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

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

revision 233 by harbaum, Wed Dec 9 19:45:36 2009 UTC revision 255 by harbaum, Tue Feb 9 19:25:36 2010 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_ALL) {      if(context->state != MAP_SEARCH) {
280        printf("map_setup(ALL)\n");        printf("map_setup(SEARCH)\n");
281    
282        /* clear any pending balloon */        /* clear any pending balloon */
283        context->balloon = NULL;        context->balloon = NULL;
# Line 273  static void map_setup(map_context_t *con Line 290  static void map_setup(map_context_t *con
290    
291        /* clear all existing cache images */        /* clear all existing cache images */
292        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
       memset(context->caches_displayed, 0,  
              (cache_num+1) * sizeof(cache_display_t));  
293    
294        /* draw all geocaches and none is semi-transparent */        if(context->caches_displayed) {
295        gpx_t *gpx = context->appdata->gpx;          memset(context->caches_displayed, 0,
296        while(gpx) {                 (cache_num+1) * sizeof(cache_display_t));
297    
298            /* draw search results and all other gpx files are semi-transparent */
299          map_draw_gpx(context->appdata, context->caches_displayed,          map_draw_gpx(context->appdata, context->caches_displayed,
300                       context->widget, gpx, NULL, FALSE);                       context->widget, context->appdata->search_results,
301          gpx = gpx->next;                       NULL, FALSE);
       }  
302    
303        {          gpx_t *gpx = context->appdata->gpx;
304          int i=0;          while(gpx) {
305          while(context->caches_displayed[i].id) i++;            map_draw_gpx(context->appdata, context->caches_displayed,
306          printf("number of caches actually displayed: %d\n", i);                         context->widget, gpx, NULL, TRUE);
307    
308              gpx = gpx->next;
309            }
310        }        }
311          name = g_strdup(_("Search results"));
312          context->state = MAP_SEARCH;
313        }
314      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
315        if(context->state != MAP_ALL) {
316          printf("map_setup(ALL)\n");
317    
318          /* clear any pending balloon */
319          context->balloon = NULL;
320          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
321    
322    #ifdef OSD_NAV
323          /* no navigation in this mode */
324          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
325    #endif
326    
327          /* clear all existing cache images */
328          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
329          if(context->caches_displayed) {
330            memset(context->caches_displayed, 0,
331                   (cache_num+1) * sizeof(cache_display_t));
332    
333            /* draw all geocaches and none is semi-transparent */
334            gpx_t *gpx = context->appdata->gpx;
335            while(gpx) {
336              map_draw_gpx(context->appdata, context->caches_displayed,
337                           context->widget, gpx, NULL, FALSE);
338              gpx = gpx->next;
339            }
340    
341            {
342              int i=0;
343              while(context->caches_displayed[i].id) i++;
344              printf("number of caches actually displayed: %d\n", i);
345            }
346          }
347        name = g_strdup(_("all"));        name = g_strdup(_("all"));
348        context->state = MAP_ALL;        context->state = MAP_ALL;
349      }      }
# Line 308  static void map_setup(map_context_t *con Line 362  static void map_setup(map_context_t *con
362    
363        /* clear all existing cache images */        /* clear all existing cache images */
364        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
365        memset(context->caches_displayed, 0,        if(context->caches_displayed) {
366               (cache_num+1) * sizeof(cache_display_t));          memset(context->caches_displayed, 0,
367                   (cache_num+1) * sizeof(cache_display_t));
368        /* draw all geocaches and all other gpx files are semi-transparent */  
369        map_draw_gpx(context->appdata, context->caches_displayed,          /* draw all geocaches and all other gpx files are semi-transparent */
370                     context->widget, context->appdata->cur_gpx, NULL, FALSE);          map_draw_gpx(context->appdata, context->caches_displayed,
371                         context->widget, context->appdata->cur_gpx, NULL, FALSE);
372        gpx_t *gpx = context->appdata->gpx;  
373        while(gpx) {          gpx_t *gpx = context->appdata->gpx;
374          if(gpx != context->appdata->cur_gpx)          while(gpx) {
375            map_draw_gpx(context->appdata, context->caches_displayed,            if(gpx != context->appdata->cur_gpx)
376                         context->widget, gpx, NULL, TRUE);              map_draw_gpx(context->appdata, context->caches_displayed,
377                             context->widget, gpx, NULL, TRUE);
378          gpx = gpx->next;  
379              gpx = gpx->next;
380            }
381        }        }
382    
383        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
# Line 338  static void map_setup(map_context_t *con Line 394  static void map_setup(map_context_t *con
394    
395      /* clear all existing ccahe images */      /* clear all existing ccahe images */
396      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
397      memset(context->caches_displayed, 0,      if(context->caches_displayed) {
398             (cache_num+1) * sizeof(cache_display_t));        memset(context->caches_displayed, 0,
399                 (cache_num+1) * sizeof(cache_display_t));
400      /* draw all geocaches and all but selected one are semi-transparent */  
401      gpx_t *gpx = context->appdata->gpx;        /* Make sure we really work on the first copy in the list as */
402      while(gpx) {        /* only this is being used if duplicates exist */
403        map_draw_gpx(context->appdata, context->caches_displayed,        cache = cache_search_first(context->appdata->gpx, cache);
404                     context->widget, gpx, cache, FALSE);  
405        gpx = gpx->next;        /* draw all geocaches and all but selected one are semi-transparent */
406          gpx_t *gpx = context->appdata->gpx;
407          while(gpx) {
408            map_draw_gpx(context->appdata, context->caches_displayed,
409                         context->widget, gpx, cache, FALSE);
410            gpx = gpx->next;
411          }
412      }      }
413    
414      name = g_strdup(cache->name);      name = g_strdup(cache->name);
# Line 380  static void map_setup(map_context_t *con Line 442  static void map_setup(map_context_t *con
442    }    }
443    
444    if(name) {    if(name) {
445      char *title = g_strdup_printf(_("Map - %s"), name);      gtk_window_set_title(GTK_WINDOW(context->window), name);
446      g_free(name);      g_free(name);
   
     gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
     g_free(title);  
447    } else    } else
448      printf("map_setup(keep)\n");      printf("map_setup(keep)\n");
449  }  }
450    
 static gboolean on_map_configure(GtkWidget *widget,  
                                  GdkEventConfigure *event,  
                                  map_context_t *context) {  
   
   /* for some reason there's a configure event with 1/1 */  
   /* on diablo. We just ignore this! */  
   
   printf("on_map_configure %d %d\n",  
          widget->allocation.width,  
          widget->allocation.height);  
   
   if(!context->map_complete &&  
      (widget->allocation.width > 100) &&  
      (widget->allocation.height > 100)) {  
   
     /* setup cache state */  
     map_setup(context);  
   
     /* set default values if they are invalid */  
     if(!context->appdata->map.zoom ||  
        isnan(context->appdata->map.pos.lat) ||  
        isnan(context->appdata->map.pos.lon)) {  
       printf("no valid map position found\n");  
   
       pos_t *refpos = get_pos(context->appdata);  
       if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
         printf("use refpos\n");  
   
         /* use gps position if present */  
         context->appdata->map.pos = *refpos;  
         context->appdata->map.zoom = GPS_DEFAULT_ZOOM;  
       } else {  
         printf("use zero pos\n");  
   
         /* use world map otherwise */  
         context->appdata->map.pos.lat = 0.0;  
         context->appdata->map.pos.lon = 0.0;  
         context->appdata->map.zoom = 1;  
       }  
     }  
   
     /* jump to initial position */  
     printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",  
            context->appdata->map.pos.lat,  
            context->appdata->map.pos.lon,  
            context->appdata->map.zoom);  
   
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               context->appdata->map.pos.lat,  
                               context->appdata->map.pos.lon,  
                               context->appdata->map.zoom);  
     context->map_complete = TRUE;  
   }  
   
   return FALSE;  
 }  
   
451  static void  static void
452  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
453                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 470  map_cachelist_nearest(cache_t *cache, po Line 471  map_cachelist_nearest(cache_t *cache, po
471  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
472    cache_t *result = NULL;    cache_t *result = NULL;
473    float distance = NAN;    float distance = NAN;
474    
475    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
476        /* search search results */
477        map_cachelist_nearest(context->appdata->search_results->cache,
478                              pos, &result, &distance);
479      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
480      /* search all geocaches */      /* search all geocaches */
481      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
482      while(gpx) {      while(gpx) {
# Line 479  static cache_t *map_closest(map_context_ Line 484  static cache_t *map_closest(map_context_
484        gpx = gpx->next;        gpx = gpx->next;
485      }      }
486    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
487        /* search in current gpx file */
488      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
489                            pos, &result, &distance);                            pos, &result, &distance);
490    } else    } else
491      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_cache;
492    
493      /* make sure this is the first hit */
494      if(context->caches_displayed)
495        result = cache_search_first(context->appdata->gpx, result);
496    
497    return result;    return result;
498  }  }
# Line 706  balloon_cb(osm_gps_map_balloon_event_t * Line 716  balloon_cb(osm_gps_map_balloon_event_t *
716      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
717             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
718             event->data.click.x, event->data.click.y);             event->data.click.x, event->data.click.y);
719    
720      /* make the main screen jump to that cache */      /* make the main screen jump to that cache */
721      if(!event->data.click.down) {      if(!event->data.click.down) {
722        if(context->appdata->cur_cache) {        if(context->appdata->cur_cache) {
723          printf("ERROR: no current cache should be visible!\n");          printf("ERROR: no current cache should be visible!\n");
724        } else {        } else {
725          gpx_t *is_in = NULL;          gpx_t *is_in = NULL;
726    
727            if(context->appdata->search_results) {
728              printf("click while in \"search results\" view\n");
729    
730          if(!context->appdata->cur_gpx) {            is_in = context->appdata->search_results;
731            } else if(!context->appdata->cur_gpx) {
732            printf("click while in \"all\" view\n");            printf("click while in \"all\" view\n");
733    
734            /* we first need to figure out which gpx file this cache */            /* we first need to figure out which gpx file this cache */
735            /* is in so we can open it first */            /* is in so we can open it first */
736            gpx_t *gpx = context->appdata->gpx;            gpx_t *gpx = context->appdata->gpx;
# Line 732  balloon_cb(osm_gps_map_balloon_event_t * Line 746  balloon_cb(osm_gps_map_balloon_event_t *
746    
747            if(is_in)            if(is_in)
748              gpxlist_goto_cachelist(context->appdata, is_in);              gpxlist_goto_cachelist(context->appdata, is_in);
749    
750          } else          } else {
751              printf("click while in \"cachelist\" view\n");
752    
753            /* the simple case: there already is an open gpx file and */            /* the simple case: there already is an open gpx file and */
754            /* we just jump into the "cache" view */            /* we just jump into the "cache" view */
755            is_in = context->appdata->cur_gpx;            is_in = context->appdata->cur_gpx;
756            }
757    
758          if(is_in) {          if(is_in) {
759            printf("selecting %s in %s\n",            printf("selecting %s in %s\n",
760                   cache->id,                   cache->id,
761                     context->appdata->search_results?
762                     context->appdata->search_results->name:
763                   context->appdata->cur_gpx->name);                   context->appdata->cur_gpx->name);
764    
765            cachelist_goto_cache(context->appdata, cache);            cachelist_goto_cache(context->appdata, cache);
766    
767            /* give focus to main screen (important for maemo) */            /* give focus to main screen (important for maemo) */
768            printf("raising main window\n");            printf("raising main window\n");
769            gtk_window_present(GTK_WINDOW(context->appdata->window));            gtk_window_present(GTK_WINDOW(context->appdata->window));
# Line 922  void map(appdata_t *appdata) { Line 941  void map(appdata_t *appdata) {
941    printf("allocated new context at %p\n", context);    printf("allocated new context at %p\n", context);
942    
943    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
944    context->state = MAP_NONE;    context->state = MAP_NONE;
945    
946    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
# Line 967  void map(appdata_t *appdata) { Line 985  void map(appdata_t *appdata) {
985    
986    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
987    
988      /* set default values if they are invalid */
989      if(!context->appdata->map.zoom ||
990         isnan(context->appdata->map.pos.lat) ||
991         isnan(context->appdata->map.pos.lon)) {
992        printf("no valid map position found\n");
993    
994        pos_t *refpos = get_pos(context->appdata);
995        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
996          printf("use refpos\n");
997    
998            /* use gps position if present */
999          context->appdata->map.pos = *refpos;
1000          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
1001        } else {
1002          printf("use zero pos\n");
1003    
1004          /* use world map otherwise */
1005          context->appdata->map.pos.lat = 0.0;
1006          context->appdata->map.pos.lon = 0.0;
1007          context->appdata->map.zoom = 1;
1008        }
1009      }
1010    
1011      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
1012                                context->appdata->map.pos.lat,
1013                                context->appdata->map.pos.lon,
1014                                context->appdata->map.zoom);
1015    
1016  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1017    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
1018    /* this leaves the main window independent from the map and */    /* this leaves the main window independent from the map and */
# Line 991  void map(appdata_t *appdata) { Line 1037  void map(appdata_t *appdata) {
1037    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1038                     G_CALLBACK(on_focus_out), context);                     G_CALLBACK(on_focus_out), context);
1039    
   g_signal_connect(G_OBJECT(context->widget), "configure-event",  
                    G_CALLBACK(on_map_configure), context);  
   
1040    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1041                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
1042    
# Line 1015  void map(appdata_t *appdata) { Line 1058  void map(appdata_t *appdata) {
1058    
1059    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1060    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1061    
1062      /* setup cache state */
1063      map_setup(context);
1064  }  }
Legend:
Removed from v.233  
changed lines
  Added in v.255