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 238 by harbaum, Sat Dec 12 12:54:37 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    /* draw geocaches and set window title */
241    static void map_setup(map_context_t *context) {
242      char *name = NULL;
243    
244      int cache_num = gpx_total_caches_global(context->appdata->gpx);
245    
246      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
247        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
248        //     cache_num, context->cache_list_len);
249        g_free(context->caches_displayed);
250        context->caches_displayed = NULL;
251        context->cache_list_len = 0;
252      }
253    
254      /* allocate buffer */
255      if(cache_num && !context->caches_displayed) {
256        context->cache_list_len = cache_num;
257        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
258        printf("allocated space to handle %d map icons\n", cache_num);
259      }
260    
261      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
262        if(context->state != MAP_ALL) {
263          printf("map_setup(ALL)\n");
264    
265          /* clear any pending balloon */
266          context->balloon = NULL;
267          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
268    
269    #ifdef OSD_NAV
270          /* no navigation in this mode */
271          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
272    #endif
273    
274          /* clear all existing cache images */
275          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
276          memset(context->caches_displayed, 0,
277                 (cache_num+1) * sizeof(cache_display_t));
278    
279          /* draw all geocaches and none is semi-transparent */
280          gpx_t *gpx = context->appdata->gpx;
281          while(gpx) {
282            map_draw_gpx(context->appdata, context->caches_displayed,
283                         context->widget, gpx, NULL, FALSE);
284            gpx = gpx->next;
285          }
286    
287          {
288            int i=0;
289            while(context->caches_displayed[i].id) i++;
290            printf("number of caches actually displayed: %d\n", i);
291          }
292    
293          name = g_strdup(_("all"));
294          context->state = MAP_ALL;
295        }
296      } else if(!context->appdata->cur_cache) {
297        if(context->state != MAP_GPX) {
298          printf("map_setup(GPX)\n");
299    
300          /* clear any pending balloon */
301          context->balloon = NULL;
302          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
303    
304    #ifdef OSD_NAV
305          /* no navigation in this mode */
306          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
307    #endif
308    
309          /* clear all existing cache images */
310          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
311          memset(context->caches_displayed, 0,
312                 (cache_num+1) * sizeof(cache_display_t));
313    
314          /* draw all geocaches and all other gpx files are semi-transparent */
315          map_draw_gpx(context->appdata, context->caches_displayed,
316                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
317    
318          gpx_t *gpx = context->appdata->gpx;
319          while(gpx) {
320            if(gpx != context->appdata->cur_gpx)
321              map_draw_gpx(context->appdata, context->caches_displayed,
322                           context->widget, gpx, NULL, TRUE);
323    
324            gpx = gpx->next;
325          }
326    
327          name = g_strdup(context->appdata->cur_gpx->name);
328          context->state = MAP_GPX;
329        }
330      } else {
331        cache_t *cache = context->appdata->cur_cache;
332    
333        printf("map_setup(CACHE)\n");
334    
335        /* clear any pending balloon */
336        context->balloon = NULL;
337        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
338    
339        /* clear all existing ccahe images */
340        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
341        memset(context->caches_displayed, 0,
342               (cache_num+1) * sizeof(cache_display_t));
343    
344        /* draw all geocaches and all but selected one are semi-transparent */
345        gpx_t *gpx = context->appdata->gpx;
346        while(gpx) {
347          map_draw_gpx(context->appdata, context->caches_displayed,
348                       context->widget, gpx, cache, FALSE);
349          gpx = gpx->next;
350        }
351    
352        name = g_strdup(cache->name);
353        context->state = MAP_CACHE;
354    
355        /* navigation in this mode! */
356        pos_t cpos = gpx_cache_pos(cache);
357    
358    #ifdef OSD_NAV
359        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
360                                  context->appdata->imperial,
361                                  cpos.lat, cpos.lon, cache->name);
362    #else
363    #warning OSD_NAV not defined!
364    #endif
365      }
366    
367      /* also mark geomath position */
368    
369      /* remove all existing appearances of this icon first */
370      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
371                               icon_get(ICON_MISC, 4));
372    
373      if(!isnan(context->appdata->geomath.lat) &&
374         !isnan(context->appdata->geomath.lon))  {
375    
376        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
377                              context->appdata->geomath.lat,
378                              context->appdata->geomath.lon,
379                              icon_get(ICON_MISC, 4));
380      }
381    
382      if(name) {
383        char *title = g_strdup_printf(_("Map - %s"), name);
384        g_free(name);
385    
386        gtk_window_set_title(GTK_WINDOW(context->window), title);
387    
388        g_free(title);
389      } else
390        printf("map_setup(keep)\n");
391    }
392    
393  static void  static void
394  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
395                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
396    
397    while(cache) {    while(cache) {
398      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
399    
# Line 258  pos_t coord2pos(coord_t coo) { Line 443  pos_t coord2pos(coord_t coo) {
443  static gboolean  static gboolean
444  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
445                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
446    
447    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
448    
449    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
450    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)
451      return FALSE;      return FALSE;
452    
453    /* 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 482  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
482                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
483    
484    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
485      g_assert(image_surface);
486    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
487    
488    // Draw the image on the new Context    // Draw the image on the new Context
# Line 309  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 496  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
496  }  }
497    
498  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
499  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
500  #else  #else
501  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
502  #endif  #endif
503    
504  static void  #ifndef BIG_BALLOONS
505  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  #define FONT_SIZE 14.0
506    cache_t *cache = (cache_t*)data;  #else
507    #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);  
508  #endif  #endif
509    #define LINE_SKIP  (FONT_SIZE/4)
510    
   /* leave a little border top and left */  
   gint x = rect->x, y = rect->y;  
511    
512    /* draw the cache type icon ... */  static void
513    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
514    cairo_draw_pixbuf(cr, icon, x, y);    printf("balloon event: ");
515    
516    if(cache->notes && cache->notes->override) {    map_context_t *context = (map_context_t*)data;
517      GdkPixbuf *over = icon_get(ICON_MISC, 1);    cache_t *cache = context->balloon;
     cairo_draw_pixbuf(cr, over, x, y);  
   }  
518    
519    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
520    cairo_text_extents_t extents;      printf("draw\n");
521    
522    if(cache->id) {  #if 0
523      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
524                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
525                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
526                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
527        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
528        cairo_fill_preserve (event->data.draw.cr);
529        cairo_set_line_width (event->data.draw.cr, 0);
530        cairo_stroke (event->data.draw.cr);
531    #endif
532    
533        /* leave a little border top and left */
534        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
535    
536        /* draw the cache type icon ... */
537        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
538        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
539    
540        if(cache->notes && cache->notes->override) {
541          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
542          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
543        }
544    
545        /* ... and right of it the waypoint id */
546        cairo_text_extents_t extents;
547    
548        if(cache->id) {
549          cairo_select_font_face (event->data.draw.cr, "Sans",
550                                  CAIRO_FONT_SLANT_NORMAL,
551                                  CAIRO_FONT_WEIGHT_BOLD);
552    
553  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
554      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
555  #else  #else
556      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
557  #endif  #endif
558    
559          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
560    
561          /* display id right of icon vertically centered */
562          x += gdk_pixbuf_get_width(icon) + 5;
563          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
564          cairo_move_to (event->data.draw.cr, x, y);
565          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
566          cairo_show_text (event->data.draw.cr, cache->id);
567          cairo_stroke (event->data.draw.cr);
568    
569          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
570        } else
571          y += gdk_pixbuf_get_height(icon);
572    
573        /* return to the left border and below icon/text */
574        x = event->data.draw.rect->x;
575    
576        /* everything from here uses the same font */
577        cairo_select_font_face (event->data.draw.cr, "Sans",
578                                CAIRO_FONT_SLANT_NORMAL,
579                                CAIRO_FONT_WEIGHT_NORMAL);
580    
581      cairo_text_extents (cr, cache->id, &extents);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
582    
583        if(cache->name) {
584          /* draw cache name */
585          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
586          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
587          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
588          cairo_show_text (event->data.draw.cr, cache->name);
589          cairo_stroke (event->data.draw.cr);
590    
591          /* return to the left border and below text */
592          y += LINE_SKIP + FONT_SIZE;
593          x = event->data.draw.rect->x;
594        }
595    
596        if(cache->terrain) {
597          int text_y = 0, icon_y = 0;
598    
599      /* display id right of icon vertically centered */        /* draw cache rating */
600      x += gdk_pixbuf_get_width(icon) + 5;        const char *terrain = "Terrain:";
601      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
602      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);  
603    
604      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
605    } else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
606      y += gdk_pixbuf_get_height(icon);        else
607            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
608    
609    /* return to the left border and below icon/text */        /* draw "Terrain:" string */
610    x = rect->x;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
611          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
612          cairo_show_text (event->data.draw.cr, _(terrain));
613          cairo_stroke (event->data.draw.cr);
614          x += extents.width + 2;
615    
616          /* draw terrain stars */
617          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
618    
619          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
620        }
621    
622        if(cache->difficulty) {
623          int text_y = 0, icon_y = 0;
624    
625    /* everything from here uses the same font */        const char *difficulty = "Difficulty:";
626    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
627                            CAIRO_FONT_WEIGHT_NORMAL);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
628  #ifndef BIG_BALLOONS  
629    cairo_set_font_size (cr, 14.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
630  #else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
631    cairo_set_font_size (cr, 22.0);        else
632  #endif          icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
633    
634    if(cache->name) {        /* draw "Difficulty:" string */
635      /* draw cache name */        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
636      cairo_text_extents (cr, cache->name, &extents);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
637      y += extents.height;        cairo_show_text (event->data.draw.cr, _(difficulty));
638      cairo_move_to (cr, x, y);        cairo_stroke (event->data.draw.cr);
639      cairo_set_source_rgba (cr, 0, 0, 0, 1);        x += extents.width + 2;
640      cairo_show_text (cr, cache->name);  
641      cairo_stroke (cr);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
642        }
643      /* return to the left border and below text */  
644      y += LINE_SKIP;      /* draw container info */
645      x = rect->x;      /* TODO ... */
646    }  
647    
648    if(cache->terrain) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
649      /* draw cache rating */      printf("click %s event at %d %d\n",
650      const char *terrain = "Terrain:";             event->data.click.down?"down":"up",
651      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));             event->data.click.x, event->data.click.y);
652      cairo_text_extents (cr, _(terrain), &extents);  
653      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;      /* make the main screen jump to that cache */
654        if(!event->data.click.down) {
655      /* draw "Terrain:" string */        if(context->appdata->cur_cache) {
656      cairo_move_to (cr, x, y);          printf("ERROR: no current cache should be visible!\n");
657      cairo_set_source_rgba (cr, 0, 0, 0, 1);        } else {
658      cairo_show_text (cr, _(terrain));          gpx_t *is_in = NULL;
659      cairo_stroke (cr);  
660      x += extents.width + 2;          if(!context->appdata->cur_gpx) {
661              printf("click while in \"all\" view\n");
662      /* draw terrain stars */  
663      cairo_draw_pixbuf(cr, icon, x, y -            /* we first need to figure out which gpx file this cache */
664                        (gdk_pixbuf_get_height(icon) + extents.height)/2);            /* is in so we can open it first */
665              gpx_t *gpx = context->appdata->gpx;
666      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;            while(gpx && !is_in) {
667      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;              cache_t *cur = gpx->cache;
668    }              while(cur && !is_in) {
669                  if(cur == cache)
670    if(cache->difficulty) {                  is_in = gpx;
671      const char *difficulty = "Difficulty:";                cur = cur->next;
672      cairo_text_extents (cr, _(difficulty), &extents);              }
673      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;              gpx = gpx->next;
674              }
675      /* draw "Difficulty:" string */  
676      cairo_move_to (cr, x, y);            if(is_in)
677      cairo_set_source_rgba (cr, 0, 0, 0, 1);              gpxlist_goto_cachelist(context->appdata, is_in);
678      cairo_show_text (cr, _(difficulty));  
679      cairo_stroke (cr);          } else
680      x += extents.width + 2;            /* the simple case: there already is an open gpx file and */
681              /* we just jump into the "cache" view */
682      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));            is_in = context->appdata->cur_gpx;
683      cairo_draw_pixbuf(cr, icon, x, y -  
684                        (gdk_pixbuf_get_height(icon) + extents.height)/2);          if(is_in) {
685              printf("selecting %s in %s\n",
686                     cache->id,
687                     context->appdata->cur_gpx->name);
688    
689              cachelist_goto_cache(context->appdata, cache);
690    
691              /* give focus to main screen (important for maemo) */
692              printf("raising main window\n");
693              gtk_window_present(GTK_WINDOW(context->appdata->window));
694            }
695          }
696        }
697      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
698        printf("removed\n");
699        context->balloon = NULL;
700    }    }
701  }  }
702    
# Line 441  on_map_button_release_event(GtkWidget *w Line 708  on_map_button_release_event(GtkWidget *w
708    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
709    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
710    /* pretty useless there */    /* pretty useless there */
711    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
712    
713      coord_t coo;      coord_t coo;
714      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 723  on_map_button_release_event(GtkWidget *w
723        float dist = gpx_pos_get_distance(pos, cpos, FALSE);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
724        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
725    
726            context->balloon = nearest;
727          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
728                                       balloon_draw_cb, nearest);                                       balloon_cb, context);
729        }        }
730      }      }
731      context->press_on = NULL;      context->press_on = NULL;
# Line 475  on_map_button_release_event(GtkWidget *w Line 743  on_map_button_release_event(GtkWidget *w
743  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
744    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
745    
   printf("destroy map window\n");  
   
746    /* save map parameters */    /* save map parameters */
747    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
748    gint zoom;    gint zoom;
# Line 498  static void on_window_destroy(GtkWidget Line 764  static void on_window_destroy(GtkWidget
764  #endif  #endif
765    
766    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
767      gps_unregister_callback(appdata, context->cb_id);
768    
769      if(context->caches_displayed) {
770        g_free(context->caches_displayed);
771        context->caches_displayed = NULL;
772      }
773    
774      printf("destroy map context\n");
775    g_free(context);    g_free(context);
776    appdata->map.context = NULL;    appdata->map.context = NULL;
777  }  }
# Line 522  on_window_realize(GtkWidget *widget, gpo Line 795  on_window_realize(GtkWidget *widget, gpo
795  }  }
796  #endif  #endif
797    
798  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
799  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
800    char *name = NULL;  /* on ordinary desktops this is different and we always update */
801    
802    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
803      if(context->state != MAP_ALL) {                           gpointer data) {
804        printf("map_setp(ALL)\n");    map_context_t *context = (map_context_t*)data;
805    
806        /* no navigation in this mode */    printf("map got focus\n");
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
807    
808        /* clear all existing ccahe images */  #ifdef USE_MAEMO
809        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));    /* re-enable refresh of map */
810      if(!context->handler_id)
811        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
812    #endif
813    
814        /* draw all geocaches */    map_setup(context);
815        gpx_t *gpx = context->appdata->gpx;    return FALSE;
816        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");  
817    
818        /* no navigation in this mode */  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
819        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));                           gpointer data) {
820      map_context_t *context = (map_context_t*)data;
821    
822        /* clear all existing ccahe images */    printf("map lost focus\n");
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
823    
824        map_draw_gpx(context->appdata, context->widget,    /* save new map position */
825                     context->appdata->cur_gpx);    gfloat lat, lon;
826        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);  
   }  
827    
828    if(name) {    context->appdata->map.pos.lat = lat;
829      char *title = g_strdup_printf(_("Map - %s"), name);    context->appdata->map.pos.lon = lon;
     g_free(name);  
830    
831      gtk_window_set_title(GTK_WINDOW(context->window), title);  #ifdef USE_MAEMO
832      gtk_timeout_remove(context->handler_id);
833      g_free(title);    context->handler_id = 0;
834    } else  #endif
     printf("map_setup(keep)\n");  
 }  
835    
 /* 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);  
836    return FALSE;    return FALSE;
837  }  }
838    
839  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
840      printf("map_update\n");
841  #ifndef USE_MAEMO  #ifndef USE_MAEMO
842    if(appdata->map.context)    if(appdata->map.context)
843      map_setup(appdata->map.context);      map_setup(appdata->map.context);
844  #endif  #endif
845  }  }
846    
847    /* callback called by the gps layer whenever gps state changes */
848    static void
849    gps_callback(struct gps_state *state, gpointer data) {
850      printf("map: gps callback\n");
851    }
852    
853  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
854    map_context_t *context = NULL;    map_context_t *context = NULL;
855    
# Line 622  void map(appdata_t *appdata) { Line 862  void map(appdata_t *appdata) {
862    }    }
863    
864    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
865      printf("allocated new context at %p\n", context);
866    
867    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
868    context->state = MAP_NONE;    context->state = MAP_NONE;
869    
870    /* 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 909  void map(appdata_t *appdata) {
909    
910    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
911    
912      /* set default values if they are invalid */
913      if(!context->appdata->map.zoom ||
914         isnan(context->appdata->map.pos.lat) ||
915         isnan(context->appdata->map.pos.lon)) {
916        printf("no valid map position found\n");
917    
918        pos_t *refpos = get_pos(context->appdata);
919        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
920          printf("use refpos\n");
921    
922            /* use gps position if present */
923          context->appdata->map.pos = *refpos;
924          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
925        } else {
926          printf("use zero pos\n");
927    
928          /* use world map otherwise */
929          context->appdata->map.pos.lat = 0.0;
930          context->appdata->map.pos.lon = 0.0;
931          context->appdata->map.zoom = 1;
932        }
933      }
934    
935      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
936                                context->appdata->map.pos.lat,
937                                context->appdata->map.pos.lon,
938                                context->appdata->map.zoom);
939    
940  #ifdef USE_MAEMO  #ifdef USE_MAEMO
941    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
942    /* 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 951  void map(appdata_t *appdata) {
951    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
952  #endif  #endif
953    
   /* setup cache state */  
   map_setup(context);  
   
954  #ifndef USE_MAEMO  #ifndef USE_MAEMO
955    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
956  #endif  #endif
# Line 692  void map(appdata_t *appdata) { Line 958  void map(appdata_t *appdata) {
958    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
959                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
960    
961    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
962                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_focus_out), context);
963    
964    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
965                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 703  void map(appdata_t *appdata) { Line 969  void map(appdata_t *appdata) {
969    
970    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
971    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
972      context->cb_id = gps_register_callback(appdata, gps_callback, context);
973    
974  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
975    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 715  void map(appdata_t *appdata) { Line 982  void map(appdata_t *appdata) {
982    
983    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
984    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
985    
986      /* setup cache state */
987      map_setup(context);
988  }  }
Legend:
Removed from v.133  
changed lines
  Added in v.238