--- trunk/src/map-tool.c	2009/08/17 19:44:00	60
+++ trunk/src/map-tool.c	2009/08/18 14:32:45	61
@@ -18,6 +18,7 @@
  */
 
 #include "gpxview.h"
+#include "converter.h"
 #include <math.h>    // for isnan
 
 #ifdef ENABLE_OSM_GPS_MAP
@@ -27,12 +28,6 @@
 #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
 #define GPS_DEFAULT_ZOOM 13
 
-/* equatorial radius in meters */
-#define EQ_RADIUS     (6378137.0)
-
-#define RAD2DEG(a)  (((a)*180.0)/M_PI)
-#define DEG2RAD(a)  (((a)*M_PI)/180.0)
-
 #define PROXY_KEY  "/system/http_proxy/"
 
 static const char *get_proxy_uri(appdata_t *appdata) {
@@ -83,9 +78,6 @@
   gtk_widget_set_sensitive(context->zoomout,
 	   zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));
 
-  /* hmm ... this doesn't really work */
-  osm_gps_map_osd_speed(map, zoom);
-
   /* save new zoom */
   context->appdata->map.zoom = zoom;
 }
@@ -251,8 +243,8 @@
 /* translate between osm-gps-map positions and gpxview ones */
 pos_t coord2pos(coord_t coo) {
   pos_t pos;
-  pos.lat = RAD2DEG(coo.rlat);
-  pos.lon = RAD2DEG(coo.rlon);
+  pos.lat = rad2deg(coo.rlat);
+  pos.lon = rad2deg(coo.rlon);
   return pos;
 }