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

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

revision 85 by harbaum, Fri Aug 28 12:07:16 2009 UTC revision 129 by harbaum, Tue Sep 29 14:30:16 2009 UTC
# Line 17  Line 17 
17   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
18   */   */
19    
20    /*
21     * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png  8-15
22     * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23     */
24    
25  #include "gpxview.h"  #include "gpxview.h"
26  #include "converter.h"  #include "converter.h"
27  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 31  Line 36 
36  #include <X11/Xatom.h>  #include <X11/Xatom.h>
37  #endif  #endif
38    
39  // #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  /* default values */
40  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
41  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
42    
# Line 170  static gboolean on_map_configure(GtkWidg Line 175  static gboolean on_map_configure(GtkWidg
175    return FALSE;    return FALSE;
176  }  }
177    
178  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache) {
179    while(cache) {    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
     GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
180    
181      /* check if there's also an overwritten coordinate */
182      if(cache->notes && cache->notes->override) {
183        GdkPixbuf *over = icon_get(ICON_MISC, 1);
184    
185        osm_gps_map_add_image(OSM_GPS_MAP(map),
186              cache->notes->pos.lat, cache->notes->pos.lon, icon);
187    
188        osm_gps_map_add_image(OSM_GPS_MAP(map),
189              cache->notes->pos.lat, cache->notes->pos.lon, over);
190      } else
191      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
192                            cache->pos.lat, cache->pos.lon, icon);                            cache->pos.lat, cache->pos.lon, icon);
193    
194    }
195    
196    static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {
197      if(!gpx->notes_loaded) {
198        notes_load_all(appdata, gpx);
199        gpx->notes_loaded = TRUE;
200      }
201    
202      cache_t *cache = gpx->cache;
203      while(cache) {
204        map_draw_cache(map, cache);
205      cache = cache->next;      cache = cache->next;
206    }    }
207  }  }
# Line 185  static void Line 210  static void
210  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
211                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
212    while(cache) {    while(cache) {
213        pos_t cpos = gpx_cache_pos(cache);
214    
215      float dist =      float dist =
216        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
217        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
218    
219      if(!(dist > *distance)) {      if(!(dist > *distance)) {
220        *result = cache;        *result = cache;
# Line 202  static cache_t *map_closest(map_context_ Line 229  static cache_t *map_closest(map_context_
229    cache_t *result = NULL;    cache_t *result = NULL;
230    float distance = NAN;    float distance = NAN;
231    
232  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
233      /* search all geocaches */      /* search all geocaches */
234      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
235      while(gpx) {      while(gpx) {
236        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
237        gpx = gpx->next;        gpx = gpx->next;
238      }      }
239  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
240      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
241                            pos, &result, &distance);                            pos, &result, &distance);
242    }    } else
243  #endif      result = context->appdata->cur_gpx->cache;
244    
245    return result;    return result;
246  }  }
# Line 236  on_map_button_press_event(GtkWidget *wid Line 260  on_map_button_press_event(GtkWidget *wid
260                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
261    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
262    
263      /* check if we actually clicked parts of the OSD */
264      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
265        return FALSE;
266    
267    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
268    if(context->press_on != NULL) {    if(context->press_on != NULL) {
269      printf("PRESS: already\n");      printf("PRESS: already\n");
270      return TRUE;      return FALSE;
271    }    }
272    
273    pos_t pos =    pos_t pos =
# Line 247  on_map_button_press_event(GtkWidget *wid Line 275  on_map_button_press_event(GtkWidget *wid
275    
276    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
277    if(nearest) {    if(nearest) {
278      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
279      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
280        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
281        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
282        context->press_on = nearest;        context->press_on = nearest;
283    }    }
284    
# Line 304  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 334  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
334    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
335    cairo_draw_pixbuf(cr, icon, x, y);    cairo_draw_pixbuf(cr, icon, x, y);
336    
337      if(cache->notes && cache->notes->override) {
338        GdkPixbuf *over = icon_get(ICON_MISC, 1);
339        cairo_draw_pixbuf(cr, over, x, y);
340      }
341    
342    /* ... and right of it the waypoint id */    /* ... and right of it the waypoint id */
343    cairo_text_extents_t extents;    cairo_text_extents_t extents;
344    
# Line 412  on_map_button_release_event(GtkWidget *w Line 447  on_map_button_release_event(GtkWidget *w
447    
448      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
449      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
450        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
451        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
452          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
453          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
454    
455          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
456                                   balloon_draw_cb, nearest);                                       balloon_draw_cb, nearest);
457    
458            osm_gps_map_osd_draw_nav (map, cpos.lat, cpos.lon, nearest->name);
459    
460        }        }
461      }      }
462      context->press_on = NULL;      context->press_on = NULL;
# Line 447  static void on_window_destroy(GtkWidget Line 487  static void on_window_destroy(GtkWidget
487    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
488    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
489    
490      gint source;
491      g_object_get(map, "map-source", &source, NULL);
492      context->appdata->map.source = source;
493    
494  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
495    /* restore cur_view */    /* restore cur_view */
496    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 477  on_window_realize(GtkWidget *widget, gpo Line 521  on_window_realize(GtkWidget *widget, gpo
521  }  }
522  #endif  #endif
523    
524    /* draw geocaches and set window title */
525    static void map_setup(map_context_t *context) {
526      char *name = NULL;
527    
528      /* clear all existing ccahe images */
529      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
530    
531      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
532        /* draw all geocaches */
533        gpx_t *gpx = context->appdata->gpx;
534        while(gpx) {
535          map_draw_gpx(context->appdata, context->widget, gpx);
536          gpx = gpx->next;
537        }
538        name = g_strdup(_("all"));
539        context->state = MAP_ALL;
540        context->gpx = context->appdata->gpx;
541      } else if(!context->appdata->cur_cache) {
542        map_draw_gpx(context->appdata, context->widget, context->appdata->cur_gpx);
543        name = g_strdup(context->appdata->cur_gpx->name);
544        context->state = MAP_GPX;
545        context->gpx = context->appdata->cur_gpx;
546      } else {
547        map_draw_cache(context->widget, context->appdata->cur_cache);
548        name = g_strdup(context->appdata->cur_cache->name);
549        context->state = MAP_CACHE;
550        context->cache = context->appdata->cur_cache;
551      }
552    
553      char *title = g_strdup_printf(_("Map - %s"), name);
554      g_free(name);
555    
556      gtk_window_set_title(GTK_WINDOW(context->window), title);
557    
558      g_free(title);
559    }
560    
561    /* on maemo a window is either on top or completely invisible. this means that */
562    /* we only need to update the map window if its raised. on ordinary desktops this */
563    /* is different and we always update */
564    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
565                             gpointer data) {
566      map_context_t *context = (map_context_t*)data;
567    
568      printf("map focus in!\n");
569    
570      return FALSE;
571    }
572    
573    void map_update(appdata_t *appdata) {
574      if(appdata->map.context) {
575        printf("map update\n");
576      }
577    }
578    
579  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
580    map_context_t *context = NULL;    map_context_t *context = NULL;
581    
582    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
583    if(appdata->map.context) {    if(appdata->map.context) {
584        printf("using existing map!\n");
585      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
586        map_setup(appdata->map.context);
587      return;      return;
588    }    }
589    
# Line 516  void map(appdata_t *appdata) { Line 617  void map(appdata_t *appdata) {
617    
618    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
619    
620      gint source = context->appdata->map.source;
621      if(!source) source = MAP_SOURCE;
622    
623    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
624                   "map-source",               MAP_SOURCE,                   "map-source",               source,
625                   "tile-cache",               path,                   "tile-cache",               path,
626                   "auto-center",              FALSE,                   "auto-center",              FALSE,
627                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 528  void map(appdata_t *appdata) { Line 632  void map(appdata_t *appdata) {
632    g_free(path);    g_free(path);
633    
634    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
   
   char *name = NULL;  
 #ifdef USE_MAEMO  
   if(!appdata->cur_gpx) {  
 #endif  
     /* draw all geocaches */  
     gpx_t *gpx = appdata->gpx;  
     while(gpx) {  
       map_draw_cachelist(context->widget, gpx->cache);  
       gpx = gpx->next;  
     }  
     name = g_strdup(_("all geocaches"));  
 #ifdef USE_MAEMO  
   } else {  
     map_draw_cachelist(context->widget, appdata->cur_gpx->cache);  
     name = g_strdup(appdata->cur_gpx->name);  
   }  
 #endif  
   
   char *title = g_strdup_printf(_("Map - %s"), name);  
   g_free(name);  
635    
636  #ifdef USE_MAEMO  #ifdef USE_MAEMO
637  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
638    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
639    /* try to enable the zoom buttons. don't do this on x86 as it breaks */    /* the user can e.g. still navigate the main menu */
640    /* at runtime with cygwin x */    context->window = hildon_window_new();
641  #ifndef __i386__  
642    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
643    g_signal_connect(G_OBJECT(context->window), "realize",    g_signal_connect(G_OBJECT(context->window), "realize",
644                     G_CALLBACK(on_window_realize), NULL);                     G_CALLBACK(on_window_realize), NULL);
645  #endif // MAEMO_VERSION  #endif // MAEMO_VERSION
646  #else  #else
   context->window = hildon_window_new();  
 #endif  
 #else  
647    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
648  #endif  #endif
649    
650    gtk_window_set_title(GTK_WINDOW(context->window), title);    /* setup cache state */
651      map_setup(context);
652    
653  #ifndef USE_MAEMO  #ifndef USE_MAEMO
654    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
655  #endif  #endif
656    
657    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
658                       G_CALLBACK(on_focus_in), context);
659    
660    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
661                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
Legend:
Removed from v.85  
changed lines
  Added in v.129