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