--- trunk/src/osm-gps-map.c 2009/08/18 14:32:45 61 +++ trunk/src/osm-gps-map.c 2009/12/12 12:54:37 238 @@ -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,28 +115,21 @@ gboolean show_trip_history; GSList *trip_history; coord_t *gps; + float gps_heading; gboolean gps_valid; - //a balloon with additional info - struct { - coord_t *coo; - gboolean valid; - OsmGpsMapRect_t rect; - OsmGpsMapBalloonCallback cb; - gpointer data; - } balloon; - #ifdef ENABLE_OSD - //the osd controls - struct { - GdkPixmap *backup; - gint backup_x, backup_y; - - - // GdkPixbuf *pixbuf; - } 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; @@ -137,6 +149,7 @@ int drag_start_mouse_y; int drag_start_map_x; int drag_start_map_y; + guint drag_expose; //for customizing the redering of the gps track int ui_gps_track_width; @@ -145,7 +158,6 @@ guint is_disposed : 1; guint dragging : 1; - guint center_coord_set : 1; }; #define OSM_GPS_MAP_PRIVATE(o) (OSM_GPS_MAP (o)->priv) @@ -169,7 +181,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, @@ -330,6 +341,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; @@ -566,8 +579,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; @@ -598,6 +610,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); @@ -611,7 +639,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, @@ -653,206 +681,6 @@ } } -/* most visual effects are hardcoded by now, but may be made */ -/* available via properties later */ -#define BALLOON_AREA_WIDTH 290 -#define BALLOON_AREA_HEIGHT 75 - -#define BALLOON_CORNER_RADIUS 20 -#define BALLOON_BORDER (BALLOON_CORNER_RADIUS/4) -#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_TRANSPARENCY 0.2 - -#define CLOSE_BUTTON_RADIUS (BALLOON_CORNER_RADIUS/3) - - -/* 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_curve_to (cr, x0 , y0, x0 , y0, x0 + BALLOON_CORNER_RADIUS, y0); - 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_curve_to (cr, x1, y0, x1, y0, x1, y0 + BALLOON_CORNER_RADIUS); - cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS); - cairo_curve_to (cr, x1, y1, x1, y1, x1 - BALLOON_CORNER_RADIUS, y1); - 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_curve_to (cr, x0, y1, x0, y1, x0, y1 - BALLOON_CORNER_RADIUS); - - 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, 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)); -} - static void osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y) { @@ -915,7 +743,9 @@ } else { - g_warning("Error creating tile download directory: %s", dl->folder); + g_warning("Error creating tile download directory: %s", + dl->folder); + perror("perror:"); } } @@ -1062,6 +892,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 { @@ -1407,153 +1242,32 @@ g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv); } -#ifdef ENABLE_OSD -/* position and extent of bounding box */ -#define OSD_X (10) -#define OSD_Y (10) -#define OSD_W (80+5) -#define OSD_H (120+5) - -static void -osm_gps_map_draw_osd_controls (OsmGpsMap *map, gint xoffset, gint yoffset) -{ - /* xyz */ - OsmGpsMapPrivate *priv = map->priv; - - /* backup previous contents */ - if(!priv->osd.backup) - priv->osd.backup = gdk_pixmap_new(priv->pixmap, OSD_W, OSD_H, -1); - - gint x = OSD_X + EXTRA_BORDER + xoffset; - gint y = OSD_Y + EXTRA_BORDER + yoffset; - - /* create backup of background */ - gdk_draw_drawable(priv->osd.backup, - GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))], - priv->pixmap, x, y, 0, 0, OSD_W, OSD_H); - priv->osd.backup_x = x; - priv->osd.backup_y = y; - -#if 0 - /* create pixbuf for osd */ - if(!priv->osd.pixbuf) - priv->osd.pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, - TRUE, 8, OSD_W, OSD_H); - cairo_surface_t *surface = - cairo_image_surface_create(CAIRO_FORMAT_ARGB32, OSD_W, OSD_H); - - /* fill with transparency */ - { - cairo_t *cr = cairo_create(surface); - cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); - cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0); - cairo_paint(cr); - cairo_destroy(cr); - } -#endif - - -#ifdef USE_CAIRO - // cairo_t *cr = cairo_create(surface); - cairo_t *cr = gdk_cairo_create(priv->pixmap); - -#define RAD 40 -#define TIP 35 -#define LEN 15 -#define WID 15 - - /* --------- the direction "pad" shape and shadow ----------- */ - cairo_arc (cr, x+RAD+5, y+RAD+5, RAD, 0, 2 * M_PI); - cairo_set_source_rgba (cr, 0, 0, 0, 0.2); - cairo_fill (cr); - cairo_stroke (cr); - - cairo_arc (cr, x+RAD, y+RAD, RAD, 0, 2 * M_PI); - cairo_set_source_rgb (cr, 1, 1, 1); - cairo_fill_preserve (cr); - cairo_set_source_rgb (cr, 0.6, 0.6, 1); - cairo_set_line_width (cr, 1); - cairo_stroke (cr); - - /* ---------- the zoom pad shape and shadow -------------- */ - cairo_move_to (cr, x, y+2*RAD); - cairo_line_to (cr, x+2*RAD-10, y+2*RAD); - cairo_curve_to (cr, x+2*RAD, y+2*RAD, - x+2*RAD, y+3*RAD, - x+2*RAD-10, y+3*RAD); - cairo_close_path (cr); - - - cairo_set_source_rgba (cr, 1, 1, 1, 1.0); - cairo_fill (cr); - cairo_stroke (cr); - - - /* left arrow/triangle */ - cairo_move_to (cr, x+RAD-TIP, y+RAD); - cairo_rel_line_to (cr, +LEN, -WID/2); - cairo_rel_line_to (cr, 0, +WID); - cairo_rel_line_to (cr, -LEN, -WID/2); - cairo_close_path (cr); - - /* right arrow/triangle */ - cairo_move_to (cr, x+RAD+TIP, y+RAD); - cairo_rel_line_to (cr, -LEN, -WID/2); - cairo_rel_line_to (cr, 0, +WID); - cairo_rel_line_to (cr, +LEN, -WID/2); - cairo_close_path (cr); - - /* top arrow/triangle */ - cairo_move_to (cr, x+RAD, y+RAD-TIP); - cairo_rel_line_to (cr, -WID/2, +LEN); - cairo_rel_line_to (cr, +WID, 0); - cairo_rel_line_to (cr, -WID/2, -LEN); - cairo_close_path (cr); - - /* bottom arrow/triangle */ - cairo_move_to (cr, x+RAD, y+RAD+TIP); - cairo_rel_line_to (cr, -WID/2, -LEN); - cairo_rel_line_to (cr, +WID, 0); - cairo_rel_line_to (cr, -WID/2, +LEN); - cairo_close_path (cr); - - cairo_set_source_rgb (cr, 0.6, 0.6, 1); - cairo_fill_preserve (cr); - cairo_set_line_width (cr, 0); - cairo_set_source_rgba (cr, 0, 0, 0, 1); - cairo_stroke (cr); - - - cairo_destroy(cr); - -#else -#warning "OSD control display lacks a non-cairo implementation!" -#endif -} - -static void -osm_gps_map_osd_restore (OsmGpsMap *map) +static gboolean +osm_gps_map_map_redraw (OsmGpsMap *map) { OsmGpsMapPrivate *priv = map->priv; - /* restore backup of previous contents */ - if(priv->osd.backup) { - /* create backup of background */ - gdk_draw_drawable(priv->pixmap, - GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))], - priv->osd.backup, 0, 0, - priv->osd.backup_x, priv->osd.backup_y, OSD_W, OSD_H); + /* on diablo the map comes up at 1x1 pixel size and */ + /* isn't really usable. we'll just ignore this ... */ + if((GTK_WIDGET(map)->allocation.width < 2) || + (GTK_WIDGET(map)->allocation.height < 2)) { + printf("not a useful sized map yet ...\n"); + return FALSE; } -} -#endif + priv->idle_map_redraw = 0; -static gboolean -osm_gps_map_map_redraw (OsmGpsMap *map) -{ - OsmGpsMapPrivate *priv = map->priv; +#ifdef ENABLE_OSD + /* 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; +#endif - priv->idle_map_redraw = 0; +#ifdef DRAG_DEBUG + printf("trying redraw\n"); +#endif /* 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 @@ -1562,11 +1276,14 @@ if (priv->dragging) return FALSE; + /* undo all offsets that may have happened when dragging */ + priv->drag_mouse_dx = 0; + priv->drag_mouse_dy = 0; + priv->redraw_cycle++; /* draw white background to initialise pixmap */ - gdk_draw_rectangle ( - priv->pixmap, + gdk_draw_rectangle (priv->pixmap, GTK_WIDGET(map)->style->white_gc, TRUE, 0, 0, @@ -1578,12 +1295,13 @@ osm_gps_map_print_tracks(map); osm_gps_map_draw_gps_point(map); osm_gps_map_print_images(map); - osm_gps_map_draw_balloon_int(map); + #ifdef ENABLE_OSD - osm_gps_map_draw_osd_controls(map, 0, 0); + /* OSD may contain a coordinate/scale, so we may have to re-render it */ + if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget)) + priv->osd->render (priv->osd); #endif - //osm_gps_map_osd_speed(map, 1.5); osm_gps_map_purge_cache(map); gtk_widget_queue_draw (GTK_WIDGET (map)); @@ -1600,6 +1318,98 @@ } static void +center_coord_update(GtkWidget *widget) { + OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget); + + // pixel_x,y, offsets + gint pixel_x = priv->map_x + widget->allocation.width/2; + gint pixel_y = priv->map_y + widget->allocation.height/2; + + priv->center_rlon = pixel2lon(priv->map_zoom, pixel_x); + priv->center_rlat = pixel2lat(priv->map_zoom, pixel_y); +} + +#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; + center_coord_update(widget); + 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; + center_coord_update(widget); + 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; + center_coord_update(widget); + 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; + center_coord_update(widget); + 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) { OsmGpsMapPrivate *priv; @@ -1612,13 +1422,14 @@ priv->trip_history = NULL; priv->gps = g_new0(coord_t, 1); priv->gps_valid = FALSE; - - priv->balloon.coo = g_new0(coord_t, 1); - priv->balloon.valid = FALSE; - priv->balloon.cb = NULL; + priv->gps_heading = OSM_GPS_MAP_INVALID; #ifdef ENABLE_OSD - priv->osd.backup = NULL; + priv->osd = NULL; +#endif + +#ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN + priv->fullscreen = FALSE; #endif priv->tracks = NULL; @@ -1637,15 +1448,14 @@ #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 - //Hash table which maps tile d/l URIs to SoupMessage requests priv->tile_queue = g_hash_table_new (g_str_hash, g_str_equal); @@ -1665,37 +1475,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) ) { @@ -1720,28 +1510,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 - - 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->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; } @@ -1778,12 +1566,19 @@ if (priv->idle_map_redraw != 0) g_source_remove (priv->idle_map_redraw); + if (priv->drag_expose != 0) + g_source_remove (priv->drag_expose); + g_free(priv->gps); - g_free(priv->balloon.coo); #ifdef ENABLE_OSD - if (priv->osd.backup) - g_object_unref(priv->osd.backup); + 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); @@ -1795,7 +1590,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); @@ -1852,10 +1652,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); @@ -1868,11 +1665,11 @@ break; case PROP_MAP_X: priv->map_x = g_value_get_int (value); - priv->center_coord_set = FALSE; + center_coord_update(GTK_WIDGET(object)); break; case PROP_MAP_Y: priv->map_y = g_value_get_int (value); - priv->center_coord_set = FALSE; + center_coord_update(GTK_WIDGET(object)); break; case PROP_GPS_TRACK_WIDTH: priv->ui_gps_track_width = g_value_get_int (value); @@ -1883,9 +1680,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; @@ -1926,9 +1745,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; @@ -2001,14 +1817,66 @@ { OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget); - /* 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; +#ifdef ENABLE_OSD + /* pressed inside OSD control? */ + if(priv->osd) { + osd_button_t but = + priv->osd->check(priv->osd, TRUE, 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; + center_coord_update(widget); + 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; + center_coord_update(widget); + 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; + center_coord_update(widget); + 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; + center_coord_update(widget); + 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; @@ -2024,20 +1892,6 @@ { OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget); - /* 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); - return FALSE; - } - - if (priv->drag_counter < 0) - return FALSE; - if (priv->dragging) { priv->dragging = FALSE; @@ -2048,19 +1902,39 @@ priv->map_x += (priv->drag_start_mouse_x - (int) event->x); priv->map_y += (priv->drag_start_mouse_y - (int) event->y); - priv->center_coord_set = FALSE; + center_coord_update(widget); osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget)); } +#ifdef ENABLE_OSD + /* pressed inside OSD control? */ + else if(priv->osd) + priv->osd->check(priv->osd, FALSE, event->x, event->y); +#endif + +#ifdef DRAG_DEBUG + printf("dragging done\n"); +#endif - priv->drag_mouse_dx = 0; - priv->drag_mouse_dy = 0; priv->drag_counter = -1; return FALSE; } static gboolean +osm_gps_map_expose (GtkWidget *widget, GdkEventExpose *event); + +static gboolean +osm_gps_map_map_expose (GtkWidget *widget) +{ + OsmGpsMapPrivate *priv = OSM_GPS_MAP(widget)->priv; + + priv->drag_expose = 0; + osm_gps_map_expose (widget, NULL); + return FALSE; +} + +static gboolean osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion *event) { int x, y; @@ -2083,12 +1957,15 @@ if (priv->drag_counter < 0) return FALSE; - priv->drag_counter++; - - // we havent dragged more than 6 pixels - if (priv->drag_counter < 6) + /* not yet dragged far enough? */ + if(!priv->drag_counter && + ( (x - priv->drag_start_mouse_x) * (x - priv->drag_start_mouse_x) + + (y - priv->drag_start_mouse_y) * (y - priv->drag_start_mouse_y) < + 10*10)) return FALSE; + priv->drag_counter++; + priv->dragging = TRUE; if (priv->map_auto_center) @@ -2097,65 +1974,10 @@ priv->drag_mouse_dx = x - priv->drag_start_mouse_x; priv->drag_mouse_dy = y - priv->drag_start_mouse_y; -#ifdef ENABLE_OSD - /* undo OSD */ - osm_gps_map_osd_restore (OSM_GPS_MAP(widget)); - - /* draw new OSD */ - osm_gps_map_draw_osd_controls (OSM_GPS_MAP(widget), - -priv->drag_mouse_dx, - -priv->drag_mouse_dy); -#endif - - 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); - } + /* instead of redrawing directly just add an idle function */ + if (!priv->drag_expose) + priv->drag_expose = + g_idle_add ((GSourceFunc)osm_gps_map_map_expose, widget); return FALSE; } @@ -2170,10 +1992,35 @@ 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); + + // pixel_x,y, offsets + gint pixel_x = lon2pixel(priv->map_zoom, priv->center_rlon); + gint pixel_y = lat2pixel(priv->map_zoom, priv->center_rlat); + + priv->map_x = pixel_x - widget->allocation.width/2; + priv->map_y = pixel_y - widget->allocation.height/2; + +#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) @@ -2191,26 +2038,98 @@ { OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget); - 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); - -#ifdef ENABLE_OSD_OVL - /* TODO: intersect with area */ - if (priv->osd.pixbuf) - { - // gdk_draw_drawable (widget->window, - // widget->style->fg_gc[GTK_WIDGET_STATE (widget)], - // priv->osd.pixbuf, 0, 0, - // OSD_X, OSD_Y, OSD_W, OSD_H); +#if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER) + GdkDrawable *drawable = priv->dbuf_pixmap; +#else + GdkDrawable *drawable = widget->window; +#endif + +#ifdef DRAG_DEBUG + printf("expose, map %d/%d\n", priv->map_x, priv->map_y); +#endif + + if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event) + { +#ifdef DRAG_DEBUG + printf(" dragging = %d, event = %p\n", priv->dragging, event); +#endif + + 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 + { +#ifdef DRAG_DEBUG + printf(" drag_mouse %d/%d\n", + priv->drag_mouse_dx - EXTRA_BORDER, + priv->drag_mouse_dy - EXTRA_BORDER); #endif + 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->dbuf_pixmap, + 0,0,0,0,-1,-1); +#endif + +#endif + return FALSE; } @@ -2292,14 +2211,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", @@ -2396,7 +2307,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, @@ -2417,7 +2328,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, @@ -2436,11 +2347,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: @@ -2482,8 +2395,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: @@ -2521,9 +2436,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: @@ -2531,8 +2449,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"; @@ -2554,9 +2470,9 @@ case OSM_GPS_MAP_SOURCE_NULL: return 18; case OSM_GPS_MAP_SOURCE_OPENSTREETMAP: + case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP: return OSM_MAX_ZOOM; case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER: - 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: @@ -2566,6 +2482,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: @@ -2658,7 +2576,6 @@ priv->center_rlat = deg2rad(latitude); priv->center_rlon = deg2rad(longitude); - priv->center_coord_set = TRUE; // pixel_x,y, offsets pixel_x = lon2pixel(priv->map_zoom, priv->center_rlon); @@ -2690,21 +2607,18 @@ //constrain zoom min_zoom -> max_zoom priv->map_zoom = CLAMP(zoom, priv->min_zoom, priv->max_zoom); - if (priv->center_coord_set) - { - priv->map_x = lon2pixel(priv->map_zoom, priv->center_rlon) - width_center; - priv->map_y = lat2pixel(priv->map_zoom, priv->center_rlat) - height_center; - } - else - { - factor = exp(priv->map_zoom * M_LN2)/exp(zoom_old * M_LN2); - priv->map_x = ((priv->map_x + width_center) * factor) - width_center; - priv->map_y = ((priv->map_y + height_center) * factor) - height_center; - } + priv->map_x = lon2pixel(priv->map_zoom, priv->center_rlon) - width_center; + priv->map_y = lat2pixel(priv->map_zoom, priv->center_rlat) - height_center; g_debug("Zoom changed from %d to %d factor:%f x:%d", zoom_old, priv->map_zoom, factor, priv->map_x); +#ifdef ENABLE_OSD + /* OSD may contain a scale, so we may have to re-render it */ + if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget)) + priv->osd->render (priv->osd); +#endif + osm_gps_map_map_redraw_idle(map); } return priv->map_zoom; @@ -2790,67 +2704,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; @@ -2862,6 +2715,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); @@ -2892,7 +2746,7 @@ priv->map_x = pixel_x - GTK_WIDGET(map)->allocation.width/2; priv->map_y = pixel_y - GTK_WIDGET(map)->allocation.height/2; - priv->center_coord_set = FALSE; + center_coord_update(GTK_WIDGET(map)); } } @@ -2951,9 +2805,11 @@ priv = map->priv; if (pixel_x) - *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - priv->map_x; + *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - + priv->map_x + priv->drag_mouse_dx; if (pixel_y) - *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - priv->map_y; + *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - + priv->map_y + priv->drag_mouse_dy; } void @@ -2964,9 +2820,15 @@ g_return_if_fail (OSM_IS_GPS_MAP (map)); priv = map->priv; - priv->center_coord_set = FALSE; priv->map_x += dx; priv->map_y += dy; + center_coord_update(GTK_WIDGET(map)); + +#ifdef ENABLE_OSD + /* OSD may contain a coordinate, so we may have to re-render it */ + if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget)) + priv->osd->render (priv->osd); +#endif osm_gps_map_map_redraw_idle (map); } @@ -2976,44 +2838,55 @@ { 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_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_draw_balloon (OsmGpsMap *map, float latitude, float longitude, - OsmGpsMapBalloonCallback cb, gpointer data) +osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) { 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; + priv = map->priv; + g_return_if_fail (!priv->osd); - // this redraws the map - osm_gps_map_map_redraw_idle(map); + priv->osd = osd; } -void -osm_gps_map_clear_balloon (OsmGpsMap *map) +void +osm_gps_map_repaint (OsmGpsMap *map) { - OsmGpsMapPrivate *priv; + osm_gps_map_expose (GTK_WIDGET(map), NULL); +} - g_return_if_fail (OSM_IS_GPS_MAP (map)); - priv = map->priv; +coord_t * +osm_gps_map_get_gps (OsmGpsMap *map) +{ + g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL); - priv->balloon.valid = FALSE; + if(!map->priv->gps_valid) + return NULL; - osm_gps_map_map_redraw_idle(map); + return map->priv->gps; } + +#endif