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

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

revision 57 by harbaum, Sun Aug 16 19:29:01 2009 UTC revision 190 by harbaum, Tue Nov 17 10:22:41 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    /*
26     * TODO:
27     * - draw caches only once
28     * - prefer duplicates from selected files
29     * - make semi-transparent caches selectable
30     */
31    
32  #include "gpxview.h"  #include "gpxview.h"
33    #include "converter.h"
34  #include <math.h>    // for isnan  #include <math.h>    // for isnan
35    
36  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
37  #include "osm-gps-map.h"  #include "osm-gps-map.h"
38    #include "osm-gps-map-osd-classic.h"
39  #endif  #endif
40    
41  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
42  #define GPS_DEFAULT_ZOOM 13  #include <gdk/gdkx.h>
43    #include <X11/Xatom.h>
44  /* equatorial radius in meters */  #endif
 #define EQ_RADIUS     (6378137.0)  
45    
46  #define RAD2DEG(a)  (((a)*180.0)/M_PI)  /* default values */
47  #define DEG2RAD(a)  (((a)*M_PI)/180.0)  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
48    #define GPS_DEFAULT_ZOOM 13
49    
50  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
51    
# Line 41  static const char *get_proxy_uri(appdata Line 55  static const char *get_proxy_uri(appdata
55    /* use environment settings if preset */    /* use environment settings if preset */
56    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
57    if(proxy) {    if(proxy) {
58      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
59      return proxy;      return proxy;
60    }    }
61    
# Line 62  static const char *get_proxy_uri(appdata Line 76  static const char *get_proxy_uri(appdata
76    
77        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
78                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
79          printf("map http proxy from gconf: %s\n ", proxy_buffer);
80    
81        g_free(host);        g_free(host);
82      }      }
# Line 71  static const char *get_proxy_uri(appdata Line 86  static const char *get_proxy_uri(appdata
86    return NULL;    return NULL;
87  }  }
88    
89  static void map_zoom(map_context_t *context, int step) {  static void
90    gint zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
   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 < osm_gps_map_source_get_max_zoom(MAP_SOURCE));  
   gtk_widget_set_sensitive(context->zoomout,  
            zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));  
   
   /* hmm ... this doesn't really work */  
   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;  
 }  
91    
92  static gboolean    if(but == OSD_GPS) {
93  cb_map_zoomout(GtkButton *button, map_context_t *context) {      pos_t *refpos = get_pos(context->appdata);
94    map_zoom(context, -1);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
95    return FALSE;        gint zoom;
96  }        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
97          if(zoom < 10)
98            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
99                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
100          else
101            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
102                                   refpos->lat, refpos->lon);
103    
104  static gboolean        /* re-enable centering */
105  cb_map_gps(GtkButton *button, map_context_t *context) {        g_object_set(context->widget, "auto-center", TRUE, NULL);
106    pos_t *refpos = get_pos(context->appdata);      } else {
107    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        /* no coordinates given: display the entire world */
108      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
109                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);                                  0.0, 0.0, 1);
110    } else {      }
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
111    }    }
   
   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;  
112  }  }
113    
114  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 135  static int dist2pixel(map_context_t *con Line 117  static int dist2pixel(map_context_t *con
117    
118  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
119    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
120      static gboolean goto_is_enabled = FALSE;
121    
122    /* get reference position ... */    /* get reference position ... */
123    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
124    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
125    
126    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
127    gtk_widget_set_sensitive(context->gps, ok);    if(ok != goto_is_enabled) {
128        osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
129                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
130        goto_is_enabled = ok;
131      }
132    
133    if(ok) {    if(ok) {
134      float heading = NAN;      float heading = NAN;
# Line 156  static gboolean map_gps_update(gpointer Line 143  static gboolean map_gps_update(gpointer
143          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
144      }      }
145    
146        /* TODO: in order to save energy: only draw if state actually changed */
147    
148      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
149      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
150                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 165  static gboolean map_gps_update(gpointer Line 154  static gboolean map_gps_update(gpointer
154    return TRUE;    return TRUE;
155  }  }
156    
157  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
158                                   GdkEventConfigure *event,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
159                                   map_context_t *context) {  
160      GdkPixbuf *icon = icon_get(type, cache->type);
161    
162      /* check if there's also an overwritten coordinate */
163      if(cache->notes && cache->notes->override) {
164        GdkPixbuf *over = icon_get(type, 11);
165    
166    /* set default values if they are invalid */      osm_gps_map_add_image(OSM_GPS_MAP(map),
167    if(!context->appdata->map.zoom ||            cache->notes->pos.lat, cache->notes->pos.lon, icon);
168       isnan(context->appdata->map.pos.lat) ||  
169       isnan(context->appdata->map.pos.lon)) {      osm_gps_map_add_image(OSM_GPS_MAP(map),
170      printf("no valid map position found\n");            cache->notes->pos.lat, cache->notes->pos.lon, over);
171      } else {
172        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
173          osm_gps_map_add_image(OSM_GPS_MAP(map),
174                                cache->pos.lat, cache->pos.lon, icon);
175      }
176    }
177    
178    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
179                             GtkWidget *map, gpx_t *gpx,
180                             cache_t *nav, gboolean semi) {
181      if(!gpx->notes_loaded) {
182        notes_load_all(appdata, gpx);
183        gpx->notes_loaded = TRUE;
184      }
185    
186      cache_t *cache = gpx->cache;
187      while(cache) {
188        /* search if we have that cache already in our list/displayed */
189        int i=0;
190        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
191          i++;
192    
193        if(!caches[i].id) {
194          /* if nav is given draw all other caches semitransparent. */
195          /* if nav is not given do what semi sais */
196          map_draw_cache(map, cache, nav?(cache != nav):semi);
197          caches[i].id = cache->id;
198        }
199    
200        cache = cache->next;
201      }
202    }
203    
204    /* draw geocaches and set window title */
205    static void map_setup(map_context_t *context) {
206      char *name = NULL;
207    
208      int cache_num = gpx_total_caches_global(context->appdata->gpx);
209    
210      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
211        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
212        //     cache_num, context->cache_list_len);
213        g_free(context->caches_displayed);
214        context->caches_displayed = NULL;
215        context->cache_list_len = 0;
216      }
217    
218      /* allocate buffer */
219      if(cache_num && !context->caches_displayed) {
220        context->cache_list_len = cache_num;
221        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
222        printf("allocated space to handle %d map icons\n", cache_num);
223      }
224    
225      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
226        if(context->state != MAP_ALL) {
227          printf("map_setup(ALL)\n");
228    
229    #ifdef OSD_NAV
230          /* no navigation in this mode */
231          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
232    #endif
233    
234          /* clear all existing cache images */
235          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
236          memset(context->caches_displayed, 0,
237                 (cache_num+1) * sizeof(cache_display_t));
238    
239          /* draw all geocaches and none is semi-transparent */
240          gpx_t *gpx = context->appdata->gpx;
241          while(gpx) {
242            map_draw_gpx(context->appdata, context->caches_displayed,
243                         context->widget, gpx, NULL, FALSE);
244            gpx = gpx->next;
245          }
246    
247          {
248            int i=0;
249            while(context->caches_displayed[i].id) i++;
250            printf("number of caches actually displayed: %d\n", i);
251          }
252    
253          name = g_strdup(_("all"));
254          context->state = MAP_ALL;
255        }
256      } else if(!context->appdata->cur_cache) {
257        if(context->state != MAP_GPX) {
258          printf("map_setup(GPX)\n");
259    
260    #ifdef OSD_NAV
261          /* no navigation in this mode */
262          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
263    #endif
264    
265          /* clear all existing ccahe images */
266          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
267          memset(context->caches_displayed, 0,
268                 (cache_num+1) * sizeof(cache_display_t));
269    
270          /* draw all geocaches and all other gpx files are semi-transparent */
271          map_draw_gpx(context->appdata, context->caches_displayed,
272                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
273    
274          gpx_t *gpx = context->appdata->gpx;
275          while(gpx) {
276            if(gpx != context->appdata->cur_gpx)
277              map_draw_gpx(context->appdata, context->caches_displayed,
278                           context->widget, gpx, NULL, TRUE);
279    
280            gpx = gpx->next;
281          }
282    
283          name = g_strdup(context->appdata->cur_gpx->name);
284          context->state = MAP_GPX;
285        }
286      } else {
287        cache_t *cache = context->appdata->cur_cache;
288    
289      pos_t *refpos = get_pos(context->appdata);      printf("map_setup(CACHE)\n");
290      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
291        /* use gps position if present */      /* no balloons in this mode */
292        context->appdata->map.pos = *refpos;      context->balloon = NULL;
293        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
294      } else {  
295        /* use world map otherwise */      /* clear all existing ccahe images */
296        context->appdata->map.pos.lat = 0.0;      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
297        context->appdata->map.pos.lon = 0.0;      memset(context->caches_displayed, 0,
298        context->appdata->map.zoom = 1;             (cache_num+1) * sizeof(cache_display_t));
299    
300        /* draw all geocaches and all but selected one are semi-transparent */
301        gpx_t *gpx = context->appdata->gpx;
302        while(gpx) {
303          map_draw_gpx(context->appdata, context->caches_displayed,
304                       context->widget, gpx, cache, FALSE);
305          gpx = gpx->next;
306      }      }
307    
308        name = g_strdup(cache->name);
309        context->state = MAP_CACHE;
310    
311        /* navigation in this mode! */
312        pos_t cpos = gpx_cache_pos(cache);
313    
314    #ifdef OSD_NAV
315        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
316                                  context->appdata->imperial,
317                                  cpos.lat, cpos.lon, cache->name);
318    #else
319    #warning OSD_NAV not defined!
320    #endif
321    }    }
322    
323    /* jump to initial position */    if(name) {
324    osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      char *title = g_strdup_printf(_("Map - %s"), name);
325                              context->appdata->map.pos.lat,      g_free(name);
                             context->appdata->map.pos.lon,  
                             context->appdata->map.zoom);  
   
   return FALSE;  
 }  
326    
327  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {      gtk_window_set_title(GTK_WINDOW(context->window), title);
   while(cache) {  
     GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
328    
329      osm_gps_map_add_image(OSM_GPS_MAP(map),      g_free(title);
330                            cache->pos.lat, cache->pos.lon, icon);    } else
331        printf("map_setup(keep)\n");
332    }
333    
334      cache = cache->next;  static gboolean on_map_configure(GtkWidget *widget,
335                                     GdkEventConfigure *event,
336                                     map_context_t *context) {
337    
338      /* for some reason there's a configure event with 1/1 */
339      /* on diablo. We just ignore this! */
340    
341      printf("on_map_configure %d %d\n",
342             widget->allocation.width,
343             widget->allocation.height);
344    
345      if(!context->map_complete &&
346         (widget->allocation.width > 100) &&
347         (widget->allocation.height > 100)) {
348    
349        /* setup cache state */
350        map_setup(context);
351    
352        /* set default values if they are invalid */
353        if(!context->appdata->map.zoom ||
354           isnan(context->appdata->map.pos.lat) ||
355           isnan(context->appdata->map.pos.lon)) {
356          printf("no valid map position found\n");
357    
358          pos_t *refpos = get_pos(context->appdata);
359          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
360            printf("use refpos\n");
361    
362            /* use gps position if present */
363            context->appdata->map.pos = *refpos;
364            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
365          } else {
366            printf("use zero pos\n");
367    
368            /* use world map otherwise */
369            context->appdata->map.pos.lat = 0.0;
370            context->appdata->map.pos.lon = 0.0;
371            context->appdata->map.zoom = 1;
372          }
373        }
374    
375        /* jump to initial position */
376        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
377               context->appdata->map.pos.lat,
378               context->appdata->map.pos.lon,
379               context->appdata->map.zoom);
380    
381        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
382                                  context->appdata->map.pos.lat,
383                                  context->appdata->map.pos.lon,
384                                  context->appdata->map.zoom);
385        context->map_complete = TRUE;
386    }    }
387    
388      return FALSE;
389  }  }
390    
391  static void  static void
392  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
393                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
394    
395    while(cache) {    while(cache) {
396        pos_t cpos = gpx_cache_pos(cache);
397    
398      float dist =      float dist =
399        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
400        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
401    
402      if(!(dist > *distance)) {      if(!(dist > *distance)) {
403        *result = cache;        *result = cache;
# Line 229  static cache_t *map_closest(map_context_ Line 412  static cache_t *map_closest(map_context_
412    cache_t *result = NULL;    cache_t *result = NULL;
413    float distance = NAN;    float distance = NAN;
414    
415  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
416      /* search all geocaches */      /* search all geocaches */
417      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
418      while(gpx) {      while(gpx) {
419        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
420        gpx = gpx->next;        gpx = gpx->next;
421      }      }
422  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
423      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
424                            pos, &result, &distance);                            pos, &result, &distance);
425    }    } else
426  #endif      result = context->appdata->cur_gpx->cache;
427    
428    return result;    return result;
429  }  }
# Line 251  static cache_t *map_closest(map_context_ Line 431  static cache_t *map_closest(map_context_
431  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
432  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
433    pos_t pos;    pos_t pos;
434    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
435    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
436    return pos;    return pos;
437  }  }
438    
# Line 261  pos_t coord2pos(coord_t coo) { Line 441  pos_t coord2pos(coord_t coo) {
441  static gboolean  static gboolean
442  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
443                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
444    
445    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
446    
447      /* check if we actually clicked parts of the OSD */
448      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
449        return FALSE;
450    
451    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
452    if(context->press_on != NULL) {    if(context->press_on != NULL) {
453      printf("PRESS: already\n");      printf("PRESS: already\n");
454      return TRUE;      return FALSE;
455    }    }
456    
457    pos_t pos =    pos_t pos =
# Line 274  on_map_button_press_event(GtkWidget *wid Line 459  on_map_button_press_event(GtkWidget *wid
459    
460    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
461    if(nearest) {    if(nearest) {
462      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
463      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
464        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
465        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
466        context->press_on = nearest;        context->press_on = nearest;
467    }    }
468    
469    return FALSE;    return FALSE;
470  }  }
471    
472    static void
473    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
474      /* convert the pixbuf into something cairo can handle */
475    
476      // Create a new ImageSurface
477      cairo_surface_t *image_surface =
478        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
479                                   gdk_pixbuf_get_width(buf),
480                                   gdk_pixbuf_get_height(buf));
481    
482      // Create the new Context for the ImageSurface
483      g_assert(image_surface);
484      cairo_t *context = cairo_create(image_surface);
485    
486      // Draw the image on the new Context
487      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
488      cairo_paint(context);
489    
490      // now draw this onto the original context
491      cairo_set_source_surface(cr, image_surface, x, y);
492    
493      cairo_paint(cr);
494    }
495    
496    #ifndef BIG_BALLOONS
497    #define ICON_SIZE  ICON_CACHE_TYPE
498    #define LINE_SKIP  7
499    #else
500    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
501    #define LINE_SKIP  7
502    #endif
503    
504    static void
505    balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
506      printf("balloon event: ");
507    
508      map_context_t *context = (map_context_t*)data;
509      cache_t *cache = context->balloon;
510    
511      if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
512        printf("draw\n");
513    
514    #if 0
515        /* draw pink background to check clipping */
516        cairo_rectangle (event->data.draw.cr,
517                         event->data.draw.rect->x-20, event->data.draw.rect->y-20,
518                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
519        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
520        cairo_fill_preserve (event->data.draw.cr);
521        cairo_set_line_width (event->data.draw.cr, 0);
522        cairo_stroke (event->data.draw.cr);
523    #endif
524    
525        /* leave a little border top and left */
526        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
527    
528        /* draw the cache type icon ... */
529        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
530        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
531    
532        if(cache->notes && cache->notes->override) {
533          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
534          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
535        }
536    
537        /* ... and right of it the waypoint id */
538        cairo_text_extents_t extents;
539    
540        if(cache->id) {
541          cairo_select_font_face (event->data.draw.cr, "Sans",
542                                  CAIRO_FONT_SLANT_NORMAL,
543                                  CAIRO_FONT_WEIGHT_BOLD);
544    
545    #ifndef BIG_BALLOONS
546          cairo_set_font_size (event->data.draw.cr, 20.0);
547    #else
548          cairo_set_font_size (event->data.draw.cr, 36.0);
549    #endif
550    
551          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
552    
553          /* display id right of icon vertically centered */
554          x += gdk_pixbuf_get_width(icon) + 5;
555          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
556          cairo_move_to (event->data.draw.cr, x, y);
557          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
558          cairo_show_text (event->data.draw.cr, cache->id);
559          cairo_stroke (event->data.draw.cr);
560    
561          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
562        } else
563          y += gdk_pixbuf_get_height(icon);
564    
565        /* return to the left border and below icon/text */
566        x = event->data.draw.rect->x;
567    
568        /* everything from here uses the same font */
569        cairo_select_font_face (event->data.draw.cr, "Sans",
570                                CAIRO_FONT_SLANT_NORMAL,
571                                CAIRO_FONT_WEIGHT_NORMAL);
572    
573    #ifndef BIG_BALLOONS
574    #define FONT_SIZE 14.0
575    #else
576    #define FONT_SIZE 22.0
577    #endif
578    
579        cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
580    
581        if(cache->name) {
582          /* draw cache name */
583          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
584          y += extents.height;
585          cairo_move_to (event->data.draw.cr, x, y);
586          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
587          cairo_show_text (event->data.draw.cr, cache->name);
588          cairo_stroke (event->data.draw.cr);
589    
590          /* return to the left border and below text */
591          y += LINE_SKIP;
592          x = event->data.draw.rect->x;
593        }
594    
595        if(cache->terrain) {
596          int text_y = 0, icon_y = 0;
597    
598          /* draw cache rating */
599          const char *terrain = "Terrain:";
600          icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
601          cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
602    
603          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
604            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
605          else
606            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
607    
608          /* draw "Terrain:" string */
609          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
610          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
611          cairo_show_text (event->data.draw.cr, _(terrain));
612          cairo_stroke (event->data.draw.cr);
613          x += extents.width + 2;
614    
615          /* draw terrain stars */
616          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
617    
618          x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
619        }
620    
621        if(cache->difficulty) {
622          int text_y = 0, icon_y = 0;
623    
624          const char *difficulty = "Difficulty:";
625          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
626          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
627    
628          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
629            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
630          else
631            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
632    
633          /* draw "Difficulty:" string */
634          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
635          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
636          cairo_show_text (event->data.draw.cr, _(difficulty));
637          cairo_stroke (event->data.draw.cr);
638          x += extents.width + 2;
639    
640          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
641        }
642      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
643        printf("click %s event at %d %d\n",
644               event->data.click.down?"down":"up",
645               event->data.click.x, event->data.click.y);
646    
647        /* make the main screen jump to that cache */
648        if(!event->data.click.down) {
649          if(context->appdata->cur_cache) {
650            printf("ERROR: no current cache should be visible!\n");
651          } else {
652            gpx_t *is_in = NULL;
653    
654            if(!context->appdata->cur_gpx) {
655              printf("click while in \"all\" view\n");
656    
657              /* we first need to figure out which gpx file this cache */
658              /* is in so we can open it first */
659              gpx_t *gpx = context->appdata->gpx;
660              while(gpx && !is_in) {
661                cache_t *cur = gpx->cache;
662                while(cur && !is_in) {
663                  if(cur == cache)
664                    is_in = gpx;
665                  cur = cur->next;
666                }
667                gpx = gpx->next;
668              }
669    
670              if(is_in)
671                gpxlist_goto_cachelist(context->appdata, is_in);
672    
673            } else
674              /* the simple case: there already is an open gpx file and */
675              /* we just jump into the "cache" view */
676              is_in = context->appdata->cur_gpx;
677    
678            if(is_in) {
679              printf("selecting %s in %s\n",
680                     cache->id,
681                     context->appdata->cur_gpx->name);
682    
683              cachelist_goto_cache(context->appdata, cache);
684    
685              /* give focus to main screen (important for maemo) */
686              printf("raising main window\n");
687              gtk_window_present(GTK_WINDOW(context->appdata->window));
688            }
689          }
690        }
691      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
692        printf("removed\n");
693        context->balloon = NULL;
694      }
695    }
696    
697  static gboolean  static gboolean
698  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
699                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
700    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
701    
702    if(context->press_on) {    /* in "MAP_CACHE" state only one cache is visible */
703      /* and the map is in navigation mode. the balloon is */
704      /* pretty useless there */
705      if(context->press_on && (context->state != MAP_CACHE)) {
706    
707      coord_t coo;      coord_t coo;
708      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
709    
# Line 296  on_map_button_release_event(GtkWidget *w Line 712  on_map_button_release_event(GtkWidget *w
712    
713      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
714      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
715        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
716        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
717          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
718          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
719    
720          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon);          context->balloon = nearest;
721            osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
722                                         balloon_cb, context);
723        }        }
724      }      }
725      context->press_on = NULL;      context->press_on = NULL;
# Line 317  on_map_button_release_event(GtkWidget *w Line 737  on_map_button_release_event(GtkWidget *w
737  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
738    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
739    
   printf("destroy map window\n");  
   
740    /* save map parameters */    /* save map parameters */
741    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
742    gint zoom;    gint zoom;
# Line 330  static void on_window_destroy(GtkWidget Line 748  static void on_window_destroy(GtkWidget
748    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
749    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
750    
751      gint source;
752      g_object_get(map, "map-source", &source, NULL);
753      context->appdata->map.source = source;
754    
755  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
756    /* restore cur_view */    /* restore cur_view */
757    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
758  #endif  #endif
759    
760    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
761      gps_unregister_callback(appdata, context->cb_id);
762    
763      if(context->caches_displayed) {
764        g_free(context->caches_displayed);
765        context->caches_displayed = NULL;
766      }
767    
768    g_free(context);    g_free(context);
769    appdata->map.context = NULL;    appdata->map.context = NULL;
770  }  }
771    
772    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
773    /* get access to zoom buttons */
774    static void
775    on_window_realize(GtkWidget *widget, gpointer data) {
776      if (widget->window) {
777        unsigned char value = 1;
778        Atom hildon_zoom_key_atom =
779          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
780          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
781        Display *dpy =
782          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
783        Window w = GDK_WINDOW_XID(widget->window);
784    
785        XChangeProperty(dpy, w, hildon_zoom_key_atom,
786                        integer_atom, 8, PropModeReplace, &value, 1);
787      }
788    }
789    #endif
790    
791    /* on maemo a window is either on top or completely invisible. this */
792    /* means that we only need to update the map window if its raised.  */
793    /* on ordinary desktops this is different and we always update */
794    
795    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
796                             gpointer data) {
797      map_context_t *context = (map_context_t*)data;
798    
799      printf("map got focus\n");
800    
801    #ifdef USE_MAEMO
802      /* re-enable refresh of map */
803      if(!context->handler_id)
804        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
805    #endif
806    
807      map_setup(context);
808      return FALSE;
809    }
810    
811    #ifdef USE_MAEMO
812    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
813                             gpointer data) {
814      map_context_t *context = (map_context_t*)data;
815    
816      printf("map lost focus\n");
817      gtk_timeout_remove(context->handler_id);
818      context->handler_id = 0;
819    
820      return FALSE;
821    }
822    #endif
823    
824    void map_update(appdata_t *appdata) {
825      printf("map_update\n");
826    #ifndef USE_MAEMO
827      if(appdata->map.context)
828        map_setup(appdata->map.context);
829    #endif
830    }
831    
832    /* callback called by the gps layer whenever gps state changes */
833    static void
834    gps_callback(struct gps_state *state, gpointer data) {
835      printf("map: gps callback\n");
836    }
837    
838  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
839    map_context_t *context = NULL;    map_context_t *context = NULL;
840    
841    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
842    if(appdata->map.context) {    if(appdata->map.context) {
843        printf("using existing map!\n");
844      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
845        map_setup(appdata->map.context);
846      return;      return;
847    }    }
848    
849    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
850    context->appdata = appdata;    context->appdata = appdata;
851      context->map_complete = FALSE;
852      context->state = MAP_NONE;
853    
854    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
855      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
856      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
857        printf("old file path %s exists\n", old_path);
858        rmdir_recursive(old_path);
859      }
860    
861      /* It is recommanded that all applications share these same */
862      /* map path, so data is only cached once. The path should be: */
863      /* ~/.osm-gps-map on standard PC     (users home) */
864      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
865      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
866    #if !defined(USE_MAEMO)
867      char *p = getenv("HOME");
868      if(!p) p = "/tmp";
869      char *path = g_strdup_printf("%s/.osm-gps-map", p);
870    #else
871    #if MAEMO_VERSION_MAJOR == 5
872      char *path = g_strdup("/home/user/.osm-gps-map");
873    #else
874      char *path = g_strdup("/media/mmc2/osm-gps-map");
875    #endif
876    #endif
877    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
878    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
879    
880      gint source = context->appdata->map.source;
881      if(!source) source = MAP_SOURCE;
882    
883    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
884                   "map-source",               MAP_SOURCE,                   "map-source",               source,
885                   "tile-cache",               path,                   "tile-cache",               path,
886                   "auto-center",              FALSE,                   "auto-center",              FALSE,
887                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 369  void map(appdata_t *appdata) { Line 891  void map(appdata_t *appdata) {
891    
892    g_free(path);    g_free(path);
893    
894    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);  
895    
896  #ifdef USE_MAEMO  #ifdef USE_MAEMO
897  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
898    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
899  #else    /* the user can e.g. still navigate the main menu */
900    context->window = hildon_window_new();    context->window = hildon_window_new();
901  #endif  
902    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
903      g_signal_connect(G_OBJECT(context->window), "realize",
904                       G_CALLBACK(on_window_realize), NULL);
905    #endif // MAEMO_VERSION
906  #else  #else
907    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
908  #endif  #endif
909    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
910  #ifndef USE_MAEMO  #ifndef USE_MAEMO
911    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
912  #endif  #endif
913    
914    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
915                       G_CALLBACK(on_focus_in), context);
916    
917    #ifdef USE_MAEMO
918      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
919                       G_CALLBACK(on_focus_out), context);
920    #endif
921    
922    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
923                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 417  void map(appdata_t *appdata) { Line 928  void map(appdata_t *appdata) {
928    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
929                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
930    
   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);  
   
931    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
932    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
933    gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);    context->cb_id = gps_register_callback(appdata, gps_callback, context);
   
   gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  
934    
935  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
936    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 451  void map(appdata_t *appdata) { Line 941  void map(appdata_t *appdata) {
941    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
942                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
943    
944    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
945    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
946  }  }

Legend:
Removed from v.57  
changed lines
  Added in v.190