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

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

revision 66 by harbaum, Wed Aug 19 20:03:28 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 67  static const char *get_proxy_uri(appdata Line 74  static const char *get_proxy_uri(appdata
74  }  }
75    
76  static void  static void
77  cb_map_gps(map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
78    pos_t *refpos = get_pos(context->appdata);    if(but == OSD_GPS) {
79    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      pos_t *refpos = get_pos(context->appdata);
80      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
81                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);        gint zoom;
82    } else {        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
83      /* no coordinates given: display the entire world */        if(zoom < 10)
84      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
85                                0.0, 0.0, 1);                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
86          else
87            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
88                                   refpos->lat, refpos->lon);
89    
90          /* re-enable centering */
91          g_object_set(context->widget, "auto-center", TRUE, NULL);
92        } else {
93          /* no coordinates given: display the entire world */
94          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
95                                    0.0, 0.0, 1);
96        }
97    }    }
98  }  }
99    
# Line 92  static gboolean map_gps_update(gpointer Line 110  static gboolean map_gps_update(gpointer
110    
111    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
112    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
113                                OSM_GPS_MAP_OSD_GPS_CALLBACK(ok?cb_map_gps:NULL), context);                   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 144  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 266  static void Line 284  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 438  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 450  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    char *path = g_strdup_printf("%s/map/", appdata->image_path);    /* 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    
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 464  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 488  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
Legend:
Removed from v.66  
changed lines
  Added in v.84