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

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

revision 136 by harbaum, Mon Oct 19 13:02:41 2009 UTC revision 242 by harbaum, Sun Dec 13 19:57:02 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     * - 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          memset(context->caches_displayed, 0,
294                 (cache_num+1) * sizeof(cache_display_t));
295    
296          /* draw search results and all other gpx files are semi-transparent */
297          map_draw_gpx(context->appdata, context->caches_displayed,
298                       context->widget, context->appdata->search_results,
299                       NULL, FALSE);
300    
301          gpx_t *gpx = context->appdata->gpx;
302          while(gpx) {
303            map_draw_gpx(context->appdata, context->caches_displayed,
304                         context->widget, gpx, NULL, TRUE);
305    
306            gpx = gpx->next;
307          }
308    
309          name = g_strdup(_("Search results"));
310          context->state = MAP_SEARCH;
311        }
312      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
313        if(context->state != MAP_ALL) {
314          printf("map_setup(ALL)\n");
315    
316          /* clear any pending balloon */
317          context->balloon = NULL;
318          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
319    
320    #ifdef OSD_NAV
321          /* no navigation in this mode */
322          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
323    #endif
324    
325          /* clear all existing cache images */
326          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
327          memset(context->caches_displayed, 0,
328                 (cache_num+1) * sizeof(cache_display_t));
329    
330          /* draw all geocaches and none is semi-transparent */
331          gpx_t *gpx = context->appdata->gpx;
332          while(gpx) {
333            map_draw_gpx(context->appdata, context->caches_displayed,
334                         context->widget, gpx, NULL, FALSE);
335            gpx = gpx->next;
336          }
337    
338          {
339            int i=0;
340            while(context->caches_displayed[i].id) i++;
341            printf("number of caches actually displayed: %d\n", i);
342          }
343    
344          name = g_strdup(_("all"));
345          context->state = MAP_ALL;
346        }
347      } else if(!context->appdata->cur_cache) {
348        if(context->state != MAP_GPX) {
349          printf("map_setup(GPX)\n");
350    
351          /* clear any pending balloon */
352          context->balloon = NULL;
353          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
354    
355    #ifdef OSD_NAV
356          /* no navigation in this mode */
357          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
358    #endif
359    
360          /* clear all existing cache images */
361          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
362          memset(context->caches_displayed, 0,
363                 (cache_num+1) * sizeof(cache_display_t));
364    
365          /* draw all geocaches and all other gpx files are semi-transparent */
366          map_draw_gpx(context->appdata, context->caches_displayed,
367                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
368    
369          gpx_t *gpx = context->appdata->gpx;
370          while(gpx) {
371            if(gpx != context->appdata->cur_gpx)
372              map_draw_gpx(context->appdata, context->caches_displayed,
373                           context->widget, gpx, NULL, TRUE);
374    
375            gpx = gpx->next;
376          }
377    
378          name = g_strdup(context->appdata->cur_gpx->name);
379          context->state = MAP_GPX;
380        }
381      } else {
382        cache_t *cache = context->appdata->cur_cache;
383    
384        printf("map_setup(CACHE)\n");
385    
386        /* clear any pending balloon */
387        context->balloon = NULL;
388        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
389    
390        /* clear all existing ccahe images */
391        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
392        memset(context->caches_displayed, 0,
393               (cache_num+1) * sizeof(cache_display_t));
394    
395        /* Make sure we really work on the first copy in the list as */
396        /* only this is being used if duplicates exist */
397        cache = cache_search_first(context->appdata->gpx, cache);
398    
399        /* draw all geocaches and all but selected one are semi-transparent */
400        gpx_t *gpx = context->appdata->gpx;
401        while(gpx) {
402          map_draw_gpx(context->appdata, context->caches_displayed,
403                       context->widget, gpx, cache, FALSE);
404          gpx = gpx->next;
405        }
406    
407        name = g_strdup(cache->name);
408        context->state = MAP_CACHE;
409    
410        /* navigation in this mode! */
411        pos_t cpos = gpx_cache_pos(cache);
412    
413    #ifdef OSD_NAV
414        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
415                                  context->appdata->imperial,
416                                  cpos.lat, cpos.lon, cache->name);
417    #else
418    #warning OSD_NAV not defined!
419    #endif
420      }
421    
422      /* also mark geomath position */
423    
424      /* remove all existing appearances of this icon first */
425      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
426                               icon_get(ICON_MISC, 4));
427    
428      if(!isnan(context->appdata->geomath.lat) &&
429         !isnan(context->appdata->geomath.lon))  {
430    
431        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
432                              context->appdata->geomath.lat,
433                              context->appdata->geomath.lon,
434                              icon_get(ICON_MISC, 4));
435      }
436    
437      if(name) {
438        gtk_window_set_title(GTK_WINDOW(context->window), name);
439        g_free(name);
440      } else
441        printf("map_setup(keep)\n");
442    }
443    
444  static void  static void
445  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
446                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
447    
448    while(cache) {    while(cache) {
449      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
450    
# Line 228  map_cachelist_nearest(cache_t *cache, po Line 464  map_cachelist_nearest(cache_t *cache, po
464  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
465    cache_t *result = NULL;    cache_t *result = NULL;
466    float distance = NAN;    float distance = NAN;
467    
468    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
469        /* search search results */
470        map_cachelist_nearest(context->appdata->search_results->cache,
471                              pos, &result, &distance);
472      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
473      /* search all geocaches */      /* search all geocaches */
474      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
475      while(gpx) {      while(gpx) {
# Line 237  static cache_t *map_closest(map_context_ Line 477  static cache_t *map_closest(map_context_
477        gpx = gpx->next;        gpx = gpx->next;
478      }      }
479    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
480        /* search in current gpx file */
481      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
482                            pos, &result, &distance);                            pos, &result, &distance);
483    } else    } else
484      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_cache;
485    
486      /* make sure this is the first hit */
487      result = cache_search_first(context->appdata->gpx, result);
488    
489    return result;    return result;
490  }  }
# Line 258  pos_t coord2pos(coord_t coo) { Line 502  pos_t coord2pos(coord_t coo) {
502  static gboolean  static gboolean
503  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
504                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
505    
506    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
507    
508    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
509    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)
510      return FALSE;      return FALSE;
511    
512    /* 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 541  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
541                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
542    
543    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
544      g_assert(image_surface);
545    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
546    
547    // Draw the image on the new Context    // Draw the image on the new Context
# Line 309  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 555  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
555  }  }
556    
557  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
558  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
559  #else  #else
560  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
561  #endif  #endif
562    
563    #ifndef BIG_BALLOONS
564    #define FONT_SIZE 14.0
565    #else
566    #define FONT_SIZE 22.0
567    #endif
568    #define LINE_SKIP  (FONT_SIZE/4)
569    
570    
571  static void  static void
572  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
573      printf("balloon event: ");
574    
575    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
576    cache_t *cache = context->balloon;    cache_t *cache = context->balloon;
577    
   printf("balloon event: ");  
   
578    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
579      printf("draw\n");      printf("draw\n");
580    
# Line 339  balloon_cb(osm_gps_map_balloon_event_t * Line 593  balloon_cb(osm_gps_map_balloon_event_t *
593      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
594    
595      /* draw the cache type icon ... */      /* draw the cache type icon ... */
596      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
597      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
598    
599      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
600        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
601        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
602      }      }
603    
# Line 379  balloon_cb(osm_gps_map_balloon_event_t * Line 633  balloon_cb(osm_gps_map_balloon_event_t *
633      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
634    
635      /* everything from here uses the same font */      /* everything from here uses the same font */
636      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
637                                CAIRO_FONT_SLANT_NORMAL,
638                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
639  #ifndef BIG_BALLOONS  
640      cairo_set_font_size (event->data.draw.cr, 14.0);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
 #else  
     cairo_set_font_size (event->data.draw.cr, 22.0);  
 #endif  
641    
642      if(cache->name) {      if(cache->name) {
643        /* draw cache name */        /* draw cache name */
644        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
645        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
646        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
647        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
648        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
649    
650        /* return to the left border and below text */        /* return to the left border and below text */
651        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
652        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
653      }      }
654    
655      if(cache->terrain) {      if(cache->terrain) {
656          int text_y = 0, icon_y = 0;
657    
658        /* draw cache rating */        /* draw cache rating */
659        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
660        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
661        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
662        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
663          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
664            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
665          else
666            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
667    
668        /* draw "Terrain:" string */        /* draw "Terrain:" string */
669        cairo_move_to (event->data.draw.cr, x, y);        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);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
671        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
672        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
673        x += extents.width + 2;        x += extents.width + 2;
674    
675        /* draw terrain stars */        /* draw terrain stars */
676        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
                         (gdk_pixbuf_get_height(icon) + extents.height)/2);  
677    
678        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
     y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;  
679      }      }
680    
681      if(cache->difficulty) {      if(cache->difficulty) {
682          int text_y = 0, icon_y = 0;
683    
684        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
685          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
686        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
       y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
687    
688          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
689            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
690          else
691            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
692    
693        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
694        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
695        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
696        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
697        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
698        x += extents.width + 2;        x += extents.width + 2;
699    
700        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
       cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -  
                       (gdk_pixbuf_get_height(icon) + extents.height)/2);  
701      }      }
702    
703        /* draw container info */
704        /* TODO ... */
705    
706    
707    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
708      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
709             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
710             event->data.click.x, event->data.click.y);             event->data.click.x, event->data.click.y);
711    
712        /* make the main screen jump to that cache */
713        if(!event->data.click.down) {
714          if(context->appdata->cur_cache) {
715            printf("ERROR: no current cache should be visible!\n");
716          } else {
717            gpx_t *is_in = NULL;
718    
719            if(!context->appdata->cur_gpx) {
720              printf("click while in \"all\" view\n");
721    
722              /* we first need to figure out which gpx file this cache */
723              /* is in so we can open it first */
724              gpx_t *gpx = context->appdata->gpx;
725              while(gpx && !is_in) {
726                cache_t *cur = gpx->cache;
727                while(cur && !is_in) {
728                  if(cur == cache)
729                    is_in = gpx;
730                  cur = cur->next;
731                }
732                gpx = gpx->next;
733              }
734    
735              if(is_in)
736                gpxlist_goto_cachelist(context->appdata, is_in);
737    
738            } else
739              /* the simple case: there already is an open gpx file and */
740              /* we just jump into the "cache" view */
741              is_in = context->appdata->cur_gpx;
742    
743            if(is_in) {
744              printf("selecting %s in %s\n",
745                     cache->id,
746                     context->appdata->cur_gpx->name);
747    
748              cachelist_goto_cache(context->appdata, cache);
749    
750              /* give focus to main screen (important for maemo) */
751              printf("raising main window\n");
752              gtk_window_present(GTK_WINDOW(context->appdata->window));
753            }
754          }
755        }
756    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
757      printf("removed\n");      printf("removed\n");
758      context->balloon = NULL;      context->balloon = NULL;
# Line 458  on_map_button_release_event(GtkWidget *w Line 767  on_map_button_release_event(GtkWidget *w
767    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
768    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
769    /* pretty useless there */    /* pretty useless there */
770    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
771    
772      coord_t coo;      coord_t coo;
773      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 493  on_map_button_release_event(GtkWidget *w Line 802  on_map_button_release_event(GtkWidget *w
802  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
803    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
804    
   printf("destroy map window\n");  
   
805    /* save map parameters */    /* save map parameters */
806    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
807    gint zoom;    gint zoom;
# Line 516  static void on_window_destroy(GtkWidget Line 823  static void on_window_destroy(GtkWidget
823  #endif  #endif
824    
825    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
826      gps_unregister_callback(appdata, context->cb_id);
827    
828      if(context->caches_displayed) {
829        g_free(context->caches_displayed);
830        context->caches_displayed = NULL;
831      }
832    
833      printf("destroy map context\n");
834    g_free(context);    g_free(context);
835    appdata->map.context = NULL;    appdata->map.context = NULL;
836  }  }
# Line 540  on_window_realize(GtkWidget *widget, gpo Line 854  on_window_realize(GtkWidget *widget, gpo
854  }  }
855  #endif  #endif
856    
857  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
858  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
859    char *name = NULL;  /* on ordinary desktops this is different and we always update */
860    
861    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
862      if(context->state != MAP_ALL) {                           gpointer data) {
863        printf("map_setp(ALL)\n");    map_context_t *context = (map_context_t*)data;
864    
865        /* no navigation in this mode */    printf("map got focus\n");
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
866    
867        /* clear all existing ccahe images */  #ifdef USE_MAEMO
868        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));    /* re-enable refresh of map */
869      if(!context->handler_id)
870        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
871    #endif
872    
873        /* draw all geocaches */    map_setup(context);
874        gpx_t *gpx = context->appdata->gpx;    return FALSE;
875        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");  
876    
877        /* no navigation in this mode */  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
878        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));                           gpointer data) {
879      map_context_t *context = (map_context_t*)data;
880    
881        /* clear all existing ccahe images */    printf("map lost focus\n");
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
882    
883        map_draw_gpx(context->appdata, context->widget,    /* save new map position */
884                     context->appdata->cur_gpx);    gfloat lat, lon;
885        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 */  
     context->balloon = NULL;  
     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);  
   }  
886    
887    if(name) {    context->appdata->map.pos.lat = lat;
888      char *title = g_strdup_printf(_("Map - %s"), name);    context->appdata->map.pos.lon = lon;
     g_free(name);  
889    
890      gtk_window_set_title(GTK_WINDOW(context->window), title);  #ifdef USE_MAEMO
891      gtk_timeout_remove(context->handler_id);
892      g_free(title);    context->handler_id = 0;
893    } else  #endif
     printf("map_setup(keep)\n");  
 }  
894    
 /* 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);  
895    return FALSE;    return FALSE;
896  }  }
897    
898  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
899      printf("map_update\n");
900  #ifndef USE_MAEMO  #ifndef USE_MAEMO
901    if(appdata->map.context)    if(appdata->map.context)
902      map_setup(appdata->map.context);      map_setup(appdata->map.context);
903  #endif  #endif
904  }  }
905    
906    /* callback called by the gps layer whenever gps state changes */
907    static void
908    gps_callback(struct gps_state *state, gpointer data) {
909      printf("map: gps callback\n");
910    }
911    
912  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
913    map_context_t *context = NULL;    map_context_t *context = NULL;
914    
# Line 641  void map(appdata_t *appdata) { Line 921  void map(appdata_t *appdata) {
921    }    }
922    
923    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
924      printf("allocated new context at %p\n", context);
925    
926    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
927    context->state = MAP_NONE;    context->state = MAP_NONE;
928    
929    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
# Line 687  void map(appdata_t *appdata) { Line 968  void map(appdata_t *appdata) {
968    
969    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
970    
971      /* set default values if they are invalid */
972      if(!context->appdata->map.zoom ||
973         isnan(context->appdata->map.pos.lat) ||
974         isnan(context->appdata->map.pos.lon)) {
975        printf("no valid map position found\n");
976    
977        pos_t *refpos = get_pos(context->appdata);
978        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
979          printf("use refpos\n");
980    
981            /* use gps position if present */
982          context->appdata->map.pos = *refpos;
983          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
984        } else {
985          printf("use zero pos\n");
986    
987          /* use world map otherwise */
988          context->appdata->map.pos.lat = 0.0;
989          context->appdata->map.pos.lon = 0.0;
990          context->appdata->map.zoom = 1;
991        }
992      }
993    
994      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
995                                context->appdata->map.pos.lat,
996                                context->appdata->map.pos.lon,
997                                context->appdata->map.zoom);
998    
999  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1000    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
1001    /* this leaves the main window independent from the map and */    /* this leaves the main window independent from the map and */
# Line 701  void map(appdata_t *appdata) { Line 1010  void map(appdata_t *appdata) {
1010    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
1011  #endif  #endif
1012    
   /* setup cache state */  
   map_setup(context);  
   
1013  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1014    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
1015  #endif  #endif
# Line 711  void map(appdata_t *appdata) { Line 1017  void map(appdata_t *appdata) {
1017    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
1018                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
1019    
1020    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1021                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_focus_out), context);
1022    
1023    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1024                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 722  void map(appdata_t *appdata) { Line 1028  void map(appdata_t *appdata) {
1028    
1029    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
1030    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
1031      context->cb_id = gps_register_callback(appdata, gps_callback, context);
1032    
1033  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
1034    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 734  void map(appdata_t *appdata) { Line 1041  void map(appdata_t *appdata) {
1041    
1042    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1043    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1044    
1045      /* setup cache state */
1046      map_setup(context);
1047  }  }
Legend:
Removed from v.136  
changed lines
  Added in v.242