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 86 by harbaum, Sun Aug 30 19:05:44 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 161  static gboolean on_map_configure(GtkWidg Line 138  static gboolean on_map_configure(GtkWidg
138                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
139                                   map_context_t *context) {                                   map_context_t *context) {
140    
141    /* set default values if they are invalid */    if(!context->map_complete) {
142    if(!context->appdata->map.zoom ||  
143       isnan(context->appdata->map.pos.lat) ||      /* set default values if they are invalid */
144       isnan(context->appdata->map.pos.lon)) {      if(!context->appdata->map.zoom ||
145      printf("no valid map position found\n");         isnan(context->appdata->map.pos.lat) ||
146           isnan(context->appdata->map.pos.lon)) {
147      pos_t *refpos = get_pos(context->appdata);        printf("no valid map position found\n");
148      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
149        /* use gps position if present */        pos_t *refpos = get_pos(context->appdata);
150        context->appdata->map.pos = *refpos;        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
151        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          /* use gps position if present */
152      } else {          context->appdata->map.pos = *refpos;
153        /* use world map otherwise */          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
154        context->appdata->map.pos.lat = 0.0;        } else {
155        context->appdata->map.pos.lon = 0.0;          /* use world map otherwise */
156        context->appdata->map.zoom = 1;          context->appdata->map.pos.lat = 0.0;
157            context->appdata->map.pos.lon = 0.0;
158            context->appdata->map.zoom = 1;
159          }
160      }      }
161    
162        /* jump to initial position */
163        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
164                                  context->appdata->map.pos.lat,
165                                  context->appdata->map.pos.lon,
166                                  context->appdata->map.zoom);
167        context->map_complete = TRUE;
168    }    }
169    
   /* 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);  
   
170    return FALSE;    return FALSE;
171  }  }
172    
# Line 255  on_map_button_press_event(GtkWidget *wid Line 236  on_map_button_press_event(GtkWidget *wid
236                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
237    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
238    
239      /* check if we actually clicked parts of the OSD */
240      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
241        return FALSE;
242    
243    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
244    if(context->press_on != NULL) {    if(context->press_on != NULL) {
245      printf("PRESS: already\n");      printf("PRESS: already\n");
246      return TRUE;      return FALSE;
247    }    }
248    
249    pos_t pos =    pos_t pos =
# Line 297  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 282  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
282    cairo_paint(cr);    cairo_paint(cr);
283  }  }
284    
285    #ifndef BIG_BALLOONS
286  #define LINE_SKIP  7  #define LINE_SKIP  7
287    #else
288    #define LINE_SKIP  12
289    #endif
290    
291  static void  static void
292  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
293    cache_t *cache = (cache_t*)data;    cache_t *cache = (cache_t*)data;
294    
   //  printf("draw cb for \"%s\"\n", cache->name);  
   
295  #if 0  #if 0
296    /* draw pink background to check clipping */    /* draw pink background to check clipping */
297    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 316  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
316                              CAIRO_FONT_SLANT_NORMAL,                              CAIRO_FONT_SLANT_NORMAL,
317                              CAIRO_FONT_WEIGHT_BOLD);                              CAIRO_FONT_WEIGHT_BOLD);
318    
319    #ifndef BIG_BALLOONS
320      cairo_set_font_size (cr, 20.0);      cairo_set_font_size (cr, 20.0);
321    #else
322        cairo_set_font_size (cr, 36.0);
323    #endif
324    
325      cairo_text_extents (cr, cache->id, &extents);      cairo_text_extents (cr, cache->id, &extents);
326    
327      /* display id right of icon vertically centered */      /* display id right of icon vertically centered */
# Line 350  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 342  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
342    /* everything from here uses the same font */    /* everything from here uses the same font */
343    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
344                            CAIRO_FONT_WEIGHT_NORMAL);                            CAIRO_FONT_WEIGHT_NORMAL);
345    #ifndef BIG_BALLOONS
346    cairo_set_font_size (cr, 14.0);    cairo_set_font_size (cr, 14.0);
347    #else
348      cairo_set_font_size (cr, 22.0);
349    #endif
350    
351    if(cache->name) {    if(cache->name) {
352      /* draw cache name */      /* draw cache name */
# Line 466  static void on_window_destroy(GtkWidget Line 462  static void on_window_destroy(GtkWidget
462    appdata->map.context = NULL;    appdata->map.context = NULL;
463  }  }
464    
465    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
466    /* get access to zoom buttons */
467    static void
468    on_window_realize(GtkWidget *widget, gpointer data) {
469      if (widget->window) {
470        unsigned char value = 1;
471        Atom hildon_zoom_key_atom =
472          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
473          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
474        Display *dpy =
475          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
476        Window w = GDK_WINDOW_XID(widget->window);
477    
478        XChangeProperty(dpy, w, hildon_zoom_key_atom,
479                        integer_atom, 8, PropModeReplace, &value, 1);
480      }
481    }
482    #endif
483    
484  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
485    map_context_t *context = NULL;    map_context_t *context = NULL;
486    
# Line 477  void map(appdata_t *appdata) { Line 492  void map(appdata_t *appdata) {
492    
493    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
494    context->appdata = appdata;    context->appdata = appdata;
495      context->map_complete = FALSE;
496    
497    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
498      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
499      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
500        printf("old file path %s exists\n", old_path);
501        rmdir_recursive(old_path);
502      }
503    
504      /* It is recommanded that all applications share these same */
505      /* map path, so data is only cached once. The path should be: */
506      /* ~/.osm-gps-map on standard PC     (users home) */
507      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
508      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
509    #if !defined(USE_MAEMO)
510      char *p = getenv("HOME");
511      if(!p) p = "/tmp";
512      char *path = g_strdup_printf("%s/.osm-gps-map", p);
513    #else
514    #if MAEMO_VERSION_MAJOR == 5
515      char *path = g_strdup("/home/user/.osm-gps-map");
516    #else
517      char *path = g_strdup("/media/mmc2/osm-gps-map");
518    #endif
519    #endif
520    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
521    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
522    
523    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 531  void map(appdata_t *appdata) {
531    
532    g_free(path);    g_free(path);
533    
534      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
535    
536    char *name = NULL;    char *name = NULL;
537  #ifdef USE_MAEMO  #ifdef USE_MAEMO
538    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 518  void map(appdata_t *appdata) { Line 557  void map(appdata_t *appdata) {
557  #ifdef USE_MAEMO  #ifdef USE_MAEMO
558  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
559    context->window = hildon_stackable_window_new();    context->window = hildon_stackable_window_new();
560      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
561      /* at runtime with cygwin x */
562    #ifndef __i386__
563      g_signal_connect(G_OBJECT(context->window), "realize",
564                       G_CALLBACK(on_window_realize), NULL);
565    #endif // MAEMO_VERSION
566  #else  #else
567    context->window = hildon_window_new();    context->window = hildon_window_new();
568  #endif  #endif
# Line 542  void map(appdata_t *appdata) { Line 587  void map(appdata_t *appdata) {
587    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
588                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
589    
   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);  
   
590    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
591    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);  
592    
593  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
594    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 576  void map(appdata_t *appdata) { Line 599  void map(appdata_t *appdata) {
599    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
600                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
601    
602    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
603    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
604  }  }
Legend:
Removed from v.61  
changed lines
  Added in v.86