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

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

revision 85 by harbaum, Fri Aug 28 12:07:16 2009 UTC revision 150 by harbaum, Thu Oct 29 20:25:11 2009 UTC
# Line 66  Line 66 
66  #include <gdk/gdkkeysyms.h>  #include <gdk/gdkkeysyms.h>
67  #endif  #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 95  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;
102    
103      //contains flags indicating the various special characters      //contains flags indicating the various special characters
# Line 112  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 (if present)      //the osd controls (if present)
123      osm_gps_map_osd_t *osd;      osm_gps_map_osd_t *osd;
# Line 156  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 348  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 584  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 616  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 629  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 671  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 1094  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 1444  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1248  osm_gps_map_map_redraw (OsmGpsMap *map)
1248  {  {
1249      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1250    
1251        /* on diablo the map comes up at 1x1 pixel size and */
1252        /* isn't really usable. we'll just ignore this ... */
1253        if((GTK_WIDGET(map)->allocation.width < 2) ||
1254           (GTK_WIDGET(map)->allocation.height < 2)) {
1255            printf("not a useful sized map yet ...\n");
1256            return FALSE;
1257        }
1258    
1259      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1260    
1261        /* don't redraw the entire map while the OSD is doing */
1262        /* some animation or the like. This is to keep the animation */
1263        /* fluid */
1264        if (priv->osd->busy(priv->osd))
1265            return FALSE;
1266    
1267    #ifdef DRAG_DEBUG
1268        printf("trying redraw\n");
1269    #endif
1270    
1271      /* 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
1272       * 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
1273       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1453  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1275  osm_gps_map_map_redraw (OsmGpsMap *map)
1275      if (priv->dragging)      if (priv->dragging)
1276          return FALSE;          return FALSE;
1277    
1278        /* undo all offsets that may have happened when dragging */
1279        priv->drag_mouse_dx = 0;
1280        priv->drag_mouse_dy = 0;
1281    
1282      priv->redraw_cycle++;      priv->redraw_cycle++;
1283    
1284      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1469  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1295  osm_gps_map_map_redraw (OsmGpsMap *map)
1295      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1296      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1297      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1298  #ifdef ENABLE_BALLOON  
1299      osm_gps_map_draw_balloon_int(map);  #ifdef ENABLE_OSD
1300        /* OSD may contain a coordinate/scale, so we may have to re-render it */
1301        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1302            priv->osd->render (priv->osd);
1303  #endif  #endif
1304    
     //osm_gps_map_osd_speed(map, 1.5);  
1305      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1306      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1307    
# Line 1496  on_window_key_press(GtkWidget *widget, Line 1324  on_window_key_press(GtkWidget *widget,
1324    gboolean handled = FALSE;    gboolean handled = FALSE;
1325    int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;    int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1326    
   //  printf("key event with keyval %x\n", event->keyval);  
   
1327    // the map handles some keys on its own ...    // the map handles some keys on its own ...
1328    switch(event->keyval) {    switch(event->keyval) {
1329  #ifdef OSM_GPS_MAP_KEY_FULLSCREEN  #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
# Line 1564  on_window_key_press(GtkWidget *widget, Line 1390  on_window_key_press(GtkWidget *widget,
1390  #endif  #endif
1391    
1392    default:    default:
       //      printf("unhandled key event with keyval %x\n", event->keyval);  
1393        break;        break;
1394    }    }
1395    
# Line 1585  osm_gps_map_init (OsmGpsMap *object) Line 1410  osm_gps_map_init (OsmGpsMap *object)
1410      priv->trip_history = NULL;      priv->trip_history = NULL;
1411      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1412      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1413        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  
1414    
1415  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1416      priv->osd = NULL;      priv->osd = NULL;
# Line 1616  osm_gps_map_init (OsmGpsMap *object) Line 1436  osm_gps_map_init (OsmGpsMap *object)
1436    
1437  #ifndef LIBSOUP22  #ifndef LIBSOUP22
1438      //Change naumber of concurrent connections option?      //Change naumber of concurrent connections option?
1439      priv->soup_session = soup_session_async_new_with_options(      priv->soup_session =
1440                                                               SOUP_SESSION_USER_AGENT,          soup_session_async_new_with_options(SOUP_SESSION_USER_AGENT,
1441                                                               "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);  
1442  #else  #else
1443      /* 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 */
1444        /* set it seperately as an extra header field for each reuest */
1445      priv->soup_session = soup_session_async_new();      priv->soup_session = soup_session_async_new();
1446  #endif  #endif
1447    
# Line 1646  osm_gps_map_init (OsmGpsMap *object) Line 1466  osm_gps_map_init (OsmGpsMap *object)
1466      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);
1467    
1468  #ifdef OSM_GPS_MAP_KEYS  #ifdef OSM_GPS_MAP_KEYS
     //    GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(object));  
1469      g_signal_connect(G_OBJECT(object), "key_press_event",      g_signal_connect(G_OBJECT(object), "key_press_event",
1470                       G_CALLBACK(on_window_key_press), priv);                       G_CALLBACK(on_window_key_press), priv);
1471  #endif  #endif
1472  }  }
1473    
1474  static GObject *  static void
1475  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_setup(OsmGpsMapPrivate *priv) {
 {  
     GObject *object;  
     OsmGpsMapPrivate *priv;  
     OsmGpsMap *map;  
1476      const char *uri;      const char *uri;
1477    
     //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);  
   
1478      //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
1479      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);
1480      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {      if ( (priv->map_source == 0) || (strcmp(priv->repo_uri, uri) == 0) ) {
# Line 1692  osm_gps_map_constructor (GType gtype, gu Line 1502  osm_gps_map_constructor (GType gtype, gu
1502      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);      const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1503      if(!fname) fname = "_unknown_";      if(!fname) fname = "_unknown_";
1504    
1505      if (priv->cache_dir) {      if (priv->tile_dir) {
1506          char *old = priv->cache_dir;          //the new cachedir is the given cache dir + the friendly name of the repo_uri
1507          //the new cachedir is the given cache dir + the md5 of the repo_uri          priv->cache_dir = g_strdup_printf("%s%c%s", priv->tile_dir, G_DIR_SEPARATOR, fname);
1508          priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, fname);          g_debug("Adjusting cache dir %s -> %s", priv->tile_dir, priv->cache_dir);
         g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);  
         g_free(old);  
1509      }      }
1510    }
1511    
1512      inspect_map_uri(map);  static GObject *
1513    osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
1514    {
1515        //Always chain up to the parent constructor
1516        GObject *object =
1517            G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
1518    
1519        osm_gps_map_setup(OSM_GPS_MAP_PRIVATE(object));
1520    
1521        inspect_map_uri(OSM_GPS_MAP(object));
1522    
1523      return object;      return object;
1524  }  }
# Line 1737  osm_gps_map_dispose (GObject *object) Line 1555  osm_gps_map_dispose (GObject *object)
1555      if (priv->idle_map_redraw != 0)      if (priv->idle_map_redraw != 0)
1556          g_source_remove (priv->idle_map_redraw);          g_source_remove (priv->idle_map_redraw);
1557    
1558      g_free(priv->gps);      if (priv->drag_expose != 0)
1559            g_source_remove (priv->drag_expose);
1560    
1561  #ifdef ENABLE_BALLOON      g_free(priv->gps);
     g_free(priv->balloon.coo);  
 #endif  
1562    
1563  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1564      if(priv->osd)      if(priv->osd)
# Line 1762  osm_gps_map_finalize (GObject *object) Line 1579  osm_gps_map_finalize (GObject *object)
1579      OsmGpsMap *map = OSM_GPS_MAP(object);      OsmGpsMap *map = OSM_GPS_MAP(object);
1580      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1581    
1582      g_free(priv->cache_dir);      if(priv->tile_dir)
1583            g_free(priv->tile_dir);
1584    
1585        if(priv->cache_dir)
1586            g_free(priv->cache_dir);
1587    
1588      g_free(priv->repo_uri);      g_free(priv->repo_uri);
1589      g_free(priv->image_format);      g_free(priv->image_format);
1590    
# Line 1819  osm_gps_map_set_property (GObject *objec Line 1641  osm_gps_map_set_property (GObject *objec
1641              break;              break;
1642          case PROP_TILE_CACHE_DIR:          case PROP_TILE_CACHE_DIR:
1643              if ( g_value_get_string(value) )              if ( g_value_get_string(value) )
1644                  priv->cache_dir = g_value_dup_string (value);                  priv->tile_dir = g_value_dup_string (value);
1645              break;              break;
1646          case PROP_ZOOM:          case PROP_ZOOM:
1647              priv->map_zoom = g_value_get_int (value);              priv->map_zoom = g_value_get_int (value);
# Line 1847  osm_gps_map_set_property (GObject *objec Line 1669  osm_gps_map_set_property (GObject *objec
1669          case PROP_GPS_POINT_R2:          case PROP_GPS_POINT_R2:
1670              priv->ui_gps_point_outer_radius = g_value_get_int (value);              priv->ui_gps_point_outer_radius = g_value_get_int (value);
1671              break;              break;
1672          case PROP_MAP_SOURCE:          case PROP_MAP_SOURCE: {
1673                gint old = priv->map_source;
1674              priv->map_source = g_value_get_int (value);              priv->map_source = g_value_get_int (value);
1675              break;              if(old >= OSM_GPS_MAP_SOURCE_NULL &&
1676                   priv->map_source != old &&
1677                   priv->map_source >= OSM_GPS_MAP_SOURCE_NULL &&
1678                   priv->map_source <= OSM_GPS_MAP_SOURCE_LAST) {
1679    
1680                    /* we now have to switch the entire map */
1681    
1682                    /* flush the ram cache */
1683                    g_hash_table_remove_all(priv->tile_cache);
1684    
1685                    osm_gps_map_setup(priv);
1686    
1687                    inspect_map_uri(map);
1688    
1689                    /* adjust zoom if necessary */
1690                    if(priv->map_zoom > priv->max_zoom)
1691                        osm_gps_map_set_zoom(map, priv->max_zoom);
1692    
1693                    if(priv->map_zoom < priv->min_zoom)
1694                        osm_gps_map_set_zoom(map, priv->min_zoom);
1695    
1696                } } break;
1697          case PROP_IMAGE_FORMAT:          case PROP_IMAGE_FORMAT:
1698              priv->image_format = g_value_dup_string (value);              priv->image_format = g_value_dup_string (value);
1699              break;              break;
# Line 1962  osm_gps_map_button_press (GtkWidget *wid Line 1806  osm_gps_map_button_press (GtkWidget *wid
1806  {  {
1807      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1808    
 #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  
   
1809  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1810      /* pressed inside OSD control? */      /* pressed inside OSD control? */
1811      if(priv->osd) {      if(priv->osd) {
1812          osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);          osd_button_t but =
1813                priv->osd->check(priv->osd, TRUE, event->x, event->y);
1814    
1815          if(but != OSD_NONE)          if(but != OSD_NONE)
1816          {          {
1817              int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;              int step =
1818                    GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1819              priv->drag_counter = -1;              priv->drag_counter = -1;
1820    
1821              switch(but) {              switch(but) {
1822              case OSD_UP:              case OSD_UP:
1823                  priv->map_y -= step;                  priv->map_y -= step;
1824                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
1825                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1826                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1827                  break;                  break;
1828    
1829              case OSD_DOWN:              case OSD_DOWN:
1830                  priv->map_y += step;                  priv->map_y += step;
1831                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
1832                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1833                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1834                  break;                  break;
1835    
1836              case OSD_LEFT:              case OSD_LEFT:
1837                  priv->map_x -= step;                  priv->map_x -= step;
1838                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
1839                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1840                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1841                  break;                  break;
1842    
1843              case OSD_RIGHT:              case OSD_RIGHT:
1844                  priv->map_x += step;                  priv->map_x += step;
1845                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
1846                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1847                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1848                  break;                  break;
1849    
# Line 2041  osm_gps_map_button_release (GtkWidget *w Line 1881  osm_gps_map_button_release (GtkWidget *w
1881  {  {
1882      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1883    
 #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  
   
1884      if (priv->dragging)      if (priv->dragging)
1885      {      {
1886          priv->dragging = FALSE;          priv->dragging = FALSE;
# Line 2067  osm_gps_map_button_release (GtkWidget *w Line 1895  osm_gps_map_button_release (GtkWidget *w
1895    
1896          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1897      }      }
1898    #ifdef ENABLE_OSD
1899        /* pressed inside OSD control? */
1900        else if(priv->osd)
1901            priv->osd->check(priv->osd, FALSE, event->x, event->y);
1902    #endif
1903    
1904    #ifdef DRAG_DEBUG
1905        printf("dragging done\n");
1906    #endif
1907    
     priv->drag_mouse_dx = 0;  
     priv->drag_mouse_dy = 0;  
1908      priv->drag_counter = -1;      priv->drag_counter = -1;
1909    
1910      return FALSE;      return FALSE;
# Line 2079  static gboolean Line 1914  static gboolean
1914  osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);  osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
1915    
1916  static gboolean  static gboolean
1917    osm_gps_map_map_expose (GtkWidget *widget)
1918    {
1919        OsmGpsMapPrivate *priv = OSM_GPS_MAP(widget)->priv;
1920    
1921        priv->drag_expose = 0;
1922        osm_gps_map_expose (widget, NULL);
1923        return FALSE;
1924    }
1925    
1926    static gboolean
1927  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)  osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
1928  {  {
1929      int x, y;      int x, y;
# Line 2101  osm_gps_map_motion_notify (GtkWidget *wi Line 1946  osm_gps_map_motion_notify (GtkWidget *wi
1946      if (priv->drag_counter < 0)      if (priv->drag_counter < 0)
1947          return FALSE;          return FALSE;
1948    
1949      priv->drag_counter++;      /* not yet dragged far enough? */
1950        if(!priv->drag_counter &&
1951      // we havent dragged more than 6 pixels         ( (x - priv->drag_start_mouse_x) * (x - priv->drag_start_mouse_x) +
1952      if (priv->drag_counter < 6)           (y - priv->drag_start_mouse_y) * (y - priv->drag_start_mouse_y) <
1953             10*10))
1954          return FALSE;          return FALSE;
1955    
1956  #ifdef OSM_GPS_MAP_REFRESH      priv->drag_counter++;
     /* reduce update frequency on maemo to keep screen update fluid */  
     static guint32 last_time = 0;  
   
     if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;  
     last_time = event->time;  
 #endif  
1957    
1958      priv->dragging = TRUE;      priv->dragging = TRUE;
1959    
# Line 2123  osm_gps_map_motion_notify (GtkWidget *wi Line 1963  osm_gps_map_motion_notify (GtkWidget *wi
1963      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
1964      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
1965    
1966      osm_gps_map_expose (widget, NULL);      /* instead of redrawing directly just add an idle function */
1967        if (!priv->drag_expose)
1968            priv->drag_expose =
1969                g_idle_add ((GSourceFunc)osm_gps_map_map_expose, widget);
1970    
1971      return FALSE;      return FALSE;
1972  }  }
# Line 2183  osm_gps_map_expose (GtkWidget *widget, G Line 2026  osm_gps_map_expose (GtkWidget *widget, G
2026      GdkDrawable *drawable = widget->window;      GdkDrawable *drawable = widget->window;
2027  #endif  #endif
2028    
2029      if (!priv->dragging)  #ifdef DRAG_DEBUG
2030        printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2031    #endif
2032    
2033        if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2034      {      {
2035    #ifdef DRAG_DEBUG
2036            printf("  dragging = %d, event = %p\n", priv->dragging, event);
2037    #endif
2038    
2039          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2040                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2041                             priv->pixmap,                             priv->pixmap,
# Line 2194  osm_gps_map_expose (GtkWidget *widget, G Line 2045  osm_gps_map_expose (GtkWidget *widget, G
2045      }      }
2046      else      else
2047      {      {
2048    #ifdef DRAG_DEBUG
2049            printf("  drag_mouse %d/%d\n",
2050                   priv->drag_mouse_dx - EXTRA_BORDER,
2051                   priv->drag_mouse_dy - EXTRA_BORDER);
2052    #endif
2053    
2054          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2055                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2056                             priv->pixmap,                             priv->pixmap,
# Line 2453  osm_gps_map_class_init (OsmGpsMapClass * Line 2310  osm_gps_map_class_init (OsmGpsMapClass *
2310                                                         -1,           /* minimum property value */                                                         -1,           /* minimum property value */
2311                                                         G_MAXINT,    /* maximum property value */                                                         G_MAXINT,    /* maximum property value */
2312                                                         -1,                                                         -1,
2313                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
2314    
2315      g_object_class_install_property (object_class,      g_object_class_install_property (object_class,
2316                                       PROP_IMAGE_FORMAT,                                       PROP_IMAGE_FORMAT,
# Line 2472  osm_gps_map_source_get_friendly_name(Osm Line 2329  osm_gps_map_source_get_friendly_name(Osm
2329          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2330              return "None";              return "None";
2331          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2332              return "OpenStreetMap";              return "OpenStreetMap I";
2333          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2334              return "OpenStreetMap Renderer";              return "OpenStreetMap II";
2335          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2336              return "OpenCycleMap";              return "OpenCycleMap";
2337            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2338                return "OSMC Trails";
2339          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2340              return "Maps-For-Free";              return "Maps-For-Free";
2341          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2520  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2379  osm_gps_map_source_get_repo_uri(OsmGpsMa
2379              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2380          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2381              return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";              return "http://c.andy.sandbox.cloudmade.com/tiles/cycle/#Z/#X/#Y.png";
2382            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2383                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2384          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2385              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";
2386          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2558  osm_gps_map_source_get_image_format(OsmG Line 2419  osm_gps_map_source_get_image_format(OsmG
2419          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2420          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2421          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2422            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2423              return "png";              return "png";
2424            case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2425          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2426            case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
2427          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2428          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
2429          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
# Line 2567  osm_gps_map_source_get_image_format(OsmG Line 2431  osm_gps_map_source_get_image_format(OsmG
2431          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:          case OSM_GPS_MAP_SOURCE_YAHOO_STREET:
2432          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2433          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:  
2434              return "jpg";              return "jpg";
2435          default:          default:
2436              return "bin";              return "bin";
# Line 2590  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2452  osm_gps_map_source_get_max_zoom(OsmGpsMa
2452          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2453              return 18;              return 18;
2454          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2455            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2456              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2457          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
         case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:  
2458          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2459          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2460          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2602  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2464  osm_gps_map_source_get_max_zoom(OsmGpsMa
2464          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2465          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2466              return 17;              return 17;
2467            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2468                return 15;
2469          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2470              return 11;              return 11;
2471          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2741  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2605  osm_gps_map_set_zoom (OsmGpsMap *map, in
2605          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2606                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2607    
2608    #ifdef ENABLE_OSD
2609            /* OSD may contain a scale, so we may have to re-render it */
2610            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2611                priv->osd->render (priv->osd);
2612    #endif
2613    
2614          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2615      }      }
2616      return priv->map_zoom;      return priv->map_zoom;
# Line 2837  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2707  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2707      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2708      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2709      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2710        priv->gps_heading = deg2rad(heading);
2711    
2712      // pixel_x,y, offsets      // pixel_x,y, offsets
2713      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 2926  osm_gps_map_geographic_to_screen (OsmGps Line 2797  osm_gps_map_geographic_to_screen (OsmGps
2797      priv = map->priv;      priv = map->priv;
2798    
2799      if (pixel_x)      if (pixel_x)
2800          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - priv->map_x;          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) -
2801                priv->map_x + priv->drag_mouse_dx;
2802      if (pixel_y)      if (pixel_y)
2803          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - priv->map_y;          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) -
2804                priv->map_y + priv->drag_mouse_dy;
2805  }  }
2806    
2807  void  void
# Line 2943  osm_gps_map_scroll (OsmGpsMap *map, gint Line 2816  osm_gps_map_scroll (OsmGpsMap *map, gint
2816      priv->map_x += dx;      priv->map_x += dx;
2817      priv->map_y += dy;      priv->map_y += dy;
2818    
2819    #ifdef ENABLE_OSD
2820        /* OSD may contain a coordinate, so we may have to re-render it */
2821        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2822            priv->osd->render (priv->osd);
2823    #endif
2824    
2825      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
2826  }  }
2827    
# Line 2951  osm_gps_map_get_scale(OsmGpsMap *map) Line 2830  osm_gps_map_get_scale(OsmGpsMap *map)
2830  {  {
2831      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2832    
2833      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);
2834      priv = map->priv;      priv = map->priv;
2835    
2836      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);
2837  }  }
2838    
 #ifdef ENABLE_BALLOON  
 void  
 osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude,  
                           OsmGpsMapBalloonCallback cb, gpointer data)  
 {  
     OsmGpsMapPrivate *priv;  
   
     /* remove and previously installed balloon */  
     osm_gps_map_clear_balloon (map);  
   
     g_return_if_fail (OSM_IS_GPS_MAP (map));  
     priv = map->priv;  
   
     priv->balloon.coo->rlat = deg2rad(latitude);  
     priv->balloon.coo->rlon = deg2rad(longitude);  
     priv->balloon.valid = TRUE;  
   
     priv->balloon.cb = cb;  
     priv->balloon.data = data;  
   
     // this redraws the map  
     osm_gps_map_map_redraw_idle(map);  
 }  
   
 void  
 osm_gps_map_clear_balloon (OsmGpsMap *map)  
 {  
     OsmGpsMapPrivate *priv;  
   
     g_return_if_fail (OSM_IS_GPS_MAP (map));  
     priv = map->priv;  
   
     priv->balloon.valid = FALSE;  
   
     osm_gps_map_map_redraw_idle(map);  
 }  
 #endif  
   
2839  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
2840    
2841  void  void
# Line 3003  osm_gps_map_redraw (OsmGpsMap *map) Line 2844  osm_gps_map_redraw (OsmGpsMap *map)
2844      osm_gps_map_map_redraw_idle(map);      osm_gps_map_map_redraw_idle(map);
2845  }  }
2846    
2847  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {  osm_gps_map_osd_t *
2848    osm_gps_map_osd_get(OsmGpsMap *map)
2849    {
2850      g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);      g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2851      return map->priv->osd;      return map->priv->osd;
2852  }  }
2853    
2854  void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {  void
2855    osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd)
2856    {
2857      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2858    
2859      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
# Line 3019  void osm_gps_map_register_osd(OsmGpsMap Line 2864  void osm_gps_map_register_osd(OsmGpsMap
2864      priv->osd = osd;      priv->osd = osd;
2865  }  }
2866    
2867    void
2868    osm_gps_map_repaint (OsmGpsMap *map)
2869    {
2870        osm_gps_map_expose (GTK_WIDGET(map), NULL);
2871    }
2872    
2873    coord_t *
2874    osm_gps_map_get_gps (OsmGpsMap *map)
2875    {
2876        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2877    
2878        if(!map->priv->gps_valid)
2879            return NULL;
2880    
2881        return map->priv->gps;
2882    }
2883    
2884  #endif  #endif
Legend:
Removed from v.85  
changed lines
  Added in v.150