[gpxview] Diff of /trunk/src/osm-gps-map.c

Diff of /trunk/src/osm-gps-map.c

Parent Directory | Revision Log | View Patch Patch

-revision 68 by harbaum,
Thu Aug 20 09:54:10 2009 UTC
+revision 280 by harbaum,
Fri May 21 19:28:16 2010 UTC
 Line 4
   * osm-gps-map.c
   * Copyright (C) Marcus Bauer 2008 <marcus.bauer@gmail.com>
   * Copyright (C) John Stowers 2009 <john.stowers@gmail.com>
+  * Copyright (C) Till Harbaum 2009 <till@harbaum.org>
   *
   * Contributions by
   * Everaldo Canuto 2009 <everaldo.canuto@gmail.com>
   *
   * osm-gps-map.c is free software: you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License as published by the
+  * under the terms of the GNU General Public License
-  * Free Software Foundation, either version 3 of the License, or
+  * as published by the Free Software Foundation; version 2.
-  * (at your option) any later version.
   *
-  * osm-gps-map.c is distributed in the hope that it will be useful, but
+  * This program is distributed in the hope that it will be useful,
-  * WITHOUT ANY WARRANTY; without even the implied warranty of
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * See the GNU General Public License for more details.
+  * GNU General Public License for more details.
   *
-  * You should have received a copy of the GNU General Public License along
+  * You should have received a copy of the GNU General Public License
-  * with this program.  If not, see <http://www.gnu.org/licenses/>.
+  * along with this program; if not, see <http://www.gnu.org/licenses/>.
   */
  #include "config.h"
 Line 36
  #include <glib/gstdio.h>
  #include <glib/gprintf.h>
  #include <libsoup/soup.h>
+ #include <cairo.h>
  #include "converter.h"
  #include "osm-gps-map-types.h"
  #include "osm-gps-map.h"
- #ifdef USE_CAIRO
- #include <cairo.h>
- #endif
  #define ENABLE_DEBUG 0
  #define EXTRA_BORDER (TILESIZE / 2)
+ #define OSM_GPS_MAP_SCROLL_STEP 10
+ #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;
-Line 78 
 struct _OsmGpsMapPrivate
+Line 79 
 struct _OsmGpsMapPrivate
      char *proxy_uri;
      //where downloaded tiles are cached
+     char *tile_dir;
+     char *tile_base_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
-Line 96 
 struct _OsmGpsMapPrivate
+Line 98 
 struct _OsmGpsMapPrivate
      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
+     //the osd controls (if present)
-     struct {
+     osm_gps_map_osd_t *osd;
-         GdkPixmap *backup;
+ #ifdef OSD_DOUBLE_BUFFER
-         cairo_surface_t *overlay;
+     GdkPixmap *dbuf_pixmap;
-         gint backup_x, backup_y;
-         OsmGpsMapOsdGpsCallback cb;
-         gpointer data;
-     } osd;
  #endif
+ #endif
      //additional images or tracks added to the map
      GSList *tracks;
      GSList *images;
-Line 139 
 struct _OsmGpsMapPrivate
+Line 127 
 struct _OsmGpsMapPrivate
      int drag_start_mouse_y;
      int drag_start_map_x;
      int drag_start_map_y;
+     int drag_limit;
+     guint drag_expose;
      //for customizing the redering of the gps track
      int ui_gps_track_width;
      int ui_gps_point_inner_radius;
      int ui_gps_point_outer_radius;
+     //For storing keybindings
+     guint keybindings[OSM_GPS_MAP_KEY_MAX];
+     guint fullscreen : 1;
+     guint keybindings_enabled : 1;
      guint is_disposed : 1;
      guint dragging : 1;
-     guint center_coord_set : 1;
+     guint button_down : 1;
+     guint double_pixel : 1;
  };
  #define OSM_GPS_MAP_PRIVATE(o)  (OSM_GPS_MAP (o)->priv)
-Line 164 
 enum
+Line 160 
 enum
  {
      PROP_0,
+     PROP_DOUBLE_PIXEL,
      PROP_AUTO_CENTER,
      PROP_RECORD_TRIP_HISTORY,
      PROP_SHOW_TRIP_HISTORY,
-Line 171 
 enum
+Line 168 
 enum
      PROP_REPO_URI,
      PROP_PROXY_URI,
      PROP_TILE_CACHE_DIR,
+     PROP_TILE_CACHE_BASE_DIR,
      PROP_TILE_CACHE_DIR_IS_FULL_PATH,
      PROP_ZOOM,
      PROP_MAX_ZOOM,
-Line 184 
 enum
+Line 182 
 enum
      PROP_GPS_POINT_R1,
      PROP_GPS_POINT_R2,
      PROP_MAP_SOURCE,
-     PROP_IMAGE_FORMAT
+     PROP_IMAGE_FORMAT,
+     PROP_DRAG_LIMIT,
  };
  G_DEFINE_TYPE (OsmGpsMap, osm_gps_map, GTK_TYPE_DRAWING_AREA);
-Line 198 
 static gchar    *replace_map_uri(OsmGpsM
+Line 197 
 static gchar    *replace_map_uri(OsmGpsM
  static void     osm_gps_map_print_images (OsmGpsMap *map);
  static void     osm_gps_map_draw_gps_point (OsmGpsMap *map);
  static void     osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y);
- #ifdef LIBSOUP22
+ #if USE_LIBSOUP22
  static void     osm_gps_map_tile_download_complete (SoupMessage *msg, gpointer user_data);
  #else
  static void     osm_gps_map_tile_download_complete (SoupSession *session, SoupMessage *msg, gpointer user_data);
-Line 332 
 static void
+Line 331 
 static void
  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;
-Line 540 
 osm_gps_map_print_images (OsmGpsMap *map
+Line 541 
 osm_gps_map_print_images (OsmGpsMap *map
                           priv->gc_map,
                           im->image,
 ,0,
-                          x-(im->w/2),y-(im->h/2),
+                          x-im->xoffset,y-im->yoffset,
                           im->w,im->h,
                           GDK_RGB_DITHER_NONE, 0, 0);
-Line 568 
 osm_gps_map_draw_gps_point (OsmGpsMap *m
+Line 569 
 osm_gps_map_draw_gps_point (OsmGpsMap *m
          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(3*r,r2);
-         int mr = MAX(r,r2);
          map_x0 = priv->map_x - EXTRA_BORDER;
          map_y0 = priv->map_y - EXTRA_BORDER;
          x = lon2pixel(priv->map_zoom, priv->gps->rlon) - map_x0;
          y = lat2pixel(priv->map_zoom, priv->gps->rlat) - map_y0;
- #ifdef USE_CAIRO
          cairo_t *cr;
          cairo_pattern_t *pat;
- #else
-         GdkColor color;
-         GdkGC *marker;
- #endif
- #ifdef USE_CAIRO
          cr = gdk_cairo_create(priv->pixmap);
          // draw transparent area
-Line 600 
 osm_gps_map_draw_gps_point (OsmGpsMap *m
+Line 594 
 osm_gps_map_draw_gps_point (OsmGpsMap *m
          // 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);
-Line 620 
 osm_gps_map_draw_gps_point (OsmGpsMap *m
+Line 630 
 osm_gps_map_draw_gps_point (OsmGpsMap *m
                                      y-mr,
                                      mr*2,
                                      mr*2);
- #else
-         marker = gdk_gc_new(priv->pixmap);
-         color.red = 5000;
-         color.green = 5000;
-         color.blue = 55000;
-         gdk_gc_set_rgb_fg_color(marker, &color);
-         gdk_gc_set_line_attributes(marker, lw, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
-         if (r2 > 0) {
-             gdk_draw_arc (priv->pixmap,
-                           marker,
-                           FALSE,            //filled
-                           x-r2, y-r2,       // x,y
-                           r2*2,r2*2,        // width, height
-, 360*64);       // start-end angle 64th, from 3h, anti clockwise
-         }
-         if (r > 0) {
-             gdk_draw_arc (priv->pixmap,
-                           marker,
-                           TRUE,         //filled
-                           x-r, y-r,     // x,y
-                           r*2,r*2,      // width, height
-, 360*64);   // start-end angle 64th, from 3h, anti clockwise
-         }
-         g_object_unref(marker);
-         gtk_widget_queue_draw_area (GTK_WIDGET(map),
-                                     x-(mr+lw),
-                                     y-(mr+lw),
-                                     (mr*2)+lw+lw,
-                                     (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)
+ osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)
  {
      OsmGpsMapPrivate *priv = map->priv;
-     if (priv->balloon.valid) {
+     if (priv->double_pixel) {
+         g_debug("Queing redraw @ %d,%d (w:%d h:%d)", offset_x,offset_y, TILESIZE*2,TILESIZE*2);
-         /* ------- 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 */
+         GdkPixbuf *double_pixbuf = gdk_pixbuf_scale_simple (pixbuf, TILESIZE*2, TILESIZE*2,
-         /* pointer direction ... */
+                                       GDK_INTERP_NEAREST);
-         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),
+         /* draw pixbuf onto pixmap */
-                                     x0, y0, BALLOON_WIDTH,
+         gdk_draw_pixbuf (priv->pixmap,
-                                     BALLOON_HEIGHT + POINTER_HEIGHT);
+                          priv->gc_map,
- #else
+                          double_pixbuf,
- #warning "Balloon display lacks a non-cairo implementation!"
+,0,
- #endif
+                          offset_x,offset_y,
+                          TILESIZE*2,TILESIZE*2,
+                          GDK_RGB_DITHER_NONE, 0, 0);
+         g_object_unref (double_pixbuf);
      }
- }
+     else
+     {
- /* the user clicked into the balloons main area. handle this */
+         g_debug("Queing redraw @ %d,%d (w:%d h:%d)", offset_x,offset_y, TILESIZE,TILESIZE);
- 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;
+         /* draw pixbuf onto pixmap */
-         osm_gps_map_map_redraw_idle(map);
+         gdk_draw_pixbuf (priv->pixmap,
+                          priv->gc_map,
+                          pixbuf,
+,0,
+                          offset_x,offset_y,
+                          TILESIZE,TILESIZE,
+                          GDK_RGB_DITHER_NONE, 0, 0);
      }
  }
- /* 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)
- {
-     OsmGpsMapPrivate *priv = map->priv;
-     g_debug("Queing redraw @ %d,%d (w:%d h:%d)", offset_x,offset_y, TILESIZE,TILESIZE);
-     /* draw pixbuf onto pixmap */
-     gdk_draw_pixbuf (priv->pixmap,
-                      priv->gc_map,
-                      pixbuf,
-,0,
-                      offset_x,offset_y,
-                      TILESIZE,TILESIZE,
-                      GDK_RGB_DITHER_NONE, 0, 0);
- }
  /* libsoup-2.2 and libsoup-2.4 use different ways to store the body data */
- #ifdef LIBSOUP22
+ #if USE_LIBSOUP22
  #define  soup_message_headers_append(a,b,c) soup_message_add_header(a,b,c)
  #define MSG_RESPONSE_BODY(a)    ((a)->response.body)
  #define MSG_RESPONSE_LEN(a)     ((a)->response.length)
-Line 896 
 osm_gps_map_blit_tile(OsmGpsMap *map, Gd
+Line 681 
 osm_gps_map_blit_tile(OsmGpsMap *map, Gd
  #define MSG_RESPONSE_LEN_FORMAT "%lld"
  #endif
- #ifdef LIBSOUP22
+ #if USE_LIBSOUP22
  static void
  osm_gps_map_tile_download_complete (SoupMessage *msg, gpointer user_data)
  #else
-Line 1012 
 osm_gps_map_tile_download_complete (Soup
+Line 797 
 osm_gps_map_tile_download_complete (Soup
          }
          else
          {
- #ifdef LIBSOUP22
+ #if USE_LIBSOUP22
              soup_session_requeue_message(dl->session, msg);
  #else
              soup_session_requeue_message(session, msg);
-Line 1034 
 osm_gps_map_download_tile (OsmGpsMap *ma
+Line 819 
 osm_gps_map_download_tile (OsmGpsMap *ma
      //calculate the uri to download
      dl->uri = replace_map_uri(map, priv->repo_uri, zoom, x, y);
- #ifdef LIBSOUP22
+ #if USE_LIBSOUP22
      dl->session = priv->soup_session;
  #endif
-Line 1078 
 osm_gps_map_download_tile (OsmGpsMap *ma
+Line 863 
 osm_gps_map_download_tile (OsmGpsMap *ma
                  }
              }
+ #if USE_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 {
-Line 1119 
 osm_gps_map_load_cached_tile (OsmGpsMap
+Line 909 
 osm_gps_map_load_cached_tile (OsmGpsMap
              tile->pixbuf = pixbuf;
              g_hash_table_insert (priv->tile_cache, filename, tile);
          }
+         else
+         {
+             g_free (filename);
+         }
      }
      /* set/update the redraw_cycle timestamp on the tile */
-Line 1186 
 osm_gps_map_render_missing_tile (OsmGpsM
+Line 980 
 osm_gps_map_render_missing_tile (OsmGpsM
      return osm_gps_map_render_missing_tile_upscaled (map, zoom, x, y);
  }
+ /* default tile lifetime is one week */
+ #ifndef OSD_GPS_MAP_TILE_TTL
+ #define  OSD_GPS_MAP_TILE_TTL  (60*60*24*7)
+ #endif
+ static gboolean
+ osm_gps_map_tile_age_exceeded(char *filename)
+ {
+     struct stat buf;
+     if(!g_stat(filename, &buf))
+         return(time(NULL) - buf.st_mtime > OSD_GPS_MAP_TILE_TTL);
+     return FALSE;
+ }
  static void
  osm_gps_map_load_tile (OsmGpsMap *map, int zoom, int x, int y, int offset_x, int offset_y)
  {
      OsmGpsMapPrivate *priv = map->priv;
      gchar *filename;
-     GdkPixbuf *pixbuf;
+     GdkPixbuf *pixbuf = NULL;
      g_debug("Load tile %d,%d (%d,%d) z:%d", x, y, offset_x, offset_y, zoom);
-Line 1207 
 osm_gps_map_load_tile (OsmGpsMap *map, i
+Line 1017 
 osm_gps_map_load_tile (OsmGpsMap *map, i
                  y,
                  priv->image_format);
-     /* try to get file from internal cache first */
+     gboolean needs_refresh = FALSE;
-     if(!(pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y)))
+     if (g_file_test(filename, G_FILE_TEST_EXISTS)) {
-         pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+         /* try to get file from internal cache first */
+         if(!(pixbuf = osm_gps_map_load_cached_tile(map, zoom, x, y)))
+             pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+          needs_refresh = osm_gps_map_tile_age_exceeded(filename);
+     }
      if(pixbuf)
      {
-Line 1217 
 osm_gps_map_load_tile (OsmGpsMap *map, i
+Line 1032 
 osm_gps_map_load_tile (OsmGpsMap *map, i
          osm_gps_map_blit_tile(map, pixbuf, offset_x,offset_y);
          g_object_unref (pixbuf);
      }
-     else
+     if(!pixbuf || needs_refresh)
      {
          if (priv->map_auto_download)
              osm_gps_map_download_tile(map, zoom, x, y, TRUE);
-         /* try to render the tile by scaling cached tiles from other zoom
+         if(!needs_refresh) {
-          * levels */
+             /* try to render the tile by scaling cached tiles from other zoom
-         pixbuf = osm_gps_map_render_missing_tile (map, zoom, x, y);
+              * levels */
-         if (pixbuf)
+             pixbuf = osm_gps_map_render_missing_tile (map, zoom, x, y);
-         {
+             if (pixbuf)
-             gdk_draw_pixbuf (priv->pixmap,
+             {
-                              priv->gc_map,
+                 osm_gps_map_blit_tile (map, pixbuf, offset_x,offset_y);
-                              pixbuf,
+                 g_object_unref (pixbuf);
-,0,
+             }
-                              offset_x,offset_y,
+             else
-                              TILESIZE,TILESIZE,
+             {
-                              GDK_RGB_DITHER_NONE, 0, 0);
+                 //prevent some artifacts when drawing not yet loaded areas.
-             g_object_unref (pixbuf);
+                 gdk_draw_rectangle (priv->pixmap,
-         }
+                                     GTK_WIDGET(map)->style->white_gc,
-         else
+                                     TRUE, offset_x, offset_y, TILESIZE, TILESIZE);
-         {
+             }
-             //prevent some artifacts when drawing not yet loaded areas.
-             gdk_draw_rectangle (priv->pixmap,
-                                 GTK_WIDGET(map)->style->white_gc,
-                                 TRUE, offset_x, offset_y, TILESIZE, TILESIZE);
          }
      }
      g_free(filename);
-Line 1259 
 osm_gps_map_fill_tiles_pixel (OsmGpsMap
+Line 1072 
 osm_gps_map_fill_tiles_pixel (OsmGpsMap
      g_debug("Fill tiles: %d,%d z:%d", priv->map_x, priv->map_y, priv->map_zoom);
-     offset_x = - priv->map_x % TILESIZE;
+     if (priv->double_pixel)
-     offset_y = - priv->map_y % TILESIZE;
+     {
-     if (offset_x > 0) offset_x -= TILESIZE;
+         width  = GTK_WIDGET(map)->allocation.width;
-     if (offset_y > 0) offset_y -= TILESIZE;
+         height = GTK_WIDGET(map)->allocation.height;
-     offset_xn = offset_x + EXTRA_BORDER;
+         offset_x = - priv->map_x % (TILESIZE*2);
-     offset_yn = offset_y + EXTRA_BORDER;
+         offset_y = - priv->map_y % (TILESIZE*2);
+         if (offset_x > 0) offset_x -= (TILESIZE*2);
+         if (offset_y > 0) offset_y -= (TILESIZE*2);
-     width  = GTK_WIDGET(map)->allocation.width;
+         offset_xn = offset_x + EXTRA_BORDER;
-     height = GTK_WIDGET(map)->allocation.height;
+         offset_yn = offset_y + EXTRA_BORDER;
-     tiles_nx = (width  - offset_x) / TILESIZE + 1;
+         tiles_nx = (width  - offset_x) / (TILESIZE*2) + 1;
-     tiles_ny = (height - offset_y) / TILESIZE + 1;
+         tiles_ny = (height - offset_y) / (TILESIZE*2) + 1;
-     tile_x0 =  floor((float)priv->map_x / (float)TILESIZE);
+         tile_x0 =  floor((float)priv->map_x / (float)(TILESIZE*2));
-     tile_y0 =  floor((float)priv->map_y / (float)TILESIZE);
+         tile_y0 =  floor((float)priv->map_y / (float)(TILESIZE*2));
-     //TODO: implement wrap around
+         for (i=tile_x0; i<(tile_x0+tiles_nx);i++)
-     for (i=tile_x0; i<(tile_x0+tiles_nx);i++)
-     {
-         for (j=tile_y0;  j<(tile_y0+tiles_ny); j++)
          {
-             if( j<0 || i<0 || i>=exp(priv->map_zoom * M_LN2) || j>=exp(priv->map_zoom * M_LN2))
+             for (j=tile_y0;  j<(tile_y0+tiles_ny); j++)
              {
-                 gdk_draw_rectangle (priv->pixmap,
+                 if( j<0 || i<0 || i>=exp(priv->map_zoom * M_LN2) || j>=exp(priv->map_zoom * M_LN2))
-                                     GTK_WIDGET(map)->style->white_gc,
+                 {
-                                     TRUE,
+                     gdk_draw_rectangle (priv->pixmap,
-                                     offset_xn, offset_yn,
+                                         GTK_WIDGET(map)->style->white_gc,
-                                     TILESIZE,TILESIZE);
+                                         TRUE,
+                                         offset_xn, offset_yn,
+                                         TILESIZE*2, TILESIZE*2);
+                 }
+                 else
+                 {
+                     osm_gps_map_load_tile(map,
+                                           priv->map_zoom - 1,
+                                           i,j,
+                                           offset_xn,offset_yn);
+                 }
+                 offset_yn += TILESIZE*2;
              }
-             else
+             offset_xn += TILESIZE*2;
+             offset_yn = offset_y + EXTRA_BORDER;
+         }
+     }
+     else
+     {
+         offset_x = - priv->map_x % TILESIZE;
+         offset_y = - priv->map_y % TILESIZE;
+         if (offset_x > 0) offset_x -= TILESIZE;
+         if (offset_y > 0) offset_y -= TILESIZE;
+         offset_xn = offset_x + EXTRA_BORDER;
+         offset_yn = offset_y + EXTRA_BORDER;
+         width  = GTK_WIDGET(map)->allocation.width;
+         height = GTK_WIDGET(map)->allocation.height;
+         tiles_nx = (width  - offset_x) / TILESIZE + 1;
+         tiles_ny = (height - offset_y) / TILESIZE + 1;
+         tile_x0 =  floor((float)priv->map_x / (float)TILESIZE);
+         tile_y0 =  floor((float)priv->map_y / (float)TILESIZE);
+         //TODO: implement wrap around
+         for (i=tile_x0; i<(tile_x0+tiles_nx);i++)
+         {
+             for (j=tile_y0;  j<(tile_y0+tiles_ny); j++)
              {
-                 osm_gps_map_load_tile(map,
+                 if( j<0 || i<0 || i>=exp(priv->map_zoom * M_LN2) || j>=exp(priv->map_zoom * M_LN2))
-                                       priv->map_zoom,
+                 {
-                                       i,j,
+                     gdk_draw_rectangle (priv->pixmap,
-                                       offset_xn,offset_yn);
+                                         GTK_WIDGET(map)->style->white_gc,
+                                         TRUE,
+                                         offset_xn, offset_yn,
+                                         TILESIZE,TILESIZE);
+                 }
+                 else
+                 {
+                     osm_gps_map_load_tile(map,
+                                           priv->map_zoom,
+                                           i,j,
+                                           offset_xn,offset_yn);
+                 }
+                 offset_yn += TILESIZE;
              }
-             offset_yn += TILESIZE;
+             offset_xn += TILESIZE;
+             offset_yn = offset_y + EXTRA_BORDER;
          }
-         offset_xn += TILESIZE;
-         offset_yn = offset_y + EXTRA_BORDER;
      }
  }
-Line 1313 
 osm_gps_map_print_track (OsmGpsMap *map,
+Line 1173 
 osm_gps_map_print_track (OsmGpsMap *map,
      int min_x = 0,min_y = 0,max_x = 0,max_y = 0;
      int lw = priv->ui_gps_track_width;
      int map_x0, map_y0;
- #ifdef USE_CAIRO
      cairo_t *cr;
- #else
-     int last_x = 0, last_y = 0;
-     GdkColor color;
-     GdkGC *gc;
- #endif
- #ifdef USE_CAIRO
      cr = gdk_cairo_create(priv->pixmap);
      cairo_set_line_width (cr, lw);
      cairo_set_source_rgba (cr, 60000.0/65535.0, 0.0, 0.0, 0.6);
      cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
      cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
- #else
-     gc = gdk_gc_new(priv->pixmap);
-     color.green = 0;
-     color.blue = 0;
-     color.red = 60000;
-     gdk_gc_set_rgb_fg_color(gc, &color);
-     gdk_gc_set_line_attributes(gc, lw, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
- #endif
      map_x0 = priv->map_x - EXTRA_BORDER;
      map_y0 = priv->map_y - EXTRA_BORDER;
-Line 1347 
 osm_gps_map_print_track (OsmGpsMap *map,
+Line 1192 
 osm_gps_map_print_track (OsmGpsMap *map,
          // first time through loop
          if (list == trackpoint_list) {
- #ifdef USE_CAIRO
              cairo_move_to(cr, x, y);
- #else
-             last_x = x;
-             last_y = y;
- #endif
          }
- #ifdef USE_CAIRO
          cairo_line_to(cr, x, y);
- #else
-         gdk_draw_line (priv->pixmap, gc, x, y, last_x, last_y);
-         last_x = x;
-         last_y = y;
- #endif
          max_x = MAX(x,max_x);
          min_x = MIN(x,min_x);
-Line 1376 
 osm_gps_map_print_track (OsmGpsMap *map,
+Line 1210 
 osm_gps_map_print_track (OsmGpsMap *map,
                                  max_x + (lw * 2),
                                  max_y + (lw * 2));
- #ifdef USE_CAIRO
      cairo_stroke(cr);
      cairo_destroy(cr);
- #else
-     g_object_unref(gc);
- #endif
  }
  /* Prints the gps trip history, and any other tracks */
-Line 1423 
 osm_gps_map_purge_cache (OsmGpsMap *map)
+Line 1253 
 osm_gps_map_purge_cache (OsmGpsMap *map)
     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_COLOR            0.5, 0.5, 1
- #define OSD_COLOR_DISABLED   0.8, 0.8, 0.8
- /* parameters of the direction shape */
- #ifndef OSM_GPS_MAP_OSD_DIAMETER
- #define D_RAD  (30)         // diameter of dpad
- #else
- #define D_RAD  (OSM_GPS_MAP_OSD_DIAMETER)
- #endif
- #define D_TIP  (4*D_RAD/5)  // distance of arrow tip from dpad center
- #define D_LEN  (D_RAD/4)    // length of arrow
- #define D_WID  (D_LEN)      // width of arrow
- /* parameters of the "zoom" pad */
- #define Z_STEP   (D_RAD/4)  // distance between dpad and zoom
- #define Z_RAD    (D_RAD/2)  // radius of "caps" of zoom bar
- /* shadow also depends on control size */
- #define OSD_SHADOW (D_RAD/6)
- /* total width and height of controls incl. shadow */
- #define OSD_W    (2*D_RAD + OSD_SHADOW)
- #define OSD_H    (2*D_RAD + Z_STEP + 2*Z_RAD + OSD_SHADOW)
- #define OSD_LBL_SHADOW (OSD_SHADOW/2)
- #define Z_TOP    (2 * D_RAD + Z_STEP)
- #define Z_MID    (Z_TOP + Z_RAD)
- #define Z_BOT    (Z_MID + Z_RAD)
- #define Z_LEFT   (Z_RAD)
- #define Z_RIGHT  (2 * D_RAD - Z_RAD)
- /* create the cairo shape used for the zoom buttons */
- static void
- osm_gps_map_osd_zoom_shape(cairo_t *cr, gint x, gint y) {
-     cairo_move_to (cr, x+Z_LEFT,    y+Z_TOP);
-     cairo_line_to (cr, x+Z_RIGHT,   y+Z_TOP);
-     cairo_arc     (cr, x+Z_RIGHT,   y+Z_MID, Z_RAD, -M_PI/2,  M_PI/2);
-     cairo_line_to (cr, x+Z_LEFT,    y+Z_BOT);
-     cairo_arc     (cr, x+Z_LEFT,    y+Z_MID, Z_RAD,  M_PI/2, -M_PI/2);
- }
- /* create the cairo shape used for the dpad */
- static void
- osm_gps_map_osd_dpad_shape(cairo_t *cr, gint x, gint y) {
-     cairo_arc (cr, x+D_RAD, y+D_RAD, D_RAD, 0, 2 * M_PI);
- }
- typedef enum {
-     OSD_NONE = 0,
-     OSD_BG,
-     OSD_UP,
-     OSD_DOWN,
-     OSD_LEFT,
-     OSD_RIGHT,
-     OSD_IN,
-     OSD_OUT,
-     OSD_GPS
- } osd_button_t;
  static gboolean
- osm_gps_map_in_circle(gint x, gint y, gint cx, gint cy, gint rad)
+ osm_gps_map_map_redraw (OsmGpsMap *map)
- {
-     return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);
- }
- /* check whether x/y is within the dpad */
- static osd_button_t
- osm_gps_map_osd_check_dpad(gint x, gint y)
- {
-     /* within entire dpad circle */
-     if( osm_gps_map_in_circle(x, y, OSD_X + D_RAD, OSD_Y + D_RAD, D_RAD))
-     {
-         /* convert into position relative to dpads centre */
-         x -= (OSD_X + D_RAD);
-         y -= (OSD_Y + D_RAD);
-         /* check for dpad center goes here! */
-         if( osm_gps_map_in_circle(x, y, 0, 0, D_RAD/3))
-             return OSD_GPS;
-         if( y < 0 && abs(x) < abs(y))
-             return OSD_UP;
-         if( y > 0 && abs(x) < abs(y))
-             return OSD_DOWN;
-         if( x < 0 && abs(y) < abs(x))
-             return OSD_LEFT;
-         if( x > 0 && abs(y) < abs(x))
-             return OSD_RIGHT;
-         return OSD_BG;
-     }
-     return OSD_NONE;
- }
- /* check whether x/y is within the zoom pads */
- static osd_button_t
- osm_gps_map_osd_check_zoom(gint x, gint y) {
-     if( x > OSD_X && x < (OSD_X + OSD_W) && y > Z_TOP && y < (OSD_Y+Z_BOT)) {
-         /* within circle around (-) label */
-         if( osm_gps_map_in_circle(x, y, OSD_X + Z_LEFT, OSD_Y + Z_MID, Z_RAD))
-             return OSD_OUT;
-         /* between center of (-) button and center of entire zoom control area */
-         if(x > OSD_LEFT && x < OSD_X + D_RAD)
-             return OSD_OUT;
-         /* within circle around (+) label */
-         if( osm_gps_map_in_circle(x, y, OSD_X + Z_RIGHT, OSD_Y + Z_MID, Z_RAD))
-             return OSD_IN;
-         /* between center of (+) button and center of entire zoom control area */
-         if(x < OSD_RIGHT && x > OSD_X + D_RAD)
-             return OSD_IN;
-     }
-     return OSD_NONE;
- }
- static osd_button_t
- osm_gps_map_osd_check(gint x, gint y) {
-     osd_button_t but = OSD_NONE;
-     /* first do a rough test for the OSD area. */
-     /* this is just to avoid an unnecessary detailed test */
-     if(x > OSD_X && x < OSD_X + OSD_W &&
-        y > OSD_Y && y < OSD_Y + OSD_H) {
-         but = osm_gps_map_osd_check_dpad(x, y);
-         if(but == OSD_NONE)
-             but = osm_gps_map_osd_check_zoom(x, y);
-     }
-     return but;
- }
- static void
- osm_gps_map_osd_shape_shadow(cairo_t *cr) {
-     cairo_set_source_rgba (cr, 0, 0, 0, 0.2);
-     cairo_fill (cr);
-     cairo_stroke (cr);
- }
- static void
- osm_gps_map_osd_shape(cairo_t *cr) {
-     cairo_set_source_rgb (cr, 1, 1, 1);
-     cairo_fill_preserve (cr);
-     cairo_set_source_rgb (cr, OSD_COLOR);
-     cairo_set_line_width (cr, 1);
-     cairo_stroke (cr);
- }
- static void
- osm_gps_map_osd_dpad_labels(cairo_t *cr, gint x, gint y) {
-     /* move reference to dpad center */
-     x += D_RAD;
-     y += D_RAD;
-     const static gint offset[][3][2] = {
-         /* left arrow/triangle */
-         { { -D_TIP+D_LEN, -D_WID }, { -D_LEN, D_WID }, { +D_LEN, D_WID } },
-         /* right arrow/triangle */
-         { { +D_TIP-D_LEN, -D_WID }, { +D_LEN, D_WID }, { -D_LEN, D_WID } },
-         /* top arrow/triangle */
-         { { -D_WID, -D_TIP+D_LEN }, { D_WID, -D_LEN }, { D_WID, +D_LEN } },
-         /* bottom arrow/triangle */
-         { { -D_WID, +D_TIP-D_LEN }, { D_WID, +D_LEN }, { D_WID, -D_LEN } }
-     };
-     int i;
-     for(i=0;i<4;i++) {
-         cairo_move_to (cr, x + offset[i][0][0], y + offset[i][0][1]);
-         cairo_rel_line_to (cr, offset[i][1][0], offset[i][1][1]);
-         cairo_rel_line_to (cr, offset[i][2][0], offset[i][2][1]);
-     }
- }
- /* draw the sattelite dish icon in the center of the dpad */
- #define GPS_V0  (D_RAD/8)
- #define GPS_V1  (D_RAD/10)
- #define GPS_V2  (D_RAD/5)
- /* draw a satellite receiver dish */
- static void
- osm_gps_map_osd_dpad_gps(cairo_t *cr, gint x, gint y) {
-     /* move reference to dpad center */
-     x += D_RAD;
-     y += D_RAD + GPS_V0;
-     cairo_move_to (cr, x-GPS_V0, y+GPS_V0);
-     cairo_rel_line_to (cr, +GPS_V0, -GPS_V0);
-     cairo_rel_line_to (cr, +GPS_V0, +GPS_V0);
-     cairo_close_path (cr);
-     cairo_move_to (cr, x+GPS_V1-GPS_V2, y-2*GPS_V2);
-     cairo_curve_to (cr, x-GPS_V2, y, x+GPS_V1, y+GPS_V1, x+GPS_V1+GPS_V2, y);
-     cairo_close_path (cr);
-     x += GPS_V1;
-     cairo_move_to (cr, x, y-GPS_V2);
-     cairo_rel_line_to (cr, +GPS_V1, -GPS_V1);
- }
- #define Z_LEN  (2*Z_RAD/3)
- static void
- osm_gps_map_osd_zoom_labels(cairo_t *cr, gint x, gint y) {
-     cairo_move_to (cr, x + Z_LEFT  - Z_LEN, y + Z_MID);
-     cairo_line_to (cr, x + Z_LEFT  + Z_LEN, y + Z_MID);
-     cairo_move_to (cr, x + Z_RIGHT,         y + Z_MID - Z_LEN);
-     cairo_line_to (cr, x + Z_RIGHT,         y + Z_MID + Z_LEN);
-     cairo_move_to (cr, x + Z_RIGHT - Z_LEN, y + Z_MID);
-     cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);
- }
- static void
- osm_gps_map_osd_labels(cairo_t *cr, gint width, gboolean enabled) {
-     if(enabled)  cairo_set_source_rgb (cr, OSD_COLOR);
-     else         cairo_set_source_rgb (cr, OSD_COLOR_DISABLED);
-     cairo_set_line_width (cr, width);
-     cairo_stroke (cr);
- }
- static void
- osm_gps_map_osd_labels_shadow(cairo_t *cr, gint width, gboolean enabled) {
-     cairo_set_source_rgba (cr, 0, 0, 0, enabled?0.3:0.15);
-     cairo_set_line_width (cr, width);
-     cairo_stroke (cr);
- }
- static void
- osm_gps_map_osd_render(OsmGpsMapPrivate *priv) {
-     /* first fill with transparency */
-     cairo_t *cr = cairo_create(priv->osd.overlay);
-     cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-     cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
-     cairo_paint(cr);
-     cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
-     /* --------- draw zoom and dpad shape shadow ----------- */
-     gint x = 0, y = 0;
-     osm_gps_map_osd_zoom_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW);
-     osm_gps_map_osd_shape_shadow(cr);
-     osm_gps_map_osd_dpad_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW);
-     osm_gps_map_osd_shape_shadow(cr);
-     /* --------- draw zoom and dpad shape ----------- */
-     osm_gps_map_osd_zoom_shape(cr, x, y);
-     osm_gps_map_osd_shape(cr);
-     osm_gps_map_osd_dpad_shape(cr, x, y);
-     osm_gps_map_osd_shape(cr);
-     /* --------- draw zoom and dpad labels --------- */
-     osm_gps_map_osd_zoom_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);
-     osm_gps_map_osd_dpad_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);
-     osm_gps_map_osd_labels_shadow(cr, Z_RAD/3, TRUE);
-     osm_gps_map_osd_dpad_gps(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);
-     osm_gps_map_osd_labels_shadow(cr, Z_RAD/6, priv->osd.cb != NULL);
-     osm_gps_map_osd_zoom_labels(cr, x, y);
-     osm_gps_map_osd_dpad_labels(cr, x, y);
-     osm_gps_map_osd_labels(cr, Z_RAD/3, TRUE);
-     osm_gps_map_osd_dpad_gps(cr, x, y);
-     osm_gps_map_osd_labels(cr, Z_RAD/6, priv->osd.cb != NULL);
-     cairo_destroy(cr);
- }
- static void
- osm_gps_map_osd_draw_controls (OsmGpsMap *map, gint xoffset, gint yoffset)
  {
      OsmGpsMapPrivate *priv = map->priv;
-     /* backup previous contents */
+     /* on diablo the map comes up at 1x1 pixel size and */
-     if(!priv->osd.backup)
+     /* isn't really usable. we'll just ignore this ... */
-         priv->osd.backup = gdk_pixmap_new(priv->pixmap, OSD_W+2, OSD_H+2, -1);
+     if((GTK_WIDGET(map)->allocation.width < 2) ||
+        (GTK_WIDGET(map)->allocation.height < 2)) {
-     gint x = OSD_X + EXTRA_BORDER + xoffset;
+         printf("not a useful sized map yet ...\n");
-     gint y = OSD_Y + EXTRA_BORDER + yoffset;
+         return FALSE;
-     /* 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-1, y-1, 0, 0, OSD_W+2, OSD_H+2);
-     priv->osd.backup_x = x-1;
-     priv->osd.backup_y = y-1;
- #ifdef USE_CAIRO
-     /* OSD itself uses some off-screen rendering, so check if the */
-     /* offscreen buffer is present and create it if not */
-     if(!priv->osd.overlay) {
-         /* create overlay ... */
-         priv->osd.overlay =
-             cairo_image_surface_create(CAIRO_FORMAT_ARGB32, OSD_W, OSD_H);
-         /* ... and render it */
-         osm_gps_map_osd_render(priv);
      }
-     // now draw this onto the original context
+     priv->idle_map_redraw = 0;
-     cairo_t *cr = gdk_cairo_create(priv->pixmap);
-     cairo_set_source_surface(cr, priv->osd.overlay, x, y);
-     cairo_paint(cr);
-     cairo_destroy(cr);
- #else
+ #ifdef ENABLE_OSD
- #warning "OSD control display lacks a non-cairo implementation!"
+     /* 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
- }
- static void
- osm_gps_map_osd_restore (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+2, OSD_H+2);
-     }
- }
+ #ifdef DRAG_DEBUG
+     printf("trying redraw\n");
  #endif
- static gboolean
- osm_gps_map_map_redraw (OsmGpsMap *map)
- {
-     OsmGpsMapPrivate *priv = map->priv;
-     priv->idle_map_redraw = 0;
      /* 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
-Line 1780 
 osm_gps_map_map_redraw (OsmGpsMap *map)
+Line 1287 
 osm_gps_map_map_redraw (OsmGpsMap *map)
      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 (
+     gdk_draw_rectangle (priv->pixmap,
-                         priv->pixmap,
                          GTK_WIDGET(map)->style->white_gc,
                          TRUE,
 , 0,
-Line 1796 
 osm_gps_map_map_redraw (OsmGpsMap *map)
+Line 1306 
 osm_gps_map_map_redraw (OsmGpsMap *map)
      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
  #ifdef ENABLE_OSD
-     osm_gps_map_osd_draw_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));
-Line 1820 
 osm_gps_map_map_redraw_idle (OsmGpsMap *
+Line 1329 
 osm_gps_map_map_redraw_idle (OsmGpsMap *
  }
  static void
- osm_gps_map_init (OsmGpsMap *object)
+ center_coord_update(OsmGpsMap *map) {
- {
-     OsmGpsMapPrivate *priv;
+     GtkWidget *widget = GTK_WIDGET(map);
+     OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(map);
+     // 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);
+     g_signal_emit_by_name(widget, "changed");
+ }
+ static gboolean
+ on_window_key_press(GtkWidget *widget, GdkEventKey *event, OsmGpsMapPrivate *priv)
+ {
+     int i;
+     int step;
+     gboolean handled;
+     OsmGpsMap *map;
+     //if no keybindings are set, let the app handle them...
+     if (!priv->keybindings_enabled)
+         return FALSE;
+     handled = FALSE;
+     map = OSM_GPS_MAP(widget);
+     step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
+     //the map handles some keys on its own
+     for (i = 0; i < OSM_GPS_MAP_KEY_MAX; i++) {
+         //not the key we have a binding for
+         if (map->priv->keybindings[i] != event->keyval)
+             continue;
+         switch(i) {
+             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;
+             case OSM_GPS_MAP_KEY_ZOOMIN:
+                 osm_gps_map_zoom_in(map);
+                 handled = TRUE;
+                 break;
+             case OSM_GPS_MAP_KEY_ZOOMOUT:
+                 osm_gps_map_zoom_out(map);
+                 handled = TRUE;
+                 break;
+             case OSM_GPS_MAP_KEY_UP:
+                 priv->map_y -= step;
+                 center_coord_update(map);
+                 osm_gps_map_map_redraw_idle(map);
+                 handled = TRUE;
+                 break;
+             case OSM_GPS_MAP_KEY_DOWN:
+                 priv->map_y += step;
+                 center_coord_update(map);
+                 osm_gps_map_map_redraw_idle(map);
+                 handled = TRUE;
+                 break;
+               case OSM_GPS_MAP_KEY_LEFT:
+                 priv->map_x -= step;
+                 center_coord_update(map);
+                 osm_gps_map_map_redraw_idle(map);
+                 handled = TRUE;
+                 break;
+             case OSM_GPS_MAP_KEY_RIGHT:
+                 priv->map_x += step;
+                 center_coord_update(map);
+                 osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
+                 handled = TRUE;
+                 break;
+             default:
+                 break;
+         }
+     }
+     return handled;
+ }
+ static void
+ osm_gps_map_init (OsmGpsMap *object)
+ {
+     int i;
+     OsmGpsMapPrivate *priv;
      priv = G_TYPE_INSTANCE_GET_PRIVATE (object, OSM_TYPE_GPS_MAP, OsmGpsMapPrivate);
      object->priv = priv;
-Line 1832 
 osm_gps_map_init (OsmGpsMap *object)
+Line 1431 
 osm_gps_map_init (OsmGpsMap *object)
      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.backup = NULL;
+     priv->osd = NULL;
-     priv->osd.overlay = NULL;
-     priv->osd.cb = NULL;
  #endif
      priv->tracks = NULL;
      priv->images = NULL;
-Line 1859 
 osm_gps_map_init (OsmGpsMap *object)
+Line 1450 
 osm_gps_map_init (OsmGpsMap *object)
      priv->map_source = -1;
- #ifndef LIBSOUP22
+     priv->keybindings_enabled = FALSE;
-     //Change naumber of concurrent connections option?
+     for (i = 0; i < OSM_GPS_MAP_KEY_MAX; i++)
-     priv->soup_session = soup_session_async_new_with_options(
+         priv->keybindings[i] = 0;
-                                                              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);
+ #if USE_LIBSOUP22
- #else
+     /* libsoup-2.2 has no special way to set the user agent, so we */
-     /* libsoup-2.2 seems not to be able to set the user agent */
+     /* set it seperately as an extra header field for each reuest */
      priv->soup_session = soup_session_async_new();
- #endif
+ #else
+     /* set the user agent */
+     priv->soup_session =
+         soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
+                                             USER_AGENT, NULL);
+ #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);
-Line 1889 
 osm_gps_map_init (OsmGpsMap *object)
+Line 1485 
 osm_gps_map_init (OsmGpsMap *object)
      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);
+     //Setup signal handlers
+     g_signal_connect(G_OBJECT(object), "key_press_event",
+                             G_CALLBACK(on_window_key_press), priv);
  }
- #ifndef G_CHECKSUM_MD5
+ static char*
- /* simple hash algorithm hack if md5 is not present */
+ osm_gps_map_get_cache_dir(OsmGpsMapPrivate *priv)
- static char *simple_hash(char *str) {
+ {
-     union {
+     if (priv->tile_base_dir)
-         char str[4];
+         return g_strdup(priv->tile_base_dir);
-         gulong val;
+     return osm_gps_map_get_default_cache_directory();
-     } hash = { .val = 0x55555555 };
+ }
-     while(*str) {
+ /* strcmp0 was introduced with glib 2.16 */
-         hash.str[(int)str & 3] ^= *str;
+ #if ! GLIB_CHECK_VERSION (2, 16, 0)
-         str++;
+ int g_strcmp0(const char *str1, const char *str2)
-     }
+ {
-     return g_strdup_printf("%08lX", hash.val);
+     if( str1 == NULL && str2 == NULL ) return 0;
+     if( str1 == NULL ) return -1;
+     if( str2 == NULL ) return 1;
+     return strcmp(str1, str2);
  }
  #endif
- static GObject *
+ static void
- osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
+ osm_gps_map_setup(OsmGpsMapPrivate *priv)
  {
-     GObject *object;
-     OsmGpsMapPrivate *priv;
-     OsmGpsMap *map;
      const char *uri;
-     //Always chain up to the parent constructor
+    //user can specify a map source ID, or a repo URI as the map source
-     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) ) {
          g_debug("Using null source");
-Line 1944 
 osm_gps_map_constructor (GType gtype, gu
+Line 1539 
 osm_gps_map_constructor (GType gtype, gu
          }
      }
-     if (!priv->cache_dir_is_full_path) {
+     if (priv->tile_dir == NULL)
- #ifdef G_CHECKSUM_MD5
+         priv->tile_dir = g_strdup(OSM_GPS_MAP_CACHE_DISABLED);
+     if ( g_strcmp0(priv->tile_dir, OSM_GPS_MAP_CACHE_DISABLED) == 0 ) {
+         priv->cache_dir = NULL;
+     } else if ( g_strcmp0(priv->tile_dir, OSM_GPS_MAP_CACHE_AUTO) == 0 ) {
+         char *base = osm_gps_map_get_cache_dir(priv);
+ #if GLIB_CHECK_VERSION (2, 16, 0)
          char *md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, priv->repo_uri, -1);
  #else
-         char *md5 = simple_hash(priv->repo_uri);
+         char *md5 = g_strdup(osm_gps_map_source_get_friendly_name(priv->map_source));
  #endif
+         priv->cache_dir = g_strdup_printf("%s%c%s", base, G_DIR_SEPARATOR, md5);
-         if (priv->cache_dir) {
+         g_free(base);
-             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);
+     } else if ( g_strcmp0(priv->tile_dir, OSM_GPS_MAP_CACHE_FRIENDLY) == 0 ) {
+         char *base = osm_gps_map_get_cache_dir(priv);
+         const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
+         priv->cache_dir = g_strdup_printf("%s%c%s", base, G_DIR_SEPARATOR, fname);
+         g_free(base);
+     } else {
+         priv->cache_dir = g_strdup(priv->tile_dir);
      }
+     g_debug("Cache dir: %s", 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;
  }
-Line 1988 
 osm_gps_map_dispose (GObject *object)
+Line 1597 
 osm_gps_map_dispose (GObject *object)
      g_hash_table_destroy(priv->missing_tiles);
      g_hash_table_destroy(priv->tile_cache);
+     /* images and layers contain GObjects which need unreffing, so free here */
      osm_gps_map_free_images(map);
      if(priv->pixmap)
-Line 2002 
 osm_gps_map_dispose (GObject *object)
+Line 1612 
 osm_gps_map_dispose (GObject *object)
      if (priv->idle_map_redraw != 0)
          g_source_remove (priv->idle_map_redraw);
-     g_free(priv->gps);
+     if (priv->drag_expose != 0)
+         g_source_remove (priv->drag_expose);
- #ifdef ENABLE_BALLOON
+     g_free(priv->gps);
-     g_free(priv->balloon.coo);
- #endif
  #ifdef ENABLE_OSD
-     if (priv->osd.backup)
+     if(priv->osd) {
-         g_object_unref(priv->osd.backup);
+         priv->osd->free(priv->osd);
+         priv->osd = NULL;
+     }
-     if (priv->osd.overlay)
+ #ifdef OSD_DOUBLE_BUFFER
-          cairo_surface_destroy(priv->osd.overlay);
+     if(priv->dbuf_pixmap)
+         g_object_unref (priv->dbuf_pixmap);
+ #endif
  #endif
      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
-Line 2025 
 osm_gps_map_finalize (GObject *object)
+Line 1638 
 osm_gps_map_finalize (GObject *object)
      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);
+     /* trip and tracks contain simple non GObject types, so free them here */
      osm_gps_map_free_trip(map);
      osm_gps_map_free_tracks(map);
-Line 2047 
 osm_gps_map_set_property (GObject *objec
+Line 1666 
 osm_gps_map_set_property (GObject *objec
          case PROP_AUTO_CENTER:
              priv->map_auto_center = g_value_get_boolean (value);
              break;
+         case PROP_DOUBLE_PIXEL:
+             priv->double_pixel = g_value_get_boolean (value);
+             osm_gps_map_map_redraw_idle(map);
+             break;
          case PROP_RECORD_TRIP_HISTORY:
              priv->record_trip_history = g_value_get_boolean (value);
              break;
-Line 2064 
 osm_gps_map_set_property (GObject *objec
+Line 1687 
 osm_gps_map_set_property (GObject *objec
                  priv->proxy_uri = g_value_dup_string (value);
                  g_debug("Setting proxy server: %s", priv->proxy_uri);
- #ifndef LIBSOUP22
+ #if USE_LIBSOUP22
+                 SoupUri* uri = soup_uri_new(priv->proxy_uri);
+                 g_object_set(G_OBJECT(priv->soup_session), SOUP_SESSION_PROXY_URI, uri, NULL);
+ #else
                  GValue val = {0};
                  SoupURI* uri = soup_uri_new(priv->proxy_uri);
                  g_value_init(&val, SOUP_TYPE_URI);
                  g_value_take_boxed(&val, uri);
                  g_object_set_property(G_OBJECT(priv->soup_session),SOUP_SESSION_PROXY_URI,&val);
- #else
-                 SoupUri* uri = soup_uri_new(priv->proxy_uri);
-                 g_object_set(G_OBJECT(priv->soup_session), SOUP_SESSION_PROXY_URI, uri, NULL);
  #endif
              } else
                  priv->proxy_uri = NULL;
              break;
          case PROP_TILE_CACHE_DIR:
-             if ( g_value_get_string(value) )
+             priv->tile_dir = g_value_dup_string (value);
-                 priv->cache_dir = g_value_dup_string (value);
              break;
-         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:
+         case PROP_TILE_CACHE_BASE_DIR:
-             priv->cache_dir_is_full_path = g_value_get_boolean (value);
+             priv->tile_base_dir = g_value_dup_string (value);
              break;
+         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:
+              g_warning("GObject property tile-cache-is-full-path depreciated");
+              break;
          case PROP_ZOOM:
              priv->map_zoom = g_value_get_int (value);
              break;
-Line 2098 
 osm_gps_map_set_property (GObject *objec
+Line 1721 
 osm_gps_map_set_property (GObject *objec
              break;
          case PROP_MAP_X:
              priv->map_x = g_value_get_int (value);
-             priv->center_coord_set = FALSE;
+             center_coord_update(map);
              break;
          case PROP_MAP_Y:
              priv->map_y = g_value_get_int (value);
-             priv->center_coord_set = FALSE;
+             center_coord_update(map);
              break;
          case PROP_GPS_TRACK_WIDTH:
              priv->ui_gps_track_width = g_value_get_int (value);
-Line 2113 
 osm_gps_map_set_property (GObject *objec
+Line 1736 
 osm_gps_map_set_property (GObject *objec
          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;
+         case PROP_DRAG_LIMIT:
+             priv->drag_limit = g_value_get_int (value);
+             break;
          default:
              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
              break;
-Line 2129 
 static void
+Line 1777 
 static void
  osm_gps_map_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
  {
      g_return_if_fail (OSM_IS_GPS_MAP (object));
-     float lat,lon;
      OsmGpsMap *map = OSM_GPS_MAP(object);
      OsmGpsMapPrivate *priv = map->priv;
      switch (prop_id)
      {
+         case PROP_DOUBLE_PIXEL:
+             g_value_set_boolean(value, priv->double_pixel);
+             break;
          case PROP_AUTO_CENTER:
              g_value_set_boolean(value, priv->map_auto_center);
              break;
-Line 2156 
 osm_gps_map_get_property (GObject *objec
+Line 1806 
 osm_gps_map_get_property (GObject *objec
          case PROP_TILE_CACHE_DIR:
              g_value_set_string(value, priv->cache_dir);
              break;
+         case PROP_TILE_CACHE_BASE_DIR:
+             g_value_set_string(value, priv->tile_base_dir);
+             break;
          case PROP_TILE_CACHE_DIR_IS_FULL_PATH:
-             g_value_set_boolean(value, priv->cache_dir_is_full_path);
+             g_value_set_boolean(value, FALSE);
              break;
          case PROP_ZOOM:
              g_value_set_int(value, priv->map_zoom);
-Line 2169 
 osm_gps_map_get_property (GObject *objec
+Line 1822 
 osm_gps_map_get_property (GObject *objec
              g_value_set_int(value, priv->min_zoom);
              break;
          case PROP_LATITUDE:
-             lat = pixel2lat(priv->map_zoom,
+             g_value_set_float(value, rad2deg(priv->center_rlat));
-                             priv->map_y + (GTK_WIDGET(map)->allocation.height / 2));
-             g_value_set_float(value, rad2deg(lat));
              break;
          case PROP_LONGITUDE:
-             lon = pixel2lon(priv->map_zoom,
+             g_value_set_float(value, rad2deg(priv->center_rlon));
-                             priv->map_x + (GTK_WIDGET(map)->allocation.width / 2));
-             g_value_set_float(value, rad2deg(lon));
              break;
          case PROP_MAP_X:
              g_value_set_int(value, priv->map_x);
-Line 2202 
 osm_gps_map_get_property (GObject *objec
+Line 1851 
 osm_gps_map_get_property (GObject *objec
          case PROP_IMAGE_FORMAT:
              g_value_set_string(value, priv->image_format);
              break;
+         case PROP_DRAG_LIMIT:
+             g_value_set_int(value, priv->drag_limit);
+             break;
          default:
              G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
              break;
-Line 2212 
 static gboolean
+Line 1864 
 static gboolean
  osm_gps_map_scroll_event (GtkWidget *widget, GdkEventScroll  *event)
  {
      OsmGpsMap *map = OSM_GPS_MAP(widget);
-     OsmGpsMapPrivate *priv = map->priv;
      if (event->direction == GDK_SCROLL_UP)
-     {
+         osm_gps_map_zoom_in(map);
-         osm_gps_map_set_zoom(map, priv->map_zoom+1);
+     else if (event->direction == GDK_SCROLL_DOWN)
-     }
+         osm_gps_map_zoom_out(map);
-     else
-     {
-         osm_gps_map_set_zoom(map, priv->map_zoom-1);
-     }
      return FALSE;
  }
-Line 2229 
 osm_gps_map_scroll_event (GtkWidget *wid
+Line 1876 
 osm_gps_map_scroll_event (GtkWidget *wid
  static gboolean
  osm_gps_map_button_press (GtkWidget *widget, GdkEventButton *event)
  {
-     OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
+     OsmGpsMap *map = OSM_GPS_MAP(widget);
+     OsmGpsMapPrivate *priv = map->priv;
- #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
-     #define SCROLL_STEP 10
      /* pressed inside OSD control? */
-     osd_button_t but = osm_gps_map_osd_check(event->x, event->y);
+     if(priv->osd) {
-     if(but != OSD_NONE)
+         osd_button_t but =
-     {
+             priv->osd->check(priv->osd, TRUE, event->x, event->y);
-         priv->drag_counter = -1;
-         switch(but) {
+         if(but != OSD_NONE)
-         case OSD_GPS:
+         {
-             priv->osd.cb(priv->osd.data);
+             int step =
-             break;
+                 GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
+             priv->drag_counter = -1;
-         case OSD_UP:
-             priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;
+             switch(but) {
-             priv->center_coord_set = FALSE;
+             case OSD_UP:
-             break;
+                 priv->map_y -= step;
+                 center_coord_update(map);
-         case OSD_DOWN:
+                 g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
-             priv->map_y += GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;
+                 osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
-             priv->center_coord_set = FALSE;
+                 break;
-             break;
-         case OSD_LEFT:
-             priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;
-             priv->center_coord_set = FALSE;
-             break;
-         case OSD_RIGHT:
-             priv->map_x += GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;
-             priv->center_coord_set = FALSE;
-             break;
-         case OSD_IN:
-             osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
-             break;
-         case OSD_OUT:
+             case OSD_DOWN:
-             osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
+                 priv->map_y += step;
-             break;
+                 center_coord_update(map);
+                 g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
+                 osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
+                 break;
-         default:
+             case OSD_LEFT:
-             break;
+                 priv->map_x -= step;
+                 center_coord_update(map);
+                 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(map);
+                 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;
          }
-         osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
-         return FALSE;
      }
  #endif
+     priv->button_down = TRUE;
      priv->drag_counter = 0;
      priv->drag_start_mouse_x = (int) event->x;
      priv->drag_start_mouse_y = (int) event->y;
-Line 2306 
 osm_gps_map_button_press (GtkWidget *wid
+Line 1953 
 osm_gps_map_button_press (GtkWidget *wid
  static gboolean
  osm_gps_map_button_release (GtkWidget *widget, GdkEventButton *event)
  {
+     OsmGpsMap *map = OSM_GPS_MAP(widget);
      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
- #ifdef ENABLE_BALLOON
+     if(!priv->button_down)
-     /* released inside the balloon? */
+         return FALSE;
-     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)
      {
-Line 2330 
 osm_gps_map_button_release (GtkWidget *w
+Line 1969 
 osm_gps_map_button_release (GtkWidget *w
          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(map);
-         osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
+         osm_gps_map_map_redraw_idle(map);
      }
+ #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;
+     priv->button_down = 0;
      return FALSE;
  }
-Line 2346 
 static gboolean
+Line 1993 
 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;
      GdkModifierType state;
      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
+     if(!priv->button_down)
+         return FALSE;
      if (event->is_hint)
          gdk_window_get_pointer (event->window, &x, &y, &state);
      else
-Line 2368 
 osm_gps_map_motion_notify (GtkWidget *wi
+Line 2028 
 osm_gps_map_motion_notify (GtkWidget *wi
      if (priv->drag_counter < 0)
          return FALSE;
-     priv->drag_counter++;
+     /* not yet dragged far enough? */
+     if(!priv->drag_counter &&
-     // we havent dragged more than 6 pixels
+        ( (x - priv->drag_start_mouse_x) * (x - priv->drag_start_mouse_x) +
-     if (priv->drag_counter < 6)
+          (y - priv->drag_start_mouse_y) * (y - priv->drag_start_mouse_y) <
+          priv->drag_limit*priv->drag_limit))
          return FALSE;
- #ifdef USE_MAEMO
+     priv->drag_counter++;
-     /* reduce update frequency on maemo to keep screen update fluid */
-     static guint32 last_time = 0;
-     if(event->time - last_time < 100) return FALSE;
-     last_time = event->time;
- #endif
      priv->dragging = TRUE;
-Line 2390 
 osm_gps_map_motion_notify (GtkWidget *wi
+Line 2045 
 osm_gps_map_motion_notify (GtkWidget *wi
      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
- #ifdef ENABLE_OSD
+     /* instead of redrawing directly just add an idle function */
-     /* undo OSD */
+     if (!priv->drag_expose)
-     osm_gps_map_osd_restore (OSM_GPS_MAP(widget));
+         priv->drag_expose =
+             g_idle_add ((GSourceFunc)osm_gps_map_map_expose, widget);
-     /* draw new OSD */
-     osm_gps_map_osd_draw_controls (OSM_GPS_MAP(widget),
-                                    -priv->drag_mouse_dx,
-                                    -priv->drag_mouse_dy);
- #endif
-     osm_gps_map_expose (widget, NULL);
      return FALSE;
  }
-Line 2416 
 osm_gps_map_configure (GtkWidget *widget
+Line 2063 
 osm_gps_map_configure (GtkWidget *widget
          g_object_unref (priv->pixmap);
      priv->pixmap = gdk_pixmap_new (
-                                    widget->window,
+                         widget->window,
-                                    widget->allocation.width + EXTRA_BORDER * 2,
+                         widget->allocation.width + EXTRA_BORDER * 2,
-                                    widget->allocation.height + EXTRA_BORDER * 2,
+                         widget->allocation.height + EXTRA_BORDER * 2,
-                                    -1);
+                         -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)
-Line 2429 
 osm_gps_map_configure (GtkWidget *widget
+Line 2101 
 osm_gps_map_configure (GtkWidget *widget
      osm_gps_map_map_redraw(OSM_GPS_MAP(widget));
+     g_signal_emit_by_name(widget, "changed");
      return FALSE;
  }
  static gboolean
  osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event)
  {
-     OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
+     OsmGpsMap *map = OSM_GPS_MAP(widget);
+     OsmGpsMapPrivate *priv = map->priv;
-     gdk_draw_drawable (
+ #ifdef OSD_DOUBLE_BUFFER
-                        widget->window,
+     GdkDrawable *drawable = priv->dbuf_pixmap;
-                        widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+ #else
-                        priv->pixmap,
+     GdkDrawable *drawable = widget->window;
-,0,
+ #endif
-                        priv->drag_mouse_dx - EXTRA_BORDER,
-                        priv->drag_mouse_dy - EXTRA_BORDER,
+ #ifdef DRAG_DEBUG
-                        -1,-1);
+     printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
+ #endif
-     //Paint white outside of the map if dragging. Its less
-     //ugly than painting the corrupted map
+     if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
-     if(priv->drag_mouse_dx>EXTRA_BORDER) {
+     {
-         gdk_draw_rectangle (
+ #ifdef DRAG_DEBUG
-                             widget->window,
+         printf("  dragging = %d, event = %p\n", priv->dragging, event);
-                             widget->style->white_gc,
+ #endif
-                             TRUE,
-, 0,
+         gdk_draw_drawable (drawable,
-                             priv->drag_mouse_dx - EXTRA_BORDER,
+                            widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-                             widget->allocation.height);
+                            priv->pixmap,
-     }
+                            event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
-     else if (-priv->drag_mouse_dx > EXTRA_BORDER)
+                            event->area.x, event->area.y,
-     {
+                            event->area.width, event->area.height);
-         gdk_draw_rectangle (
+     }
-                             widget->window,
+     else
-                             widget->style->white_gc,
+     {
-                             TRUE,
+ #ifdef DRAG_DEBUG
-                             priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
+         printf("  drag_mouse %d/%d\n",
-                             -priv->drag_mouse_dx - EXTRA_BORDER,
+                priv->drag_mouse_dx - EXTRA_BORDER,
-                             widget->allocation.height);
+                priv->drag_mouse_dy - EXTRA_BORDER);
-     }
+ #endif
-     if (priv->drag_mouse_dy>EXTRA_BORDER) {
+         gdk_draw_drawable (drawable,
-         gdk_draw_rectangle (
+                            widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-                             widget->window,
+                            priv->pixmap,
-                             widget->style->white_gc,
+,0,
-                             TRUE,
+                            priv->drag_mouse_dx - EXTRA_BORDER,
-, 0,
+                            priv->drag_mouse_dy - EXTRA_BORDER,
-                             widget->allocation.width,
+                            -1,-1);
-                             priv->drag_mouse_dy - EXTRA_BORDER);
-     }
+         //Paint white outside of the map if dragging. Its less
-     else if (-priv->drag_mouse_dy > EXTRA_BORDER)
+         //ugly than painting the corrupted map
-     {
+         if(priv->drag_mouse_dx>EXTRA_BORDER) {
-         gdk_draw_rectangle (
+             gdk_draw_rectangle (drawable,
-                             widget->window,
+                                 widget->style->white_gc,
-                             widget->style->white_gc,
+                                 TRUE,
-                             TRUE,
+, 0,
-, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
+                                 priv->drag_mouse_dx - EXTRA_BORDER,
-                             widget->allocation.width,
+                                 widget->allocation.height);
-                             -priv->drag_mouse_dy - EXTRA_BORDER);
+         }
-     }
+         else if (-priv->drag_mouse_dx > EXTRA_BORDER)
- #if 0
+         {
-     if(!priv->dragging)
+             gdk_draw_rectangle (drawable,
-         gdk_draw_drawable (
+                                 widget->style->white_gc,
-                        widget->window,
+                                 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,
+                                 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,
+, 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,
+                        priv->dbuf_pixmap,
-                        event->area.x + EXTRA_BORDER,
+,0,0,0,-1,-1);
-                        event->area.y + EXTRA_BORDER,
-                        event->area.x, event->area.y,
-                        event->area.width, event->area.height);
  #endif
+ #endif
      return FALSE;
  }
-Line 2523 
 osm_gps_map_class_init (OsmGpsMapClass *
+Line 2229 
 osm_gps_map_class_init (OsmGpsMapClass *
      widget_class->scroll_event = osm_gps_map_scroll_event;
      g_object_class_install_property (object_class,
+                                      PROP_DOUBLE_PIXEL,
+                                      g_param_spec_boolean ("double-pixel",
+                                                            "double pixel",
+                                                            "double map pixels for better readability",
+                                                            FALSE,
+                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+     g_object_class_install_property (object_class,
                                       PROP_AUTO_CENTER,
                                       g_param_spec_boolean ("auto-center",
                                                             "auto center",
-Line 2575 
 osm_gps_map_class_init (OsmGpsMapClass *
+Line 2290 
 osm_gps_map_class_init (OsmGpsMapClass *
                                       g_param_spec_string ("tile-cache",
                                                            "tile cache",
                                                            "osm local tile cache dir",
-                                                           NULL,
+                                                           OSM_GPS_MAP_CACHE_AUTO,
                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
      g_object_class_install_property (object_class,
-                                      PROP_TILE_CACHE_DIR_IS_FULL_PATH,
+                                      PROP_TILE_CACHE_BASE_DIR,
-                                      g_param_spec_boolean ("tile-cache-is-full-path",
+                                      g_param_spec_string ("tile-cache-base",
-                                                            "tile cache is full path",
+                                                           "tile cache-base",
-                                                            "if true, the path passed to tile-cache is interpreted as the full cache path",
+                                                           "base directory to which friendly and auto paths are appended",
-                                                            FALSE,
+                                                           NULL,
-                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+                                                           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",
+                                                             "DEPRECIATED",
+                                                             FALSE,
+                                                             G_PARAM_READABLE | G_PARAM_WRITABLE));
      g_object_class_install_property (object_class,
                                       PROP_ZOOM,
                                       g_param_spec_int ("zoom",
                                                         "zoom",
-                                                        "zoom level",
+                                                        "initial zoom level",
                                                         MIN_ZOOM, /* minimum property value */
                                                         MAX_ZOOM, /* maximum property value */
 ,
-Line 2683 
 osm_gps_map_class_init (OsmGpsMapClass *
+Line 2406 
 osm_gps_map_class_init (OsmGpsMapClass *
                                                         "radius of the gps point inner circle",
 ,           /* minimum property value */
                                                         G_MAXINT,    /* maximum property value */
 ,
                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
      g_object_class_install_property (object_class,
-Line 2701 
 osm_gps_map_class_init (OsmGpsMapClass *
+Line 2424 
 osm_gps_map_class_init (OsmGpsMapClass *
                                       g_param_spec_int ("map-source",
                                                         "map source",
                                                         "map source ID",
-                                                        -1,           /* minimum property value */
+                                                        -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,
-Line 2713 
 osm_gps_map_class_init (OsmGpsMapClass *
+Line 2436 
 osm_gps_map_class_init (OsmGpsMapClass *
                                                            "map source tile repository image format (jpg, png)",
                                                            OSM_IMAGE_FORMAT,
                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+     g_object_class_install_property (object_class,
+                                      PROP_DRAG_LIMIT,
+                                      g_param_spec_int ("drag-limit",
+                                                        "drag limit",
+                                                        "the number of pixels the user has to move the pointer in order to start dragging",
+,           /* minimum property value */
+                                                        G_MAXINT,    /* maximum property value */
+,
+                                                        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+     g_signal_new ("changed", OSM_TYPE_GPS_MAP,
+                   G_SIGNAL_RUN_FIRST, 0, NULL, NULL,
+                   g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
  }
  const char*
-Line 2723 
 osm_gps_map_source_get_friendly_name(Osm
+Line 2460 
 osm_gps_map_source_get_friendly_name(Osm
          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";
+             return "OpenStreetMap II";
          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:
              return "OpenAerialMap";
+         case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
+             return "OpenCycleMap";
+         case OSM_GPS_MAP_SOURCE_OSM_PUBLIC_TRANSPORT:
+             return "Public Transport";
+         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:
-Line 2748 
 osm_gps_map_source_get_friendly_name(Osm
+Line 2491 
 osm_gps_map_source_get_friendly_name(Osm
              return "Yahoo Satellite";
          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
              return "Yahoo Hybrid";
+         case OSM_GPS_MAP_SOURCE_LAST:
          default:
              return NULL;
      }
-Line 2767 
 osm_gps_map_source_get_repo_uri(OsmGpsMa
+Line 2511 
 osm_gps_map_source_get_repo_uri(OsmGpsMa
              return "none://";
          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
              return OSM_REPO_URI;
+         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:
+             /* OpenAerialMap is down, offline till furthur notice
+                http://openaerialmap.org/pipermail/talk_openaerialmap.org/2008-December/000055.html */
+             return NULL;
          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
-         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:
+         case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
-             return "http://tile.openaerialmap.org/tiles/1.0.0/openaerialmap-900913/#Z/#X/#Y.jpg";
+             return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";
+         case OSM_GPS_MAP_SOURCE_OSM_PUBLIC_TRANSPORT:
+             return "http://tile.xn--pnvkarte-m4a.de/tilegen/#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:
              return "http://mt#R.google.com/vt/v=w2.97&x=#X&y=#Y&z=#Z";
-         case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
-             return "http://khm#R.google.com/kh?n=404&v=3&t=#Q";
          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
-             return NULL; /* No longer working  "http://mt#R.google.com/mt?n=404&v=w2t.99&x=#X&y=#Y&zoom=#S" */
+             /* No longer working
+                "http://mt#R.google.com/mt?n=404&v=w2t.99&x=#X&y=#Y&zoom=#S" */
+             return NULL;
+         case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
+             return "http://khm#R.google.com/kh/v=51&x=#X&y=#Y&z=#Z";
          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
              return "http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50";
          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
-Line 2795 
 osm_gps_map_source_get_repo_uri(OsmGpsMa
+Line 2549 
 osm_gps_map_source_get_repo_uri(OsmGpsMa
               *  z = zoom - (MAX_ZOOM - 17));
               */
              return NULL;
+         case OSM_GPS_MAP_SOURCE_LAST:
          default:
              return NULL;
      }
-Line 2808 
 osm_gps_map_source_get_image_format(OsmG
+Line 2563 
 osm_gps_map_source_get_image_format(OsmG
          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_OSM_PUBLIC_TRANSPORT:
+         case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
              return "png";
          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:
          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
-Line 2821 
 osm_gps_map_source_get_image_format(OsmG
+Line 2579 
 osm_gps_map_source_get_image_format(OsmG
          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
              return "jpg";
+         case OSM_GPS_MAP_SOURCE_LAST:
          default:
              return "bin";
      }
-Line 2841 
 osm_gps_map_source_get_max_zoom(OsmGpsMa
+Line 2600 
 osm_gps_map_source_get_max_zoom(OsmGpsMa
          case OSM_GPS_MAP_SOURCE_NULL:
              return 18;
          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
+         case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
+         case OSM_GPS_MAP_SOURCE_OSM_PUBLIC_TRANSPORT:
              return OSM_MAX_ZOOM;
          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:
-Line 2853 
 osm_gps_map_source_get_max_zoom(OsmGpsMa
+Line 2614 
 osm_gps_map_source_get_max_zoom(OsmGpsMa
          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:
              return 18;
+         case OSM_GPS_MAP_SOURCE_LAST:
          default:
              return 17;
      }
      return 17;
  }
+ gboolean
+ osm_gps_map_source_is_valid(OsmGpsMapSource_t source)
+ {
+     return osm_gps_map_source_get_repo_uri(source) != NULL;
+ }
  void
  osm_gps_map_download_maps (OsmGpsMap *map, coord_t *pt1, coord_t *pt2, int zoom_start, int zoom_end)
  {
-Line 2899 
 osm_gps_map_download_maps (OsmGpsMap *ma
+Line 2669 
 osm_gps_map_download_maps (OsmGpsMap *ma
                                      i, G_DIR_SEPARATOR,
                                      j,
                                      priv->image_format);
-                     if (!g_file_test(filename, G_FILE_TEST_EXISTS))
+                     if ((!g_file_test(filename, G_FILE_TEST_EXISTS)) ||
+                         osm_gps_map_tile_age_exceeded(filename))
                      {
                          osm_gps_map_download_tile(map, zoom, i, j, FALSE);
                          num_tiles++;
                      }
                      g_free(filename);
                  }
              }
-Line 2943 
 osm_gps_map_set_center (OsmGpsMap *map,
+Line 2716 
 osm_gps_map_set_center (OsmGpsMap *map,
      g_return_if_fail (OSM_IS_GPS_MAP (map));
      priv = map->priv;
+     g_object_set(G_OBJECT(map), "auto-center", FALSE, NULL);
      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);
-Line 2955 
 osm_gps_map_set_center (OsmGpsMap *map,
+Line 2729 
 osm_gps_map_set_center (OsmGpsMap *map,
      priv->map_y = pixel_y - GTK_WIDGET(map)->allocation.height/2;
      osm_gps_map_map_redraw_idle(map);
+     g_signal_emit_by_name(map, "changed");
  }
  int
-Line 2977 
 osm_gps_map_set_zoom (OsmGpsMap *map, in
+Line 2753 
 osm_gps_map_set_zoom (OsmGpsMap *map, in
          //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;
-             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;
-         }
+         factor = pow(2, priv->map_zoom-zoom_old);
          g_debug("Zoom changed from %d to %d factor:%f x:%d",
                  zoom_old, priv->map_zoom, factor, priv->map_x);
+         /* adjust gps precision indicator */
+         priv->ui_gps_point_outer_radius *= factor;
+ #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);
+         g_signal_emit_by_name(map, "changed");
      }
      return priv->map_zoom;
  }
+ int
+ osm_gps_map_zoom_in (OsmGpsMap *map)
+ {
+     g_return_val_if_fail (OSM_IS_GPS_MAP (map), 0);
+     return osm_gps_map_set_zoom(map, map->priv->map_zoom+1);
+ }
+ int
+ osm_gps_map_zoom_out (OsmGpsMap *map)
+ {
+     g_return_val_if_fail (OSM_IS_GPS_MAP (map), 0);
+     return osm_gps_map_set_zoom(map, map->priv->map_zoom-1);
+ }
  void
  osm_gps_map_add_track (OsmGpsMap *map, GSList *track)
  {
-Line 3012 
 osm_gps_map_add_track (OsmGpsMap *map, G
+Line 2805 
 osm_gps_map_add_track (OsmGpsMap *map, G
  }
  void
+ osm_gps_map_replace_track (OsmGpsMap *map, GSList *old_track, GSList *new_track)
+ {
+     OsmGpsMapPrivate *priv;
+     if(!old_track) {
+         osm_gps_map_add_track (map, new_track);
+         return;
+     }
+     g_return_if_fail (OSM_IS_GPS_MAP (map));
+     priv = map->priv;
+     GSList *old = g_slist_find(priv->tracks, old_track);
+     if(!old) {
+         g_warning("track to be replaced not found");
+         return;
+     }
+     old->data = new_track;
+     osm_gps_map_map_redraw_idle(map);
+ }
+ void
  osm_gps_map_clear_tracks (OsmGpsMap *map)
  {
      g_return_if_fail (OSM_IS_GPS_MAP (map));
-Line 3021 
 osm_gps_map_clear_tracks (OsmGpsMap *map
+Line 2837 
 osm_gps_map_clear_tracks (OsmGpsMap *map
  }
  void
- osm_gps_map_add_image (OsmGpsMap *map, float latitude, float longitude, GdkPixbuf *image)
+ osm_gps_map_add_image_with_alignment (OsmGpsMap *map, float latitude, float longitude, GdkPixbuf *image, float xalign, float yalign)
  {
      g_return_if_fail (OSM_IS_GPS_MAP (map));
-Line 3036 
 osm_gps_map_add_image (OsmGpsMap *map, f
+Line 2852 
 osm_gps_map_add_image (OsmGpsMap *map, f
          im->pt.rlat = deg2rad(latitude);
          im->pt.rlon = deg2rad(longitude);
+         //handle alignment
+         im->xoffset = xalign * im->w;
+         im->yoffset = yalign * im->h;
          g_object_ref(image);
          im->image = image;
-Line 3045 
 osm_gps_map_add_image (OsmGpsMap *map, f
+Line 2865 
 osm_gps_map_add_image (OsmGpsMap *map, f
      }
  }
+ void
+ osm_gps_map_add_image (OsmGpsMap *map, float latitude, float longitude, GdkPixbuf *image)
+ {
+     osm_gps_map_add_image_with_alignment (map, latitude, longitude, image, 0.5, 0.5);
+ }
  gboolean
  osm_gps_map_remove_image (OsmGpsMap *map, GdkPixbuf *image)
  {
-Line 3077 
 osm_gps_map_clear_images (OsmGpsMap *map
+Line 2903 
 osm_gps_map_clear_images (OsmGpsMap *map
  }
  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,
-                        width+10,width+10);
-     gdk_draw_layout(GTK_WIDGET(map)->window,
-                     gc,
-, 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;
-Line 3149 
 osm_gps_map_draw_gps (OsmGpsMap *map, fl
+Line 2914 
 osm_gps_map_draw_gps (OsmGpsMap *map, fl
      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);
-Line 3179 
 osm_gps_map_draw_gps (OsmGpsMap *map, fl
+Line 2945 
 osm_gps_map_draw_gps (OsmGpsMap *map, fl
              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(map);
          }
      }
-Line 3238 
 osm_gps_map_geographic_to_screen (OsmGps
+Line 3004 
 osm_gps_map_geographic_to_screen (OsmGps
      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
-Line 3251 
 osm_gps_map_scroll (OsmGpsMap *map, gint
+Line 3019 
 osm_gps_map_scroll (OsmGpsMap *map, gint
      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(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);
  }
-Line 3263 
 osm_gps_map_get_scale(OsmGpsMap *map)
+Line 3037 
 osm_gps_map_get_scale(OsmGpsMap *map)
  {
      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
+ char * osm_gps_map_get_default_cache_directory(void)
- void
- osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
-                           OsmGpsMapBalloonCallback cb, gpointer data)
  {
-     OsmGpsMapPrivate *priv;
+     return g_build_filename(
+                         g_get_user_cache_dir(),
-     /* remove and previously installed balloon */
+                         "osmgpsmap",
-     osm_gps_map_clear_balloon (map);
+                         NULL);
+ }
+ void osm_gps_map_set_keyboard_shortcut(OsmGpsMap *map, OsmGpsMapKey_t key, guint keyval)
+ {
      g_return_if_fail (OSM_IS_GPS_MAP (map));
-     priv = map->priv;
+     g_return_if_fail(key < OSM_GPS_MAP_KEY_MAX);
-     priv->balloon.coo->rlat = deg2rad(latitude);
+     map->priv->keybindings[key] = keyval;
-     priv->balloon.coo->rlon = deg2rad(longitude);
+     map->priv->keybindings_enabled = TRUE;
-     priv->balloon.valid = TRUE;
+ }
-     priv->balloon.cb = cb;
+ #ifdef ENABLE_OSD
-     priv->balloon.data = data;
-     // this redraws the map
+ 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_clear_balloon (OsmGpsMap *map)
+ 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->balloon.valid = FALSE;
+     priv->osd = osd;
-     osm_gps_map_map_redraw_idle(map);
  }
- #endif
- #ifdef ENABLE_OSD
- void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdGpsCallback cb, gpointer data) {
-     OsmGpsMapPrivate *priv;
-     g_return_if_fail (OSM_IS_GPS_MAP (map));
+ void
-     priv = map->priv;
+ osm_gps_map_repaint (OsmGpsMap *map)
+ {
-     priv->osd.cb = cb;
+     osm_gps_map_expose (GTK_WIDGET(map), NULL);
-     priv->osd.data = data;
+ }
-     /* this may have changed the state of the gps button */
+ coord_t *
-     /* we thus re-render the overlay */
+ osm_gps_map_get_gps (OsmGpsMap *map)
-     osm_gps_map_osd_render(priv);
+ {
+     g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
-     osm_gps_map_map_redraw_idle(map);
+     if(!map->priv->gps_valid)
+         return NULL;
+     return map->priv->gps;
  }
  #endif

 Legend:



Removed from v.68
 


changed lines


 
Added in v.280
 Legend:



Removed from v.68
 


changed lines


 
Added in v.280
-Removed from v.68
+Added in v.280