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

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

revision 77 by harbaum, Tue Aug 25 12:49:03 2009 UTC revision 125 by harbaum, Sun Sep 27 19:11:37 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
41  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
42    
43  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 77  cb_map_gps(osd_button_t but, map_context Line 83  cb_map_gps(osd_button_t but, map_context
83    if(but == OSD_GPS) {    if(but == OSD_GPS) {
84      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
85      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
86        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        gint zoom;
87                                  refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
88          if(zoom < 10)
89            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
90                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
91          else
92            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
93                                   refpos->lat, refpos->lon);
94    
95        /* re-enable centering */        /* re-enable centering */
96        g_object_set(context->widget, "auto-center", TRUE, NULL);        g_object_set(context->widget, "auto-center", TRUE, NULL);
97      } else {      } else {
# Line 130  static gboolean on_map_configure(GtkWidg Line 143  static gboolean on_map_configure(GtkWidg
143                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
144                                   map_context_t *context) {                                   map_context_t *context) {
145    
146    /* set default values if they are invalid */    if(!context->map_complete) {
147    if(!context->appdata->map.zoom ||  
148       isnan(context->appdata->map.pos.lat) ||      /* set default values if they are invalid */
149       isnan(context->appdata->map.pos.lon)) {      if(!context->appdata->map.zoom ||
150      printf("no valid map position found\n");         isnan(context->appdata->map.pos.lat) ||
151           isnan(context->appdata->map.pos.lon)) {
152      pos_t *refpos = get_pos(context->appdata);        printf("no valid map position found\n");
153      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
154        /* use gps position if present */        pos_t *refpos = get_pos(context->appdata);
155        context->appdata->map.pos = *refpos;        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
156        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          /* use gps position if present */
157      } else {          context->appdata->map.pos = *refpos;
158        /* use world map otherwise */          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
159        context->appdata->map.pos.lat = 0.0;        } else {
160        context->appdata->map.pos.lon = 0.0;          /* use world map otherwise */
161        context->appdata->map.zoom = 1;          context->appdata->map.pos.lat = 0.0;
162            context->appdata->map.pos.lon = 0.0;
163            context->appdata->map.zoom = 1;
164          }
165      }      }
166    
167        /* jump to initial position */
168        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
169                                  context->appdata->map.pos.lat,
170                                  context->appdata->map.pos.lon,
171                                  context->appdata->map.zoom);
172        context->map_complete = TRUE;
173    }    }
174    
   /* jump to initial position */  
   osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                             context->appdata->map.pos.lat,  
                             context->appdata->map.pos.lon,  
                             context->appdata->map.zoom);  
   
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 173  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 191  static cache_t *map_closest(map_context_ Line 230  static cache_t *map_closest(map_context_
230    float distance = NAN;    float distance = NAN;
231    
232  #ifdef USE_MAEMO  #ifdef USE_MAEMO
233    if(!context->appdata->cur_gpx) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
234  #endif  #endif
235      /* search all geocaches */      /* search all geocaches */
236      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
# Line 200  static cache_t *map_closest(map_context_ Line 239  static cache_t *map_closest(map_context_
239        gpx = gpx->next;        gpx = gpx->next;
240      }      }
241  #ifdef USE_MAEMO  #ifdef USE_MAEMO
242    } else {    } else if(context->appdata->cur_gpx) {
243      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
244                            pos, &result, &distance);                            pos, &result, &distance);
245    }    } else
246        result = context->appdata->cur_gpx->cache;
247  #endif  #endif
248    
249    return result;    return result;
# Line 224  on_map_button_press_event(GtkWidget *wid Line 264  on_map_button_press_event(GtkWidget *wid
264                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
265    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
266    
267      /* check if we actually clicked parts of the OSD */
268      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
269        return FALSE;
270    
271    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
272    if(context->press_on != NULL) {    if(context->press_on != NULL) {
273      printf("PRESS: already\n");      printf("PRESS: already\n");
274      return TRUE;      return FALSE;
275    }    }
276    
277    pos_t pos =    pos_t pos =
# Line 235  on_map_button_press_event(GtkWidget *wid Line 279  on_map_button_press_event(GtkWidget *wid
279    
280    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
281    if(nearest) {    if(nearest) {
282      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
283      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
284        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
285        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
286        context->press_on = nearest;        context->press_on = nearest;
287    }    }
288    
# Line 292  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 338  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
338    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
339    cairo_draw_pixbuf(cr, icon, x, y);    cairo_draw_pixbuf(cr, icon, x, y);
340    
341      if(cache->notes && cache->notes->override) {
342        GdkPixbuf *over = icon_get(ICON_MISC, 1);
343        cairo_draw_pixbuf(cr, over, x, y);
344      }
345    
346    /* ... and right of it the waypoint id */    /* ... and right of it the waypoint id */
347    cairo_text_extents_t extents;    cairo_text_extents_t extents;
348    
# Line 400  on_map_button_release_event(GtkWidget *w Line 451  on_map_button_release_event(GtkWidget *w
451    
452      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
453      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
454        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
455        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
456          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
457          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
458    
459          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
460                                   balloon_draw_cb, nearest);                                       balloon_draw_cb, nearest);
461    
462            osm_gps_map_osd_draw_nav (map, cpos.lat, cpos.lon, nearest->name);
463    
464        }        }
465      }      }
466      context->press_on = NULL;      context->press_on = NULL;
# Line 435  static void on_window_destroy(GtkWidget Line 491  static void on_window_destroy(GtkWidget
491    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
492    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
493    
494      gint source;
495      g_object_get(map, "map-source", &source, NULL);
496      context->appdata->map.source = source;
497    
498  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
499    /* restore cur_view */    /* restore cur_view */
500    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 465  on_window_realize(GtkWidget *widget, gpo Line 525  on_window_realize(GtkWidget *widget, gpo
525  }  }
526  #endif  #endif
527    
528    /* draw geocaches and set window title */
529    static void map_setup(map_context_t *context) {
530      char *name = NULL;
531    
532      /* clear all existing ccahe images */
533      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
534    
535    #ifdef USE_MAEMO
536      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
537    #endif
538        /* draw all geocaches */
539        gpx_t *gpx = context->appdata->gpx;
540        while(gpx) {
541          map_draw_gpx(context->appdata, context->widget, gpx);
542          gpx = gpx->next;
543        }
544        name = g_strdup(_("all"));
545    #ifdef USE_MAEMO
546      } else if(!context->appdata->cur_cache) {
547        map_draw_gpx(context->appdata, context->widget, context->appdata->cur_gpx);
548        name = g_strdup(context->appdata->cur_gpx->name);
549      } else {
550        map_draw_cache(context->widget, context->appdata->cur_cache);
551        name = g_strdup(context->appdata->cur_cache->name);
552      }
553    #endif
554    
555      char *title = g_strdup_printf(_("Map - %s"), name);
556      g_free(name);
557    
558      gtk_window_set_title(GTK_WINDOW(context->window), title);
559    
560      g_free(title);
561    }
562    
563  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
564    map_context_t *context = NULL;    map_context_t *context = NULL;
565    
566    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
567    if(appdata->map.context) {    if(appdata->map.context) {
568        printf("using existing map!\n");
569      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
570        map_setup(appdata->map.context);
571      return;      return;
572    }    }
573    
574    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
575    context->appdata = appdata;    context->appdata = appdata;
576      context->map_complete = FALSE;
577    
578    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
579    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
# Line 503  void map(appdata_t *appdata) { Line 601  void map(appdata_t *appdata) {
601    
602    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
603    
604      gint source = context->appdata->map.source;
605      if(!source) source = MAP_SOURCE;
606    
607    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
608                   "map-source",               MAP_SOURCE,                   "map-source",               source,
609                   "tile-cache",               path,                   "tile-cache",               path,
610                   "auto-center",              FALSE,                   "auto-center",              FALSE,
611                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 515  void map(appdata_t *appdata) { Line 616  void map(appdata_t *appdata) {
616    g_free(path);    g_free(path);
617    
618    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);  
619    
620  #ifdef USE_MAEMO  #ifdef USE_MAEMO
621  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
622    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
623    /* 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 */
624    /* at runtime with cygwin x */    context->window = hildon_window_new();
625  #ifndef __i386__  
626    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
627    g_signal_connect(G_OBJECT(context->window), "realize",    g_signal_connect(G_OBJECT(context->window), "realize",
628                     G_CALLBACK(on_window_realize), NULL);                     G_CALLBACK(on_window_realize), NULL);
629  #endif // MAEMO_VERSION  #endif // MAEMO_VERSION
630  #else  #else
   context->window = hildon_window_new();  
 #endif  
 #else  
631    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
632  #endif  #endif
633    
634    gtk_window_set_title(GTK_WINDOW(context->window), title);    /* setup cache state */
635      map_setup(context);
636    
637  #ifndef USE_MAEMO  #ifndef USE_MAEMO
638    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
639  #endif  #endif
640    
   g_free(title);  
   
641    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
642                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
643    
Legend:
Removed from v.77  
changed lines
  Added in v.125