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

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

revision 58 by harbaum, Mon Aug 17 10:51:56 2009 UTC revision 120 by harbaum, Sat Sep 19 19:19:42 2009 UTC
# Line 17  Line 17 
17   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
18   */   */
19    
20    /*
21     * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png  8-15
22     * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23     */
24    
25  #include "gpxview.h"  #include "gpxview.h"
26    #include "converter.h"
27  #include <math.h>    // for isnan  #include <math.h>    // for isnan
28    
29  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
30  #include "osm-gps-map.h"  #include "osm-gps-map.h"
31    #include "osm-gps-map-osd-classic.h"
32  #endif  #endif
33    
34  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
35  #define GPS_DEFAULT_ZOOM 13  #include <gdk/gdkx.h>
36    #include <X11/Xatom.h>
37  /* equatorial radius in meters */  #endif
 #define EQ_RADIUS     (6378137.0)  
38    
39  #define RAD2DEG(a)  (((a)*180.0)/M_PI)  /* default values */
40  #define DEG2RAD(a)  (((a)*M_PI)/180.0)  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
41    #define GPS_DEFAULT_ZOOM 13
42    
43  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
44    
# Line 71  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    gint 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    /* enable/disable zoom buttons as required */        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
88    gtk_widget_set_sensitive(context->zoomin,        if(zoom < 10)
89             zoom < osm_gps_map_source_get_max_zoom(MAP_SOURCE));          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
90    gtk_widget_set_sensitive(context->zoomout,                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
91             zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));        else
92            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
93    /* hmm ... this doesn't really work */                                 refpos->lat, refpos->lon);
   osm_gps_map_osd_speed(map, zoom);  
   
   /* save new zoom */  
   context->appdata->map.zoom = zoom;  
 }  
   
 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;  
 }  
94    
95  static gboolean        /* re-enable centering */
96  cb_map_gps(GtkButton *button, map_context_t *context) {        g_object_set(context->widget, "auto-center", TRUE, NULL);
97    pos_t *refpos = get_pos(context->appdata);      } else {
98    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        /* no coordinates given: display the entire world */
99      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
100                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);                                  0.0, 0.0, 1);
101    } else {      }
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
102    }    }
   
   return FALSE;  
 }  
   
 static GtkWidget  
 *map_add_button(int icon, GCallback cb, gpointer data,  
                 char *tooltip) {  
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, icon));  
   g_signal_connect(button, "clicked", cb, data);  
 #ifndef USE_MAEMO  
   gtk_widget_set_tooltip_text(button, tooltip);  
 #endif  
   return button;  
103  }  }
104    
105  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 141  static gboolean map_gps_update(gpointer Line 114  static gboolean map_gps_update(gpointer
114    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
115    
116    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
117    gtk_widget_set_sensitive(context->gps, ok);    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) {    if(ok) {
121      float heading = NAN;      float heading = NAN;
# Line 169  static gboolean on_map_configure(GtkWidg Line 143  static gboolean on_map_configure(GtkWidg
143                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
144                                   map_context_t *context) {                                   map_context_t *context) {
145    
146    /* set default values if they are invalid */    if(!context->map_complete) {
147    if(!context->appdata->map.zoom ||  
148       isnan(context->appdata->map.pos.lat) ||      /* set default values if they are invalid */
149       isnan(context->appdata->map.pos.lon)) {      if(!context->appdata->map.zoom ||
150      printf("no valid map position found\n");         isnan(context->appdata->map.pos.lat) ||
151           isnan(context->appdata->map.pos.lon)) {
152      pos_t *refpos = get_pos(context->appdata);        printf("no valid map position found\n");
153      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
154        /* use gps position if present */        pos_t *refpos = get_pos(context->appdata);
155        context->appdata->map.pos = *refpos;        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
156        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          /* use gps position if present */
157      } else {          context->appdata->map.pos = *refpos;
158        /* use world map otherwise */          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
159        context->appdata->map.pos.lat = 0.0;        } else {
160        context->appdata->map.pos.lon = 0.0;          /* use world map otherwise */
161        context->appdata->map.zoom = 1;          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    
   /* jump to initial position */  
   osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                             context->appdata->map.pos.lat,  
                             context->appdata->map.pos.lon,  
                             context->appdata->map.zoom);  
   
175    return FALSE;    return FALSE;
176  }  }
177    
178  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache) {
179    while(cache) {    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
     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),      osm_gps_map_add_image(OSM_GPS_MAP(map),
192                            cache->pos.lat, cache->pos.lon, icon);                            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;      cache = cache->next;
206    }    }
207  }  }
# Line 212  static void Line 210  static void
210  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
211                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
212    while(cache) {    while(cache) {
213        pos_t cpos = gpx_cache_pos(cache);
214    
215      float dist =      float dist =
216        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
217        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
218    
219      if(!(dist > *distance)) {      if(!(dist > *distance)) {
220        *result = cache;        *result = cache;
# Line 230  static cache_t *map_closest(map_context_ Line 230  static cache_t *map_closest(map_context_
230    float distance = NAN;    float distance = NAN;
231    
232  #ifdef USE_MAEMO  #ifdef USE_MAEMO
233    if(!context->appdata->cur_gpx) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
234  #endif  #endif
235      /* search all geocaches */      /* search all geocaches */
236      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
# Line 239  static cache_t *map_closest(map_context_ Line 239  static cache_t *map_closest(map_context_
239        gpx = gpx->next;        gpx = gpx->next;
240      }      }
241  #ifdef USE_MAEMO  #ifdef USE_MAEMO
242    } else {    } else if(context->appdata->cur_gpx) {
243      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
244                            pos, &result, &distance);                            pos, &result, &distance);
245    }    } else
246        result = context->appdata->cur_gpx->cache;
247  #endif  #endif
248    
249    return result;    return result;
# Line 251  static cache_t *map_closest(map_context_ Line 252  static cache_t *map_closest(map_context_
252  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
253  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
254    pos_t pos;    pos_t pos;
255    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
256    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
257    return pos;    return pos;
258  }  }
259    
# Line 263  on_map_button_press_event(GtkWidget *wid Line 264  on_map_button_press_event(GtkWidget *wid
264                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
265    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    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! */    /* got a press event without release event? eat it! */
272    if(context->press_on != NULL) {    if(context->press_on != NULL) {
273      printf("PRESS: already\n");      printf("PRESS: already\n");
274      return TRUE;      return FALSE;
275    }    }
276    
277    pos_t pos =    pos_t pos =
# Line 274  on_map_button_press_event(GtkWidget *wid Line 279  on_map_button_press_event(GtkWidget *wid
279    
280    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
281    if(nearest) {    if(nearest) {
282      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
283      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
284        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
285        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
286        context->press_on = nearest;        context->press_on = nearest;
287    }    }
288    
# Line 301  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 308  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
308    
309    // now draw this onto the original context    // now draw this onto the original context
310    cairo_set_source_surface(cr, image_surface, x, y);    cairo_set_source_surface(cr, image_surface, x, y);
311    
312    cairo_paint(cr);    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  static void
322  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
323    cache_t *cache = (cache_t*)data;    cache_t *cache = (cache_t*)data;
324    
   //  printf("draw cb for \"%s\"\n", cache->name);  
   
325  #if 0  #if 0
326    /* draw pink background to check clipping */    /* draw pink background to check clipping */
327    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
# Line 326  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 338  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
338    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
339    cairo_draw_pixbuf(cr, icon, x, y);    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 */    /* ... and right of it the waypoint id */
347    cairo_text_extents_t extents;    cairo_text_extents_t extents;
348    
349    cairo_select_font_face (cr, "Sans",    if(cache->id) {
350                            CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (cr, "Sans",
351                            CAIRO_FONT_WEIGHT_BOLD);                              CAIRO_FONT_SLANT_NORMAL,
352                                CAIRO_FONT_WEIGHT_BOLD);
353    
354    cairo_set_font_size (cr, 20.0);  #ifndef BIG_BALLOONS
355    cairo_text_extents (cr, cache->id, &extents);      cairo_set_font_size (cr, 20.0);
356    #else
357        cairo_set_font_size (cr, 36.0);
358    #endif
359    
360    /* draw right of icon vertically centered */      cairo_text_extents (cr, cache->id, &extents);
361    x += gdk_pixbuf_get_width(icon) + 5;  
362    y += (gdk_pixbuf_get_height(icon) + extents.height)/2;      /* display id right of icon vertically centered */
363        x += gdk_pixbuf_get_width(icon) + 5;
364    cairo_move_to (cr, x,y);      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
365    printf("trying to draw %s\n", cache->id);      cairo_move_to (cr, x, y);
366    cairo_set_source_rgba (cr, 0, 0, 0, 1);      cairo_set_source_rgba (cr, 0, 0, 0, 1);
367    cairo_show_text (cr, cache->id);      cairo_show_text (cr, cache->id);
368    cairo_stroke (cr);      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
# Line 362  on_map_button_release_event(GtkWidget *w Line 451  on_map_button_release_event(GtkWidget *w
451    
452      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
453      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
454        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
455        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
456          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
457          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
458    
459          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
460                                   balloon_draw_cb, nearest);                                       balloon_draw_cb, nearest);
461        }        }
462      }      }
463      context->press_on = NULL;      context->press_on = NULL;
# Line 397  static void on_window_destroy(GtkWidget Line 488  static void on_window_destroy(GtkWidget
488    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
489    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
490    
491      gint source;
492      g_object_get(map, "map-source", &source, NULL);
493      context->appdata->map.source = source;
494    
495  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
496    /* restore cur_view */    /* restore cur_view */
497    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 408  static void on_window_destroy(GtkWidget Line 503  static void on_window_destroy(GtkWidget
503    appdata->map.context = NULL;    appdata->map.context = NULL;
504  }  }
505    
506    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
507    /* get access to zoom buttons */
508    static void
509    on_window_realize(GtkWidget *widget, gpointer data) {
510      if (widget->window) {
511        unsigned char value = 1;
512        Atom hildon_zoom_key_atom =
513          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
514          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
515        Display *dpy =
516          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
517        Window w = GDK_WINDOW_XID(widget->window);
518    
519        XChangeProperty(dpy, w, hildon_zoom_key_atom,
520                        integer_atom, 8, PropModeReplace, &value, 1);
521      }
522    }
523    #endif
524    
525  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
526    map_context_t *context = NULL;    map_context_t *context = NULL;
527    
# Line 419  void map(appdata_t *appdata) { Line 533  void map(appdata_t *appdata) {
533    
534    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
535    context->appdata = appdata;    context->appdata = appdata;
536      context->map_complete = FALSE;
537    
538    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
539      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
540      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
541        printf("old file path %s exists\n", old_path);
542        rmdir_recursive(old_path);
543      }
544    
545      /* It is recommanded that all applications share these same */
546      /* map path, so data is only cached once. The path should be: */
547      /* ~/.osm-gps-map on standard PC     (users home) */
548      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
549      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
550    #if !defined(USE_MAEMO)
551      char *p = getenv("HOME");
552      if(!p) p = "/tmp";
553      char *path = g_strdup_printf("%s/.osm-gps-map", p);
554    #else
555    #if MAEMO_VERSION_MAJOR == 5
556      char *path = g_strdup("/home/user/.osm-gps-map");
557    #else
558      char *path = g_strdup("/media/mmc2/osm-gps-map");
559    #endif
560    #endif
561    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
562    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
563    
564      gint source = context->appdata->map.source;
565      if(!source) source = MAP_SOURCE;
566    
567    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
568                   "map-source",               MAP_SOURCE,                   "map-source",               source,
569                   "tile-cache",               path,                   "tile-cache",               path,
570                   "auto-center",              FALSE,                   "auto-center",              FALSE,
571                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 436  void map(appdata_t *appdata) { Line 575  void map(appdata_t *appdata) {
575    
576    g_free(path);    g_free(path);
577    
578      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
579    
580    char *name = NULL;    char *name = NULL;
581  #ifdef USE_MAEMO  #ifdef USE_MAEMO
582    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx && !appdata->cur_cache) {
583  #endif  #endif
584      /* draw all geocaches */      /* draw all geocaches */
585      gpx_t *gpx = appdata->gpx;      gpx_t *gpx = appdata->gpx;
586      while(gpx) {      while(gpx) {
587        map_draw_cachelist(context->widget, gpx->cache);        map_draw_gpx(appdata, context->widget, gpx);
588        gpx = gpx->next;        gpx = gpx->next;
589      }      }
590      name = g_strdup(_("all geocaches"));      name = g_strdup(_("all"));
591  #ifdef USE_MAEMO  #ifdef USE_MAEMO
592    } else {    } else if(!appdata->cur_cache) {
593      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);      map_draw_gpx(appdata, context->widget, appdata->cur_gpx);
594      name = g_strdup(appdata->cur_gpx->name);      name = g_strdup(appdata->cur_gpx->name);
595      } else {
596        map_draw_cache(context->widget, appdata->cur_cache);
597        name = g_strdup(appdata->cur_cache->name);
598    }    }
599  #endif  #endif
600    
# Line 460  void map(appdata_t *appdata) { Line 604  void map(appdata_t *appdata) {
604  #ifdef USE_MAEMO  #ifdef USE_MAEMO
605  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
606    context->window = hildon_stackable_window_new();    context->window = hildon_stackable_window_new();
607      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
608      /* at runtime with cygwin x */
609    #ifndef __i386__
610      g_signal_connect(G_OBJECT(context->window), "realize",
611                       G_CALLBACK(on_window_realize), NULL);
612    #endif // MAEMO_VERSION
613  #else  #else
614    context->window = hildon_window_new();    context->window = hildon_window_new();
615  #endif  #endif
# Line 484  void map(appdata_t *appdata) { Line 634  void map(appdata_t *appdata) {
634    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
635                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
636    
   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(10, 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(11, 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(9, G_CALLBACK(cb_map_gps),  
                    context, _("Jump to GPS position"));  
   gtk_widget_set_sensitive(context->gps, FALSE);  
   
637    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
638    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);  
639    
640  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
641    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 518  void map(appdata_t *appdata) { Line 646  void map(appdata_t *appdata) {
646    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
647                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
648    
649    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
650    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
651  }  }
Legend:
Removed from v.58  
changed lines
  Added in v.120