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

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

revision 73 by harbaum, Sun Aug 23 19:38:15 2009 UTC revision 148 by harbaum, Wed Oct 28 11:57:54 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  #include "gpxview.h"  #include "gpxview.h"
26  #include "converter.h"  #include "converter.h"
27  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 26  Line 31 
31  #include "osm-gps-map-osd-classic.h"  #include "osm-gps-map-osd-classic.h"
32  #endif  #endif
33    
34  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
35    #include <gdk/gdkx.h>
36    #include <X11/Xatom.h>
37    #endif
38    
39    /* default values */
40    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
41  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
42    
43  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 69  static const char *get_proxy_uri(appdata Line 80  static const char *get_proxy_uri(appdata
80    
81  static void  static void
82  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
83    
84    if(but == OSD_GPS) {    if(but == OSD_GPS) {
85      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
86      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
87        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        gint zoom;
88                                  refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
89          if(zoom < 10)
90            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
91                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
92          else
93            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
94                                   refpos->lat, refpos->lon);
95    
96          /* re-enable centering */
97          g_object_set(context->widget, "auto-center", TRUE, NULL);
98      } else {      } else {
99        /* no coordinates given: display the entire world */        /* no coordinates given: display the entire world */
100        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
# Line 88  static int dist2pixel(map_context_t *con Line 109  static int dist2pixel(map_context_t *con
109    
110  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
111    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
112      static gboolean goto_is_enabled = FALSE;
113    
114    /* get reference position ... */    /* get reference position ... */
115    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
116    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
117    
118    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
119    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
120                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
121                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
122        goto_is_enabled = ok;
123      }
124    
125    if(ok) {    if(ok) {
126      float heading = NAN;      float heading = NAN;
# Line 110  static gboolean map_gps_update(gpointer Line 135  static gboolean map_gps_update(gpointer
135          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
136      }      }
137    
138        /* TODO: in order to save energy: only draw if state actually changed */
139    
140      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
141      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
142                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 119  static gboolean map_gps_update(gpointer Line 146  static gboolean map_gps_update(gpointer
146    return TRUE;    return TRUE;
147  }  }
148    
149  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache) {
150                                   GdkEventConfigure *event,    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
                                  map_context_t *context) {  
151    
152    /* set default values if they are invalid */    /* check if there's also an overwritten coordinate */
153    if(!context->appdata->map.zoom ||    if(cache->notes && cache->notes->override) {
154       isnan(context->appdata->map.pos.lat) ||      GdkPixbuf *over = icon_get(ICON_MISC, 1);
      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;  
     }  
   }  
155    
156    /* jump to initial position */      osm_gps_map_add_image(OSM_GPS_MAP(map),
157    osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),            cache->notes->pos.lat, cache->notes->pos.lon, icon);
                             context->appdata->map.pos.lat,  
                             context->appdata->map.pos.lon,  
                             context->appdata->map.zoom);  
158    
159    return FALSE;      osm_gps_map_add_image(OSM_GPS_MAP(map),
160              cache->notes->pos.lat, cache->notes->pos.lon, over);
161      } else {
162        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
163          osm_gps_map_add_image(OSM_GPS_MAP(map),
164                                cache->pos.lat, cache->pos.lon, icon);
165      }
166  }  }
167    
168  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {
169      if(!gpx->notes_loaded) {
170        notes_load_all(appdata, gpx);
171        gpx->notes_loaded = TRUE;
172      }
173    
174      cache_t *cache = gpx->cache;
175    while(cache) {    while(cache) {
176      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      map_draw_cache(map, cache);
177        cache = cache->next;
178      }
179    }
180    
181    /* draw geocaches and set window title */
182    static void map_setup(map_context_t *context) {
183      char *name = NULL;
184    
185      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
186        if(context->state != MAP_ALL) {
187          printf("map_setup(ALL)\n");
188    
189    #ifdef OSD_NAV
190          /* no navigation in this mode */
191          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
192    #endif
193    
194          /* clear all existing ccahe images */
195          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
196    
197          /* draw all geocaches */
198          gpx_t *gpx = context->appdata->gpx;
199          while(gpx) {
200            map_draw_gpx(context->appdata, context->widget, gpx);
201            gpx = gpx->next;
202          }
203          name = g_strdup(_("all"));
204          context->state = MAP_ALL;
205        }
206      } else if(!context->appdata->cur_cache) {
207        if(context->state != MAP_GPX) {
208          printf("map_setup(GPX)\n");
209    
210    #ifdef OSD_NAV
211          /* no navigation in this mode */
212          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
213    #endif
214    
215          /* clear all existing ccahe images */
216          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
217    
218          map_draw_gpx(context->appdata, context->widget,
219                       context->appdata->cur_gpx);
220          name = g_strdup(context->appdata->cur_gpx->name);
221          context->state = MAP_GPX;
222        }
223      } else {
224        cache_t *cache = context->appdata->cur_cache;
225    
226      osm_gps_map_add_image(OSM_GPS_MAP(map),      printf("map_setp(CACHE)\n");
227                            cache->pos.lat, cache->pos.lon, icon);  
228        /* no balloons in this mode */
229        context->balloon = NULL;
230        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
231    
232        /* clear all existing ccahe images */
233        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
234    
235        map_draw_cache(context->widget, cache);
236        name = g_strdup(cache->name);
237        context->state = MAP_CACHE;
238    
239        /* navigation in this mode! */
240        pos_t cpos = gpx_cache_pos(cache);
241    
242      cache = cache->next;  #ifdef OSD_NAV
243        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
244                                  context->appdata->imperial,
245                                  cpos.lat, cpos.lon, cache->name);
246    #else
247    #warning OSD_NAV not defined!
248    #endif
249    }    }
250    
251      if(name) {
252        char *title = g_strdup_printf(_("Map - %s"), name);
253        g_free(name);
254    
255        gtk_window_set_title(GTK_WINDOW(context->window), title);
256    
257        g_free(title);
258      } else
259        printf("map_setup(keep)\n");
260    }
261    
262    static gboolean on_map_configure(GtkWidget *widget,
263                                     GdkEventConfigure *event,
264                                     map_context_t *context) {
265    
266      /* for some reason there's a configure event with 1/1 */
267      /* on diablo. We just ignore this! */
268    
269      printf("on_map_configure %d %d\n",
270             widget->allocation.width,
271             widget->allocation.height);
272    
273      if(!context->map_complete &&
274         (widget->allocation.width > 100) &&
275         (widget->allocation.height > 100)) {
276    
277        /* setup cache state */
278        map_setup(context);
279    
280        /* set default values if they are invalid */
281        if(!context->appdata->map.zoom ||
282           isnan(context->appdata->map.pos.lat) ||
283           isnan(context->appdata->map.pos.lon)) {
284          printf("no valid map position found\n");
285    
286          pos_t *refpos = get_pos(context->appdata);
287          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
288            printf("use refpos\n");
289    
290            /* use gps position if present */
291            context->appdata->map.pos = *refpos;
292            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
293          } else {
294            printf("use zero pos\n");
295    
296            /* use world map otherwise */
297            context->appdata->map.pos.lat = 0.0;
298            context->appdata->map.pos.lon = 0.0;
299            context->appdata->map.zoom = 1;
300          }
301        }
302    
303        /* jump to initial position */
304        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
305               context->appdata->map.pos.lat,
306               context->appdata->map.pos.lon,
307               context->appdata->map.zoom);
308    
309        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
310                                  context->appdata->map.pos.lat,
311                                  context->appdata->map.pos.lon,
312                                  context->appdata->map.zoom);
313        context->map_complete = TRUE;
314      }
315    
316      return FALSE;
317  }  }
318    
319  static void  static void
320  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
321                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
322    
323    while(cache) {    while(cache) {
324        pos_t cpos = gpx_cache_pos(cache);
325    
326      float dist =      float dist =
327        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
328        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
329    
330      if(!(dist > *distance)) {      if(!(dist > *distance)) {
331        *result = cache;        *result = cache;
# Line 183  static cache_t *map_closest(map_context_ Line 340  static cache_t *map_closest(map_context_
340    cache_t *result = NULL;    cache_t *result = NULL;
341    float distance = NAN;    float distance = NAN;
342    
343  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
344      /* search all geocaches */      /* search all geocaches */
345      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
346      while(gpx) {      while(gpx) {
347        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
348        gpx = gpx->next;        gpx = gpx->next;
349      }      }
350  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
351      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
352                            pos, &result, &distance);                            pos, &result, &distance);
353    }    } else
354  #endif      result = context->appdata->cur_gpx->cache;
355    
356    return result;    return result;
357  }  }
# Line 215  pos_t coord2pos(coord_t coo) { Line 369  pos_t coord2pos(coord_t coo) {
369  static gboolean  static gboolean
370  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
371                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
372    
373    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
374    
375      /* check if we actually clicked parts of the OSD */
376      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
377        return FALSE;
378    
379    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
380    if(context->press_on != NULL) {    if(context->press_on != NULL) {
381      printf("PRESS: already\n");      printf("PRESS: already\n");
382      return TRUE;      return FALSE;
383    }    }
384    
385    pos_t pos =    pos_t pos =
# Line 228  on_map_button_press_event(GtkWidget *wid Line 387  on_map_button_press_event(GtkWidget *wid
387    
388    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
389    if(nearest) {    if(nearest) {
390      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
391      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
392        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
393        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
394        context->press_on = nearest;        context->press_on = nearest;
395    }    }
396    
# Line 266  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 427  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
427  #endif  #endif
428    
429  static void  static void
430  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
431    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
432    
433      map_context_t *context = (map_context_t*)data;
434      cache_t *cache = context->balloon;
435    
436    //  printf("draw cb for \"%s\"\n", cache->name);    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
437        printf("draw\n");
438    
439  #if 0  #if 0
440    /* draw pink background to check clipping */      /* draw pink background to check clipping */
441    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);      cairo_rectangle (event->data.draw.cr,
442    cairo_set_source_rgba (cr, 1, 0, 0, 0.3);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
443    cairo_fill_preserve (cr);                       event->data.draw.rect->w+40, event->data.draw.rect->h+40);
444    cairo_set_line_width (cr, 0);      cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
445    cairo_stroke (cr);      cairo_fill_preserve (event->data.draw.cr);
446        cairo_set_line_width (event->data.draw.cr, 0);
447        cairo_stroke (event->data.draw.cr);
448  #endif  #endif
449    
450    /* leave a little border top and left */      /* leave a little border top and left */
451    gint x = rect->x, y = rect->y;      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
452    
453    /* draw the cache type icon ... */      /* draw the cache type icon ... */
454    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
455    cairo_draw_pixbuf(cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
456    
457    /* ... and right of it the waypoint id */      if(cache->notes && cache->notes->override) {
458    cairo_text_extents_t extents;        GdkPixbuf *over = icon_get(ICON_MISC, 1);
459          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
460    if(cache->id) {      }
461      cairo_select_font_face (cr, "Sans",  
462                              CAIRO_FONT_SLANT_NORMAL,      /* ... and right of it the waypoint id */
463                              CAIRO_FONT_WEIGHT_BOLD);      cairo_text_extents_t extents;
464    
465        if(cache->id) {
466          cairo_select_font_face (event->data.draw.cr, "Sans",
467                                  CAIRO_FONT_SLANT_NORMAL,
468                                  CAIRO_FONT_WEIGHT_BOLD);
469    
470  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
471      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
472  #else  #else
473      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
474  #endif  #endif
475    
476      cairo_text_extents (cr, cache->id, &extents);        cairo_text_extents (event->data.draw.cr, cache->id, &extents);
477    
478      /* display id right of icon vertically centered */        /* display id right of icon vertically centered */
479      x += gdk_pixbuf_get_width(icon) + 5;        x += gdk_pixbuf_get_width(icon) + 5;
480      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
481      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
482      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
483      cairo_show_text (cr, cache->id);        cairo_show_text (event->data.draw.cr, cache->id);
484      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
485    
486      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
487    } else      } else
488      y += gdk_pixbuf_get_height(icon);        y += gdk_pixbuf_get_height(icon);
489    
490    /* return to the left border and below icon/text */      /* return to the left border and below icon/text */
491    x = rect->x;      x = event->data.draw.rect->x;
492    
493    /* everything from here uses the same font */      /* everything from here uses the same font */
494    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
495                            CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
496  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
497    cairo_set_font_size (cr, 14.0);      cairo_set_font_size (event->data.draw.cr, 14.0);
498  #else  #else
499    cairo_set_font_size (cr, 22.0);      cairo_set_font_size (event->data.draw.cr, 22.0);
500  #endif  #endif
501    
502    if(cache->name) {      if(cache->name) {
503      /* draw cache name */        /* draw cache name */
504      cairo_text_extents (cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
505      y += extents.height;        y += extents.height;
506      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
507      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
508      cairo_show_text (cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
509      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
510    
511      /* return to the left border and below text */        /* return to the left border and below text */
512      y += LINE_SKIP;        y += LINE_SKIP;
513      x = rect->x;        x = event->data.draw.rect->x;
514    }      }
515    
516    if(cache->terrain) {      if(cache->terrain) {
517      /* draw cache rating */        /* draw cache rating */
518      const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
519      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
520      cairo_text_extents (cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
521      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
522    
523      /* draw "Terrain:" string */        /* draw "Terrain:" string */
524      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
525      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
526      cairo_show_text (cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
527      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
528      x += extents.width + 2;        x += extents.width + 2;
529    
530      /* draw terrain stars */        /* draw terrain stars */
531      cairo_draw_pixbuf(cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
532                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
533    
534      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
535      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
536    }      }
   
   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;  
537    
538      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));      if(cache->difficulty) {
539      cairo_draw_pixbuf(cr, icon, x, y -        const char *difficulty = "Difficulty:";
540          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
541          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
542    
543          /* draw "Difficulty:" string */
544          cairo_move_to (event->data.draw.cr, x, y);
545          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
546          cairo_show_text (event->data.draw.cr, _(difficulty));
547          cairo_stroke (event->data.draw.cr);
548          x += extents.width + 2;
549    
550          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
551          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
552                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                        (gdk_pixbuf_get_height(icon) + extents.height)/2);
553        }
554      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
555        printf("click %s event at %d %d\n",
556               event->data.click.down?"down":"up",
557               event->data.click.x, event->data.click.y);
558    
559        /* make the main screen jump to that cache */
560        if(!event->data.click.down) {
561          if(context->appdata->cur_cache) {
562            printf("ERROR: no current cache should be visible!\n");
563          } else {
564            gpx_t *is_in = NULL;
565    
566            if(!context->appdata->cur_gpx) {
567              printf("click while in \"all\" view\n");
568    
569              /* we first need to figure out which gpx file this cache */
570              /* is in so we can open it first */
571              gpx_t *gpx = context->appdata->gpx;
572              while(gpx && !is_in) {
573                cache_t *cur = gpx->cache;
574                while(cur && !is_in) {
575                  if(cur == cache)
576                    is_in = gpx;
577                  cur = cur->next;
578                }
579                gpx = gpx->next;
580              }
581    
582              if(is_in)
583                gpxlist_goto_cachelist(context->appdata, is_in);
584    
585            } else
586              /* the simple case: there already is an open gpx file and */
587              /* we just jump into the "cache" view */
588              is_in = context->appdata->cur_gpx;
589    
590            if(is_in) {
591              printf("selecting %s in %s\n",
592                     cache->id,
593                     context->appdata->cur_gpx->name);
594    
595              cachelist_goto_cache(context->appdata, cache);
596    
597              /* give focus to main screen (important for maemo) */
598              printf("raising main window\n");
599              gtk_window_present(GTK_WINDOW(context->appdata->window));
600            }
601          }
602        }
603      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
604        printf("removed\n");
605        context->balloon = NULL;
606    }    }
607  }  }
608    
# Line 386  on_map_button_release_event(GtkWidget *w Line 611  on_map_button_release_event(GtkWidget *w
611                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
612    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
613    
614    if(context->press_on) {    /* in "MAP_CACHE" state only one cache is visible */
615      /* and the map is in navigation mode. the balloon is */
616      /* pretty useless there */
617      if(context->press_on && (context->state != MAP_CACHE)) {
618    
619      coord_t coo;      coord_t coo;
620      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
621    
# Line 395  on_map_button_release_event(GtkWidget *w Line 624  on_map_button_release_event(GtkWidget *w
624    
625      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
626      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
627        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
628        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
629          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
630          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
631    
632          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
633                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
634                                         balloon_cb, context);
635        }        }
636      }      }
637      context->press_on = NULL;      context->press_on = NULL;
# Line 417  on_map_button_release_event(GtkWidget *w Line 649  on_map_button_release_event(GtkWidget *w
649  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
650    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
651    
   printf("destroy map window\n");  
   
652    /* save map parameters */    /* save map parameters */
653    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
654    gint zoom;    gint zoom;
# Line 430  static void on_window_destroy(GtkWidget Line 660  static void on_window_destroy(GtkWidget
660    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
661    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
662    
663      gint source;
664      g_object_get(map, "map-source", &source, NULL);
665      context->appdata->map.source = source;
666    
667  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
668    /* restore cur_view */    /* restore cur_view */
669    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 441  static void on_window_destroy(GtkWidget Line 675  static void on_window_destroy(GtkWidget
675    appdata->map.context = NULL;    appdata->map.context = NULL;
676  }  }
677    
678    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
679    /* get access to zoom buttons */
680    static void
681    on_window_realize(GtkWidget *widget, gpointer data) {
682      if (widget->window) {
683        unsigned char value = 1;
684        Atom hildon_zoom_key_atom =
685          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
686          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
687        Display *dpy =
688          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
689        Window w = GDK_WINDOW_XID(widget->window);
690    
691        XChangeProperty(dpy, w, hildon_zoom_key_atom,
692                        integer_atom, 8, PropModeReplace, &value, 1);
693      }
694    }
695    #endif
696    
697    /* on maemo a window is either on top or completely invisible. this */
698    /* means that we only need to update the map window if its raised.  */
699    /* on ordinary desktops this is different and we always update */
700    
701    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
702                             gpointer data) {
703      printf("map got focus\n");
704      map_setup((map_context_t*)data);
705      return FALSE;
706    }
707    
708    void map_update(appdata_t *appdata) {
709      printf("map_update\n");
710    #ifndef USE_MAEMO
711      if(appdata->map.context)
712        map_setup(appdata->map.context);
713    #endif
714    }
715    
716  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
717    map_context_t *context = NULL;    map_context_t *context = NULL;
718    
719    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
720    if(appdata->map.context) {    if(appdata->map.context) {
721        printf("using existing map!\n");
722      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
723        map_setup(appdata->map.context);
724      return;      return;
725    }    }
726    
727    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
728    context->appdata = appdata;    context->appdata = appdata;
729      context->map_complete = FALSE;
730      context->state = MAP_NONE;
731    
732      /* cleanup old (pre 0.8.7) path if it exists */
733      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
734      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
735        printf("old file path %s exists\n", old_path);
736        rmdir_recursive(old_path);
737      }
738    
739      /* It is recommanded that all applications share these same */
740      /* map path, so data is only cached once. The path should be: */
741      /* ~/.osm-gps-map on standard PC     (users home) */
742      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
743      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
744    #if !defined(USE_MAEMO)
745      char *p = getenv("HOME");
746      if(!p) p = "/tmp";
747      char *path = g_strdup_printf("%s/.osm-gps-map", p);
748    #else
749    #if MAEMO_VERSION_MAJOR == 5
750      char *path = g_strdup("/home/user/.osm-gps-map");
751    #else
752      char *path = g_strdup("/media/mmc2/osm-gps-map");
753    #endif
754    #endif
755    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
756    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
757    
758      gint source = context->appdata->map.source;
759      if(!source) source = MAP_SOURCE;
760    
761    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
762                   "map-source",               MAP_SOURCE,                   "map-source",               source,
763                   "tile-cache",               path,                   "tile-cache",               path,
764                   "auto-center",              FALSE,                   "auto-center",              FALSE,
765                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 468  void map(appdata_t *appdata) { Line 770  void map(appdata_t *appdata) {
770    g_free(path);    g_free(path);
771    
772    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);  
773    
774  #ifdef USE_MAEMO  #ifdef USE_MAEMO
775  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
776    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
777  #else    /* the user can e.g. still navigate the main menu */
778    context->window = hildon_window_new();    context->window = hildon_window_new();
779  #endif  
780    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
781      g_signal_connect(G_OBJECT(context->window), "realize",
782                       G_CALLBACK(on_window_realize), NULL);
783    #endif // MAEMO_VERSION
784  #else  #else
785    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
786  #endif  #endif
787    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
788  #ifndef USE_MAEMO  #ifndef USE_MAEMO
789    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
790  #endif  #endif
791    
792    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
793                       G_CALLBACK(on_focus_in), context);
794    
795    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
796                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
Legend:
Removed from v.73  
changed lines
  Added in v.148