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

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

revision 48 by harbaum, Fri Aug 7 07:57:33 2009 UTC revision 73 by harbaum, Sun Aug 23 19:38:15 2009 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2008 Till Harbaum <till@harbaum.org>.   * Copyright (C) 2008-2009 Till Harbaum <till@harbaum.org>.
3   *   *
4   * This file is part of GPXView.   * This file is part of GPXView.
5   *   *
# Line 18  Line 18 
18   */   */
19    
20  #include "gpxview.h"  #include "gpxview.h"
21    #include "converter.h"
22  #include <math.h>    // for isnan  #include <math.h>    // for isnan
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
30  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
31    
 /* 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  
 } map_context_t;  
   
32  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
33    
34  static const char *get_proxy_uri(appdata_t *appdata) {  static const char *get_proxy_uri(appdata_t *appdata) {
# Line 81  static const char *get_proxy_uri(appdata Line 67  static const char *get_proxy_uri(appdata
67    return NULL;    return NULL;
68  }  }
69    
70  static void map_zoom(map_context_t *context, int step) {  static void
71    gint zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
72    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(but == OSD_GPS) {
73    g_object_get(map, "zoom", &zoom, NULL);      pos_t *refpos = get_pos(context->appdata);
74    zoom = osm_gps_map_set_zoom(map, zoom+step);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
75          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
76    /* enable/disable zoom buttons as required */                                  refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
77    gtk_widget_set_sensitive(context->zoomin, zoom<17);      } else {
78    gtk_widget_set_sensitive(context->zoomout, zoom>1);        /* no coordinates given: display the entire world */
79          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
80    /* save new zoom */                                  0.0, 0.0, 1);
81    context->appdata->map.zoom = zoom;      }
 }  
   
 static gboolean  
 cb_map_zoomin(GtkButton *button, map_context_t *context) {  
   map_zoom(context, +1);  
   return FALSE;  
 }  
   
 static gboolean  
 cb_map_zoomout(GtkButton *button, map_context_t *context) {  
   map_zoom(context, -1);  
   return FALSE;  
 }  
   
 static gboolean  
 cb_map_gps(GtkButton *button, 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);  
82    }    }
   
   return FALSE;  
83  }  }
84    
85  static GtkWidget  static int dist2pixel(map_context_t *context, float km, float lat) {
86  *map_add_button(const gchar *icon, GCallback cb, gpointer data,    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
                 char *tooltip) {  
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button),  
                        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);  
 #endif  
   return button;  
87  }  }
88    
89  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
90    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
91    
92      /* get reference position ... */
93    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
94    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
95    
96    /* get reference position and go there */    /* ... and enable "goto" button if it's valid */
97    gtk_widget_set_sensitive(context->gps, ok);    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
98                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
99    
100      if(ok) {
101        float heading = NAN;
102        int radius = 0;
103    
104        if(context->appdata->use_gps) {
105          heading = gps_get_heading(context->appdata);
106    
107          /* get error */
108          float eph = gps_get_eph(context->appdata);
109          if(!isnan(eph))
110            radius = dist2pixel(context, eph/1000, refpos->lat);
111        }
112    
113        g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
114        osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
115                             refpos->lat, refpos->lon, heading);
116      } else
117        osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
118    
119    return TRUE;    return TRUE;
120  }  }
121    
# Line 175  static gboolean on_map_configure(GtkWidg Line 147  static gboolean on_map_configure(GtkWidg
147                              context->appdata->map.pos.lat,                              context->appdata->map.pos.lat,
148                              context->appdata->map.pos.lon,                              context->appdata->map.pos.lon,
149                              context->appdata->map.zoom);                              context->appdata->map.zoom);
150    
151    return FALSE;    return FALSE;
152  }  }
153    
# Line 190  static void map_draw_cachelist(GtkWidget Line 162  static void map_draw_cachelist(GtkWidget
162    }    }
163  }  }
164    
 /* draw a nice popup */  
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *window;  
   GMainLoop *loop;  
 } popup_context_t;  
   
 /* draw shape */  
 #define ARROW_BORDER   20  
 #define CORNER_RADIUS  10  
   
 #ifndef USE_MAEMO  
 #define POPUP_WIDTH  300  
 #define POPUP_HEIGHT 100  
 #else  
 #define POPUP_WIDTH  350  
 #define POPUP_HEIGHT 120  
 #endif  
   
 static gboolean  
 pointer_in_window(GtkWidget *widget, gint x_root, gint y_root) {  
   if(GTK_WIDGET_MAPPED(gtk_widget_get_toplevel(widget))) {  
     gint window_x, window_y;  
   
     gdk_window_get_position(gtk_widget_get_toplevel(widget)->window,  
                             &window_x, &window_y);  
   
     if(x_root >= window_x && x_root < window_x + widget->allocation.width &&  
         y_root >= window_y && y_root < window_y + widget->allocation.height)  
       return TRUE;  
   }  
   
   return FALSE;  
 }  
   
 static gboolean  
 on_button_press_event(GtkWidget *widget,  
                           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);  
   return !in;  
 }  
   
 static gboolean  
 on_button_release_event(GtkWidget *widget,  
                           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);  
   
   if(!in) {  
     printf("destroying popup\n");  
     gtk_widget_destroy(gtk_widget_get_toplevel(widget));  
   }  
   
   return !in;  
 }  
   
 static void  
 shutdown_loop(popup_context_t *context) {  
   if(g_main_loop_is_running(context->loop))  
     g_main_loop_quit(context->loop);  
 }  
   
 static gint  
 run_delete_handler(GtkWindow *window, GdkEventAny *event,  
                    popup_context_t *context) {  
   shutdown_loop(context);  
   return TRUE; /* Do not destroy */  
 }  
   
 static void  
 run_destroy_handler(GtkWindow *window, popup_context_t *context) {  
   /* shutdown_loop will be called by run_unmap_handler */  
   printf("popup destroyed\n");  
 }  
   
 static void  
 run_unmap_handler(GtkWindow *window, popup_context_t *context) {  
   shutdown_loop(context);  
 }  
   
 static void popup_window_shape(GtkWidget *window, int tip_x, int tip_y) {  
   GdkBitmap *mask = gdk_pixmap_new(NULL, POPUP_WIDTH, POPUP_HEIGHT, 1);  
   
   GdkGC *gc = gdk_gc_new(mask);  
   GdkColormap *colormap;  
   GdkColor black;  
   GdkColor white;  
   
   /* get black/white color values */  
   colormap = gdk_colormap_get_system();  
   gdk_color_black(colormap, &black);  
   gdk_color_white(colormap, &white);  
   
   /* erase */  
   gdk_gc_set_foreground(gc, &black);  
   gdk_gc_set_background(gc, &white);  
   
   /* erase background */  
   gdk_draw_rectangle(mask, gc, TRUE, 0, 0, POPUP_WIDTH, POPUP_HEIGHT);  
   
   gdk_gc_set_foreground(gc, &white);  
   gdk_gc_set_background(gc, &black);  
   
   /* the tip is always above or below the "bubble" but never at its side */  
   guint tip_offset = (tip_y == 0)?ARROW_BORDER:0;  
   
   gdk_draw_rectangle(mask, gc, TRUE,  
                      0, tip_offset + CORNER_RADIUS,  
                      POPUP_WIDTH,  
                      POPUP_HEIGHT - 2*CORNER_RADIUS - ARROW_BORDER);  
   
   gdk_draw_rectangle(mask, gc, TRUE,  
                      CORNER_RADIUS, tip_offset,  
                      POPUP_WIDTH  - 2*CORNER_RADIUS,  
                      POPUP_HEIGHT - ARROW_BORDER);  
   
   int off[][2] = {  
           { CORNER_RADIUS,               tip_offset + CORNER_RADIUS },  
           { POPUP_WIDTH - CORNER_RADIUS, tip_offset + CORNER_RADIUS },  
           { POPUP_WIDTH - CORNER_RADIUS,  
             POPUP_HEIGHT - CORNER_RADIUS - ARROW_BORDER + tip_offset},  
           { CORNER_RADIUS,  
             POPUP_HEIGHT - CORNER_RADIUS  - ARROW_BORDER + tip_offset}};  
   
   int i;  
   for(i=0;i<4;i++) {  
     gdk_draw_arc(mask, gc, TRUE,  
                  off[i][0]-CORNER_RADIUS, off[i][1]-CORNER_RADIUS,  
                  2*CORNER_RADIUS,         2*CORNER_RADIUS,  
                  0, 360*64);  
   }  
   
   GdkPoint points[3] = { {POPUP_WIDTH*1/3, POPUP_HEIGHT/2},  
                          {POPUP_WIDTH*2/3, POPUP_HEIGHT/2},  
                          {tip_x,tip_y} };  
   gdk_draw_polygon(mask, gc, TRUE, points, 3);  
   
   
   gdk_window_shape_combine_mask(window->window, mask, 0, 0);  
 }  
   
 /* create a left aligned label (normal ones are centered) */  
 static GtkWidget *gtk_label_left_new(char *str) {  
   GtkWidget *label = gtk_label_new(str);  
   gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);  
   return label;  
 }  
   
 /* the small labels are actually only on maemo small */  
 #ifdef USE_MAEMO  
 #define MARKUP_SMALL "<span size='small'>%s</span>"  
 GtkWidget *gtk_label_small_left_new(char *str) {  
   GtkWidget *label = gtk_label_new("");  
   char *markup = g_markup_printf_escaped(MARKUP_SMALL, str);  
   gtk_label_set_markup(GTK_LABEL(label), markup);  
   g_free(markup);  
   gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);  
   return label;  
 }  
 #define gtk_label_big_left_new(a) gtk_label_left_new(a)  
 #else  
 #define gtk_label_small_left_new(a) gtk_label_left_new(a)  
 #define MARKUP_BIG "<span size='x-large'>%s</span>"  
 GtkWidget *gtk_label_big_left_new(char *str) {  
   GtkWidget *label = gtk_label_new("");  
   char *markup = g_markup_printf_escaped(MARKUP_BIG, str);  
   gtk_label_set_markup(GTK_LABEL(label), markup);  
   g_free(markup);  
   gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);  
   return label;  
 }  
 #endif  
   
 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(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(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(pcontext.window->window, TRUE,  
      GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK,  
                    NULL, NULL, GDK_CURRENT_TIME);  
   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);  
   
   gdk_window_get_origin(mcontext->widget->window, &x, &y);  
   
   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;  
   
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   GdkColor color;  
   gdk_color_parse("darkgray", &color);  
   gtk_widget_modify_bg(GTK_WIDGET(pcontext.window), GTK_STATE_NORMAL, &color);  
 #endif  
   
   gtk_window_move(GTK_WINDOW(pcontext.window),  
                   x + mcontext->widget->allocation.x + sx - ax,  
                   y + mcontext->widget->allocation.y + sy - ay);  
   
   
   GtkWidget *alignment = gtk_alignment_new(0.5, 0.5, 1.0, 1.0);  
   gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),  
                             CORNER_RADIUS/2 + (ay?0:ARROW_BORDER),  
                             CORNER_RADIUS/2 + (ay?ARROW_BORDER:0),  
                             CORNER_RADIUS, CORNER_RADIUS);  
   
   /* --- actual content ---- */  
   GtkWidget *vbox = gtk_vbox_new(FALSE, 0);  
   
   if(cache->id) {  
     GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);  
   
     gtk_box_pack_start(GTK_BOX(ihbox),  
        icon_get_widget(ICON_CACHE_TYPE, cache->type),  
        FALSE, FALSE, 5);  
   
     gtk_box_pack_start_defaults(GTK_BOX(ihbox),  
                 gtk_label_big_left_new(cache->id));  
   
     gtk_box_pack_start_defaults(GTK_BOX(vbox), ihbox);  
   }  
   
   if(cache->name) {  
     GtkWidget *label = gtk_label_small_left_new(cache->name);  
     gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);  
     gtk_box_pack_start_defaults(GTK_BOX(vbox), label);  
   }  
   
   GtkWidget *hbox = gtk_hbox_new(FALSE, 0);  
   if(cache->terrain) {  
     GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        gtk_label_small_left_new(_("Terrain:")), FALSE, FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),  
        FALSE, FALSE, 5);  
     gtk_box_pack_start_defaults(GTK_BOX(hbox), ihbox);  
   }  
   
   if(cache->difficulty) {  
     GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        gtk_label_small_left_new(_("Difficulty:")), FALSE, FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),  
        FALSE, FALSE, 5);  
     gtk_box_pack_start_defaults(GTK_BOX(hbox), ihbox);  
   }  
   
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);  
   
   gtk_container_add(GTK_CONTAINER(alignment), vbox);  
   /* ----------------------- */  
   
   
   gtk_container_add(GTK_CONTAINER(pcontext.window), alignment);  
   
   /* give window its shape */  
   popup_window_shape(pcontext.window, ax, ay);  
   
   gtk_widget_show_all(pcontext.window);  
   
   /* handle this popup until it's gone */  
   
   pcontext.loop = g_main_loop_new(NULL, FALSE);  
   
   GDK_THREADS_LEAVE();  
   g_main_loop_run(pcontext.loop);  
   GDK_THREADS_ENTER();  
   
   g_main_loop_unref(pcontext.loop);  
   
   printf("cache popup removed\n");  
 }  
   
165  static void  static void
166  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
167                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 544  static cache_t *map_closest(map_context_ Line 205  static cache_t *map_closest(map_context_
205  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
206  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
207    pos_t pos;    pos_t pos;
208    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
209    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
210    return pos;    return pos;
211  }  }
212    
 static int dist2pixel(map_context_t *context, float km, float lat) {  
   gint 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;  
 }  
   
213  #define CLICK_FUZZ (24)  #define CLICK_FUZZ (24)
214    
215  static gboolean  static gboolean
# Line 586  on_map_button_press_event(GtkWidget *wid Line 236  on_map_button_press_event(GtkWidget *wid
236    return FALSE;    return FALSE;
237  }  }
238    
239    static void
240    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
241      /* convert the pixbuf into something cairo can handle */
242    
243      // Create a new ImageSurface
244      cairo_surface_t *image_surface =
245        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
246                                   gdk_pixbuf_get_width(buf),
247                                   gdk_pixbuf_get_height(buf));
248    
249      // Create the new Context for the ImageSurface
250      cairo_t *context = cairo_create(image_surface);
251    
252      // Draw the image on the new Context
253      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
254      cairo_paint(context);
255    
256      // now draw this onto the original context
257      cairo_set_source_surface(cr, image_surface, x, y);
258    
259      cairo_paint(cr);
260    }
261    
262    #ifndef BIG_BALLOONS
263    #define LINE_SKIP  7
264    #else
265    #define LINE_SKIP  12
266    #endif
267    
268    static void
269    balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
270      cache_t *cache = (cache_t*)data;
271    
272      //  printf("draw cb for \"%s\"\n", cache->name);
273    
274    #if 0
275      /* draw pink background to check clipping */
276      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
277      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
278      cairo_fill_preserve (cr);
279      cairo_set_line_width (cr, 0);
280      cairo_stroke (cr);
281    #endif
282    
283      /* leave a little border top and left */
284      gint x = rect->x, y = rect->y;
285    
286      /* draw the cache type icon ... */
287      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
288      cairo_draw_pixbuf(cr, icon, x, y);
289    
290      /* ... and right of it the waypoint id */
291      cairo_text_extents_t extents;
292    
293      if(cache->id) {
294        cairo_select_font_face (cr, "Sans",
295                                CAIRO_FONT_SLANT_NORMAL,
296                                CAIRO_FONT_WEIGHT_BOLD);
297    
298    #ifndef BIG_BALLOONS
299        cairo_set_font_size (cr, 20.0);
300    #else
301        cairo_set_font_size (cr, 36.0);
302    #endif
303    
304        cairo_text_extents (cr, cache->id, &extents);
305    
306        /* display id right of icon vertically centered */
307        x += gdk_pixbuf_get_width(icon) + 5;
308        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
309        cairo_move_to (cr, x, y);
310        cairo_set_source_rgba (cr, 0, 0, 0, 1);
311        cairo_show_text (cr, cache->id);
312        cairo_stroke (cr);
313    
314        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
315      } else
316        y += gdk_pixbuf_get_height(icon);
317    
318      /* return to the left border and below icon/text */
319      x = rect->x;
320    
321      /* everything from here uses the same font */
322      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
323                              CAIRO_FONT_WEIGHT_NORMAL);
324    #ifndef BIG_BALLOONS
325      cairo_set_font_size (cr, 14.0);
326    #else
327      cairo_set_font_size (cr, 22.0);
328    #endif
329    
330      if(cache->name) {
331        /* draw cache name */
332        cairo_text_extents (cr, cache->name, &extents);
333        y += extents.height;
334        cairo_move_to (cr, x, y);
335        cairo_set_source_rgba (cr, 0, 0, 0, 1);
336        cairo_show_text (cr, cache->name);
337        cairo_stroke (cr);
338    
339        /* return to the left border and below text */
340        y += LINE_SKIP;
341        x = rect->x;
342      }
343    
344      if(cache->terrain) {
345        /* draw cache rating */
346        const char *terrain = "Terrain:";
347        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
348        cairo_text_extents (cr, _(terrain), &extents);
349        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
350    
351        /* draw "Terrain:" string */
352        cairo_move_to (cr, x, y);
353        cairo_set_source_rgba (cr, 0, 0, 0, 1);
354        cairo_show_text (cr, _(terrain));
355        cairo_stroke (cr);
356        x += extents.width + 2;
357    
358        /* draw terrain stars */
359        cairo_draw_pixbuf(cr, icon, x, y -
360                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
361    
362        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
363        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
364      }
365    
366      if(cache->difficulty) {
367        const char *difficulty = "Difficulty:";
368        cairo_text_extents (cr, _(difficulty), &extents);
369        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
370    
371        /* draw "Difficulty:" string */
372        cairo_move_to (cr, x, y);
373        cairo_set_source_rgba (cr, 0, 0, 0, 1);
374        cairo_show_text (cr, _(difficulty));
375        cairo_stroke (cr);
376        x += extents.width + 2;
377    
378        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
379        cairo_draw_pixbuf(cr, icon, x, y -
380                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
381      }
382    }
383    
384  static gboolean  static gboolean
385  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
386                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
387    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
388    
389    if(context->press_on) {    if(context->press_on) {
390        coord_t coo;
391        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
392    
393      pos_t pos =      pos_t pos =
394        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
395    
396      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
397      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
398        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
399        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
400          cache_popup(context, nearest);  
401            osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
402                                     balloon_draw_cb, nearest);
403          }
404      }      }
405      context->press_on = NULL;      context->press_on = NULL;
406    } else {    } else {
# Line 613  on_map_button_release_event(GtkWidget *w Line 414  on_map_button_release_event(GtkWidget *w
414    return FALSE;    return FALSE;
415  }  }
416    
417  static void save_map_state(map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
418      appdata_t *appdata = context->appdata;
419    
420      printf("destroy map window\n");
421    
422    /* save map parameters */    /* save map parameters */
423    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
424    gint zoom;    gint zoom;
# Line 624  static void save_map_state(map_context_t Line 429  static void save_map_state(map_context_t
429    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
430    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
431    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
 }  
432    
433  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
 static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  
   printf("destroy map view\n");  
   
   save_map_state(context);  
   
434    /* restore cur_view */    /* restore cur_view */
435    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
436    #endif
437    
438    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
439    
440    g_free(context);    g_free(context);
441      appdata->map.context = NULL;
442  }  }
 #endif  
443    
444  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
445    map_context_t *context = g_new0(map_context_t, 1);    map_context_t *context = NULL;
446    context->appdata = appdata;  
447      /* if the map window already exists, just raise it */
448      if(appdata->map.context) {
449        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
450        return;
451      }
452    
453    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    context = appdata->map.context = g_new0(map_context_t, 1);
454      context->appdata = appdata;
455    
456    char *path = g_strdup_printf("%s/map/", appdata->image_path);    char *path = g_strdup_printf("%s/map/", appdata->image_path);
457    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
458    
459    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
460                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,                   "map-source",               MAP_SOURCE,
461                  "tile-cache", path,                   "tile-cache",               path,
462                  proxy?"proxy-uri":NULL, proxy,                   "auto-center",              FALSE,
463                     "record-trip-history",      FALSE,
464                     "show-trip-history",        FALSE,
465                     proxy?"proxy-uri":NULL,     proxy,
466                   NULL);                   NULL);
467    
468    g_free(path);    g_free(path);
469    
470      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
471    
472    char *name = NULL;    char *name = NULL;
473  #ifdef USE_MAEMO  #ifdef USE_MAEMO
474    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 678  void map(appdata_t *appdata) { Line 490  void map(appdata_t *appdata) {
490    char *title = g_strdup_printf(_("Map - %s"), name);    char *title = g_strdup_printf(_("Map - %s"), name);
491    g_free(name);    g_free(name);
492    
493  #if MAEMO_VERSION_MAJOR == 5  #ifdef USE_MAEMO
494    GtkWidget *window = hildon_stackable_window_new();  #ifdef USE_STACKABLE_WINDOW
495    gtk_window_set_title(GTK_WINDOW(window), title);    context->window = hildon_stackable_window_new();
496  #else  #else
497    GtkWidget *dialog = gtk_dialog_new_with_buttons(title,    context->window = hildon_window_new();
498                            GTK_WINDOW(appdata->window),  #endif
                           GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,  
                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,  
                           NULL);  
   
 #ifndef USE_MAEMO  
   gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);  
499  #else  #else
500    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
501  #endif  #endif
502    
503      gtk_window_set_title(GTK_WINDOW(context->window), title);
504    
505    #ifndef USE_MAEMO
506      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
507  #endif  #endif
508    
509    g_free(title);    g_free(title);
# Line 706  void map(appdata_t *appdata) { Line 517  void map(appdata_t *appdata) {
517    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
518                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
519    
   gtk_box_pack_start_defaults(GTK_BOX(hbox), context->widget);  
   /* zoom button box */  
   GtkWidget *vbox = gtk_vbox_new(FALSE,0);  
   
   context->zoomin =  
     map_add_button(GTK_STOCK_ZOOM_IN, G_CALLBACK(cb_map_zoomin),  
                    context, _("Zoom in"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomin, FALSE, FALSE, 0);  
   
   context->zoomout =  
     map_add_button(GTK_STOCK_ZOOM_OUT, G_CALLBACK(cb_map_zoomout),  
                    context, _("Zoom out"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomout, FALSE, FALSE, 0);  
   
   context->gps =  
     map_add_button(GTK_STOCK_HOME, G_CALLBACK(cb_map_gps),  
                    context, _("Jump to GPS position"));  
   gtk_widget_set_sensitive(context->gps, FALSE);  
520    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
521    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
   gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);  
   
   gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  
522    
523  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
524    /* prevent some of the main screen things */    /* prevent some of the main screen things */
525    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
526    appdata->cur_view = NULL;    appdata->cur_view = NULL;
527    #endif
528    
529    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
530                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
531    
532    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
533    gtk_widget_show_all(GTK_WIDGET(window));    gtk_widget_show_all(GTK_WIDGET(context->window));
   
 #else  
   gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);  
   gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);  
   gtk_widget_show_all(dialog);  
   gtk_dialog_run(GTK_DIALOG(dialog));  
   save_map_state(context);  
   gtk_timeout_remove(context->handler_id);  
   gtk_widget_destroy(dialog);  
   g_free(context);  
 #endif  
534  }  }
Legend:
Removed from v.48  
changed lines
  Added in v.73