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

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

revision 44 by harbaum, Tue Aug 4 14:07:18 2009 UTC revision 93 by harbaum, Wed Sep 2 12:25:51 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 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"
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  /* equatorial radius in meters */  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
35  #define EQ_RADIUS     (6378137.0)  #include <gdk/gdkx.h>
36    #include <X11/Xatom.h>
 #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;  
37  #endif  #endif
38  } map_context_t;  
39    // #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
40    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
41    // #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_GOOGLE_STREET
42    #define GPS_DEFAULT_ZOOM 13
43    
44  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
45    
# Line 79  static const char *get_proxy_uri(appdata Line 79  static const char *get_proxy_uri(appdata
79    return NULL;    return NULL;
80  }  }
81    
82  static void map_zoom(map_context_t *context, int step) {  static void
83    int zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
84    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(but == OSD_GPS) {
85    g_object_get(map, "zoom", &zoom, NULL);      pos_t *refpos = get_pos(context->appdata);
86    zoom = osm_gps_map_set_zoom(map, zoom+step);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
87          gint zoom;
88    /* enable/disable zoom buttons as required */        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
89    gtk_widget_set_sensitive(context->zoomin, zoom<17);        if(zoom < 10)
90    gtk_widget_set_sensitive(context->zoomout, zoom>1);          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
91  }                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
92          else
93  static gboolean          osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
94  cb_map_zoomin(GtkButton *button, map_context_t *context) {                                 refpos->lat, refpos->lon);
95    map_zoom(context, +1);  
96    return FALSE;        /* re-enable centering */
97  }        g_object_set(context->widget, "auto-center", TRUE, NULL);
98        } else {
99  static gboolean        /* no coordinates given: display the entire world */
100  cb_map_zoomout(GtkButton *button, map_context_t *context) {        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
101    map_zoom(context, -1);                                  0.0, 0.0, 1);
102    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, 14);  
   } else {  
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
103    }    }
   
   return FALSE;  
104  }  }
105    
106  static GtkWidget  static int dist2pixel(map_context_t *context, float km, float lat) {
107  *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_MENU));  
   g_signal_connect(button, "clicked", cb, data);  
 #ifndef USE_MAEMO  
   gtk_widget_set_tooltip_text(button, tooltip);  
 #endif  
   return button;  
108  }  }
109    
110  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
111    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
112    
113      /* get reference position ... */
114    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
115    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
116    
117    /* get reference position and go there */    /* ... and enable "goto" button if it's valid */
118    gtk_widget_set_sensitive(context->gps, ok);    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
119                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
120    
121      if(ok) {
122        float heading = NAN;
123        int radius = 0;
124    
125        if(context->appdata->use_gps) {
126          heading = gps_get_heading(context->appdata);
127    
128          /* get error */
129          float eph = gps_get_eph(context->appdata);
130          if(!isnan(eph))
131            radius = dist2pixel(context, eph/1000, refpos->lat);
132        }
133    
134        g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
135        osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
136                             refpos->lat, refpos->lon, heading);
137      } else
138        osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
139    
140    return TRUE;    return TRUE;
141  }  }
142    
# Line 146  static gboolean on_map_configure(GtkWidg Line 144  static gboolean on_map_configure(GtkWidg
144                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
145                                   map_context_t *context) {                                   map_context_t *context) {
146    
147    cb_map_gps(NULL, context);    if(!context->map_complete) {
148    
149        /* set default values if they are invalid */
150        if(!context->appdata->map.zoom ||
151           isnan(context->appdata->map.pos.lat) ||
152           isnan(context->appdata->map.pos.lon)) {
153          printf("no valid map position found\n");
154    
155          pos_t *refpos = get_pos(context->appdata);
156          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
157            /* use gps position if present */
158            context->appdata->map.pos = *refpos;
159            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
160          } else {
161            /* use world map otherwise */
162            context->appdata->map.pos.lat = 0.0;
163            context->appdata->map.pos.lon = 0.0;
164            context->appdata->map.zoom = 1;
165          }
166        }
167    
168        /* jump to initial position */
169        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
170                                  context->appdata->map.pos.lat,
171                                  context->appdata->map.pos.lon,
172                                  context->appdata->map.zoom);
173        context->map_complete = TRUE;
174      }
175    
176    return FALSE;    return FALSE;
177  }  }
# Line 162  static void map_draw_cachelist(GtkWidget Line 187  static void map_draw_cachelist(GtkWidget
187    }    }
188  }  }
189    
 /* draw a nice popup */  
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *window;  
   GMainLoop *loop;  
 } popup_context_t;  
   
   
 #ifndef USE_HILDON  
 #define POPUP_WIDTH  300  
 #define POPUP_HEIGHT 100  
 #else  
 #define POPUP_WIDTH  600  
 #define POPUP_HEIGHT 200  
 #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);  
 }  
   
 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;  
   osm_gps_map_geographic_to_screen(OSM_GPS_MAP(mcontext->widget),  
                                    cache->pos.lat, cache->pos.lon,  
                                    &x, &y);  
   
   printf("screen pos %d/%d\n", x, y);  
   
   gdk_window_get_origin(mcontext->widget->window, &x, &y);  
   printf("window = %d/%d %d/%d\n", x, y,  
          mcontext->widget->allocation.x,  
          mcontext->widget->allocation.y);  
   
   //  gtk_window_move(GTK_WINDOW(pcontext.window),  
   //              x + button->allocation.x,  
   //              y + button->allocation.y - HEIGHT);  
   
   
   gtk_window_move(GTK_WINDOW(pcontext.window),  
                   100,  
                   100);  
   
   /* 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(pcontext.window), frame);  
   
   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");  
 }  
   
190  static void  static void
191  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
192                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 364  static cache_t *map_closest(map_context_ Line 230  static cache_t *map_closest(map_context_
230  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
231  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
232    pos_t pos;    pos_t pos;
233    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
234    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
235    return pos;    return pos;
236  }  }
237    
238  static int dist2pixel(map_context_t *context, float km, float lat) {  #define CLICK_FUZZ (24)
   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)  
239    
240  static gboolean  static gboolean
241  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
242                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
243    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
244    
245      /* check if we actually clicked parts of the OSD */
246      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
247        return FALSE;
248    
249    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
250    if(context->press_on != NULL) {    if(context->press_on != NULL) {
251      printf("PRESS: already\n");      printf("PRESS: already\n");
252      return TRUE;      return FALSE;
253    }    }
254    
255    pos_t pos =    pos_t pos =
# Line 406  on_map_button_press_event(GtkWidget *wid Line 265  on_map_button_press_event(GtkWidget *wid
265    return FALSE;    return FALSE;
266  }  }
267    
268    static void
269    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
270      /* convert the pixbuf into something cairo can handle */
271    
272      // Create a new ImageSurface
273      cairo_surface_t *image_surface =
274        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
275                                   gdk_pixbuf_get_width(buf),
276                                   gdk_pixbuf_get_height(buf));
277    
278      // Create the new Context for the ImageSurface
279      cairo_t *context = cairo_create(image_surface);
280    
281      // Draw the image on the new Context
282      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
283      cairo_paint(context);
284    
285      // now draw this onto the original context
286      cairo_set_source_surface(cr, image_surface, x, y);
287    
288      cairo_paint(cr);
289    }
290    
291    #ifndef BIG_BALLOONS
292    #define LINE_SKIP  7
293    #else
294    #define LINE_SKIP  12
295    #endif
296    
297    static void
298    balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
299      cache_t *cache = (cache_t*)data;
300    
301    #if 0
302      /* draw pink background to check clipping */
303      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
304      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
305      cairo_fill_preserve (cr);
306      cairo_set_line_width (cr, 0);
307      cairo_stroke (cr);
308    #endif
309    
310      /* leave a little border top and left */
311      gint x = rect->x, y = rect->y;
312    
313      /* draw the cache type icon ... */
314      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
315      cairo_draw_pixbuf(cr, icon, x, y);
316    
317      /* ... and right of it the waypoint id */
318      cairo_text_extents_t extents;
319    
320      if(cache->id) {
321        cairo_select_font_face (cr, "Sans",
322                                CAIRO_FONT_SLANT_NORMAL,
323                                CAIRO_FONT_WEIGHT_BOLD);
324    
325    #ifndef BIG_BALLOONS
326        cairo_set_font_size (cr, 20.0);
327    #else
328        cairo_set_font_size (cr, 36.0);
329    #endif
330    
331        cairo_text_extents (cr, cache->id, &extents);
332    
333        /* display id right of icon vertically centered */
334        x += gdk_pixbuf_get_width(icon) + 5;
335        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
336        cairo_move_to (cr, x, y);
337        cairo_set_source_rgba (cr, 0, 0, 0, 1);
338        cairo_show_text (cr, cache->id);
339        cairo_stroke (cr);
340    
341        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
342      } else
343        y += gdk_pixbuf_get_height(icon);
344    
345      /* return to the left border and below icon/text */
346      x = rect->x;
347    
348      /* everything from here uses the same font */
349      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
350                              CAIRO_FONT_WEIGHT_NORMAL);
351    #ifndef BIG_BALLOONS
352      cairo_set_font_size (cr, 14.0);
353    #else
354      cairo_set_font_size (cr, 22.0);
355    #endif
356    
357      if(cache->name) {
358        /* draw cache name */
359        cairo_text_extents (cr, cache->name, &extents);
360        y += extents.height;
361        cairo_move_to (cr, x, y);
362        cairo_set_source_rgba (cr, 0, 0, 0, 1);
363        cairo_show_text (cr, cache->name);
364        cairo_stroke (cr);
365    
366        /* return to the left border and below text */
367        y += LINE_SKIP;
368        x = rect->x;
369      }
370    
371      if(cache->terrain) {
372        /* draw cache rating */
373        const char *terrain = "Terrain:";
374        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
375        cairo_text_extents (cr, _(terrain), &extents);
376        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
377    
378        /* draw "Terrain:" string */
379        cairo_move_to (cr, x, y);
380        cairo_set_source_rgba (cr, 0, 0, 0, 1);
381        cairo_show_text (cr, _(terrain));
382        cairo_stroke (cr);
383        x += extents.width + 2;
384    
385        /* draw terrain stars */
386        cairo_draw_pixbuf(cr, icon, x, y -
387                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
388    
389        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
390        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
391      }
392    
393      if(cache->difficulty) {
394        const char *difficulty = "Difficulty:";
395        cairo_text_extents (cr, _(difficulty), &extents);
396        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
397    
398        /* draw "Difficulty:" string */
399        cairo_move_to (cr, x, y);
400        cairo_set_source_rgba (cr, 0, 0, 0, 1);
401        cairo_show_text (cr, _(difficulty));
402        cairo_stroke (cr);
403        x += extents.width + 2;
404    
405        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
406        cairo_draw_pixbuf(cr, icon, x, y -
407                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
408      }
409    }
410    
411  static gboolean  static gboolean
412  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
413                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
414      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
415    
416    if(context->press_on) {    if(context->press_on) {
417      OsmGpsMap *map = OSM_GPS_MAP(context->widget);      coord_t coo;
418        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
419    
420      pos_t pos =      pos_t pos =
421        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
# Line 418  on_map_button_release_event(GtkWidget *w Line 423  on_map_button_release_event(GtkWidget *w
423      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
424      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
425        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
426        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
427          cache_popup(context, nearest);  
428            osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
429                                     balloon_draw_cb, nearest);
430          }
431      }      }
432      context->press_on = NULL;      context->press_on = NULL;
433      } else {
434        /* save new map position */
435        gfloat lat, lon;
436        g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
437        context->appdata->map.pos.lat = lat;
438        context->appdata->map.pos.lon = lon;
439    }    }
440    
441    return FALSE;    return FALSE;
442  }  }
443    
   
 #if MAEMO_VERSION_MAJOR == 5  
444  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
445    printf("destroy map view\n");    appdata_t *appdata = context->appdata;
446    
447      printf("destroy map window\n");
448    
449      /* save map parameters */
450      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
451      gint zoom;
452      g_object_get(map, "zoom", &zoom, NULL);
453      context->appdata->map.zoom = zoom;
454    
455      gfloat lat, lon;
456      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
457      context->appdata->map.pos.lat = lat;
458      context->appdata->map.pos.lon = lon;
459    
460      gint source;
461      g_object_get(map, "map-source", &source, NULL);
462      context->appdata->map.source = source;
463    
464    #if MAEMO_VERSION_MAJOR == 5
465    /* restore cur_view */    /* restore cur_view */
466    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
467    #endif
468    
469    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
470    
471    g_free(context);    g_free(context);
472      appdata->map.context = NULL;
473    }
474    
475    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
476    /* get access to zoom buttons */
477    static void
478    on_window_realize(GtkWidget *widget, gpointer data) {
479      if (widget->window) {
480        unsigned char value = 1;
481        Atom hildon_zoom_key_atom =
482          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
483          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
484        Display *dpy =
485          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
486        Window w = GDK_WINDOW_XID(widget->window);
487    
488        XChangeProperty(dpy, w, hildon_zoom_key_atom,
489                        integer_atom, 8, PropModeReplace, &value, 1);
490      }
491  }  }
492  #endif  #endif
493    
494  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
495    map_context_t *context = g_new0(map_context_t, 1);    map_context_t *context = NULL;
496    
497      /* if the map window already exists, just raise it */
498      if(appdata->map.context) {
499        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
500        return;
501      }
502    
503      context = appdata->map.context = g_new0(map_context_t, 1);
504    context->appdata = appdata;    context->appdata = appdata;
505      context->map_complete = FALSE;
506    
507    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
508      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
509      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
510        printf("old file path %s exists\n", old_path);
511        rmdir_recursive(old_path);
512      }
513    
514      /* It is recommanded that all applications share these same */
515      /* map path, so data is only cached once. The path should be: */
516      /* ~/.osm-gps-map on standard PC     (users home) */
517      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
518      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
519    #if !defined(USE_MAEMO)
520      char *p = getenv("HOME");
521      if(!p) p = "/tmp";
522      char *path = g_strdup_printf("%s/.osm-gps-map", p);
523    #else
524    #if MAEMO_VERSION_MAJOR == 5
525      char *path = g_strdup("/home/user/.osm-gps-map");
526    #else
527      char *path = g_strdup("/media/mmc2/osm-gps-map");
528    #endif
529    #endif
530    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
531    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
532    
533      gint source = context->appdata->map.source;
534      if(!source) source = MAP_SOURCE;
535    
536    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
537                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,                   "map-source",               source,
538                  "tile-cache", path,                   "tile-cache",               path,
539                  proxy?"proxy-uri":NULL, proxy,                   "auto-center",              FALSE,
540                     "record-trip-history",      FALSE,
541                     "show-trip-history",        FALSE,
542                     proxy?"proxy-uri":NULL,     proxy,
543                   NULL);                   NULL);
544    
545    g_free(path);    g_free(path);
546    
547      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
548    
549    char *name = NULL;    char *name = NULL;
550  #ifdef USE_MAEMO  #ifdef USE_MAEMO
551    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 478  void map(appdata_t *appdata) { Line 567  void map(appdata_t *appdata) {
567    char *title = g_strdup_printf(_("Map - %s"), name);    char *title = g_strdup_printf(_("Map - %s"), name);
568    g_free(name);    g_free(name);
569    
570  #if MAEMO_VERSION_MAJOR == 5  #ifdef USE_MAEMO
571    GtkWidget *window = hildon_stackable_window_new();  #ifdef USE_STACKABLE_WINDOW
572    gtk_window_set_title(GTK_WINDOW(window), title);    context->window = hildon_stackable_window_new();
573      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
574      /* at runtime with cygwin x */
575    #ifndef __i386__
576      g_signal_connect(G_OBJECT(context->window), "realize",
577                       G_CALLBACK(on_window_realize), NULL);
578    #endif // MAEMO_VERSION
579  #else  #else
580    GtkWidget *dialog = gtk_dialog_new_with_buttons(title,    context->window = hildon_window_new();
581                            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), 400, 350);  
582  #else  #else
583    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
584  #endif  #endif
585    
586      gtk_window_set_title(GTK_WINDOW(context->window), title);
587    
588    #ifndef USE_MAEMO
589      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
590  #endif  #endif
591    
592    g_free(title);    g_free(title);
# Line 506  void map(appdata_t *appdata) { Line 600  void map(appdata_t *appdata) {
600    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
601                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
602    
   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);  
603    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
604    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);  
605    
606  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
607    /* prevent some of the main screen things */    /* prevent some of the main screen things */
608    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
609    appdata->cur_view = NULL;    appdata->cur_view = NULL;
610    #endif
611    
612    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
613                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
614    
615    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
616    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));  
   gtk_timeout_remove(context->handler_id);  
   gtk_widget_destroy(dialog);  
   g_free(context);  
 #endif  
617  }  }
Legend:
Removed from v.44  
changed lines
  Added in v.93