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

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

revision 61 by harbaum, Tue Aug 18 14:32:45 2009 UTC revision 98 by harbaum, Mon Sep 7 13:20: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
28    
29  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
30  #include "osm-gps-map.h"  #include "osm-gps-map.h"
31    #include "osm-gps-map-osd-classic.h"
32  #endif  #endif
33    
34  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
35    #include <gdk/gdkx.h>
36    #include <X11/Xatom.h>
37    #endif
38    
39    /* 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 66  static const char *get_proxy_uri(appdata Line 78  static const char *get_proxy_uri(appdata
78    return NULL;    return NULL;
79  }  }
80    
81  static void map_zoom(map_context_t *context, int step) {  static void
82    gint zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
83    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(but == OSD_GPS) {
84    g_object_get(map, "zoom", &zoom, NULL);      pos_t *refpos = get_pos(context->appdata);
85    zoom = osm_gps_map_set_zoom(map, zoom+step);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
86          gint zoom;
87    /* enable/disable zoom buttons as required */        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
88    gtk_widget_set_sensitive(context->zoomin,        if(zoom < 10)
89             zoom < osm_gps_map_source_get_max_zoom(MAP_SOURCE));          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
90    gtk_widget_set_sensitive(context->zoomout,                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
91             zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));        else
92            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
93    /* save new zoom */                                 refpos->lat, refpos->lon);
   context->appdata->map.zoom = zoom;  
 }  
   
 static gboolean  
 cb_map_zoomin(GtkButton *button, map_context_t *context) {  
   map_zoom(context, +1);  
   return FALSE;  
 }  
   
 static gboolean  
 cb_map_zoomout(GtkButton *button, map_context_t *context) {  
   map_zoom(context, -1);  
   return FALSE;  
 }  
94    
95  static gboolean        /* re-enable centering */
96  cb_map_gps(GtkButton *button, map_context_t *context) {        g_object_set(context->widget, "auto-center", TRUE, NULL);
97    pos_t *refpos = get_pos(context->appdata);      } else {
98    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        /* no coordinates given: display the entire world */
99      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
100                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);                                  0.0, 0.0, 1);
101    } else {      }
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
102    }    }
   
   return FALSE;  
 }  
   
 static GtkWidget  
 *map_add_button(int icon, GCallback cb, gpointer data,  
                 char *tooltip) {  
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, icon));  
   g_signal_connect(button, "clicked", cb, data);  
 #ifndef USE_MAEMO  
   gtk_widget_set_tooltip_text(button, tooltip);  
 #endif  
   return button;  
103  }  }
104    
105  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 133  static gboolean map_gps_update(gpointer Line 114  static gboolean map_gps_update(gpointer
114    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
115    
116    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
117    gtk_widget_set_sensitive(context->gps, ok);    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
118                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
119    
120    if(ok) {    if(ok) {
121      float heading = NAN;      float heading = NAN;
# Line 161  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    
# Line 255  on_map_button_press_event(GtkWidget *wid Line 241  on_map_button_press_event(GtkWidget *wid
241                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
242    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
243    
244      /* check if we actually clicked parts of the OSD */
245      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
246        return FALSE;
247    
248    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
249    if(context->press_on != NULL) {    if(context->press_on != NULL) {
250      printf("PRESS: already\n");      printf("PRESS: already\n");
251      return TRUE;      return FALSE;
252    }    }
253    
254    pos_t pos =    pos_t pos =
# Line 297  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 287  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
287    cairo_paint(cr);    cairo_paint(cr);
288  }  }
289    
290    #ifndef BIG_BALLOONS
291  #define LINE_SKIP  7  #define LINE_SKIP  7
292    #else
293    #define LINE_SKIP  12
294    #endif
295    
296  static void  static void
297  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
298    cache_t *cache = (cache_t*)data;    cache_t *cache = (cache_t*)data;
299    
   //  printf("draw cb for \"%s\"\n", cache->name);  
   
300  #if 0  #if 0
301    /* draw pink background to check clipping */    /* draw pink background to check clipping */
302    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
# Line 329  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 321  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
321                              CAIRO_FONT_SLANT_NORMAL,                              CAIRO_FONT_SLANT_NORMAL,
322                              CAIRO_FONT_WEIGHT_BOLD);                              CAIRO_FONT_WEIGHT_BOLD);
323    
324    #ifndef BIG_BALLOONS
325      cairo_set_font_size (cr, 20.0);      cairo_set_font_size (cr, 20.0);
326    #else
327        cairo_set_font_size (cr, 36.0);
328    #endif
329    
330      cairo_text_extents (cr, cache->id, &extents);      cairo_text_extents (cr, cache->id, &extents);
331    
332      /* display id right of icon vertically centered */      /* display id right of icon vertically centered */
# Line 350  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 347  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
347    /* everything from here uses the same font */    /* everything from here uses the same font */
348    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
349                            CAIRO_FONT_WEIGHT_NORMAL);                            CAIRO_FONT_WEIGHT_NORMAL);
350    #ifndef BIG_BALLOONS
351    cairo_set_font_size (cr, 14.0);    cairo_set_font_size (cr, 14.0);
352    #else
353      cairo_set_font_size (cr, 22.0);
354    #endif
355    
356    if(cache->name) {    if(cache->name) {
357      /* draw cache name */      /* draw cache name */
# Line 455  static void on_window_destroy(GtkWidget Line 456  static void on_window_destroy(GtkWidget
456    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
457    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
458    
459      gint source;
460      g_object_get(map, "map-source", &source, NULL);
461      context->appdata->map.source = source;
462    
463  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
464    /* restore cur_view */    /* restore cur_view */
465    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 466  static void on_window_destroy(GtkWidget Line 471  static void on_window_destroy(GtkWidget
471    appdata->map.context = NULL;    appdata->map.context = NULL;
472  }  }
473    
474    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
475    /* get access to zoom buttons */
476    static void
477    on_window_realize(GtkWidget *widget, gpointer data) {
478      if (widget->window) {
479        unsigned char value = 1;
480        Atom hildon_zoom_key_atom =
481          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
482          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
483        Display *dpy =
484          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
485        Window w = GDK_WINDOW_XID(widget->window);
486    
487        XChangeProperty(dpy, w, hildon_zoom_key_atom,
488                        integer_atom, 8, PropModeReplace, &value, 1);
489      }
490    }
491    #endif
492    
493  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
494    map_context_t *context = NULL;    map_context_t *context = NULL;
495    
# Line 477  void map(appdata_t *appdata) { Line 501  void map(appdata_t *appdata) {
501    
502    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
503    context->appdata = appdata;    context->appdata = appdata;
504      context->map_complete = FALSE;
505    
506    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
507      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
508      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
509        printf("old file path %s exists\n", old_path);
510        rmdir_recursive(old_path);
511      }
512    
513      /* It is recommanded that all applications share these same */
514      /* map path, so data is only cached once. The path should be: */
515      /* ~/.osm-gps-map on standard PC     (users home) */
516      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
517      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
518    #if !defined(USE_MAEMO)
519      char *p = getenv("HOME");
520      if(!p) p = "/tmp";
521      char *path = g_strdup_printf("%s/.osm-gps-map", p);
522    #else
523    #if MAEMO_VERSION_MAJOR == 5
524      char *path = g_strdup("/home/user/.osm-gps-map");
525    #else
526      char *path = g_strdup("/media/mmc2/osm-gps-map");
527    #endif
528    #endif
529    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
530    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
531    
532      gint source = context->appdata->map.source;
533      if(!source) source = MAP_SOURCE;
534    
535    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
536                   "map-source",               MAP_SOURCE,                   "map-source",               source,
537                   "tile-cache",               path,                   "tile-cache",               path,
538                   "auto-center",              FALSE,                   "auto-center",              FALSE,
539                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 494  void map(appdata_t *appdata) { Line 543  void map(appdata_t *appdata) {
543    
544    g_free(path);    g_free(path);
545    
546      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
547    
548    char *name = NULL;    char *name = NULL;
549  #ifdef USE_MAEMO  #ifdef USE_MAEMO
550    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 518  void map(appdata_t *appdata) { Line 569  void map(appdata_t *appdata) {
569  #ifdef USE_MAEMO  #ifdef USE_MAEMO
570  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
571    context->window = hildon_stackable_window_new();    context->window = hildon_stackable_window_new();
572      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
573      /* at runtime with cygwin x */
574    #ifndef __i386__
575      g_signal_connect(G_OBJECT(context->window), "realize",
576                       G_CALLBACK(on_window_realize), NULL);
577    #endif // MAEMO_VERSION
578  #else  #else
579    context->window = hildon_window_new();    context->window = hildon_window_new();
580  #endif  #endif
# Line 542  void map(appdata_t *appdata) { Line 599  void map(appdata_t *appdata) {
599    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
600                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
601    
   gtk_box_pack_start_defaults(GTK_BOX(hbox), context->widget);  
   /* zoom button box */  
   GtkWidget *vbox = gtk_vbox_new(FALSE,0);  
   
   context->zoomin =  
     map_add_button(10, G_CALLBACK(cb_map_zoomin),  
                    context, _("Zoom in"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomin, FALSE, FALSE, 0);  
   
   context->zoomout =  
     map_add_button(11, G_CALLBACK(cb_map_zoomout),  
                    context, _("Zoom out"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomout, FALSE, FALSE, 0);  
   
   context->gps =  
     map_add_button(9, G_CALLBACK(cb_map_gps),  
                    context, _("Jump to GPS position"));  
   gtk_widget_set_sensitive(context->gps, FALSE);  
   
602    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
603    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
   gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);  
   
   gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  
604    
605  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
606    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 576  void map(appdata_t *appdata) { Line 611  void map(appdata_t *appdata) {
611    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
612                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
613    
614    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
615    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
616  }  }

Legend:
Removed from v.61  
changed lines
  Added in v.98