--- trunk/src/osm-gps-map.c 2009/08/17 19:44:00 60 +++ trunk/src/osm-gps-map.c 2009/08/28 12:07:16 85 @@ -49,6 +49,23 @@ #define EXTRA_BORDER (TILESIZE / 2) +#define OSM_GPS_MAP_SCROLL_STEP 10 + +/* any defined key enables key support */ +#if (defined(OSM_GPS_MAP_KEY_FULLSCREEN) || \ + defined(OSM_GPS_MAP_KEY_ZOOMIN) || \ + defined(OSM_GPS_MAP_KEY_ZOOMOUT) || \ + defined(OSM_GPS_MAP_KEY_UP) || \ + defined(OSM_GPS_MAP_KEY_DOWN) || \ + defined(OSM_GPS_MAP_KEY_LEFT) || \ + defined(OSM_GPS_MAP_KEY_RIGHT)) +#define OSM_GPS_MAP_KEYS +#endif + +#ifdef OSM_GPS_MAP_KEYS +#include +#endif + struct _OsmGpsMapPrivate { GHashTable *tile_queue; @@ -79,7 +96,6 @@ //where downloaded tiles are cached char *cache_dir; - gboolean cache_dir_is_full_path; //contains flags indicating the various special characters //the uri string contains, that will be replaced when calculating @@ -98,6 +114,7 @@ coord_t *gps; gboolean gps_valid; +#ifdef ENABLE_BALLOON //a balloon with additional info struct { coord_t *coo; @@ -106,7 +123,20 @@ OsmGpsMapBalloonCallback cb; gpointer data; } balloon; +#endif +#ifdef ENABLE_OSD + //the osd controls (if present) + osm_gps_map_osd_t *osd; +#ifdef OSD_DOUBLE_BUFFER + GdkPixmap *dbuf_pixmap; +#endif +#endif + +#ifdef OSM_GPS_MAP_KEY_FULLSCREEN + gboolean fullscreen; +#endif + //additional images or tracks added to the map GSList *tracks; GSList *images; @@ -158,7 +188,6 @@ PROP_REPO_URI, PROP_PROXY_URI, PROP_TILE_CACHE_DIR, - PROP_TILE_CACHE_DIR_IS_FULL_PATH, PROP_ZOOM, PROP_MAX_ZOOM, PROP_MIN_ZOOM, @@ -642,23 +671,30 @@ } } +#ifdef ENABLE_BALLOON /* most visual effects are hardcoded by now, but may be made */ /* available via properties later */ +#ifndef BALLOON_AREA_WIDTH #define BALLOON_AREA_WIDTH 290 +#endif +#ifndef BALLOON_AREA_HEIGHT #define BALLOON_AREA_HEIGHT 75 +#endif +#ifndef BALLOON_CORNER_RADIUS +#define BALLOON_CORNER_RADIUS 10 +#endif -#define BALLOON_CORNER_RADIUS 20 -#define BALLOON_BORDER (BALLOON_CORNER_RADIUS/4) +#define BALLOON_BORDER (BALLOON_CORNER_RADIUS/2) #define BALLOON_WIDTH (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER) #define BALLOON_HEIGHT (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER) #define BALLOON_TRANSPARENCY 0.8 #define POINTER_HEIGHT 20 #define POINTER_FOOT_WIDTH 20 #define POINTER_OFFSET (BALLOON_CORNER_RADIUS*3/4) -#define BALLOON_SHADOW 5 +#define BALLOON_SHADOW (BALLOON_CORNER_RADIUS/2) #define BALLOON_SHADOW_TRANSPARENCY 0.2 -#define CLOSE_BUTTON_RADIUS (BALLOON_CORNER_RADIUS/3) +#define CLOSE_BUTTON_RADIUS (BALLOON_CORNER_RADIUS) /* draw the bubble shape. this is used twice, once for the shape and once */ @@ -668,7 +704,8 @@ gboolean bottom, int px, int py, int px0, int px1) { cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS); - cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + BALLOON_CORNER_RADIUS, y0); + cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS, + BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2); if(!bottom) { /* insert top pointer */ cairo_line_to (cr, px1, y0); @@ -677,9 +714,11 @@ } cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0); - cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + BALLOON_CORNER_RADIUS); + cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS, + BALLOON_CORNER_RADIUS, -M_PI/2, 0); cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS); - cairo_curve_to (cr, x1, y1, x1, y1, x1 - BALLOON_CORNER_RADIUS, y1); + cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS, + BALLOON_CORNER_RADIUS, 0, M_PI/2); if(bottom) { /* insert bottom pointer */ cairo_line_to (cr, px0, y1); @@ -688,12 +727,12 @@ } cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1); - cairo_curve_to (cr, x0, y1, x0, y1, x0, y1 - BALLOON_CORNER_RADIUS); + cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS, + BALLOON_CORNER_RADIUS, M_PI/2, M_PI); cairo_close_path (cr); } -/* http://cairographics.org/samples/ */ static void osm_gps_map_draw_balloon_int (OsmGpsMap *map) { @@ -780,7 +819,7 @@ cairo_stroke(cr); cairo_set_source_rgba (cr, 1, 1, 1, 1.0); - cairo_set_line_width (cr, 3); + cairo_set_line_width (cr, BALLOON_CORNER_RADIUS/3.3); cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); cairo_move_to (cr, cx - crad/2, cy - crad/2); cairo_line_to (cr, cx + crad/2, cy + crad/2); @@ -801,6 +840,8 @@ priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data); } + cairo_destroy(cr); + gtk_widget_queue_draw_area (GTK_WIDGET(map), x0, y0, BALLOON_WIDTH, BALLOON_HEIGHT + POINTER_HEIGHT); @@ -840,6 +881,7 @@ (y > priv->balloon.rect.y) && (y < priv->balloon.rect.y + priv->balloon.rect.h)); } +#endif // ENABLE_BALLOON static void osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y) @@ -903,7 +945,9 @@ } else { - g_warning("Error creating tile download directory: %s", dl->folder); + g_warning("Error creating tile download directory: %s", + dl->folder); + perror("perror:"); } } @@ -1425,7 +1469,9 @@ osm_gps_map_print_tracks(map); osm_gps_map_draw_gps_point(map); osm_gps_map_print_images(map); +#ifdef ENABLE_BALLOON osm_gps_map_draw_balloon_int(map); +#endif //osm_gps_map_osd_speed(map, 1.5); osm_gps_map_purge_cache(map); @@ -1443,6 +1489,89 @@ priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map); } +#ifdef OSM_GPS_MAP_KEYS +static gboolean +on_window_key_press(GtkWidget *widget, + GdkEventKey *event, OsmGpsMapPrivate *priv) { + gboolean handled = FALSE; + int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP; + + // printf("key event with keyval %x\n", event->keyval); + + // the map handles some keys on its own ... + switch(event->keyval) { +#ifdef OSM_GPS_MAP_KEY_FULLSCREEN + case OSM_GPS_MAP_KEY_FULLSCREEN: { + GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget)); + if(!priv->fullscreen) + gtk_window_fullscreen(GTK_WINDOW(toplevel)); + else + gtk_window_unfullscreen(GTK_WINDOW(toplevel)); + + priv->fullscreen = !priv->fullscreen; + handled = TRUE; + } break; +#endif + +#ifdef OSM_GPS_MAP_KEY_ZOOMIN + case OSM_GPS_MAP_KEY_ZOOMIN: + osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1); + handled = TRUE; + break; +#endif + +#ifdef OSM_GPS_MAP_KEY_ZOOMOUT + case OSM_GPS_MAP_KEY_ZOOMOUT: + osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1); + handled = TRUE; + break; +#endif + +#ifdef OSM_GPS_MAP_KEY_UP + case OSM_GPS_MAP_KEY_UP: + priv->map_y -= step; + priv->center_coord_set = FALSE; + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + handled = TRUE; + break; +#endif + +#ifdef OSM_GPS_MAP_KEY_DOWN + case OSM_GPS_MAP_KEY_DOWN: + priv->map_y += step; + priv->center_coord_set = FALSE; + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + handled = TRUE; + break; +#endif + +#ifdef OSM_GPS_MAP_KEY_LEFT + case OSM_GPS_MAP_KEY_LEFT: + priv->map_x -= step; + priv->center_coord_set = FALSE; + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + handled = TRUE; + break; +#endif + +#ifdef OSM_GPS_MAP_KEY_RIGHT + case OSM_GPS_MAP_KEY_RIGHT: + priv->map_x += step; + priv->center_coord_set = FALSE; + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + handled = TRUE; + break; +#endif + + default: + // printf("unhandled key event with keyval %x\n", event->keyval); + break; + } + + return handled; +} +#endif + static void osm_gps_map_init (OsmGpsMap *object) { @@ -1457,9 +1586,19 @@ priv->gps = g_new0(coord_t, 1); priv->gps_valid = FALSE; +#ifdef ENABLE_BALLOON priv->balloon.coo = g_new0(coord_t, 1); priv->balloon.valid = FALSE; priv->balloon.cb = NULL; +#endif + +#ifdef ENABLE_OSD + priv->osd = NULL; +#endif + +#ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN + priv->fullscreen = FALSE; +#endif priv->tracks = NULL; priv->images = NULL; @@ -1505,23 +1644,13 @@ GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS); g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL); -} -#ifndef G_CHECKSUM_MD5 -/* simple hash algorithm hack if md5 is not present */ -static char *simple_hash(char *str) { - union { - char str[4]; - gulong val; - } hash = { .val = 0x55555555 }; - - while(*str) { - hash.str[(int)str & 3] ^= *str; - str++; - } - return g_strdup_printf("%08lX", hash.val); -} +#ifdef OSM_GPS_MAP_KEYS + // GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(object)); + g_signal_connect(G_OBJECT(object), "key_press_event", + G_CALLBACK(on_window_key_press), priv); #endif +} static GObject * osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties) @@ -1560,25 +1689,15 @@ } } - if (!priv->cache_dir_is_full_path) { -#ifdef G_CHECKSUM_MD5 - char *md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, priv->repo_uri, -1); -#else - char *md5 = simple_hash(priv->repo_uri); -#endif - - if (priv->cache_dir) { - char *old = priv->cache_dir; - //the new cachedir is the given cache dir + the md5 of the repo_uri - priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, md5); - g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir); - g_free(old); - } else { - //the new cachedir is the current dir + the md5 of the repo_uri - priv->cache_dir = g_strdup(md5); - } + const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source); + if(!fname) fname = "_unknown_"; - g_free(md5); + if (priv->cache_dir) { + char *old = priv->cache_dir; + //the new cachedir is the given cache dir + the md5 of the repo_uri + priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, fname); + g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir); + g_free(old); } inspect_map_uri(map); @@ -1619,7 +1738,20 @@ g_source_remove (priv->idle_map_redraw); g_free(priv->gps); + +#ifdef ENABLE_BALLOON g_free(priv->balloon.coo); +#endif + +#ifdef ENABLE_OSD + if(priv->osd) + priv->osd->free(priv->osd); + +#ifdef OSD_DOUBLE_BUFFER + if(priv->dbuf_pixmap) + g_object_unref (priv->dbuf_pixmap); +#endif +#endif G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object); } @@ -1689,9 +1821,6 @@ if ( g_value_get_string(value) ) priv->cache_dir = g_value_dup_string (value); break; - case PROP_TILE_CACHE_DIR_IS_FULL_PATH: - priv->cache_dir_is_full_path = g_value_get_boolean (value); - break; case PROP_ZOOM: priv->map_zoom = g_value_get_int (value); break; @@ -1761,9 +1890,6 @@ case PROP_TILE_CACHE_DIR: g_value_set_string(value, priv->cache_dir); break; - case PROP_TILE_CACHE_DIR_IS_FULL_PATH: - g_value_set_boolean(value, priv->cache_dir_is_full_path); - break; case PROP_ZOOM: g_value_set_int(value, priv->map_zoom); break; @@ -1836,6 +1962,7 @@ { OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget); +#ifdef ENABLE_BALLOON /* don't drag if the user clicked within the balloon */ if (osm_gps_map_in_balloon(priv, event->x + EXTRA_BORDER, @@ -1844,6 +1971,61 @@ priv->drag_counter = -1; return FALSE; } +#endif + +#ifdef ENABLE_OSD + /* pressed inside OSD control? */ + if(priv->osd) { + osd_button_t but = priv->osd->check(priv->osd, event->x, event->y); + if(but != OSD_NONE) + { + int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP; + priv->drag_counter = -1; + + switch(but) { + case OSD_UP: + priv->map_y -= step; + priv->center_coord_set = FALSE; + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + break; + + case OSD_DOWN: + priv->map_y += step; + priv->center_coord_set = FALSE; + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + break; + + case OSD_LEFT: + priv->map_x -= step; + priv->center_coord_set = FALSE; + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + break; + + case OSD_RIGHT: + priv->map_x += step; + priv->center_coord_set = FALSE; + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + break; + + case OSD_IN: + osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1); + break; + + case OSD_OUT: + osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1); + break; + + default: + /* all custom buttons are forwarded to the application */ + if(priv->osd->cb) + priv->osd->cb(but, priv->osd->data); + break; + } + + return FALSE; + } + } +#endif priv->drag_counter = 0; priv->drag_start_mouse_x = (int) event->x; @@ -1859,6 +2041,7 @@ { OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget); +#ifdef ENABLE_BALLOON /* released inside the balloon? */ if (osm_gps_map_in_balloon(priv, event->x + EXTRA_BORDER, @@ -1867,11 +2050,8 @@ osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget), event->x - priv->balloon.rect.x + EXTRA_BORDER, event->y - priv->balloon.rect.y + EXTRA_BORDER); - return FALSE; } - - if (priv->drag_counter < 0) - return FALSE; +#endif if (priv->dragging) { @@ -1896,6 +2076,9 @@ } static gboolean +osm_gps_map_expose (GtkWidget *widget, GdkEventExpose *event); + +static gboolean osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion *event) { int x, y; @@ -1924,6 +2107,14 @@ if (priv->drag_counter < 6) return FALSE; +#ifdef OSM_GPS_MAP_REFRESH + /* reduce update frequency on maemo to keep screen update fluid */ + static guint32 last_time = 0; + + if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE; + last_time = event->time; +#endif + priv->dragging = TRUE; if (priv->map_auto_center) @@ -1932,55 +2123,7 @@ priv->drag_mouse_dx = x - priv->drag_start_mouse_x; priv->drag_mouse_dy = y - priv->drag_start_mouse_y; - gdk_draw_drawable ( - widget->window, - widget->style->fg_gc[GTK_WIDGET_STATE (widget)], - priv->pixmap, - 0,0, - priv->drag_mouse_dx - EXTRA_BORDER, priv->drag_mouse_dy - EXTRA_BORDER, - -1,-1); - - //Paint white outside of the map if dragging. Its less - //ugly than painting the corrupted map - if(priv->drag_mouse_dx>EXTRA_BORDER) { - gdk_draw_rectangle ( - widget->window, - widget->style->white_gc, - TRUE, - 0, 0, - priv->drag_mouse_dx - EXTRA_BORDER, - widget->allocation.height); - } - else if (-priv->drag_mouse_dx > EXTRA_BORDER) - { - gdk_draw_rectangle ( - widget->window, - widget->style->white_gc, - TRUE, - priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0, - -priv->drag_mouse_dx - EXTRA_BORDER, - widget->allocation.height); - } - - if (priv->drag_mouse_dy>EXTRA_BORDER) { - gdk_draw_rectangle ( - widget->window, - widget->style->white_gc, - TRUE, - 0, 0, - widget->allocation.width, - priv->drag_mouse_dy - EXTRA_BORDER); - } - else if (-priv->drag_mouse_dy > EXTRA_BORDER) - { - gdk_draw_rectangle ( - widget->window, - widget->style->white_gc, - TRUE, - 0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER, - widget->allocation.width, - -priv->drag_mouse_dy - EXTRA_BORDER); - } + osm_gps_map_expose (widget, NULL); return FALSE; } @@ -1995,10 +2138,28 @@ g_object_unref (priv->pixmap); priv->pixmap = gdk_pixmap_new ( - widget->window, - widget->allocation.width + EXTRA_BORDER * 2, - widget->allocation.height + EXTRA_BORDER * 2, - -1); + widget->window, + widget->allocation.width + EXTRA_BORDER * 2, + widget->allocation.height + EXTRA_BORDER * 2, + -1); + +#ifdef ENABLE_OSD + +#ifdef OSD_DOUBLE_BUFFER + if (priv->dbuf_pixmap) + g_object_unref (priv->dbuf_pixmap); + + priv->dbuf_pixmap = gdk_pixmap_new ( + widget->window, + widget->allocation.width, + widget->allocation.height, + -1); +#endif + + /* the osd needs some references to map internal objects */ + if(priv->osd) + priv->osd->widget = widget; +#endif /* and gc, used for clipping (I think......) */ if(priv->gc_map) @@ -2016,15 +2177,84 @@ { OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget); - gdk_draw_drawable ( - widget->window, +#if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER) + GdkDrawable *drawable = priv->dbuf_pixmap; +#else + GdkDrawable *drawable = widget->window; +#endif + + if (!priv->dragging) + { + gdk_draw_drawable (drawable, + widget->style->fg_gc[GTK_WIDGET_STATE (widget)], + priv->pixmap, + event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER, + event->area.x, event->area.y, + event->area.width, event->area.height); + } + else + { + gdk_draw_drawable (drawable, + widget->style->fg_gc[GTK_WIDGET_STATE (widget)], + priv->pixmap, + 0,0, + priv->drag_mouse_dx - EXTRA_BORDER, + priv->drag_mouse_dy - EXTRA_BORDER, + -1,-1); + + //Paint white outside of the map if dragging. Its less + //ugly than painting the corrupted map + if(priv->drag_mouse_dx>EXTRA_BORDER) { + gdk_draw_rectangle (drawable, + widget->style->white_gc, + TRUE, + 0, 0, + priv->drag_mouse_dx - EXTRA_BORDER, + widget->allocation.height); + } + else if (-priv->drag_mouse_dx > EXTRA_BORDER) + { + gdk_draw_rectangle (drawable, + widget->style->white_gc, + TRUE, + priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0, + -priv->drag_mouse_dx - EXTRA_BORDER, + widget->allocation.height); + } + + if (priv->drag_mouse_dy>EXTRA_BORDER) { + gdk_draw_rectangle (drawable, + widget->style->white_gc, + TRUE, + 0, 0, + widget->allocation.width, + priv->drag_mouse_dy - EXTRA_BORDER); + } + else if (-priv->drag_mouse_dy > EXTRA_BORDER) + { + gdk_draw_rectangle (drawable, + widget->style->white_gc, + TRUE, + 0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER, + widget->allocation.width, + -priv->drag_mouse_dy - EXTRA_BORDER); + } + } + +#ifdef ENABLE_OSD + /* draw new OSD */ + if(priv->osd) + priv->osd->draw (priv->osd, drawable); + +#ifdef OSD_DOUBLE_BUFFER + gdk_draw_drawable (widget->window, widget->style->fg_gc[GTK_WIDGET_STATE (widget)], - priv->pixmap, - event->area.x + EXTRA_BORDER, - event->area.y + EXTRA_BORDER, - event->area.x, event->area.y, - event->area.width, event->area.height); + priv->dbuf_pixmap, + 0,0,0,0,-1,-1); +#endif +#endif + return FALSE; } @@ -2106,14 +2336,6 @@ G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (object_class, - PROP_TILE_CACHE_DIR_IS_FULL_PATH, - g_param_spec_boolean ("tile-cache-is-full-path", - "tile cache is full path", - "if true, the path passed to tile-cache is interpreted as the full cache path", - FALSE, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property (object_class, PROP_ZOOM, g_param_spec_int ("zoom", "zoom", @@ -2210,7 +2432,7 @@ "radius of the gps point inner circle", 0, /* minimum property value */ G_MAXINT, /* maximum property value */ - 5, + 10, G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); g_object_class_install_property (object_class, @@ -2253,8 +2475,8 @@ return "OpenStreetMap"; case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER: return "OpenStreetMap Renderer"; - case OSM_GPS_MAP_SOURCE_OPENAERIALMAP: - return "OpenAerialMap"; + case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP: + return "OpenCycleMap"; case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE: return "Maps-For-Free"; case OSM_GPS_MAP_SOURCE_GOOGLE_STREET: @@ -2296,8 +2518,8 @@ return OSM_REPO_URI; case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER: return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png"; - case OSM_GPS_MAP_SOURCE_OPENAERIALMAP: - return "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z/#X/#Y.jpg"; + case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP: + return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png"; case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE: return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg"; case OSM_GPS_MAP_SOURCE_GOOGLE_STREET: @@ -2335,8 +2557,8 @@ case OSM_GPS_MAP_SOURCE_NULL: case OSM_GPS_MAP_SOURCE_OPENSTREETMAP: case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER: + case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP: return "png"; - case OSM_GPS_MAP_SOURCE_OPENAERIALMAP: case OSM_GPS_MAP_SOURCE_GOOGLE_STREET: case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID: case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET: @@ -2370,7 +2592,7 @@ case OSM_GPS_MAP_SOURCE_OPENSTREETMAP: return OSM_MAX_ZOOM; case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER: - case OSM_GPS_MAP_SOURCE_OPENAERIALMAP: + case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP: case OSM_GPS_MAP_SOURCE_GOOGLE_STREET: case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID: case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET: @@ -2604,67 +2826,6 @@ } void -osm_gps_map_osd_speed (OsmGpsMap *map, float speed) -{ - OsmGpsMapPrivate *priv; - - PangoContext *context = NULL; - PangoLayout *layout = NULL; - PangoFontDescription *desc = NULL; - - GdkColor color; - GdkGC *gc; - - gchar *buffer; - //static int x = 10, y = 10; - static int width = 0, height = 0; - - g_return_if_fail (OSM_IS_GPS_MAP (map)); - priv = map->priv; - - buffer = g_strdup_printf("%.0f", speed); - - /* pango initialisation */ - context = gtk_widget_get_pango_context (GTK_WIDGET(map)); - layout = pango_layout_new (context); - desc = pango_font_description_new(); - - pango_font_description_set_size (desc, 40 * PANGO_SCALE); - pango_layout_set_font_description (layout, desc); - pango_layout_set_text (layout, buffer, strlen(buffer)); - - gc = gdk_gc_new (GTK_WIDGET(map)->window); - - color.red = (0 > 50) ? 0xffff : 0; - color.green = 0; - color.blue = 0; - - gdk_gc_set_rgb_fg_color (gc, &color); - - /* faster / less flicker alternative:*/ - gdk_draw_drawable ( - GTK_WIDGET(map)->window, - GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(map)], - priv->pixmap, - 0,0, - 0,0, - width+10,width+10); - - gdk_draw_layout(GTK_WIDGET(map)->window, - gc, - 0, 0, - layout); - - /* set width and height */ - pango_layout_get_pixel_size(layout, &width, &height); - - g_free(buffer); - pango_font_description_free (desc); - g_object_unref (layout); - g_object_unref (gc); -} - -void osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading) { int pixel_x, pixel_y; @@ -2796,6 +2957,7 @@ return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon); } +#ifdef ENABLE_BALLOON void osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude, OsmGpsMapBalloonCallback cb, gpointer data) @@ -2831,3 +2993,30 @@ osm_gps_map_map_redraw_idle(map); } +#endif + +#ifdef ENABLE_OSD + +void +osm_gps_map_redraw (OsmGpsMap *map) +{ + osm_gps_map_map_redraw_idle(map); +} + +osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) { + g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL); + return map->priv->osd; +} + +void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) { + OsmGpsMapPrivate *priv; + + g_return_if_fail (OSM_IS_GPS_MAP (map)); + + priv = map->priv; + g_return_if_fail (!priv->osd); + + priv->osd = osd; +} + +#endif