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

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

revision 91 by harbaum, Tue Sep 1 19:55:49 2009 UTC revision 112 by harbaum, Tue Sep 15 13:52:04 2009 UTC
# Line 115  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 589  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 579  osm_gps_map_draw_gps_point (OsmGpsMap *m
579          int x, y;          int x, y;
580          int r = priv->ui_gps_point_inner_radius;          int r = priv->ui_gps_point_inner_radius;
581          int r2 = priv->ui_gps_point_outer_radius;          int r2 = priv->ui_gps_point_outer_radius;
582          // int lw = priv->ui_gps_track_width;          int mr = MAX(3*r,r2);
         int mr = MAX(r,r2);  
583    
584          map_x0 = priv->map_x - EXTRA_BORDER;          map_x0 = priv->map_x - EXTRA_BORDER;
585          map_y0 = priv->map_y - EXTRA_BORDER;          map_y0 = priv->map_y - EXTRA_BORDER;
# Line 621  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 610  osm_gps_map_draw_gps_point (OsmGpsMap *m
610    
611          // draw ball gradient          // draw ball gradient
612          if (r > 0) {          if (r > 0) {
613                // draw direction arrow
614                if(!isnan(priv->gps_heading))
615                {
616                    cairo_move_to (cr, x-r*cos(priv->gps_heading), y-r*sin(priv->gps_heading));
617                    cairo_line_to (cr, x+3*r*sin(priv->gps_heading), y-3*r*cos(priv->gps_heading));
618                    cairo_line_to (cr, x+r*cos(priv->gps_heading), y+r*sin(priv->gps_heading));
619                    cairo_close_path (cr);
620    
621                    cairo_set_source_rgba (cr, 0.3, 0.3, 1.0, 0.5);
622                    cairo_fill_preserve (cr);
623    
624                    cairo_set_line_width (cr, 1.0);
625                    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5);
626                    cairo_stroke(cr);
627                }
628    
629              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);
630              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);
631              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 634  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 639  osm_gps_map_draw_gps_point (OsmGpsMap *m
639              cairo_arc (cr, x, y, r, 0, 2 * M_PI);              cairo_arc (cr, x, y, r, 0, 2 * M_PI);
640              cairo_stroke(cr);              cairo_stroke(cr);
641          }          }
642    
643          cairo_destroy(cr);          cairo_destroy(cr);
644          gtk_widget_queue_draw_area (GTK_WIDGET(map),          gtk_widget_queue_draw_area (GTK_WIDGET(map),
645                                      x-mr,                                      x-mr,
# Line 676  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 681  osm_gps_map_draw_gps_point (OsmGpsMap *m
681      }      }
682  }  }
683    
 #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  
   
684  static void  static void
685  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)
686  {  {
# Line 1462  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1255  osm_gps_map_map_redraw (OsmGpsMap *map)
1255      if (priv->osd->busy(priv->osd))      if (priv->osd->busy(priv->osd))
1256          return FALSE;          return FALSE;
1257    
1258    #ifdef DRAG_DEBUG
1259        printf("trying redraw\n");
1260    #endif
1261    
1262      /* 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
1263       * 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
1264       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1469  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1266  osm_gps_map_map_redraw (OsmGpsMap *map)
1266      if (priv->dragging)      if (priv->dragging)
1267          return FALSE;          return FALSE;
1268    
1269        /* undo all offsets that may have happened when dragging */
1270        priv->drag_mouse_dx = 0;
1271        priv->drag_mouse_dy = 0;
1272    
1273      priv->redraw_cycle++;      priv->redraw_cycle++;
1274    
1275      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1485  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1286  osm_gps_map_map_redraw (OsmGpsMap *map)
1286      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1287      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1288      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1289  #ifdef ENABLE_BALLOON  
1290      osm_gps_map_draw_balloon_int(map);  #ifdef ENABLE_OSD
1291        /* OSD may contain a coordinate/scale, so we may have to re-render it */
1292        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1293            priv->osd->render (priv->osd);
1294  #endif  #endif
1295    
     //osm_gps_map_osd_speed(map, 1.5);  
1296      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1297      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1298    
# Line 1598  osm_gps_map_init (OsmGpsMap *object) Line 1401  osm_gps_map_init (OsmGpsMap *object)
1401      priv->trip_history = NULL;      priv->trip_history = NULL;
1402      priv->gps = g_new0(coord_t, 1);      priv->gps = g_new0(coord_t, 1);
1403      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1404        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  
1405    
1406  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1407      priv->osd = NULL;      priv->osd = NULL;
# Line 1750  osm_gps_map_dispose (GObject *object) Line 1548  osm_gps_map_dispose (GObject *object)
1548    
1549      g_free(priv->gps);      g_free(priv->gps);
1550    
 #ifdef ENABLE_BALLOON  
     g_free(priv->balloon.coo);  
 #endif  
   
1551  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1552      if(priv->osd)      if(priv->osd)
1553          priv->osd->free(priv->osd);          priv->osd->free(priv->osd);
# Line 2000  osm_gps_map_button_press (GtkWidget *wid Line 1794  osm_gps_map_button_press (GtkWidget *wid
1794  {  {
1795      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1796    
 #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  
   
1797  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1798      /* pressed inside OSD control? */      /* pressed inside OSD control? */
1799      if(priv->osd) {      if(priv->osd) {
# Line 2024  osm_gps_map_button_press (GtkWidget *wid Line 1807  osm_gps_map_button_press (GtkWidget *wid
1807              case OSD_UP:              case OSD_UP:
1808                  priv->map_y -= step;                  priv->map_y -= step;
1809                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
1810                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1811                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1812                  break;                  break;
1813    
1814              case OSD_DOWN:              case OSD_DOWN:
1815                  priv->map_y += step;                  priv->map_y += step;
1816                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
1817                    g_object_set(G_OBJECT(widget), "auto-center", FALSE, NULL);
1818                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1819                  break;                  break;
1820    
1821              case OSD_LEFT:              case OSD_LEFT:
1822                  priv->map_x -= step;                  priv->map_x -= step;
1823                  priv->center_coord_set = FALSE;                  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));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1826                  break;                  break;
1827    
1828              case OSD_RIGHT:              case OSD_RIGHT:
1829                  priv->map_x += step;                  priv->map_x += step;
1830                  priv->center_coord_set = FALSE;                  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));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1833                  break;                  break;
1834    
# Line 2079  osm_gps_map_button_release (GtkWidget *w Line 1866  osm_gps_map_button_release (GtkWidget *w
1866  {  {
1867      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1868    
 #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  
   
1869      if (priv->dragging)      if (priv->dragging)
1870      {      {
1871          priv->dragging = FALSE;          priv->dragging = FALSE;
# Line 2106  osm_gps_map_button_release (GtkWidget *w Line 1881  osm_gps_map_button_release (GtkWidget *w
1881          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1882      }      }
1883    
1884      priv->drag_mouse_dx = 0;  #ifdef DRAG_DEBUG
1885      priv->drag_mouse_dy = 0;      printf("dragging done\n");
1886    #endif
1887    
1888      priv->drag_counter = -1;      priv->drag_counter = -1;
1889    
1890      return FALSE;      return FALSE;
# Line 2221  osm_gps_map_expose (GtkWidget *widget, G Line 1998  osm_gps_map_expose (GtkWidget *widget, G
1998      GdkDrawable *drawable = widget->window;      GdkDrawable *drawable = widget->window;
1999  #endif  #endif
2000    
2001      if (!priv->dragging && event)  #ifdef DRAG_DEBUG
2002        printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2003    #endif
2004    
2005        if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2006      {      {
2007    #ifdef DRAG_DEBUG
2008            printf("  dragging = %d, event = %p\n", priv->dragging, event);
2009    #endif
2010    
2011          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2012                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2013                             priv->pixmap,                             priv->pixmap,
# Line 2232  osm_gps_map_expose (GtkWidget *widget, G Line 2017  osm_gps_map_expose (GtkWidget *widget, G
2017      }      }
2018      else      else
2019      {      {
2020    #ifdef DRAG_DEBUG
2021            printf("  drag_mouse %d/%d\n",
2022                   priv->drag_mouse_dx - EXTRA_BORDER,
2023                   priv->drag_mouse_dy - EXTRA_BORDER);
2024    #endif
2025    
2026          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2027                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2028                             priv->pixmap,                             priv->pixmap,
# Line 2515  osm_gps_map_source_get_friendly_name(Osm Line 2306  osm_gps_map_source_get_friendly_name(Osm
2306              return "OpenStreetMap II";              return "OpenStreetMap II";
2307          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2308              return "OpenCycleMap";              return "OpenCycleMap";
2309            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2310                return "OSMC Trails";
2311          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2312              return "Maps-For-Free";              return "Maps-For-Free";
2313          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2558  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2351  osm_gps_map_source_get_repo_uri(OsmGpsMa
2351              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";              return "http://tah.openstreetmap.org/Tiles/tile/#Z/#X/#Y.png";
2352          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2353              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";
2354            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2355                return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png";
2356          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2357              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";
2358          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2596  osm_gps_map_source_get_image_format(OsmG Line 2391  osm_gps_map_source_get_image_format(OsmG
2391          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2392          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
2393          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2394            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2395              return "png";              return "png";
2396          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2397          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
# Line 2628  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2424  osm_gps_map_source_get_max_zoom(OsmGpsMa
2424          case OSM_GPS_MAP_SOURCE_NULL:          case OSM_GPS_MAP_SOURCE_NULL:
2425              return 18;              return 18;
2426          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
2427            case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2428              return OSM_MAX_ZOOM;              return OSM_MAX_ZOOM;
2429          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:          case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
         case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:  
2430          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:          case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
2431          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:          case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
2432          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:          case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
# Line 2640  osm_gps_map_source_get_max_zoom(OsmGpsMa Line 2436  osm_gps_map_source_get_max_zoom(OsmGpsMa
2436          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:          case OSM_GPS_MAP_SOURCE_YAHOO_SATELLITE:
2437          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:          case OSM_GPS_MAP_SOURCE_YAHOO_HYBRID:
2438              return 17;              return 17;
2439            case OSM_GPS_MAP_SOURCE_OSMC_TRAILS:
2440                return 15;
2441          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2442              return 11;              return 11;
2443          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:          case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
# Line 2779  osm_gps_map_set_zoom (OsmGpsMap *map, in Line 2577  osm_gps_map_set_zoom (OsmGpsMap *map, in
2577          g_debug("Zoom changed from %d to %d factor:%f x:%d",          g_debug("Zoom changed from %d to %d factor:%f x:%d",
2578                  zoom_old, priv->map_zoom, factor, priv->map_x);                  zoom_old, priv->map_zoom, factor, priv->map_x);
2579    
2580    #ifdef ENABLE_OSD
2581            /* OSD may contain a scale, so we may have to re-render it */
2582            if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2583                priv->osd->render (priv->osd);
2584    #endif
2585    
2586          osm_gps_map_map_redraw_idle(map);          osm_gps_map_map_redraw_idle(map);
2587      }      }
2588      return priv->map_zoom;      return priv->map_zoom;
# Line 2875  osm_gps_map_draw_gps (OsmGpsMap *map, fl Line 2679  osm_gps_map_draw_gps (OsmGpsMap *map, fl
2679      priv->gps->rlat = deg2rad(latitude);      priv->gps->rlat = deg2rad(latitude);
2680      priv->gps->rlon = deg2rad(longitude);      priv->gps->rlon = deg2rad(longitude);
2681      priv->gps_valid = TRUE;      priv->gps_valid = TRUE;
2682        priv->gps_heading = deg2rad(heading);
2683    
2684      // pixel_x,y, offsets      // pixel_x,y, offsets
2685      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);      pixel_x = lon2pixel(priv->map_zoom, priv->gps->rlon);
# Line 2981  osm_gps_map_scroll (OsmGpsMap *map, gint Line 2786  osm_gps_map_scroll (OsmGpsMap *map, gint
2786      priv->map_x += dx;      priv->map_x += dx;
2787      priv->map_y += dy;      priv->map_y += dy;
2788    
2789    #ifdef ENABLE_OSD
2790        /* OSD may contain a coordinate, so we may have to re-render it */
2791        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2792            priv->osd->render (priv->osd);
2793    #endif
2794    
2795      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
2796  }  }
2797    
# Line 2989  osm_gps_map_get_scale(OsmGpsMap *map) Line 2800  osm_gps_map_get_scale(OsmGpsMap *map)
2800  {  {
2801      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2802    
2803      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);
2804      priv = map->priv;      priv = map->priv;
2805    
2806      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);
2807  }  }
2808    
 #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  
   
2809  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
2810    
2811  void  void
Legend:
Removed from v.91  
changed lines
  Added in v.112