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

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

revision 69 by harbaum, Thu Aug 20 18:54:06 2009 UTC revision 81 by harbaum, Tue Aug 25 13:21:45 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 67  static const char *get_proxy_uri(appdata Line 73  static const char *get_proxy_uri(appdata
73  }  }
74    
75  static void  static void
76  cb_map_gps(map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
77    pos_t *refpos = get_pos(context->appdata);    if(but == OSD_GPS) {
78    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      pos_t *refpos = get_pos(context->appdata);
79      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
80                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);        gint zoom;
81    } else {        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
82      /* no coordinates given: display the entire world */        if(zoom < 10)
83      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
84                                0.0, 0.0, 1);                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
85          else
86            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
87                                   refpos->lat, refpos->lon);
88    
89          /* re-enable centering */
90          g_object_set(context->widget, "auto-center", TRUE, NULL);
91        } else {
92          /* no coordinates given: display the entire world */
93          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
94                                    0.0, 0.0, 1);
95        }
96    }    }
97  }  }
98    
# Line 92  static gboolean map_gps_update(gpointer Line 109  static gboolean map_gps_update(gpointer
109    
110    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
111    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
112                   OSM_GPS_MAP_OSD_GPS_CALLBACK(ok?cb_map_gps:NULL), context);                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
113    
114    if(ok) {    if(ok) {
115      float heading = NAN;      float heading = NAN;
# Line 144  static gboolean on_map_configure(GtkWidg Line 161  static gboolean on_map_configure(GtkWidg
161                              context->appdata->map.pos.lat,                              context->appdata->map.pos.lat,
162                              context->appdata->map.pos.lon,                              context->appdata->map.pos.lon,
163                              context->appdata->map.zoom);                              context->appdata->map.zoom);
164    
165    return FALSE;    return FALSE;
166  }  }
167    
# Line 266  static void Line 283  static void
283  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
284    cache_t *cache = (cache_t*)data;    cache_t *cache = (cache_t*)data;
285    
   //  printf("draw cb for \"%s\"\n", cache->name);  
   
286  #if 0  #if 0
287    /* draw pink background to check clipping */    /* draw pink background to check clipping */
288    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 438  static void on_window_destroy(GtkWidget Line 453  static void on_window_destroy(GtkWidget
453    appdata->map.context = NULL;    appdata->map.context = NULL;
454  }  }
455    
456    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
457    /* get access to zoom buttons */
458    static void
459    on_window_realize(GtkWidget *widget, gpointer data) {
460      if (widget->window) {
461        unsigned char value = 1;
462        Atom hildon_zoom_key_atom =
463          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
464          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
465        Display *dpy =
466          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
467        Window w = GDK_WINDOW_XID(widget->window);
468    
469        XChangeProperty(dpy, w, hildon_zoom_key_atom,
470                        integer_atom, 8, PropModeReplace, &value, 1);
471      }
472    }
473    #endif
474    
475  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
476    map_context_t *context = NULL;    map_context_t *context = NULL;
477    
# Line 450  void map(appdata_t *appdata) { Line 484  void map(appdata_t *appdata) {
484    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
485    context->appdata = appdata;    context->appdata = appdata;
486    
487    char *path = g_strdup_printf("%s/map/", appdata->image_path);    /* cleanup old (pre 0.8.7) path if it exists */
488      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
489      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
490        printf("old file path %s exists\n", old_path);
491        rmdir_recursive(old_path);
492      }
493    
494      /* It is recommanded that all applications share these same */
495      /* map path, so data is only cached once. The path should be: */
496      /* ~/.osm-gps-map on standard PC     (users home) */
497      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
498      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
499    #if !defined(USE_MAEMO)
500      char *p = getenv("HOME");
501      if(!p) p = "/tmp";
502      char *path = g_strdup_printf("%s/.osm-gps-map", p);
503    #else
504    #if MAEMO_VERSION_MAJOR == 5
505      char *path = g_strdup("/home/user/.osm-gps-map");
506    #else
507      char *path = g_strdup("/media/mmc2/osm-gps-map");
508    #endif
509    #endif
510    
511    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
512    
513    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
# Line 464  void map(appdata_t *appdata) { Line 521  void map(appdata_t *appdata) {
521    
522    g_free(path);    g_free(path);
523    
524      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
525    
526    char *name = NULL;    char *name = NULL;
527  #ifdef USE_MAEMO  #ifdef USE_MAEMO
528    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 488  void map(appdata_t *appdata) { Line 547  void map(appdata_t *appdata) {
547  #ifdef USE_MAEMO  #ifdef USE_MAEMO
548  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
549    context->window = hildon_stackable_window_new();    context->window = hildon_stackable_window_new();
550      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
551      /* at runtime with cygwin x */
552    #ifndef __i386__
553      g_signal_connect(G_OBJECT(context->window), "realize",
554                       G_CALLBACK(on_window_realize), NULL);
555    #endif // MAEMO_VERSION
556  #else  #else
557    context->window = hildon_window_new();    context->window = hildon_window_new();
558  #endif  #endif
Legend:
Removed from v.69  
changed lines
  Added in v.81