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 89 by harbaum, Tue Sep 1 11:16:30 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 MAP_SOURCE  OSM_GPS_MAP_SOURCE_GOOGLE_STREET
37  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
38    
39  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 67  static const char *get_proxy_uri(appdata Line 75  static const char *get_proxy_uri(appdata
75  }  }
76    
77  static void  static void
78  cb_map_gps(map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
79    pos_t *refpos = get_pos(context->appdata);    if(but == OSD_GPS) {
80    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      pos_t *refpos = get_pos(context->appdata);
81      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
82                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);        gint zoom;
83    } else {        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
84      /* no coordinates given: display the entire world */        if(zoom < 10)
85      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
86                                0.0, 0.0, 1);                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
87          else
88            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
89                                   refpos->lat, refpos->lon);
90    
91          /* re-enable centering */
92          g_object_set(context->widget, "auto-center", TRUE, NULL);
93        } else {
94          /* no coordinates given: display the entire world */
95          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
96                                    0.0, 0.0, 1);
97        }
98    }    }
99  }  }
100    
# Line 92  static gboolean map_gps_update(gpointer Line 111  static gboolean map_gps_update(gpointer
111    
112    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
113    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
114                                OSM_GPS_MAP_OSD_GPS_CALLBACK(ok?cb_map_gps:NULL), context);                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
115    
116    if(ok) {    if(ok) {
117      float heading = NAN;      float heading = NAN;
# Line 120  static gboolean on_map_configure(GtkWidg Line 139  static gboolean on_map_configure(GtkWidg
139                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
140                                   map_context_t *context) {                                   map_context_t *context) {
141    
142    /* set default values if they are invalid */    if(!context->map_complete) {
143    if(!context->appdata->map.zoom ||  
144       isnan(context->appdata->map.pos.lat) ||      /* set default values if they are invalid */
145       isnan(context->appdata->map.pos.lon)) {      if(!context->appdata->map.zoom ||
146      printf("no valid map position found\n");         isnan(context->appdata->map.pos.lat) ||
147           isnan(context->appdata->map.pos.lon)) {
148      pos_t *refpos = get_pos(context->appdata);        printf("no valid map position found\n");
149      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
150        /* use gps position if present */        pos_t *refpos = get_pos(context->appdata);
151        context->appdata->map.pos = *refpos;        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
152        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          /* use gps position if present */
153      } else {          context->appdata->map.pos = *refpos;
154        /* use world map otherwise */          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
155        context->appdata->map.pos.lat = 0.0;        } else {
156        context->appdata->map.pos.lon = 0.0;          /* use world map otherwise */
157        context->appdata->map.zoom = 1;          context->appdata->map.pos.lat = 0.0;
158            context->appdata->map.pos.lon = 0.0;
159            context->appdata->map.zoom = 1;
160          }
161      }      }
162    
163        /* jump to initial position */
164        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
165                                  context->appdata->map.pos.lat,
166                                  context->appdata->map.pos.lon,
167                                  context->appdata->map.zoom);
168        context->map_complete = TRUE;
169    }    }
170    
   /* 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);  
   
171    return FALSE;    return FALSE;
172  }  }
173    
# Line 214  on_map_button_press_event(GtkWidget *wid Line 237  on_map_button_press_event(GtkWidget *wid
237                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
238    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
239    
240      /* check if we actually clicked parts of the OSD */
241      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
242        return FALSE;
243    
244    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
245    if(context->press_on != NULL) {    if(context->press_on != NULL) {
246      printf("PRESS: already\n");      printf("PRESS: already\n");
247      return TRUE;      return FALSE;
248    }    }
249    
250    pos_t pos =    pos_t pos =
# Line 266  static void Line 293  static void
293  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
294    cache_t *cache = (cache_t*)data;    cache_t *cache = (cache_t*)data;
295    
   //  printf("draw cb for \"%s\"\n", cache->name);  
   
296  #if 0  #if 0
297    /* draw pink background to check clipping */    /* draw pink background to check clipping */
298    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 427  static void on_window_destroy(GtkWidget Line 452  static void on_window_destroy(GtkWidget
452    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
453    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
454    
455      gint source;
456      g_object_get(map, "map-source", &source, NULL);
457      context->appdata->map.source = source;
458    
459  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
460    /* restore cur_view */    /* restore cur_view */
461    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 438  static void on_window_destroy(GtkWidget Line 467  static void on_window_destroy(GtkWidget
467    appdata->map.context = NULL;    appdata->map.context = NULL;
468  }  }
469    
470    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
471    /* get access to zoom buttons */
472    static void
473    on_window_realize(GtkWidget *widget, gpointer data) {
474      if (widget->window) {
475        unsigned char value = 1;
476        Atom hildon_zoom_key_atom =
477          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
478          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
479        Display *dpy =
480          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
481        Window w = GDK_WINDOW_XID(widget->window);
482    
483        XChangeProperty(dpy, w, hildon_zoom_key_atom,
484                        integer_atom, 8, PropModeReplace, &value, 1);
485      }
486    }
487    #endif
488    
489  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
490    map_context_t *context = NULL;    map_context_t *context = NULL;
491    
# Line 449  void map(appdata_t *appdata) { Line 497  void map(appdata_t *appdata) {
497    
498    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
499    context->appdata = appdata;    context->appdata = appdata;
500      context->map_complete = FALSE;
501    
502      /* cleanup old (pre 0.8.7) path if it exists */
503      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
504      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
505        printf("old file path %s exists\n", old_path);
506        rmdir_recursive(old_path);
507      }
508    
509      /* It is recommanded that all applications share these same */
510      /* map path, so data is only cached once. The path should be: */
511      /* ~/.osm-gps-map on standard PC     (users home) */
512      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
513      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
514    #if !defined(USE_MAEMO)
515      char *p = getenv("HOME");
516      if(!p) p = "/tmp";
517      char *path = g_strdup_printf("%s/.osm-gps-map", p);
518    #else
519    #if MAEMO_VERSION_MAJOR == 5
520      char *path = g_strdup("/home/user/.osm-gps-map");
521    #else
522      char *path = g_strdup("/media/mmc2/osm-gps-map");
523    #endif
524    #endif
525    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
526    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
527    
528      gint source = context->appdata->map.source;
529      if(!source) source = MAP_SOURCE;
530    
531    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
532                   "map-source",               MAP_SOURCE,                   "map-source",               source,
533                   "tile-cache",               path,                   "tile-cache",               path,
534                   "auto-center",              FALSE,                   "auto-center",              FALSE,
535                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 464  void map(appdata_t *appdata) { Line 539  void map(appdata_t *appdata) {
539    
540    g_free(path);    g_free(path);
541    
542      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
543    
544    char *name = NULL;    char *name = NULL;
545  #ifdef USE_MAEMO  #ifdef USE_MAEMO
546    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 488  void map(appdata_t *appdata) { Line 565  void map(appdata_t *appdata) {
565  #ifdef USE_MAEMO  #ifdef USE_MAEMO
566  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
567    context->window = hildon_stackable_window_new();    context->window = hildon_stackable_window_new();
568      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
569      /* at runtime with cygwin x */
570    #ifndef __i386__
571      g_signal_connect(G_OBJECT(context->window), "realize",
572                       G_CALLBACK(on_window_realize), NULL);
573    #endif // MAEMO_VERSION
574  #else  #else
575    context->window = hildon_window_new();    context->window = hildon_window_new();
576  #endif  #endif
Legend:
Removed from v.66  
changed lines
  Added in v.89