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

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

revision 35 by harbaum, Thu Jul 30 08:29:52 2009 UTC revision 125 by harbaum, Sun Sep 27 19:11:37 2009 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2008 Till Harbaum <till@harbaum.org>.   * Copyright (C) 2008-2009 Till Harbaum <till@harbaum.org>.
3   *   *
4   * This file is part of GPXView.   * This file is part of GPXView.
5   *   *
# Line 17  Line 17 
17   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
18   */   */
19    
20    /*
21     * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png  8-15
22     * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23     */
24    
25  #include "gpxview.h"  #include "gpxview.h"
26    #include "converter.h"
27  #include <math.h>    // for isnan  #include <math.h>    // for isnan
28    
29  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
30  #include "osm-gps-map.h"  #include "osm-gps-map.h"
31    #include "osm-gps-map-osd-classic.h"
32    #endif
33    
34    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
35    #include <gdk/gdkx.h>
36    #include <X11/Xatom.h>
37  #endif  #endif
38    
39  typedef struct {  /* default values */
40    appdata_t *appdata;  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
41    GtkWidget *widget;  #define GPS_DEFAULT_ZOOM 13
   GtkWidget *zoomin, *zoomout, *gps;  
   gint handler_id;  
 } map_context_t;  
42    
43  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
44    
# Line 69  static const char *get_proxy_uri(appdata Line 78  static const char *get_proxy_uri(appdata
78    return NULL;    return NULL;
79  }  }
80    
81  static void map_zoom(map_context_t *context, int step) {  static void
82    int zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
83    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(but == OSD_GPS) {
84    g_object_get(map, "zoom", &zoom, NULL);      pos_t *refpos = get_pos(context->appdata);
85    zoom = osm_gps_map_set_zoom(map, zoom+step);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
86          gint zoom;
87          g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
88          if(zoom < 10)
89            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
90                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
91          else
92            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
93                                   refpos->lat, refpos->lon);
94    
95          /* re-enable centering */
96          g_object_set(context->widget, "auto-center", TRUE, NULL);
97        } else {
98          /* no coordinates given: display the entire world */
99          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
100                                    0.0, 0.0, 1);
101        }
102      }
103    }
104    
105    /* enable/disable zoom buttons as required */  static int dist2pixel(map_context_t *context, float km, float lat) {
106    gtk_widget_set_sensitive(context->zoomin, zoom<17);    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
   gtk_widget_set_sensitive(context->zoomout, zoom>1);  
107  }  }
108    
109  static gboolean  static gboolean map_gps_update(gpointer data) {
110  cb_map_zoomin(GtkButton *button, map_context_t *context) {    map_context_t *context = (map_context_t*)data;
111    map_zoom(context, +1);  
112      /* get reference position ... */
113      pos_t *refpos = get_pos(context->appdata);
114      gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
115    
116      /* ... and enable "goto" button if it's valid */
117      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
118                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
119    
120      if(ok) {
121        float heading = NAN;
122        int radius = 0;
123    
124        if(context->appdata->use_gps) {
125          heading = gps_get_heading(context->appdata);
126    
127          /* get error */
128          float eph = gps_get_eph(context->appdata);
129          if(!isnan(eph))
130            radius = dist2pixel(context, eph/1000, refpos->lat);
131        }
132    
133        g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
134        osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
135                             refpos->lat, refpos->lon, heading);
136      } else
137        osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
138    
139      return TRUE;
140    }
141    
142    static gboolean on_map_configure(GtkWidget *widget,
143                                     GdkEventConfigure *event,
144                                     map_context_t *context) {
145    
146      if(!context->map_complete) {
147    
148        /* set default values if they are invalid */
149        if(!context->appdata->map.zoom ||
150           isnan(context->appdata->map.pos.lat) ||
151           isnan(context->appdata->map.pos.lon)) {
152          printf("no valid map position found\n");
153    
154          pos_t *refpos = get_pos(context->appdata);
155          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
156            /* use gps position if present */
157            context->appdata->map.pos = *refpos;
158            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
159          } else {
160            /* use world map otherwise */
161            context->appdata->map.pos.lat = 0.0;
162            context->appdata->map.pos.lon = 0.0;
163            context->appdata->map.zoom = 1;
164          }
165        }
166    
167        /* jump to initial position */
168        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
169                                  context->appdata->map.pos.lat,
170                                  context->appdata->map.pos.lon,
171                                  context->appdata->map.zoom);
172        context->map_complete = TRUE;
173      }
174    
175    return FALSE;    return FALSE;
176  }  }
177    
178    static void map_draw_cache(GtkWidget *map, cache_t *cache) {
179      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
180    
181      /* check if there's also an overwritten coordinate */
182      if(cache->notes && cache->notes->override) {
183        GdkPixbuf *over = icon_get(ICON_MISC, 1);
184    
185        osm_gps_map_add_image(OSM_GPS_MAP(map),
186              cache->notes->pos.lat, cache->notes->pos.lon, icon);
187    
188        osm_gps_map_add_image(OSM_GPS_MAP(map),
189              cache->notes->pos.lat, cache->notes->pos.lon, over);
190      } else
191        osm_gps_map_add_image(OSM_GPS_MAP(map),
192                              cache->pos.lat, cache->pos.lon, icon);
193    
194    }
195    
196    static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {
197      if(!gpx->notes_loaded) {
198        notes_load_all(appdata, gpx);
199        gpx->notes_loaded = TRUE;
200      }
201    
202      cache_t *cache = gpx->cache;
203      while(cache) {
204        map_draw_cache(map, cache);
205        cache = cache->next;
206      }
207    }
208    
209    static void
210    map_cachelist_nearest(cache_t *cache, pos_t *pos,
211                          cache_t **result, float *distance) {
212      while(cache) {
213        pos_t cpos = gpx_cache_pos(cache);
214    
215        float dist =
216          pow(cpos.lat - pos->lat, 2) +
217          pow(cpos.lon - pos->lon, 2);
218    
219        if(!(dist > *distance)) {
220          *result = cache;
221          *distance = dist;
222        }
223    
224        cache = cache->next;
225      }
226    }
227    
228    static cache_t *map_closest(map_context_t *context, pos_t *pos) {
229      cache_t *result = NULL;
230      float distance = NAN;
231    
232    #ifdef USE_MAEMO
233      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
234    #endif
235        /* search all geocaches */
236        gpx_t *gpx = context->appdata->gpx;
237        while(gpx) {
238          map_cachelist_nearest(gpx->cache, pos, &result, &distance);
239          gpx = gpx->next;
240        }
241    #ifdef USE_MAEMO
242      } else if(context->appdata->cur_gpx) {
243        map_cachelist_nearest(context->appdata->cur_gpx->cache,
244                              pos, &result, &distance);
245      } else
246        result = context->appdata->cur_gpx->cache;
247    #endif
248    
249      return result;
250    }
251    
252    /* translate between osm-gps-map positions and gpxview ones */
253    pos_t coord2pos(coord_t coo) {
254      pos_t pos;
255      pos.lat = rad2deg(coo.rlat);
256      pos.lon = rad2deg(coo.rlon);
257      return pos;
258    }
259    
260    #define CLICK_FUZZ (24)
261    
262  static gboolean  static gboolean
263  cb_map_zoomout(GtkButton *button, map_context_t *context) {  on_map_button_press_event(GtkWidget *widget,
264    map_zoom(context, -1);                              GdkEventButton *event, map_context_t *context) {
265      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
266    
267      /* check if we actually clicked parts of the OSD */
268      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
269        return FALSE;
270    
271      /* got a press event without release event? eat it! */
272      if(context->press_on != NULL) {
273        printf("PRESS: already\n");
274        return FALSE;
275      }
276    
277      pos_t pos =
278        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
279    
280      cache_t *nearest = map_closest(context, &pos);
281      if(nearest) {
282        pos_t cpos = gpx_cache_pos(nearest);
283    
284        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
285        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
286          context->press_on = nearest;
287      }
288    
289    return FALSE;    return FALSE;
290  }  }
291    
292    static void
293    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
294      /* convert the pixbuf into something cairo can handle */
295    
296      // Create a new ImageSurface
297      cairo_surface_t *image_surface =
298        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
299                                   gdk_pixbuf_get_width(buf),
300                                   gdk_pixbuf_get_height(buf));
301    
302      // Create the new Context for the ImageSurface
303      cairo_t *context = cairo_create(image_surface);
304    
305      // Draw the image on the new Context
306      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
307      cairo_paint(context);
308    
309      // now draw this onto the original context
310      cairo_set_source_surface(cr, image_surface, x, y);
311    
312      cairo_paint(cr);
313    }
314    
315    #ifndef BIG_BALLOONS
316    #define LINE_SKIP  7
317    #else
318    #define LINE_SKIP  12
319    #endif
320    
321    static void
322    balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
323      cache_t *cache = (cache_t*)data;
324    
325    #if 0
326      /* draw pink background to check clipping */
327      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
328      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
329      cairo_fill_preserve (cr);
330      cairo_set_line_width (cr, 0);
331      cairo_stroke (cr);
332    #endif
333    
334      /* leave a little border top and left */
335      gint x = rect->x, y = rect->y;
336    
337      /* draw the cache type icon ... */
338      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
339      cairo_draw_pixbuf(cr, icon, x, y);
340    
341      if(cache->notes && cache->notes->override) {
342        GdkPixbuf *over = icon_get(ICON_MISC, 1);
343        cairo_draw_pixbuf(cr, over, x, y);
344      }
345    
346      /* ... and right of it the waypoint id */
347      cairo_text_extents_t extents;
348    
349      if(cache->id) {
350        cairo_select_font_face (cr, "Sans",
351                                CAIRO_FONT_SLANT_NORMAL,
352                                CAIRO_FONT_WEIGHT_BOLD);
353    
354    #ifndef BIG_BALLOONS
355        cairo_set_font_size (cr, 20.0);
356    #else
357        cairo_set_font_size (cr, 36.0);
358    #endif
359    
360        cairo_text_extents (cr, cache->id, &extents);
361    
362        /* display id right of icon vertically centered */
363        x += gdk_pixbuf_get_width(icon) + 5;
364        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
365        cairo_move_to (cr, x, y);
366        cairo_set_source_rgba (cr, 0, 0, 0, 1);
367        cairo_show_text (cr, cache->id);
368        cairo_stroke (cr);
369    
370        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
371      } else
372        y += gdk_pixbuf_get_height(icon);
373    
374      /* return to the left border and below icon/text */
375      x = rect->x;
376    
377      /* everything from here uses the same font */
378      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
379                              CAIRO_FONT_WEIGHT_NORMAL);
380    #ifndef BIG_BALLOONS
381      cairo_set_font_size (cr, 14.0);
382    #else
383      cairo_set_font_size (cr, 22.0);
384    #endif
385    
386      if(cache->name) {
387        /* draw cache name */
388        cairo_text_extents (cr, cache->name, &extents);
389        y += extents.height;
390        cairo_move_to (cr, x, y);
391        cairo_set_source_rgba (cr, 0, 0, 0, 1);
392        cairo_show_text (cr, cache->name);
393        cairo_stroke (cr);
394    
395        /* return to the left border and below text */
396        y += LINE_SKIP;
397        x = rect->x;
398      }
399    
400      if(cache->terrain) {
401        /* draw cache rating */
402        const char *terrain = "Terrain:";
403        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
404        cairo_text_extents (cr, _(terrain), &extents);
405        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
406    
407        /* draw "Terrain:" string */
408        cairo_move_to (cr, x, y);
409        cairo_set_source_rgba (cr, 0, 0, 0, 1);
410        cairo_show_text (cr, _(terrain));
411        cairo_stroke (cr);
412        x += extents.width + 2;
413    
414        /* draw terrain stars */
415        cairo_draw_pixbuf(cr, icon, x, y -
416                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
417    
418        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
419        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
420      }
421    
422      if(cache->difficulty) {
423        const char *difficulty = "Difficulty:";
424        cairo_text_extents (cr, _(difficulty), &extents);
425        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
426    
427        /* draw "Difficulty:" string */
428        cairo_move_to (cr, x, y);
429        cairo_set_source_rgba (cr, 0, 0, 0, 1);
430        cairo_show_text (cr, _(difficulty));
431        cairo_stroke (cr);
432        x += extents.width + 2;
433    
434        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
435        cairo_draw_pixbuf(cr, icon, x, y -
436                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
437      }
438    }
439    
440  static gboolean  static gboolean
441  cb_map_gps(GtkButton *button, map_context_t *context) {  on_map_button_release_event(GtkWidget *widget,
442    pos_t *refpos = get_pos(context->appdata);                              GdkEventButton *event, map_context_t *context) {
443    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
444      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
445                                refpos->lat, refpos->lon, 14);    if(context->press_on) {
446        coord_t coo;
447        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
448    
449        pos_t pos =
450          coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
451    
452        cache_t *nearest = map_closest(context, &pos);
453        if(nearest && nearest == context->press_on) {
454          pos_t cpos = gpx_cache_pos(nearest);
455    
456          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
457          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
458    
459            osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
460                                         balloon_draw_cb, nearest);
461    
462            osm_gps_map_osd_draw_nav (map, cpos.lat, cpos.lon, nearest->name);
463    
464          }
465        }
466        context->press_on = NULL;
467    } else {    } else {
468      /* no coordinates given: display the entire world */      /* save new map position */
469      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      gfloat lat, lon;
470                                0.0, 0.0, 1);      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
471        context->appdata->map.pos.lat = lat;
472        context->appdata->map.pos.lon = lon;
473    }    }
474    
475    return FALSE;    return FALSE;
476  }  }
477    
478  static GtkWidget  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
479  *map_add_button(const gchar *icon, GCallback cb, gpointer data,    appdata_t *appdata = context->appdata;
480                  char *tooltip) {  
481    GtkWidget *button = gtk_button_new();    printf("destroy map window\n");
482    gtk_button_set_image(GTK_BUTTON(button),  
483                         gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU));    /* save map parameters */
484    g_signal_connect(button, "clicked", cb, data);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
485  #ifndef USE_MAEMO    gint zoom;
486    gtk_widget_set_tooltip_text(button, tooltip);    g_object_get(map, "zoom", &zoom, NULL);
487      context->appdata->map.zoom = zoom;
488    
489      gfloat lat, lon;
490      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
491      context->appdata->map.pos.lat = lat;
492      context->appdata->map.pos.lon = lon;
493    
494      gint source;
495      g_object_get(map, "map-source", &source, NULL);
496      context->appdata->map.source = source;
497    
498    #if MAEMO_VERSION_MAJOR == 5
499      /* restore cur_view */
500      context->appdata->cur_view = context->old_view;
501  #endif  #endif
   return button;  
 }  
502    
503  static gboolean map_gps_update(gpointer data) {    gtk_timeout_remove(context->handler_id);
   map_context_t *context = (map_context_t*)data;  
504    
505    pos_t *refpos = get_pos(context->appdata);    g_free(context);
506    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    appdata->map.context = NULL;
507    }
508    
509    /* get reference position and go there */  #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
510    gtk_widget_set_sensitive(context->gps, ok);  /* get access to zoom buttons */
511    static void
512    on_window_realize(GtkWidget *widget, gpointer data) {
513      if (widget->window) {
514        unsigned char value = 1;
515        Atom hildon_zoom_key_atom =
516          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
517          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
518        Display *dpy =
519          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
520        Window w = GDK_WINDOW_XID(widget->window);
521    
522    return TRUE;      XChangeProperty(dpy, w, hildon_zoom_key_atom,
523                        integer_atom, 8, PropModeReplace, &value, 1);
524      }
525  }  }
526    #endif
527    
528  static gboolean on_map_configure(GtkWidget *widget,  /* draw geocaches and set window title */
529                                   GdkEventConfigure *event,  static void map_setup(map_context_t *context) {
530                                   map_context_t *context) {    char *name = NULL;
531    
532    cb_map_gps(NULL, context);    /* clear all existing ccahe images */
533      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
534    
535    return FALSE;  #ifdef USE_MAEMO
536      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
537    #endif
538        /* draw all geocaches */
539        gpx_t *gpx = context->appdata->gpx;
540        while(gpx) {
541          map_draw_gpx(context->appdata, context->widget, gpx);
542          gpx = gpx->next;
543        }
544        name = g_strdup(_("all"));
545    #ifdef USE_MAEMO
546      } else if(!context->appdata->cur_cache) {
547        map_draw_gpx(context->appdata, context->widget, context->appdata->cur_gpx);
548        name = g_strdup(context->appdata->cur_gpx->name);
549      } else {
550        map_draw_cache(context->widget, context->appdata->cur_cache);
551        name = g_strdup(context->appdata->cur_cache->name);
552      }
553    #endif
554    
555      char *title = g_strdup_printf(_("Map - %s"), name);
556      g_free(name);
557    
558      gtk_window_set_title(GTK_WINDOW(context->window), title);
559    
560      g_free(title);
561  }  }
562    
563  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
564    map_context_t context;    map_context_t *context = NULL;
   context.appdata = appdata;  
565    
566    GtkWidget *dialog = gtk_dialog_new_with_buttons(_("Map"),    /* if the map window already exists, just raise it */
567                            GTK_WINDOW(appdata->window),    if(appdata->map.context) {
568                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,      printf("using existing map!\n");
569                            GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
570                            NULL);      map_setup(appdata->map.context);
571        return;
572      }
573    
574  #ifndef USE_MAEMO    context = appdata->map.context = g_new0(map_context_t, 1);
575    gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 350);    context->appdata = appdata;
576      context->map_complete = FALSE;
577    
578      /* cleanup old (pre 0.8.7) path if it exists */
579      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
580      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
581        printf("old file path %s exists\n", old_path);
582        rmdir_recursive(old_path);
583      }
584    
585      /* It is recommanded that all applications share these same */
586      /* map path, so data is only cached once. The path should be: */
587      /* ~/.osm-gps-map on standard PC     (users home) */
588      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
589      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
590    #if !defined(USE_MAEMO)
591      char *p = getenv("HOME");
592      if(!p) p = "/tmp";
593      char *path = g_strdup_printf("%s/.osm-gps-map", p);
594  #else  #else
595    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);  #if MAEMO_VERSION_MAJOR == 5
596      char *path = g_strdup("/home/user/.osm-gps-map");
597    #else
598      char *path = g_strdup("/media/mmc2/osm-gps-map");
599    #endif
600  #endif  #endif
601    
   GtkWidget *hbox = gtk_hbox_new(FALSE, 0);  
   
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
602    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
603    
604    context.widget = g_object_new(OSM_TYPE_GPS_MAP,    gint source = context->appdata->map.source;
605                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,    if(!source) source = MAP_SOURCE;
606                  "tile-cache", path,  
607                  proxy?"proxy-uri":NULL, proxy,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
608                     "map-source",               source,
609                     "tile-cache",               path,
610                     "auto-center",              FALSE,
611                     "record-trip-history",      FALSE,
612                     "show-trip-history",        FALSE,
613                     proxy?"proxy-uri":NULL,     proxy,
614                   NULL);                   NULL);
615    
616    g_free(path);    g_free(path);
617    
618    g_signal_connect(G_OBJECT(context.widget), "configure-event",    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
619                     G_CALLBACK(on_map_configure), &context);  
620  #if 0  #ifdef USE_MAEMO
621    g_signal_connect(G_OBJECT(context.widget), "button-release-event",    /* we don't use a stackable window here on fremantle, since */
622                     G_CALLBACK(on_map_button_release_event), &context);    /* this leaves the main window independent from the map and */
623      /* the user can e.g. still navigate the main menu */
624      context->window = hildon_window_new();
625    
626    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
627      g_signal_connect(G_OBJECT(context->window), "realize",
628                       G_CALLBACK(on_window_realize), NULL);
629    #endif // MAEMO_VERSION
630    #else
631      context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
632  #endif  #endif
633    
634    gtk_box_pack_start_defaults(GTK_BOX(hbox), context.widget);    /* setup cache state */
635    /* zoom button box */    map_setup(context);
   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);  
   /* install handler for timed updates of the gps button */  
   context.handler_id = gtk_timeout_add(1000, map_gps_update, &context);  
   gtk_box_pack_start(GTK_BOX(vbox), context.gps, FALSE, FALSE, 0);  
636    
637    gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  #ifndef USE_MAEMO
638      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
639    #endif
640    
641    gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);    g_signal_connect(G_OBJECT(context->widget), "configure-event",
642                       G_CALLBACK(on_map_configure), context);
643    
644    gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
645                       G_CALLBACK(on_map_button_press_event), context);
646    
647    gtk_widget_show_all(dialog);    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
648                       G_CALLBACK(on_map_button_release_event), context);
649    
650    gtk_dialog_run(GTK_DIALOG(dialog));    /* install handler for timed updates of the gps button */
651      context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
652    gtk_timeout_remove(context.handler_id);  
653    #if MAEMO_VERSION_MAJOR == 5
654      /* prevent some of the main screen things */
655      context->old_view = appdata->cur_view;
656      appdata->cur_view = NULL;
657    #endif
658    
659      g_signal_connect(G_OBJECT(context->window), "destroy",
660                       G_CALLBACK(on_window_destroy), context);
661    
662    gtk_widget_destroy(dialog);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
663      gtk_widget_show_all(GTK_WIDGET(context->window));
664  }  }
Legend:
Removed from v.35  
changed lines
  Added in v.125