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

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

revision 63 by harbaum, Wed Aug 19 12:35:25 2009 UTC revision 203 by harbaum, Sun Nov 22 20:39:46 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
33    
34  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
35  #include "osm-gps-map.h"  #include "osm-gps-map.h"
36    #include "osm-gps-map-osd-classic.h"
37  #endif  #endif
38    
39  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
40    #include <gdk/gdkx.h>
41    #include <X11/Xatom.h>
42    #endif
43    
44    /* default values */
45    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
46  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
47    
48  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 36  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 57  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 66  static const char *get_proxy_uri(appdata Line 84  static const char *get_proxy_uri(appdata
84    return NULL;    return NULL;
85  }  }
86    
87  /* TODO: This needs to be wired to the GPS button in osm_gps_map */  static void
88  #if 0  cb_map_gps(osd_button_t but, map_context_t *context) {
 static gboolean  
 cb_map_gps(GtkButton *button, map_context_t *context) {  
   pos_t *refpos = get_pos(context->appdata);  
   if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                       refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);  
   } else {  
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
   }  
89    
90    return FALSE;    if(but == OSD_GPS) {
91        pos_t *refpos = get_pos(context->appdata);
92        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
93          gint zoom;
94          g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
95          if(zoom < 10)
96            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
97                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
98          else
99            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
100                                   refpos->lat, refpos->lon);
101    
102          /* re-enable centering */
103          g_object_set(context->widget, "auto-center", TRUE, NULL);
104        } else {
105          /* no coordinates given: display the entire world */
106          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
107                                    0.0, 0.0, 1);
108        }
109      }
110  }  }
 #endif  
111    
112  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
113    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
# Line 90  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    /* TODO: gtk_widget_set_sensitive(context->gps, ok); */    if(ok != goto_is_enabled) {
126        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 111  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 120  static gboolean map_gps_update(gpointer Line 152  static gboolean map_gps_update(gpointer
152    return TRUE;    return TRUE;
153  }  }
154    
155  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
156                                   GdkEventConfigure *event,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
157                                   map_context_t *context) {  
158      GdkPixbuf *icon = icon_get(type, cache->type);
159    
160      /* check if there's also an overwritten coordinate */
161      if(cache->notes && cache->notes->override) {
162        GdkPixbuf *over = icon_get(type, 11);
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, cache_display_t *caches,
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        /* search if we have that cache already in our list/displayed */
187        int i=0;
188        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
189          i++;
190    
191        if(!caches[i].id) {
192          /* if nav is given draw all other caches semitransparent. */
193          /* if nav is not given do what semi sais */
194          map_draw_cache(map, cache, nav?(cache != nav):semi);
195          caches[i].id = cache->id;
196        }
197    
198        cache = cache->next;
199      }
200    }
201    
202    /* draw geocaches and set window title */
203    static void map_setup(map_context_t *context) {
204      char *name = NULL;
205    
206      int cache_num = gpx_total_caches_global(context->appdata->gpx);
207    
208      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
209        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
210        //     cache_num, context->cache_list_len);
211        g_free(context->caches_displayed);
212        context->caches_displayed = NULL;
213        context->cache_list_len = 0;
214      }
215    
216      /* allocate buffer */
217      if(cache_num && !context->caches_displayed) {
218        context->cache_list_len = cache_num;
219        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
220        printf("allocated space to handle %d map icons\n", cache_num);
221      }
222    
223      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
224        if(context->state != MAP_ALL) {
225          printf("map_setup(ALL)\n");
226    
227          /* clear any pending balloon */
228          context->balloon = NULL;
229          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
230    
231    #ifdef OSD_NAV
232          /* no navigation in this mode */
233          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
234    #endif
235    
236          /* clear all existing cache images */
237          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
238          memset(context->caches_displayed, 0,
239                 (cache_num+1) * sizeof(cache_display_t));
240    
241          /* draw all geocaches and none is semi-transparent */
242          gpx_t *gpx = context->appdata->gpx;
243          while(gpx) {
244            map_draw_gpx(context->appdata, context->caches_displayed,
245                         context->widget, gpx, NULL, FALSE);
246            gpx = gpx->next;
247          }
248    
249          {
250            int i=0;
251            while(context->caches_displayed[i].id) i++;
252            printf("number of caches actually displayed: %d\n", i);
253          }
254    
255          name = g_strdup(_("all"));
256          context->state = MAP_ALL;
257        }
258      } else if(!context->appdata->cur_cache) {
259        if(context->state != MAP_GPX) {
260          printf("map_setup(GPX)\n");
261    
262          /* clear any pending balloon */
263          context->balloon = NULL;
264          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
265    
266    #ifdef OSD_NAV
267          /* no navigation in this mode */
268          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
269    #endif
270    
271          /* clear all existing cache images */
272          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
273          memset(context->caches_displayed, 0,
274                 (cache_num+1) * sizeof(cache_display_t));
275    
276          /* draw all geocaches and all other gpx files are semi-transparent */
277          map_draw_gpx(context->appdata, context->caches_displayed,
278                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
279    
280          gpx_t *gpx = context->appdata->gpx;
281          while(gpx) {
282            if(gpx != context->appdata->cur_gpx)
283              map_draw_gpx(context->appdata, context->caches_displayed,
284                           context->widget, gpx, NULL, TRUE);
285    
286    /* set default values if they are invalid */          gpx = gpx->next;
287    if(!context->appdata->map.zoom ||        }
288       isnan(context->appdata->map.pos.lat) ||  
289       isnan(context->appdata->map.pos.lon)) {        name = g_strdup(context->appdata->cur_gpx->name);
290      printf("no valid map position found\n");        context->state = MAP_GPX;
291        }
292      } else {
293        cache_t *cache = context->appdata->cur_cache;
294    
295      pos_t *refpos = get_pos(context->appdata);      printf("map_setup(CACHE)\n");
296      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
297        /* use gps position if present */      /* clear any pending balloon */
298        context->appdata->map.pos = *refpos;      context->balloon = NULL;
299        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
300      } else {  
301        /* use world map otherwise */      /* clear all existing ccahe images */
302        context->appdata->map.pos.lat = 0.0;      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
303        context->appdata->map.pos.lon = 0.0;      memset(context->caches_displayed, 0,
304        context->appdata->map.zoom = 1;             (cache_num+1) * sizeof(cache_display_t));
305    
306        /* draw all geocaches and all but selected one are semi-transparent */
307        gpx_t *gpx = context->appdata->gpx;
308        while(gpx) {
309          map_draw_gpx(context->appdata, context->caches_displayed,
310                       context->widget, gpx, cache, FALSE);
311          gpx = gpx->next;
312      }      }
313    
314        name = g_strdup(cache->name);
315        context->state = MAP_CACHE;
316    
317        /* navigation in this mode! */
318        pos_t cpos = gpx_cache_pos(cache);
319    
320    #ifdef OSD_NAV
321        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
322                                  context->appdata->imperial,
323                                  cpos.lat, cpos.lon, cache->name);
324    #else
325    #warning OSD_NAV not defined!
326    #endif
327    }    }
328    
329    /* jump to initial position */    if(name) {
330    osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      char *title = g_strdup_printf(_("Map - %s"), name);
331                              context->appdata->map.pos.lat,      g_free(name);
                             context->appdata->map.pos.lon,  
                             context->appdata->map.zoom);  
   
   return FALSE;  
 }  
332    
333  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {      gtk_window_set_title(GTK_WINDOW(context->window), title);
   while(cache) {  
     GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
334    
335      osm_gps_map_add_image(OSM_GPS_MAP(map),      g_free(title);
336                            cache->pos.lat, cache->pos.lon, icon);    } else
337        printf("map_setup(keep)\n");
338    }
339    
340      cache = cache->next;  static gboolean on_map_configure(GtkWidget *widget,
341                                     GdkEventConfigure *event,
342                                     map_context_t *context) {
343    
344      /* for some reason there's a configure event with 1/1 */
345      /* on diablo. We just ignore this! */
346    
347      printf("on_map_configure %d %d\n",
348             widget->allocation.width,
349             widget->allocation.height);
350    
351      if(!context->map_complete &&
352         (widget->allocation.width > 100) &&
353         (widget->allocation.height > 100)) {
354    
355        /* setup cache state */
356        map_setup(context);
357    
358        /* set default values if they are invalid */
359        if(!context->appdata->map.zoom ||
360           isnan(context->appdata->map.pos.lat) ||
361           isnan(context->appdata->map.pos.lon)) {
362          printf("no valid map position found\n");
363    
364          pos_t *refpos = get_pos(context->appdata);
365          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
366            printf("use refpos\n");
367    
368            /* use gps position if present */
369            context->appdata->map.pos = *refpos;
370            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
371          } else {
372            printf("use zero pos\n");
373    
374            /* use world map otherwise */
375            context->appdata->map.pos.lat = 0.0;
376            context->appdata->map.pos.lon = 0.0;
377            context->appdata->map.zoom = 1;
378          }
379        }
380    
381        /* jump to initial position */
382        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
383               context->appdata->map.pos.lat,
384               context->appdata->map.pos.lon,
385               context->appdata->map.zoom);
386    
387        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
388                                  context->appdata->map.pos.lat,
389                                  context->appdata->map.pos.lon,
390                                  context->appdata->map.zoom);
391        context->map_complete = TRUE;
392    }    }
393    
394      return FALSE;
395  }  }
396    
397  static void  static void
398  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
399                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
400    
401    while(cache) {    while(cache) {
402        pos_t cpos = gpx_cache_pos(cache);
403    
404      float dist =      float dist =
405        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
406        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
407    
408      if(!(dist > *distance)) {      if(!(dist > *distance)) {
409        *result = cache;        *result = cache;
# Line 184  static cache_t *map_closest(map_context_ Line 418  static cache_t *map_closest(map_context_
418    cache_t *result = NULL;    cache_t *result = NULL;
419    float distance = NAN;    float distance = NAN;
420    
421  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
422      /* search all geocaches */      /* search all geocaches */
423      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
424      while(gpx) {      while(gpx) {
425        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
426        gpx = gpx->next;        gpx = gpx->next;
427      }      }
428  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
429      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
430                            pos, &result, &distance);                            pos, &result, &distance);
431    }    } else
432  #endif      result = context->appdata->cur_gpx->cache;
433    
434    return result;    return result;
435  }  }
# Line 216  pos_t coord2pos(coord_t coo) { Line 447  pos_t coord2pos(coord_t coo) {
447  static gboolean  static gboolean
448  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
449                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
450    
451    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
452    
453      /* check if we actually clicked parts of the OSD */
454      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
455        return FALSE;
456    
457    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
458    if(context->press_on != NULL) {    if(context->press_on != NULL) {
459      printf("PRESS: already\n");      printf("PRESS: already\n");
460      return TRUE;      return FALSE;
461    }    }
462    
463    pos_t pos =    pos_t pos =
# Line 229  on_map_button_press_event(GtkWidget *wid Line 465  on_map_button_press_event(GtkWidget *wid
465    
466    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
467    if(nearest) {    if(nearest) {
468      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
469      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
470        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
471        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
472        context->press_on = nearest;        context->press_on = nearest;
473    }    }
474    
# Line 248  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 486  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
486                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
487    
488    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
489      g_assert(image_surface);
490    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
491    
492    // Draw the image on the new Context    // Draw the image on the new Context
# Line 260  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 499  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
499    cairo_paint(cr);    cairo_paint(cr);
500  }  }
501    
502  #define LINE_SKIP  7  #ifndef BIG_BALLOONS
503    #define ICON_SIZE  ICON_CACHE_TYPE
504    #else
505    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
506    #endif
507    
508    #ifndef BIG_BALLOONS
509    #define FONT_SIZE 14.0
510    #else
511    #define FONT_SIZE 22.0
512    #endif
513    #define LINE_SKIP  (FONT_SIZE/4)
514    
515    
516  static void  static void
517  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
518    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
519    
520    //  printf("draw cb for \"%s\"\n", cache->name);    map_context_t *context = (map_context_t*)data;
521      cache_t *cache = context->balloon;
522    
523      if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
524        printf("draw\n");
525    
526  #if 0  #if 0
527    /* draw pink background to check clipping */      /* draw pink background to check clipping */
528    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);      cairo_rectangle (event->data.draw.cr,
529    cairo_set_source_rgba (cr, 1, 0, 0, 0.3);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
530    cairo_fill_preserve (cr);                       event->data.draw.rect->w+40, event->data.draw.rect->h+40);
531    cairo_set_line_width (cr, 0);      cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
532    cairo_stroke (cr);      cairo_fill_preserve (event->data.draw.cr);
533  #endif      cairo_set_line_width (event->data.draw.cr, 0);
534        cairo_stroke (event->data.draw.cr);
535    /* leave a little border top and left */  #endif
536    gint x = rect->x, y = rect->y;  
537        /* leave a little border top and left */
538    /* draw the cache type icon ... */      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
539    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
540    cairo_draw_pixbuf(cr, icon, x, y);      /* draw the cache type icon ... */
541        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
542        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
543    
544        if(cache->notes && cache->notes->override) {
545          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
546          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
547        }
548    
549        /* ... and right of it the waypoint id */
550        cairo_text_extents_t extents;
551    
552        if(cache->id) {
553          cairo_select_font_face (event->data.draw.cr, "Sans",
554                                  CAIRO_FONT_SLANT_NORMAL,
555                                  CAIRO_FONT_WEIGHT_BOLD);
556    
557    #ifndef BIG_BALLOONS
558          cairo_set_font_size (event->data.draw.cr, 20.0);
559    #else
560          cairo_set_font_size (event->data.draw.cr, 36.0);
561    #endif
562    
563          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
564    
565          /* display id right of icon vertically centered */
566          x += gdk_pixbuf_get_width(icon) + 5;
567          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
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, cache->id);
571          cairo_stroke (event->data.draw.cr);
572    
573          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
574        } else
575          y += gdk_pixbuf_get_height(icon);
576    
577        /* return to the left border and below icon/text */
578        x = event->data.draw.rect->x;
579    
580        /* everything from here uses the same font */
581        cairo_select_font_face (event->data.draw.cr, "Sans",
582                                CAIRO_FONT_SLANT_NORMAL,
583                                CAIRO_FONT_WEIGHT_NORMAL);
584    
585    /* ... and right of it the waypoint id */      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
586    cairo_text_extents_t extents;  
587        if(cache->name) {
588          /* draw cache name */
589          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
590          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
591          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
592          cairo_show_text (event->data.draw.cr, cache->name);
593          cairo_stroke (event->data.draw.cr);
594    
595          /* return to the left border and below text */
596          y += LINE_SKIP + FONT_SIZE;
597          x = event->data.draw.rect->x;
598        }
599    
600        if(cache->terrain) {
601          int text_y = 0, icon_y = 0;
602    
603    if(cache->id) {        /* draw cache rating */
604      cairo_select_font_face (cr, "Sans",        const char *terrain = "Terrain:";
605                              CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
606                              CAIRO_FONT_WEIGHT_BOLD);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
607    
608      cairo_set_font_size (cr, 20.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
609      cairo_text_extents (cr, cache->id, &extents);          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
610          else
611            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
612    
613          /* draw "Terrain:" string */
614          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
615          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
616          cairo_show_text (event->data.draw.cr, _(terrain));
617          cairo_stroke (event->data.draw.cr);
618          x += extents.width + 2;
619    
620          /* draw terrain stars */
621          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
622    
623          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
624        }
625    
626        if(cache->difficulty) {
627          int text_y = 0, icon_y = 0;
628    
629      /* display id right of icon vertically centered */        const char *difficulty = "Difficulty:";
630      x += gdk_pixbuf_get_width(icon) + 5;        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
631      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
632      cairo_move_to (cr, x, y);  
633      cairo_set_source_rgba (cr, 0, 0, 0, 1);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
634      cairo_show_text (cr, cache->id);          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
635      cairo_stroke (cr);        else
636            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
637    
638          /* draw "Difficulty:" string */
639          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
640          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
641          cairo_show_text (event->data.draw.cr, _(difficulty));
642          cairo_stroke (event->data.draw.cr);
643          x += extents.width + 2;
644    
645          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
646        }
647    
648      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;      /* draw container info */
649    } else      /* TODO ... */
     y += gdk_pixbuf_get_height(icon);  
650    
   /* return to the left border and below icon/text */  
   x = rect->x;  
651    
652    /* everything from here uses the same font */    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
653    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      printf("click %s event at %d %d\n",
654                            CAIRO_FONT_WEIGHT_NORMAL);             event->data.click.down?"down":"up",
655    cairo_set_font_size (cr, 14.0);             event->data.click.x, event->data.click.y);
656    
657    if(cache->name) {      /* make the main screen jump to that cache */
658      /* draw cache name */      if(!event->data.click.down) {
659      cairo_text_extents (cr, cache->name, &extents);        if(context->appdata->cur_cache) {
660      y += extents.height;          printf("ERROR: no current cache should be visible!\n");
661      cairo_move_to (cr, x, y);        } else {
662      cairo_set_source_rgba (cr, 0, 0, 0, 1);          gpx_t *is_in = NULL;
663      cairo_show_text (cr, cache->name);  
664      cairo_stroke (cr);          if(!context->appdata->cur_gpx) {
665              printf("click while in \"all\" view\n");
666      /* return to the left border and below text */  
667      y += LINE_SKIP;            /* we first need to figure out which gpx file this cache */
668      x = rect->x;            /* is in so we can open it first */
669    }            gpx_t *gpx = context->appdata->gpx;
670              while(gpx && !is_in) {
671    if(cache->terrain) {              cache_t *cur = gpx->cache;
672      /* draw cache rating */              while(cur && !is_in) {
673      const char *terrain = "Terrain:";                if(cur == cache)
674      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));                  is_in = gpx;
675      cairo_text_extents (cr, _(terrain), &extents);                cur = cur->next;
676      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;              }
677                gpx = gpx->next;
678      /* draw "Terrain:" string */            }
679      cairo_move_to (cr, x, y);  
680      cairo_set_source_rgba (cr, 0, 0, 0, 1);            if(is_in)
681      cairo_show_text (cr, _(terrain));              gpxlist_goto_cachelist(context->appdata, is_in);
682      cairo_stroke (cr);  
683      x += extents.width + 2;          } else
684              /* the simple case: there already is an open gpx file and */
685      /* draw terrain stars */            /* we just jump into the "cache" view */
686      cairo_draw_pixbuf(cr, icon, x, y -            is_in = context->appdata->cur_gpx;
687                        (gdk_pixbuf_get_height(icon) + extents.height)/2);  
688            if(is_in) {
689      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;            printf("selecting %s in %s\n",
690      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;                   cache->id,
691    }                   context->appdata->cur_gpx->name);
692    
693    if(cache->difficulty) {            cachelist_goto_cache(context->appdata, cache);
694      const char *difficulty = "Difficulty:";  
695      cairo_text_extents (cr, _(difficulty), &extents);            /* give focus to main screen (important for maemo) */
696      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;            printf("raising main window\n");
697              gtk_window_present(GTK_WINDOW(context->appdata->window));
698      /* draw "Difficulty:" string */          }
699      cairo_move_to (cr, x, y);        }
700      cairo_set_source_rgba (cr, 0, 0, 0, 1);      }
701      cairo_show_text (cr, _(difficulty));    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
702      cairo_stroke (cr);      printf("removed\n");
703      x += extents.width + 2;      context->balloon = NULL;
   
     icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));  
     cairo_draw_pixbuf(cr, icon, x, y -  
                       (gdk_pixbuf_get_height(icon) + extents.height)/2);  
704    }    }
705  }  }
706    
# Line 374  on_map_button_release_event(GtkWidget *w Line 709  on_map_button_release_event(GtkWidget *w
709                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
710    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
711    
712      /* in "MAP_CACHE" state only one cache is visible */
713      /* and the map is in navigation mode. the balloon is */
714      /* pretty useless there */
715    if(context->press_on) {    if(context->press_on) {
716    
717      coord_t coo;      coord_t coo;
718      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
719    
# Line 383  on_map_button_release_event(GtkWidget *w Line 722  on_map_button_release_event(GtkWidget *w
722    
723      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
724      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
725        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
726        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
727          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
728          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
729    
730          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
731                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
732                                         balloon_cb, context);
733        }        }
734      }      }
735      context->press_on = NULL;      context->press_on = NULL;
# Line 405  on_map_button_release_event(GtkWidget *w Line 747  on_map_button_release_event(GtkWidget *w
747  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
748    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
749    
   printf("destroy map window\n");  
   
750    /* save map parameters */    /* save map parameters */
751    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
752    gint zoom;    gint zoom;
# Line 418  static void on_window_destroy(GtkWidget Line 758  static void on_window_destroy(GtkWidget
758    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
759    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
760    
761      gint source;
762      g_object_get(map, "map-source", &source, NULL);
763      context->appdata->map.source = source;
764    
765  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
766    /* restore cur_view */    /* restore cur_view */
767    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
768  #endif  #endif
769    
770    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
771      gps_unregister_callback(appdata, context->cb_id);
772    
773      if(context->caches_displayed) {
774        g_free(context->caches_displayed);
775        context->caches_displayed = NULL;
776      }
777    
778    g_free(context);    g_free(context);
779    appdata->map.context = NULL;    appdata->map.context = NULL;
780  }  }
781    
782    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
783    /* get access to zoom buttons */
784    static void
785    on_window_realize(GtkWidget *widget, gpointer data) {
786      if (widget->window) {
787        unsigned char value = 1;
788        Atom hildon_zoom_key_atom =
789          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
790          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
791        Display *dpy =
792          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
793        Window w = GDK_WINDOW_XID(widget->window);
794    
795        XChangeProperty(dpy, w, hildon_zoom_key_atom,
796                        integer_atom, 8, PropModeReplace, &value, 1);
797      }
798    }
799    #endif
800    
801    /* on maemo a window is either on top or completely invisible. this */
802    /* means that we only need to update the map window if its raised.  */
803    /* on ordinary desktops this is different and we always update */
804    
805    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
806                             gpointer data) {
807      map_context_t *context = (map_context_t*)data;
808    
809      printf("map got focus\n");
810    
811    #ifdef USE_MAEMO
812      /* re-enable refresh of map */
813      if(!context->handler_id)
814        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
815    #endif
816    
817      map_setup(context);
818      return FALSE;
819    }
820    
821    #ifdef USE_MAEMO
822    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
823                             gpointer data) {
824      map_context_t *context = (map_context_t*)data;
825    
826      printf("map lost focus\n");
827      gtk_timeout_remove(context->handler_id);
828      context->handler_id = 0;
829    
830      return FALSE;
831    }
832    #endif
833    
834    void map_update(appdata_t *appdata) {
835      printf("map_update\n");
836    #ifndef USE_MAEMO
837      if(appdata->map.context)
838        map_setup(appdata->map.context);
839    #endif
840    }
841    
842    /* callback called by the gps layer whenever gps state changes */
843    static void
844    gps_callback(struct gps_state *state, gpointer data) {
845      printf("map: gps callback\n");
846    }
847    
848  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
849    map_context_t *context = NULL;    map_context_t *context = NULL;
850    
851    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
852    if(appdata->map.context) {    if(appdata->map.context) {
853        printf("using existing map!\n");
854      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
855        map_setup(appdata->map.context);
856      return;      return;
857    }    }
858    
859    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
860    context->appdata = appdata;    context->appdata = appdata;
861      context->map_complete = FALSE;
862      context->state = MAP_NONE;
863    
864      /* cleanup old (pre 0.8.7) path if it exists */
865      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
866      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
867        printf("old file path %s exists\n", old_path);
868        rmdir_recursive(old_path);
869      }
870    
871      /* It is recommanded that all applications share these same */
872      /* map path, so data is only cached once. The path should be: */
873      /* ~/.osm-gps-map on standard PC     (users home) */
874      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
875      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
876    #if !defined(USE_MAEMO)
877      char *p = getenv("HOME");
878      if(!p) p = "/tmp";
879      char *path = g_strdup_printf("%s/.osm-gps-map", p);
880    #else
881    #if MAEMO_VERSION_MAJOR == 5
882      char *path = g_strdup("/home/user/.osm-gps-map");
883    #else
884      char *path = g_strdup("/media/mmc2/osm-gps-map");
885    #endif
886    #endif
887    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
888    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
889    
890      gint source = context->appdata->map.source;
891      if(!source) source = MAP_SOURCE;
892    
893    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
894                   "map-source",               MAP_SOURCE,                   "map-source",               source,
895                   "tile-cache",               path,                   "tile-cache",               path,
896                   "auto-center",              FALSE,                   "auto-center",              FALSE,
897                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 455  void map(appdata_t *appdata) { Line 901  void map(appdata_t *appdata) {
901    
902    g_free(path);    g_free(path);
903    
904    char *name = NULL;    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
 #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);  
905    
906  #ifdef USE_MAEMO  #ifdef USE_MAEMO
907  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
908    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
909  #else    /* the user can e.g. still navigate the main menu */
910    context->window = hildon_window_new();    context->window = hildon_window_new();
911  #endif  
912    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
913      g_signal_connect(G_OBJECT(context->window), "realize",
914                       G_CALLBACK(on_window_realize), NULL);
915    #endif // MAEMO_VERSION
916  #else  #else
917    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
918  #endif  #endif
919    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
920  #ifndef USE_MAEMO  #ifndef USE_MAEMO
921    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
922  #endif  #endif
923    
924    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
925                       G_CALLBACK(on_focus_in), context);
926    
927    #ifdef USE_MAEMO
928      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
929                       G_CALLBACK(on_focus_out), context);
930    #endif
931    
932    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
933                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 503  void map(appdata_t *appdata) { Line 938  void map(appdata_t *appdata) {
938    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
939                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
940    
   /* TODO: gtk_widget_set_sensitive(context->gps, FALSE); */  
   
941    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
942    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
943      context->cb_id = gps_register_callback(appdata, gps_callback, context);
944    
945  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
946    /* prevent some of the main screen things */    /* prevent some of the main screen things */

Legend:
Removed from v.63  
changed lines
  Added in v.203