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

Legend:
Removed from v.58  
changed lines
  Added in v.167