--- trunk/src/map-tool.c	2009/08/03 14:21:57	41
+++ trunk/src/map-tool.c	2009/08/04 19:27:39	45
@@ -24,11 +24,18 @@
 #include "osm-gps-map.h"
 #endif
 
+/* equatorial radius in meters */
+#define EQ_RADIUS     (6378137.0)
+
+#define RAD2DEG(a)  (((a)*180.0)/M_PI)
+#define DEG2RAD(a)  (((a)*M_PI)/180.0)
+
 typedef struct {
   appdata_t *appdata;
   GtkWidget *widget;
   GtkWidget *zoomin, *zoomout, *gps;
   gint handler_id;
+  cache_t *press_on;
 #if MAEMO_VERSION_MAJOR == 5
   GtkWidget *old_view;
 #endif
@@ -115,7 +122,7 @@
 		char *tooltip) {
   GtkWidget *button = gtk_button_new();
   gtk_button_set_image(GTK_BUTTON(button), 
-		       gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU));
+		       gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON));
   g_signal_connect(button, "clicked", cb, data);
 #ifndef USE_MAEMO
   gtk_widget_set_tooltip_text(button, tooltip);
@@ -192,7 +199,7 @@
 			  GdkEventButton *event, popup_context_t *context) {
   gboolean in = pointer_in_window(widget, event->x_root, event->y_root);
 
-  printf("overlay button press(in = %d)\n", in);
+  printf("overlay button press (in = %d)\n", in);
   return !in;
 }
 
@@ -201,7 +208,7 @@
 			  GdkEventButton *event, popup_context_t *context) {
   gboolean in = pointer_in_window(widget, event->x_root, event->y_root);
 
-  printf("overlay button release(in = %d)\n", in);
+  printf("overlay button release (in = %d)\n", in);
 
   if(!in) {
     printf("destroying popup\n");
@@ -235,77 +242,89 @@
   shutdown_loop(context);
 }
 
-void cache_popup(appdata_t *appdata, cache_t *cache) {
-  popup_context_t context;
-  context.appdata = appdata;
-
-  context.window = gtk_window_new(GTK_WINDOW_POPUP);
-  gtk_widget_realize(context.window);
-  gtk_window_set_default_size(GTK_WINDOW(context.window), 
+void cache_popup(map_context_t *mcontext, cache_t *cache) {
+  popup_context_t pcontext;
+  pcontext.appdata = mcontext->appdata;
+
+  pcontext.window = gtk_window_new(GTK_WINDOW_POPUP);
+  gtk_widget_realize(pcontext.window);
+  gtk_window_set_default_size(GTK_WINDOW(pcontext.window), 
 			      POPUP_WIDTH, POPUP_HEIGHT); 
-  gtk_window_resize(GTK_WINDOW(context.window), 
-		    POPUP_WIDTH, POPUP_HEIGHT); 
-  //  gtk_window_set_resizable(GTK_WINDOW(context.window), FALSE);
-  gtk_window_set_transient_for(GTK_WINDOW(context.window), 
-			       GTK_WINDOW(appdata->window));
-  gtk_window_set_keep_above(GTK_WINDOW(context.window), TRUE);    
-  gtk_window_set_destroy_with_parent(GTK_WINDOW(context.window), TRUE);
-  gtk_window_set_gravity(GTK_WINDOW(context.window), GDK_GRAVITY_STATIC);
-  gtk_window_set_modal(GTK_WINDOW(context.window), TRUE);
+  gtk_window_resize(GTK_WINDOW(pcontext.window), POPUP_WIDTH, POPUP_HEIGHT); 
+  //  gtk_window_set_resizable(GTK_WINDOW(pcontext.window), FALSE);
+  gtk_window_set_transient_for(GTK_WINDOW(pcontext.window), 
+			       GTK_WINDOW(mcontext->appdata->window));
+  gtk_window_set_keep_above(GTK_WINDOW(pcontext.window), TRUE);    
+  gtk_window_set_destroy_with_parent(GTK_WINDOW(pcontext.window), TRUE);
+  gtk_window_set_gravity(GTK_WINDOW(pcontext.window), GDK_GRAVITY_STATIC);
+  gtk_window_set_modal(GTK_WINDOW(pcontext.window), TRUE);
 
   /* connect events */
-  g_signal_connect(G_OBJECT(context.window), "button-press-event",
-		   G_CALLBACK(on_button_press_event), &context);
-  g_signal_connect(G_OBJECT(context.window), "button-release-event",
-		   G_CALLBACK(on_button_release_event), &context);
-  g_signal_connect(G_OBJECT(context.window), "delete-event",
-		   G_CALLBACK(run_delete_handler), &context);
-  g_signal_connect(G_OBJECT(context.window), "destroy",
-		   G_CALLBACK(run_destroy_handler), &context);
-  g_signal_connect(G_OBJECT(context.window), "unmap",
-		   G_CALLBACK(run_unmap_handler), &context);
+  g_signal_connect(G_OBJECT(pcontext.window), "button-press-event",
+		   G_CALLBACK(on_button_press_event), &pcontext);
+  g_signal_connect(G_OBJECT(pcontext.window), "button-release-event",
+		   G_CALLBACK(on_button_release_event), &pcontext);
+  g_signal_connect(G_OBJECT(pcontext.window), "delete-event",
+		   G_CALLBACK(run_delete_handler), &pcontext);
+  g_signal_connect(G_OBJECT(pcontext.window), "destroy",
+		   G_CALLBACK(run_destroy_handler), &pcontext);
+  g_signal_connect(G_OBJECT(pcontext.window), "unmap",
+		   G_CALLBACK(run_unmap_handler), &pcontext);
   
-  gdk_pointer_grab(context.window->window, TRUE,
+  gdk_pointer_grab(pcontext.window->window, TRUE,
      GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK,
 		   NULL, NULL, GDK_CURRENT_TIME);
-  gtk_grab_add(context.window);
-
-  //  gint x, y;
-  //  gdk_window_get_origin(button->window, &x, &y);
- 
-  //  gtk_window_move(GTK_WINDOW(context.window),
-  //		  x + button->allocation.x, 
-  //  		  y + button->allocation.y - HEIGHT);
+  gtk_grab_add(pcontext.window);
 
+  /* check whether cache is in upper or lower half of window */
+  gint x, y, sx, sy;
+  osm_gps_map_geographic_to_screen(OSM_GPS_MAP(mcontext->widget),
+				   cache->pos.lat, cache->pos.lon,
+				   &sx, &sy);
+  
+  printf("screen pos %d/%d\n", sx, sy);
 
-  gtk_window_move(GTK_WINDOW(context.window),
-  		  100, 
-    		  100);
+  gdk_window_get_origin(mcontext->widget->window, &x, &y);
+  printf("window = %d/%d +%d+%d %d*%d\n", x, y, 
+	 mcontext->widget->allocation.x,
+	 mcontext->widget->allocation.y,
+	 mcontext->widget->allocation.width,
+	 mcontext->widget->allocation.height
+	 );
+
+  gint ax = 0, ay = 0; 
+  if(sx > mcontext->widget->allocation.width/2)
+    ax = POPUP_WIDTH;
+
+  if(sy > mcontext->widget->allocation.height/2)
+    ay = POPUP_HEIGHT;
+
+  gtk_window_move(GTK_WINDOW(pcontext.window),
+  		  x + mcontext->widget->allocation.x + sx - ax, 
+  		  y + mcontext->widget->allocation.y + sy - ay); 
 
   /* a frame with a vscale inside */
   GtkWidget *frame = gtk_frame_new(NULL);
   gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
 
   gtk_container_add(GTK_CONTAINER(frame), gtk_label_new(cache->name));
-  gtk_container_add(GTK_CONTAINER(context.window), frame);
+  gtk_container_add(GTK_CONTAINER(pcontext.window), frame);
   
-  gtk_widget_show_all(context.window);
+  gtk_widget_show_all(pcontext.window);
 
   /* handle this popup until it's gone */
   
-  context.loop = g_main_loop_new(NULL, FALSE);
+  pcontext.loop = g_main_loop_new(NULL, FALSE);
 
   GDK_THREADS_LEAVE();  
-  g_main_loop_run(context.loop);
+  g_main_loop_run(pcontext.loop);
   GDK_THREADS_ENTER();  
 
-  g_main_loop_unref(context.loop);
+  g_main_loop_unref(pcontext.loop);
 
   printf("cache popup removed\n");
 }
 
-#define RAD2DEG(a)  (((a)*180.0)/M_PI)
-
 static void
 map_cachelist_nearest(cache_t *cache, pos_t *pos, 
 		      cache_t **result, float *distance) {
@@ -354,47 +373,65 @@
   return pos;
 }
 
+static int dist2pixel(map_context_t *context, float km, float lat) {
+  int zoom;
+  g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
+
+  /* world at zoom 1 == 512 pixels */
+  float m_per_pix = 
+    cos(DEG2RAD(lat))*2*M_PI*EQ_RADIUS/(1<<(8+zoom));
+
+  return 1000.0*km/m_per_pix;
+}
+
+#define CLICK_FUZZ (16)
+
 static gboolean
 on_map_button_press_event(GtkWidget *widget, 
 			    GdkEventButton *event, map_context_t *context) {
   OsmGpsMap *map = OSM_GPS_MAP(context->widget);
 
-  pos_t pos = 
-    coord2pos(osm_gps_map_get_co_ordinates(map, (int)event->x, (int)event->y));
+  /* got a press event without release event? eat it! */
+  if(context->press_on != NULL) {
+    printf("PRESS: already\n");
+    return TRUE;
+  }
 
-  printf("clicked at %f/%f\n", pos.lat, pos.lon);
+  pos_t pos = 
+    coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
 
+  cache_t *nearest = map_closest(context, &pos);  
+  if(nearest) {
+    float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
+    if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) 
+      context->press_on = nearest;
+  }
+  
   return FALSE;
 }
 
 static gboolean
 on_map_button_release_event(GtkWidget *widget, 
 			    GdkEventButton *event, map_context_t *context) {
-  OsmGpsMap *map = OSM_GPS_MAP(context->widget);
+  if(context->press_on) {
+    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
 
-  pos_t pos = 
-    coord2pos(osm_gps_map_get_co_ordinates(map, (int)event->x, (int)event->y));
-
-  printf("released at %f/%f\n", pos.lat, pos.lon);
+    pos_t pos = 
+      coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
 
-  /* return true if we clicked a cache */
-  /* ... */
-
-  cache_t *nearest = map_closest(context, &pos);
-  
-  if(nearest) {
-    float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
-
-    printf("nearest = %s, distance = %fkm\n", nearest->name, dist);
-    
-    cache_popup(context->appdata, nearest);
-
-    return TRUE;
+    cache_t *nearest = map_closest(context, &pos);  
+    if(nearest && nearest == context->press_on) {
+      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
+      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
+	cache_popup(context, nearest);
+    }
+    context->press_on = NULL;
   }
 
   return FALSE;
 }
 
+
 #if MAEMO_VERSION_MAJOR == 5
 static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
   printf("destroy map view\n");
@@ -438,7 +475,7 @@
 #ifdef USE_MAEMO
   } else {
     map_draw_cachelist(context->widget, appdata->cur_gpx->cache);
-    name = g_strdup(_("appdata->cur_gpx->name"));
+    name = g_strdup(appdata->cur_gpx->name);
   }
 #endif
 
@@ -456,7 +493,7 @@
                           NULL);
 
 #ifndef USE_MAEMO
-  gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 350);
+  gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);
 #else
   gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);
 #endif