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

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

revision 133 by harbaum, Mon Oct 12 20:27:55 2009 UTC revision 255 by harbaum, Tue Feb 9 19:25:36 2010 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     * - 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
# Line 48  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 69  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 80  static const char *get_proxy_uri(appdata Line 86  static const char *get_proxy_uri(appdata
86    
87  static void  static void
88  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
89    
90    if(but == OSD_GPS) {    if(but == OSD_GPS) {
91        printf("clicked OSD_GPS %p\n", context);
92        printf("clicked OSD_GPS a %p\n", context->appdata);
93    
94      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
95      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
96        gint zoom;        gint zoom;
# Line 109  static int dist2pixel(map_context_t *con Line 119  static int dist2pixel(map_context_t *con
119  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
120    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
121    
122    #ifdef USE_MAEMO
123      if(context->appdata->goto_disable_screensaver)
124        if(osso_display_blanking_pause(context->appdata->osso_context) != OSSO_OK)
125          fprintf(stderr, "error with display blank\n");
126    #endif
127    
128    /* get reference position ... */    /* get reference position ... */
129    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
130    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
131    
132    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
133    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != context->goto_is_enabled) {
134                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
135                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
136        context->goto_is_enabled = ok;
137      }
138    
139    if(ok) {    if(ok) {
140      float heading = NAN;      float heading = NAN;
# Line 130  static gboolean map_gps_update(gpointer Line 149  static gboolean map_gps_update(gpointer
149          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
150      }      }
151    
152        /* TODO: in order to save energy: only draw if state actually changed */
153    
154      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
155      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
156                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 139  static gboolean map_gps_update(gpointer Line 160  static gboolean map_gps_update(gpointer
160    return TRUE;    return TRUE;
161  }  }
162    
163  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
164                                   GdkEventConfigure *event,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
                                  map_context_t *context) {  
   
   if(!context->map_complete) {  
   
     /* set default values if they are invalid */  
     if(!context->appdata->map.zoom ||  
        isnan(context->appdata->map.pos.lat) ||  
        isnan(context->appdata->map.pos.lon)) {  
       printf("no valid map position found\n");  
   
       pos_t *refpos = get_pos(context->appdata);  
       if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
         /* use gps position if present */  
         context->appdata->map.pos = *refpos;  
         context->appdata->map.zoom = GPS_DEFAULT_ZOOM;  
       } else {  
         /* use world map otherwise */  
         context->appdata->map.pos.lat = 0.0;  
         context->appdata->map.pos.lon = 0.0;  
         context->appdata->map.zoom = 1;  
       }  
     }  
   
     /* jump to initial position */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               context->appdata->map.pos.lat,  
                               context->appdata->map.pos.lon,  
                               context->appdata->map.zoom);  
     context->map_complete = TRUE;  
   }  
165    
166    return FALSE;    GdkPixbuf *icon = icon_get(type, cache->type);
167  }    GdkPixbuf *over = NULL;
168    
169  static void map_draw_cache(GtkWidget *map, cache_t *cache) {    if(cache->mine)                   over = icon_get(type, 14);
170    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    else if(cache->found)             over = icon_get(type, 12);
171      else if(cache->notes) {
172        if(cache->notes->found)         over = icon_get(type, 12);
173        else if(cache->notes->override) over = icon_get(type, 11);
174        else                            over = icon_get(type, 13);
175      }
176    
177      pos_t *pos = &cache->pos;
178    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
179    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override)
180      GdkPixbuf *over = icon_get(ICON_MISC, 1);      pos = &cache->notes->pos;
181    
182      if(!isnan(pos->lat) && !isnan(pos->lon)) {
183      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
184            cache->notes->pos.lat, cache->notes->pos.lon, icon);                            pos->lat, pos->lon, icon);
185        if(over)
186      osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
187            cache->notes->pos.lat, cache->notes->pos.lon, over);                              pos->lat, pos->lon, over);
188    } else    }
189      osm_gps_map_add_image(OSM_GPS_MAP(map),  }
                           cache->pos.lat, cache->pos.lon, icon);  
190    
191    static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
192      /* only draw wpts that don't equal the main point */
193      if(pos_differ(&cache->pos, &wpt->pos)) {
194        if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
195          GdkPixbuf *icon =
196            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
197                     wpt->sym:WPT_SYM_REFPOINT);
198    
199          osm_gps_map_add_image(OSM_GPS_MAP(map),
200                                wpt->pos.lat, wpt->pos.lon, icon);
201        }
202      }
203  }  }
204    
205  static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {  static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
206                             GtkWidget *map, gpx_t *gpx,
207                             cache_t *nav, gboolean semi) {
208    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
209      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
210      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 201  static void map_draw_gpx(appdata_t *appd Line 212  static void map_draw_gpx(appdata_t *appd
212    
213    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
214    while(cache) {    while(cache) {
215      map_draw_cache(map, cache);      /* search if we have that cache already in our list/displayed */
216        int i=0;
217        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
218          i++;
219    
220        if(!caches[i].id) {
221          /* if nav is given draw all other caches semitransparent. */
222          /* if nav is not given do what semi sais */
223          map_draw_cache(map, cache, nav?(cache != nav):semi);
224          caches[i].id = cache->id;
225    
226          /* also draw waypoints of nav cache */
227          if(nav && cache == nav) {
228            wpt_t *wpt = cache->wpt;
229            while(wpt) {
230              map_draw_wpt(map, cache, wpt);
231              wpt = wpt->next;
232            }
233          }
234        }
235    
236      cache = cache->next;      cache = cache->next;
237    }    }
238  }  }
239    
240    static cache_t *cache_search_first(gpx_t *gpx, cache_t *cache) {
241      while(gpx) {
242        cache_t *cur = gpx->cache;
243        while(cur) {
244          /* we do a string comparision to make sure that if copies */
245          /* exist, we get the original one */
246          if(!strcmp(cache->id, cur->id))
247             return cur;
248    
249          cur = cur->next;
250        }
251        gpx = gpx->next;
252      }
253      g_assert(FALSE);
254      return NULL;
255    }
256    
257    /* draw geocaches and set window title */
258    static void map_setup(map_context_t *context) {
259      char *name = NULL;
260    
261      int cache_num = gpx_total_caches_global(context->appdata->gpx);
262    
263      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
264        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
265        //     cache_num, context->cache_list_len);
266        g_free(context->caches_displayed);
267        context->caches_displayed = NULL;
268        context->cache_list_len = 0;
269      }
270    
271      /* allocate buffer */
272      if(cache_num && !context->caches_displayed) {
273        context->cache_list_len = cache_num;
274        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
275        printf("allocated space to handle %d map icons\n", cache_num);
276      }
277    
278      if(context->appdata->search_results && !context->appdata->cur_cache) {
279        if(context->state != MAP_SEARCH) {
280          printf("map_setup(SEARCH)\n");
281    
282          /* clear any pending balloon */
283          context->balloon = NULL;
284          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
285    
286    #ifdef OSD_NAV
287          /* no navigation in this mode */
288          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
289    #endif
290    
291          /* clear all existing cache images */
292          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
293    
294          if(context->caches_displayed) {
295            memset(context->caches_displayed, 0,
296                   (cache_num+1) * sizeof(cache_display_t));
297    
298            /* draw search results and all other gpx files are semi-transparent */
299            map_draw_gpx(context->appdata, context->caches_displayed,
300                         context->widget, context->appdata->search_results,
301                         NULL, FALSE);
302    
303            gpx_t *gpx = context->appdata->gpx;
304            while(gpx) {
305              map_draw_gpx(context->appdata, context->caches_displayed,
306                           context->widget, gpx, NULL, TRUE);
307    
308              gpx = gpx->next;
309            }
310          }
311          name = g_strdup(_("Search results"));
312          context->state = MAP_SEARCH;
313        }
314      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
315        if(context->state != MAP_ALL) {
316          printf("map_setup(ALL)\n");
317    
318          /* clear any pending balloon */
319          context->balloon = NULL;
320          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
321    
322    #ifdef OSD_NAV
323          /* no navigation in this mode */
324          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
325    #endif
326    
327          /* clear all existing cache images */
328          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
329          if(context->caches_displayed) {
330            memset(context->caches_displayed, 0,
331                   (cache_num+1) * sizeof(cache_display_t));
332    
333            /* draw all geocaches and none is semi-transparent */
334            gpx_t *gpx = context->appdata->gpx;
335            while(gpx) {
336              map_draw_gpx(context->appdata, context->caches_displayed,
337                           context->widget, gpx, NULL, FALSE);
338              gpx = gpx->next;
339            }
340    
341            {
342              int i=0;
343              while(context->caches_displayed[i].id) i++;
344              printf("number of caches actually displayed: %d\n", i);
345            }
346          }
347          name = g_strdup(_("all"));
348          context->state = MAP_ALL;
349        }
350      } else if(!context->appdata->cur_cache) {
351        if(context->state != MAP_GPX) {
352          printf("map_setup(GPX)\n");
353    
354          /* clear any pending balloon */
355          context->balloon = NULL;
356          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
357    
358    #ifdef OSD_NAV
359          /* no navigation in this mode */
360          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
361    #endif
362    
363          /* clear all existing cache images */
364          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
365          if(context->caches_displayed) {
366            memset(context->caches_displayed, 0,
367                   (cache_num+1) * sizeof(cache_display_t));
368    
369            /* draw all geocaches and all other gpx files are semi-transparent */
370            map_draw_gpx(context->appdata, context->caches_displayed,
371                         context->widget, context->appdata->cur_gpx, NULL, FALSE);
372    
373            gpx_t *gpx = context->appdata->gpx;
374            while(gpx) {
375              if(gpx != context->appdata->cur_gpx)
376                map_draw_gpx(context->appdata, context->caches_displayed,
377                             context->widget, gpx, NULL, TRUE);
378    
379              gpx = gpx->next;
380            }
381          }
382    
383          name = g_strdup(context->appdata->cur_gpx->name);
384          context->state = MAP_GPX;
385        }
386      } else {
387        cache_t *cache = context->appdata->cur_cache;
388    
389        printf("map_setup(CACHE)\n");
390    
391        /* clear any pending balloon */
392        context->balloon = NULL;
393        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
394    
395        /* clear all existing ccahe images */
396        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
397        if(context->caches_displayed) {
398          memset(context->caches_displayed, 0,
399                 (cache_num+1) * sizeof(cache_display_t));
400    
401          /* Make sure we really work on the first copy in the list as */
402          /* only this is being used if duplicates exist */
403          cache = cache_search_first(context->appdata->gpx, cache);
404    
405          /* draw all geocaches and all but selected one are semi-transparent */
406          gpx_t *gpx = context->appdata->gpx;
407          while(gpx) {
408            map_draw_gpx(context->appdata, context->caches_displayed,
409                         context->widget, gpx, cache, FALSE);
410            gpx = gpx->next;
411          }
412        }
413    
414        name = g_strdup(cache->name);
415        context->state = MAP_CACHE;
416    
417        /* navigation in this mode! */
418        pos_t cpos = gpx_cache_pos(cache);
419    
420    #ifdef OSD_NAV
421        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
422                                  context->appdata->imperial,
423                                  cpos.lat, cpos.lon, cache->name);
424    #else
425    #warning OSD_NAV not defined!
426    #endif
427      }
428    
429      /* also mark geomath position */
430    
431      /* remove all existing appearances of this icon first */
432      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
433                               icon_get(ICON_MISC, 4));
434    
435      if(!isnan(context->appdata->geomath.lat) &&
436         !isnan(context->appdata->geomath.lon))  {
437    
438        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
439                              context->appdata->geomath.lat,
440                              context->appdata->geomath.lon,
441                              icon_get(ICON_MISC, 4));
442      }
443    
444      if(name) {
445        gtk_window_set_title(GTK_WINDOW(context->window), name);
446        g_free(name);
447      } else
448        printf("map_setup(keep)\n");
449    }
450    
451  static void  static void
452  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
453                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
454    
455    while(cache) {    while(cache) {
456      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
457    
# Line 228  map_cachelist_nearest(cache_t *cache, po Line 471  map_cachelist_nearest(cache_t *cache, po
471  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
472    cache_t *result = NULL;    cache_t *result = NULL;
473    float distance = NAN;    float distance = NAN;
474    
475    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
476        /* search search results */
477        map_cachelist_nearest(context->appdata->search_results->cache,
478                              pos, &result, &distance);
479      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
480      /* search all geocaches */      /* search all geocaches */
481      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
482      while(gpx) {      while(gpx) {
# Line 237  static cache_t *map_closest(map_context_ Line 484  static cache_t *map_closest(map_context_
484        gpx = gpx->next;        gpx = gpx->next;
485      }      }
486    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
487        /* search in current gpx file */
488      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
489                            pos, &result, &distance);                            pos, &result, &distance);
490    } else    } else
491      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_cache;
492    
493      /* make sure this is the first hit */
494      if(context->caches_displayed)
495        result = cache_search_first(context->appdata->gpx, result);
496    
497    return result;    return result;
498  }  }
# Line 258  pos_t coord2pos(coord_t coo) { Line 510  pos_t coord2pos(coord_t coo) {
510  static gboolean  static gboolean
511  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
512                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
513    
514    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
515    
516    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
517    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)
518      return FALSE;      return FALSE;
519    
520    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
# Line 296  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 549  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
549                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
550    
551    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
552      g_assert(image_surface);
553    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
554    
555    // Draw the image on the new Context    // Draw the image on the new Context
# Line 309  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 563  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
563  }  }
564    
565  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
566  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
567  #else  #else
568  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
569  #endif  #endif
570    
571  static void  #ifndef BIG_BALLOONS
572  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  #define FONT_SIZE 14.0
573    cache_t *cache = (cache_t*)data;  #else
574    #define FONT_SIZE 22.0
 #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);  
575  #endif  #endif
576    #define LINE_SKIP  (FONT_SIZE/4)
577    
   /* leave a little border top and left */  
   gint x = rect->x, y = rect->y;  
578    
579    /* draw the cache type icon ... */  static void
580    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
581    cairo_draw_pixbuf(cr, icon, x, y);    printf("balloon event: ");
582    
583    if(cache->notes && cache->notes->override) {    map_context_t *context = (map_context_t*)data;
584      GdkPixbuf *over = icon_get(ICON_MISC, 1);    cache_t *cache = context->balloon;
     cairo_draw_pixbuf(cr, over, x, y);  
   }  
585    
586    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
587    cairo_text_extents_t extents;      printf("draw\n");
588    
589    if(cache->id) {  #if 0
590      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
591                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
592                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
593                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
594        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
595        cairo_fill_preserve (event->data.draw.cr);
596        cairo_set_line_width (event->data.draw.cr, 0);
597        cairo_stroke (event->data.draw.cr);
598    #endif
599    
600        /* leave a little border top and left */
601        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
602    
603        /* draw the cache type icon ... */
604        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
605        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
606    
607        if(cache->notes && cache->notes->override) {
608          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
609          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
610        }
611    
612        /* ... and right of it the waypoint id */
613        cairo_text_extents_t extents;
614    
615        if(cache->id) {
616          cairo_select_font_face (event->data.draw.cr, "Sans",
617                                  CAIRO_FONT_SLANT_NORMAL,
618                                  CAIRO_FONT_WEIGHT_BOLD);
619    
620  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
621      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
622  #else  #else
623      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
624  #endif  #endif
625    
626          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
627    
628          /* display id right of icon vertically centered */
629          x += gdk_pixbuf_get_width(icon) + 5;
630          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
631          cairo_move_to (event->data.draw.cr, x, y);
632          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
633          cairo_show_text (event->data.draw.cr, cache->id);
634          cairo_stroke (event->data.draw.cr);
635    
636          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
637        } else
638          y += gdk_pixbuf_get_height(icon);
639    
640        /* return to the left border and below icon/text */
641        x = event->data.draw.rect->x;
642    
643        /* everything from here uses the same font */
644        cairo_select_font_face (event->data.draw.cr, "Sans",
645                                CAIRO_FONT_SLANT_NORMAL,
646                                CAIRO_FONT_WEIGHT_NORMAL);
647    
648      cairo_text_extents (cr, cache->id, &extents);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
649    
650        if(cache->name) {
651          /* draw cache name */
652          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
653          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
654          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
655          cairo_show_text (event->data.draw.cr, cache->name);
656          cairo_stroke (event->data.draw.cr);
657    
658          /* return to the left border and below text */
659          y += LINE_SKIP + FONT_SIZE;
660          x = event->data.draw.rect->x;
661        }
662    
663        if(cache->terrain) {
664          int text_y = 0, icon_y = 0;
665    
666      /* display id right of icon vertically centered */        /* draw cache rating */
667      x += gdk_pixbuf_get_width(icon) + 5;        const char *terrain = "Terrain:";
668      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
669      cairo_move_to (cr, x, y);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
     cairo_set_source_rgba (cr, 0, 0, 0, 1);  
     cairo_show_text (cr, cache->id);  
     cairo_stroke (cr);  
670    
671      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
672    } else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
673      y += gdk_pixbuf_get_height(icon);        else
674            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
675    
676    /* return to the left border and below icon/text */        /* draw "Terrain:" string */
677    x = rect->x;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
678          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
679          cairo_show_text (event->data.draw.cr, _(terrain));
680          cairo_stroke (event->data.draw.cr);
681          x += extents.width + 2;
682    
683          /* draw terrain stars */
684          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
685    
686          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
687        }
688    
689        if(cache->difficulty) {
690          int text_y = 0, icon_y = 0;
691    
692    /* everything from here uses the same font */        const char *difficulty = "Difficulty:";
693    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
694                            CAIRO_FONT_WEIGHT_NORMAL);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
695  #ifndef BIG_BALLOONS  
696    cairo_set_font_size (cr, 14.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
697  #else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
698    cairo_set_font_size (cr, 22.0);        else
699  #endif          icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
700    
701    if(cache->name) {        /* draw "Difficulty:" string */
702      /* draw cache name */        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
703      cairo_text_extents (cr, cache->name, &extents);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
704      y += extents.height;        cairo_show_text (event->data.draw.cr, _(difficulty));
705      cairo_move_to (cr, x, y);        cairo_stroke (event->data.draw.cr);
706      cairo_set_source_rgba (cr, 0, 0, 0, 1);        x += extents.width + 2;
707      cairo_show_text (cr, cache->name);  
708      cairo_stroke (cr);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
709        }
710      /* return to the left border and below text */  
711      y += LINE_SKIP;      /* draw container info */
712      x = rect->x;      /* TODO ... */
713    }  
714    
715    if(cache->terrain) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
716      /* draw cache rating */      printf("click %s event at %d %d\n",
717      const char *terrain = "Terrain:";             event->data.click.down?"down":"up",
718      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));             event->data.click.x, event->data.click.y);
719      cairo_text_extents (cr, _(terrain), &extents);  
720      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;      /* make the main screen jump to that cache */
721        if(!event->data.click.down) {
722      /* draw "Terrain:" string */        if(context->appdata->cur_cache) {
723      cairo_move_to (cr, x, y);          printf("ERROR: no current cache should be visible!\n");
724      cairo_set_source_rgba (cr, 0, 0, 0, 1);        } else {
725      cairo_show_text (cr, _(terrain));          gpx_t *is_in = NULL;
726      cairo_stroke (cr);  
727      x += extents.width + 2;          if(context->appdata->search_results) {
728              printf("click while in \"search results\" view\n");
729      /* draw terrain stars */  
730      cairo_draw_pixbuf(cr, icon, x, y -            is_in = context->appdata->search_results;
731                        (gdk_pixbuf_get_height(icon) + extents.height)/2);          } else if(!context->appdata->cur_gpx) {
732              printf("click while in \"all\" view\n");
733      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;  
734      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;            /* we first need to figure out which gpx file this cache */
735    }            /* is in so we can open it first */
736              gpx_t *gpx = context->appdata->gpx;
737    if(cache->difficulty) {            while(gpx && !is_in) {
738      const char *difficulty = "Difficulty:";              cache_t *cur = gpx->cache;
739      cairo_text_extents (cr, _(difficulty), &extents);              while(cur && !is_in) {
740      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;                if(cur == cache)
741                    is_in = gpx;
742      /* draw "Difficulty:" string */                cur = cur->next;
743      cairo_move_to (cr, x, y);              }
744      cairo_set_source_rgba (cr, 0, 0, 0, 1);              gpx = gpx->next;
745      cairo_show_text (cr, _(difficulty));            }
746      cairo_stroke (cr);  
747      x += extents.width + 2;            if(is_in)
748                gpxlist_goto_cachelist(context->appdata, is_in);
749      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));  
750      cairo_draw_pixbuf(cr, icon, x, y -          } else {
751                        (gdk_pixbuf_get_height(icon) + extents.height)/2);            printf("click while in \"cachelist\" view\n");
752    
753              /* the simple case: there already is an open gpx file and */
754              /* we just jump into the "cache" view */
755              is_in = context->appdata->cur_gpx;
756            }
757    
758            if(is_in) {
759              printf("selecting %s in %s\n",
760                     cache->id,
761                     context->appdata->search_results?
762                     context->appdata->search_results->name:
763                     context->appdata->cur_gpx->name);
764    
765              cachelist_goto_cache(context->appdata, cache);
766    
767              /* give focus to main screen (important for maemo) */
768              printf("raising main window\n");
769              gtk_window_present(GTK_WINDOW(context->appdata->window));
770            }
771          }
772        }
773      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
774        printf("removed\n");
775        context->balloon = NULL;
776    }    }
777  }  }
778    
# Line 441  on_map_button_release_event(GtkWidget *w Line 784  on_map_button_release_event(GtkWidget *w
784    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
785    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
786    /* pretty useless there */    /* pretty useless there */
787    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
788    
789      coord_t coo;      coord_t coo;
790      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
# Line 456  on_map_button_release_event(GtkWidget *w Line 799  on_map_button_release_event(GtkWidget *w
799        float dist = gpx_pos_get_distance(pos, cpos, FALSE);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
800        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
801    
802            context->balloon = nearest;
803          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
804                                       balloon_draw_cb, nearest);                                       balloon_cb, context);
805        }        }
806      }      }
807      context->press_on = NULL;      context->press_on = NULL;
# Line 475  on_map_button_release_event(GtkWidget *w Line 819  on_map_button_release_event(GtkWidget *w
819  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
820    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
821    
   printf("destroy map window\n");  
   
822    /* save map parameters */    /* save map parameters */
823    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
824    gint zoom;    gint zoom;
# Line 498  static void on_window_destroy(GtkWidget Line 840  static void on_window_destroy(GtkWidget
840  #endif  #endif
841    
842    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
843      gps_unregister_callback(appdata, context->cb_id);
844    
845      if(context->caches_displayed) {
846        g_free(context->caches_displayed);
847        context->caches_displayed = NULL;
848      }
849    
850      printf("destroy map context\n");
851    g_free(context);    g_free(context);
852    appdata->map.context = NULL;    appdata->map.context = NULL;
853  }  }
# Line 522  on_window_realize(GtkWidget *widget, gpo Line 871  on_window_realize(GtkWidget *widget, gpo
871  }  }
872  #endif  #endif
873    
874  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
875  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
876    char *name = NULL;  /* on ordinary desktops this is different and we always update */
877    
878    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
879      if(context->state != MAP_ALL) {                           gpointer data) {
880        printf("map_setp(ALL)\n");    map_context_t *context = (map_context_t*)data;
881    
882        /* no navigation in this mode */    printf("map got focus\n");
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
883    
884        /* clear all existing ccahe images */  #ifdef USE_MAEMO
885        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));    /* re-enable refresh of map */
886      if(!context->handler_id)
887        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
888    #endif
889    
890        /* draw all geocaches */    map_setup(context);
891        gpx_t *gpx = context->appdata->gpx;    return FALSE;
892        while(gpx) {  }
         map_draw_gpx(context->appdata, context->widget, gpx);  
         gpx = gpx->next;  
       }  
       name = g_strdup(_("all"));  
       context->state = MAP_ALL;  
     }  
   } else if(!context->appdata->cur_cache) {  
     if(context->state != MAP_GPX) {  
       printf("map_setp(GPX)\n");  
893    
894        /* no navigation in this mode */  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
895        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));                           gpointer data) {
896      map_context_t *context = (map_context_t*)data;
897    
898        /* clear all existing ccahe images */    printf("map lost focus\n");
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
899    
900        map_draw_gpx(context->appdata, context->widget,    /* save new map position */
901                     context->appdata->cur_gpx);    gfloat lat, lon;
902        name = g_strdup(context->appdata->cur_gpx->name);    g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
       context->state = MAP_GPX;  
     }  
   } else {  
     cache_t *cache = context->appdata->cur_cache;  
   
     printf("map_setp(CACHE)\n");  
   
     /* no balloons in this mode */  
     osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));  
   
     /* clear all existing ccahe images */  
     osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
     map_draw_cache(context->widget, cache);  
     name = g_strdup(cache->name);  
     context->state = MAP_CACHE;  
   
     /* navigation in this mode! */  
     pos_t cpos = gpx_cache_pos(cache);  
     osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),  
                               context->appdata->imperial,  
                               cpos.lat, cpos.lon, cache->name);  
   }  
903    
904    if(name) {    context->appdata->map.pos.lat = lat;
905      char *title = g_strdup_printf(_("Map - %s"), name);    context->appdata->map.pos.lon = lon;
     g_free(name);  
906    
907      gtk_window_set_title(GTK_WINDOW(context->window), title);  #ifdef USE_MAEMO
908      gtk_timeout_remove(context->handler_id);
909      g_free(title);    context->handler_id = 0;
910    } else  #endif
     printf("map_setup(keep)\n");  
 }  
911    
 /* on maemo a window is either on top or completely invisible. this means that */  
 /* we only need to update the map window if its raised. on ordinary desktops this */  
 /* is different and we always update */  
 static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  
                          gpointer data) {  
   printf("map got focus\n");  
   map_setup((map_context_t*)data);  
912    return FALSE;    return FALSE;
913  }  }
914    
915  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
916      printf("map_update\n");
917  #ifndef USE_MAEMO  #ifndef USE_MAEMO
918    if(appdata->map.context)    if(appdata->map.context)
919      map_setup(appdata->map.context);      map_setup(appdata->map.context);
920  #endif  #endif
921  }  }
922    
923    /* callback called by the gps layer whenever gps state changes */
924    static void
925    gps_callback(struct gps_state *state, gpointer data) {
926      printf("map: gps callback\n");
927    }
928    
929  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
930    map_context_t *context = NULL;    map_context_t *context = NULL;
931    
# Line 622  void map(appdata_t *appdata) { Line 938  void map(appdata_t *appdata) {
938    }    }
939    
940    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
941      printf("allocated new context at %p\n", context);
942    
943    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
944    context->state = MAP_NONE;    context->state = MAP_NONE;
945    
946    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
# Line 668  void map(appdata_t *appdata) { Line 985  void map(appdata_t *appdata) {
985    
986    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
987    
988      /* set default values if they are invalid */
989      if(!context->appdata->map.zoom ||
990         isnan(context->appdata->map.pos.lat) ||
991         isnan(context->appdata->map.pos.lon)) {
992        printf("no valid map position found\n");
993    
994        pos_t *refpos = get_pos(context->appdata);
995        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
996          printf("use refpos\n");
997    
998            /* use gps position if present */
999          context->appdata->map.pos = *refpos;
1000          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
1001        } else {
1002          printf("use zero pos\n");
1003    
1004          /* use world map otherwise */
1005          context->appdata->map.pos.lat = 0.0;
1006          context->appdata->map.pos.lon = 0.0;
1007          context->appdata->map.zoom = 1;
1008        }
1009      }
1010    
1011      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
1012                                context->appdata->map.pos.lat,
1013                                context->appdata->map.pos.lon,
1014                                context->appdata->map.zoom);
1015    
1016  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1017    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
1018    /* this leaves the main window independent from the map and */    /* this leaves the main window independent from the map and */
# Line 682  void map(appdata_t *appdata) { Line 1027  void map(appdata_t *appdata) {
1027    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
1028  #endif  #endif
1029    
   /* setup cache state */  
   map_setup(context);  
   
1030  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1031    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
1032  #endif  #endif
# Line 692  void map(appdata_t *appdata) { Line 1034  void map(appdata_t *appdata) {
1034    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
1035                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
1036    
1037    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1038                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_focus_out), context);
1039    
1040    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1041                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 703  void map(appdata_t *appdata) { Line 1045  void map(appdata_t *appdata) {
1045    
1046    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
1047    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
1048      context->cb_id = gps_register_callback(appdata, gps_callback, context);
1049    
1050  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
1051    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 715  void map(appdata_t *appdata) { Line 1058  void map(appdata_t *appdata) {
1058    
1059    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1060    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1061    
1062      /* setup cache state */
1063      map_setup(context);
1064  }  }
Legend:
Removed from v.133  
changed lines
  Added in v.255