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

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

revision 84 by harbaum, Fri Aug 28 07:52:01 2009 UTC revision 151 by harbaum, Fri Oct 30 20:09:13 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     * - draw caches only once
28     * - prefer duplicates from selected files
29     * - make semi-transparent caches selectable
30     */
31    
32  #include "gpxview.h"  #include "gpxview.h"
33  #include "converter.h"  #include "converter.h"
34  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 31  Line 43 
43  #include <X11/Xatom.h>  #include <X11/Xatom.h>
44  #endif  #endif
45    
46  // #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  /* default values */
47  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
48  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
49    
# Line 75  static const char *get_proxy_uri(appdata Line 87  static const char *get_proxy_uri(appdata
87    
88  static void  static void
89  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
90    
91    if(but == OSD_GPS) {    if(but == OSD_GPS) {
92      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
93      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
# Line 103  static int dist2pixel(map_context_t *con Line 116  static int dist2pixel(map_context_t *con
116    
117  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
118    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
119      static gboolean goto_is_enabled = FALSE;
120    
121    /* get reference position ... */    /* get reference position ... */
122    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
123    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
124    
125    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
126    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
127                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
128                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
129        goto_is_enabled = ok;
130      }
131    
132    if(ok) {    if(ok) {
133      float heading = NAN;      float heading = NAN;
# Line 125  static gboolean map_gps_update(gpointer Line 142  static gboolean map_gps_update(gpointer
142          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
143      }      }
144    
145        /* TODO: in order to save energy: only draw if state actually changed */
146    
147      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
148      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
149                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 134  static gboolean map_gps_update(gpointer Line 153  static gboolean map_gps_update(gpointer
153    return TRUE;    return TRUE;
154  }  }
155    
156  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
157                                   GdkEventConfigure *event,    GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE,
158                                   map_context_t *context) {                               cache->type);
159    
160      /* check if there's also an overwritten coordinate */
161      if(cache->notes && cache->notes->override) {
162        GdkPixbuf *over = icon_get(ICON_MISC, 1);
163    
164        osm_gps_map_add_image(OSM_GPS_MAP(map),
165              cache->notes->pos.lat, cache->notes->pos.lon, icon);
166    
167        osm_gps_map_add_image(OSM_GPS_MAP(map),
168              cache->notes->pos.lat, cache->notes->pos.lon, over);
169      } else {
170        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
171          osm_gps_map_add_image(OSM_GPS_MAP(map),
172                                cache->pos.lat, cache->pos.lon, icon);
173      }
174    }
175    
176    static void map_draw_gpx(appdata_t *appdata,
177                             GtkWidget *map, gpx_t *gpx,
178                             cache_t *nav, gboolean semi) {
179      if(!gpx->notes_loaded) {
180        notes_load_all(appdata, gpx);
181        gpx->notes_loaded = TRUE;
182      }
183    
184      cache_t *cache = gpx->cache;
185      while(cache) {
186        /* if nav is given draw all other caches semitransparent. */
187        /* if nav is not given do what semi sais */
188        map_draw_cache(map, cache, nav?(cache != nav):semi);
189        cache = cache->next;
190      }
191    }
192    
193    /* draw geocaches and set window title */
194    static void map_setup(map_context_t *context) {
195      char *name = NULL;
196    
197      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
198        if(context->state != MAP_ALL) {
199          printf("map_setup(ALL)\n");
200    
201    #ifdef OSD_NAV
202          /* no navigation in this mode */
203          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
204    #endif
205    
206          /* clear all existing cache images */
207          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
208    
209          /* draw all geocaches and none is semi-transparent */
210          gpx_t *gpx = context->appdata->gpx;
211          while(gpx) {
212            map_draw_gpx(context->appdata, context->widget, gpx, NULL, FALSE);
213            gpx = gpx->next;
214          }
215          name = g_strdup(_("all"));
216          context->state = MAP_ALL;
217        }
218      } else if(!context->appdata->cur_cache) {
219        if(context->state != MAP_GPX) {
220          printf("map_setup(GPX)\n");
221    
222    #ifdef OSD_NAV
223          /* no navigation in this mode */
224          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
225    #endif
226    
227          /* clear all existing ccahe images */
228          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
229    
230          /* draw all geocaches and all other gpx files are semi-transparent */
231          gpx_t *gpx = context->appdata->gpx;
232          while(gpx) {
233            map_draw_gpx(context->appdata, context->widget, gpx, NULL,
234                         gpx != context->appdata->cur_gpx);
235            gpx = gpx->next;
236          }
237    
238    /* set default values if they are invalid */        name = g_strdup(context->appdata->cur_gpx->name);
239    if(!context->appdata->map.zoom ||        context->state = MAP_GPX;
240       isnan(context->appdata->map.pos.lat) ||      }
241       isnan(context->appdata->map.pos.lon)) {    } else {
242      printf("no valid map position found\n");      cache_t *cache = context->appdata->cur_cache;
243    
244      pos_t *refpos = get_pos(context->appdata);      printf("map_setp(CACHE)\n");
245      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
246        /* use gps position if present */      /* no balloons in this mode */
247        context->appdata->map.pos = *refpos;      context->balloon = NULL;
248        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
249      } else {  
250        /* use world map otherwise */      /* clear all existing ccahe images */
251        context->appdata->map.pos.lat = 0.0;      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
252        context->appdata->map.pos.lon = 0.0;  
253        context->appdata->map.zoom = 1;      /* draw all geocaches and all but selected one are semi-transparent */
254        gpx_t *gpx = context->appdata->gpx;
255        while(gpx) {
256          map_draw_gpx(context->appdata, context->widget, gpx, cache, FALSE);
257          gpx = gpx->next;
258      }      }
259    
260        name = g_strdup(cache->name);
261        context->state = MAP_CACHE;
262    
263        /* navigation in this mode! */
264        pos_t cpos = gpx_cache_pos(cache);
265    
266    #ifdef OSD_NAV
267        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
268                                  context->appdata->imperial,
269                                  cpos.lat, cpos.lon, cache->name);
270    #else
271    #warning OSD_NAV not defined!
272    #endif
273    }    }
274    
275    /* jump to initial position */    if(name) {
276    osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      char *title = g_strdup_printf(_("Map - %s"), name);
277                              context->appdata->map.pos.lat,      g_free(name);
                             context->appdata->map.pos.lon,  
                             context->appdata->map.zoom);  
278    
279    return FALSE;      gtk_window_set_title(GTK_WINDOW(context->window), title);
280    
281        g_free(title);
282      } else
283        printf("map_setup(keep)\n");
284  }  }
285    
286  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  static gboolean on_map_configure(GtkWidget *widget,
287    while(cache) {                                   GdkEventConfigure *event,
288      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);                                   map_context_t *context) {
   
     osm_gps_map_add_image(OSM_GPS_MAP(map),  
                           cache->pos.lat, cache->pos.lon, icon);  
289    
290      cache = cache->next;    /* for some reason there's a configure event with 1/1 */
291      /* on diablo. We just ignore this! */
292    
293      printf("on_map_configure %d %d\n",
294             widget->allocation.width,
295             widget->allocation.height);
296    
297      if(!context->map_complete &&
298         (widget->allocation.width > 100) &&
299         (widget->allocation.height > 100)) {
300    
301        /* setup cache state */
302        map_setup(context);
303    
304        /* set default values if they are invalid */
305        if(!context->appdata->map.zoom ||
306           isnan(context->appdata->map.pos.lat) ||
307           isnan(context->appdata->map.pos.lon)) {
308          printf("no valid map position found\n");
309    
310          pos_t *refpos = get_pos(context->appdata);
311          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
312            printf("use refpos\n");
313    
314            /* use gps position if present */
315            context->appdata->map.pos = *refpos;
316            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
317          } else {
318            printf("use zero pos\n");
319    
320            /* use world map otherwise */
321            context->appdata->map.pos.lat = 0.0;
322            context->appdata->map.pos.lon = 0.0;
323            context->appdata->map.zoom = 1;
324          }
325        }
326    
327        /* jump to initial position */
328        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
329               context->appdata->map.pos.lat,
330               context->appdata->map.pos.lon,
331               context->appdata->map.zoom);
332    
333        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
334                                  context->appdata->map.pos.lat,
335                                  context->appdata->map.pos.lon,
336                                  context->appdata->map.zoom);
337        context->map_complete = TRUE;
338    }    }
339    
340      return FALSE;
341  }  }
342    
343  static void  static void
344  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
345                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
346    
347    while(cache) {    while(cache) {
348        pos_t cpos = gpx_cache_pos(cache);
349    
350      float dist =      float dist =
351        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
352        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
353    
354      if(!(dist > *distance)) {      if(!(dist > *distance)) {
355        *result = cache;        *result = cache;
# Line 198  static cache_t *map_closest(map_context_ Line 364  static cache_t *map_closest(map_context_
364    cache_t *result = NULL;    cache_t *result = NULL;
365    float distance = NAN;    float distance = NAN;
366    
367  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
368      /* search all geocaches */      /* search all geocaches */
369      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
370      while(gpx) {      while(gpx) {
371        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
372        gpx = gpx->next;        gpx = gpx->next;
373      }      }
374  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
375      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
376                            pos, &result, &distance);                            pos, &result, &distance);
377    }    } else
378  #endif      result = context->appdata->cur_gpx->cache;
379    
380    return result;    return result;
381  }  }
# Line 230  pos_t coord2pos(coord_t coo) { Line 393  pos_t coord2pos(coord_t coo) {
393  static gboolean  static gboolean
394  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
395                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
396    
397    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
398    
399      /* check if we actually clicked parts of the OSD */
400      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
401        return FALSE;
402    
403    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
404    if(context->press_on != NULL) {    if(context->press_on != NULL) {
405      printf("PRESS: already\n");      printf("PRESS: already\n");
406      return TRUE;      return FALSE;
407    }    }
408    
409    pos_t pos =    pos_t pos =
# Line 243  on_map_button_press_event(GtkWidget *wid Line 411  on_map_button_press_event(GtkWidget *wid
411    
412    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
413    if(nearest) {    if(nearest) {
414      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
415      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
416        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
417        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
418        context->press_on = nearest;        context->press_on = nearest;
419    }    }
420    
# Line 281  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 451  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
451  #endif  #endif
452    
453  static void  static void
454  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
455    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
456    
457      map_context_t *context = (map_context_t*)data;
458      cache_t *cache = context->balloon;
459    
460      if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
461        printf("draw\n");
462    
463  #if 0  #if 0
464    /* draw pink background to check clipping */      /* draw pink background to check clipping */
465    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);      cairo_rectangle (event->data.draw.cr,
466    cairo_set_source_rgba (cr, 1, 0, 0, 0.3);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
467    cairo_fill_preserve (cr);                       event->data.draw.rect->w+40, event->data.draw.rect->h+40);
468    cairo_set_line_width (cr, 0);      cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
469    cairo_stroke (cr);      cairo_fill_preserve (event->data.draw.cr);
470  #endif      cairo_set_line_width (event->data.draw.cr, 0);
471        cairo_stroke (event->data.draw.cr);
472    /* leave a little border top and left */  #endif
473    gint x = rect->x, y = rect->y;  
474        /* leave a little border top and left */
475    /* draw the cache type icon ... */      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
476    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
477    cairo_draw_pixbuf(cr, icon, x, y);      /* draw the cache type icon ... */
478        GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
479    /* ... and right of it the waypoint id */      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
480    cairo_text_extents_t extents;  
481        if(cache->notes && cache->notes->override) {
482    if(cache->id) {        GdkPixbuf *over = icon_get(ICON_MISC, 1);
483      cairo_select_font_face (cr, "Sans",        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
484                              CAIRO_FONT_SLANT_NORMAL,      }
485                              CAIRO_FONT_WEIGHT_BOLD);  
486        /* ... and right of it the waypoint id */
487        cairo_text_extents_t extents;
488    
489        if(cache->id) {
490          cairo_select_font_face (event->data.draw.cr, "Sans",
491                                  CAIRO_FONT_SLANT_NORMAL,
492                                  CAIRO_FONT_WEIGHT_BOLD);
493    
494  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
495      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
496  #else  #else
497      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
498  #endif  #endif
499    
500      cairo_text_extents (cr, cache->id, &extents);        cairo_text_extents (event->data.draw.cr, cache->id, &extents);
501    
502      /* display id right of icon vertically centered */        /* display id right of icon vertically centered */
503      x += gdk_pixbuf_get_width(icon) + 5;        x += gdk_pixbuf_get_width(icon) + 5;
504      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
505      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
506      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
507      cairo_show_text (cr, cache->id);        cairo_show_text (event->data.draw.cr, cache->id);
508      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
509    
510      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
511    } else      } else
512      y += gdk_pixbuf_get_height(icon);        y += gdk_pixbuf_get_height(icon);
513    
514    /* return to the left border and below icon/text */      /* return to the left border and below icon/text */
515    x = rect->x;      x = event->data.draw.rect->x;
516    
517    /* everything from here uses the same font */      /* everything from here uses the same font */
518    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
519                            CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
520  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
521    cairo_set_font_size (cr, 14.0);      cairo_set_font_size (event->data.draw.cr, 14.0);
522  #else  #else
523    cairo_set_font_size (cr, 22.0);      cairo_set_font_size (event->data.draw.cr, 22.0);
524  #endif  #endif
525    
526    if(cache->name) {      if(cache->name) {
527      /* draw cache name */        /* draw cache name */
528      cairo_text_extents (cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
529      y += extents.height;        y += extents.height;
530      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
531      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
532      cairo_show_text (cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
533      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
534    
535      /* return to the left border and below text */        /* return to the left border and below text */
536      y += LINE_SKIP;        y += LINE_SKIP;
537      x = rect->x;        x = event->data.draw.rect->x;
538    }      }
539    
540    if(cache->terrain) {      if(cache->terrain) {
541      /* draw cache rating */        /* draw cache rating */
542      const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
543      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
544      cairo_text_extents (cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
545      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
546    
547      /* draw "Terrain:" string */        /* draw "Terrain:" string */
548      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
549      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
550      cairo_show_text (cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
551      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
552      x += extents.width + 2;        x += extents.width + 2;
553    
554      /* draw terrain stars */        /* draw terrain stars */
555      cairo_draw_pixbuf(cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
556                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
557    
558      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
559      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
560    }      }
   
   if(cache->difficulty) {  
     const char *difficulty = "Difficulty:";  
     cairo_text_extents (cr, _(difficulty), &extents);  
     y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
   
     /* draw "Difficulty:" string */  
     cairo_move_to (cr, x, y);  
     cairo_set_source_rgba (cr, 0, 0, 0, 1);  
     cairo_show_text (cr, _(difficulty));  
     cairo_stroke (cr);  
     x += extents.width + 2;  
561    
562      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));      if(cache->difficulty) {
563      cairo_draw_pixbuf(cr, icon, x, y -        const char *difficulty = "Difficulty:";
564          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
565          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
566    
567          /* draw "Difficulty:" string */
568          cairo_move_to (event->data.draw.cr, x, y);
569          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
570          cairo_show_text (event->data.draw.cr, _(difficulty));
571          cairo_stroke (event->data.draw.cr);
572          x += extents.width + 2;
573    
574          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
575          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
576                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                        (gdk_pixbuf_get_height(icon) + extents.height)/2);
577        }
578      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
579        printf("click %s event at %d %d\n",
580               event->data.click.down?"down":"up",
581               event->data.click.x, event->data.click.y);
582    
583        /* make the main screen jump to that cache */
584        if(!event->data.click.down) {
585          if(context->appdata->cur_cache) {
586            printf("ERROR: no current cache should be visible!\n");
587          } else {
588            gpx_t *is_in = NULL;
589    
590            if(!context->appdata->cur_gpx) {
591              printf("click while in \"all\" view\n");
592    
593              /* we first need to figure out which gpx file this cache */
594              /* is in so we can open it first */
595              gpx_t *gpx = context->appdata->gpx;
596              while(gpx && !is_in) {
597                cache_t *cur = gpx->cache;
598                while(cur && !is_in) {
599                  if(cur == cache)
600                    is_in = gpx;
601                  cur = cur->next;
602                }
603                gpx = gpx->next;
604              }
605    
606              if(is_in)
607                gpxlist_goto_cachelist(context->appdata, is_in);
608    
609            } else
610              /* the simple case: there already is an open gpx file and */
611              /* we just jump into the "cache" view */
612              is_in = context->appdata->cur_gpx;
613    
614            if(is_in) {
615              printf("selecting %s in %s\n",
616                     cache->id,
617                     context->appdata->cur_gpx->name);
618    
619              cachelist_goto_cache(context->appdata, cache);
620    
621              /* give focus to main screen (important for maemo) */
622              printf("raising main window\n");
623              gtk_window_present(GTK_WINDOW(context->appdata->window));
624            }
625          }
626        }
627      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
628        printf("removed\n");
629        context->balloon = NULL;
630    }    }
631  }  }
632    
# Line 399  on_map_button_release_event(GtkWidget *w Line 635  on_map_button_release_event(GtkWidget *w
635                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
636    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
637    
638    if(context->press_on) {    /* in "MAP_CACHE" state only one cache is visible */
639      /* and the map is in navigation mode. the balloon is */
640      /* pretty useless there */
641      if(context->press_on && (context->state != MAP_CACHE)) {
642    
643      coord_t coo;      coord_t coo;
644      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
645    
# Line 408  on_map_button_release_event(GtkWidget *w Line 648  on_map_button_release_event(GtkWidget *w
648    
649      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
650      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
651        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
652        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
653          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
654          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
655    
656          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
657                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
658                                         balloon_cb, context);
659        }        }
660      }      }
661      context->press_on = NULL;      context->press_on = NULL;
# Line 430  on_map_button_release_event(GtkWidget *w Line 673  on_map_button_release_event(GtkWidget *w
673  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
674    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
675    
   printf("destroy map window\n");  
   
676    /* save map parameters */    /* save map parameters */
677    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
678    gint zoom;    gint zoom;
# Line 443  static void on_window_destroy(GtkWidget Line 684  static void on_window_destroy(GtkWidget
684    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
685    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
686    
687      gint source;
688      g_object_get(map, "map-source", &source, NULL);
689      context->appdata->map.source = source;
690    
691  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
692    /* restore cur_view */    /* restore cur_view */
693    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
694  #endif  #endif
695    
696    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
697      gps_unregister_callback(appdata, context->cb_id);
698    
699    g_free(context);    g_free(context);
700    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 473  on_window_realize(GtkWidget *widget, gpo Line 719  on_window_realize(GtkWidget *widget, gpo
719  }  }
720  #endif  #endif
721    
722    /* on maemo a window is either on top or completely invisible. this */
723    /* means that we only need to update the map window if its raised.  */
724    /* on ordinary desktops this is different and we always update */
725    
726    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
727                             gpointer data) {
728      printf("map got focus\n");
729      map_setup((map_context_t*)data);
730      return FALSE;
731    }
732    
733    void map_update(appdata_t *appdata) {
734      printf("map_update\n");
735    #ifndef USE_MAEMO
736      if(appdata->map.context)
737        map_setup(appdata->map.context);
738    #endif
739    }
740    
741    /* callback called by the gps layer whenever gps state changes */
742    static void
743    gps_callback(struct gps_state *state, gpointer data) {
744      printf("map: gps callback\n");
745    }
746    
747  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
748    map_context_t *context = NULL;    map_context_t *context = NULL;
749    
750    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
751    if(appdata->map.context) {    if(appdata->map.context) {
752        printf("using existing map!\n");
753      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
754        map_setup(appdata->map.context);
755      return;      return;
756    }    }
757    
758    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
759    context->appdata = appdata;    context->appdata = appdata;
760      context->map_complete = FALSE;
761      context->state = MAP_NONE;
762    
763    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
764    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
# Line 511  void map(appdata_t *appdata) { Line 786  void map(appdata_t *appdata) {
786    
787    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
788    
789      gint source = context->appdata->map.source;
790      if(!source) source = MAP_SOURCE;
791    
792    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
793                   "map-source",               MAP_SOURCE,                   "map-source",               source,
794                   "tile-cache",               path,                   "tile-cache",               path,
795                   "auto-center",              FALSE,                   "auto-center",              FALSE,
796                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 523  void map(appdata_t *appdata) { Line 801  void map(appdata_t *appdata) {
801    g_free(path);    g_free(path);
802    
803    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);  
804    
805  #ifdef USE_MAEMO  #ifdef USE_MAEMO
806  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
807    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
808    /* 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 */
809    /* at runtime with cygwin x */    context->window = hildon_window_new();
810  #ifndef __i386__  
811    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
812    g_signal_connect(G_OBJECT(context->window), "realize",    g_signal_connect(G_OBJECT(context->window), "realize",
813                     G_CALLBACK(on_window_realize), NULL);                     G_CALLBACK(on_window_realize), NULL);
814  #endif // MAEMO_VERSION  #endif // MAEMO_VERSION
815  #else  #else
   context->window = hildon_window_new();  
 #endif  
 #else  
816    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
817  #endif  #endif
818    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
819  #ifndef USE_MAEMO  #ifndef USE_MAEMO
820    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
821  #endif  #endif
822    
823    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
824                       G_CALLBACK(on_focus_in), context);
825    
826    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
827                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 580  void map(appdata_t *appdata) { Line 834  void map(appdata_t *appdata) {
834    
835    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
836    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
837      context->cb_id = gps_register_callback(appdata, gps_callback, context);
838    
839  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
840    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.84  
changed lines
  Added in v.151