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 77 by harbaum, Tue Aug 25 12:49:03 2009 UTC
# Line 23  Line 23 
23    
24  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
25  #include "osm-gps-map.h"  #include "osm-gps-map.h"
26    #include "osm-gps-map-osd-classic.h"
27    #endif
28    
29    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
30    #include <gdk/gdkx.h>
31    #include <X11/Xatom.h>
32  #endif  #endif
33    
34  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
# Line 66  static const char *get_proxy_uri(appdata Line 72  static const char *get_proxy_uri(appdata
72    return NULL;    return NULL;
73  }  }
74    
75  static void map_zoom(map_context_t *context, int step) {  static void
76    gint zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
77    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(but == OSD_GPS) {
78    g_object_get(map, "zoom", &zoom, NULL);      pos_t *refpos = get_pos(context->appdata);
79    zoom = osm_gps_map_set_zoom(map, zoom+step);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
80          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
81    /* enable/disable zoom buttons as required */                                  refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
82    gtk_widget_set_sensitive(context->zoomin,        /* re-enable centering */
83             zoom < osm_gps_map_source_get_max_zoom(MAP_SOURCE));        g_object_set(context->widget, "auto-center", TRUE, NULL);
84    gtk_widget_set_sensitive(context->zoomout,      } else {
85             zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));        /* no coordinates given: display the entire world */
86          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
87    /* save new zoom */                                  0.0, 0.0, 1);
88    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;  
 }  
   
 static gboolean  
 cb_map_gps(GtkButton *button, map_context_t *context) {  
   pos_t *refpos = get_pos(context->appdata);  
   if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                       refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);  
   } else {  
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
89    }    }
   
   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;  
90  }  }
91    
92  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 101  static gboolean map_gps_update(gpointer
101    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
102    
103    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
104    gtk_widget_set_sensitive(context->gps, ok);    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
105                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
106    
107    if(ok) {    if(ok) {
108      float heading = NAN;      float heading = NAN;
# Line 185  static gboolean on_map_configure(GtkWidg Line 154  static gboolean on_map_configure(GtkWidg
154                              context->appdata->map.pos.lat,                              context->appdata->map.pos.lat,
155                              context->appdata->map.pos.lon,                              context->appdata->map.pos.lon,
156                              context->appdata->map.zoom);                              context->appdata->map.zoom);
157    
158    return FALSE;    return FALSE;
159  }  }
160    
# Line 297  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 266  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
266    cairo_paint(cr);    cairo_paint(cr);
267  }  }
268    
269    #ifndef BIG_BALLOONS
270  #define LINE_SKIP  7  #define LINE_SKIP  7
271    #else
272    #define LINE_SKIP  12
273    #endif
274    
275  static void  static void
276  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
277    cache_t *cache = (cache_t*)data;    cache_t *cache = (cache_t*)data;
278    
   //  printf("draw cb for \"%s\"\n", cache->name);  
   
279  #if 0  #if 0
280    /* draw pink background to check clipping */    /* draw pink background to check clipping */
281    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 300  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
300                              CAIRO_FONT_SLANT_NORMAL,                              CAIRO_FONT_SLANT_NORMAL,
301                              CAIRO_FONT_WEIGHT_BOLD);                              CAIRO_FONT_WEIGHT_BOLD);
302    
303    #ifndef BIG_BALLOONS
304      cairo_set_font_size (cr, 20.0);      cairo_set_font_size (cr, 20.0);
305    #else
306        cairo_set_font_size (cr, 36.0);
307    #endif
308    
309      cairo_text_extents (cr, cache->id, &extents);      cairo_text_extents (cr, cache->id, &extents);
310    
311      /* display id right of icon vertically centered */      /* display id right of icon vertically centered */
# Line 350  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 326  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
326    /* everything from here uses the same font */    /* everything from here uses the same font */
327    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
328                            CAIRO_FONT_WEIGHT_NORMAL);                            CAIRO_FONT_WEIGHT_NORMAL);
329    #ifndef BIG_BALLOONS
330    cairo_set_font_size (cr, 14.0);    cairo_set_font_size (cr, 14.0);
331    #else
332      cairo_set_font_size (cr, 22.0);
333    #endif
334    
335    if(cache->name) {    if(cache->name) {
336      /* draw cache name */      /* draw cache name */
# Line 466  static void on_window_destroy(GtkWidget Line 446  static void on_window_destroy(GtkWidget
446    appdata->map.context = NULL;    appdata->map.context = NULL;
447  }  }
448    
449    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
450    /* get access to zoom buttons */
451    static void
452    on_window_realize(GtkWidget *widget, gpointer data) {
453      if (widget->window) {
454        unsigned char value = 1;
455        Atom hildon_zoom_key_atom =
456          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
457          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
458        Display *dpy =
459          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
460        Window w = GDK_WINDOW_XID(widget->window);
461    
462        XChangeProperty(dpy, w, hildon_zoom_key_atom,
463                        integer_atom, 8, PropModeReplace, &value, 1);
464      }
465    }
466    #endif
467    
468  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
469    map_context_t *context = NULL;    map_context_t *context = NULL;
470    
# Line 478  void map(appdata_t *appdata) { Line 477  void map(appdata_t *appdata) {
477    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
478    context->appdata = appdata;    context->appdata = appdata;
479    
480    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
481      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
482      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
483        printf("old file path %s exists\n", old_path);
484        rmdir_recursive(old_path);
485      }
486    
487      /* It is recommanded that all applications share these same */
488      /* map path, so data is only cached once. The path should be: */
489      /* ~/.osm-gps-map on standard PC     (users home) */
490      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
491      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
492    #if !defined(USE_MAEMO)
493      char *p = getenv("HOME");
494      if(!p) p = "/tmp";
495      char *path = g_strdup_printf("%s/.osm-gps-map", p);
496    #else
497    #if MAEMO_VERSION_MAJOR == 5
498      char *path = g_strdup("/home/user/.osm-gps-map");
499    #else
500      char *path = g_strdup("/media/mmc2/osm-gps-map");
501    #endif
502    #endif
503    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
504    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
505    
506    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
# Line 494  void map(appdata_t *appdata) { Line 514  void map(appdata_t *appdata) {
514    
515    g_free(path);    g_free(path);
516    
517      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
518    
519    char *name = NULL;    char *name = NULL;
520  #ifdef USE_MAEMO  #ifdef USE_MAEMO
521    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 518  void map(appdata_t *appdata) { Line 540  void map(appdata_t *appdata) {
540  #ifdef USE_MAEMO  #ifdef USE_MAEMO
541  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
542    context->window = hildon_stackable_window_new();    context->window = hildon_stackable_window_new();
543      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
544      /* at runtime with cygwin x */
545    #ifndef __i386__
546      g_signal_connect(G_OBJECT(context->window), "realize",
547                       G_CALLBACK(on_window_realize), NULL);
548    #endif // MAEMO_VERSION
549  #else  #else
550    context->window = hildon_window_new();    context->window = hildon_window_new();
551  #endif  #endif
# Line 542  void map(appdata_t *appdata) { Line 570  void map(appdata_t *appdata) {
570    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
571                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
572    
   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);  
   
573    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
574    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);  
575    
576  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
577    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 576  void map(appdata_t *appdata) { Line 582  void map(appdata_t *appdata) {
582    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
583                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
584    
585    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
586    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
587  }  }
Legend:
Removed from v.61  
changed lines
  Added in v.77