From cc76790a0739cccfa9e22f5f8b9e1cdba128f774 Mon Sep 17 00:00:00 2001
From: Kaj-Michael Lang <milang@tal.org>
Date: Thu, 1 Nov 2007 03:33:03 +0200
Subject: [PATCH] Fix distance display

---
 src/osm-db.c | 7 +++----
 src/poi.c    | 3 +--
 src/search.c | 8 +++++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/osm-db.c b/src/osm-db.c
index ca52791..e0abcfa 100644
--- a/src/osm-db.c
+++ b/src/osm-db.c
@@ -968,11 +968,11 @@ if (ltext)
 while (SQLITE_ROW == sqlite3_step(sql.select_way_name_search)) {
 	gdouble rlat, rlon, dist;
 
-	rlat=sqlite3_column_double(sql.select_way_name_search, 2);
-	rlon=sqlite3_column_double(sql.select_way_name_search, 3);
+	rlat=sqlite3_column_double(sql.select_way_name_search, 3);
+	rlon=sqlite3_column_double(sql.select_way_name_search, 4);
 	lat_format(rlat, tmp1);
 	lon_format(rlon, tmp2);
-	dist=0.0;
+	dist=calculate_distance(lat, lon, rlat, rlon) * UNITS_CONVERT[_units];
 
 	gtk_list_store_append(*store, &iter);
 	gtk_list_store_set(*store, &iter,
@@ -982,7 +982,6 @@ while (SQLITE_ROW == sqlite3_step(sql.select_way_name_search)) {
 		ITEM_DIST, dist,
 		ITEM_LATLON, g_strdup_printf("%s, %s", tmp1, tmp2),
 		ITEM_LABEL, sqlite3_column_text(sql.select_way_name_search, 1),
-		ITEM_DESC, sqlite3_column_text(sql.select_way_name_search, 4),
 		-1);
 	rows++;
 }
diff --git a/src/poi.c b/src/poi.c
index eebbf23..d0d08e5 100644
--- a/src/poi.c
+++ b/src/poi.c
@@ -553,8 +553,7 @@ while (SQLITE_ROW == sqlite3_step(sql)) {
 	rlon=sqlite3_column_double(sql, 1);
 	lat_format(rlat, tmp1);
 	lon_format(rlon, tmp2);
-
-	dist=calculate_distance(lat, lon, rlat, rlon);
+	dist=calculate_distance(lat, lon, rlat, rlon) * UNITS_CONVERT[_units];
 
 	gtk_list_store_append(*store, &iter);
 	gtk_list_store_set(*store, &iter,
diff --git a/src/search.c b/src/search.c
index 1064f85..5044327 100644
--- a/src/search.c
+++ b/src/search.c
@@ -84,11 +84,17 @@ search_do_cb(GtkWidget *widget, gpointer data)
 gchar *st;
 guint cid;
 GtkTreeIter iter;
+guint slen;
 search_dialog *s=(search_dialog *)data;
 
-if ((strlen(gtk_entry_get_text(GTK_ENTRY(s->search_entry)))<2) && (cid==-1)) {
+slen=strlen(gtk_entry_get_text(GTK_ENTRY(s->search_entry)));
+
+if (slen<2 && s->stype==SEARCH_TYPE_POI && cid!=-1) {
 	popup_error(s->dialog, _("Query string too short. Minimum 2 characters."));
 	return TRUE;
+} else if (slen<3 && s->stype!=SEARCH_TYPE_POI) {
+	popup_error(s->dialog, _("Query string too short. Minimum 3 characters."));
+	return TRUE;	
 }
 
 st=g_strdup(gtk_entry_get_text(GTK_ENTRY(s->search_entry)));
-- 
2.39.5