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

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

revision 42 by harbaum, Mon Aug 3 19:18:13 2009 UTC revision 65 by harbaum, Wed Aug 19 14:21:14 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  #endif  #endif
27    
28  /* equatorial radius in meters */  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
29  #define EQ_RADIUS     (6378137.0)  #define GPS_DEFAULT_ZOOM 13
   
 #define RAD2DEG(a)  (((a)*180.0)/M_PI)  
 #define DEG2RAD(a)  (((a)*M_PI)/180.0)  
   
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *widget;  
   GtkWidget *zoomin, *zoomout, *gps;  
   gint handler_id;  
   cache_t *press_on;  
 #if MAEMO_VERSION_MAJOR == 5  
   GtkWidget *old_view;  
 #endif  
 } map_context_t;  
30    
31  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
32    
# Line 79  static const char *get_proxy_uri(appdata Line 66  static const char *get_proxy_uri(appdata
66    return NULL;    return NULL;
67  }  }
68    
69  static void map_zoom(map_context_t *context, int step) {  /* TODO: This needs to be wired to the GPS button in osm_gps_map */
70    int zoom;  #if 0
   OsmGpsMap *map = OSM_GPS_MAP(context->widget);  
   g_object_get(map, "zoom", &zoom, NULL);  
   zoom = osm_gps_map_set_zoom(map, zoom+step);  
   
   /* enable/disable zoom buttons as required */  
   gtk_widget_set_sensitive(context->zoomin, zoom<17);  
   gtk_widget_set_sensitive(context->zoomout, zoom>1);  
 }  
   
 static gboolean  
 cb_map_zoomin(GtkButton *button, map_context_t *context) {  
   map_zoom(context, +1);  
   return FALSE;  
 }  
   
 static gboolean  
 cb_map_zoomout(GtkButton *button, map_context_t *context) {  
   map_zoom(context, -1);  
   return FALSE;  
 }  
   
71  static gboolean  static gboolean
72  cb_map_gps(GtkButton *button, map_context_t *context) {  cb_map_gps(GtkButton *button, map_context_t *context) {
73    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
74    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
75      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
76                                refpos->lat, refpos->lon, 14);                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
77    } else {    } else {
78      /* no coordinates given: display the entire world */      /* no coordinates given: display the entire world */
79      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
# Line 116  cb_map_gps(GtkButton *button, map_contex Line 82  cb_map_gps(GtkButton *button, map_contex
82    
83    return FALSE;    return FALSE;
84  }  }
   
 static GtkWidget  
 *map_add_button(const gchar *icon, GCallback cb, gpointer data,  
                 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);  
85  #endif  #endif
86    return button;  
87    static int dist2pixel(map_context_t *context, float km, float lat) {
88      return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
89  }  }
90    
91  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
92    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
93    
94      /* get reference position ... */
95    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
96    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
97    
98    /* get reference position and go there */    /* ... and enable "goto" button if it's valid */
99    gtk_widget_set_sensitive(context->gps, ok);    /* TODO: gtk_widget_set_sensitive(context->gps, ok); */
100    
101      if(ok) {
102        float heading = NAN;
103        int radius = 0;
104    
105        if(context->appdata->use_gps) {
106          heading = gps_get_heading(context->appdata);
107    
108          /* get error */
109          float eph = gps_get_eph(context->appdata);
110          if(!isnan(eph))
111            radius = dist2pixel(context, eph/1000, refpos->lat);
112        }
113    
114        g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
115        osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
116                             refpos->lat, refpos->lon, heading);
117      } else
118        osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
119    
120    return TRUE;    return TRUE;
121  }  }
122    
# Line 146  static gboolean on_map_configure(GtkWidg Line 124  static gboolean on_map_configure(GtkWidg
124                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
125                                   map_context_t *context) {                                   map_context_t *context) {
126    
127    cb_map_gps(NULL, context);    /* set default values if they are invalid */
128      if(!context->appdata->map.zoom ||
129         isnan(context->appdata->map.pos.lat) ||
130         isnan(context->appdata->map.pos.lon)) {
131        printf("no valid map position found\n");
132    
133        pos_t *refpos = get_pos(context->appdata);
134        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
135          /* use gps position if present */
136          context->appdata->map.pos = *refpos;
137          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
138        } else {
139          /* use world map otherwise */
140          context->appdata->map.pos.lat = 0.0;
141          context->appdata->map.pos.lon = 0.0;
142          context->appdata->map.zoom = 1;
143        }
144      }
145    
146      /* jump to initial position */
147      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
148                                context->appdata->map.pos.lat,
149                                context->appdata->map.pos.lon,
150                                context->appdata->map.zoom);
151    
152    return FALSE;    return FALSE;
153  }  }
154    
# Line 162  static void map_draw_cachelist(GtkWidget Line 163  static void map_draw_cachelist(GtkWidget
163    }    }
164  }  }
165    
 /* 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");  
 }  
   
166  static void  static void
167  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
168                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 364  static cache_t *map_closest(map_context_ Line 206  static cache_t *map_closest(map_context_
206  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
207  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
208    pos_t pos;    pos_t pos;
209    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
210    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
211    return pos;    return pos;
212  }  }
213    
214  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 (10)  
215    
216  static gboolean  static gboolean
217  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
218                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
219    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
220    
221      /* got a press event without release event? eat it! */
222      if(context->press_on != NULL) {
223        printf("PRESS: already\n");
224        return TRUE;
225      }
226    
227    pos_t pos =    pos_t pos =
228      coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));      coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
229    
230    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
231    if(nearest) {    if(nearest) {
232      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
233      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
234        context->press_on = nearest;        context->press_on = nearest;
       return TRUE;  
     }  
235    }    }
236    
   context->press_on = NULL;  
237    return FALSE;    return FALSE;
238  }  }
239    
240    static void
241    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
242      /* convert the pixbuf into something cairo can handle */
243    
244      // Create a new ImageSurface
245      cairo_surface_t *image_surface =
246        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
247                                   gdk_pixbuf_get_width(buf),
248                                   gdk_pixbuf_get_height(buf));
249    
250      // Create the new Context for the ImageSurface
251      cairo_t *context = cairo_create(image_surface);
252    
253      // Draw the image on the new Context
254      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
255      cairo_paint(context);
256    
257      // now draw this onto the original context
258      cairo_set_source_surface(cr, image_surface, x, y);
259    
260      cairo_paint(cr);
261    }
262    
263    #ifndef BIG_BALLOONS
264    #define LINE_SKIP  7
265    #else
266    #define LINE_SKIP  12
267    #endif
268    
269    static void
270    balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
271      cache_t *cache = (cache_t*)data;
272    
273      //  printf("draw cb for \"%s\"\n", cache->name);
274    
275    #if 0
276      /* draw pink background to check clipping */
277      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
278      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
279      cairo_fill_preserve (cr);
280      cairo_set_line_width (cr, 0);
281      cairo_stroke (cr);
282    #endif
283    
284      /* leave a little border top and left */
285      gint x = rect->x, y = rect->y;
286    
287      /* draw the cache type icon ... */
288      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
289      cairo_draw_pixbuf(cr, icon, x, y);
290    
291      /* ... and right of it the waypoint id */
292      cairo_text_extents_t extents;
293    
294      if(cache->id) {
295        cairo_select_font_face (cr, "Sans",
296                                CAIRO_FONT_SLANT_NORMAL,
297                                CAIRO_FONT_WEIGHT_BOLD);
298    
299    #ifndef BIG_BALLOONS
300        cairo_set_font_size (cr, 20.0);
301    #else
302        cairo_set_font_size (cr, 36.0);
303    #endif
304    
305        cairo_text_extents (cr, cache->id, &extents);
306    
307        /* display id right of icon vertically centered */
308        x += gdk_pixbuf_get_width(icon) + 5;
309        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
310        cairo_move_to (cr, x, y);
311        cairo_set_source_rgba (cr, 0, 0, 0, 1);
312        cairo_show_text (cr, cache->id);
313        cairo_stroke (cr);
314    
315        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
316      } else
317        y += gdk_pixbuf_get_height(icon);
318    
319      /* return to the left border and below icon/text */
320      x = rect->x;
321    
322      /* everything from here uses the same font */
323      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
324                              CAIRO_FONT_WEIGHT_NORMAL);
325    #ifndef BIG_BALLOONS
326      cairo_set_font_size (cr, 14.0);
327    #else
328      cairo_set_font_size (cr, 24.0);
329    #endif
330    
331      if(cache->name) {
332        /* draw cache name */
333        cairo_text_extents (cr, cache->name, &extents);
334        y += extents.height;
335        cairo_move_to (cr, x, y);
336        cairo_set_source_rgba (cr, 0, 0, 0, 1);
337        cairo_show_text (cr, cache->name);
338        cairo_stroke (cr);
339    
340        /* return to the left border and below text */
341        y += LINE_SKIP;
342        x = rect->x;
343      }
344    
345      if(cache->terrain) {
346        /* draw cache rating */
347        const char *terrain = "Terrain:";
348        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
349        cairo_text_extents (cr, _(terrain), &extents);
350        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
351    
352        /* draw "Terrain:" string */
353        cairo_move_to (cr, x, y);
354        cairo_set_source_rgba (cr, 0, 0, 0, 1);
355        cairo_show_text (cr, _(terrain));
356        cairo_stroke (cr);
357        x += extents.width + 2;
358    
359        /* draw terrain stars */
360        cairo_draw_pixbuf(cr, icon, x, y -
361                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
362    
363        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
364        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
365      }
366    
367      if(cache->difficulty) {
368        const char *difficulty = "Difficulty:";
369        cairo_text_extents (cr, _(difficulty), &extents);
370        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
371    
372        /* draw "Difficulty:" string */
373        cairo_move_to (cr, x, y);
374        cairo_set_source_rgba (cr, 0, 0, 0, 1);
375        cairo_show_text (cr, _(difficulty));
376        cairo_stroke (cr);
377        x += extents.width + 2;
378    
379        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
380        cairo_draw_pixbuf(cr, icon, x, y -
381                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
382      }
383    }
384    
385  static gboolean  static gboolean
386  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
387                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
388      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
389    
390    if(context->press_on) {    if(context->press_on) {
391      OsmGpsMap *map = OSM_GPS_MAP(context->widget);      coord_t coo;
392        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
393    
394      pos_t pos =      pos_t pos =
395        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 417  on_map_button_release_event(GtkWidget *w Line 399  on_map_button_release_event(GtkWidget *w
399        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
400        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
401    
402          cache_popup(context, nearest);          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
403                                     balloon_draw_cb, nearest);
         context->press_on = NULL;  
         return TRUE;  
404        }        }
405      }      }
406        context->press_on = NULL;
407      } else {
408        /* save new map position */
409        gfloat lat, lon;
410        g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
411        context->appdata->map.pos.lat = lat;
412        context->appdata->map.pos.lon = lon;
413    }    }
414    
   context->press_on = NULL;  
415    return FALSE;    return FALSE;
416  }  }
417    
 #if MAEMO_VERSION_MAJOR == 5  
418  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
419    printf("destroy map view\n");    appdata_t *appdata = context->appdata;
420    
421      printf("destroy map window\n");
422    
423      /* save map parameters */
424      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
425      gint zoom;
426      g_object_get(map, "zoom", &zoom, NULL);
427      context->appdata->map.zoom = zoom;
428    
429      gfloat lat, lon;
430      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
431      context->appdata->map.pos.lat = lat;
432      context->appdata->map.pos.lon = lon;
433    
434    #if MAEMO_VERSION_MAJOR == 5
435    /* restore cur_view */    /* restore cur_view */
436    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
437    #endif
438    
439    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
440    
441    g_free(context);    g_free(context);
442      appdata->map.context = NULL;
443  }  }
 #endif  
444    
445  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
446    map_context_t *context = g_new0(map_context_t, 1);    map_context_t *context = NULL;
   context->appdata = appdata;  
447    
448    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* if the map window already exists, just raise it */
449      if(appdata->map.context) {
450        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
451        return;
452      }
453    
454      context = appdata->map.context = g_new0(map_context_t, 1);
455      context->appdata = appdata;
456    
457    char *path = g_strdup_printf("%s/map/", appdata->image_path);    char *path = g_strdup_printf("%s/map/", appdata->image_path);
458    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
459    
460    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
461                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,                   "map-source",               MAP_SOURCE,
462                  "tile-cache", path,                   "tile-cache",               path,
463                  proxy?"proxy-uri":NULL, proxy,                   "auto-center",              FALSE,
464                     "record-trip-history",      FALSE,
465                     "show-trip-history",        FALSE,
466                     proxy?"proxy-uri":NULL,     proxy,
467                   NULL);                   NULL);
468    
469    g_free(path);    g_free(path);
# Line 472  void map(appdata_t *appdata) { Line 482  void map(appdata_t *appdata) {
482  #ifdef USE_MAEMO  #ifdef USE_MAEMO
483    } else {    } else {
484      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);
485      name = g_strdup(_("appdata->cur_gpx->name"));      name = g_strdup(appdata->cur_gpx->name);
486    }    }
487  #endif  #endif
488    
489    char *title = g_strdup_printf(_("Map - %s"), name);    char *title = g_strdup_printf(_("Map - %s"), name);
490    g_free(name);    g_free(name);
491    
492  #if MAEMO_VERSION_MAJOR == 5  #ifdef USE_MAEMO
493    GtkWidget *window = hildon_stackable_window_new();  #ifdef USE_STACKABLE_WINDOW
494    gtk_window_set_title(GTK_WINDOW(window), title);    context->window = hildon_stackable_window_new();
495  #else  #else
496    GtkWidget *dialog = gtk_dialog_new_with_buttons(title,    context->window = hildon_window_new();
497                            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);  
498  #else  #else
499    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
500  #endif  #endif
501    
502      gtk_window_set_title(GTK_WINDOW(context->window), title);
503    
504    #ifndef USE_MAEMO
505      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
506  #endif  #endif
507    
508    g_free(title);    g_free(title);
# Line 507  void map(appdata_t *appdata) { Line 516  void map(appdata_t *appdata) {
516    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
517                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
518    
519    gtk_box_pack_start_defaults(GTK_BOX(hbox), context->widget);    /* TODO: gtk_widget_set_sensitive(context->gps, FALSE); */
520    /* 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);  
521    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
522    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);  
523    
524  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
525    /* prevent some of the main screen things */    /* prevent some of the main screen things */
526    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
527    appdata->cur_view = NULL;    appdata->cur_view = NULL;
528    #endif
529    
530    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
531                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
532    
533    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
534    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  
535  }  }
Legend:
Removed from v.42  
changed lines
  Added in v.65