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