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

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

revision 65 by harbaum, Wed Aug 19 14:21:14 2009 UTC revision 142 by harbaum, Mon Oct 26 10:40:06 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"  #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    #include <gdk/gdkx.h>
36    #include <X11/Xatom.h>
37    #endif
38    
39    /* default values */
40    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
41  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
42    
43  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 66  static const char *get_proxy_uri(appdata Line 78  static const char *get_proxy_uri(appdata
78    return NULL;    return NULL;
79  }  }
80    
81  /* TODO: This needs to be wired to the GPS button in osm_gps_map */  static void
82  #if 0  cb_map_gps(osd_button_t but, map_context_t *context) {
83  static gboolean    if(but == OSD_GPS) {
84  cb_map_gps(GtkButton *button, map_context_t *context) {      pos_t *refpos = get_pos(context->appdata);
85    pos_t *refpos = get_pos(context->appdata);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
86    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        gint zoom;
87      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
88                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);        if(zoom < 10)
89    } else {          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
90      /* no coordinates given: display the entire world */                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
91      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        else
92                                0.0, 0.0, 1);          osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
93    }                                 refpos->lat, refpos->lon);
94    
95    return FALSE;        /* 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  }  }
 #endif  
104    
105  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
106    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
# Line 96  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    /* TODO: 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 124  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 167  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 184  static cache_t *map_closest(map_context_ Line 229  static cache_t *map_closest(map_context_
229    cache_t *result = NULL;    cache_t *result = NULL;
230    float distance = NAN;    float distance = NAN;
231    
232  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
233      /* search all geocaches */      /* search all geocaches */
234      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
235      while(gpx) {      while(gpx) {
236        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
237        gpx = gpx->next;        gpx = gpx->next;
238      }      }
239  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
240      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
241                            pos, &result, &distance);                            pos, &result, &distance);
242    }    } else
243  #endif      result = context->appdata->cur_gpx->cache;
244    
245    return result;    return result;
246  }  }
# Line 218  on_map_button_press_event(GtkWidget *wid Line 260  on_map_button_press_event(GtkWidget *wid
260                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
261    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
262    
263      /* check if we actually clicked parts of the OSD */
264      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
265        return FALSE;
266    
267    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
268    if(context->press_on != NULL) {    if(context->press_on != NULL) {
269      printf("PRESS: already\n");      printf("PRESS: already\n");
270      return TRUE;      return FALSE;
271    }    }
272    
273    pos_t pos =    pos_t pos =
# Line 229  on_map_button_press_event(GtkWidget *wid Line 275  on_map_button_press_event(GtkWidget *wid
275    
276    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
277    if(nearest) {    if(nearest) {
278      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
279      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
280        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
281        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
282        context->press_on = nearest;        context->press_on = nearest;
283    }    }
284    
# Line 267  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 315  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
315  #endif  #endif
316    
317  static void  static void
318  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
319    cache_t *cache = (cache_t*)data;    map_context_t *context = (map_context_t*)data;
320      cache_t *cache = context->balloon;
321    
322    //  printf("draw cb for \"%s\"\n", cache->name);    printf("balloon event: ");
323    
324      if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
325        printf("draw\n");
326    
327  #if 0  #if 0
328    /* draw pink background to check clipping */      /* draw pink background to check clipping */
329    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);      cairo_rectangle (event->data.draw.cr,
330    cairo_set_source_rgba (cr, 1, 0, 0, 0.3);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
331    cairo_fill_preserve (cr);                       event->data.draw.rect->w+40, event->data.draw.rect->h+40);
332    cairo_set_line_width (cr, 0);      cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
333    cairo_stroke (cr);      cairo_fill_preserve (event->data.draw.cr);
334        cairo_set_line_width (event->data.draw.cr, 0);
335        cairo_stroke (event->data.draw.cr);
336  #endif  #endif
337    
338    /* leave a little border top and left */      /* leave a little border top and left */
339    gint x = rect->x, y = rect->y;      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
340    
341    /* draw the cache type icon ... */      /* draw the cache type icon ... */
342    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
343    cairo_draw_pixbuf(cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
344    
345    /* ... and right of it the waypoint id */      if(cache->notes && cache->notes->override) {
346    cairo_text_extents_t extents;        GdkPixbuf *over = icon_get(ICON_MISC, 1);
347          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
348    if(cache->id) {      }
349      cairo_select_font_face (cr, "Sans",  
350                              CAIRO_FONT_SLANT_NORMAL,      /* ... and right of it the waypoint id */
351                              CAIRO_FONT_WEIGHT_BOLD);      cairo_text_extents_t extents;
352    
353        if(cache->id) {
354          cairo_select_font_face (event->data.draw.cr, "Sans",
355                                  CAIRO_FONT_SLANT_NORMAL,
356                                  CAIRO_FONT_WEIGHT_BOLD);
357    
358  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
359      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
360  #else  #else
361      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
362  #endif  #endif
363    
364      cairo_text_extents (cr, cache->id, &extents);        cairo_text_extents (event->data.draw.cr, cache->id, &extents);
365    
366      /* display id right of icon vertically centered */        /* display id right of icon vertically centered */
367      x += gdk_pixbuf_get_width(icon) + 5;        x += gdk_pixbuf_get_width(icon) + 5;
368      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
369      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
370      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
371      cairo_show_text (cr, cache->id);        cairo_show_text (event->data.draw.cr, cache->id);
372      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
373    
374      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
375    } else      } else
376      y += gdk_pixbuf_get_height(icon);        y += gdk_pixbuf_get_height(icon);
377    
378    /* return to the left border and below icon/text */      /* return to the left border and below icon/text */
379    x = rect->x;      x = event->data.draw.rect->x;
380    
381    /* everything from here uses the same font */      /* everything from here uses the same font */
382    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
383                            CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
384  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
385    cairo_set_font_size (cr, 14.0);      cairo_set_font_size (event->data.draw.cr, 14.0);
386  #else  #else
387    cairo_set_font_size (cr, 24.0);      cairo_set_font_size (event->data.draw.cr, 22.0);
388  #endif  #endif
389    
390    if(cache->name) {      if(cache->name) {
391      /* draw cache name */        /* draw cache name */
392      cairo_text_extents (cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
393      y += extents.height;        y += extents.height;
394      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
395      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
396      cairo_show_text (cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
397      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
398    
399      /* return to the left border and below text */        /* return to the left border and below text */
400      y += LINE_SKIP;        y += LINE_SKIP;
401      x = rect->x;        x = event->data.draw.rect->x;
402    }      }
403    
404    if(cache->terrain) {      if(cache->terrain) {
405      /* draw cache rating */        /* draw cache rating */
406      const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
407      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
408      cairo_text_extents (cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
409      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
410    
411      /* draw "Terrain:" string */        /* draw "Terrain:" string */
412      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
413      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
414      cairo_show_text (cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
415      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
416      x += extents.width + 2;        x += extents.width + 2;
417    
418      /* draw terrain stars */        /* draw terrain stars */
419      cairo_draw_pixbuf(cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
420                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
421    
422      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
423      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
424    }      }
   
   if(cache->difficulty) {  
     const char *difficulty = "Difficulty:";  
     cairo_text_extents (cr, _(difficulty), &extents);  
     y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
   
     /* draw "Difficulty:" string */  
     cairo_move_to (cr, x, y);  
     cairo_set_source_rgba (cr, 0, 0, 0, 1);  
     cairo_show_text (cr, _(difficulty));  
     cairo_stroke (cr);  
     x += extents.width + 2;  
425    
426      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));      if(cache->difficulty) {
427      cairo_draw_pixbuf(cr, icon, x, y -        const char *difficulty = "Difficulty:";
428          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
429          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
430    
431          /* draw "Difficulty:" string */
432          cairo_move_to (event->data.draw.cr, x, y);
433          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
434          cairo_show_text (event->data.draw.cr, _(difficulty));
435          cairo_stroke (event->data.draw.cr);
436          x += extents.width + 2;
437    
438          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
439          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
440                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                        (gdk_pixbuf_get_height(icon) + extents.height)/2);
441        }
442      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
443        printf("click %s event at %d %d\n",
444               event->data.click.down?"down":"up",
445               event->data.click.x, event->data.click.y);
446    
447        /* make the main screen jump to that cache */
448        if(!event->data.click.down) {
449          if(context->appdata->cur_cache) {
450            printf("ERROR: no current cache should be visible!\n");
451          } else {
452            gpx_t *is_in = NULL;
453    
454            if(!context->appdata->cur_gpx) {
455              printf("click while in \"all\" view\n");
456    
457              /* we first need to figure out which gpx file this cache */
458              /* is in so we can open it first */
459              gpx_t *gpx = context->appdata->gpx;
460              while(gpx && !is_in) {
461                cache_t *cur = gpx->cache;
462                while(cur && !is_in) {
463                  if(cur == cache)
464                    is_in = gpx;
465                  cur = cur->next;
466                }
467                gpx = gpx->next;
468              }
469    
470              if(is_in)
471                gpxlist_goto_cachelist(context->appdata, is_in);
472    
473            } else
474              /* the simple case: there already is an open gpx file and */
475              /* we just jump into the "cache" view */
476              is_in = context->appdata->cur_gpx;
477    
478            if(is_in) {
479              printf("selecting %s in %s\n",
480                     cache->id,
481                     context->appdata->cur_gpx->name);
482    
483              cachelist_goto_cache(context->appdata, cache);
484    
485              /* give focus to main screen (important for maemo) */
486              printf("raising main window\n");
487              gtk_window_present(GTK_WINDOW(context->appdata->window));
488            }
489          }
490        }
491      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
492        printf("removed\n");
493        context->balloon = NULL;
494    }    }
495  }  }
496    
# Line 387  on_map_button_release_event(GtkWidget *w Line 499  on_map_button_release_event(GtkWidget *w
499                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
500    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
501    
502    if(context->press_on) {    /* in "MAP_CACHE" state only one cache is visible */
503      /* and the map is in navigation mode. the balloon is */
504      /* pretty useless there */
505      if(context->press_on && (context->state != MAP_CACHE)) {
506    
507      coord_t coo;      coord_t coo;
508      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
509    
# Line 396  on_map_button_release_event(GtkWidget *w Line 512  on_map_button_release_event(GtkWidget *w
512    
513      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
514      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
515        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
516        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
517          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
518          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
519    
520          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
521                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
522                                         balloon_cb, context);
523        }        }
524      }      }
525      context->press_on = NULL;      context->press_on = NULL;
# Line 431  static void on_window_destroy(GtkWidget Line 550  static void on_window_destroy(GtkWidget
550    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
551    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
552    
553      gint source;
554      g_object_get(map, "map-source", &source, NULL);
555      context->appdata->map.source = source;
556    
557  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
558    /* restore cur_view */    /* restore cur_view */
559    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 442  static void on_window_destroy(GtkWidget Line 565  static void on_window_destroy(GtkWidget
565    appdata->map.context = NULL;    appdata->map.context = NULL;
566  }  }
567    
568    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
569    /* get access to zoom buttons */
570    static void
571    on_window_realize(GtkWidget *widget, gpointer data) {
572      if (widget->window) {
573        unsigned char value = 1;
574        Atom hildon_zoom_key_atom =
575          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
576          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
577        Display *dpy =
578          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
579        Window w = GDK_WINDOW_XID(widget->window);
580    
581        XChangeProperty(dpy, w, hildon_zoom_key_atom,
582                        integer_atom, 8, PropModeReplace, &value, 1);
583      }
584    }
585    #endif
586    
587    /* draw geocaches and set window title */
588    static void map_setup(map_context_t *context) {
589      char *name = NULL;
590    
591      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
592        if(context->state != MAP_ALL) {
593          printf("map_setp(ALL)\n");
594    
595          /* no navigation in this mode */
596          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
597    
598          /* clear all existing ccahe images */
599          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
600    
601          /* draw all geocaches */
602          gpx_t *gpx = context->appdata->gpx;
603          while(gpx) {
604            map_draw_gpx(context->appdata, context->widget, gpx);
605            gpx = gpx->next;
606          }
607          name = g_strdup(_("all"));
608          context->state = MAP_ALL;
609        }
610      } else if(!context->appdata->cur_cache) {
611        if(context->state != MAP_GPX) {
612          printf("map_setp(GPX)\n");
613    
614          /* no navigation in this mode */
615          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
616    
617          /* clear all existing ccahe images */
618          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
619    
620          map_draw_gpx(context->appdata, context->widget,
621                       context->appdata->cur_gpx);
622          name = g_strdup(context->appdata->cur_gpx->name);
623          context->state = MAP_GPX;
624        }
625      } else {
626        cache_t *cache = context->appdata->cur_cache;
627    
628        printf("map_setp(CACHE)\n");
629    
630        /* no balloons in this mode */
631        context->balloon = NULL;
632        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
633    
634        /* clear all existing ccahe images */
635        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
636    
637        map_draw_cache(context->widget, cache);
638        name = g_strdup(cache->name);
639        context->state = MAP_CACHE;
640    
641        /* navigation in this mode! */
642        pos_t cpos = gpx_cache_pos(cache);
643        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
644                                  context->appdata->imperial,
645                                  cpos.lat, cpos.lon, cache->name);
646      }
647    
648      if(name) {
649        char *title = g_strdup_printf("%s - %s", _("Map"), name);
650        g_free(name);
651    
652        gtk_window_set_title(GTK_WINDOW(context->window), title);
653    
654        g_free(title);
655      } else
656        printf("map_setup(keep)\n");
657    }
658    
659    /* on maemo a window is either on top or completely invisible. this means that */
660    /* we only need to update the map window if its raised. on ordinary desktops this */
661    /* is different and we always update */
662    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
663                             gpointer data) {
664      printf("map got focus\n");
665      map_setup((map_context_t*)data);
666      return FALSE;
667    }
668    
669    void map_update(appdata_t *appdata) {
670    #ifndef USE_MAEMO
671      if(appdata->map.context)
672        map_setup(appdata->map.context);
673    #endif
674    }
675    
676  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
677    map_context_t *context = NULL;    map_context_t *context = NULL;
678    
679    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
680    if(appdata->map.context) {    if(appdata->map.context) {
681        printf("using existing map!\n");
682      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
683        map_setup(appdata->map.context);
684      return;      return;
685    }    }
686    
687    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
688    context->appdata = appdata;    context->appdata = appdata;
689      context->map_complete = FALSE;
690      context->state = MAP_NONE;
691    
692      /* cleanup old (pre 0.8.7) path if it exists */
693      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
694      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
695        printf("old file path %s exists\n", old_path);
696        rmdir_recursive(old_path);
697      }
698    
699      /* It is recommanded that all applications share these same */
700      /* map path, so data is only cached once. The path should be: */
701      /* ~/.osm-gps-map on standard PC     (users home) */
702      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
703      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
704    #if !defined(USE_MAEMO)
705      char *p = getenv("HOME");
706      if(!p) p = "/tmp";
707      char *path = g_strdup_printf("%s/.osm-gps-map", p);
708    #else
709    #if MAEMO_VERSION_MAJOR == 5
710      char *path = g_strdup("/home/user/.osm-gps-map");
711    #else
712      char *path = g_strdup("/media/mmc2/osm-gps-map");
713    #endif
714    #endif
715    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
716    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
717    
718      gint source = context->appdata->map.source;
719      if(!source) source = MAP_SOURCE;
720    
721    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
722                   "map-source",               MAP_SOURCE,                   "map-source",               source,
723                   "tile-cache",               path,                   "tile-cache",               path,
724                   "auto-center",              FALSE,                   "auto-center",              FALSE,
725                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 468  void map(appdata_t *appdata) { Line 729  void map(appdata_t *appdata) {
729    
730    g_free(path);    g_free(path);
731    
732    char *name = NULL;    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
 #ifdef USE_MAEMO  
   if(!appdata->cur_gpx) {  
 #endif  
     /* draw all geocaches */  
     gpx_t *gpx = appdata->gpx;  
     while(gpx) {  
       map_draw_cachelist(context->widget, gpx->cache);  
       gpx = gpx->next;  
     }  
     name = g_strdup(_("all geocaches"));  
 #ifdef USE_MAEMO  
   } else {  
     map_draw_cachelist(context->widget, appdata->cur_gpx->cache);  
     name = g_strdup(appdata->cur_gpx->name);  
   }  
 #endif  
   
   char *title = g_strdup_printf(_("Map - %s"), name);  
   g_free(name);  
733    
734  #ifdef USE_MAEMO  #ifdef USE_MAEMO
735  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
736    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
737  #else    /* the user can e.g. still navigate the main menu */
738    context->window = hildon_window_new();    context->window = hildon_window_new();
739  #endif  
740    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
741      g_signal_connect(G_OBJECT(context->window), "realize",
742                       G_CALLBACK(on_window_realize), NULL);
743    #endif // MAEMO_VERSION
744  #else  #else
745    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
746  #endif  #endif
747    
748    gtk_window_set_title(GTK_WINDOW(context->window), title);    /* setup cache state */
749      map_setup(context);
750    
751  #ifndef USE_MAEMO  #ifndef USE_MAEMO
752    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
753  #endif  #endif
754    
755    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
756                       G_CALLBACK(on_focus_in), context);
757    
758    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
759                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 516  void map(appdata_t *appdata) { Line 764  void map(appdata_t *appdata) {
764    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
765                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
766    
   /* TODO: gtk_widget_set_sensitive(context->gps, FALSE); */  
   
767    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
768    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
769    
Legend:
Removed from v.65  
changed lines
  Added in v.142