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

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

revision 219 by harbaum, Fri Nov 27 17:10:57 2009 UTC revision 242 by harbaum, Sun Dec 13 19:57:02 2009 UTC
# Line 88  static void Line 88  static void
88  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
89    
90    if(but == OSD_GPS) {    if(but == OSD_GPS) {
91        printf("clicked OSD_GPS %p\n", context);
92        printf("clicked OSD_GPS a %p\n", context->appdata);
93    
94      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
95      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
96        gint zoom;        gint zoom;
# Line 115  static int dist2pixel(map_context_t *con Line 118  static int dist2pixel(map_context_t *con
118    
119  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
120    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
121    static gboolean goto_is_enabled = FALSE;  
122    #ifdef USE_MAEMO
123      if(context->appdata->goto_disable_screensaver)
124        if(osso_display_blanking_pause(context->appdata->osso_context) != OSSO_OK)
125          fprintf(stderr, "error with display blank\n");
126    #endif
127    
128    /* get reference position ... */    /* get reference position ... */
129    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
130    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
131    
132    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
133    if(ok != goto_is_enabled) {    if(ok != context->goto_is_enabled) {
134      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
135                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
136      goto_is_enabled = ok;      context->goto_is_enabled = ok;
137    }    }
138    
139    if(ok) {    if(ok) {
# Line 181  static void map_draw_cache(GtkWidget *ma Line 189  static void map_draw_cache(GtkWidget *ma
189  }  }
190    
191  static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {  static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
   
192    /* only draw wpts that don't equal the main point */    /* only draw wpts that don't equal the main point */
193    if(pos_differ(&cache->pos, &wpt->pos)) {    if(pos_differ(&cache->pos, &wpt->pos)) {
194      GdkPixbuf *icon =      if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
195        icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?        GdkPixbuf *icon =
196                 wpt->sym:WPT_SYM_REFPOINT);          icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
197                     wpt->sym:WPT_SYM_REFPOINT);
198      if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  
199        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
200                              wpt->pos.lat, wpt->pos.lon, icon);                              wpt->pos.lat, wpt->pos.lon, icon);
201        }
202    }    }
203  }  }
204    
# Line 229  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 250  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 332  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 356  static void map_setup(map_context_t *con Line 419  static void map_setup(map_context_t *con
419  #endif  #endif
420    }    }
421    
422    if(name) {    /* also mark geomath position */
     char *title = g_strdup_printf(_("Map - %s"), name);  
     g_free(name);  
   
     gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
     g_free(title);  
   } else  
     printf("map_setup(keep)\n");  
 }  
   
 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");  
423    
424          /* use gps position if present */    /* remove all existing appearances of this icon first */
425          context->appdata->map.pos = *refpos;    osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
426          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;                             icon_get(ICON_MISC, 4));
427        } else {  
428          printf("use zero pos\n");    if(!isnan(context->appdata->geomath.lat) &&
429         !isnan(context->appdata->geomath.lon))  {
430    
431          /* use world map otherwise */      osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
432          context->appdata->map.pos.lat = 0.0;                            context->appdata->geomath.lat,
433          context->appdata->map.pos.lon = 0.0;                            context->appdata->geomath.lon,
434          context->appdata->map.zoom = 1;                            icon_get(ICON_MISC, 4));
       }  
     }  
   
     /* 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;  
435    }    }
436    
437    return FALSE;    if(name) {
438        gtk_window_set_title(GTK_WINDOW(context->window), name);
439        g_free(name);
440      } else
441        printf("map_setup(keep)\n");
442  }  }
443    
444  static void  static void
# Line 447  map_cachelist_nearest(cache_t *cache, po Line 464  map_cachelist_nearest(cache_t *cache, po
464  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
465    cache_t *result = NULL;    cache_t *result = NULL;
466    float distance = NAN;    float distance = NAN;
467    
468    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
469        /* search search results */
470        map_cachelist_nearest(context->appdata->search_results->cache,
471                              pos, &result, &distance);
472      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
473      /* search all geocaches */      /* search all geocaches */
474      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
475      while(gpx) {      while(gpx) {
# Line 456  static cache_t *map_closest(map_context_ Line 477  static cache_t *map_closest(map_context_
477        gpx = gpx->next;        gpx = gpx->next;
478      }      }
479    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
480        /* search in current gpx file */
481      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
482                            pos, &result, &distance);                            pos, &result, &distance);
483    } else    } else
484      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_cache;
485    
486      /* make sure this is the first hit */
487      result = cache_search_first(context->appdata->gpx, result);
488    
489    return result;    return result;
490  }  }
# Line 805  static void on_window_destroy(GtkWidget Line 830  static void on_window_destroy(GtkWidget
830      context->caches_displayed = NULL;      context->caches_displayed = NULL;
831    }    }
832    
833      printf("destroy map context\n");
834    g_free(context);    g_free(context);
835    appdata->map.context = NULL;    appdata->map.context = NULL;
836  }  }
# Line 895  void map(appdata_t *appdata) { Line 921  void map(appdata_t *appdata) {
921    }    }
922    
923    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
924      printf("allocated new context at %p\n", context);
925    
926    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
927    context->state = MAP_NONE;    context->state = MAP_NONE;
928    
929    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
# Line 941  void map(appdata_t *appdata) { Line 968  void map(appdata_t *appdata) {
968    
969    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
970    
971      /* set default values if they are invalid */
972      if(!context->appdata->map.zoom ||
973         isnan(context->appdata->map.pos.lat) ||
974         isnan(context->appdata->map.pos.lon)) {
975        printf("no valid map position found\n");
976    
977        pos_t *refpos = get_pos(context->appdata);
978        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
979          printf("use refpos\n");
980    
981            /* use gps position if present */
982          context->appdata->map.pos = *refpos;
983          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
984        } else {
985          printf("use zero pos\n");
986    
987          /* use world map otherwise */
988          context->appdata->map.pos.lat = 0.0;
989          context->appdata->map.pos.lon = 0.0;
990          context->appdata->map.zoom = 1;
991        }
992      }
993    
994      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
995                                context->appdata->map.pos.lat,
996                                context->appdata->map.pos.lon,
997                                context->appdata->map.zoom);
998    
999  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1000    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
1001    /* this leaves the main window independent from the map and */    /* this leaves the main window independent from the map and */
# Line 965  void map(appdata_t *appdata) { Line 1020  void map(appdata_t *appdata) {
1020    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1021                     G_CALLBACK(on_focus_out), context);                     G_CALLBACK(on_focus_out), context);
1022    
   g_signal_connect(G_OBJECT(context->widget), "configure-event",  
                    G_CALLBACK(on_map_configure), context);  
   
1023    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1024                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
1025    
# Line 989  void map(appdata_t *appdata) { Line 1041  void map(appdata_t *appdata) {
1041    
1042    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1043    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1044    
1045      /* setup cache state */
1046      map_setup(context);
1047  }  }
Legend:
Removed from v.219  
changed lines
  Added in v.242