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

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

revision 85 by harbaum, Fri Aug 28 12:07:16 2009 UTC revision 123 by harbaum, Wed Sep 23 11:23:45 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 31  Line 36 
36  #include <X11/Xatom.h>  #include <X11/Xatom.h>
37  #endif  #endif
38    
39  // #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  /* default values */
40  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
41  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
42    
# Line 170  static gboolean on_map_configure(GtkWidg Line 175  static gboolean on_map_configure(GtkWidg
175    return FALSE;    return FALSE;
176  }  }
177    
178  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache) {
179    while(cache) {    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
     GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
180    
181      /* check if there's also an overwritten coordinate */
182      if(cache->notes && cache->notes->override) {
183        GdkPixbuf *over = icon_get(ICON_MISC, 1);
184    
185        osm_gps_map_add_image(OSM_GPS_MAP(map),
186              cache->notes->pos.lat, cache->notes->pos.lon, icon);
187    
188        osm_gps_map_add_image(OSM_GPS_MAP(map),
189              cache->notes->pos.lat, cache->notes->pos.lon, over);
190      } else
191      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
192                            cache->pos.lat, cache->pos.lon, icon);                            cache->pos.lat, cache->pos.lon, icon);
193    
194    }
195    
196    static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {
197      if(!gpx->notes_loaded) {
198        notes_load_all(appdata, gpx);
199        gpx->notes_loaded = TRUE;
200      }
201    
202      cache_t *cache = gpx->cache;
203      while(cache) {
204        map_draw_cache(map, cache);
205      cache = cache->next;      cache = cache->next;
206    }    }
207  }  }
# Line 185  static void Line 210  static void
210  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
211                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
212    while(cache) {    while(cache) {
213        pos_t cpos = gpx_cache_pos(cache);
214    
215      float dist =      float dist =
216        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
217        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
218    
219      if(!(dist > *distance)) {      if(!(dist > *distance)) {
220        *result = cache;        *result = cache;
# Line 203  static cache_t *map_closest(map_context_ Line 230  static cache_t *map_closest(map_context_
230    float distance = NAN;    float distance = NAN;
231    
232  #ifdef USE_MAEMO  #ifdef USE_MAEMO
233    if(!context->appdata->cur_gpx) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
234  #endif  #endif
235      /* search all geocaches */      /* search all geocaches */
236      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
# Line 212  static cache_t *map_closest(map_context_ Line 239  static cache_t *map_closest(map_context_
239        gpx = gpx->next;        gpx = gpx->next;
240      }      }
241  #ifdef USE_MAEMO  #ifdef USE_MAEMO
242    } else {    } else if(context->appdata->cur_gpx) {
243      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
244                            pos, &result, &distance);                            pos, &result, &distance);
245    }    } else
246        result = context->appdata->cur_gpx->cache;
247  #endif  #endif
248    
249    return result;    return result;
# Line 236  on_map_button_press_event(GtkWidget *wid Line 264  on_map_button_press_event(GtkWidget *wid
264                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
265    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
266    
267      /* check if we actually clicked parts of the OSD */
268      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
269        return FALSE;
270    
271    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
272    if(context->press_on != NULL) {    if(context->press_on != NULL) {
273      printf("PRESS: already\n");      printf("PRESS: already\n");
274      return TRUE;      return FALSE;
275    }    }
276    
277    pos_t pos =    pos_t pos =
# Line 247  on_map_button_press_event(GtkWidget *wid Line 279  on_map_button_press_event(GtkWidget *wid
279    
280    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
281    if(nearest) {    if(nearest) {
282      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
283      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
284        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
285        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
286        context->press_on = nearest;        context->press_on = nearest;
287    }    }
288    
# Line 304  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe Line 338  balloon_draw_cb(cairo_t *cr, OsmGpsMapRe
338    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
339    cairo_draw_pixbuf(cr, icon, x, y);    cairo_draw_pixbuf(cr, icon, x, y);
340    
341      if(cache->notes && cache->notes->override) {
342        GdkPixbuf *over = icon_get(ICON_MISC, 1);
343        cairo_draw_pixbuf(cr, over, x, y);
344      }
345    
346    /* ... and right of it the waypoint id */    /* ... and right of it the waypoint id */
347    cairo_text_extents_t extents;    cairo_text_extents_t extents;
348    
# Line 412  on_map_button_release_event(GtkWidget *w Line 451  on_map_button_release_event(GtkWidget *w
451    
452      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
453      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
454        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
455        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
456          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
457          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
458    
459          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
460                                   balloon_draw_cb, nearest);                                       balloon_draw_cb, nearest);
461    
462            osm_gps_map_osd_draw_nav (map, cpos.lat, cpos.lon, nearest->name);
463    
464        }        }
465      }      }
466      context->press_on = NULL;      context->press_on = NULL;
# Line 447  static void on_window_destroy(GtkWidget Line 491  static void on_window_destroy(GtkWidget
491    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
492    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
493    
494      gint source;
495      g_object_get(map, "map-source", &source, NULL);
496      context->appdata->map.source = source;
497    
498  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
499    /* restore cur_view */    /* restore cur_view */
500    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
# Line 516  void map(appdata_t *appdata) { Line 564  void map(appdata_t *appdata) {
564    
565    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
566    
567      gint source = context->appdata->map.source;
568      if(!source) source = MAP_SOURCE;
569    
570    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
571                   "map-source",               MAP_SOURCE,                   "map-source",               source,
572                   "tile-cache",               path,                   "tile-cache",               path,
573                   "auto-center",              FALSE,                   "auto-center",              FALSE,
574                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 531  void map(appdata_t *appdata) { Line 582  void map(appdata_t *appdata) {
582    
583    char *name = NULL;    char *name = NULL;
584  #ifdef USE_MAEMO  #ifdef USE_MAEMO
585    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx && !appdata->cur_cache) {
586  #endif  #endif
587      /* draw all geocaches */      /* draw all geocaches */
588      gpx_t *gpx = appdata->gpx;      gpx_t *gpx = appdata->gpx;
589      while(gpx) {      while(gpx) {
590        map_draw_cachelist(context->widget, gpx->cache);        map_draw_gpx(appdata, context->widget, gpx);
591        gpx = gpx->next;        gpx = gpx->next;
592      }      }
593      name = g_strdup(_("all geocaches"));      name = g_strdup(_("all"));
594  #ifdef USE_MAEMO  #ifdef USE_MAEMO
595    } else {    } else if(!appdata->cur_cache) {
596      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);      map_draw_gpx(appdata, context->widget, appdata->cur_gpx);
597      name = g_strdup(appdata->cur_gpx->name);      name = g_strdup(appdata->cur_gpx->name);
598      } else {
599        map_draw_cache(context->widget, appdata->cur_cache);
600        name = g_strdup(appdata->cur_cache->name);
601    }    }
602  #endif  #endif
603    
Legend:
Removed from v.85  
changed lines
  Added in v.123