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 85 by harbaum, Fri Aug 28 12:07:16 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 120  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 266  static void Line 288  static void
288  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
289    cache_t *cache = (cache_t*)data;    cache_t *cache = (cache_t*)data;
290    
   //  printf("draw cb for \"%s\"\n", cache->name);  
   
291  #if 0  #if 0
292    /* draw pink background to check clipping */    /* draw pink background to check clipping */
293    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 458  static void on_window_destroy(GtkWidget
458    appdata->map.context = NULL;    appdata->map.context = NULL;
459  }  }
460    
461    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
462    /* get access to zoom buttons */
463    static void
464    on_window_realize(GtkWidget *widget, gpointer data) {
465      if (widget->window) {
466        unsigned char value = 1;
467        Atom hildon_zoom_key_atom =
468          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
469          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
470        Display *dpy =
471          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
472        Window w = GDK_WINDOW_XID(widget->window);
473    
474        XChangeProperty(dpy, w, hildon_zoom_key_atom,
475                        integer_atom, 8, PropModeReplace, &value, 1);
476      }
477    }
478    #endif
479    
480  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
481    map_context_t *context = NULL;    map_context_t *context = NULL;
482    
# Line 449  void map(appdata_t *appdata) { Line 488  void map(appdata_t *appdata) {
488    
489    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
490    context->appdata = appdata;    context->appdata = appdata;
491      context->map_complete = FALSE;
492    
493      /* cleanup old (pre 0.8.7) path if it exists */
494      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
495      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
496        printf("old file path %s exists\n", old_path);
497        rmdir_recursive(old_path);
498      }
499    
500      /* It is recommanded that all applications share these same */
501      /* map path, so data is only cached once. The path should be: */
502      /* ~/.osm-gps-map on standard PC     (users home) */
503      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
504      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
505    #if !defined(USE_MAEMO)
506      char *p = getenv("HOME");
507      if(!p) p = "/tmp";
508      char *path = g_strdup_printf("%s/.osm-gps-map", p);
509    #else
510    #if MAEMO_VERSION_MAJOR == 5
511      char *path = g_strdup("/home/user/.osm-gps-map");
512    #else
513      char *path = g_strdup("/media/mmc2/osm-gps-map");
514    #endif
515    #endif
516    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
517    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
518    
519    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 527  void map(appdata_t *appdata) {
527    
528    g_free(path);    g_free(path);
529    
530      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
531    
532    char *name = NULL;    char *name = NULL;
533  #ifdef USE_MAEMO  #ifdef USE_MAEMO
534    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 488  void map(appdata_t *appdata) { Line 553  void map(appdata_t *appdata) {
553  #ifdef USE_MAEMO  #ifdef USE_MAEMO
554  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
555    context->window = hildon_stackable_window_new();    context->window = hildon_stackable_window_new();
556      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
557      /* at runtime with cygwin x */
558    #ifndef __i386__
559      g_signal_connect(G_OBJECT(context->window), "realize",
560                       G_CALLBACK(on_window_realize), NULL);
561    #endif // MAEMO_VERSION
562  #else  #else
563    context->window = hildon_window_new();    context->window = hildon_window_new();
564  #endif  #endif
Legend:
Removed from v.66  
changed lines
  Added in v.85