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 112 by harbaum, Tue Sep 15 13:52:04 2009 UTC
# Line 17  Line 17 
17   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
18   */   */
19    
20    /*
21     * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png  8-15
22     * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23     */
24    
25  #include "gpxview.h"  #include "gpxview.h"
26  #include "converter.h"  #include "converter.h"
27  #include <math.h>    // for isnan  #include <math.h>    // for isnan
28    
29  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
30  #include "osm-gps-map.h"  #include "osm-gps-map.h"
31    #include "osm-gps-map-osd-classic.h"
32  #endif  #endif
33    
34  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
35    #include <gdk/gdkx.h>
36    #include <X11/Xatom.h>
37    #endif
38    
39    /* default values */
40    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
41  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
42    
43  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 67  static const char *get_proxy_uri(appdata Line 79  static const char *get_proxy_uri(appdata
79  }  }
80    
81  static void  static void
82  cb_map_gps(map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
83    pos_t *refpos = get_pos(context->appdata);    if(but == OSD_GPS) {
84    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      pos_t *refpos = get_pos(context->appdata);
85      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
86                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);        gint zoom;
87    } else {        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
88      /* no coordinates given: display the entire world */        if(zoom < 10)
89      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
90                                0.0, 0.0, 1);                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
91          else
92            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
93                                   refpos->lat, refpos->lon);
94    
95          /* re-enable centering */
96          g_object_set(context->widget, "auto-center", TRUE, NULL);
97        } else {
98          /* no coordinates given: display the entire world */
99          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
100                                    0.0, 0.0, 1);
101        }
102    }    }
103  }  }
104    
# Line 92  static gboolean map_gps_update(gpointer Line 115  static gboolean map_gps_update(gpointer
115    
116    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
117    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
118                                OSM_GPS_MAP_OSD_GPS_CALLBACK(ok?cb_map_gps:NULL), context);                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
119    
120    if(ok) {    if(ok) {
121      float heading = NAN;      float heading = NAN;
# Line 120  static gboolean on_map_configure(GtkWidg Line 143  static gboolean on_map_configure(GtkWidg
143                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
144                                   map_context_t *context) {                                   map_context_t *context) {
145    
146    /* set default values if they are invalid */    if(!context->map_complete) {
147    if(!context->appdata->map.zoom ||  
148       isnan(context->appdata->map.pos.lat) ||      /* set default values if they are invalid */
149       isnan(context->appdata->map.pos.lon)) {      if(!context->appdata->map.zoom ||
150      printf("no valid map position found\n");         isnan(context->appdata->map.pos.lat) ||
151           isnan(context->appdata->map.pos.lon)) {
152      pos_t *refpos = get_pos(context->appdata);        printf("no valid map position found\n");
153      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
154        /* use gps position if present */        pos_t *refpos = get_pos(context->appdata);
155        context->appdata->map.pos = *refpos;        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
156        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          /* use gps position if present */
157      } else {          context->appdata->map.pos = *refpos;
158        /* use world map otherwise */          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
159        context->appdata->map.pos.lat = 0.0;        } else {
160        context->appdata->map.pos.lon = 0.0;          /* use world map otherwise */
161        context->appdata->map.zoom = 1;          context->appdata->map.pos.lat = 0.0;
162            context->appdata->map.pos.lon = 0.0;
163            context->appdata->map.zoom = 1;
164          }
165      }      }
166    
167        /* jump to initial position */
168        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
169                                  context->appdata->map.pos.lat,
170                                  context->appdata->map.pos.lon,
171                                  context->appdata->map.zoom);
172        context->map_complete = TRUE;
173    }    }
174    
   /* 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);  
   
175    return FALSE;    return FALSE;
176  }  }
177    
# Line 214  on_map_button_press_event(GtkWidget *wid Line 241  on_map_button_press_event(GtkWidget *wid
241                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
242    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
243    
244      /* check if we actually clicked parts of the OSD */
245      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
246        return FALSE;
247    
248    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
249    if(context->press_on != NULL) {    if(context->press_on != NULL) {
250      printf("PRESS: already\n");      printf("PRESS: already\n");
251      return TRUE;      return FALSE;
252    }    }
253    
254    pos_t pos =    pos_t pos =
# Line 266  static void Line 297  static void
297  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
298    cache_t *cache = (cache_t*)data;    cache_t *cache = (cache_t*)data;
299    
   //  printf("draw cb for \"%s\"\n", cache->name);  
   
300  #if 0  #if 0
301    /* draw pink background to check clipping */    /* draw pink background to check clipping */
302    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 395  on_map_button_release_event(GtkWidget *w Line 424  on_map_button_release_event(GtkWidget *w
424        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
425        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
426    
427          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          osm_gps_map_osd_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
428                                   balloon_draw_cb, nearest);                                       balloon_draw_cb, nearest);
429        }        }
430      }      }
431      context->press_on = NULL;      context->press_on = NULL;
# Line 427  static void on_window_destroy(GtkWidget Line 456  static void on_window_destroy(GtkWidget
456    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
457    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
458    
459      gint source;
460      g_object_get(map, "map-source", &source, NULL);
461      context->appdata->map.source = source;
462    
463  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
464    /* restore cur_view */    /* restore cur_view */
465    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 438  static void on_window_destroy(GtkWidget Line 471  static void on_window_destroy(GtkWidget
471    appdata->map.context = NULL;    appdata->map.context = NULL;
472  }  }
473    
474    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
475    /* get access to zoom buttons */
476    static void
477    on_window_realize(GtkWidget *widget, gpointer data) {
478      if (widget->window) {
479        unsigned char value = 1;
480        Atom hildon_zoom_key_atom =
481          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
482          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
483        Display *dpy =
484          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
485        Window w = GDK_WINDOW_XID(widget->window);
486    
487        XChangeProperty(dpy, w, hildon_zoom_key_atom,
488                        integer_atom, 8, PropModeReplace, &value, 1);
489      }
490    }
491    #endif
492    
493  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
494    map_context_t *context = NULL;    map_context_t *context = NULL;
495    
# Line 449  void map(appdata_t *appdata) { Line 501  void map(appdata_t *appdata) {
501    
502    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
503    context->appdata = appdata;    context->appdata = appdata;
504      context->map_complete = FALSE;
505    
506      /* cleanup old (pre 0.8.7) path if it exists */
507      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
508      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
509        printf("old file path %s exists\n", old_path);
510        rmdir_recursive(old_path);
511      }
512    
513      /* It is recommanded that all applications share these same */
514      /* map path, so data is only cached once. The path should be: */
515      /* ~/.osm-gps-map on standard PC     (users home) */
516      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
517      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
518    #if !defined(USE_MAEMO)
519      char *p = getenv("HOME");
520      if(!p) p = "/tmp";
521      char *path = g_strdup_printf("%s/.osm-gps-map", p);
522    #else
523    #if MAEMO_VERSION_MAJOR == 5
524      char *path = g_strdup("/home/user/.osm-gps-map");
525    #else
526      char *path = g_strdup("/media/mmc2/osm-gps-map");
527    #endif
528    #endif
529    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
530    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
531    
532      gint source = context->appdata->map.source;
533      if(!source) source = MAP_SOURCE;
534    
535    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
536                   "map-source",               MAP_SOURCE,                   "map-source",               source,
537                   "tile-cache",               path,                   "tile-cache",               path,
538                   "auto-center",              FALSE,                   "auto-center",              FALSE,
539                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 464  void map(appdata_t *appdata) { Line 543  void map(appdata_t *appdata) {
543    
544    g_free(path);    g_free(path);
545    
546      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
547    
548    char *name = NULL;    char *name = NULL;
549  #ifdef USE_MAEMO  #ifdef USE_MAEMO
550    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 488  void map(appdata_t *appdata) { Line 569  void map(appdata_t *appdata) {
569  #ifdef USE_MAEMO  #ifdef USE_MAEMO
570  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
571    context->window = hildon_stackable_window_new();    context->window = hildon_stackable_window_new();
572      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
573      /* at runtime with cygwin x */
574    #ifndef __i386__
575      g_signal_connect(G_OBJECT(context->window), "realize",
576                       G_CALLBACK(on_window_realize), NULL);
577    #endif // MAEMO_VERSION
578  #else  #else
579    context->window = hildon_window_new();    context->window = hildon_window_new();
580  #endif  #endif
Legend:
Removed from v.66  
changed lines
  Added in v.112