Diff of /trunk/src/map-tool.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 239 by harbaum, Sat Dec 12 12:54:37 2009 UTC revision 240 by harbaum, Sat Dec 12 20:56:23 2009 UTC
# Line 237  static void map_draw_gpx(appdata_t *appd Line 237  static void map_draw_gpx(appdata_t *appd
237    }    }
238  }  }
239    
240    static cache_t *cache_search_first(gpx_t *gpx, cache_t *cache) {
241      while(gpx) {
242        cache_t *cur = gpx->cache;
243        while(cur) {
244          /* we do a string comparision to make sure that if copies */
245          /* exist, we get the original one */
246          if(!strcmp(cache->id, cur->id))
247             return cur;
248    
249          cur = cur->next;
250        }
251        gpx = gpx->next;
252      }
253      g_assert(FALSE);
254      return NULL;
255    }
256    
257  /* draw geocaches and set window title */  /* draw geocaches and set window title */
258  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
259    char *name = NULL;    char *name = NULL;
# Line 258  static void map_setup(map_context_t *con Line 275  static void map_setup(map_context_t *con
275      printf("allocated space to handle %d map icons\n", cache_num);      printf("allocated space to handle %d map icons\n", cache_num);
276    }    }
277    
278    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
279        if(context->state != MAP_SEARCH) {
280          printf("map_setup(SEARCH)\n");
281    
282          /* clear any pending balloon */
283          context->balloon = NULL;
284          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
285    
286    #ifdef OSD_NAV
287          /* no navigation in this mode */
288          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
289    #endif
290    
291          /* clear all existing cache images */
292          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
293          memset(context->caches_displayed, 0,
294                 (cache_num+1) * sizeof(cache_display_t));
295    
296          /* draw search results and all other gpx files are semi-transparent */
297          map_draw_gpx(context->appdata, context->caches_displayed,
298                       context->widget, context->appdata->search_results,
299                       NULL, FALSE);
300    
301          gpx_t *gpx = context->appdata->gpx;
302          while(gpx) {
303            map_draw_gpx(context->appdata, context->caches_displayed,
304                         context->widget, gpx, NULL, TRUE);
305    
306            gpx = gpx->next;
307          }
308    
309          name = g_strdup(_("Search results"));
310          context->state = MAP_SEARCH;
311        }
312      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
313      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
314        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
315    
# Line 340  static void map_setup(map_context_t *con Line 391  static void map_setup(map_context_t *con
391      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
392      memset(context->caches_displayed, 0,      memset(context->caches_displayed, 0,
393             (cache_num+1) * sizeof(cache_display_t));             (cache_num+1) * sizeof(cache_display_t));
394    
395        /* Make sure we really work on the first copy in the list as */
396        /* only this is being used if duplicates exist */
397        cache = cache_search_first(context->appdata->gpx, cache);
398    
399      /* draw all geocaches and all but selected one are semi-transparent */      /* draw all geocaches and all but selected one are semi-transparent */
400      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
# Line 413  map_cachelist_nearest(cache_t *cache, po Line 468  map_cachelist_nearest(cache_t *cache, po
468  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
469    cache_t *result = NULL;    cache_t *result = NULL;
470    float distance = NAN;    float distance = NAN;
471    
472    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
473        /* search search results */
474        map_cachelist_nearest(context->appdata->search_results->cache,
475                              pos, &result, &distance);
476      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
477      /* search all geocaches */      /* search all geocaches */
478      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
479      while(gpx) {      while(gpx) {
# Line 422  static cache_t *map_closest(map_context_ Line 481  static cache_t *map_closest(map_context_
481        gpx = gpx->next;        gpx = gpx->next;
482      }      }
483    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
484        /* search in current gpx file */
485      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
486                            pos, &result, &distance);                            pos, &result, &distance);
487    } else    } else
488      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_cache;
489    
490      /* make sure this is the first hit */
491      result = cache_search_first(context->appdata->gpx, result);
492    
493    return result;    return result;
494  }  }
Legend:
Removed from v.239  
changed lines
  Added in v.240