From 94ab69610a1e9f72e011cf28a2851c05227c0c06 Mon Sep 17 00:00:00 2001 From: Kaj-Michael Lang Date: Thu, 17 Jan 2008 12:42:55 +0200 Subject: [PATCH] Remove unused variables --- src/map.c | 5 ++--- src/map.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/map.c b/src/map.c index ab984d7..1f323f4 100644 --- a/src/map.c +++ b/src/map.c @@ -108,7 +108,7 @@ static gint zoom_timeout_sid=0; static gint map_mode=0; static gboolean map_data_needs_refresh=FALSE; -static osm_location map_loc = {NULL, NULL, NULL, FALSE, FALSE, 0, 0, 0.0, 0.0, 0 }; +osm_location map_loc = {NULL, NULL, NULL, FALSE, FALSE, 0, 0, 0.0, 0.0, 0 }; static GTimer *map_timer; @@ -1199,8 +1199,7 @@ else osm_set_way_range(OSM_RANGE_WAY/4); osm_progress_set_widget(_db, _progress_item); -_map_location_known=osm_get_location_data(ilat, ilon, &map_loc); -_map_location_dist=map_loc.street ? map_loc.street->dist : 900000.0; +osm_get_location_data(ilat, ilon, &map_loc); if (map_loc.valid) map_set_place_information(map_loc.street, map_loc.primary, map_loc.secondary); else diff --git a/src/map.h b/src/map.h index 6a83acb..049713c 100644 --- a/src/map.h +++ b/src/map.h @@ -18,6 +18,7 @@ #include "utils.h" #include "mapper-types.h" +#include "osm.h" /** MAX_ZOOM defines the largest map zoom level we will download. * (MAX_ZOOM - 1) is the largest map zoom level that the user can zoom to. @@ -180,8 +181,7 @@ guint _world_size_tiles; guint _key_zoom_new; guint _key_zoom_timeout_sid; -gboolean _map_location_known; -gdouble _map_location_dist; +osm_location map_loc; /** The widget that provides the visual display of the map. */ GtkWidget *_map_widget; -- 2.39.5