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

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

revision 125 by harbaum, Sun Sep 27 19:11:37 2009 UTC revision 155 by harbaum, Tue Nov 3 08:38:23 2009 UTC
# Line 22  Line 22 
22   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15   * 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"  #include "converter.h"
34  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 80  static const char *get_proxy_uri(appdata Line 87  static const char *get_proxy_uri(appdata
87    
88  static void  static void
89  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
90    
91    if(but == OSD_GPS) {    if(but == OSD_GPS) {
92      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
93      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
# Line 108  static int dist2pixel(map_context_t *con Line 116  static int dist2pixel(map_context_t *con
116    
117  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
118    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
119      static gboolean goto_is_enabled = FALSE;
120    
121    /* get reference position ... */    /* get reference position ... */
122    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
123    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
124    
125    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
126    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
127                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
128                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
129        goto_is_enabled = ok;
130      }
131    
132    if(ok) {    if(ok) {
133      float heading = NAN;      float heading = NAN;
# Line 130  static gboolean map_gps_update(gpointer Line 142  static gboolean map_gps_update(gpointer
142          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
143      }      }
144    
145        /* TODO: in order to save energy: only draw if state actually changed */
146    
147      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
148      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
149                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 139  static gboolean map_gps_update(gpointer Line 153  static gboolean map_gps_update(gpointer
153    return TRUE;    return TRUE;
154  }  }
155    
156    static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
157      GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE,
158                                 cache->type);
159    
160      /* check if there's also an overwritten coordinate */
161      if(cache->notes && cache->notes->override) {
162        GdkPixbuf *over = icon_get(ICON_MISC, 1);
163    
164        osm_gps_map_add_image(OSM_GPS_MAP(map),
165              cache->notes->pos.lat, cache->notes->pos.lon, icon);
166    
167        osm_gps_map_add_image(OSM_GPS_MAP(map),
168              cache->notes->pos.lat, cache->notes->pos.lon, over);
169      } else {
170        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
171          osm_gps_map_add_image(OSM_GPS_MAP(map),
172                                cache->pos.lat, cache->pos.lon, icon);
173      }
174    }
175    
176    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
177                             GtkWidget *map, gpx_t *gpx,
178                             cache_t *nav, gboolean semi) {
179      if(!gpx->notes_loaded) {
180        notes_load_all(appdata, gpx);
181        gpx->notes_loaded = TRUE;
182      }
183    
184      cache_t *cache = gpx->cache;
185      while(cache) {
186        /* search if we have that cache already in our list/displayed */
187        int i=0;
188        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
189          i++;
190    
191        if(!caches[i].id) {
192          /* if nav is given draw all other caches semitransparent. */
193          /* if nav is not given do what semi sais */
194          map_draw_cache(map, cache, nav?(cache != nav):semi);
195          caches[i].id = cache->id;
196        }
197    
198        cache = cache->next;
199      }
200    }
201    
202    /* draw geocaches and set window title */
203    static void map_setup(map_context_t *context) {
204      char *name = NULL;
205    
206      int cache_num = gpx_total_caches_global(context->appdata->gpx);
207    
208      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
209        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
210        //     cache_num, context->cache_list_len);
211        g_free(context->caches_displayed);
212        context->caches_displayed = NULL;
213        context->cache_list_len = 0;
214      }
215    
216      /* allocate buffer */
217      if(cache_num && !context->caches_displayed) {
218        context->cache_list_len = cache_num;
219        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
220        printf("allocated space to handle %d map icons\n", cache_num);
221      }
222    
223      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
224        if(context->state != MAP_ALL) {
225          printf("map_setup(ALL)\n");
226    
227    #ifdef OSD_NAV
228          /* no navigation in this mode */
229          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
230    #endif
231    
232          /* clear all existing cache images */
233          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
234          memset(context->caches_displayed, 0,
235                 (cache_num+1) * sizeof(cache_display_t));
236    
237          /* draw all geocaches and none is semi-transparent */
238          gpx_t *gpx = context->appdata->gpx;
239          while(gpx) {
240            map_draw_gpx(context->appdata, context->caches_displayed,
241                         context->widget, gpx, NULL, FALSE);
242            gpx = gpx->next;
243          }
244    
245          {
246            int i=0;
247            while(context->caches_displayed[i].id) i++;
248            printf("number of caches actually displayed: %d\n", i);
249          }
250    
251          name = g_strdup(_("all"));
252          context->state = MAP_ALL;
253        }
254      } else if(!context->appdata->cur_cache) {
255        if(context->state != MAP_GPX) {
256          printf("map_setup(GPX)\n");
257    
258    #ifdef OSD_NAV
259          /* no navigation in this mode */
260          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
261    #endif
262    
263          /* clear all existing ccahe images */
264          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
265          memset(context->caches_displayed, 0,
266                 (cache_num+1) * sizeof(cache_display_t));
267    
268          /* draw all geocaches and all other gpx files are semi-transparent */
269          map_draw_gpx(context->appdata, context->caches_displayed,
270                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
271    
272          gpx_t *gpx = context->appdata->gpx;
273          while(gpx) {
274            if(gpx != context->appdata->cur_gpx)
275              map_draw_gpx(context->appdata, context->caches_displayed,
276                           context->widget, gpx, NULL, TRUE);
277    
278            gpx = gpx->next;
279          }
280    
281          name = g_strdup(context->appdata->cur_gpx->name);
282          context->state = MAP_GPX;
283        }
284      } else {
285        cache_t *cache = context->appdata->cur_cache;
286    
287        printf("map_setup(CACHE)\n");
288    
289        /* no balloons in this mode */
290        context->balloon = NULL;
291        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
292    
293        /* clear all existing ccahe images */
294        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
295        memset(context->caches_displayed, 0,
296               (cache_num+1) * sizeof(cache_display_t));
297    
298        /* draw all geocaches and all but selected one are semi-transparent */
299        gpx_t *gpx = context->appdata->gpx;
300        while(gpx) {
301          map_draw_gpx(context->appdata, context->caches_displayed,
302                       context->widget, gpx, cache, FALSE);
303          gpx = gpx->next;
304        }
305    
306        name = g_strdup(cache->name);
307        context->state = MAP_CACHE;
308    
309        /* navigation in this mode! */
310        pos_t cpos = gpx_cache_pos(cache);
311    
312    #ifdef OSD_NAV
313        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
314                                  context->appdata->imperial,
315                                  cpos.lat, cpos.lon, cache->name);
316    #else
317    #warning OSD_NAV not defined!
318    #endif
319      }
320    
321      if(name) {
322        char *title = g_strdup_printf(_("Map - %s"), name);
323        g_free(name);
324    
325        gtk_window_set_title(GTK_WINDOW(context->window), title);
326    
327        g_free(title);
328      } else
329        printf("map_setup(keep)\n");
330    }
331    
332  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
333                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
334                                   map_context_t *context) {                                   map_context_t *context) {
335    
336    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
337      /* on diablo. We just ignore this! */
338    
339      printf("on_map_configure %d %d\n",
340             widget->allocation.width,
341             widget->allocation.height);
342    
343      if(!context->map_complete &&
344         (widget->allocation.width > 100) &&
345         (widget->allocation.height > 100)) {
346    
347        /* setup cache state */
348        map_setup(context);
349    
350      /* set default values if they are invalid */      /* set default values if they are invalid */
351      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 153  static gboolean on_map_configure(GtkWidg Line 355  static gboolean on_map_configure(GtkWidg
355    
356        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
357        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
358            printf("use refpos\n");
359    
360          /* use gps position if present */          /* use gps position if present */
361          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
362          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
363        } else {        } else {
364            printf("use zero pos\n");
365    
366          /* use world map otherwise */          /* use world map otherwise */
367          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
368          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 165  static gboolean on_map_configure(GtkWidg Line 371  static gboolean on_map_configure(GtkWidg
371      }      }
372    
373      /* jump to initial position */      /* jump to initial position */
374        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
375               context->appdata->map.pos.lat,
376               context->appdata->map.pos.lon,
377               context->appdata->map.zoom);
378    
379      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
380                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
381                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 175  static gboolean on_map_configure(GtkWidg Line 386  static gboolean on_map_configure(GtkWidg
386    return FALSE;    return FALSE;
387  }  }
388    
 static void map_draw_cache(GtkWidget *map, cache_t *cache) {  
   GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   
   /* check if there's also an overwritten coordinate */  
   if(cache->notes && cache->notes->override) {  
     GdkPixbuf *over = icon_get(ICON_MISC, 1);  
   
     osm_gps_map_add_image(OSM_GPS_MAP(map),  
           cache->notes->pos.lat, cache->notes->pos.lon, icon);  
   
     osm_gps_map_add_image(OSM_GPS_MAP(map),  
           cache->notes->pos.lat, cache->notes->pos.lon, over);  
   } else  
     osm_gps_map_add_image(OSM_GPS_MAP(map),  
                           cache->pos.lat, cache->pos.lon, icon);  
   
 }  
   
 static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {  
   if(!gpx->notes_loaded) {  
     notes_load_all(appdata, gpx);  
     gpx->notes_loaded = TRUE;  
   }  
   
   cache_t *cache = gpx->cache;  
   while(cache) {  
     map_draw_cache(map, cache);  
     cache = cache->next;  
   }  
 }  
   
389  static void  static void
390  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
391                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
392    
393    while(cache) {    while(cache) {
394      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
395    
# Line 229  static cache_t *map_closest(map_context_ Line 410  static cache_t *map_closest(map_context_
410    cache_t *result = NULL;    cache_t *result = NULL;
411    float distance = NAN;    float distance = NAN;
412    
 #ifdef USE_MAEMO  
413    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
 #endif  
414      /* search all geocaches */      /* search all geocaches */
415      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
416      while(gpx) {      while(gpx) {
417        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
418        gpx = gpx->next;        gpx = gpx->next;
419      }      }
 #ifdef USE_MAEMO  
420    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
421      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
422                            pos, &result, &distance);                            pos, &result, &distance);
423    } else    } else
424      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_gpx->cache;
 #endif  
425    
426    return result;    return result;
427  }  }
# Line 262  pos_t coord2pos(coord_t coo) { Line 439  pos_t coord2pos(coord_t coo) {
439  static gboolean  static gboolean
440  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
441                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
442    
443    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
444    
445    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
446    if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)    if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
447      return FALSE;      return FALSE;
448    
449    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
# Line 300  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 478  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
478                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
479    
480    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
481      g_assert(image_surface);
482    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
483    
484    // Draw the image on the new Context    // Draw the image on the new Context
# Line 319  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 498  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
498  #endif  #endif
499    
500  static void  static void
501  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
502    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
   
 #if 0  
   /* draw pink background to check clipping */  
   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);  
503    
504    if(cache->notes && cache->notes->override) {    map_context_t *context = (map_context_t*)data;
505      GdkPixbuf *over = icon_get(ICON_MISC, 1);    cache_t *cache = context->balloon;
     cairo_draw_pixbuf(cr, over, x, y);  
   }  
506    
507    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
508    cairo_text_extents_t extents;      printf("draw\n");
509    
510    if(cache->id) {  #if 0
511      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
512                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
513                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
514                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
515        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
516        cairo_fill_preserve (event->data.draw.cr);
517        cairo_set_line_width (event->data.draw.cr, 0);
518        cairo_stroke (event->data.draw.cr);
519    #endif
520    
521        /* leave a little border top and left */
522        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
523    
524        /* draw the cache type icon ... */
525        GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
526        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
527    
528        if(cache->notes && cache->notes->override) {
529          GdkPixbuf *over = icon_get(ICON_MISC, 1);
530          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
531        }
532    
533        /* ... and right of it the waypoint id */
534        cairo_text_extents_t extents;
535    
536        if(cache->id) {
537          cairo_select_font_face (event->data.draw.cr, "Sans",
538                                  CAIRO_FONT_SLANT_NORMAL,
539                                  CAIRO_FONT_WEIGHT_BOLD);
540    
541  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
542      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
543  #else  #else
544      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
545  #endif  #endif
546    
547      cairo_text_extents (cr, cache->id, &extents);        cairo_text_extents (event->data.draw.cr, cache->id, &extents);
548    
549      /* display id right of icon vertically centered */        /* display id right of icon vertically centered */
550      x += gdk_pixbuf_get_width(icon) + 5;        x += gdk_pixbuf_get_width(icon) + 5;
551      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
552      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
553      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
554      cairo_show_text (cr, cache->id);        cairo_show_text (event->data.draw.cr, cache->id);
555      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
556    
557      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
558    } else      } else
559      y += gdk_pixbuf_get_height(icon);        y += gdk_pixbuf_get_height(icon);
560    
561    /* return to the left border and below icon/text */      /* return to the left border and below icon/text */
562    x = rect->x;      x = event->data.draw.rect->x;
563    
564    /* everything from here uses the same font */      /* everything from here uses the same font */
565    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
566                            CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
567  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
568    cairo_set_font_size (cr, 14.0);      cairo_set_font_size (event->data.draw.cr, 14.0);
569  #else  #else
570    cairo_set_font_size (cr, 22.0);      cairo_set_font_size (event->data.draw.cr, 22.0);
571  #endif  #endif
572    
573    if(cache->name) {      if(cache->name) {
574      /* draw cache name */        /* draw cache name */
575      cairo_text_extents (cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
576      y += extents.height;        y += extents.height;
577      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
578      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
579      cairo_show_text (cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
580      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
581    
582      /* return to the left border and below text */        /* return to the left border and below text */
583      y += LINE_SKIP;        y += LINE_SKIP;
584      x = rect->x;        x = event->data.draw.rect->x;
585    }      }
586    
587    if(cache->terrain) {      if(cache->terrain) {
588      /* draw cache rating */        /* draw cache rating */
589      const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
590      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
591      cairo_text_extents (cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
592      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
593    
594      /* draw "Terrain:" string */        /* draw "Terrain:" string */
595      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
596      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
597      cairo_show_text (cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
598      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
599      x += extents.width + 2;        x += extents.width + 2;
600    
601      /* draw terrain stars */        /* draw terrain stars */
602      cairo_draw_pixbuf(cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
603                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
604    
605      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
606      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
607    }      }
   
   if(cache->difficulty) {  
     const char *difficulty = "Difficulty:";  
     cairo_text_extents (cr, _(difficulty), &extents);  
     y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
   
     /* draw "Difficulty:" string */  
     cairo_move_to (cr, x, y);  
     cairo_set_source_rgba (cr, 0, 0, 0, 1);  
     cairo_show_text (cr, _(difficulty));  
     cairo_stroke (cr);  
     x += extents.width + 2;  
608    
609      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));      if(cache->difficulty) {
610      cairo_draw_pixbuf(cr, icon, x, y -        const char *difficulty = "Difficulty:";
611          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
612          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
613    
614          /* draw "Difficulty:" string */
615          cairo_move_to (event->data.draw.cr, x, y);
616          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
617          cairo_show_text (event->data.draw.cr, _(difficulty));
618          cairo_stroke (event->data.draw.cr);
619          x += extents.width + 2;
620    
621          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
622          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
623                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                        (gdk_pixbuf_get_height(icon) + extents.height)/2);
624        }
625      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
626        printf("click %s event at %d %d\n",
627               event->data.click.down?"down":"up",
628               event->data.click.x, event->data.click.y);
629    
630        /* make the main screen jump to that cache */
631        if(!event->data.click.down) {
632          if(context->appdata->cur_cache) {
633            printf("ERROR: no current cache should be visible!\n");
634          } else {
635            gpx_t *is_in = NULL;
636    
637            if(!context->appdata->cur_gpx) {
638              printf("click while in \"all\" view\n");
639    
640              /* we first need to figure out which gpx file this cache */
641              /* is in so we can open it first */
642              gpx_t *gpx = context->appdata->gpx;
643              while(gpx && !is_in) {
644                cache_t *cur = gpx->cache;
645                while(cur && !is_in) {
646                  if(cur == cache)
647                    is_in = gpx;
648                  cur = cur->next;
649                }
650                gpx = gpx->next;
651              }
652    
653              if(is_in)
654                gpxlist_goto_cachelist(context->appdata, is_in);
655    
656            } else
657              /* the simple case: there already is an open gpx file and */
658              /* we just jump into the "cache" view */
659              is_in = context->appdata->cur_gpx;
660    
661            if(is_in) {
662              printf("selecting %s in %s\n",
663                     cache->id,
664                     context->appdata->cur_gpx->name);
665    
666              cachelist_goto_cache(context->appdata, cache);
667    
668              /* give focus to main screen (important for maemo) */
669              printf("raising main window\n");
670              gtk_window_present(GTK_WINDOW(context->appdata->window));
671            }
672          }
673        }
674      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
675        printf("removed\n");
676        context->balloon = NULL;
677    }    }
678  }  }
679    
# Line 442  on_map_button_release_event(GtkWidget *w Line 682  on_map_button_release_event(GtkWidget *w
682                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
683    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
684    
685    if(context->press_on) {    /* in "MAP_CACHE" state only one cache is visible */
686      /* and the map is in navigation mode. the balloon is */
687      /* pretty useless there */
688      if(context->press_on && (context->state != MAP_CACHE)) {
689    
690      coord_t coo;      coord_t coo;
691      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
692    
# Line 456  on_map_button_release_event(GtkWidget *w Line 700  on_map_button_release_event(GtkWidget *w
700        float dist = gpx_pos_get_distance(pos, cpos, FALSE);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
701        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
702    
703            context->balloon = nearest;
704          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
705                                       balloon_draw_cb, nearest);                                       balloon_cb, context);
   
         osm_gps_map_osd_draw_nav (map, cpos.lat, cpos.lon, nearest->name);  
   
706        }        }
707      }      }
708      context->press_on = NULL;      context->press_on = NULL;
# Line 478  on_map_button_release_event(GtkWidget *w Line 720  on_map_button_release_event(GtkWidget *w
720  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
721    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
722    
   printf("destroy map window\n");  
   
723    /* save map parameters */    /* save map parameters */
724    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
725    gint zoom;    gint zoom;
# Line 501  static void on_window_destroy(GtkWidget Line 741  static void on_window_destroy(GtkWidget
741  #endif  #endif
742    
743    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
744      gps_unregister_callback(appdata, context->cb_id);
745    
746      if(context->caches_displayed) {
747        g_free(context->caches_displayed);
748        context->caches_displayed = NULL;
749      }
750    
751    g_free(context);    g_free(context);
752    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 525  on_window_realize(GtkWidget *widget, gpo Line 771  on_window_realize(GtkWidget *widget, gpo
771  }  }
772  #endif  #endif
773    
774  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
775  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
776    char *name = NULL;  /* on ordinary desktops this is different and we always update */
777    
778    /* clear all existing ccahe images */  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
779    osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));                           gpointer data) {
780      printf("map got focus\n");
781      map_setup((map_context_t*)data);
782      return FALSE;
783    }
784    
785  #ifdef USE_MAEMO  void map_update(appdata_t *appdata) {
786    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    printf("map_update\n");
787  #endif  #ifndef USE_MAEMO
788      /* draw all geocaches */    if(appdata->map.context)
789      gpx_t *gpx = context->appdata->gpx;      map_setup(appdata->map.context);
     while(gpx) {  
       map_draw_gpx(context->appdata, context->widget, gpx);  
       gpx = gpx->next;  
     }  
     name = g_strdup(_("all"));  
 #ifdef USE_MAEMO  
   } else if(!context->appdata->cur_cache) {  
     map_draw_gpx(context->appdata, context->widget, context->appdata->cur_gpx);  
     name = g_strdup(context->appdata->cur_gpx->name);  
   } else {  
     map_draw_cache(context->widget, context->appdata->cur_cache);  
     name = g_strdup(context->appdata->cur_cache->name);  
   }  
790  #endif  #endif
791    }
792    
793    char *title = g_strdup_printf(_("Map - %s"), name);  /* callback called by the gps layer whenever gps state changes */
794    g_free(name);  static void
795    gps_callback(struct gps_state *state, gpointer data) {
796    gtk_window_set_title(GTK_WINDOW(context->window), title);    printf("map: gps callback\n");
   
   g_free(title);  
797  }  }
798    
799  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
# Line 574  void map(appdata_t *appdata) { Line 810  void map(appdata_t *appdata) {
810    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
811    context->appdata = appdata;    context->appdata = appdata;
812    context->map_complete = FALSE;    context->map_complete = FALSE;
813      context->state = MAP_NONE;
814    
815    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
816    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
# Line 631  void map(appdata_t *appdata) { Line 868  void map(appdata_t *appdata) {
868    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
869  #endif  #endif
870    
   /* setup cache state */  
   map_setup(context);  
   
871  #ifndef USE_MAEMO  #ifndef USE_MAEMO
872    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
873  #endif  #endif
874    
875      g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
876                       G_CALLBACK(on_focus_in), context);
877    
878    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
879                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
880    
# Line 649  void map(appdata_t *appdata) { Line 886  void map(appdata_t *appdata) {
886    
887    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
888    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
889      context->cb_id = gps_register_callback(appdata, gps_callback, context);
890    
891  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
892    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.125  
changed lines
  Added in v.155