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 280 by harbaum, Fri May 21 19:28:16 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 503  on_map_button_press_event(GtkWidget *wid Line 513  on_map_button_press_event(GtkWidget *wid
513    
514    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
515    
516      puts("press event");
517    
518    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
519    if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)    if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
520      return FALSE;      return FALSE;
# Line 706  balloon_cb(osm_gps_map_balloon_event_t * Line 718  balloon_cb(osm_gps_map_balloon_event_t *
718      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
719             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
720             event->data.click.x, event->data.click.y);             event->data.click.x, event->data.click.y);
721    
722      /* make the main screen jump to that cache */      /* make the main screen jump to that cache */
723      if(!event->data.click.down) {      if(!event->data.click.down) {
724        if(context->appdata->cur_cache) {        if(context->appdata->cur_cache) {
725          printf("ERROR: no current cache should be visible!\n");          printf("ERROR: no current cache should be visible!\n");
726        } else {        } else {
727          gpx_t *is_in = NULL;          gpx_t *is_in = NULL;
728    
729            if(context->appdata->search_results) {
730              printf("click while in \"search results\" view\n");
731    
732          if(!context->appdata->cur_gpx) {            is_in = context->appdata->search_results;
733            } else if(!context->appdata->cur_gpx) {
734            printf("click while in \"all\" view\n");            printf("click while in \"all\" view\n");
735    
736            /* we first need to figure out which gpx file this cache */            /* we first need to figure out which gpx file this cache */
737            /* is in so we can open it first */            /* is in so we can open it first */
738            gpx_t *gpx = context->appdata->gpx;            gpx_t *gpx = context->appdata->gpx;
# Line 732  balloon_cb(osm_gps_map_balloon_event_t * Line 748  balloon_cb(osm_gps_map_balloon_event_t *
748    
749            if(is_in)            if(is_in)
750              gpxlist_goto_cachelist(context->appdata, is_in);              gpxlist_goto_cachelist(context->appdata, is_in);
751    
752          } else          } else {
753              printf("click while in \"cachelist\" view\n");
754    
755            /* the simple case: there already is an open gpx file and */            /* the simple case: there already is an open gpx file and */
756            /* we just jump into the "cache" view */            /* we just jump into the "cache" view */
757            is_in = context->appdata->cur_gpx;            is_in = context->appdata->cur_gpx;
758            }
759    
760          if(is_in) {          if(is_in) {
761            printf("selecting %s in %s\n",            printf("selecting %s in %s\n",
762                   cache->id,                   cache->id,
763                     context->appdata->search_results?
764                     context->appdata->search_results->name:
765                   context->appdata->cur_gpx->name);                   context->appdata->cur_gpx->name);
766    
767            cachelist_goto_cache(context->appdata, cache);            cachelist_goto_cache(context->appdata, cache);
768    
769            /* give focus to main screen (important for maemo) */            /* give focus to main screen (important for maemo) */
770            printf("raising main window\n");            printf("raising main window\n");
771            gtk_window_present(GTK_WINDOW(context->appdata->window));            gtk_window_present(GTK_WINDOW(context->appdata->window));
# Line 762  on_map_button_release_event(GtkWidget *w Line 783  on_map_button_release_event(GtkWidget *w
783                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
784    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
785    
786      puts("release event");
787    
788    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
789    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
790    /* pretty useless there */    /* pretty useless there */
# Line 806  static void on_window_destroy(GtkWidget Line 829  static void on_window_destroy(GtkWidget
829    g_object_get(map, "zoom", &zoom, NULL);    g_object_get(map, "zoom", &zoom, NULL);
830    context->appdata->map.zoom = zoom;    context->appdata->map.zoom = zoom;
831    
832      gboolean dpix;
833      g_object_get(map, "double-pixel", &dpix, NULL);
834      context->appdata->map.dpix = dpix;
835    
836    gfloat lat, lon;    gfloat lat, lon;
837    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
838    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
# Line 922  void map(appdata_t *appdata) { Line 949  void map(appdata_t *appdata) {
949    printf("allocated new context at %p\n", context);    printf("allocated new context at %p\n", context);
950    
951    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
952    context->state = MAP_NONE;    context->state = MAP_NONE;
953    
954    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
# Line 960  void map(appdata_t *appdata) { Line 986  void map(appdata_t *appdata) {
986                   "auto-center",              FALSE,                   "auto-center",              FALSE,
987                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
988                   "show-trip-history",        FALSE,                   "show-trip-history",        FALSE,
989                     "double-pixel",             context->appdata->map.dpix,
990                   proxy?"proxy-uri":NULL,     proxy,                   proxy?"proxy-uri":NULL,     proxy,
991                   NULL);                   NULL);
992    
# Line 967  void map(appdata_t *appdata) { Line 994  void map(appdata_t *appdata) {
994    
995    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
996    
997      /* set default values if they are invalid */
998      if(!context->appdata->map.zoom ||
999         isnan(context->appdata->map.pos.lat) ||
1000         isnan(context->appdata->map.pos.lon)) {
1001        printf("no valid map position found\n");
1002    
1003        pos_t *refpos = get_pos(context->appdata);
1004        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
1005          printf("use refpos\n");
1006    
1007            /* use gps position if present */
1008          context->appdata->map.pos = *refpos;
1009          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
1010        } else {
1011          printf("use zero pos\n");
1012    
1013          /* use world map otherwise */
1014          context->appdata->map.pos.lat = 0.0;
1015          context->appdata->map.pos.lon = 0.0;
1016          context->appdata->map.zoom = 1;
1017        }
1018      }
1019    
1020      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
1021                                context->appdata->map.pos.lat,
1022                                context->appdata->map.pos.lon,
1023                                context->appdata->map.zoom);
1024    
1025  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1026    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
1027    /* 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 1046  void map(appdata_t *appdata) {
1046    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1047                     G_CALLBACK(on_focus_out), context);                     G_CALLBACK(on_focus_out), context);
1048    
   g_signal_connect(G_OBJECT(context->widget), "configure-event",  
                    G_CALLBACK(on_map_configure), context);  
   
1049    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1050                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
1051    
# Line 1015  void map(appdata_t *appdata) { Line 1067  void map(appdata_t *appdata) {
1067    
1068    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1069    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1070    
1071      /* setup cache state */
1072      map_setup(context);
1073  }  }
Legend:
Removed from v.233  
changed lines
  Added in v.280