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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 68 by harbaum, Thu Aug 20 09:54:10 2009 UTC revision 121 by harbaum, Sun Sep 20 19:26:29 2009 UTC
# Line 49  Line 49 
49    
50  #define EXTRA_BORDER (TILESIZE / 2)  #define EXTRA_BORDER (TILESIZE / 2)
51    
52    #define OSM_GPS_MAP_SCROLL_STEP 10
53    
54    /* any defined key enables key support */
55    #if (defined(OSM_GPS_MAP_KEY_FULLSCREEN) || \
56         defined(OSM_GPS_MAP_KEY_ZOOMIN) || \
57         defined(OSM_GPS_MAP_KEY_ZOOMOUT) || \
58         defined(OSM_GPS_MAP_KEY_UP) || \
59         defined(OSM_GPS_MAP_KEY_DOWN) || \
60         defined(OSM_GPS_MAP_KEY_LEFT) || \
61         defined(OSM_GPS_MAP_KEY_RIGHT))
62    #define OSM_GPS_MAP_KEYS
63    #endif
64    
65    #ifdef OSM_GPS_MAP_KEYS
66    #include <gdk/gdkkeysyms.h>
67    #endif
68    
69    #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"
70    
71  struct _OsmGpsMapPrivate  struct _OsmGpsMapPrivate
72  {  {
73      GHashTable *tile_queue;      GHashTable *tile_queue;
# Line 78  struct _OsmGpsMapPrivate Line 97  struct _OsmGpsMapPrivate
97      char *proxy_uri;      char *proxy_uri;
98    
99      //where downloaded tiles are cached      //where downloaded tiles are cached
100        char *tile_dir;
101      char *cache_dir;      char *cache_dir;
     gboolean cache_dir_is_full_path;  
102    
103      //contains flags indicating the various special characters      //contains flags indicating the various special characters
104      //the uri string contains, that will be replaced when calculating      //the uri string contains, that will be replaced when calculating
# Line 96  struct _OsmGpsMapPrivate Line 115  struct _OsmGpsMapPrivate
115      gboolean show_trip_history;      gboolean show_trip_history;
116      GSList *trip_history;      GSList *trip_history;
117      coord_t *gps;      coord_t *gps;
118        float gps_heading;
119      gboolean gps_valid;      gboolean gps_valid;
120    
 #ifdef ENABLE_BALLOON  
     //a balloon with additional info  
     struct {  
         coord_t *coo;  
         gboolean valid;  
         OsmGpsMapRect_t rect;  
         OsmGpsMapBalloonCallback cb;  
         gpointer data;  
     } balloon;  
 #endif  
   
121  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
122      //the osd controls      //the osd controls (if present)
123      struct {      osm_gps_map_osd_t *osd;
124          GdkPixmap *backup;  #ifdef OSD_DOUBLE_BUFFER
125          cairo_surface_t *overlay;      GdkPixmap *dbuf_pixmap;
126          gint backup_x, backup_y;  #endif
         OsmGpsMapOsdGpsCallback cb;  
         gpointer data;  
     } osd;  
127  #endif  #endif
128    
129    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
130        gboolean fullscreen;
131    #endif
132    
133      //additional images or tracks added to the map      //additional images or tracks added to the map
134      GSList *tracks;      GSList *tracks;
135      GSList *images;      GSList *images;
# Line 139  struct _OsmGpsMapPrivate Line 149  struct _OsmGpsMapPrivate
149      int drag_start_mouse_y;      int drag_start_mouse_y;
150      int drag_start_map_x;      int drag_start_map_x;
151      int drag_start_map_y;      int drag_start_map_y;
152        guint drag_expose;
153    
154      //for customizing the redering of the gps track      //for customizing the redering of the gps track
155      int ui_gps_track_width;      int ui_gps_track_width;
# Line 171  enum Line 182  enum
182      PROP_REPO_URI,      PROP_REPO_URI,
183      PROP_PROXY_URI,      PROP_PROXY_URI,
184      PROP_TILE_CACHE_DIR,      PROP_TILE_CACHE_DIR,
     PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
185      PROP_ZOOM,      PROP_ZOOM,
186      PROP_MAX_ZOOM,      PROP_MAX_ZOOM,
187      PROP_MIN_ZOOM,      PROP_MIN_ZOOM,
# Line 332  static void Line 342  static void
342  inspect_map_uri(OsmGpsMap *map)  inspect_map_uri(OsmGpsMap *map)
343  {  {
344      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
345        priv->uri_format = 0;
346        priv->the_google = FALSE;
347    
348      if (g_strrstr(priv->repo_uri, URI_MARKER_X))      if (g_strrstr(priv->repo_uri, URI_MARKER_X))
349          priv->uri_format |= URI_HAS_X;          priv->uri_format |= URI_HAS_X;
# Line 568  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 580  osm_gps_map_draw_gps_point (OsmGpsMap *m
580          int x, y;          int x, y;
581          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
582          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
583          // int lw = priv->ui_gps_track_width;          int mr = MAX(3*r,r2);
         int mr = MAX(r,r2);  
584    
585          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
586          map_y0 = priv->map_y - EXTRA_BORDER;          map_y0 = priv->map_y - EXTRA_BORDER;
# Line 600  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 611  osm_gps_map_draw_gps_point (OsmGpsMap *m
611    
612          // draw ball gradient          // draw ball gradient
613          if (r > 0) {          if (r > 0) {
614                // draw direction arrow
615                if(!isnan(priv->gps_heading))
616                {
617                    cairo_move_to (cr, x-r*cos(priv->gps_heading), y-r*sin(priv->gps_heading));
618                    cairo_line_to (cr, x+3*r*sin(priv->gps_heading), y-3*r*cos(priv->gps_heading));
619                    cairo_line_to (cr, x+r*cos(priv->gps_heading), y+r*sin(priv->gps_heading));
620                    cairo_close_path (cr);
621    
622                    cairo_set_source_rgba (cr, 0.3, 0.3, 1.0, 0.5);
623                    cairo_fill_preserve (cr);
624    
625                    cairo_set_line_width (cr, 1.0);
626                    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
627                    cairo_stroke(cr);
628                }
629    
630              pat = cairo_pattern_create_radial (x-(r/5), y-(r/5), (r/5), x,  y, r);              pat = cairo_pattern_create_radial (x-(r/5), y-(r/5), (r/5), x,  y, r);
631              cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1.0);              cairo_pattern_add_color_stop_rgba (pat, 0, 1, 1, 1, 1.0);
632              cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 1, 1.0);              cairo_pattern_add_color_stop_rgba (pat, 1, 0, 0, 1, 1.0);
# Line 613  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 640  osm_gps_map_draw_gps_point (OsmGpsMap *m
640              cairo_arc (cr, x, y, r, 0, 2 * M_PI);              cairo_arc (cr, x, y, r, 0, 2 * M_PI);
641              cairo_stroke(cr);              cairo_stroke(cr);
642          }          }
643    
644          cairo_destroy(cr);          cairo_destroy(cr);
645          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
646                                      x-mr,                                      x-mr,
# Line 655  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 682  osm_gps_map_draw_gps_point (OsmGpsMap *m
682      }      }
683  }  }
684    
 #ifdef ENABLE_BALLOON  
 /* most visual effects are hardcoded by now, but may be made */  
 /* available via properties later */  
 #ifndef BALLOON_AREA_WIDTH  
 #define BALLOON_AREA_WIDTH           290  
 #endif  
 #ifndef BALLOON_AREA_HEIGHT  
 #define BALLOON_AREA_HEIGHT           75  
 #endif  
 #ifndef BALLOON_CORNER_RADIUS  
 #define BALLOON_CORNER_RADIUS         10  
 #endif  
   
 #define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)  
 #define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)  
 #define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)  
 #define BALLOON_TRANSPARENCY         0.8  
 #define POINTER_HEIGHT                20  
 #define POINTER_FOOT_WIDTH            20  
 #define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)  
 #define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)  
 #define BALLOON_SHADOW_TRANSPARENCY  0.2  
   
 #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)  
   
   
 /* draw the bubble shape. this is used twice, once for the shape and once */  
 /* for the shadow */  
 static void  
 osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,  
        gboolean bottom, int px, int py, int px0, int px1) {  
   
     cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);  
     cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,  
                BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);  
     if(!bottom) {  
         /* insert top pointer */  
         cairo_line_to (cr, px1, y0);  
         cairo_line_to (cr, px, py);  
         cairo_line_to (cr, px0, y0);  
     }  
   
     cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);  
     cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,  
                BALLOON_CORNER_RADIUS, -M_PI/2, 0);  
     cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);  
     cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,  
                BALLOON_CORNER_RADIUS, 0, M_PI/2);  
     if(bottom) {  
         /* insert bottom pointer */  
         cairo_line_to (cr, px0, y1);  
         cairo_line_to (cr, px, py);  
         cairo_line_to (cr, px1, y1);  
     }  
   
     cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);  
     cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,  
                BALLOON_CORNER_RADIUS, M_PI/2, M_PI);  
   
     cairo_close_path (cr);  
 }  
   
 static void  
 osm_gps_map_draw_balloon_int (OsmGpsMap *map)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
   
     if (priv->balloon.valid) {  
   
         /* ------- convert given coordinate into screen position --------- */  
         int x0 = lon2pixel(priv->map_zoom, priv->balloon.coo->rlon) -  
             priv->map_x + EXTRA_BORDER;  
         int y0 = lat2pixel(priv->map_zoom, priv->balloon.coo->rlat) -  
             priv->map_y + EXTRA_BORDER;  
   
         /* check position of this relative to screen center to determine */  
         /* pointer direction ... */  
         int pointer_x = x0, pointer_x0, pointer_x1;  
         int pointer_y = y0;  
   
         /* ... and calculate position */  
         if((x0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.width/2) {  
             x0 -= BALLOON_WIDTH - POINTER_OFFSET;  
             pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET);  
             pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH;  
         } else {  
             x0 -= POINTER_OFFSET;  
             pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET);  
             pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH;  
         }  
   
         gboolean bottom = FALSE;  
         if((y0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.height/2) {  
             bottom = TRUE;  
             y0 -= BALLOON_HEIGHT + POINTER_HEIGHT;  
         } else  
             y0 += POINTER_HEIGHT;  
   
         /* calculate bottom/right of box */  
         int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;  
   
         /* save balloon screen coordinates for later use */  
         priv->balloon.rect.x = x0 + BALLOON_BORDER;  
         priv->balloon.rect.y = y0 + BALLOON_BORDER;  
         priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;  
         priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;  
   
 #ifdef USE_CAIRO  
         cairo_t *cr = gdk_cairo_create(priv->pixmap);  
   
         /* --------- draw shadow --------------- */  
         osm_gps_map_draw_balloon_shape (cr,  
                     x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW,  
                     x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW,  
                     bottom, pointer_x, pointer_y,  
                     pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW);  
   
         cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY);  
         cairo_fill_preserve (cr);  
         cairo_set_source_rgba (cr, 1, 0, 0, 1.0);  
         cairo_set_line_width (cr, 0);  
         cairo_stroke (cr);  
   
         /* --------- draw main shape ----------- */  
         osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1,  
                     bottom, pointer_x, pointer_y, pointer_x0, pointer_x1);  
   
         cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY);  
         cairo_fill_preserve (cr);  
         cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY);  
         cairo_set_line_width (cr, 1);  
         cairo_stroke (cr);  
   
   
         /* ---------- draw close button --------- */  
   
         int cx = x1 - BALLOON_BORDER - CLOSE_BUTTON_RADIUS;  
         int cy = y0 + BALLOON_BORDER + CLOSE_BUTTON_RADIUS;  
         int crad = CLOSE_BUTTON_RADIUS;  
   
         cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI);  
         cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0);  
         cairo_fill_preserve (cr);  
         cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0);  
         cairo_set_line_width (cr, 2);  
         cairo_stroke(cr);  
   
         cairo_set_source_rgba (cr, 1, 1, 1, 1.0);  
         cairo_set_line_width (cr, BALLOON_CORNER_RADIUS/3.3);  
         cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);  
         cairo_move_to (cr, cx - crad/2, cy - crad/2);  
         cairo_line_to (cr, cx + crad/2, cy + crad/2);  
         cairo_stroke (cr);  
         cairo_move_to (cr, cx + crad/2, cy - crad/2);  
         cairo_line_to (cr, cx - crad/2, cy + crad/2);  
         cairo_stroke (cr);  
   
         if (priv->balloon.cb) {  
             /* clip in case application tries to draw in */  
             /* exceed of the balloon */  
             cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,  
                              priv->balloon.rect.w, priv->balloon.rect.h);  
             cairo_clip (cr);  
             cairo_new_path (cr);  /* current path is not  
                                      consumed by cairo_clip() */  
   
             priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);  
         }  
   
         cairo_destroy(cr);  
   
         gtk_widget_queue_draw_area (GTK_WIDGET(map),  
                                     x0, y0, BALLOON_WIDTH,  
                                     BALLOON_HEIGHT + POINTER_HEIGHT);  
 #else  
 #warning "Balloon display lacks a non-cairo implementation!"  
 #endif  
     }  
 }  
   
 /* the user clicked into the balloons main area. handle this */  
 static void  
 osm_gps_map_handle_balloon_click(OsmGpsMap *map, gint x, gint y)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
   
     if (!priv->balloon.valid)  
         return;  
   
     /* check if the close button was clicked */  
     if ((x > priv->balloon.rect.w - 2*CLOSE_BUTTON_RADIUS) &&  
         (x < priv->balloon.rect.w) &&  
         (y > 0) && (y < 2*CLOSE_BUTTON_RADIUS)) {  
   
         priv->balloon.valid = FALSE;  
         osm_gps_map_map_redraw_idle(map);  
     }  
 }  
   
 /* return true if balloon is being displayed and if */  
 /* the given coordinate is within this balloon */  
 static gboolean  
 osm_gps_map_in_balloon(OsmGpsMapPrivate *priv, gint x, gint y)  
 {  
     return (priv->balloon.valid &&  
             (x > priv->balloon.rect.x) &&  
             (x < priv->balloon.rect.x + priv->balloon.rect.w) &&  
             (y > priv->balloon.rect.y) &&  
             (y < priv->balloon.rect.y + priv->balloon.rect.h));  
 }  
 #endif // ENABLE_BALLOON  
   
685  static void  static void
686  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)
687  {  {
# Line 1078  osm_gps_map_download_tile (OsmGpsMap *ma Line 893  osm_gps_map_download_tile (OsmGpsMap *ma
893                  }                  }
894              }              }
895    
896    #ifdef LIBSOUP22
897                soup_message_headers_append(msg->request_headers,
898                                            "User-Agent", USER_AGENT);
899    #endif
900    
901              g_hash_table_insert (priv->tile_queue, dl->uri, msg);              g_hash_table_insert (priv->tile_queue, dl->uri, msg);
902              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);              soup_session_queue_message (priv->soup_session, msg, osm_gps_map_tile_download_complete, dl);
903          } else {          } else {
# Line 1423  osm_gps_map_purge_cache (OsmGpsMap *map) Line 1243  osm_gps_map_purge_cache (OsmGpsMap *map)
1243     g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);     g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);
1244  }  }
1245    
 #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;  
   
1246  static gboolean  static gboolean
1247  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)  
1248  {  {
1249      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1250    
1251      /* backup previous contents */      priv->idle_map_redraw = 0;
     if(!priv->osd.backup)  
         priv->osd.backup = gdk_pixmap_new(priv->pixmap, OSD_W+2, OSD_H+2, -1);  
   
     gint x = OSD_X + EXTRA_BORDER + xoffset;  
     gint y = OSD_Y + EXTRA_BORDER + yoffset;  
   
     /* create backup of background */  
     gdk_draw_drawable(priv->osd.backup,  
         GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],  
                       priv->pixmap, x-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  
     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  
 #warning "OSD control display lacks a non-cairo implementation!"  
 #endif  
 }  
   
 static void  
 osm_gps_map_osd_restore (OsmGpsMap *map)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
1252    
1253      /* restore backup of previous contents */      /* don't redraw the entire map while the OSD is doing */
1254      if(priv->osd.backup) {      /* some animation or the like. This is to keep the animation */
1255          /* create backup of background */      /* fluid */
1256          gdk_draw_drawable(priv->pixmap,      if (priv->osd->busy(priv->osd))
1257              GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],          return FALSE;
                       priv->osd.backup, 0, 0,  
                       priv->osd.backup_x, priv->osd.backup_y, OSD_W+2, OSD_H+2);  
     }  
 }  
1258    
1259    #ifdef DRAG_DEBUG
1260        printf("trying redraw\n");
1261  #endif  #endif
1262    
 static gboolean  
 osm_gps_map_map_redraw (OsmGpsMap *map)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
   
     priv->idle_map_redraw = 0;  
   
1263      /* the motion_notify handler uses priv->pixmap to redraw the area; if we      /* the motion_notify handler uses priv->pixmap to redraw the area; if we
1264       * change it while we are dragging, we will end up showing it in the wrong       * change it while we are dragging, we will end up showing it in the wrong
1265       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1780  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1267  osm_gps_map_map_redraw (OsmGpsMap *map)
1267      if (priv->dragging)      if (priv->dragging)
1268          return FALSE;          return FALSE;
1269    
1270        /* undo all offsets that may have happened when dragging */
1271        priv->drag_mouse_dx = 0;
1272        priv->drag_mouse_dy = 0;
1273    
1274      priv->redraw_cycle++;      priv->redraw_cycle++;
1275    
1276      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1796  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1287  osm_gps_map_map_redraw (OsmGpsMap *map)
1287      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1288      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1289      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1290  #ifdef ENABLE_BALLOON  
     osm_gps_map_draw_balloon_int(map);  
 #endif  
1291  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1292      osm_gps_map_osd_draw_controls(map, 0, 0);      /* OSD may contain a coordinate/scale, so we may have to re-render it */
1293        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1294            priv->osd->render (priv->osd);
1295  #endif  #endif
1296    
     //osm_gps_map_osd_speed(map, 1.5);  
1297      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1298      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1299    
# Line 1819  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1309  osm_gps_map_map_redraw_idle (OsmGpsMap *
1309          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);
1310  }  }
1311    
1312    #ifdef OSM_GPS_MAP_KEYS
1313    static gboolean
1314    on_window_key_press(GtkWidget *widget,
1315                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1316      gboolean handled = FALSE;
1317      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1318    
1319      // the map handles some keys on its own ...
1320      switch(event->keyval) {
1321    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1322      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1323          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1324          if(!priv->fullscreen)
1325              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1326          else
1327              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1328    
1329          priv->fullscreen = !priv->fullscreen;
1330          handled = TRUE;
1331          } break;
1332    #endif
1333    
1334    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1335      case OSM_GPS_MAP_KEY_ZOOMIN:
1336          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1337          handled = TRUE;
1338          break;
1339    #endif
1340    
1341    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1342      case OSM_GPS_MAP_KEY_ZOOMOUT:
1343          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1344          handled = TRUE;
1345          break;
1346    #endif
1347    
1348    #ifdef OSM_GPS_MAP_KEY_UP
1349      case OSM_GPS_MAP_KEY_UP:
1350          priv->map_y -= step;
1351          priv->center_coord_set = FALSE;
1352          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1353          handled = TRUE;
1354          break;
1355    #endif
1356    
1357    #ifdef OSM_GPS_MAP_KEY_DOWN
1358      case OSM_GPS_MAP_KEY_DOWN:
1359          priv->map_y += step;
1360          priv->center_coord_set = FALSE;
1361          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1362          handled = TRUE;
1363          break;
1364    #endif
1365    
1366    #ifdef OSM_GPS_MAP_KEY_LEFT
1367      case OSM_GPS_MAP_KEY_LEFT:
1368          priv->map_x -= step;
1369          priv->center_coord_set = FALSE;
1370          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1371          handled = TRUE;
1372          break;
1373    #endif
1374    
1375    #ifdef OSM_GPS_MAP_KEY_RIGHT
1376      case OSM_GPS_MAP_KEY_RIGHT:
1377          priv->map_x += step;
1378          priv->center_coord_set = FALSE;
1379          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1380          handled = TRUE;
1381          break;
1382    #endif
1383    
1384      default:
1385          break;
1386      }
1387    
1388      return handled;
1389    }
1390    #endif
1391    
1392  static void  static void
1393  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1394  {  {
# Line 1832  osm_gps_map_init (OsmGpsMap *object) Line 1402  osm_gps_map_init (OsmGpsMap *object)
1402      priv->trip_history = NULL;      priv->trip_history = NULL;
1403      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1404      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1405        priv->gps_heading = OSM_GPS_MAP_INVALID;
1406    
1407  #ifdef ENABLE_BALLOON  #ifdef ENABLE_OSD
1408      priv->balloon.coo = g_new0(coord_t, 1);      priv->osd = NULL;
     priv->balloon.valid = FALSE;  
     priv->balloon.cb = NULL;  
1409  #endif  #endif
1410    
1411  #ifdef ENABLE_OSD  #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1412      priv->osd.backup = NULL;      priv->fullscreen = FALSE;
     priv->osd.overlay = NULL;  
     priv->osd.cb = NULL;  
1413  #endif  #endif
1414    
1415      priv->tracks = NULL;      priv->tracks = NULL;
# Line 1861  osm_gps_map_init (OsmGpsMap *object) Line 1428  osm_gps_map_init (OsmGpsMap *object)
1428    
1429  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1430      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1431      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1432                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1433                                                               "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11",                                              USER_AGENT, NULL);
                                                              NULL);  
1434  #else  #else
1435      /* libsoup-2.2 seems not to be able to set the user agent */      /* libsoup-2.2 has no special way to set the user agent, so we */
1436        /* set it seperately as an extra header field for each reuest */
1437      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1438  #endif  #endif
1439    
# Line 1889  osm_gps_map_init (OsmGpsMap *object) Line 1456  osm_gps_map_init (OsmGpsMap *object)
1456      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1457    
1458      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);      g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_MASK, my_log_handler, NULL);
 }  
1459    
1460  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1461  /* simple hash algorithm hack if md5 is not present */      g_signal_connect(G_OBJECT(object), "key_press_event",
1462  static char *simple_hash(char *str) {                       G_CALLBACK(on_window_key_press), priv);
     union {  
         char str[4];  
         gulong val;  
     } hash = { .val = 0x55555555 };  
   
     while(*str) {  
         hash.str[(int)str & 3] ^= *str;  
         str++;  
     }  
     return g_strdup_printf("%08lX", hash.val);  
 }  
1463  #endif  #endif
1464    }
1465    
1466  static GObject *  static void
1467  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1468      const char *uri;      const char *uri;
1469    
     //Always chain up to the parent constructor  
     object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);  
     map = OSM_GPS_MAP(object);  
     priv = OSM_GPS_MAP_PRIVATE(object);  
   
1470      //user can specify a map source ID, or a repo URI as the map source      //user can specify a map source ID, or a repo URI as the map source
1471      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);      uri = osm_gps_map_source_get_repo_uri(OSM_GPS_MAP_SOURCE_NULL);
1472      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1944  osm_gps_map_constructor (GType gtype, gu Line 1491  osm_gps_map_constructor (GType gtype, gu
1491          }          }
1492      }      }
1493    
1494      if (!priv->cache_dir_is_full_path) {      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1495  #ifdef G_CHECKSUM_MD5      if(!fname) fname = "_unknown_";
         char *md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, priv->repo_uri, -1);  
 #else  
         char *md5 = simple_hash(priv->repo_uri);  
 #endif  
   
         if (priv->cache_dir) {  
             char *old = priv->cache_dir;  
             //the new cachedir is the given cache dir + the md5 of the repo_uri  
             priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, md5);  
             g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);  
             g_free(old);  
         } else {  
             //the new cachedir is the current dir + the md5 of the repo_uri  
             priv->cache_dir = g_strdup(md5);  
         }  
1496    
1497          g_free(md5);      if (priv->tile_dir) {
1498            //the new cachedir is the given cache dir + the friendly name of the repo_uri
1499            priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1500            g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
1501      }      }
1502    }
1503    
1504      inspect_map_uri(map);  static GObject *
1505    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1506    {
1507        //Always chain up to the parent constructor
1508        GObject *object =
1509            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1510    
1511        osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1512    
1513        inspect_map_uri(OSM_GPS_MAP(object));
1514    
1515      return object;      return object;
1516  }  }
# Line 2002  osm_gps_map_dispose (GObject *object) Line 1547  osm_gps_map_dispose (GObject *object)
1547      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1548          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1549    
1550      g_free(priv->gps);      if (priv->drag_expose != 0)
1551            g_source_remove (priv->drag_expose);
1552    
1553  #ifdef ENABLE_BALLOON      g_free(priv->gps);
     g_free(priv->balloon.coo);  
 #endif  
1554    
1555  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1556      if (priv->osd.backup)      if(priv->osd)
1557          g_object_unref(priv->osd.backup);          priv->osd->free(priv->osd);
1558    
1559      if (priv->osd.overlay)  #ifdef OSD_DOUBLE_BUFFER
1560           cairo_surface_destroy(priv->osd.overlay);      if(priv->dbuf_pixmap)
1561            g_object_unref (priv->dbuf_pixmap);
1562    #endif
1563  #endif  #endif
1564    
1565      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
# Line 2025  osm_gps_map_finalize (GObject *object) Line 1571  osm_gps_map_finalize (GObject *object)
1571      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1572      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1573    
1574      g_free(priv->cache_dir);      if(priv->tile_dir)
1575            g_free(priv->tile_dir);
1576    
1577        if(priv->cache_dir)
1578            g_free(priv->cache_dir);
1579    
1580      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1581      g_free(priv->image_format);      g_free(priv->image_format);
1582    
# Line 2082  osm_gps_map_set_property (GObject *objec Line 1633  osm_gps_map_set_property (GObject *objec
1633              break;              break;
1634          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1635              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1636                  priv->cache_dir = g_value_dup_string (value);                  priv->tile_dir = g_value_dup_string (value);
             break;  
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             priv->cache_dir_is_full_path = g_value_get_boolean (value);  
1637              break;              break;
1638          case PROP_ZOOM:          case PROP_ZOOM:
1639              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 2113  osm_gps_map_set_property (GObject *objec Line 1661  osm_gps_map_set_property (GObject *objec
1661          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1662              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1663              break;              break;
1664          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1665                gint old = priv->map_source;
1666              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1667              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1668                   priv->map_source != old &&
1669                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1670                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1671    
1672                    /* we now have to switch the entire map */
1673    
1674                    /* flush the ram cache */
1675                    g_hash_table_remove_all(priv->tile_cache);
1676    
1677                    osm_gps_map_setup(priv);
1678    
1679                    inspect_map_uri(map);
1680    
1681                    /* adjust zoom if necessary */
1682                    if(priv->map_zoom > priv->max_zoom)
1683                        osm_gps_map_set_zoom(map, priv->max_zoom);
1684    
1685                    if(priv->map_zoom < priv->min_zoom)
1686                        osm_gps_map_set_zoom(map, priv->min_zoom);
1687    
1688                } } break;
1689          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1690              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1691              break;              break;
# Line 2156  osm_gps_map_get_property (GObject *objec Line 1726  osm_gps_map_get_property (GObject *objec
1726          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1727              g_value_set_string(value, priv->cache_dir);              g_value_set_string(value, priv->cache_dir);
1728              break;              break;
         case PROP_TILE_CACHE_DIR_IS_FULL_PATH:  
             g_value_set_boolean(value, priv->cache_dir_is_full_path);  
             break;  
1729          case PROP_ZOOM:          case PROP_ZOOM:
1730              g_value_set_int(value, priv->map_zoom);              g_value_set_int(value, priv->map_zoom);
1731              break;              break;
# Line 2231  osm_gps_map_button_press (GtkWidget *wid Line 1798  osm_gps_map_button_press (GtkWidget *wid
1798  {  {
1799      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1800    
 #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  
   
1801  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
     #define SCROLL_STEP 10  
   
1802      /* pressed inside OSD control? */      /* pressed inside OSD control? */
1803      osd_button_t but = osm_gps_map_osd_check(event->x, event->y);      if(priv->osd) {
1804      if(but != OSD_NONE)          osd_button_t but =
1805      {              priv->osd->check(priv->osd, TRUE, event->x, event->y);
         priv->drag_counter = -1;  
   
         switch(but) {  
         case OSD_GPS:  
             priv->osd.cb(priv->osd.data);  
             break;  
   
         case OSD_UP:  
             priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;  
             priv->center_coord_set = FALSE;  
             break;  
1806    
1807          case OSD_DOWN:          if(but != OSD_NONE)
1808              priv->map_y += GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;          {
1809              priv->center_coord_set = FALSE;              int step =
1810              break;                  GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1811                priv->drag_counter = -1;
1812          case OSD_LEFT:  
1813              priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;              switch(but) {
1814              priv->center_coord_set = FALSE;              case OSD_UP:
1815              break;                  priv->map_y -= step;
1816                    priv->center_coord_set = FALSE;
1817          case OSD_RIGHT:                  g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1818              priv->map_x += GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1819              priv->center_coord_set = FALSE;                  break;
             break;  
   
         case OSD_IN:  
             osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);  
             break;  
1820    
1821          case OSD_OUT:              case OSD_DOWN:
1822              osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);                  priv->map_y += step;
1823              break;                  priv->center_coord_set = FALSE;
1824                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1825                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1826                    break;
1827    
1828          default:              case OSD_LEFT:
1829              break;                  priv->map_x -= step;
1830                    priv->center_coord_set = FALSE;
1831                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1832                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1833                    break;
1834    
1835                case OSD_RIGHT:
1836                    priv->map_x += step;
1837                    priv->center_coord_set = FALSE;
1838                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1839                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1840                    break;
1841    
1842                case OSD_IN:
1843                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1844                    break;
1845    
1846                case OSD_OUT:
1847                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1848                    break;
1849    
1850                default:
1851                    /* all custom buttons are forwarded to the application */
1852                    if(priv->osd->cb)
1853                        priv->osd->cb(but, priv->osd->data);
1854                    break;
1855                }
1856    
1857                return FALSE;
1858          }          }
   
         osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));  
   
         return FALSE;  
1859      }      }
1860  #endif  #endif
1861    
# Line 2308  osm_gps_map_button_release (GtkWidget *w Line 1873  osm_gps_map_button_release (GtkWidget *w
1873  {  {
1874      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1875    
 #ifdef ENABLE_BALLOON  
     /* released inside the balloon? */  
     if (osm_gps_map_in_balloon(priv,  
                    event->x + EXTRA_BORDER,  
                    event->y + EXTRA_BORDER))  
     {  
         osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget),  
              event->x - priv->balloon.rect.x + EXTRA_BORDER,  
              event->y - priv->balloon.rect.y + EXTRA_BORDER);  
     }  
 #endif  
   
1876      if (priv->dragging)      if (priv->dragging)
1877      {      {
1878          priv->dragging = FALSE;          priv->dragging = FALSE;
# Line 2334  osm_gps_map_button_release (GtkWidget *w Line 1887  osm_gps_map_button_release (GtkWidget *w
1887    
1888          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1889      }      }
1890    #ifdef ENABLE_OSD
1891        /* pressed inside OSD control? */
1892        else if(priv->osd)
1893            priv->osd->check(priv->osd, FALSE, event->x, event->y);
1894    #endif
1895    
1896    #ifdef DRAG_DEBUG
1897        printf("dragging done\n");
1898    #endif
1899    
     priv->drag_mouse_dx = 0;  
     priv->drag_mouse_dy = 0;  
1900      priv->drag_counter = -1;      priv->drag_counter = -1;
1901    
1902      return FALSE;      return FALSE;
# Line 2346  static gboolean Line 1906  static gboolean
1906  osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);  osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
1907    
1908  static gboolean  static gboolean
1909    osm_gps_map_map_expose (GtkWidget *widget)
1910    {
1911        OsmGpsMapPrivate *priv = OSM_GPS_MAP(widget)->priv;
1912    
1913        priv->drag_expose = 0;
1914        osm_gps_map_expose (widget, NULL);
1915        return FALSE;
1916    }
1917    
1918    static gboolean
1919  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
1920  {  {
1921      int x, y;      int x, y;
# Line 2368  osm_gps_map_motion_notify (GtkWidget *wi Line 1938  osm_gps_map_motion_notify (GtkWidget *wi
1938      if (priv->drag_counter < 0)      if (priv->drag_counter < 0)
1939          return FALSE;          return FALSE;
1940    
1941      priv->drag_counter++;      /* not yet dragged far enough? */
1942        if(!priv->drag_counter &&
1943      // we havent dragged more than 6 pixels         ( (x - priv->drag_start_mouse_x) * (x - priv->drag_start_mouse_x) +
1944      if (priv->drag_counter < 6)           (y - priv->drag_start_mouse_y) * (y - priv->drag_start_mouse_y) <
1945             10*10))
1946          return FALSE;          return FALSE;
1947    
1948  #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  
1949    
1950      priv->dragging = TRUE;      priv->dragging = TRUE;
1951    
# Line 2390  osm_gps_map_motion_notify (GtkWidget *wi Line 1955  osm_gps_map_motion_notify (GtkWidget *wi
1955      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
1956      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
1957    
1958  #ifdef ENABLE_OSD      /* instead of redrawing directly just add an idle function */
1959      /* undo OSD */      if (!priv->drag_expose)
1960      osm_gps_map_osd_restore (OSM_GPS_MAP(widget));          priv->drag_expose =
1961                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);  
   
1962    
1963      return FALSE;      return FALSE;
1964  }  }
# Line 2416  osm_gps_map_configure (GtkWidget *widget Line 1973  osm_gps_map_configure (GtkWidget *widget
1973          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
1974    
1975      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
1976                                     widget->window,                          widget->window,
1977                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
1978                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
1979                                     -1);                          -1);
1980    
1981    #ifdef ENABLE_OSD
1982    
1983    #ifdef OSD_DOUBLE_BUFFER
1984        if (priv->dbuf_pixmap)
1985            g_object_unref (priv->dbuf_pixmap);
1986    
1987        priv->dbuf_pixmap = gdk_pixmap_new (
1988                            widget->window,
1989                            widget->allocation.width,
1990                            widget->allocation.height,
1991                            -1);
1992    #endif
1993    
1994        /* the osd needs some references to map internal objects */
1995        if(priv->osd)
1996            priv->osd->widget = widget;
1997    #endif
1998    
1999      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2000      if(priv->gc_map)      if(priv->gc_map)
# Line 2437  osm_gps_map_expose (GtkWidget *widget, G Line 2012  osm_gps_map_expose (GtkWidget *widget, G
2012  {  {
2013      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2014    
2015      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2016                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2017                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],  #else
2018                         priv->pixmap,      GdkDrawable *drawable = widget->window;
2019                         0,0,  #endif
2020                         priv->drag_mouse_dx - EXTRA_BORDER,  
2021                         priv->drag_mouse_dy - EXTRA_BORDER,  #ifdef DRAG_DEBUG
2022                         -1,-1);      printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2023    #endif
2024      //Paint white outside of the map if dragging. Its less  
2025      //ugly than painting the corrupted map      if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2026      if(priv->drag_mouse_dx>EXTRA_BORDER) {      {
2027          gdk_draw_rectangle (  #ifdef DRAG_DEBUG
2028                              widget->window,          printf("  dragging = %d, event = %p\n", priv->dragging, event);
2029                              widget->style->white_gc,  #endif
2030                              TRUE,  
2031                              0, 0,          gdk_draw_drawable (drawable,
2032                              priv->drag_mouse_dx - EXTRA_BORDER,                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2033                              widget->allocation.height);                             priv->pixmap,
2034      }                             event->area.x + EXTRA_BORDER, event->area.y + EXTRA_BORDER,
2035      else if (-priv->drag_mouse_dx > EXTRA_BORDER)                             event->area.x, event->area.y,
2036      {                             event->area.width, event->area.height);
2037          gdk_draw_rectangle (      }
2038                              widget->window,      else
2039                              widget->style->white_gc,      {
2040                              TRUE,  #ifdef DRAG_DEBUG
2041                              priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,          printf("  drag_mouse %d/%d\n",
2042                              -priv->drag_mouse_dx - EXTRA_BORDER,                 priv->drag_mouse_dx - EXTRA_BORDER,
2043                              widget->allocation.height);                 priv->drag_mouse_dy - EXTRA_BORDER);
2044      }  #endif
2045    
2046      if (priv->drag_mouse_dy>EXTRA_BORDER) {          gdk_draw_drawable (drawable,
2047          gdk_draw_rectangle (                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2048                              widget->window,                             priv->pixmap,
2049                              widget->style->white_gc,                             0,0,
2050                              TRUE,                             priv->drag_mouse_dx - EXTRA_BORDER,
2051                              0, 0,                             priv->drag_mouse_dy - EXTRA_BORDER,
2052                              widget->allocation.width,                             -1,-1);
2053                              priv->drag_mouse_dy - EXTRA_BORDER);  
2054      }          //Paint white outside of the map if dragging. Its less
2055      else if (-priv->drag_mouse_dy > EXTRA_BORDER)          //ugly than painting the corrupted map
2056      {          if(priv->drag_mouse_dx>EXTRA_BORDER) {
2057          gdk_draw_rectangle (              gdk_draw_rectangle (drawable,
2058                              widget->window,                                  widget->style->white_gc,
2059                              widget->style->white_gc,                                  TRUE,
2060                              TRUE,                                  0, 0,
2061                              0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,                                  priv->drag_mouse_dx - EXTRA_BORDER,
2062                              widget->allocation.width,                                  widget->allocation.height);
2063                              -priv->drag_mouse_dy - EXTRA_BORDER);          }
2064      }          else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2065  #if 0          {
2066      if(!priv->dragging)              gdk_draw_rectangle (drawable,
2067          gdk_draw_drawable (                                  widget->style->white_gc,
2068                         widget->window,                                  TRUE,
2069                                    priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
2070                                    -priv->drag_mouse_dx - EXTRA_BORDER,
2071                                    widget->allocation.height);
2072            }
2073    
2074            if (priv->drag_mouse_dy>EXTRA_BORDER) {
2075                gdk_draw_rectangle (drawable,
2076                                    widget->style->white_gc,
2077                                    TRUE,
2078                                    0, 0,
2079                                    widget->allocation.width,
2080                                    priv->drag_mouse_dy - EXTRA_BORDER);
2081            }
2082            else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2083            {
2084                gdk_draw_rectangle (drawable,
2085                                    widget->style->white_gc,
2086                                    TRUE,
2087                                    0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2088                                    widget->allocation.width,
2089                                    -priv->drag_mouse_dy - EXTRA_BORDER);
2090            }
2091        }
2092    
2093    #ifdef ENABLE_OSD
2094        /* draw new OSD */
2095        if(priv->osd)
2096            priv->osd->draw (priv->osd, drawable);
2097    
2098    #ifdef OSD_DOUBLE_BUFFER
2099        gdk_draw_drawable (widget->window,
2100                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2101                         priv->pixmap,                         priv->dbuf_pixmap,
2102                         event->area.x + EXTRA_BORDER,                         0,0,0,0,-1,-1);
2103                         event->area.y + EXTRA_BORDER,  #endif
2104                         event->area.x, event->area.y,  
                        event->area.width, event->area.height);  
2105  #endif  #endif
2106    
2107      return FALSE;      return FALSE;
2108  }  }
2109    
# Line 2579  osm_gps_map_class_init (OsmGpsMapClass * Line 2185  osm_gps_map_class_init (OsmGpsMapClass *
2185                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
2186    
2187      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
                                      PROP_TILE_CACHE_DIR_IS_FULL_PATH,  
                                      g_param_spec_boolean ("tile-cache-is-full-path",  
                                                            "tile cache is full path",  
                                                            "if true, the path passed to tile-cache is interpreted as the full cache path",  
                                                            FALSE,  
                                                            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));  
   
     g_object_class_install_property (object_class,  
2188                                       PROP_ZOOM,                                       PROP_ZOOM,
2189                                       g_param_spec_int ("zoom",                                       g_param_spec_int ("zoom",
2190                                                         "zoom",                                                         "zoom",
# Line 2704  osm_gps_map_class_init (OsmGpsMapClass * Line 2302  osm_gps_map_class_init (OsmGpsMapClass *
2302                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2303                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2304                                                         -1,                                                         -1,
2305                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2306    
2307      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2308                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2723  osm_gps_map_source_get_friendly_name(Osm Line 2321  osm_gps_map_source_get_friendly_name(Osm
2321          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2322              return "None";              return "None";
2323          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2324              return "OpenStreetMap";              return "OpenStreetMap I";
2325          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2326              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2327          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2328              return "OpenAerialMap";              return "OpenCycleMap";
2329            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2330                return "OSMC Trails";
2331          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2332              return "Maps-For-Free";              return "Maps-For-Free";
2333          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2769  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2369  osm_gps_map_source_get_repo_uri(OsmGpsMa
2369              return OSM_REPO_URI;              return OSM_REPO_URI;
2370          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2371              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2372          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2373              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";
2374            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2375                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2376          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2377              return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";              return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg";
2378          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2808  osm_gps_map_source_get_image_format(OsmG Line 2410  osm_gps_map_source_get_image_format(OsmG
2410          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2411          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2412          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2413            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2414            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2415              return "png";              return "png";
2416          case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2417          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2418            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2419          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2420          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2421          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2818  osm_gps_map_source_get_image_format(OsmG Line 2423  osm_gps_map_source_get_image_format(OsmG
2423          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2424          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2425          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
         case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:  
         case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:  
2426              return "jpg";              return "jpg";
2427          default:          default:
2428              return "bin";              return "bin";
# Line 2841  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2444  osm_gps_map_source_get_max_zoom(OsmGpsMa
2444          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2445              return 18;              return 18;
2446          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2447            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2448              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2449          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
         case OSM_GPS_MAP_SOURCE_OPENAERIALMAP:  
2450          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2451          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2452          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2853  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2456  osm_gps_map_source_get_max_zoom(OsmGpsMa
2456          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2457          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2458              return 17;              return 17;
2459            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2460                return 15;
2461          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2462              return 11;              return 11;
2463          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2992  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2597  osm_gps_map_set_zoom (OsmGpsMap *map, in
2597          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2598                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2599    
2600    #ifdef ENABLE_OSD
2601            /* OSD may contain a scale, so we may have to re-render it */
2602            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2603                priv->osd->render (priv->osd);
2604    #endif
2605    
2606          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2607      }      }
2608      return priv->map_zoom;      return priv->map_zoom;
# Line 3077  osm_gps_map_clear_images (OsmGpsMap *map Line 2688  osm_gps_map_clear_images (OsmGpsMap *map
2688  }  }
2689    
2690  void  void
 osm_gps_map_osd_speed (OsmGpsMap *map, float speed)  
 {  
     OsmGpsMapPrivate *priv;  
   
     PangoContext        *context = NULL;  
     PangoLayout     *layout  = NULL;  
     PangoFontDescription    *desc    = NULL;  
   
     GdkColor color;  
     GdkGC *gc;  
   
     gchar *buffer;  
     //static int x = 10, y = 10;  
     static int width = 0, height = 0;  
   
     g_return_if_fail (OSM_IS_GPS_MAP (map));  
     priv = map->priv;  
   
     buffer = g_strdup_printf("%.0f", speed);  
   
     /* pango initialisation */  
     context = gtk_widget_get_pango_context (GTK_WIDGET(map));  
     layout  = pango_layout_new (context);  
     desc    = pango_font_description_new();  
   
     pango_font_description_set_size (desc, 40 * PANGO_SCALE);  
     pango_layout_set_font_description (layout, desc);  
     pango_layout_set_text (layout, buffer, strlen(buffer));  
   
     gc = gdk_gc_new (GTK_WIDGET(map)->window);  
   
     color.red = (0 > 50) ? 0xffff : 0;  
     color.green = 0;  
     color.blue = 0;  
   
     gdk_gc_set_rgb_fg_color (gc, &color);  
   
     /* faster / less flicker alternative:*/  
     gdk_draw_drawable (  
                        GTK_WIDGET(map)->window,  
                        GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(map)],  
                        priv->pixmap,  
                        0,0,  
                        0,0,  
                        width+10,width+10);  
   
     gdk_draw_layout(GTK_WIDGET(map)->window,  
                     gc,  
                     0, 0,  
                     layout);  
   
     /* set width and height */  
     pango_layout_get_pixel_size(layout, &width, &height);  
   
     g_free(buffer);  
     pango_font_description_free (desc);  
     g_object_unref (layout);  
     g_object_unref (gc);  
 }  
   
 void  
2691  osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading)  osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading)
2692  {  {
2693      int pixel_x, pixel_y;      int pixel_x, pixel_y;
# Line 3149  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2699  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2699      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2700      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2701      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2702        priv->gps_heading = deg2rad(heading);
2703    
2704      // pixel_x,y, offsets      // pixel_x,y, offsets
2705      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 3238  osm_gps_map_geographic_to_screen (OsmGps Line 2789  osm_gps_map_geographic_to_screen (OsmGps
2789      priv = map->priv;      priv = map->priv;
2790    
2791      if (pixel_x)      if (pixel_x)
2792          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - priv->map_x;          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) -
2793                priv->map_x + priv->drag_mouse_dx;
2794      if (pixel_y)      if (pixel_y)
2795          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - priv->map_y;          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) -
2796                priv->map_y + priv->drag_mouse_dy;
2797  }  }
2798    
2799  void  void
# Line 3255  osm_gps_map_scroll (OsmGpsMap *map, gint Line 2808  osm_gps_map_scroll (OsmGpsMap *map, gint
2808      priv->map_x += dx;      priv->map_x += dx;
2809      priv->map_y += dy;      priv->map_y += dy;
2810    
2811    #ifdef ENABLE_OSD
2812        /* OSD may contain a coordinate, so we may have to re-render it */
2813        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2814            priv->osd->render (priv->osd);
2815    #endif
2816    
2817      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
2818  }  }
2819    
# Line 3263  osm_gps_map_get_scale(OsmGpsMap *map) Line 2822  osm_gps_map_get_scale(OsmGpsMap *map)
2822  {  {
2823      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2824    
2825      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);
2826      priv = map->priv;      priv = map->priv;
2827    
2828      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
2829  }  }
2830    
2831  #ifdef ENABLE_BALLOON  #ifdef ENABLE_OSD
 void  
 osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,  
                           OsmGpsMapBalloonCallback cb, gpointer data)  
 {  
     OsmGpsMapPrivate *priv;  
   
     /* remove and previously installed balloon */  
     osm_gps_map_clear_balloon (map);  
   
     g_return_if_fail (OSM_IS_GPS_MAP (map));  
     priv = map->priv;  
   
     priv->balloon.coo->rlat = deg2rad(latitude);  
     priv->balloon.coo->rlon = deg2rad(longitude);  
     priv->balloon.valid = TRUE;  
   
     priv->balloon.cb = cb;  
     priv->balloon.data = data;  
2832    
2833      // this redraws the map  void
2834    osm_gps_map_redraw (OsmGpsMap *map)
2835    {
2836      osm_gps_map_map_redraw_idle(map);      osm_gps_map_map_redraw_idle(map);
2837  }  }
2838    
2839  void  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
2840  osm_gps_map_clear_balloon (OsmGpsMap *map)      g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2841  {      return map->priv->osd;
     OsmGpsMapPrivate *priv;  
   
     g_return_if_fail (OSM_IS_GPS_MAP (map));  
     priv = map->priv;  
   
     priv->balloon.valid = FALSE;  
   
     osm_gps_map_map_redraw_idle(map);  
2842  }  }
 #endif  
2843    
2844  #ifdef ENABLE_OSD  void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
 void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdGpsCallback cb, gpointer data) {  
2845      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2846    
2847      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
     priv = map->priv;  
2848    
2849      priv->osd.cb = cb;      priv = map->priv;
2850      priv->osd.data = data;      g_return_if_fail (!priv->osd);
2851    
2852      /* this may have changed the state of the gps button */      priv->osd = osd;
2853      /* we thus re-render the overlay */  }
     osm_gps_map_osd_render(priv);  
2854    
2855      osm_gps_map_map_redraw_idle(map);  void
2856    osm_gps_map_repaint (OsmGpsMap *map) {
2857        osm_gps_map_expose (GTK_WIDGET(map), NULL);
2858  }  }
2859    
2860  #endif  #endif
Legend:
Removed from v.68  
changed lines
  Added in v.121