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

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

revision 73 by harbaum, Sun Aug 23 19:38:15 2009 UTC revision 77 by harbaum, Tue Aug 25 12:49:03 2009 UTC
# Line 49  Line 49 
49    
50  #define EXTRA_BORDER (TILESIZE / 2)  #define EXTRA_BORDER (TILESIZE / 2)
51    
52    #define OSM_GPS_MAP_SCROLL_STEP 10
53    
54    /* any defined key enables key support */
55    #if (defined(OSM_GPS_MAP_KEY_FULLSCREEN) || \
56         defined(OSM_GPS_MAP_KEY_ZOOMIN) || \
57         defined(OSM_GPS_MAP_KEY_ZOOMOUT) || \
58         defined(OSM_GPS_MAP_KEY_UP) || \
59         defined(OSM_GPS_MAP_KEY_DOWN) || \
60         defined(OSM_GPS_MAP_KEY_LEFT) || \
61         defined(OSM_GPS_MAP_KEY_RIGHT))
62    #define OSM_GPS_MAP_KEYS
63    #endif
64    
65    #ifdef OSM_GPS_MAP_KEYS
66    #include <gdk/gdkkeysyms.h>
67    #endif
68    
69  struct _OsmGpsMapPrivate  struct _OsmGpsMapPrivate
70  {  {
71      GHashTable *tile_queue;      GHashTable *tile_queue;
# Line 112  struct _OsmGpsMapPrivate Line 129  struct _OsmGpsMapPrivate
129  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
130      //the osd controls (if present)      //the osd controls (if present)
131      osm_gps_map_osd_t *osd;      osm_gps_map_osd_t *osd;
132    #ifdef OSD_DOUBLE_BUFFER
133        GdkPixmap *dbuf_pixmap;
134    #endif
135    #endif
136    
137    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
138        gboolean fullscreen;
139  #endif  #endif
140    
141      //additional images or tracks added to the map      //additional images or tracks added to the map
# Line 1451  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1475  osm_gps_map_map_redraw (OsmGpsMap *map)
1475      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1476  #endif  #endif
1477    
 #ifdef ENABLE_OSD  
     if(priv->osd)  
         priv->osd->draw(priv->osd, EXTRA_BORDER, EXTRA_BORDER);  
 #endif  
   
1478      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
1479      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1480      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
# Line 1472  osm_gps_map_map_redraw_idle (OsmGpsMap * Line 1491  osm_gps_map_map_redraw_idle (OsmGpsMap *
1491          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);          priv->idle_map_redraw = g_idle_add ((GSourceFunc)osm_gps_map_map_redraw, map);
1492  }  }
1493    
1494    #ifdef OSM_GPS_MAP_KEYS
1495    static gboolean
1496    on_window_key_press(GtkWidget *widget,
1497                             GdkEventKey *event, OsmGpsMapPrivate *priv) {
1498      gboolean handled = FALSE;
1499      int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1500    
1501      printf("key event with keyval %x\n", event->keyval);
1502    
1503      // the map handles some keys on its own ...
1504      switch(event->keyval) {
1505    #ifdef OSM_GPS_MAP_KEY_FULLSCREEN
1506      case OSM_GPS_MAP_KEY_FULLSCREEN: {
1507          GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(widget));
1508          if(!priv->fullscreen)
1509              gtk_window_fullscreen(GTK_WINDOW(toplevel));
1510          else
1511              gtk_window_unfullscreen(GTK_WINDOW(toplevel));
1512    
1513          priv->fullscreen = !priv->fullscreen;
1514          handled = TRUE;
1515          } break;
1516    #endif
1517    
1518    #ifdef OSM_GPS_MAP_KEY_ZOOMIN
1519      case OSM_GPS_MAP_KEY_ZOOMIN:
1520          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1521          handled = TRUE;
1522          break;
1523    #endif
1524    
1525    #ifdef OSM_GPS_MAP_KEY_ZOOMOUT
1526      case OSM_GPS_MAP_KEY_ZOOMOUT:
1527          osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1528          handled = TRUE;
1529          break;
1530    #endif
1531    
1532    #ifdef OSM_GPS_MAP_KEY_UP
1533      case OSM_GPS_MAP_KEY_UP:
1534          priv->map_y -= step;
1535          priv->center_coord_set = FALSE;
1536          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1537          handled = TRUE;
1538          break;
1539    #endif
1540    
1541    #ifdef OSM_GPS_MAP_KEY_DOWN
1542      case OSM_GPS_MAP_KEY_DOWN:
1543          priv->map_y += step;
1544          priv->center_coord_set = FALSE;
1545          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1546          handled = TRUE;
1547          break;
1548    #endif
1549    
1550    #ifdef OSM_GPS_MAP_KEY_LEFT
1551      case OSM_GPS_MAP_KEY_LEFT:
1552          priv->map_x -= step;
1553          priv->center_coord_set = FALSE;
1554          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1555          handled = TRUE;
1556          break;
1557    #endif
1558    
1559    #ifdef OSM_GPS_MAP_KEY_RIGHT
1560      case OSM_GPS_MAP_KEY_RIGHT:
1561          priv->map_x += step;
1562          priv->center_coord_set = FALSE;
1563          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1564          handled = TRUE;
1565          break;
1566    #endif
1567    
1568      default:
1569          printf("unhandled key event with keyval %x\n", event->keyval);
1570          break;
1571      }
1572    
1573      return handled;
1574    }
1575    #endif
1576    
1577  static void  static void
1578  osm_gps_map_init (OsmGpsMap *object)  osm_gps_map_init (OsmGpsMap *object)
1579  {  {
# Line 1496  osm_gps_map_init (OsmGpsMap *object) Line 1598  osm_gps_map_init (OsmGpsMap *object)
1598      priv->osd = NULL;      priv->osd = NULL;
1599  #endif  #endif
1600    
1601    #ifdef OSM_GPS_MAP_BUTTON_FULLSCREEN
1602        priv->fullscreen = FALSE;
1603    #endif
1604    
1605      priv->tracks = NULL;      priv->tracks = NULL;
1606      priv->images = NULL;      priv->images = NULL;
1607    
# Line 1540  osm_gps_map_init (OsmGpsMap *object) Line 1646  osm_gps_map_init (OsmGpsMap *object)
1646      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);      GTK_WIDGET_SET_FLAGS (object, GTK_CAN_FOCUS);
1647    
1648      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);
 }  
1649    
1650  #ifndef G_CHECKSUM_MD5  #ifdef OSM_GPS_MAP_KEYS
1651  /* simple hash algorithm hack if md5 is not present */      //    GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(object));
1652  static char *simple_hash(char *str) {      g_signal_connect(G_OBJECT(object), "key_press_event",
1653      union {                       G_CALLBACK(on_window_key_press), priv);
         char str[4];  
         gulong val;  
     } hash = { .val = 0x55555555 };  
   
     while(*str) {  
         hash.str[(int)str & 3] ^= *str;  
         str++;  
     }  
     return g_strdup_printf("%08lX", hash.val);  
 }  
1654  #endif  #endif
1655    }
1656    
1657  static GObject *  static GObject *
1658  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)  osm_gps_map_constructor (GType gtype, guint n_properties, GObjectConstructParam *properties)
# Line 1596  osm_gps_map_constructor (GType gtype, gu Line 1692  osm_gps_map_constructor (GType gtype, gu
1692      }      }
1693    
1694      if (!priv->cache_dir_is_full_path) {      if (!priv->cache_dir_is_full_path) {
1695  #ifdef G_CHECKSUM_MD5          const char *fname = osm_gps_map_source_get_friendly_name(priv->map_source);
1696          char *md5 = g_compute_checksum_for_string (G_CHECKSUM_MD5, priv->repo_uri, -1);          if(!fname) fname = "_unknown_";
 #else  
         char *md5 = simple_hash(priv->repo_uri);  
 #endif  
1697    
1698          if (priv->cache_dir) {          if (priv->cache_dir) {
1699              char *old = priv->cache_dir;              char *old = priv->cache_dir;
1700              //the new cachedir is the given cache dir + the md5 of the repo_uri              //the new cachedir is the given cache dir + the md5 of the repo_uri
1701              priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, md5);              priv->cache_dir = g_strdup_printf("%s%c%s", old, G_DIR_SEPARATOR, fname);
1702              g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);              g_debug("Adjusting cache dir %s -> %s", old, priv->cache_dir);
1703              g_free(old);              g_free(old);
1704          } else {          } else {
1705              //the new cachedir is the current dir + the md5 of the repo_uri              //the new cachedir is the current dir + the md5 of the repo_uri
1706              priv->cache_dir = g_strdup(md5);              priv->cache_dir = g_strdup(fname);
1707          }          }
   
         g_free(md5);  
1708      }      }
1709    
1710      inspect_map_uri(map);      inspect_map_uri(map);
# Line 1662  osm_gps_map_dispose (GObject *object) Line 1753  osm_gps_map_dispose (GObject *object)
1753  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1754      if(priv->osd)      if(priv->osd)
1755          priv->osd->free(priv->osd);          priv->osd->free(priv->osd);
1756    
1757    #ifdef OSD_DOUBLE_BUFFER
1758        if(priv->dbuf_pixmap)
1759            g_object_unref (priv->dbuf_pixmap);
1760    #endif
1761  #endif  #endif
1762    
1763      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
# Line 1891  osm_gps_map_button_press (GtkWidget *wid Line 1987  osm_gps_map_button_press (GtkWidget *wid
1987  #endif  #endif
1988    
1989  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
     #define SCROLL_STEP 10  
   
1990      /* pressed inside OSD control? */      /* pressed inside OSD control? */
1991      if(priv->osd) {      if(priv->osd) {
1992          osd_button_t but = priv->osd->check(event->x, event->y);          osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
1993          if(but != OSD_NONE)          if(but != OSD_NONE)
1994          {          {
1995                int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1996              priv->drag_counter = -1;              priv->drag_counter = -1;
1997    
1998              switch(but) {              switch(but) {
1999              case OSD_UP:              case OSD_UP:
2000                  priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;                  priv->map_y -= step;
2001                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2002                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2003                  break;                  break;
2004    
2005              case OSD_DOWN:              case OSD_DOWN:
2006                  priv->map_y += GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;                  priv->map_y += step;
2007                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2008                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2009                  break;                  break;
2010    
2011              case OSD_LEFT:              case OSD_LEFT:
2012                  priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;                  priv->map_x -= step;
2013                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2014                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2015                  break;                  break;
2016    
2017              case OSD_RIGHT:              case OSD_RIGHT:
2018                  priv->map_x += GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;                  priv->map_x += step;
2019                  priv->center_coord_set = FALSE;                  priv->center_coord_set = FALSE;
2020                    osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
2021                  break;                  break;
2022    
2023              case OSD_IN:              case OSD_IN:
# Line 1936  osm_gps_map_button_press (GtkWidget *wid Line 2035  osm_gps_map_button_press (GtkWidget *wid
2035                  break;                  break;
2036              }              }
2037    
             osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));  
   
2038              return FALSE;              return FALSE;
2039          }          }
2040      }      }
# Line 2023  osm_gps_map_motion_notify (GtkWidget *wi Line 2120  osm_gps_map_motion_notify (GtkWidget *wi
2120      if (priv->drag_counter < 6)      if (priv->drag_counter < 6)
2121          return FALSE;          return FALSE;
2122    
2123  #ifdef USE_MAEMO  #ifdef OSM_GPS_MAP_REFRESH
2124      /* reduce update frequency on maemo to keep screen update fluid */      /* reduce update frequency on maemo to keep screen update fluid */
2125      static guint32 last_time = 0;      static guint32 last_time = 0;
2126    
2127      if(event->time - last_time < 100) return FALSE;      if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
2128      last_time = event->time;      last_time = event->time;
2129  #endif  #endif
2130    
# Line 2039  osm_gps_map_motion_notify (GtkWidget *wi Line 2136  osm_gps_map_motion_notify (GtkWidget *wi
2136      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;      priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
2137      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2138    
 #ifdef ENABLE_OSD  
     if(priv->osd) {  
         /* undo OSD */  
         priv->osd->restore (priv->osd);  
   
         /* draw new OSD */  
         priv->osd->draw (priv->osd,  
                          EXTRA_BORDER - priv->drag_mouse_dx,  
                          EXTRA_BORDER - priv->drag_mouse_dy);  
     }  
 #endif  
   
2139      osm_gps_map_expose (widget, NULL);      osm_gps_map_expose (widget, NULL);
2140    
   
2141      return FALSE;      return FALSE;
2142  }  }
2143    
# Line 2067  osm_gps_map_configure (GtkWidget *widget Line 2151  osm_gps_map_configure (GtkWidget *widget
2151          g_object_unref (priv->pixmap);          g_object_unref (priv->pixmap);
2152    
2153      priv->pixmap = gdk_pixmap_new (      priv->pixmap = gdk_pixmap_new (
2154                                     widget->window,                          widget->window,
2155                                     widget->allocation.width + EXTRA_BORDER * 2,                          widget->allocation.width + EXTRA_BORDER * 2,
2156                                     widget->allocation.height + EXTRA_BORDER * 2,                          widget->allocation.height + EXTRA_BORDER * 2,
2157                                     -1);                          -1);
2158    
2159  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
2160    
2161    #ifdef OSD_DOUBLE_BUFFER
2162        if (priv->dbuf_pixmap)
2163            g_object_unref (priv->dbuf_pixmap);
2164    
2165        priv->dbuf_pixmap = gdk_pixmap_new (
2166                            widget->window,
2167                            widget->allocation.width,
2168                            widget->allocation.height,
2169                            -1);
2170    #endif
2171    
2172      /* the osd needs some references to map internal objects */      /* the osd needs some references to map internal objects */
2173      if(priv->osd)      if(priv->osd)
     {  
         priv->osd->pixmap = priv->pixmap;  
2174          priv->osd->widget = widget;          priv->osd->widget = widget;
     }  
2175  #endif  #endif
2176    
2177      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
# Line 2097  osm_gps_map_expose (GtkWidget *widget, G Line 2190  osm_gps_map_expose (GtkWidget *widget, G
2190  {  {
2191      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
2192    
2193      gdk_draw_drawable (  #if defined(ENABLE_OSD) && defined(OSD_DOUBLE_BUFFER)
2194                         widget->window,      GdkDrawable *drawable = priv->dbuf_pixmap;
2195    #else
2196        GdkDrawable *drawable = widget->window;
2197    #endif
2198    
2199        gdk_draw_drawable (drawable,
2200                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2201                         priv->pixmap,                         priv->pixmap,
2202                         0,0,                         0,0,
# Line 2109  osm_gps_map_expose (GtkWidget *widget, G Line 2207  osm_gps_map_expose (GtkWidget *widget, G
2207      //Paint white outside of the map if dragging. Its less      //Paint white outside of the map if dragging. Its less
2208      //ugly than painting the corrupted map      //ugly than painting the corrupted map
2209      if(priv->drag_mouse_dx>EXTRA_BORDER) {      if(priv->drag_mouse_dx>EXTRA_BORDER) {
2210          gdk_draw_rectangle (          gdk_draw_rectangle (drawable,
                             widget->window,  
2211                              widget->style->white_gc,                              widget->style->white_gc,
2212                              TRUE,                              TRUE,
2213                              0, 0,                              0, 0,
# Line 2119  osm_gps_map_expose (GtkWidget *widget, G Line 2216  osm_gps_map_expose (GtkWidget *widget, G
2216      }      }
2217      else if (-priv->drag_mouse_dx > EXTRA_BORDER)      else if (-priv->drag_mouse_dx > EXTRA_BORDER)
2218      {      {
2219          gdk_draw_rectangle (          gdk_draw_rectangle (drawable,
                             widget->window,  
2220                              widget->style->white_gc,                              widget->style->white_gc,
2221                              TRUE,                              TRUE,
2222                              priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,                              priv->drag_mouse_dx + widget->allocation.width + EXTRA_BORDER, 0,
# Line 2129  osm_gps_map_expose (GtkWidget *widget, G Line 2225  osm_gps_map_expose (GtkWidget *widget, G
2225      }      }
2226    
2227      if (priv->drag_mouse_dy>EXTRA_BORDER) {      if (priv->drag_mouse_dy>EXTRA_BORDER) {
2228          gdk_draw_rectangle (          gdk_draw_rectangle (drawable,
                             widget->window,  
2229                              widget->style->white_gc,                              widget->style->white_gc,
2230                              TRUE,                              TRUE,
2231                              0, 0,                              0, 0,
# Line 2139  osm_gps_map_expose (GtkWidget *widget, G Line 2234  osm_gps_map_expose (GtkWidget *widget, G
2234      }      }
2235      else if (-priv->drag_mouse_dy > EXTRA_BORDER)      else if (-priv->drag_mouse_dy > EXTRA_BORDER)
2236      {      {
2237          gdk_draw_rectangle (          gdk_draw_rectangle (drawable,
                             widget->window,  
2238                              widget->style->white_gc,                              widget->style->white_gc,
2239                              TRUE,                              TRUE,
2240                              0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,                              0, priv->drag_mouse_dy + widget->allocation.height + EXTRA_BORDER,
2241                              widget->allocation.width,                              widget->allocation.width,
2242                              -priv->drag_mouse_dy - EXTRA_BORDER);                              -priv->drag_mouse_dy - EXTRA_BORDER);
2243      }      }
2244  #if 0  
2245      if(!priv->dragging)  #ifdef ENABLE_OSD
2246          gdk_draw_drawable (      /* draw new OSD */
2247                         widget->window,      if(priv->osd)
2248            priv->osd->draw (priv->osd, drawable);
2249    
2250    #ifdef OSD_DOUBLE_BUFFER
2251        gdk_draw_drawable (widget->window,
2252                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2253                         priv->pixmap,                         priv->dbuf_pixmap,
2254                         event->area.x + EXTRA_BORDER,                         0,0,0,0,-1,-1);
                        event->area.y + EXTRA_BORDER,  
                        event->area.x, event->area.y,  
                        event->area.width, event->area.height);  
2255  #endif  #endif
2256    
2257    #endif
2258    
2259      return FALSE;      return FALSE;
2260  }  }
2261    
# Line 2737  osm_gps_map_clear_images (OsmGpsMap *map Line 2835  osm_gps_map_clear_images (OsmGpsMap *map
2835  }  }
2836    
2837  void  void
 osm_gps_map_osd_speed (OsmGpsMap *map, float speed)  
 {  
     OsmGpsMapPrivate *priv;  
   
     PangoContext        *context = NULL;  
     PangoLayout     *layout  = NULL;  
     PangoFontDescription    *desc    = NULL;  
   
     GdkColor color;  
     GdkGC *gc;  
   
     gchar *buffer;  
     //static int x = 10, y = 10;  
     static int width = 0, height = 0;  
   
     g_return_if_fail (OSM_IS_GPS_MAP (map));  
     priv = map->priv;  
   
     buffer = g_strdup_printf("%.0f", speed);  
   
     /* pango initialisation */  
     context = gtk_widget_get_pango_context (GTK_WIDGET(map));  
     layout  = pango_layout_new (context);  
     desc    = pango_font_description_new();  
   
     pango_font_description_set_size (desc, 40 * PANGO_SCALE);  
     pango_layout_set_font_description (layout, desc);  
     pango_layout_set_text (layout, buffer, strlen(buffer));  
   
     gc = gdk_gc_new (GTK_WIDGET(map)->window);  
   
     color.red = (0 > 50) ? 0xffff : 0;  
     color.green = 0;  
     color.blue = 0;  
   
     gdk_gc_set_rgb_fg_color (gc, &color);  
   
     /* faster / less flicker alternative:*/  
     gdk_draw_drawable (  
                        GTK_WIDGET(map)->window,  
                        GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(map)],  
                        priv->pixmap,  
                        0,0,  
                        0,0,  
                        width+10,width+10);  
   
     gdk_draw_layout(GTK_WIDGET(map)->window,  
                     gc,  
                     0, 0,  
                     layout);  
   
     /* set width and height */  
     pango_layout_get_pixel_size(layout, &width, &height);  
   
     g_free(buffer);  
     pango_font_description_free (desc);  
     g_object_unref (layout);  
     g_object_unref (gc);  
 }  
   
 void  
2838  osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading)  osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading)
2839  {  {
2840      int pixel_x, pixel_y;      int pixel_x, pixel_y;
Legend:
Removed from v.73  
changed lines
  Added in v.77