--- trunk/src/osm-gps-map.c 2009/08/13 12:01:52 55 +++ trunk/src/osm-gps-map.c 2009/09/07 06:16:06 97 @@ -49,6 +49,25 @@ #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 + +#define USER_AGENT "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11" + struct _OsmGpsMapPrivate { GHashTable *tile_queue; @@ -78,8 +97,8 @@ char *proxy_uri; //where downloaded tiles are cached + char *tile_dir; 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 @@ -96,8 +115,32 @@ gboolean show_trip_history; GSList *trip_history; coord_t *gps; + float gps_heading; gboolean gps_valid; +#ifdef ENABLE_BALLOON + //a balloon with additional info + struct { + coord_t *coo; + gboolean valid; + OsmGpsMapRect_t rect; + 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; @@ -149,7 +192,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, @@ -310,6 +352,8 @@ inspect_map_uri(OsmGpsMap *map) { OsmGpsMapPrivate *priv = map->priv; + priv->uri_format = 0; + priv->the_google = FALSE; if (g_strrstr(priv->repo_uri, URI_MARKER_X)) priv->uri_format |= URI_HAS_X; @@ -546,8 +590,7 @@ int x, y; int r = priv->ui_gps_point_inner_radius; int r2 = priv->ui_gps_point_outer_radius; - // int lw = priv->ui_gps_track_width; - int mr = MAX(r,r2); + int mr = MAX(3*r,r2); map_x0 = priv->map_x - EXTRA_BORDER; map_y0 = priv->map_y - EXTRA_BORDER; @@ -578,6 +621,22 @@ // draw ball gradient if (r > 0) { + // draw direction arrow + if(!isnan(priv->gps_heading)) + { + cairo_move_to (cr, x-r*cos(priv->gps_heading), y-r*sin(priv->gps_heading)); + cairo_line_to (cr, x+3*r*sin(priv->gps_heading), y-3*r*cos(priv->gps_heading)); + cairo_line_to (cr, x+r*cos(priv->gps_heading), y+r*sin(priv->gps_heading)); + cairo_close_path (cr); + + cairo_set_source_rgba (cr, 0.3, 0.3, 1.0, 0.5); + cairo_fill_preserve (cr); + + cairo_set_line_width (cr, 1.0); + cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5); + cairo_stroke(cr); + } + pat = cairo_pattern_create_radial (x-(r/5), y-(r/5), (r/5), x, y, r); cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1.0); cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 1, 1.0); @@ -591,7 +650,7 @@ cairo_arc (cr, x, y, r, 0, 2 * M_PI); cairo_stroke(cr); } - + cairo_destroy(cr); gtk_widget_queue_draw_area (GTK_WIDGET(map), x-mr, @@ -631,7 +690,219 @@ (mr*2)+lw+lw); #endif } +} + +#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_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 (BALLOON_CORNER_RADIUS/2) +#define BALLOON_SHADOW_TRANSPARENCY 0.2 + +#define CLOSE_BUTTON_RADIUS (BALLOON_CORNER_RADIUS) + + +/* draw the bubble shape. this is used twice, once for the shape and once */ +/* for the shadow */ +static void +osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1, + gboolean bottom, int px, int py, int px0, int px1) { + + cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS); + 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); + cairo_line_to (cr, px, py); + cairo_line_to (cr, px0, y0); + } + + cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0); + 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_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); + cairo_line_to (cr, px, py); + cairo_line_to (cr, px1, y1); + } + + cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1); + cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS, + BALLOON_CORNER_RADIUS, M_PI/2, M_PI); + + cairo_close_path (cr); +} + +static void +osm_gps_map_draw_balloon_int (OsmGpsMap *map) +{ + OsmGpsMapPrivate *priv = map->priv; + + if (priv->balloon.valid) { + + /* ------- convert given coordinate into screen position --------- */ + int x0 = lon2pixel(priv->map_zoom, priv->balloon.coo->rlon) - + priv->map_x + EXTRA_BORDER; + int y0 = lat2pixel(priv->map_zoom, priv->balloon.coo->rlat) - + priv->map_y + EXTRA_BORDER; + + /* check position of this relative to screen center to determine */ + /* pointer direction ... */ + int pointer_x = x0, pointer_x0, pointer_x1; + int pointer_y = y0; + + /* ... and calculate position */ + if((x0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.width/2) { + x0 -= BALLOON_WIDTH - POINTER_OFFSET; + pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET); + pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH; + } else { + x0 -= POINTER_OFFSET; + pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET); + pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH; + } + + gboolean bottom = FALSE; + if((y0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.height/2) { + bottom = TRUE; + y0 -= BALLOON_HEIGHT + POINTER_HEIGHT; + } else + y0 += POINTER_HEIGHT; + + /* calculate bottom/right of box */ + int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT; + + /* save balloon screen coordinates for later use */ + priv->balloon.rect.x = x0 + BALLOON_BORDER; + priv->balloon.rect.y = y0 + BALLOON_BORDER; + priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER; + priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER; + +#ifdef USE_CAIRO + cairo_t *cr = gdk_cairo_create(priv->pixmap); + + /* --------- draw shadow --------------- */ + osm_gps_map_draw_balloon_shape (cr, + x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW, + x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW, + bottom, pointer_x, pointer_y, + pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW); + + cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY); + cairo_fill_preserve (cr); + cairo_set_source_rgba (cr, 1, 0, 0, 1.0); + cairo_set_line_width (cr, 0); + cairo_stroke (cr); + + /* --------- draw main shape ----------- */ + osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1, + bottom, pointer_x, pointer_y, pointer_x0, pointer_x1); + + cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY); + cairo_fill_preserve (cr); + cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY); + cairo_set_line_width (cr, 1); + cairo_stroke (cr); + + + /* ---------- draw close button --------- */ + + int cx = x1 - BALLOON_BORDER - CLOSE_BUTTON_RADIUS; + int cy = y0 + BALLOON_BORDER + CLOSE_BUTTON_RADIUS; + int crad = CLOSE_BUTTON_RADIUS; + + cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI); + cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0); + cairo_fill_preserve (cr); + cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0); + cairo_set_line_width (cr, 2); + cairo_stroke(cr); + + cairo_set_source_rgba (cr, 1, 1, 1, 1.0); + 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); + cairo_stroke (cr); + cairo_move_to (cr, cx + crad/2, cy - crad/2); + cairo_line_to (cr, cx - crad/2, cy + crad/2); + cairo_stroke (cr); + + if (priv->balloon.cb) { + /* clip in case application tries to draw in */ + /* exceed of the balloon */ + cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y, + priv->balloon.rect.w, priv->balloon.rect.h); + cairo_clip (cr); + cairo_new_path (cr); /* current path is not + consumed by cairo_clip() */ + + 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); +#else +#warning "Balloon display lacks a non-cairo implementation!" +#endif + } +} + +/* the user clicked into the balloons main area. handle this */ +static void +osm_gps_map_handle_balloon_click(OsmGpsMap *map, gint x, gint y) +{ + OsmGpsMapPrivate *priv = map->priv; + + if (!priv->balloon.valid) + return; + + /* check if the close button was clicked */ + if ((x > priv->balloon.rect.w - 2*CLOSE_BUTTON_RADIUS) && + (x < priv->balloon.rect.w) && + (y > 0) && (y < 2*CLOSE_BUTTON_RADIUS)) { + + priv->balloon.valid = FALSE; + osm_gps_map_map_redraw_idle(map); + } +} + +/* return true if balloon is being displayed and if */ +/* the given coordinate is within this balloon */ +static gboolean +osm_gps_map_in_balloon(OsmGpsMapPrivate *priv, gint x, gint y) +{ + return (priv->balloon.valid && + (x > priv->balloon.rect.x) && + (x < priv->balloon.rect.x + priv->balloon.rect.w) && + (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) @@ -695,7 +966,9 @@ } else { - g_warning("Error creating tile download directory: %s", dl->folder); + g_warning("Error creating tile download directory: %s", + dl->folder); + perror("perror:"); } } @@ -842,6 +1115,11 @@ } } +#ifdef LIBSOUP22 + soup_message_headers_append(msg->request_headers, + "User-Agent", USER_AGENT); +#endif + g_hash_table_insert (priv->tile_queue, dl->uri, msg); soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl); } else { @@ -1194,6 +1472,12 @@ priv->idle_map_redraw = 0; + /* don't redraw the entire map while the OSD is doing */ + /* some animation or the like. This is to keep the animation */ + /* fluid */ + if (priv->osd->busy(priv->osd)) + return FALSE; + /* the motion_notify handler uses priv->pixmap to redraw the area; if we * change it while we are dragging, we will end up showing it in the wrong * place. This could be fixed by carefully recompute the coordinates, but @@ -1217,6 +1501,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); @@ -1234,6 +1521,86 @@ 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; + + // 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: + break; + } + + return handled; +} +#endif + static void osm_gps_map_init (OsmGpsMap *object) { @@ -1247,6 +1614,21 @@ priv->trip_history = NULL; priv->gps = g_new0(coord_t, 1); priv->gps_valid = FALSE; + priv->gps_heading = OSM_GPS_MAP_INVALID; + +#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; @@ -1264,12 +1646,12 @@ #ifndef LIBSOUP22 //Change naumber of concurrent connections option? - priv->soup_session = soup_session_async_new_with_options( - SOUP_SESSION_USER_AGENT, - "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11", - NULL); + priv->soup_session = + soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT, + USER_AGENT, NULL); #else - /* libsoup-2.2 seems not to be able to set the user agent */ + /* libsoup-2.2 has no special way to set the user agent, so we */ + /* set it seperately as an extra header field for each reuest */ priv->soup_session = soup_session_async_new(); #endif @@ -1292,37 +1674,17 @@ 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 + 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) -{ - GObject *object; - OsmGpsMapPrivate *priv; - OsmGpsMap *map; +static void +osm_gps_map_setup(OsmGpsMapPrivate *priv) { const char *uri; - //Always chain up to the parent constructor - object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties); - map = OSM_GPS_MAP(object); - priv = OSM_GPS_MAP_PRIVATE(object); - //user can specify a map source ID, or a repo URI as the map source uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL); if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) { @@ -1347,28 +1709,26 @@ } } - 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 + const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source); + if(!fname) fname = "_unknown_"; - 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); - } - - g_free(md5); + if (priv->tile_dir) { + //the new cachedir is the given cache dir + the friendly name of the repo_uri + priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname); + g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir); } +} - inspect_map_uri(map); +static GObject * +osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties) +{ + //Always chain up to the parent constructor + GObject *object = + G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties); + + osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object)); + + inspect_map_uri(OSM_GPS_MAP(object)); return object; } @@ -1405,6 +1765,22 @@ if (priv->idle_map_redraw != 0) 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); } @@ -1414,7 +1790,12 @@ OsmGpsMap *map = OSM_GPS_MAP(object); OsmGpsMapPrivate *priv = map->priv; - g_free(priv->cache_dir); + if(priv->tile_dir) + g_free(priv->tile_dir); + + if(priv->cache_dir) + g_free(priv->cache_dir); + g_free(priv->repo_uri); g_free(priv->image_format); @@ -1471,10 +1852,7 @@ break; case PROP_TILE_CACHE_DIR: 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); + priv->tile_dir = g_value_dup_string (value); break; case PROP_ZOOM: priv->map_zoom = g_value_get_int (value); @@ -1502,9 +1880,31 @@ case PROP_GPS_POINT_R2: priv->ui_gps_point_outer_radius = g_value_get_int (value); break; - case PROP_MAP_SOURCE: + case PROP_MAP_SOURCE: { + gint old = priv->map_source; priv->map_source = g_value_get_int (value); - break; + if(old >= OSM_GPS_MAP_SOURCE_NULL && + priv->map_source != old && + priv->map_source >= OSM_GPS_MAP_SOURCE_NULL && + priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) { + + /* we now have to switch the entire map */ + + /* flush the ram cache */ + g_hash_table_remove_all(priv->tile_cache); + + osm_gps_map_setup(priv); + + inspect_map_uri(map); + + /* adjust zoom if necessary */ + if(priv->map_zoom > priv->max_zoom) + osm_gps_map_set_zoom(map, priv->max_zoom); + + if(priv->map_zoom < priv->min_zoom) + osm_gps_map_set_zoom(map, priv->min_zoom); + + } } break; case PROP_IMAGE_FORMAT: priv->image_format = g_value_dup_string (value); break; @@ -1545,9 +1945,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; @@ -1620,6 +2017,75 @@ { 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, + event->y + EXTRA_BORDER)) + { + 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; + g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL); + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + break; + + case OSD_DOWN: + priv->map_y += step; + priv->center_coord_set = FALSE; + g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL); + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + break; + + case OSD_LEFT: + priv->map_x -= step; + priv->center_coord_set = FALSE; + g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL); + osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); + break; + + case OSD_RIGHT: + priv->map_x += step; + priv->center_coord_set = FALSE; + g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL); + 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; priv->drag_start_mouse_y = (int) event->y; @@ -1634,6 +2100,18 @@ { 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, + event->y + EXTRA_BORDER)) + { + 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); + } +#endif + if (priv->dragging) { priv->dragging = FALSE; @@ -1651,12 +2129,15 @@ priv->drag_mouse_dx = 0; priv->drag_mouse_dy = 0; - priv->drag_counter = 0; + priv->drag_counter = -1; return FALSE; } static gboolean +osm_gps_map_expose (GtkWidget *widget, GdkEventExpose *event); + +static gboolean osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion *event) { int x, y; @@ -1676,12 +2157,23 @@ if (!(state & GDK_BUTTON1_MASK)) return FALSE; + if (priv->drag_counter < 0) + return FALSE; + priv->drag_counter++; // we havent dragged more than 6 pixels 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) @@ -1690,55 +2182,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; } @@ -1753,10 +2197,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) @@ -1774,14 +2236,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 && event) + { + 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; } @@ -1863,14 +2395,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", @@ -1967,7 +2491,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, @@ -1988,7 +2512,7 @@ -1, /* minimum property value */ G_MAXINT, /* maximum property value */ -1, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); g_object_class_install_property (object_class, PROP_IMAGE_FORMAT, @@ -2007,11 +2531,13 @@ case OSM_GPS_MAP_SOURCE_NULL: return "None"; case OSM_GPS_MAP_SOURCE_OPENSTREETMAP: - return "OpenStreetMap"; + return "OpenStreetMap I"; case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER: - return "OpenStreetMap Renderer"; - case OSM_GPS_MAP_SOURCE_OPENAERIALMAP: - return "OpenAerialMap"; + return "OpenStreetMap II"; + case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP: + return "OpenCycleMap"; + case OSM_GPS_MAP_SOURCE_OSMC_TRAILS: + return "OSMC Trails"; case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE: return "Maps-For-Free"; case OSM_GPS_MAP_SOURCE_GOOGLE_STREET: @@ -2053,8 +2579,10 @@ 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_OSMC_TRAILS: + return "http://topo.geofabrik.de/trails/#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: @@ -2092,9 +2620,12 @@ 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: + case OSM_GPS_MAP_SOURCE_OSMC_TRAILS: return "png"; - case OSM_GPS_MAP_SOURCE_OPENAERIALMAP: + case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE: case OSM_GPS_MAP_SOURCE_GOOGLE_STREET: + case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE: case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID: case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET: case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE: @@ -2102,8 +2633,6 @@ case OSM_GPS_MAP_SOURCE_YAHOO_STREET: case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE: case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID: - case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE: - case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE: return "jpg"; default: return "bin"; @@ -2127,7 +2656,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: @@ -2137,6 +2666,8 @@ case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE: case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID: return 17; + case OSM_GPS_MAP_SOURCE_OSMC_TRAILS: + return 15; case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE: return 11; case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE: @@ -2361,67 +2892,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; @@ -2433,6 +2903,7 @@ priv->gps->rlat = deg2rad(latitude); priv->gps->rlon = deg2rad(longitude); priv->gps_valid = TRUE; + priv->gps_heading = deg2rad(heading); // pixel_x,y, offsets pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon); @@ -2547,9 +3018,77 @@ { OsmGpsMapPrivate *priv; - g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_NAN); + g_return_val_if_fail (OSM_IS_GPS_MAP (map), OSM_GPS_MAP_INVALID); priv = map->priv; 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) +{ + OsmGpsMapPrivate *priv; + + /* remove and previously installed balloon */ + osm_gps_map_clear_balloon (map); + + g_return_if_fail (OSM_IS_GPS_MAP (map)); + priv = map->priv; + + priv->balloon.coo->rlat = deg2rad(latitude); + priv->balloon.coo->rlon = deg2rad(longitude); + priv->balloon.valid = TRUE; + + priv->balloon.cb = cb; + priv->balloon.data = data; + + // this redraws the map + osm_gps_map_map_redraw_idle(map); +} + +void +osm_gps_map_clear_balloon (OsmGpsMap *map) +{ + OsmGpsMapPrivate *priv; + + g_return_if_fail (OSM_IS_GPS_MAP (map)); + priv = map->priv; + + priv->balloon.valid = FALSE; + + 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; +} + +void +osm_gps_map_repaint (OsmGpsMap *map) { + osm_gps_map_expose (GTK_WIDGET(map), NULL); +} + +#endif