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 143 by harbaum, Mon Oct 26 19:55:00 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 34  Line 45 
45  static const char *get_proxy_uri(appdata_t *appdata) {  static const char *get_proxy_uri(appdata_t *appdata) {
46    static char proxy_buffer[64] = "";    static char proxy_buffer[64] = "";
47    
48      printf("get_proxy_uri in\n");
49    
50    /* use environment settings if preset */    /* use environment settings if preset */
51    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
52    if(proxy) {    if(proxy) {
# Line 64  static const char *get_proxy_uri(appdata Line 77  static const char *get_proxy_uri(appdata
77      return proxy_buffer;      return proxy_buffer;
78    }    }
79    
80      printf("get_proxy_uri out\n");
81    return NULL;    return NULL;
82  }  }
83    
84  static void  static void
85  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
86      printf("cb_map_gps in\n");
87    
88    if(but == OSD_GPS) {    if(but == OSD_GPS) {
89      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
90      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
91        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        gint zoom;
92                                  refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
93          if(zoom < 10)
94            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
95                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
96          else
97            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
98                                   refpos->lat, refpos->lon);
99    
100          /* re-enable centering */
101          g_object_set(context->widget, "auto-center", TRUE, NULL);
102      } else {      } else {
103        /* no coordinates given: display the entire world */        /* no coordinates given: display the entire world */
104        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
105                                  0.0, 0.0, 1);                                  0.0, 0.0, 1);
106      }      }
107    }    }
108      printf("cb_map_gps out\n");
109  }  }
110    
111  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 89  static int dist2pixel(map_context_t *con Line 115  static int dist2pixel(map_context_t *con
115  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
116    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
117    
118      printf("map_gps_update in\n");
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);
# Line 116  static gboolean map_gps_update(gpointer Line 144  static gboolean map_gps_update(gpointer
144    } else    } else
145      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
146    
147      printf("map_gps_update out\n");
148    return TRUE;    return TRUE;
149  }  }
150    
151  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache) {
152                                   GdkEventConfigure *event,    printf("map_draw_cache in\n");
                                  map_context_t *context) {  
153    
154    /* set default values if they are invalid */    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
   if(!context->appdata->map.zoom ||  
      isnan(context->appdata->map.pos.lat) ||  
      isnan(context->appdata->map.pos.lon)) {  
     printf("no valid map position found\n");  
   
     pos_t *refpos = get_pos(context->appdata);  
     if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
       /* use gps position if present */  
       context->appdata->map.pos = *refpos;  
       context->appdata->map.zoom = GPS_DEFAULT_ZOOM;  
     } else {  
       /* use world map otherwise */  
       context->appdata->map.pos.lat = 0.0;  
       context->appdata->map.pos.lon = 0.0;  
       context->appdata->map.zoom = 1;  
     }  
   }  
155    
156    /* jump to initial position */    /* check if there's also an overwritten coordinate */
157    osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),    if(cache->notes && cache->notes->override) {
158                              context->appdata->map.pos.lat,      GdkPixbuf *over = icon_get(ICON_MISC, 1);
                             context->appdata->map.pos.lon,  
                             context->appdata->map.zoom);  
159    
160    return FALSE;      osm_gps_map_add_image(OSM_GPS_MAP(map),
161              cache->notes->pos.lat, cache->notes->pos.lon, icon);
162    
163        osm_gps_map_add_image(OSM_GPS_MAP(map),
164              cache->notes->pos.lat, cache->notes->pos.lon, over);
165      } else {
166        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
167          osm_gps_map_add_image(OSM_GPS_MAP(map),
168                                cache->pos.lat, cache->pos.lon, icon);
169      }
170      printf("map_draw_cache out\n");
171  }  }
172    
173  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {
174      printf("map_draw_gpx in\n");
175    
176      if(!gpx->notes_loaded) {
177        notes_load_all(appdata, gpx);
178        gpx->notes_loaded = TRUE;
179      }
180    
181      cache_t *cache = gpx->cache;
182    while(cache) {    while(cache) {
183      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      map_draw_cache(map, cache);
184        cache = cache->next;
185      }
186      printf("map_draw_gpx out\n");
187    }
188    
189    /* draw geocaches and set window title */
190    static void map_setup(map_context_t *context) {
191      char *name = NULL;
192    
193      printf("map_setup in\n");
194    
195      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
196        if(context->state != MAP_ALL) {
197          printf("map_setup(ALL)\n");
198    
199    #ifdef OSD_NAV
200          /* no navigation in this mode */
201          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
202    #endif
203    
204          /* clear all existing ccahe images */
205          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
206    
207          /* draw all geocaches */
208          gpx_t *gpx = context->appdata->gpx;
209          while(gpx) {
210            map_draw_gpx(context->appdata, context->widget, gpx);
211            gpx = gpx->next;
212          }
213          name = g_strdup(_("all"));
214          context->state = MAP_ALL;
215        }
216      } else if(!context->appdata->cur_cache) {
217        if(context->state != MAP_GPX) {
218          printf("map_setup(GPX)\n");
219    
220    #ifdef OSD_NAV
221          /* no navigation in this mode */
222          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
223    #endif
224    
225          /* clear all existing ccahe images */
226          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
227    
228          map_draw_gpx(context->appdata, context->widget,
229                       context->appdata->cur_gpx);
230          name = g_strdup(context->appdata->cur_gpx->name);
231          context->state = MAP_GPX;
232        }
233      } else {
234        cache_t *cache = context->appdata->cur_cache;
235    
236      osm_gps_map_add_image(OSM_GPS_MAP(map),      printf("map_setp(CACHE)\n");
237                            cache->pos.lat, cache->pos.lon, icon);  
238        /* no balloons in this mode */
239        context->balloon = NULL;
240        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
241    
242        /* clear all existing ccahe images */
243        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
244    
245        map_draw_cache(context->widget, cache);
246        name = g_strdup(cache->name);
247        context->state = MAP_CACHE;
248    
249        /* navigation in this mode! */
250        pos_t cpos = gpx_cache_pos(cache);
251    
252      cache = cache->next;  #ifdef OSD_NAV
253        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
254                                  context->appdata->imperial,
255                                  cpos.lat, cpos.lon, cache->name);
256    #else
257    #warning OSD_NAV not defined!
258    #endif
259    }    }
260    
261      if(name) {
262        char *title = g_strdup_printf(_("Map - %s"), name);
263        g_free(name);
264    
265        gtk_window_set_title(GTK_WINDOW(context->window), title);
266    
267        g_free(title);
268      } else
269        printf("map_setup(keep)\n");
270    
271      printf("map_setup out\n");
272    }
273    
274    static gboolean on_map_configure(GtkWidget *widget,
275                                     GdkEventConfigure *event,
276                                     map_context_t *context) {
277    
278      /* for some reason there's a configure event with 1/1 */
279      /* on diablo. We just ignore this! */
280    
281      printf("on_map_configure %d %d\n",
282             widget->allocation.width,
283             widget->allocation.height);
284    
285      if(!context->map_complete &&
286         (widget->allocation.width > 100) &&
287         (widget->allocation.height > 100)) {
288    
289        /* setup cache state */
290        map_setup(context);
291    
292        /* set default values if they are invalid */
293        if(!context->appdata->map.zoom ||
294           isnan(context->appdata->map.pos.lat) ||
295           isnan(context->appdata->map.pos.lon)) {
296          printf("no valid map position found\n");
297    
298          pos_t *refpos = get_pos(context->appdata);
299          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
300            printf("use refpos\n");
301    
302            /* use gps position if present */
303            context->appdata->map.pos = *refpos;
304            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
305          } else {
306            printf("use zero pos\n");
307    
308            /* use world map otherwise */
309            context->appdata->map.pos.lat = 0.0;
310            context->appdata->map.pos.lon = 0.0;
311            context->appdata->map.zoom = 1;
312          }
313        }
314    
315        /* jump to initial position */
316        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
317               context->appdata->map.pos.lat,
318               context->appdata->map.pos.lon,
319               context->appdata->map.zoom);
320    
321        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
322                                  context->appdata->map.pos.lat,
323                                  context->appdata->map.pos.lon,
324                                  context->appdata->map.zoom);
325        context->map_complete = TRUE;
326      }
327    
328      printf("map configure done\n");
329      return FALSE;
330  }  }
331    
332  static void  static void
333  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
334                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
335      printf("map_cachelist_nearest in\n");
336    while(cache) {    while(cache) {
337        pos_t cpos = gpx_cache_pos(cache);
338    
339      float dist =      float dist =
340        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
341        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
342    
343      if(!(dist > *distance)) {      if(!(dist > *distance)) {
344        *result = cache;        *result = cache;
# Line 177  map_cachelist_nearest(cache_t *cache, po Line 347  map_cachelist_nearest(cache_t *cache, po
347    
348      cache = cache->next;      cache = cache->next;
349    }    }
350      printf("map_cachelist_nearest out\n");
351  }  }
352    
353  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
354    cache_t *result = NULL;    cache_t *result = NULL;
355    float distance = NAN;    float distance = NAN;
356    
357  #ifdef USE_MAEMO    printf("map_closest in\n");
358    if(!context->appdata->cur_gpx) {  
359  #endif    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
360      /* search all geocaches */      /* search all geocaches */
361      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
362      while(gpx) {      while(gpx) {
363        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
364        gpx = gpx->next;        gpx = gpx->next;
365      }      }
366  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
367      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
368                            pos, &result, &distance);                            pos, &result, &distance);
369    }    } else
370  #endif      result = context->appdata->cur_gpx->cache;
371    
372      printf("map_closest out\n");
373    return result;    return result;
374  }  }
375    
# Line 215  pos_t coord2pos(coord_t coo) { Line 386  pos_t coord2pos(coord_t coo) {
386  static gboolean  static gboolean
387  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
388                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
389      printf("on_map_button_press_event in\n");
390    
391    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
392    
393      /* check if we actually clicked parts of the OSD */
394      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE) {
395        printf("on_map_button_press_event out 1\n");
396        return FALSE;
397      }
398    
399    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
400    if(context->press_on != NULL) {    if(context->press_on != NULL) {
401      printf("PRESS: already\n");      printf("PRESS: already\n");
402      return TRUE;      return FALSE;
403    }    }
404    
405    pos_t pos =    pos_t pos =
# Line 228  on_map_button_press_event(GtkWidget *wid Line 407  on_map_button_press_event(GtkWidget *wid
407    
408    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
409    if(nearest) {    if(nearest) {
410      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
411      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
412        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
413        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
414        context->press_on = nearest;        context->press_on = nearest;
415    }    }
416    
417      printf("on_map_button_press_event out\n");
418    return FALSE;    return FALSE;
419  }  }
420    
# Line 240  static void Line 422  static void
422  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
423    /* convert the pixbuf into something cairo can handle */    /* convert the pixbuf into something cairo can handle */
424    
425      printf("cairo_draw_pixbuf in\n");
426    
427    // Create a new ImageSurface    // Create a new ImageSurface
428    cairo_surface_t *image_surface =    cairo_surface_t *image_surface =
429      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
# Line 257  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 441  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
441    cairo_set_source_surface(cr, image_surface, x, y);    cairo_set_source_surface(cr, image_surface, x, y);
442    
443    cairo_paint(cr);    cairo_paint(cr);
444      printf("cairo_draw_pixbuf out\n");
445  }  }
446    
447  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
# Line 266  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:\n");
456    
457    //  printf("draw cb for \"%s\"\n", cache->name);    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        cairo_set_line_width (event->data.draw.cr, 0);
471        cairo_stroke (event->data.draw.cr);
472  #endif  #endif
473    
474    /* leave a little border top and left */      /* leave a little border top and left */
475    gint x = rect->x, y = rect->y;      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
476    
477    /* draw the cache type icon ... */      /* draw the cache type icon ... */
478    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
479    cairo_draw_pixbuf(cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
480    
481    /* ... and right of it the waypoint id */      if(cache->notes && cache->notes->override) {
482    cairo_text_extents_t extents;        GdkPixbuf *over = icon_get(ICON_MISC, 1);
483          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
484    if(cache->id) {      }
485      cairo_select_font_face (cr, "Sans",  
486                              CAIRO_FONT_SLANT_NORMAL,      /* ... and right of it the waypoint id */
487                              CAIRO_FONT_WEIGHT_BOLD);      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      printf("balloon out\n");
632  }  }
633    
634  static gboolean  static gboolean
# Line 386  on_map_button_release_event(GtkWidget *w Line 636  on_map_button_release_event(GtkWidget *w
636                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
637    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
638    
639    if(context->press_on) {    printf("on_map_button_release_event in\n");
640    
641      /* in "MAP_CACHE" state only one cache is visible */
642      /* and the map is in navigation mode. the balloon is */
643      /* pretty useless there */
644      if(context->press_on && (context->state != MAP_CACHE)) {
645    
646      coord_t coo;      coord_t coo;
647      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
648    
# Line 395  on_map_button_release_event(GtkWidget *w Line 651  on_map_button_release_event(GtkWidget *w
651    
652      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
653      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
654        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
655        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
656          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
657          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
658    
659          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
660                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
661                                         balloon_cb, context);
662        }        }
663      }      }
664      context->press_on = NULL;      context->press_on = NULL;
# Line 411  on_map_button_release_event(GtkWidget *w Line 670  on_map_button_release_event(GtkWidget *w
670      context->appdata->map.pos.lon = lon;      context->appdata->map.pos.lon = lon;
671    }    }
672    
673      printf("on_map_button_release_event out\n");
674    return FALSE;    return FALSE;
675  }  }
676    
# Line 430  static void on_window_destroy(GtkWidget Line 690  static void on_window_destroy(GtkWidget
690    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
691    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
692    
693      gint source;
694      g_object_get(map, "map-source", &source, NULL);
695      context->appdata->map.source = source;
696    
697  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
698    /* restore cur_view */    /* restore cur_view */
699    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 441  static void on_window_destroy(GtkWidget Line 705  static void on_window_destroy(GtkWidget
705    appdata->map.context = NULL;    appdata->map.context = NULL;
706  }  }
707    
708    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
709    /* get access to zoom buttons */
710    static void
711    on_window_realize(GtkWidget *widget, gpointer data) {
712      if (widget->window) {
713        unsigned char value = 1;
714        Atom hildon_zoom_key_atom =
715          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
716          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
717        Display *dpy =
718          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
719        Window w = GDK_WINDOW_XID(widget->window);
720    
721        XChangeProperty(dpy, w, hildon_zoom_key_atom,
722                        integer_atom, 8, PropModeReplace, &value, 1);
723      }
724    }
725    #endif
726    
727    /* on maemo a window is either on top or completely invisible. this */
728    /* means that we only need to update the map window if its raised.  */
729    /* on ordinary desktops this is different and we always update */
730    
731    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
732                             gpointer data) {
733      printf("map got focus\n");
734      map_setup((map_context_t*)data);
735      return FALSE;
736    }
737    
738    void map_update(appdata_t *appdata) {
739      printf("map_update\n");
740    #ifndef USE_MAEMO
741      if(appdata->map.context)
742        map_setup(appdata->map.context);
743    #endif
744    }
745    
746  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
747    map_context_t *context = NULL;    map_context_t *context = NULL;
748    
749      printf("map 1\n");
750    
751    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
752    if(appdata->map.context) {    if(appdata->map.context) {
753        printf("using existing map!\n");
754      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
755        map_setup(appdata->map.context);
756      return;      return;
757    }    }
758    
759      printf("map 2\n");
760    
761    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
762    context->appdata = appdata;    context->appdata = appdata;
763      context->map_complete = FALSE;
764      context->state = MAP_NONE;
765    
766      /* cleanup old (pre 0.8.7) path if it exists */
767      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
768      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
769        printf("old file path %s exists\n", old_path);
770        rmdir_recursive(old_path);
771      }
772    
773      printf("map 3\n");
774    
775      /* It is recommanded that all applications share these same */
776      /* map path, so data is only cached once. The path should be: */
777      /* ~/.osm-gps-map on standard PC     (users home) */
778      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
779      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
780    #if !defined(USE_MAEMO)
781      char *p = getenv("HOME");
782      if(!p) p = "/tmp";
783      char *path = g_strdup_printf("%s/.osm-gps-map", p);
784    #else
785    #if MAEMO_VERSION_MAJOR == 5
786      char *path = g_strdup("/home/user/.osm-gps-map");
787    #else
788      char *path = g_strdup("/media/mmc2/osm-gps-map");
789    #endif
790    #endif
791    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
792    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
793    
794      gint source = context->appdata->map.source;
795      if(!source) source = MAP_SOURCE;
796    
797      printf("map 4\n");
798    
799    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
800                   "map-source",               MAP_SOURCE,                   "map-source",               source,
801                   "tile-cache",               path,                   "tile-cache",               path,
802                   "auto-center",              FALSE,                   "auto-center",              FALSE,
803                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 468  void map(appdata_t *appdata) { Line 808  void map(appdata_t *appdata) {
808    g_free(path);    g_free(path);
809    
810    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  
811    
812    char *title = g_strdup_printf(_("Map - %s"), name);    printf("map 5\n");
   g_free(name);  
813    
814  #ifdef USE_MAEMO  #ifdef USE_MAEMO
815  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
816    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
817  #else    /* the user can e.g. still navigate the main menu */
818    context->window = hildon_window_new();    context->window = hildon_window_new();
819  #endif  
820    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
821      g_signal_connect(G_OBJECT(context->window), "realize",
822                       G_CALLBACK(on_window_realize), NULL);
823    #endif // MAEMO_VERSION
824  #else  #else
825    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
826  #endif  #endif
827    
828    gtk_window_set_title(GTK_WINDOW(context->window), title);    printf("map 6\n");
829    
830  #ifndef USE_MAEMO  #ifndef USE_MAEMO
831    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
832  #endif  #endif
833    
834    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
835                       G_CALLBACK(on_focus_in), context);
836    
837    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
838                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 520  void map(appdata_t *appdata) { Line 846  void map(appdata_t *appdata) {
846    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
847    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
848    
849      printf("map 7\n");
850    
851  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
852    /* prevent some of the main screen things */    /* prevent some of the main screen things */
853    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
854    appdata->cur_view = NULL;    appdata->cur_view = NULL;
855  #endif  #endif
856    
857      printf("map 8\n");
858    
859    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
860                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
861    
862      printf("map 9\n");
863    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
864      printf("map 10\n");
865    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
866    
867      printf("map 11\n");
868  }  }
Legend:
Removed from v.73  
changed lines
  Added in v.143