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

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

revision 86 by harbaum, Sun Aug 30 19:05:44 2009 UTC revision 220 by harbaum, Sat Nov 28 14:20:28 2009 UTC
# Line 17  Line 17 
17   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
18   */   */
19    
20    /*
21     * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png  8-15
22     * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23     */
24    
25    /*
26     * TODO:
27     * - make semi-transparent caches selectable
28     */
29    
30  #include "gpxview.h"  #include "gpxview.h"
31  #include "converter.h"  #include "converter.h"
32  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 31  Line 41 
41  #include <X11/Xatom.h>  #include <X11/Xatom.h>
42  #endif  #endif
43    
44  // #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  /* default values */
45  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
46  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
47    
# Line 43  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 64  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 75  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      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
92      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
# Line 103  static int dist2pixel(map_context_t *con Line 115  static int dist2pixel(map_context_t *con
115    
116  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
117    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
118      static gboolean goto_is_enabled = FALSE;
119    
120    /* get reference position ... */    /* get reference position ... */
121    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
122    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
123    
124    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
125    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
126                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
127                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
128        goto_is_enabled = ok;
129      }
130    
131    if(ok) {    if(ok) {
132      float heading = NAN;      float heading = NAN;
# Line 125  static gboolean map_gps_update(gpointer Line 141  static gboolean map_gps_update(gpointer
141          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
142      }      }
143    
144        /* TODO: in order to save energy: only draw if state actually changed */
145    
146      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
147      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
148                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 134  static gboolean map_gps_update(gpointer Line 152  static gboolean map_gps_update(gpointer
152    return TRUE;    return TRUE;
153  }  }
154    
155    static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
156      int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
157    
158      GdkPixbuf *icon = icon_get(type, cache->type);
159      GdkPixbuf *over = NULL;
160    
161      if(cache->mine)                   over = icon_get(type, 14);
162      else if(cache->found)             over = icon_get(type, 12);
163      else if(cache->notes) {
164        if(cache->notes->found)         over = icon_get(type, 12);
165        else if(cache->notes->override) over = icon_get(type, 11);
166        else                            over = icon_get(type, 13);
167      }
168    
169      pos_t *pos = &cache->pos;
170      /* check if there's also an overwritten coordinate */
171      if(cache->notes && cache->notes->override)
172        pos = &cache->notes->pos;
173    
174      if(!isnan(pos->lat) && !isnan(pos->lon)) {
175        osm_gps_map_add_image(OSM_GPS_MAP(map),
176                              pos->lat, pos->lon, icon);
177        if(over)
178          osm_gps_map_add_image(OSM_GPS_MAP(map),
179                                pos->lat, pos->lon, over);
180      }
181    }
182    
183    static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
184      /* only draw wpts that don't equal the main point */
185      if(pos_differ(&cache->pos, &wpt->pos)) {
186        if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
187          GdkPixbuf *icon =
188            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
189                     wpt->sym:WPT_SYM_REFPOINT);
190    
191          osm_gps_map_add_image(OSM_GPS_MAP(map),
192                                wpt->pos.lat, wpt->pos.lon, icon);
193        }
194      }
195    }
196    
197    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
198                             GtkWidget *map, gpx_t *gpx,
199                             cache_t *nav, gboolean semi) {
200      if(!gpx->notes_loaded) {
201        notes_load_all(appdata, gpx);
202        gpx->notes_loaded = TRUE;
203      }
204    
205      cache_t *cache = gpx->cache;
206      while(cache) {
207        /* search if we have that cache already in our list/displayed */
208        int i=0;
209        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
210          i++;
211    
212        if(!caches[i].id) {
213          /* if nav is given draw all other caches semitransparent. */
214          /* if nav is not given do what semi sais */
215          map_draw_cache(map, cache, nav?(cache != nav):semi);
216          caches[i].id = cache->id;
217    
218          /* also draw waypoints of nav cache */
219          if(nav && cache == nav) {
220            wpt_t *wpt = cache->wpt;
221            while(wpt) {
222              map_draw_wpt(map, cache, wpt);
223              wpt = wpt->next;
224            }
225          }
226        }
227    
228        cache = cache->next;
229      }
230    }
231    
232    /* draw geocaches and set window title */
233    static void map_setup(map_context_t *context) {
234      char *name = NULL;
235    
236      int cache_num = gpx_total_caches_global(context->appdata->gpx);
237    
238      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
239        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
240        //     cache_num, context->cache_list_len);
241        g_free(context->caches_displayed);
242        context->caches_displayed = NULL;
243        context->cache_list_len = 0;
244      }
245    
246      /* allocate buffer */
247      if(cache_num && !context->caches_displayed) {
248        context->cache_list_len = cache_num;
249        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
250        printf("allocated space to handle %d map icons\n", cache_num);
251      }
252    
253      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
254        if(context->state != MAP_ALL) {
255          printf("map_setup(ALL)\n");
256    
257          /* clear any pending balloon */
258          context->balloon = NULL;
259          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
260    
261    #ifdef OSD_NAV
262          /* no navigation in this mode */
263          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
264    #endif
265    
266          /* clear all existing cache images */
267          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
268          memset(context->caches_displayed, 0,
269                 (cache_num+1) * sizeof(cache_display_t));
270    
271          /* draw all geocaches and none is semi-transparent */
272          gpx_t *gpx = context->appdata->gpx;
273          while(gpx) {
274            map_draw_gpx(context->appdata, context->caches_displayed,
275                         context->widget, gpx, NULL, FALSE);
276            gpx = gpx->next;
277          }
278    
279          {
280            int i=0;
281            while(context->caches_displayed[i].id) i++;
282            printf("number of caches actually displayed: %d\n", i);
283          }
284    
285          name = g_strdup(_("all"));
286          context->state = MAP_ALL;
287        }
288      } else if(!context->appdata->cur_cache) {
289        if(context->state != MAP_GPX) {
290          printf("map_setup(GPX)\n");
291    
292          /* clear any pending balloon */
293          context->balloon = NULL;
294          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
295    
296    #ifdef OSD_NAV
297          /* no navigation in this mode */
298          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
299    #endif
300    
301          /* clear all existing cache images */
302          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
303          memset(context->caches_displayed, 0,
304                 (cache_num+1) * sizeof(cache_display_t));
305    
306          /* draw all geocaches and all other gpx files are semi-transparent */
307          map_draw_gpx(context->appdata, context->caches_displayed,
308                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
309    
310          gpx_t *gpx = context->appdata->gpx;
311          while(gpx) {
312            if(gpx != context->appdata->cur_gpx)
313              map_draw_gpx(context->appdata, context->caches_displayed,
314                           context->widget, gpx, NULL, TRUE);
315    
316            gpx = gpx->next;
317          }
318    
319          name = g_strdup(context->appdata->cur_gpx->name);
320          context->state = MAP_GPX;
321        }
322      } else {
323        cache_t *cache = context->appdata->cur_cache;
324    
325        printf("map_setup(CACHE)\n");
326    
327        /* clear any pending balloon */
328        context->balloon = NULL;
329        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
330    
331        /* clear all existing ccahe images */
332        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
333        memset(context->caches_displayed, 0,
334               (cache_num+1) * sizeof(cache_display_t));
335    
336        /* draw all geocaches and all but selected one are semi-transparent */
337        gpx_t *gpx = context->appdata->gpx;
338        while(gpx) {
339          map_draw_gpx(context->appdata, context->caches_displayed,
340                       context->widget, gpx, cache, FALSE);
341          gpx = gpx->next;
342        }
343    
344        name = g_strdup(cache->name);
345        context->state = MAP_CACHE;
346    
347        /* navigation in this mode! */
348        pos_t cpos = gpx_cache_pos(cache);
349    
350    #ifdef OSD_NAV
351        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
352                                  context->appdata->imperial,
353                                  cpos.lat, cpos.lon, cache->name);
354    #else
355    #warning OSD_NAV not defined!
356    #endif
357      }
358    
359      /* also mark geomath position */
360    
361      /* remove all existing appearances of this icon first */
362      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
363                               icon_get(ICON_MISC, 6));
364    
365      if(!isnan(context->appdata->geomath.lat) &&
366         !isnan(context->appdata->geomath.lon))  {
367    
368        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
369                              context->appdata->geomath.lat,
370                              context->appdata->geomath.lon,
371                              icon_get(ICON_MISC, 6));
372      }
373    
374      if(name) {
375        char *title = g_strdup_printf(_("Map - %s"), name);
376        g_free(name);
377    
378        gtk_window_set_title(GTK_WINDOW(context->window), title);
379    
380        g_free(title);
381      } else
382        printf("map_setup(keep)\n");
383    }
384    
385  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
386                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
387                                   map_context_t *context) {                                   map_context_t *context) {
388    
389    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
390      /* on diablo. We just ignore this! */
391    
392      printf("on_map_configure %d %d\n",
393             widget->allocation.width,
394             widget->allocation.height);
395    
396      if(!context->map_complete &&
397         (widget->allocation.width > 100) &&
398         (widget->allocation.height > 100)) {
399    
400        /* setup cache state */
401        map_setup(context);
402    
403      /* set default values if they are invalid */      /* set default values if they are invalid */
404      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 148  static gboolean on_map_configure(GtkWidg Line 408  static gboolean on_map_configure(GtkWidg
408    
409        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
410        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
411            printf("use refpos\n");
412    
413          /* use gps position if present */          /* use gps position if present */
414          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
415          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
416        } else {        } else {
417            printf("use zero pos\n");
418    
419          /* use world map otherwise */          /* use world map otherwise */
420          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
421          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 160  static gboolean on_map_configure(GtkWidg Line 424  static gboolean on_map_configure(GtkWidg
424      }      }
425    
426      /* jump to initial position */      /* jump to initial position */
427        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
428               context->appdata->map.pos.lat,
429               context->appdata->map.pos.lon,
430               context->appdata->map.zoom);
431    
432      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
433                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
434                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 170  static gboolean on_map_configure(GtkWidg Line 439  static gboolean on_map_configure(GtkWidg
439    return FALSE;    return FALSE;
440  }  }
441    
 static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  
   while(cache) {  
     GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   
     osm_gps_map_add_image(OSM_GPS_MAP(map),  
                           cache->pos.lat, cache->pos.lon, icon);  
   
     cache = cache->next;  
   }  
 }  
   
442  static void  static void
443  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
444                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
445    
446    while(cache) {    while(cache) {
447        pos_t cpos = gpx_cache_pos(cache);
448    
449      float dist =      float dist =
450        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
451        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
452    
453      if(!(dist > *distance)) {      if(!(dist > *distance)) {
454        *result = cache;        *result = cache;
# Line 202  static cache_t *map_closest(map_context_ Line 463  static cache_t *map_closest(map_context_
463    cache_t *result = NULL;    cache_t *result = NULL;
464    float distance = NAN;    float distance = NAN;
465    
466  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
467      /* search all geocaches */      /* search all geocaches */
468      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
469      while(gpx) {      while(gpx) {
470        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
471        gpx = gpx->next;        gpx = gpx->next;
472      }      }
473  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
474      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
475                            pos, &result, &distance);                            pos, &result, &distance);
476    }    } else
477  #endif      result = context->appdata->cur_gpx->cache;
478    
479    return result;    return result;
480  }  }
# Line 234  pos_t coord2pos(coord_t coo) { Line 492  pos_t coord2pos(coord_t coo) {
492  static gboolean  static gboolean
493  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
494                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
495    
496    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
497    
498    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
499    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)
500      return FALSE;      return FALSE;
501    
502    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
# Line 251  on_map_button_press_event(GtkWidget *wid Line 510  on_map_button_press_event(GtkWidget *wid
510    
511    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
512    if(nearest) {    if(nearest) {
513      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
514      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
515        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
516        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
517        context->press_on = nearest;        context->press_on = nearest;
518    }    }
519    
# Line 270  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 531  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
531                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
532    
533    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
534      g_assert(image_surface);
535    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
536    
537    // Draw the image on the new Context    // Draw the image on the new Context
# Line 283  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 545  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
545  }  }
546    
547  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
548  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
549    #else
550    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
551    #endif
552    
553    #ifndef BIG_BALLOONS
554    #define FONT_SIZE 14.0
555  #else  #else
556  #define LINE_SKIP  12  #define FONT_SIZE 22.0
557  #endif  #endif
558    #define LINE_SKIP  (FONT_SIZE/4)
559    
560    
561  static void  static void
562  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
563    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
564    
565  #if 0    map_context_t *context = (map_context_t*)data;
566    /* draw pink background to check clipping */    cache_t *cache = context->balloon;
   cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);  
   cairo_set_source_rgba (cr, 1, 0, 0, 0.3);  
   cairo_fill_preserve (cr);  
   cairo_set_line_width (cr, 0);  
   cairo_stroke (cr);  
 #endif  
   
   /* leave a little border top and left */  
   gint x = rect->x, y = rect->y;  
   
   /* draw the cache type icon ... */  
   GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   cairo_draw_pixbuf(cr, icon, x, y);  
567    
568    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
569    cairo_text_extents_t extents;      printf("draw\n");
570    
571    if(cache->id) {  #if 0
572      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
573                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
574                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
575                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
576        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
577        cairo_fill_preserve (event->data.draw.cr);
578        cairo_set_line_width (event->data.draw.cr, 0);
579        cairo_stroke (event->data.draw.cr);
580    #endif
581    
582        /* leave a little border top and left */
583        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
584    
585        /* draw the cache type icon ... */
586        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
587        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
588    
589        if(cache->notes && cache->notes->override) {
590          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
591          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
592        }
593    
594        /* ... and right of it the waypoint id */
595        cairo_text_extents_t extents;
596    
597        if(cache->id) {
598          cairo_select_font_face (event->data.draw.cr, "Sans",
599                                  CAIRO_FONT_SLANT_NORMAL,
600                                  CAIRO_FONT_WEIGHT_BOLD);
601    
602  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
603      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
604  #else  #else
605      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
606  #endif  #endif
607    
608          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
609    
610          /* display id right of icon vertically centered */
611          x += gdk_pixbuf_get_width(icon) + 5;
612          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
613          cairo_move_to (event->data.draw.cr, x, y);
614          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
615          cairo_show_text (event->data.draw.cr, cache->id);
616          cairo_stroke (event->data.draw.cr);
617    
618          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
619        } else
620          y += gdk_pixbuf_get_height(icon);
621    
622        /* return to the left border and below icon/text */
623        x = event->data.draw.rect->x;
624    
625        /* everything from here uses the same font */
626        cairo_select_font_face (event->data.draw.cr, "Sans",
627                                CAIRO_FONT_SLANT_NORMAL,
628                                CAIRO_FONT_WEIGHT_NORMAL);
629    
630      cairo_text_extents (cr, cache->id, &extents);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
631    
632        if(cache->name) {
633          /* draw cache name */
634          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
635          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
636          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
637          cairo_show_text (event->data.draw.cr, cache->name);
638          cairo_stroke (event->data.draw.cr);
639    
640          /* return to the left border and below text */
641          y += LINE_SKIP + FONT_SIZE;
642          x = event->data.draw.rect->x;
643        }
644    
645        if(cache->terrain) {
646          int text_y = 0, icon_y = 0;
647    
648      /* display id right of icon vertically centered */        /* draw cache rating */
649      x += gdk_pixbuf_get_width(icon) + 5;        const char *terrain = "Terrain:";
650      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
651      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);  
652    
653      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
654    } else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
655      y += gdk_pixbuf_get_height(icon);        else
656            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
657    
658    /* return to the left border and below icon/text */        /* draw "Terrain:" string */
659    x = rect->x;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
660          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
661          cairo_show_text (event->data.draw.cr, _(terrain));
662          cairo_stroke (event->data.draw.cr);
663          x += extents.width + 2;
664    
665          /* draw terrain stars */
666          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
667    
668          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
669        }
670    
671        if(cache->difficulty) {
672          int text_y = 0, icon_y = 0;
673    
674    /* everything from here uses the same font */        const char *difficulty = "Difficulty:";
675    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
676                            CAIRO_FONT_WEIGHT_NORMAL);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
677  #ifndef BIG_BALLOONS  
678    cairo_set_font_size (cr, 14.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
679  #else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
680    cairo_set_font_size (cr, 22.0);        else
681  #endif          icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
682    
683    if(cache->name) {        /* draw "Difficulty:" string */
684      /* draw cache name */        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
685      cairo_text_extents (cr, cache->name, &extents);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
686      y += extents.height;        cairo_show_text (event->data.draw.cr, _(difficulty));
687      cairo_move_to (cr, x, y);        cairo_stroke (event->data.draw.cr);
688      cairo_set_source_rgba (cr, 0, 0, 0, 1);        x += extents.width + 2;
689      cairo_show_text (cr, cache->name);  
690      cairo_stroke (cr);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
691        }
692      /* return to the left border and below text */  
693      y += LINE_SKIP;      /* draw container info */
694      x = rect->x;      /* TODO ... */
695    }  
696    
697    if(cache->terrain) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
698      /* draw cache rating */      printf("click %s event at %d %d\n",
699      const char *terrain = "Terrain:";             event->data.click.down?"down":"up",
700      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));             event->data.click.x, event->data.click.y);
701      cairo_text_extents (cr, _(terrain), &extents);  
702      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;      /* make the main screen jump to that cache */
703        if(!event->data.click.down) {
704      /* draw "Terrain:" string */        if(context->appdata->cur_cache) {
705      cairo_move_to (cr, x, y);          printf("ERROR: no current cache should be visible!\n");
706      cairo_set_source_rgba (cr, 0, 0, 0, 1);        } else {
707      cairo_show_text (cr, _(terrain));          gpx_t *is_in = NULL;
708      cairo_stroke (cr);  
709      x += extents.width + 2;          if(!context->appdata->cur_gpx) {
710              printf("click while in \"all\" view\n");
711      /* draw terrain stars */  
712      cairo_draw_pixbuf(cr, icon, x, y -            /* we first need to figure out which gpx file this cache */
713                        (gdk_pixbuf_get_height(icon) + extents.height)/2);            /* is in so we can open it first */
714              gpx_t *gpx = context->appdata->gpx;
715      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;            while(gpx && !is_in) {
716      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;              cache_t *cur = gpx->cache;
717    }              while(cur && !is_in) {
718                  if(cur == cache)
719    if(cache->difficulty) {                  is_in = gpx;
720      const char *difficulty = "Difficulty:";                cur = cur->next;
721      cairo_text_extents (cr, _(difficulty), &extents);              }
722      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;              gpx = gpx->next;
723              }
724      /* draw "Difficulty:" string */  
725      cairo_move_to (cr, x, y);            if(is_in)
726      cairo_set_source_rgba (cr, 0, 0, 0, 1);              gpxlist_goto_cachelist(context->appdata, is_in);
727      cairo_show_text (cr, _(difficulty));  
728      cairo_stroke (cr);          } else
729      x += extents.width + 2;            /* the simple case: there already is an open gpx file and */
730              /* we just jump into the "cache" view */
731      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));            is_in = context->appdata->cur_gpx;
732      cairo_draw_pixbuf(cr, icon, x, y -  
733                        (gdk_pixbuf_get_height(icon) + extents.height)/2);          if(is_in) {
734              printf("selecting %s in %s\n",
735                     cache->id,
736                     context->appdata->cur_gpx->name);
737    
738              cachelist_goto_cache(context->appdata, cache);
739    
740              /* give focus to main screen (important for maemo) */
741              printf("raising main window\n");
742              gtk_window_present(GTK_WINDOW(context->appdata->window));
743            }
744          }
745        }
746      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
747        printf("removed\n");
748        context->balloon = NULL;
749    }    }
750  }  }
751    
# Line 407  on_map_button_release_event(GtkWidget *w Line 754  on_map_button_release_event(GtkWidget *w
754                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
755    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
756    
757      /* in "MAP_CACHE" state only one cache is visible */
758      /* and the map is in navigation mode. the balloon is */
759      /* pretty useless there */
760    if(context->press_on) {    if(context->press_on) {
761    
762      coord_t coo;      coord_t coo;
763      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
764    
# Line 416  on_map_button_release_event(GtkWidget *w Line 767  on_map_button_release_event(GtkWidget *w
767    
768      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
769      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
770        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
771        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
772          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
773          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
774    
775          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
776                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
777                                         balloon_cb, context);
778        }        }
779      }      }
780      context->press_on = NULL;      context->press_on = NULL;
# Line 438  on_map_button_release_event(GtkWidget *w Line 792  on_map_button_release_event(GtkWidget *w
792  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
793    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
794    
   printf("destroy map window\n");  
   
795    /* save map parameters */    /* save map parameters */
796    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
797    gint zoom;    gint zoom;
# Line 451  static void on_window_destroy(GtkWidget Line 803  static void on_window_destroy(GtkWidget
803    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
804    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
805    
806      gint source;
807      g_object_get(map, "map-source", &source, NULL);
808      context->appdata->map.source = source;
809    
810  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
811    /* restore cur_view */    /* restore cur_view */
812    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
813  #endif  #endif
814    
815    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
816      gps_unregister_callback(appdata, context->cb_id);
817    
818      if(context->caches_displayed) {
819        g_free(context->caches_displayed);
820        context->caches_displayed = NULL;
821      }
822    
823    g_free(context);    g_free(context);
824    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 481  on_window_realize(GtkWidget *widget, gpo Line 843  on_window_realize(GtkWidget *widget, gpo
843  }  }
844  #endif  #endif
845    
846    /* on maemo a window is either on top or completely invisible. this */
847    /* means that we only need to update the map window if its raised.  */
848    /* on ordinary desktops this is different and we always update */
849    
850    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
851                             gpointer data) {
852      map_context_t *context = (map_context_t*)data;
853    
854      printf("map got focus\n");
855    
856    #ifdef USE_MAEMO
857      /* re-enable refresh of map */
858      if(!context->handler_id)
859        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
860    #endif
861    
862      map_setup(context);
863      return FALSE;
864    }
865    
866    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
867                             gpointer data) {
868      map_context_t *context = (map_context_t*)data;
869    
870      printf("map lost focus\n");
871    
872      /* save new map position */
873      gfloat lat, lon;
874      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
875    
876      context->appdata->map.pos.lat = lat;
877      context->appdata->map.pos.lon = lon;
878    
879    #ifdef USE_MAEMO
880      gtk_timeout_remove(context->handler_id);
881      context->handler_id = 0;
882    #endif
883    
884      return FALSE;
885    }
886    
887    void map_update(appdata_t *appdata) {
888      printf("map_update\n");
889    #ifndef USE_MAEMO
890      if(appdata->map.context)
891        map_setup(appdata->map.context);
892    #endif
893    }
894    
895    /* callback called by the gps layer whenever gps state changes */
896    static void
897    gps_callback(struct gps_state *state, gpointer data) {
898      printf("map: gps callback\n");
899    }
900    
901  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
902    map_context_t *context = NULL;    map_context_t *context = NULL;
903    
904    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
905    if(appdata->map.context) {    if(appdata->map.context) {
906        printf("using existing map!\n");
907      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
908        map_setup(appdata->map.context);
909      return;      return;
910    }    }
911    
912    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
913    context->appdata = appdata;    context->appdata = appdata;
914    context->map_complete = FALSE;    context->map_complete = FALSE;
915      context->state = MAP_NONE;
916    
917    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
918    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
# Line 520  void map(appdata_t *appdata) { Line 940  void map(appdata_t *appdata) {
940    
941    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
942    
943      gint source = context->appdata->map.source;
944      if(!source) source = MAP_SOURCE;
945    
946    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
947                   "map-source",               MAP_SOURCE,                   "map-source",               source,
948                   "tile-cache",               path,                   "tile-cache",               path,
949                   "auto-center",              FALSE,                   "auto-center",              FALSE,
950                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 532  void map(appdata_t *appdata) { Line 955  void map(appdata_t *appdata) {
955    g_free(path);    g_free(path);
956    
957    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
   
   char *name = NULL;  
 #ifdef USE_MAEMO  
   if(!appdata->cur_gpx) {  
 #endif  
     /* draw all geocaches */  
     gpx_t *gpx = appdata->gpx;  
     while(gpx) {  
       map_draw_cachelist(context->widget, gpx->cache);  
       gpx = gpx->next;  
     }  
     name = g_strdup(_("all geocaches"));  
 #ifdef USE_MAEMO  
   } else {  
     map_draw_cachelist(context->widget, appdata->cur_gpx->cache);  
     name = g_strdup(appdata->cur_gpx->name);  
   }  
 #endif  
   
   char *title = g_strdup_printf(_("Map - %s"), name);  
   g_free(name);  
958    
959  #ifdef USE_MAEMO  #ifdef USE_MAEMO
960  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
961    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
962    /* try to enable the zoom buttons. don't do this on x86 as it breaks */    /* the user can e.g. still navigate the main menu */
963    /* at runtime with cygwin x */    context->window = hildon_window_new();
964  #ifndef __i386__  
965    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
966    g_signal_connect(G_OBJECT(context->window), "realize",    g_signal_connect(G_OBJECT(context->window), "realize",
967                     G_CALLBACK(on_window_realize), NULL);                     G_CALLBACK(on_window_realize), NULL);
968  #endif // MAEMO_VERSION  #endif // MAEMO_VERSION
969  #else  #else
   context->window = hildon_window_new();  
 #endif  
 #else  
970    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
971  #endif  #endif
972    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
973  #ifndef USE_MAEMO  #ifndef USE_MAEMO
974    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
975  #endif  #endif
976    
977    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
978                       G_CALLBACK(on_focus_in), context);
979    
980      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
981                       G_CALLBACK(on_focus_out), context);
982    
983    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
984                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 589  void map(appdata_t *appdata) { Line 991  void map(appdata_t *appdata) {
991    
992    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
993    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
994      context->cb_id = gps_register_callback(appdata, gps_callback, context);
995    
996  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
997    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.86  
changed lines
  Added in v.220