--- trunk/src/map-tool.c 2009/08/20 18:54:06 69
+++ trunk/src/map-tool.c 2009/12/02 20:05:52 226
@@ -17,15 +17,32 @@
* along with GPXView. If not, see .
*/
+/*
+ * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png 8-15
+ * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png 8-15
+ */
+
+/*
+ * TODO:
+ * - make semi-transparent caches selectable
+ */
+
#include "gpxview.h"
#include "converter.h"
#include // for isnan
#ifdef ENABLE_OSM_GPS_MAP
#include "osm-gps-map.h"
+#include "osm-gps-map-osd-classic.h"
#endif
-#define MAP_SOURCE OSM_GPS_MAP_SOURCE_OPENSTREETMAP
+#if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
+#include
+#include
+#endif
+
+/* default values */
+#define MAP_SOURCE OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
#define GPS_DEFAULT_ZOOM 13
#define PROXY_KEY "/system/http_proxy/"
@@ -36,7 +53,7 @@
/* use environment settings if preset */
const char *proxy = g_getenv("http_proxy");
if(proxy) {
- printf("http_proxy: %s\n", proxy);
+ printf("map http proxy from env: %s\n", proxy);
return proxy;
}
@@ -57,6 +74,7 @@
snprintf(proxy_buffer, sizeof(proxy_buffer),
"http://%s:%u", host, port);
+ printf("map http proxy from gconf: %s\n ", proxy_buffer);
g_free(host);
}
@@ -67,15 +85,30 @@
}
static void
-cb_map_gps(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);
+cb_map_gps(osd_button_t but, map_context_t *context) {
+
+ if(but == OSD_GPS) {
+ printf("clicked OSD_GPS %p\n", context);
+ printf("clicked OSD_GPS a %p\n", context->appdata);
+
+ pos_t *refpos = get_pos(context->appdata);
+ if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
+ gint zoom;
+ g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
+ if(zoom < 10)
+ osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
+ refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
+ else
+ osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
+ refpos->lat, refpos->lon);
+
+ /* re-enable centering */
+ g_object_set(context->widget, "auto-center", TRUE, NULL);
+ } else {
+ /* no coordinates given: display the entire world */
+ osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
+ 0.0, 0.0, 1);
+ }
}
}
@@ -91,8 +124,11 @@
gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
/* ... and enable "goto" button if it's valid */
- osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
- OSM_GPS_MAP_OSD_GPS_CALLBACK(ok?cb_map_gps:NULL), context);
+ if(ok != context->goto_is_enabled) {
+ osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
+ OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
+ context->goto_is_enabled = ok;
+ }
if(ok) {
float heading = NAN;
@@ -107,6 +143,8 @@
radius = dist2pixel(context, eph/1000, refpos->lat);
}
+ /* TODO: in order to save energy: only draw if state actually changed */
+
g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
refpos->lat, refpos->lon, heading);
@@ -116,56 +154,303 @@
return TRUE;
}
-static gboolean on_map_configure(GtkWidget *widget,
- GdkEventConfigure *event,
- map_context_t *context) {
+static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
+ int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
+
+ GdkPixbuf *icon = icon_get(type, cache->type);
+ GdkPixbuf *over = NULL;
+
+ if(cache->mine) over = icon_get(type, 14);
+ else if(cache->found) over = icon_get(type, 12);
+ else if(cache->notes) {
+ if(cache->notes->found) over = icon_get(type, 12);
+ else if(cache->notes->override) over = icon_get(type, 11);
+ else over = icon_get(type, 13);
+ }
+
+ pos_t *pos = &cache->pos;
+ /* check if there's also an overwritten coordinate */
+ if(cache->notes && cache->notes->override)
+ pos = &cache->notes->pos;
+
+ if(!isnan(pos->lat) && !isnan(pos->lon)) {
+ osm_gps_map_add_image(OSM_GPS_MAP(map),
+ pos->lat, pos->lon, icon);
+ if(over)
+ osm_gps_map_add_image(OSM_GPS_MAP(map),
+ pos->lat, pos->lon, over);
+ }
+}
- /* set default values if they are invalid */
- if(!context->appdata->map.zoom ||
- isnan(context->appdata->map.pos.lat) ||
- isnan(context->appdata->map.pos.lon)) {
- printf("no valid map position found\n");
+static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
+ /* only draw wpts that don't equal the main point */
+ if(pos_differ(&cache->pos, &wpt->pos)) {
+ if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon)) {
+ GdkPixbuf *icon =
+ icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
+ wpt->sym:WPT_SYM_REFPOINT);
+
+ osm_gps_map_add_image(OSM_GPS_MAP(map),
+ wpt->pos.lat, wpt->pos.lon, icon);
+ }
+ }
+}
+
+static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
+ GtkWidget *map, gpx_t *gpx,
+ cache_t *nav, gboolean semi) {
+ if(!gpx->notes_loaded) {
+ notes_load_all(appdata, gpx);
+ gpx->notes_loaded = TRUE;
+ }
+
+ cache_t *cache = gpx->cache;
+ while(cache) {
+ /* search if we have that cache already in our list/displayed */
+ int i=0;
+ while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
+ i++;
+
+ if(!caches[i].id) {
+ /* if nav is given draw all other caches semitransparent. */
+ /* if nav is not given do what semi sais */
+ map_draw_cache(map, cache, nav?(cache != nav):semi);
+ caches[i].id = cache->id;
+
+ /* also draw waypoints of nav cache */
+ if(nav && cache == nav) {
+ wpt_t *wpt = cache->wpt;
+ while(wpt) {
+ map_draw_wpt(map, cache, wpt);
+ wpt = wpt->next;
+ }
+ }
+ }
+
+ cache = cache->next;
+ }
+}
+
+/* draw geocaches and set window title */
+static void map_setup(map_context_t *context) {
+ char *name = NULL;
+
+ int cache_num = gpx_total_caches_global(context->appdata->gpx);
+
+ if(context->caches_displayed && (cache_num != context->cache_list_len)) {
+ // printf("re-alloc because %p %d/%d\n", context->caches_displayed,
+ // cache_num, context->cache_list_len);
+ g_free(context->caches_displayed);
+ context->caches_displayed = NULL;
+ context->cache_list_len = 0;
+ }
+
+ /* allocate buffer */
+ if(cache_num && !context->caches_displayed) {
+ context->cache_list_len = cache_num;
+ context->caches_displayed = g_new0(cache_display_t, cache_num+1);
+ printf("allocated space to handle %d map icons\n", cache_num);
+ }
+
+ if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
+ if(context->state != MAP_ALL) {
+ printf("map_setup(ALL)\n");
+
+ /* clear any pending balloon */
+ context->balloon = NULL;
+ osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
+
+#ifdef OSD_NAV
+ /* no navigation in this mode */
+ osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
+#endif
+
+ /* clear all existing cache images */
+ osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
+ memset(context->caches_displayed, 0,
+ (cache_num+1) * sizeof(cache_display_t));
+
+ /* draw all geocaches and none is semi-transparent */
+ gpx_t *gpx = context->appdata->gpx;
+ while(gpx) {
+ map_draw_gpx(context->appdata, context->caches_displayed,
+ context->widget, gpx, NULL, FALSE);
+ gpx = gpx->next;
+ }
+
+ {
+ int i=0;
+ while(context->caches_displayed[i].id) i++;
+ printf("number of caches actually displayed: %d\n", i);
+ }
+
+ name = g_strdup(_("all"));
+ context->state = MAP_ALL;
+ }
+ } else if(!context->appdata->cur_cache) {
+ if(context->state != MAP_GPX) {
+ printf("map_setup(GPX)\n");
+
+ /* clear any pending balloon */
+ context->balloon = NULL;
+ osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
+
+#ifdef OSD_NAV
+ /* no navigation in this mode */
+ osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
+#endif
+
+ /* clear all existing cache images */
+ osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
+ memset(context->caches_displayed, 0,
+ (cache_num+1) * sizeof(cache_display_t));
+
+ /* draw all geocaches and all other gpx files are semi-transparent */
+ map_draw_gpx(context->appdata, context->caches_displayed,
+ context->widget, context->appdata->cur_gpx, NULL, FALSE);
+
+ gpx_t *gpx = context->appdata->gpx;
+ while(gpx) {
+ if(gpx != context->appdata->cur_gpx)
+ map_draw_gpx(context->appdata, context->caches_displayed,
+ context->widget, gpx, NULL, TRUE);
+
+ gpx = gpx->next;
+ }
+
+ name = g_strdup(context->appdata->cur_gpx->name);
+ context->state = MAP_GPX;
+ }
+ } else {
+ cache_t *cache = context->appdata->cur_cache;
- 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;
+ printf("map_setup(CACHE)\n");
+
+ /* clear any pending balloon */
+ context->balloon = NULL;
+ osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
+
+ /* clear all existing ccahe images */
+ osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
+ memset(context->caches_displayed, 0,
+ (cache_num+1) * sizeof(cache_display_t));
+
+ /* draw all geocaches and all but selected one are semi-transparent */
+ gpx_t *gpx = context->appdata->gpx;
+ while(gpx) {
+ map_draw_gpx(context->appdata, context->caches_displayed,
+ context->widget, gpx, cache, FALSE);
+ gpx = gpx->next;
}
+
+ name = g_strdup(cache->name);
+ context->state = MAP_CACHE;
+
+ /* navigation in this mode! */
+ pos_t cpos = gpx_cache_pos(cache);
+
+#ifdef OSD_NAV
+ osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
+ context->appdata->imperial,
+ cpos.lat, cpos.lon, cache->name);
+#else
+#warning OSD_NAV not defined!
+#endif
}
- /* jump to initial position */
- osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
- context->appdata->map.pos.lat,
- context->appdata->map.pos.lon,
- context->appdata->map.zoom);
+ /* also mark geomath position */
+
+ /* remove all existing appearances of this icon first */
+ osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
+ icon_get(ICON_MISC, 6));
- return FALSE;
-}
+ if(!isnan(context->appdata->geomath.lat) &&
+ !isnan(context->appdata->geomath.lon)) {
-static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {
- while(cache) {
- GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
+ osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
+ context->appdata->geomath.lat,
+ context->appdata->geomath.lon,
+ icon_get(ICON_MISC, 6));
+ }
+
+ if(name) {
+ char *title = g_strdup_printf(_("Map - %s"), name);
+ g_free(name);
+
+ gtk_window_set_title(GTK_WINDOW(context->window), title);
- osm_gps_map_add_image(OSM_GPS_MAP(map),
- cache->pos.lat, cache->pos.lon, icon);
+ g_free(title);
+ } else
+ printf("map_setup(keep)\n");
+}
- cache = cache->next;
+static gboolean on_map_configure(GtkWidget *widget,
+ GdkEventConfigure *event,
+ map_context_t *context) {
+
+ /* for some reason there's a configure event with 1/1 */
+ /* on diablo. We just ignore this! */
+
+ printf("on_map_configure %d %d\n",
+ widget->allocation.width,
+ widget->allocation.height);
+
+ if(!context->map_complete &&
+ (widget->allocation.width > 100) &&
+ (widget->allocation.height > 100)) {
+
+ /* setup cache state */
+ map_setup(context);
+
+ /* set default values if they are invalid */
+ 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)) {
+ printf("use refpos\n");
+
+ /* use gps position if present */
+ context->appdata->map.pos = *refpos;
+ context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
+ } else {
+ printf("use zero pos\n");
+
+ /* use world map otherwise */
+ context->appdata->map.pos.lat = 0.0;
+ context->appdata->map.pos.lon = 0.0;
+ context->appdata->map.zoom = 1;
+ }
+ }
+
+ /* jump to initial position */
+ printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
+ context->appdata->map.pos.lat,
+ context->appdata->map.pos.lon,
+ context->appdata->map.zoom);
+
+ osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
+ context->appdata->map.pos.lat,
+ context->appdata->map.pos.lon,
+ context->appdata->map.zoom);
+ context->map_complete = TRUE;
}
+
+ return FALSE;
}
static void
map_cachelist_nearest(cache_t *cache, pos_t *pos,
cache_t **result, float *distance) {
+
while(cache) {
+ pos_t cpos = gpx_cache_pos(cache);
+
float dist =
- pow(cache->pos.lat - pos->lat, 2) +
- pow(cache->pos.lon - pos->lon, 2);
+ pow(cpos.lat - pos->lat, 2) +
+ pow(cpos.lon - pos->lon, 2);
if(!(dist > *distance)) {
*result = cache;
@@ -180,21 +465,18 @@
cache_t *result = NULL;
float distance = NAN;
-#ifdef USE_MAEMO
- if(!context->appdata->cur_gpx) {
-#endif
+ if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
/* search all geocaches */
gpx_t *gpx = context->appdata->gpx;
while(gpx) {
map_cachelist_nearest(gpx->cache, pos, &result, &distance);
gpx = gpx->next;
}
-#ifdef USE_MAEMO
- } else {
+ } else if(context->appdata->cur_gpx) {
map_cachelist_nearest(context->appdata->cur_gpx->cache,
pos, &result, &distance);
- }
-#endif
+ } else
+ result = context->appdata->cur_gpx->cache;
return result;
}
@@ -212,12 +494,17 @@
static gboolean
on_map_button_press_event(GtkWidget *widget,
GdkEventButton *event, map_context_t *context) {
+
OsmGpsMap *map = OSM_GPS_MAP(context->widget);
+ /* check if we actually clicked parts of the OSD */
+ if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
+ return FALSE;
+
/* got a press event without release event? eat it! */
if(context->press_on != NULL) {
printf("PRESS: already\n");
- return TRUE;
+ return FALSE;
}
pos_t pos =
@@ -225,8 +512,10 @@
cache_t *nearest = map_closest(context, &pos);
if(nearest) {
- float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
- if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
+ pos_t cpos = gpx_cache_pos(nearest);
+
+ float dist = gpx_pos_get_distance(pos, cpos, FALSE);
+ if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
context->press_on = nearest;
}
@@ -244,6 +533,7 @@
gdk_pixbuf_get_height(buf));
// Create the new Context for the ImageSurface
+ g_assert(image_surface);
cairo_t *context = cairo_create(image_surface);
// Draw the image on the new Context
@@ -257,124 +547,207 @@
}
#ifndef BIG_BALLOONS
-#define LINE_SKIP 7
+#define ICON_SIZE ICON_CACHE_TYPE
#else
-#define LINE_SKIP 12
+#define ICON_SIZE ICON_CACHE_TYPE_1_5X
#endif
-static void
-balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
- cache_t *cache = (cache_t*)data;
+#ifndef BIG_BALLOONS
+#define FONT_SIZE 14.0
+#else
+#define FONT_SIZE 22.0
+#endif
+#define LINE_SKIP (FONT_SIZE/4)
- // printf("draw cb for \"%s\"\n", cache->name);
-#if 0
- /* draw pink background to check clipping */
- cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
- cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
- cairo_fill_preserve (cr);
- cairo_set_line_width (cr, 0);
- cairo_stroke (cr);
-#endif
-
- /* leave a little border top and left */
- gint x = rect->x, y = rect->y;
-
- /* draw the cache type icon ... */
- GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
- cairo_draw_pixbuf(cr, icon, x, y);
+static void
+balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
+ printf("balloon event: ");
- /* ... and right of it the waypoint id */
- cairo_text_extents_t extents;
+ map_context_t *context = (map_context_t*)data;
+ cache_t *cache = context->balloon;
- if(cache->id) {
- cairo_select_font_face (cr, "Sans",
- CAIRO_FONT_SLANT_NORMAL,
- CAIRO_FONT_WEIGHT_BOLD);
-
+ if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
+ printf("draw\n");
+
+#if 0
+ /* draw pink background to check clipping */
+ cairo_rectangle (event->data.draw.cr,
+ event->data.draw.rect->x-20, event->data.draw.rect->y-20,
+ event->data.draw.rect->w+40, event->data.draw.rect->h+40);
+ cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
+ cairo_fill_preserve (event->data.draw.cr);
+ cairo_set_line_width (event->data.draw.cr, 0);
+ cairo_stroke (event->data.draw.cr);
+#endif
+
+ /* leave a little border top and left */
+ gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
+
+ /* draw the cache type icon ... */
+ GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
+ cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
+
+ if(cache->notes && cache->notes->override) {
+ GdkPixbuf *over = icon_get(ICON_SIZE, 11);
+ cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
+ }
+
+ /* ... and right of it the waypoint id */
+ cairo_text_extents_t extents;
+
+ if(cache->id) {
+ cairo_select_font_face (event->data.draw.cr, "Sans",
+ CAIRO_FONT_SLANT_NORMAL,
+ CAIRO_FONT_WEIGHT_BOLD);
+
#ifndef BIG_BALLOONS
- cairo_set_font_size (cr, 20.0);
+ cairo_set_font_size (event->data.draw.cr, 20.0);
#else
- cairo_set_font_size (cr, 36.0);
+ cairo_set_font_size (event->data.draw.cr, 36.0);
#endif
+
+ cairo_text_extents (event->data.draw.cr, cache->id, &extents);
+
+ /* display id right of icon vertically centered */
+ x += gdk_pixbuf_get_width(icon) + 5;
+ y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
+ cairo_move_to (event->data.draw.cr, x, y);
+ cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
+ cairo_show_text (event->data.draw.cr, cache->id);
+ cairo_stroke (event->data.draw.cr);
+
+ y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
+ } else
+ y += gdk_pixbuf_get_height(icon);
+
+ /* return to the left border and below icon/text */
+ x = event->data.draw.rect->x;
+
+ /* everything from here uses the same font */
+ cairo_select_font_face (event->data.draw.cr, "Sans",
+ CAIRO_FONT_SLANT_NORMAL,
+ CAIRO_FONT_WEIGHT_NORMAL);
- cairo_text_extents (cr, cache->id, &extents);
+ cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
+
+ if(cache->name) {
+ /* draw cache name */
+ cairo_text_extents (event->data.draw.cr, cache->name, &extents);
+ cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
+ cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
+ cairo_show_text (event->data.draw.cr, cache->name);
+ cairo_stroke (event->data.draw.cr);
+
+ /* return to the left border and below text */
+ y += LINE_SKIP + FONT_SIZE;
+ x = event->data.draw.rect->x;
+ }
+
+ if(cache->terrain) {
+ int text_y = 0, icon_y = 0;
- /* display id right of icon vertically centered */
- x += gdk_pixbuf_get_width(icon) + 5;
- y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
- cairo_move_to (cr, x, y);
- cairo_set_source_rgba (cr, 0, 0, 0, 1);
- cairo_show_text (cr, cache->id);
- cairo_stroke (cr);
+ /* draw cache rating */
+ const char *terrain = "Terrain:";
+ icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
+ cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
+
+ if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
+ text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
+ else
+ icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
+
+ /* draw "Terrain:" string */
+ cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
+ cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
+ cairo_show_text (event->data.draw.cr, _(terrain));
+ cairo_stroke (event->data.draw.cr);
+ x += extents.width + 2;
+
+ /* draw terrain stars */
+ cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
+
+ x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
+ }
+
+ if(cache->difficulty) {
+ int text_y = 0, icon_y = 0;
- y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
- } else
- y += gdk_pixbuf_get_height(icon);
+ const char *difficulty = "Difficulty:";
+ icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
+ cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
+
+ if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
+ text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
+ else
+ icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
+
+ /* draw "Difficulty:" string */
+ cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
+ cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
+ cairo_show_text (event->data.draw.cr, _(difficulty));
+ cairo_stroke (event->data.draw.cr);
+ x += extents.width + 2;
+
+ cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
+ }
- /* return to the left border and below icon/text */
- x = rect->x;
+ /* draw container info */
+ /* TODO ... */
- /* everything from here uses the same font */
- cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
- CAIRO_FONT_WEIGHT_NORMAL);
-#ifndef BIG_BALLOONS
- cairo_set_font_size (cr, 14.0);
-#else
- cairo_set_font_size (cr, 22.0);
-#endif
- if(cache->name) {
- /* draw cache name */
- cairo_text_extents (cr, cache->name, &extents);
- y += extents.height;
- cairo_move_to (cr, x, y);
- cairo_set_source_rgba (cr, 0, 0, 0, 1);
- cairo_show_text (cr, cache->name);
- cairo_stroke (cr);
-
- /* return to the left border and below text */
- y += LINE_SKIP;
- x = rect->x;
- }
-
- if(cache->terrain) {
- /* draw cache rating */
- const char *terrain = "Terrain:";
- icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
- cairo_text_extents (cr, _(terrain), &extents);
- y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
-
- /* draw "Terrain:" string */
- cairo_move_to (cr, x, y);
- cairo_set_source_rgba (cr, 0, 0, 0, 1);
- cairo_show_text (cr, _(terrain));
- cairo_stroke (cr);
- x += extents.width + 2;
-
- /* draw terrain stars */
- cairo_draw_pixbuf(cr, icon, x, y -
- (gdk_pixbuf_get_height(icon) + extents.height)/2);
-
- x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
- y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
- }
-
- 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;
-
- 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);
+ } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
+ printf("click %s event at %d %d\n",
+ event->data.click.down?"down":"up",
+ event->data.click.x, event->data.click.y);
+
+ /* make the main screen jump to that cache */
+ if(!event->data.click.down) {
+ if(context->appdata->cur_cache) {
+ printf("ERROR: no current cache should be visible!\n");
+ } else {
+ gpx_t *is_in = NULL;
+
+ if(!context->appdata->cur_gpx) {
+ printf("click while in \"all\" view\n");
+
+ /* we first need to figure out which gpx file this cache */
+ /* is in so we can open it first */
+ gpx_t *gpx = context->appdata->gpx;
+ while(gpx && !is_in) {
+ cache_t *cur = gpx->cache;
+ while(cur && !is_in) {
+ if(cur == cache)
+ is_in = gpx;
+ cur = cur->next;
+ }
+ gpx = gpx->next;
+ }
+
+ if(is_in)
+ gpxlist_goto_cachelist(context->appdata, is_in);
+
+ } else
+ /* the simple case: there already is an open gpx file and */
+ /* we just jump into the "cache" view */
+ is_in = context->appdata->cur_gpx;
+
+ if(is_in) {
+ printf("selecting %s in %s\n",
+ cache->id,
+ context->appdata->cur_gpx->name);
+
+ cachelist_goto_cache(context->appdata, cache);
+
+ /* give focus to main screen (important for maemo) */
+ printf("raising main window\n");
+ gtk_window_present(GTK_WINDOW(context->appdata->window));
+ }
+ }
+ }
+ } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
+ printf("removed\n");
+ context->balloon = NULL;
}
}
@@ -383,7 +756,11 @@
GdkEventButton *event, map_context_t *context) {
OsmGpsMap *map = OSM_GPS_MAP(context->widget);
+ /* in "MAP_CACHE" state only one cache is visible */
+ /* and the map is in navigation mode. the balloon is */
+ /* pretty useless there */
if(context->press_on) {
+
coord_t coo;
coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
@@ -392,11 +769,14 @@
cache_t *nearest = map_closest(context, &pos);
if(nearest && nearest == context->press_on) {
- float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
- if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
+ pos_t cpos = gpx_cache_pos(nearest);
+
+ float dist = gpx_pos_get_distance(pos, cpos, FALSE);
+ if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
- osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
- balloon_draw_cb, nearest);
+ context->balloon = nearest;
+ osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
+ balloon_cb, context);
}
}
context->press_on = NULL;
@@ -414,8 +794,6 @@
static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
appdata_t *appdata = context->appdata;
- printf("destroy map window\n");
-
/* save map parameters */
OsmGpsMap *map = OSM_GPS_MAP(context->widget);
gint zoom;
@@ -427,34 +805,151 @@
context->appdata->map.pos.lat = lat;
context->appdata->map.pos.lon = lon;
+ gint source;
+ g_object_get(map, "map-source", &source, NULL);
+ context->appdata->map.source = source;
+
#if MAEMO_VERSION_MAJOR == 5
/* restore cur_view */
context->appdata->cur_view = context->old_view;
#endif
gtk_timeout_remove(context->handler_id);
+ gps_unregister_callback(appdata, context->cb_id);
+ if(context->caches_displayed) {
+ g_free(context->caches_displayed);
+ context->caches_displayed = NULL;
+ }
+
+ printf("destroy map context\n");
g_free(context);
appdata->map.context = NULL;
}
+#if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
+/* get access to zoom buttons */
+static void
+on_window_realize(GtkWidget *widget, gpointer data) {
+ if (widget->window) {
+ unsigned char value = 1;
+ Atom hildon_zoom_key_atom =
+ gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
+ integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
+ Display *dpy =
+ GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
+ Window w = GDK_WINDOW_XID(widget->window);
+
+ XChangeProperty(dpy, w, hildon_zoom_key_atom,
+ integer_atom, 8, PropModeReplace, &value, 1);
+ }
+}
+#endif
+
+/* on maemo a window is either on top or completely invisible. this */
+/* means that we only need to update the map window if its raised. */
+/* on ordinary desktops this is different and we always update */
+
+static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data) {
+ map_context_t *context = (map_context_t*)data;
+
+ printf("map got focus\n");
+
+#ifdef USE_MAEMO
+ /* re-enable refresh of map */
+ if(!context->handler_id)
+ context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
+#endif
+
+ map_setup(context);
+ return FALSE;
+}
+
+static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data) {
+ map_context_t *context = (map_context_t*)data;
+
+ printf("map lost focus\n");
+
+ /* save new map position */
+ gfloat lat, lon;
+ g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
+
+ context->appdata->map.pos.lat = lat;
+ context->appdata->map.pos.lon = lon;
+
+#ifdef USE_MAEMO
+ gtk_timeout_remove(context->handler_id);
+ context->handler_id = 0;
+#endif
+
+ return FALSE;
+}
+
+void map_update(appdata_t *appdata) {
+ printf("map_update\n");
+#ifndef USE_MAEMO
+ if(appdata->map.context)
+ map_setup(appdata->map.context);
+#endif
+}
+
+/* callback called by the gps layer whenever gps state changes */
+static void
+gps_callback(struct gps_state *state, gpointer data) {
+ printf("map: gps callback\n");
+}
+
void map(appdata_t *appdata) {
map_context_t *context = NULL;
/* if the map window already exists, just raise it */
if(appdata->map.context) {
+ printf("using existing map!\n");
gtk_window_present(GTK_WINDOW(appdata->map.context->window));
+ map_setup(appdata->map.context);
return;
}
context = appdata->map.context = g_new0(map_context_t, 1);
+ printf("allocated new context at %p\n", context);
+
context->appdata = appdata;
+ context->map_complete = FALSE;
+ context->state = MAP_NONE;
+
+ /* cleanup old (pre 0.8.7) path if it exists */
+ char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
+ if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
+ printf("old file path %s exists\n", old_path);
+ rmdir_recursive(old_path);
+ }
+
+ /* It is recommanded that all applications share these same */
+ /* map path, so data is only cached once. The path should be: */
+ /* ~/.osm-gps-map on standard PC (users home) */
+ /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
+ /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
+#if !defined(USE_MAEMO)
+ char *p = getenv("HOME");
+ if(!p) p = "/tmp";
+ char *path = g_strdup_printf("%s/.osm-gps-map", p);
+#else
+#if MAEMO_VERSION_MAJOR == 5
+ char *path = g_strdup("/home/user/.osm-gps-map");
+#else
+ char *path = g_strdup("/media/mmc2/osm-gps-map");
+#endif
+#endif
- char *path = g_strdup_printf("%s/map/", appdata->image_path);
const char *proxy = get_proxy_uri(appdata);
+ gint source = context->appdata->map.source;
+ if(!source) source = MAP_SOURCE;
+
context->widget = g_object_new(OSM_TYPE_GPS_MAP,
- "map-source", MAP_SOURCE,
+ "map-source", source,
"tile-cache", path,
"auto-center", FALSE,
"record-trip-history", FALSE,
@@ -464,44 +959,31 @@
g_free(path);
- char *name = NULL;
-#ifdef USE_MAEMO
- if(!appdata->cur_gpx) {
-#endif
- /* draw all geocaches */
- gpx_t *gpx = appdata->gpx;
- while(gpx) {
- map_draw_cachelist(context->widget, gpx->cache);
- gpx = gpx->next;
- }
- name = g_strdup(_("all geocaches"));
-#ifdef USE_MAEMO
- } else {
- map_draw_cachelist(context->widget, appdata->cur_gpx->cache);
- name = g_strdup(appdata->cur_gpx->name);
- }
-#endif
-
- char *title = g_strdup_printf(_("Map - %s"), name);
- g_free(name);
+ osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
#ifdef USE_MAEMO
-#ifdef USE_STACKABLE_WINDOW
- context->window = hildon_stackable_window_new();
-#else
+ /* we don't use a stackable window here on fremantle, since */
+ /* this leaves the main window independent from the map and */
+ /* the user can e.g. still navigate the main menu */
context->window = hildon_window_new();
-#endif
+
+#if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
+ g_signal_connect(G_OBJECT(context->window), "realize",
+ G_CALLBACK(on_window_realize), NULL);
+#endif // MAEMO_VERSION
#else
context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
#endif
- gtk_window_set_title(GTK_WINDOW(context->window), title);
-
#ifndef USE_MAEMO
gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
#endif
- g_free(title);
+ g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
+ G_CALLBACK(on_focus_in), context);
+
+ g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
+ G_CALLBACK(on_focus_out), context);
g_signal_connect(G_OBJECT(context->widget), "configure-event",
G_CALLBACK(on_map_configure), context);
@@ -514,6 +996,7 @@
/* install handler for timed updates of the gps button */
context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
+ context->cb_id = gps_register_callback(appdata, gps_callback, context);
#if MAEMO_VERSION_MAJOR == 5
/* prevent some of the main screen things */