Diff of /trunk/src/map-tool.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 41 by harbaum, Mon Aug 3 14:21:57 2009 UTC revision 48 by harbaum, Fri Aug 7 07:57:33 2009 UTC
# Line 24  Line 24 
24  #include "osm-gps-map.h"  #include "osm-gps-map.h"
25  #endif  #endif
26    
27    #define GPS_DEFAULT_ZOOM 13
28    
29    /* equatorial radius in meters */
30    #define EQ_RADIUS     (6378137.0)
31    
32    #define RAD2DEG(a)  (((a)*180.0)/M_PI)
33    #define DEG2RAD(a)  (((a)*M_PI)/180.0)
34    
35  typedef struct {  typedef struct {
36    appdata_t *appdata;    appdata_t *appdata;
37    GtkWidget *widget;    GtkWidget *widget;
38    GtkWidget *zoomin, *zoomout, *gps;    GtkWidget *zoomin, *zoomout, *gps;
39    gint handler_id;    gint handler_id;
40      cache_t *press_on;
41  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
42    GtkWidget *old_view;    GtkWidget *old_view;
43  #endif  #endif
# Line 73  static const char *get_proxy_uri(appdata Line 82  static const char *get_proxy_uri(appdata
82  }  }
83    
84  static void map_zoom(map_context_t *context, int step) {  static void map_zoom(map_context_t *context, int step) {
85    int zoom;    gint zoom;
86    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
87    g_object_get(map, "zoom", &zoom, NULL);    g_object_get(map, "zoom", &zoom, NULL);
88    zoom = osm_gps_map_set_zoom(map, zoom+step);    zoom = osm_gps_map_set_zoom(map, zoom+step);
# Line 81  static void map_zoom(map_context_t *cont Line 90  static void map_zoom(map_context_t *cont
90    /* enable/disable zoom buttons as required */    /* enable/disable zoom buttons as required */
91    gtk_widget_set_sensitive(context->zoomin, zoom<17);    gtk_widget_set_sensitive(context->zoomin, zoom<17);
92    gtk_widget_set_sensitive(context->zoomout, zoom>1);    gtk_widget_set_sensitive(context->zoomout, zoom>1);
93    
94      /* save new zoom */
95      context->appdata->map.zoom = zoom;
96  }  }
97    
98  static gboolean  static gboolean
# Line 100  cb_map_gps(GtkButton *button, map_contex Line 112  cb_map_gps(GtkButton *button, map_contex
112    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
113    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
114      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
115                                refpos->lat, refpos->lon, 14);                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
116    } else {    } else {
117      /* no coordinates given: display the entire world */      /* no coordinates given: display the entire world */
118      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
# Line 115  static GtkWidget Line 127  static GtkWidget
127                  char *tooltip) {                  char *tooltip) {
128    GtkWidget *button = gtk_button_new();    GtkWidget *button = gtk_button_new();
129    gtk_button_set_image(GTK_BUTTON(button),    gtk_button_set_image(GTK_BUTTON(button),
130                         gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU));                         gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON));
131    g_signal_connect(button, "clicked", cb, data);    g_signal_connect(button, "clicked", cb, data);
132  #ifndef USE_MAEMO  #ifndef USE_MAEMO
133    gtk_widget_set_tooltip_text(button, tooltip);    gtk_widget_set_tooltip_text(button, tooltip);
# Line 139  static gboolean on_map_configure(GtkWidg Line 151  static gboolean on_map_configure(GtkWidg
151                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
152                                   map_context_t *context) {                                   map_context_t *context) {
153    
154    cb_map_gps(NULL, context);    /* set default values if they are invalid */
155      if(!context->appdata->map.zoom ||
156         isnan(context->appdata->map.pos.lat) ||
157         isnan(context->appdata->map.pos.lon)) {
158        printf("no valid map position found\n");
159    
160        pos_t *refpos = get_pos(context->appdata);
161        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
162          /* use gps position if present */
163          context->appdata->map.pos = *refpos;
164          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
165        } else {
166          /* use world map otherwise */
167          context->appdata->map.pos.lat = 0.0;
168          context->appdata->map.pos.lon = 0.0;
169          context->appdata->map.zoom = 1;
170        }
171      }
172    
173      /* jump to initial position */
174      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
175                                context->appdata->map.pos.lat,
176                                context->appdata->map.pos.lon,
177                                context->appdata->map.zoom);
178    
179    return FALSE;    return FALSE;
180  }  }
181    
# Line 162  typedef struct { Line 197  typedef struct {
197    GMainLoop *loop;    GMainLoop *loop;
198  } popup_context_t;  } popup_context_t;
199    
200    /* draw shape */
201    #define ARROW_BORDER   20
202    #define CORNER_RADIUS  10
203    
204  #ifndef USE_HILDON  #ifndef USE_MAEMO
205  #define POPUP_WIDTH  300  #define POPUP_WIDTH  300
206  #define POPUP_HEIGHT 100  #define POPUP_HEIGHT 100
207  #else  #else
208  #define POPUP_WIDTH  600  #define POPUP_WIDTH  350
209  #define POPUP_HEIGHT 200  #define POPUP_HEIGHT 120
210  #endif  #endif
211    
212  static gboolean  static gboolean
# Line 192  on_button_press_event(GtkWidget *widget, Line 230  on_button_press_event(GtkWidget *widget,
230                            GdkEventButton *event, popup_context_t *context) {                            GdkEventButton *event, popup_context_t *context) {
231    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);
232    
233    printf("overlay button press(in = %d)\n", in);    printf("overlay button press (in = %d)\n", in);
234    return !in;    return !in;
235  }  }
236    
# Line 201  on_button_release_event(GtkWidget *widge Line 239  on_button_release_event(GtkWidget *widge
239                            GdkEventButton *event, popup_context_t *context) {                            GdkEventButton *event, popup_context_t *context) {
240    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);
241    
242    printf("overlay button release(in = %d)\n", in);    printf("overlay button release (in = %d)\n", in);
243    
244    if(!in) {    if(!in) {
245      printf("destroying popup\n");      printf("destroying popup\n");
# Line 235  run_unmap_handler(GtkWindow *window, pop Line 273  run_unmap_handler(GtkWindow *window, pop
273    shutdown_loop(context);    shutdown_loop(context);
274  }  }
275    
276  void cache_popup(appdata_t *appdata, cache_t *cache) {  static void popup_window_shape(GtkWidget *window, int tip_x, int tip_y) {
277    popup_context_t context;    GdkBitmap *mask = gdk_pixmap_new(NULL, POPUP_WIDTH, POPUP_HEIGHT, 1);
278    context.appdata = appdata;  
279      GdkGC *gc = gdk_gc_new(mask);
280    context.window = gtk_window_new(GTK_WINDOW_POPUP);    GdkColormap *colormap;
281    gtk_widget_realize(context.window);    GdkColor black;
282    gtk_window_set_default_size(GTK_WINDOW(context.window),    GdkColor white;
283    
284      /* get black/white color values */
285      colormap = gdk_colormap_get_system();
286      gdk_color_black(colormap, &black);
287      gdk_color_white(colormap, &white);
288    
289      /* erase */
290      gdk_gc_set_foreground(gc, &black);
291      gdk_gc_set_background(gc, &white);
292    
293      /* erase background */
294      gdk_draw_rectangle(mask, gc, TRUE, 0, 0, POPUP_WIDTH, POPUP_HEIGHT);
295    
296      gdk_gc_set_foreground(gc, &white);
297      gdk_gc_set_background(gc, &black);
298    
299      /* the tip is always above or below the "bubble" but never at its side */
300      guint tip_offset = (tip_y == 0)?ARROW_BORDER:0;
301    
302      gdk_draw_rectangle(mask, gc, TRUE,
303                         0, tip_offset + CORNER_RADIUS,
304                         POPUP_WIDTH,
305                         POPUP_HEIGHT - 2*CORNER_RADIUS - ARROW_BORDER);
306    
307      gdk_draw_rectangle(mask, gc, TRUE,
308                         CORNER_RADIUS, tip_offset,
309                         POPUP_WIDTH  - 2*CORNER_RADIUS,
310                         POPUP_HEIGHT - ARROW_BORDER);
311    
312      int off[][2] = {
313              { CORNER_RADIUS,               tip_offset + CORNER_RADIUS },
314              { POPUP_WIDTH - CORNER_RADIUS, tip_offset + CORNER_RADIUS },
315              { POPUP_WIDTH - CORNER_RADIUS,
316                POPUP_HEIGHT - CORNER_RADIUS - ARROW_BORDER + tip_offset},
317              { CORNER_RADIUS,
318                POPUP_HEIGHT - CORNER_RADIUS  - ARROW_BORDER + tip_offset}};
319    
320      int i;
321      for(i=0;i<4;i++) {
322        gdk_draw_arc(mask, gc, TRUE,
323                     off[i][0]-CORNER_RADIUS, off[i][1]-CORNER_RADIUS,
324                     2*CORNER_RADIUS,         2*CORNER_RADIUS,
325                     0, 360*64);
326      }
327    
328      GdkPoint points[3] = { {POPUP_WIDTH*1/3, POPUP_HEIGHT/2},
329                             {POPUP_WIDTH*2/3, POPUP_HEIGHT/2},
330                             {tip_x,tip_y} };
331      gdk_draw_polygon(mask, gc, TRUE, points, 3);
332    
333    
334      gdk_window_shape_combine_mask(window->window, mask, 0, 0);
335    }
336    
337    /* create a left aligned label (normal ones are centered) */
338    static GtkWidget *gtk_label_left_new(char *str) {
339      GtkWidget *label = gtk_label_new(str);
340      gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);
341      return label;
342    }
343    
344    /* the small labels are actually only on maemo small */
345    #ifdef USE_MAEMO
346    #define MARKUP_SMALL "<span size='small'>%s</span>"
347    GtkWidget *gtk_label_small_left_new(char *str) {
348      GtkWidget *label = gtk_label_new("");
349      char *markup = g_markup_printf_escaped(MARKUP_SMALL, str);
350      gtk_label_set_markup(GTK_LABEL(label), markup);
351      g_free(markup);
352      gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);
353      return label;
354    }
355    #define gtk_label_big_left_new(a) gtk_label_left_new(a)
356    #else
357    #define gtk_label_small_left_new(a) gtk_label_left_new(a)
358    #define MARKUP_BIG "<span size='x-large'>%s</span>"
359    GtkWidget *gtk_label_big_left_new(char *str) {
360      GtkWidget *label = gtk_label_new("");
361      char *markup = g_markup_printf_escaped(MARKUP_BIG, str);
362      gtk_label_set_markup(GTK_LABEL(label), markup);
363      g_free(markup);
364      gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);
365      return label;
366    }
367    #endif
368    
369    void cache_popup(map_context_t *mcontext, cache_t *cache) {
370      popup_context_t pcontext;
371      pcontext.appdata = mcontext->appdata;
372    
373      pcontext.window = gtk_window_new(GTK_WINDOW_POPUP);
374      gtk_widget_realize(pcontext.window);
375      gtk_window_set_default_size(GTK_WINDOW(pcontext.window),
376                                POPUP_WIDTH, POPUP_HEIGHT);                                POPUP_WIDTH, POPUP_HEIGHT);
377    gtk_window_resize(GTK_WINDOW(context.window),    gtk_window_resize(GTK_WINDOW(pcontext.window), POPUP_WIDTH, POPUP_HEIGHT);
378                      POPUP_WIDTH, POPUP_HEIGHT);    //  gtk_window_set_resizable(GTK_WINDOW(pcontext.window), FALSE);
379    //  gtk_window_set_resizable(GTK_WINDOW(context.window), FALSE);    gtk_window_set_transient_for(GTK_WINDOW(pcontext.window),
380    gtk_window_set_transient_for(GTK_WINDOW(context.window),                                 GTK_WINDOW(mcontext->appdata->window));
381                                 GTK_WINDOW(appdata->window));    gtk_window_set_keep_above(GTK_WINDOW(pcontext.window), TRUE);
382    gtk_window_set_keep_above(GTK_WINDOW(context.window), TRUE);    gtk_window_set_destroy_with_parent(GTK_WINDOW(pcontext.window), TRUE);
383    gtk_window_set_destroy_with_parent(GTK_WINDOW(context.window), TRUE);    gtk_window_set_gravity(GTK_WINDOW(pcontext.window), GDK_GRAVITY_STATIC);
384    gtk_window_set_gravity(GTK_WINDOW(context.window), GDK_GRAVITY_STATIC);    gtk_window_set_modal(GTK_WINDOW(pcontext.window), TRUE);
   gtk_window_set_modal(GTK_WINDOW(context.window), TRUE);  
385    
386    /* connect events */    /* connect events */
387    g_signal_connect(G_OBJECT(context.window), "button-press-event",    g_signal_connect(G_OBJECT(pcontext.window), "button-press-event",
388                     G_CALLBACK(on_button_press_event), &context);                     G_CALLBACK(on_button_press_event), &pcontext);
389    g_signal_connect(G_OBJECT(context.window), "button-release-event",    g_signal_connect(G_OBJECT(pcontext.window), "button-release-event",
390                     G_CALLBACK(on_button_release_event), &context);                     G_CALLBACK(on_button_release_event), &pcontext);
391    g_signal_connect(G_OBJECT(context.window), "delete-event",    g_signal_connect(G_OBJECT(pcontext.window), "delete-event",
392                     G_CALLBACK(run_delete_handler), &context);                     G_CALLBACK(run_delete_handler), &pcontext);
393    g_signal_connect(G_OBJECT(context.window), "destroy",    g_signal_connect(G_OBJECT(pcontext.window), "destroy",
394                     G_CALLBACK(run_destroy_handler), &context);                     G_CALLBACK(run_destroy_handler), &pcontext);
395    g_signal_connect(G_OBJECT(context.window), "unmap",    g_signal_connect(G_OBJECT(pcontext.window), "unmap",
396                     G_CALLBACK(run_unmap_handler), &context);                     G_CALLBACK(run_unmap_handler), &pcontext);
397    
398    gdk_pointer_grab(context.window->window, TRUE,    gdk_pointer_grab(pcontext.window->window, TRUE,
399       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK,       GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK,
400                     NULL, NULL, GDK_CURRENT_TIME);                     NULL, NULL, GDK_CURRENT_TIME);
401    gtk_grab_add(context.window);    gtk_grab_add(pcontext.window);
402    
403    //  gint x, y;    /* check whether cache is in upper or lower half of window */
404    //  gdk_window_get_origin(button->window, &x, &y);    gint x, y, sx, sy;
405      osm_gps_map_geographic_to_screen(OSM_GPS_MAP(mcontext->widget),
406    //  gtk_window_move(GTK_WINDOW(context.window),                                     cache->pos.lat, cache->pos.lon,
407    //              x + button->allocation.x,                                     &sx, &sy);
408    //              y + button->allocation.y - HEIGHT);  
409      gdk_window_get_origin(mcontext->widget->window, &x, &y);
410    
411      gint ax = 0, ay = 0;
412      if(sx > mcontext->widget->allocation.width/2)
413        ax = POPUP_WIDTH;
414    
415      if(sy > mcontext->widget->allocation.height/2)
416        ay = POPUP_HEIGHT;
417    
418    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
419      GdkColor color;
420      gdk_color_parse("darkgray", &color);
421      gtk_widget_modify_bg(GTK_WIDGET(pcontext.window), GTK_STATE_NORMAL, &color);
422    #endif
423    
424      gtk_window_move(GTK_WINDOW(pcontext.window),
425                      x + mcontext->widget->allocation.x + sx - ax,
426                      y + mcontext->widget->allocation.y + sy - ay);
427    
   gtk_window_move(GTK_WINDOW(context.window),  
                   100,  
                   100);  
428    
429    /* a frame with a vscale inside */    GtkWidget *alignment = gtk_alignment_new(0.5, 0.5, 1.0, 1.0);
430    GtkWidget *frame = gtk_frame_new(NULL);    gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
431    gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);                              CORNER_RADIUS/2 + (ay?0:ARROW_BORDER),
432                                CORNER_RADIUS/2 + (ay?ARROW_BORDER:0),
433                                CORNER_RADIUS, CORNER_RADIUS);
434    
435    gtk_container_add(GTK_CONTAINER(frame), gtk_label_new(cache->name));    /* --- actual content ---- */
436    gtk_container_add(GTK_CONTAINER(context.window), frame);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
437    
438      if(cache->id) {
439        GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);
440    
441        gtk_box_pack_start(GTK_BOX(ihbox),
442           icon_get_widget(ICON_CACHE_TYPE, cache->type),
443           FALSE, FALSE, 5);
444    
445        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
446                    gtk_label_big_left_new(cache->id));
447    
448        gtk_box_pack_start_defaults(GTK_BOX(vbox), ihbox);
449      }
450    
451      if(cache->name) {
452        GtkWidget *label = gtk_label_small_left_new(cache->name);
453        gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);
454        gtk_box_pack_start_defaults(GTK_BOX(vbox), label);
455      }
456    
457      GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
458      if(cache->terrain) {
459        GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);
460        gtk_box_pack_start(GTK_BOX(ihbox),
461           gtk_label_small_left_new(_("Terrain:")), FALSE, FALSE, 0);
462        gtk_box_pack_start(GTK_BOX(ihbox),
463           icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
464           FALSE, FALSE, 5);
465        gtk_box_pack_start_defaults(GTK_BOX(hbox), ihbox);
466      }
467    
468      if(cache->difficulty) {
469        GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);
470        gtk_box_pack_start(GTK_BOX(ihbox),
471           gtk_label_small_left_new(_("Difficulty:")), FALSE, FALSE, 0);
472        gtk_box_pack_start(GTK_BOX(ihbox),
473           icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
474           FALSE, FALSE, 5);
475        gtk_box_pack_start_defaults(GTK_BOX(hbox), ihbox);
476      }
477    
478      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
479    
480      gtk_container_add(GTK_CONTAINER(alignment), vbox);
481      /* ----------------------- */
482    
483    
484      gtk_container_add(GTK_CONTAINER(pcontext.window), alignment);
485    
486    gtk_widget_show_all(context.window);    /* give window its shape */
487      popup_window_shape(pcontext.window, ax, ay);
488    
489      gtk_widget_show_all(pcontext.window);
490    
491    /* handle this popup until it's gone */    /* handle this popup until it's gone */
492    
493    context.loop = g_main_loop_new(NULL, FALSE);    pcontext.loop = g_main_loop_new(NULL, FALSE);
494    
495    GDK_THREADS_LEAVE();    GDK_THREADS_LEAVE();
496    g_main_loop_run(context.loop);    g_main_loop_run(pcontext.loop);
497    GDK_THREADS_ENTER();    GDK_THREADS_ENTER();
498    
499    g_main_loop_unref(context.loop);    g_main_loop_unref(pcontext.loop);
500    
501    printf("cache popup removed\n");    printf("cache popup removed\n");
502  }  }
503    
 #define RAD2DEG(a)  (((a)*180.0)/M_PI)  
   
504  static void  static void
505  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
506                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 354  pos_t coord2pos(coord_t coo) { Line 549  pos_t coord2pos(coord_t coo) {
549    return pos;    return pos;
550  }  }
551    
552    static int dist2pixel(map_context_t *context, float km, float lat) {
553      gint zoom;
554      g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
555    
556      /* world at zoom 1 == 512 pixels */
557      float m_per_pix =
558        cos(DEG2RAD(lat))*2*M_PI*EQ_RADIUS/(1<<(8+zoom));
559    
560      return 1000.0*km/m_per_pix;
561    }
562    
563    #define CLICK_FUZZ (24)
564    
565  static gboolean  static gboolean
566  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
567                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
568    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
569    
570    pos_t pos =    /* got a press event without release event? eat it! */
571      coord2pos(osm_gps_map_get_co_ordinates(map, (int)event->x, (int)event->y));    if(context->press_on != NULL) {
572        printf("PRESS: already\n");
573        return TRUE;
574      }
575    
576    printf("clicked at %f/%f\n", pos.lat, pos.lon);    pos_t pos =
577        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
578    
579      cache_t *nearest = map_closest(context, &pos);
580      if(nearest) {
581        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
582        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
583          context->press_on = nearest;
584      }
585    
586    return FALSE;    return FALSE;
587  }  }
588    
# Line 372  on_map_button_release_event(GtkWidget *w Line 591  on_map_button_release_event(GtkWidget *w
591                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
592    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
593    
594    pos_t pos =    if(context->press_on) {
595      coord2pos(osm_gps_map_get_co_ordinates(map, (int)event->x, (int)event->y));      pos_t pos =
596          coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
597    printf("released at %f/%f\n", pos.lat, pos.lon);  
598        cache_t *nearest = map_closest(context, &pos);
599    /* return true if we clicked a cache */      if(nearest && nearest == context->press_on) {
600    /* ... */        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
601          if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
602    cache_t *nearest = map_closest(context, &pos);          cache_popup(context, nearest);
603        }
604    if(nearest) {      context->press_on = NULL;
605      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);    } else {
606        /* save new map position */
607      printf("nearest = %s, distance = %fkm\n", nearest->name, dist);      gfloat lat, lon;
608        g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
609      cache_popup(context->appdata, nearest);      context->appdata->map.pos.lat = lat;
610        context->appdata->map.pos.lon = lon;
     return TRUE;  
611    }    }
612    
613    return FALSE;    return FALSE;
614  }  }
615    
616    static void save_map_state(map_context_t *context) {
617      /* save map parameters */
618      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
619      gint zoom;
620      g_object_get(map, "zoom", &zoom, NULL);
621      context->appdata->map.zoom = zoom;
622    
623      gfloat lat, lon;
624      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
625      context->appdata->map.pos.lat = lat;
626      context->appdata->map.pos.lon = lon;
627    }
628    
629  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
630  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
631    printf("destroy map view\n");    printf("destroy map view\n");
632    
633      save_map_state(context);
634    
635    /* restore cur_view */    /* restore cur_view */
636    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
637    
# Line 438  void map(appdata_t *appdata) { Line 671  void map(appdata_t *appdata) {
671  #ifdef USE_MAEMO  #ifdef USE_MAEMO
672    } else {    } else {
673      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);
674      name = g_strdup(_("appdata->cur_gpx->name"));      name = g_strdup(appdata->cur_gpx->name);
675    }    }
676  #endif  #endif
677    
# Line 456  void map(appdata_t *appdata) { Line 689  void map(appdata_t *appdata) {
689                            NULL);                            NULL);
690    
691  #ifndef USE_MAEMO  #ifndef USE_MAEMO
692    gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 350);    gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);
693  #else  #else
694    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);
695  #endif  #endif
# Line 513  void map(appdata_t *appdata) { Line 746  void map(appdata_t *appdata) {
746    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
747    gtk_widget_show_all(dialog);    gtk_widget_show_all(dialog);
748    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
749      save_map_state(context);
750    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
751    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
752    g_free(context);    g_free(context);
Legend:
Removed from v.41  
changed lines
  Added in v.48