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

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

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

Legend:
Removed from v.63  
changed lines
  Added in v.219