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 84 by harbaum, Fri Aug 28 07:52:01 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  #endif
28    
29  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
30    #include <gdk/gdkx.h>
31    #include <X11/Xatom.h>
32    #endif
33    
34    // #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
35    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
36  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
37    
38  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 66  static const char *get_proxy_uri(appdata Line 73  static const char *get_proxy_uri(appdata
73    return NULL;    return NULL;
74  }  }
75    
76  static void map_zoom(map_context_t *context, int step) {  static void
77    gint zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
78    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(but == OSD_GPS) {
79    g_object_get(map, "zoom", &zoom, NULL);      pos_t *refpos = get_pos(context->appdata);
80    zoom = osm_gps_map_set_zoom(map, zoom+step);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
81          gint zoom;
82    /* enable/disable zoom buttons as required */        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
83    gtk_widget_set_sensitive(context->zoomin,        if(zoom < 10)
84             zoom < osm_gps_map_source_get_max_zoom(MAP_SOURCE));          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
85    gtk_widget_set_sensitive(context->zoomout,                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
86             zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));        else
87            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
88    /* 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;  
 }  
89    
90  static gboolean        /* re-enable centering */
91  cb_map_gps(GtkButton *button, map_context_t *context) {        g_object_set(context->widget, "auto-center", TRUE, NULL);
92    pos_t *refpos = get_pos(context->appdata);      } else {
93    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        /* no coordinates given: display the entire world */
94      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
95                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);                                  0.0, 0.0, 1);
96    } else {      }
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
97    }    }
   
   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;  
98  }  }
99    
100  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 109  static gboolean map_gps_update(gpointer
109    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
110    
111    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
112    gtk_widget_set_sensitive(context->gps, ok);    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
113                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
114    
115    if(ok) {    if(ok) {
116      float heading = NAN;      float heading = NAN;
# Line 185  static gboolean on_map_configure(GtkWidg Line 162  static gboolean on_map_configure(GtkWidg
162                              context->appdata->map.pos.lat,                              context->appdata->map.pos.lat,
163                              context->appdata->map.pos.lon,                              context->appdata->map.pos.lon,
164                              context->appdata->map.zoom);                              context->appdata->map.zoom);
165    
166    return FALSE;    return FALSE;
167  }  }
168    
# Line 297  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 274  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
274    cairo_paint(cr);    cairo_paint(cr);
275  }  }
276    
277    #ifndef BIG_BALLOONS
278  #define LINE_SKIP  7  #define LINE_SKIP  7
279    #else
280    #define LINE_SKIP  12
281    #endif
282    
283  static void  static void
284  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
285    cache_t *cache = (cache_t*)data;    cache_t *cache = (cache_t*)data;
286    
   //  printf("draw cb for \"%s\"\n", cache->name);  
   
287  #if 0  #if 0
288    /* draw pink background to check clipping */    /* draw pink background to check clipping */
289    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 308  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
308                              CAIRO_FONT_SLANT_NORMAL,                              CAIRO_FONT_SLANT_NORMAL,
309                              CAIRO_FONT_WEIGHT_BOLD);                              CAIRO_FONT_WEIGHT_BOLD);
310    
311    #ifndef BIG_BALLOONS
312      cairo_set_font_size (cr, 20.0);      cairo_set_font_size (cr, 20.0);
313    #else
314        cairo_set_font_size (cr, 36.0);
315    #endif
316    
317      cairo_text_extents (cr, cache->id, &extents);      cairo_text_extents (cr, cache->id, &extents);
318    
319      /* display id right of icon vertically centered */      /* display id right of icon vertically centered */
# Line 350  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 334  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
334    /* everything from here uses the same font */    /* everything from here uses the same font */
335    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
336                            CAIRO_FONT_WEIGHT_NORMAL);                            CAIRO_FONT_WEIGHT_NORMAL);
337    #ifndef BIG_BALLOONS
338    cairo_set_font_size (cr, 14.0);    cairo_set_font_size (cr, 14.0);
339    #else
340      cairo_set_font_size (cr, 22.0);
341    #endif
342    
343    if(cache->name) {    if(cache->name) {
344      /* draw cache name */      /* draw cache name */
# Line 466  static void on_window_destroy(GtkWidget Line 454  static void on_window_destroy(GtkWidget
454    appdata->map.context = NULL;    appdata->map.context = NULL;
455  }  }
456    
457    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
458    /* get access to zoom buttons */
459    static void
460    on_window_realize(GtkWidget *widget, gpointer data) {
461      if (widget->window) {
462        unsigned char value = 1;
463        Atom hildon_zoom_key_atom =
464          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
465          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
466        Display *dpy =
467          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
468        Window w = GDK_WINDOW_XID(widget->window);
469    
470        XChangeProperty(dpy, w, hildon_zoom_key_atom,
471                        integer_atom, 8, PropModeReplace, &value, 1);
472      }
473    }
474    #endif
475    
476  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
477    map_context_t *context = NULL;    map_context_t *context = NULL;
478    
# Line 478  void map(appdata_t *appdata) { Line 485  void map(appdata_t *appdata) {
485    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
486    context->appdata = appdata;    context->appdata = appdata;
487    
488    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
489      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
490      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
491        printf("old file path %s exists\n", old_path);
492        rmdir_recursive(old_path);
493      }
494    
495      /* It is recommanded that all applications share these same */
496      /* map path, so data is only cached once. The path should be: */
497      /* ~/.osm-gps-map on standard PC     (users home) */
498      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
499      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
500    #if !defined(USE_MAEMO)
501      char *p = getenv("HOME");
502      if(!p) p = "/tmp";
503      char *path = g_strdup_printf("%s/.osm-gps-map", p);
504    #else
505    #if MAEMO_VERSION_MAJOR == 5
506      char *path = g_strdup("/home/user/.osm-gps-map");
507    #else
508      char *path = g_strdup("/media/mmc2/osm-gps-map");
509    #endif
510    #endif
511    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
512    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
513    
514    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 522  void map(appdata_t *appdata) {
522    
523    g_free(path);    g_free(path);
524    
525      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
526    
527    char *name = NULL;    char *name = NULL;
528  #ifdef USE_MAEMO  #ifdef USE_MAEMO
529    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 518  void map(appdata_t *appdata) { Line 548  void map(appdata_t *appdata) {
548  #ifdef USE_MAEMO  #ifdef USE_MAEMO
549  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
550    context->window = hildon_stackable_window_new();    context->window = hildon_stackable_window_new();
551      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
552      /* at runtime with cygwin x */
553    #ifndef __i386__
554      g_signal_connect(G_OBJECT(context->window), "realize",
555                       G_CALLBACK(on_window_realize), NULL);
556    #endif // MAEMO_VERSION
557  #else  #else
558    context->window = hildon_window_new();    context->window = hildon_window_new();
559  #endif  #endif
# Line 542  void map(appdata_t *appdata) { Line 578  void map(appdata_t *appdata) {
578    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
579                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
580    
   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);  
   
581    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
582    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);  
583    
584  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
585    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 576  void map(appdata_t *appdata) { Line 590  void map(appdata_t *appdata) {
590    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
591                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
592    
593    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
594    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
595  }  }
Legend:
Removed from v.61  
changed lines
  Added in v.84