--- trunk/src/map-tool.c	2009/08/19 20:03:28	66
+++ trunk/src/map-tool.c	2009/09/15 13:52:04	112
@@ -17,15 +17,27 @@
  * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png  8-15
+ * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
+ */
+
 #include "gpxview.h"
 #include "converter.h"
 #include <math.h>    // for isnan
 
 #ifdef ENABLE_OSM_GPS_MAP
 #include "osm-gps-map.h"
+#include "osm-gps-map-osd-classic.h"
 #endif
 
-#define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
+#if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
+#include <gdk/gdkx.h>
+#include <X11/Xatom.h>
+#endif
+
+/* default values */
+#define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
 #define GPS_DEFAULT_ZOOM 13
 
 #define PROXY_KEY  "/system/http_proxy/"
@@ -67,15 +79,26 @@
 }
 
 static void
-cb_map_gps(map_context_t *context) {
-  pos_t *refpos = get_pos(context->appdata);
-  if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
-    osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
-		      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);     
-  } else {
-    /* no coordinates given: display the entire world */
-    osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget), 
-			      0.0, 0.0, 1);
+cb_map_gps(osd_button_t but, map_context_t *context) {
+  if(but == OSD_GPS) {
+    pos_t *refpos = get_pos(context->appdata);
+    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
+      gint zoom;
+      g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
+      if(zoom < 10)
+	osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
+				  refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
+      else
+	osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
+			       refpos->lat, refpos->lon);
+
+      /* re-enable centering */
+      g_object_set(context->widget, "auto-center", TRUE, NULL);
+    } else {
+      /* no coordinates given: display the entire world */
+      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget), 
+				0.0, 0.0, 1);
+    }
   }
 }
 
@@ -92,7 +115,7 @@
 
   /* ... and enable "goto" button if it's valid */
   osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget), 
-			      OSM_GPS_MAP_OSD_GPS_CALLBACK(ok?cb_map_gps:NULL), context);
+		 OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
 
   if(ok) {
     float heading = NAN;
@@ -120,31 +143,35 @@
 				 GdkEventConfigure *event,
 				 map_context_t *context) {
 
-  /* set default values if they are invalid */
-  if(!context->appdata->map.zoom || 
-     isnan(context->appdata->map.pos.lat) ||
-     isnan(context->appdata->map.pos.lon)) {
-    printf("no valid map position found\n");
-    
-    pos_t *refpos = get_pos(context->appdata);
-    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
-      /* use gps position if present */
-      context->appdata->map.pos = *refpos;
-      context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
-    } else {
-      /* use world map otherwise */
-      context->appdata->map.pos.lat = 0.0;
-      context->appdata->map.pos.lon = 0.0;
-      context->appdata->map.zoom = 1;
+  if(!context->map_complete) {
+
+    /* set default values if they are invalid */
+    if(!context->appdata->map.zoom || 
+       isnan(context->appdata->map.pos.lat) ||
+       isnan(context->appdata->map.pos.lon)) {
+      printf("no valid map position found\n");
+      
+      pos_t *refpos = get_pos(context->appdata);
+      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
+	/* use gps position if present */
+	context->appdata->map.pos = *refpos;
+	context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
+      } else {
+	/* use world map otherwise */
+	context->appdata->map.pos.lat = 0.0;
+	context->appdata->map.pos.lon = 0.0;
+	context->appdata->map.zoom = 1;
+      }
     }
+    
+    /* 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);
+    context->map_complete = TRUE;
   }
 
-  /* 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);
-  
   return FALSE;
 }
 
@@ -214,10 +241,14 @@
 			    GdkEventButton *event, map_context_t *context) {
   OsmGpsMap *map = OSM_GPS_MAP(context->widget);
 
+  /* check if we actually clicked parts of the OSD */
+  if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
+    return FALSE;
+
   /* got a press event without release event? eat it! */
   if(context->press_on != NULL) {
     printf("PRESS: already\n");
-    return TRUE;
+    return FALSE;
   }
 
   pos_t pos = 
@@ -266,8 +297,6 @@
 balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
   cache_t *cache = (cache_t*)data;
 
-  //  printf("draw cb for \"%s\"\n", cache->name);
-
 #if 0
   /* draw pink background to check clipping */
   cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
@@ -395,8 +424,8 @@
       float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
       if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
 	
-	osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
-				 balloon_draw_cb, nearest);
+	osm_gps_map_osd_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
+				     balloon_draw_cb, nearest);
       }
     }
     context->press_on = NULL;
@@ -427,6 +456,10 @@
   context->appdata->map.pos.lat = lat;
   context->appdata->map.pos.lon = lon;
 
+  gint source;
+  g_object_get(map, "map-source", &source, NULL);
+  context->appdata->map.source = source;
+
 #if MAEMO_VERSION_MAJOR == 5
   /* restore cur_view */
   context->appdata->cur_view = context->old_view;
@@ -438,6 +471,25 @@
   appdata->map.context = NULL;
 }
 
+#if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
+/* get access to zoom buttons */
+static void
+on_window_realize(GtkWidget *widget, gpointer data) {
+  if (widget->window) {
+    unsigned char value = 1;
+    Atom hildon_zoom_key_atom = 
+      gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
+      integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
+    Display *dpy = 
+      GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
+    Window w = GDK_WINDOW_XID(widget->window);
+
+    XChangeProperty(dpy, w, hildon_zoom_key_atom, 
+		    integer_atom, 8, PropModeReplace, &value, 1);
+  }
+}
+#endif
+
 void map(appdata_t *appdata) {
   map_context_t *context = NULL; 
 
@@ -449,12 +501,39 @@
 
   context = appdata->map.context = g_new0(map_context_t, 1);
   context->appdata = appdata;
+  context->map_complete = FALSE;
+
+  /* cleanup old (pre 0.8.7) path if it exists */
+  char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
+  if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
+    printf("old file path %s exists\n", old_path);
+    rmdir_recursive(old_path);
+  }
+
+  /* It is recommanded that all applications share these same */
+  /* map path, so data is only cached once. The path should be: */
+  /* ~/.osm-gps-map on standard PC     (users home) */
+  /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
+  /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
+#if !defined(USE_MAEMO)
+  char *p = getenv("HOME");
+  if(!p) p = "/tmp"; 
+  char *path = g_strdup_printf("%s/.osm-gps-map", p);
+#else
+#if MAEMO_VERSION_MAJOR == 5
+  char *path = g_strdup("/home/user/.osm-gps-map");
+#else
+  char *path = g_strdup("/media/mmc2/osm-gps-map");
+#endif
+#endif
 
-  char *path = g_strdup_printf("%s/map/", appdata->image_path);
   const char *proxy = get_proxy_uri(appdata);
 
+  gint source = context->appdata->map.source;
+  if(!source) source = MAP_SOURCE;
+
   context->widget = g_object_new(OSM_TYPE_GPS_MAP,
-		 "map-source",               MAP_SOURCE,
+		 "map-source",               source,
                  "tile-cache",               path,
 		 "auto-center",              FALSE,
 		 "record-trip-history",      FALSE, 
@@ -464,6 +543,8 @@
 
   g_free(path);
 
+  osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
+  
   char *name = NULL;
 #ifdef USE_MAEMO
   if(!appdata->cur_gpx) {
@@ -488,6 +569,12 @@
 #ifdef USE_MAEMO
 #ifdef USE_STACKABLE_WINDOW
   context->window = hildon_stackable_window_new();
+  /* try to enable the zoom buttons. don't do this on x86 as it breaks */
+  /* at runtime with cygwin x */
+#ifndef __i386__
+  g_signal_connect(G_OBJECT(context->window), "realize", 
+		   G_CALLBACK(on_window_realize), NULL);
+#endif // MAEMO_VERSION
 #else
   context->window = hildon_window_new();
 #endif