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 121 by harbaum, Sun Sep 20 19:26:29 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 159  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 589  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 621  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 634  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 676  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 1462  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1256  osm_gps_map_map_redraw (OsmGpsMap *map)
1256      if (priv->osd->busy(priv->osd))      if (priv->osd->busy(priv->osd))
1257          return FALSE;          return FALSE;
1258    
1259    #ifdef DRAG_DEBUG
1260        printf("trying redraw\n");
1261    #endif
1262    
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 1469  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 1485  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  
1291      osm_gps_map_draw_balloon_int(map);  #ifdef ENABLE_OSD
1292        /* 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 1598  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;
 #ifdef ENABLE_BALLOON  
     priv->balloon.coo = g_new0(coord_t, 1);  
     priv->balloon.valid = FALSE;  
     priv->balloon.cb = NULL;  
 #endif  
1406    
1407  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1408      priv->osd = NULL;      priv->osd = NULL;
# Line 1748  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)      if(priv->osd)
# Line 2000  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
1802      /* pressed inside OSD control? */      /* pressed inside OSD control? */
1803      if(priv->osd) {      if(priv->osd) {
1804          osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);          osd_button_t but =
1805                priv->osd->check(priv->osd, TRUE, event->x, event->y);
1806    
1807          if(but != OSD_NONE)          if(but != OSD_NONE)
1808          {          {
1809              int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;              int step =
1810                    GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1811              priv->drag_counter = -1;              priv->drag_counter = -1;
1812    
1813              switch(but) {              switch(but) {
1814              case OSD_UP:              case OSD_UP:
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_DOWN:              case OSD_DOWN:
1822                  priv->map_y += step;                  priv->map_y += 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_LEFT:              case OSD_LEFT:
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    
1835              case OSD_RIGHT:              case OSD_RIGHT:
1836                  priv->map_x += step;                  priv->map_x += step;
1837                  priv->center_coord_set = FALSE;                  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));                  osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1840                  break;                  break;
1841    
# Line 2079  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 2105  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 2117  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 2139  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 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  
1949    
1950      priv->dragging = TRUE;      priv->dragging = TRUE;
1951    
# Line 2161  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      osm_gps_map_expose (widget, NULL);      /* instead of redrawing directly just add an idle function */
1959        if (!priv->drag_expose)
1960            priv->drag_expose =
1961                g_idle_add ((GSourceFunc)osm_gps_map_map_expose, widget);
1962    
1963      return FALSE;      return FALSE;
1964  }  }
# Line 2221  osm_gps_map_expose (GtkWidget *widget, G Line 2018  osm_gps_map_expose (GtkWidget *widget, G
2018      GdkDrawable *drawable = widget->window;      GdkDrawable *drawable = widget->window;
2019  #endif  #endif
2020    
2021      if (!priv->dragging && event)  #ifdef DRAG_DEBUG
2022        printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2023    #endif
2024    
2025        if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2026      {      {
2027    #ifdef DRAG_DEBUG
2028            printf("  dragging = %d, event = %p\n", priv->dragging, event);
2029    #endif
2030    
2031          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2032                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2033                             priv->pixmap,                             priv->pixmap,
# Line 2232  osm_gps_map_expose (GtkWidget *widget, G Line 2037  osm_gps_map_expose (GtkWidget *widget, G
2037      }      }
2038      else      else
2039      {      {
2040    #ifdef DRAG_DEBUG
2041            printf("  drag_mouse %d/%d\n",
2042                   priv->drag_mouse_dx - EXTRA_BORDER,
2043                   priv->drag_mouse_dy - EXTRA_BORDER);
2044    #endif
2045    
2046          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2047                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2048                             priv->pixmap,                             priv->pixmap,
# Line 2515  osm_gps_map_source_get_friendly_name(Osm Line 2326  osm_gps_map_source_get_friendly_name(Osm
2326              return "OpenStreetMap II";              return "OpenStreetMap II";
2327          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2328              return "OpenCycleMap";              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 2558  osm_gps_map_source_get_repo_uri(OsmGpsMa Line 2371  osm_gps_map_source_get_repo_uri(OsmGpsMa
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_OPENCYCLEMAP:          case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
2373              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";
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 2596  osm_gps_map_source_get_image_format(OsmG Line 2411  osm_gps_map_source_get_image_format(OsmG
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:          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_MAPS_FOR_FREE:          case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE:
2417          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 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_OPENCYCLEMAP:  
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 2640  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 2779  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 2875  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 2964  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 2981  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 2989  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    
 #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  
   
2831  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
2832    
2833  void  void
Legend:
Removed from v.91  
changed lines
  Added in v.121