From dd87b6bb6f717d06c5113166b0e775f01d8f83a7 Mon Sep 17 00:00:00 2001 From: sleske Date: Mon, 11 Aug 2014 21:27:03 +0000 Subject: Fix:gui/gtk:POI search: Remove pointless code for reading vehicle position.|See #1133. git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5867 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/gui/gtk/gui_gtk_poi.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'navit/gui/gtk') diff --git a/navit/gui/gtk/gui_gtk_poi.c b/navit/gui/gtk/gui_gtk_poi.c index 2c82dde6a..198b91f78 100644 --- a/navit/gui/gtk/gui_gtk_poi.c +++ b/navit/gui/gtk/gui_gtk_poi.c @@ -33,7 +33,6 @@ #include "mapset.h" #include "transform.h" #include "attr.h" -#include "vehicle.h" #include "util.h" static struct gtk_poi_search{ @@ -114,24 +113,13 @@ model_poi (struct gtk_poi_search *search) struct map_rect *mr; struct item *item; struct point cursor_position; - struct attr attr, vehicle_attr; - struct vehicle *v=NULL; enum item_type selected; search_distance_meters=1000*atoi((char *) gtk_entry_get_text(GTK_ENTRY(search->entry_distance))); - if(navit_get_attr(search->nav,attr_vehicle, &vehicle_attr,NULL) && (v=vehicle_attr.u.vehicle)) { - vehicle_get_attr(v,attr_position_coord_geo, &attr, NULL); - } - if (!v || (attr.u.coord_geo->lng==0.0f && attr.u.coord_geo->lat==0.0f)){ - cursor_position.x=navit_get_width(search->nav)/2; - cursor_position.y=navit_get_height(search->nav)/2; - gtk_label_set_text(GTK_LABEL(search->label_distance),_("Distance from screen center (km)")); - }else{ - cursor_position.x=navit_get_width(search->nav)/2; - cursor_position.y=navit_get_height(search->nav)*4/5; - gtk_label_set_text(GTK_LABEL(search->label_distance),_("Distance from vehicle cursor (km)")); - } + cursor_position.x=navit_get_width(search->nav)/2; + cursor_position.y=navit_get_height(search->nav)/2; + gtk_label_set_text(GTK_LABEL(search->label_distance),_("Distance from screen center (km)")); transform_reverse(navit_get_trans(search->nav), &cursor_position, ¢er); pc.pro = transform_get_projection(navit_get_trans(search->nav)); -- cgit v1.2.1