]> err.no Git - mapper/blobdiff - src/osm-db.c
Start to rewrite the GPS system to support location information from multiple sources.
[mapper] / src / osm-db.c
index 1c03dcc4fe242cc222c540175873db1b9888ff9c..be7537f00b1f5f34fbb1cddacbce9f42c7e87e27 100644 (file)
-#define _GNU_SOURCE
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#include "config.h"
 
-#include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <strings.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <math.h>
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <gtk/gtk.h>
 #include <sqlite3.h>
-#include <expat.h>
 
 #include "osm.h"
 #include "latlon.h"
+#include "gps.h"
+#include "osm-db.h"
+#include "settings.h"
+
+/* #define DEBUG_OSM */
+/* #define DEBUG_OSM_TIME */
+#define OSM_PLACE_CACHE_MAX_ITEMS (64)
+
+#define OSM_DB_PROGRESS_NUM (20000)
+
+/* Node search ranges */
+#define OSM_RANGE_START (16384)
+#define OSM_RANGE_STEP  (8192)
+#define OSM_RANGE_STOP  (65535)
+
+static sqlite3 *osmdb;
+static gboolean osm_db_ok;
 
 struct sql_select_stmt {
        sqlite3_stmt *select_way;
+       sqlite3_stmt *select_way2;
+       sqlite3_stmt *select_way_next_seg;
+       sqlite3_stmt *select_way_prev_seg;
+
        sqlite3_stmt *select_way_nodes;
        sqlite3_stmt *select_way_name;
+       sqlite3_stmt *select_way_name_nls;
+       sqlite3_stmt *select_way_name_search;
        sqlite3_stmt *select_way_ref;
        sqlite3_stmt *select_place;
        sqlite3_stmt *select_near_place;
+
+       sqlite3_stmt *select_node_next;
+       sqlite3_stmt *select_node_prev;
 };
 static struct sql_select_stmt sql;
-
-gboolean osm_way_get_nodes(osm_way *w);
-gboolean osm_way_get_name(osm_way *w);
-gboolean osm_way_get_ref(osm_way *w);
+static GTimer *dbt;
+static GtkProgressBar *dbpw=NULL;
 
 /* Cache hash tables */
-static GHashTable *_place_cache;
+static GHashTable *place_cache;
+
+static guint way_dist_range=OSM_RANGE_WAY;
+
+osm_way_node *osm_way_get_prev_node(osm_way *w);
+osm_way_node *osm_way_get_next_node(osm_way *w);
+
+/*****************************************************************************/
+
+void
+osm_set_way_range(guint sr)
+{
+way_dist_range=sr;
+}
+
+void
+osm_set_way_range_from_speed(gfloat speed)
+{
+if (speed>54.0)
+       way_dist_range=OSM_RANGE_WAY*2;
+else
+       way_dist_range=OSM_RANGE_WAY-lrint((speed/4)*1000);
+}
+
+/*****************************************************************************/
+
+static int
+osm_progress(void *ud)
+{
+if (!dbpw)
+       return 0;
+gtk_progress_bar_pulse(dbpw);
+gtk_main_iteration_do(FALSE);
+return 0;
+}
+
+static void
+osm_progress_hide(sqlite3 *db)
+{
+if (!dbpw)
+       return;
+gtk_progress_bar_set_text(dbpw, "");
+gtk_progress_bar_set_fraction(dbpw, 0.0);
+sqlite3_progress_handler(db, OSM_DB_PROGRESS_NUM, NULL, NULL);
+}
+
+static void
+osm_progress_show(sqlite3 *db)
+{
+if (!dbpw)
+       return;
+gtk_progress_bar_set_text(dbpw, _("Searching..."));
+sqlite3_progress_handler(db, OSM_DB_PROGRESS_NUM, osm_progress, NULL);
+}
+
+void
+osm_progress_set_widget(sqlite3 *db, GtkProgressBar *w)
+{
+if (dbpw!=NULL && w==NULL)
+       osm_progress_hide(db);
+dbpw=w;
+if (w!=NULL)
+       osm_progress_show(db);
+}
 
 /*****************************************************************************/
 
@@ -40,18 +143,18 @@ osm_db_prepare(sqlite3 *db)
 {
 /* Place */
 /* Select nearest place inside lat,lon+-range */
-if (sqlite3_prepare_v2(db, "select name,(($LAT-lat)*($LAT-lat))+(($LON-lon)*($LON-lon)) as dist,"
-                                       " lat,lon,places.nid,isin "
+if (sqlite3_prepare_v2(db, "select name,(($LAT-ilat)*($LAT-ilat))+(($LON-ilon)*($LON-ilon)) as dist,"
+                                       " ilat,ilon,places.nid,isin_p,isin_c "
                                        " from places,nodes where type=$TYPE "
                                        " and nodes.nid=places.nid "
-                                       " and lat between $LAT-$RANGE and $LAT+$RANGE"
-                                       " and lon between $LON-$RANGE and $LON+$RANGE order by dist limit 1",
+                                       " and ilat between $LAT-$RANGE and $LAT+$RANGE"
+                                       " and ilon between $LON-$RANGE and $LON+$RANGE order by dist limit 1",
                    -1, &sql.select_near_place, NULL)!=SQLITE_OK)
        return FALSE;
-/* Select place name, distance, location, parent-place and type with given ID */
 
-if (sqlite3_prepare_v2(db, "select name,(($LAT-lat)*($LAT-lat))+(($LON-lon)*($LON-lon)) as dist,"
-                                       " lat,lon,type,isin "
+/* Select place name, distance, location, parent-place and type with given ID */
+if (sqlite3_prepare_v2(db, "select name,(($LAT-ilat)*($LAT-ilat))+(($LON-ilon)*($LON-ilon)) as dist,"
+                                       " ilat,ilon,type,isin_p,isin_c "
                                        " from places,nodes where "
                                        " nodes.nid=places.nid "
                                        " and places.nid=$NID order by dist limit 1",
@@ -59,69 +162,126 @@ if (sqlite3_prepare_v2(db, "select name,(($LAT-lat)*($LAT-lat))+(($LON-lon)*($LO
        return FALSE;
 
 /* Ways */
-/* Select neareset ways inside lat,lon+-range */
-if (sqlite3_prepare_v2(db, "select wid,type,nodes,flags,"
-                                       "(($LAT-lat)*($LAT-lat))+(($LON-lon)*($LON-lon)) as dist, num"
-                                       " from way,way_seg,nodes"
-                                       " where wid=wsid and way_seg.node=nodes.nid "
-                                       " and lat between $LAT-$RANGE and $LAT+$RANGE "
-                                       " and lon between $LON-$RANGE and $LON+$RANGE "
-                                       " order by dist",
-                   -1, &sql.select_way, NULL)!=SQLITE_OK)
+/* Select nearest ways inside lat,lon+-range */
+if (sqlite3_prepare_v2(db, "select w.wid,type,nodes,flags,"
+                                       "(($LAT-n.ilat)*($LAT-n.ilat))+(($LON-n.ilon)*($LON-n.ilon)) as d,wn.f,wn.t,n.ilat,n.ilon "
+                                       " from way as w,way_n2n as wn,nodes as n "
+                                       " where w.wid=wn.wid and wn.f=n.nid "
+                                       " and n.ilat between $LAT-$RANGE and $LAT+$RANGE "
+                                       " and n.ilon between $LON-$RANGE and $LON+$RANGE "
+                                       " and w.type between $WTS and $WTY " 
+                                       " order by d",
+                   -1, &sql.select_way2, NULL)!=SQLITE_OK)
        return FALSE;
 
-/* Select way nodes */
-if (sqlite3_prepare_v2(db, "select num,lat,lon from way_seg,nodes where wsid=? and way_seg.node=nodes.nid order by num",
-                   -1, &sql.select_way_nodes, NULL)!=SQLITE_OK)
+if (sqlite3_prepare_v2(db, "select w.wid,w.name as name,"
+                                       "(($LAT-ww.lat)*($LAT-ww.lat))+(($LON-ww.lon)*($LON-ww.lon)) as d,ww.lat,ww.lon "
+                                       " from way_names as w,way as ww where "
+                                       " ww.type between $WTS and $WTY and w.wid=ww.wid and w.name like $NAME "
+                                       " and ww.lat between $LAT-$RANGE and $LAT+$RANGE "
+                                       " and ww.lon between $LON-$RANGE and $LON+$RANGE "
+                                       " union "
+                                       " select w.wid,n.name as name,"
+                                       "(($LAT-ww.lat)*($LAT-ww.lat))+(($LON-ww.lon)*($LON-ww.lon)) as d,ww.lat,ww.lon "
+                                       " from way_names as w, way as ww,way_names_nls as n on w.wid=n.wid where "
+                                       " ww.type between $WTS and $WTY and w.wid=ww.wid and n.name like $NAME "
+                                       " and ww.lat between $LAT-$RANGE and $LAT+$RANGE "
+                                       " and ww.lon between $LON-$RANGE and $LON+$RANGE "
+                                       " order by name limit 100",
+                       -1, &sql.select_way_name_search, NULL)!=SQLITE_OK)
        return FALSE;
 
-/* Way name and ref */
-if (sqlite3_prepare_v2(db, "select name from way_names where wid=?",
-                   -1, &sql.select_way_name, NULL)!=SQLITE_OK)
+if (sqlite3_prepare_v2(db, "select wn.t,ilat,ilon from way_n2n as wn,nodes where wid=? and wn.f=? and wn.t=nodes.nid limit 1",
+                   -1, &sql.select_way_next_seg, NULL)!=SQLITE_OK)
        return FALSE;
 
-if (sqlite3_prepare_v2(db, "select ref,int_ref from way_ref where rid=?",
-                   -1, &sql.select_way_ref, NULL)!=SQLITE_OK)
+if (sqlite3_prepare_v2(db, "select wn.f,ilat,ilon from way_n2n as wn,nodes where wid=? and wn.t=? and wn.f=nodes.nid limit 1",
+                   -1, &sql.select_way_prev_seg, NULL)!=SQLITE_OK)
        return FALSE;
 
-return TRUE;
-}
+/* Way name */
+if (sqlite3_prepare_v2(db, "select name from way_names where wid=?", -1, &sql.select_way_name, NULL)!=SQLITE_OK)
+       return FALSE;
+
+/* Way ref and int_ref */
+if (sqlite3_prepare_v2(db, "select ref,int_ref from way_ref where rid=?", -1, &sql.select_way_ref, NULL)!=SQLITE_OK)
+       return FALSE;
+
+/* Get next, prev node + way information. For routing. */
+if (sqlite3_prepare_v2(db, "select w.wid,w.type,w.flags,w.speed,n.nid,n.rlat,n.rlon,nn.f,nn.t,n.f,n.l "
+                       "from way as w, nodes as n, way_n2n as nn where w.wid=nn.wid and nn.f=n.nid and nn.f=?",
+                   -1, &sql.select_node_next, NULL)!=SQLITE_OK)
+       return FALSE;
+
+if (sqlite3_prepare_v2(db, "select w.wid,w.type,w.flags,w.speed,n.nid,n.rlat,n.rlon,nn.f,nn.t,n.f,n.l "
+                       "from way as w, nodes as n, way_n2n as nn where w.wid=nn.wid and nn.f=n.nid and nn.t=?",
+                   -1, &sql.select_node_prev, NULL)!=SQLITE_OK)
+       return FALSE;
 
-gboolean
-osm_init(void)
-{
-_place_cache=g_hash_table_new(g_direct_hash, g_direct_equal);
 return TRUE;
 }
 
 void
 osm_deinit(void)
 {
-g_hash_table_destroy(_place_cache);
+if (osmdb!=NULL) {
+       sqlite3_finalize(sql.select_way_ref);
+       sqlite3_finalize(sql.select_way_name);
+       sqlite3_finalize(sql.select_way_next_seg);
+       sqlite3_finalize(sql.select_way_prev_seg);
+       sqlite3_finalize(sql.select_way_name_search);
+       sqlite3_finalize(sql.select_way2);
+       sqlite3_finalize(sql.select_place);
+       sqlite3_finalize(sql.select_near_place);
+}
+osmdb=NULL;
+osm_db_ok=FALSE;
+g_hash_table_destroy(place_cache);
+g_timer_destroy(dbt);
 }
 
-/*****************************************************************************/
-
-static osm_place *
-osm_place_cache_lookup(guint32 id)
+gboolean
+osm_init(sqlite3 **db)
 {
-return g_hash_table_lookup(_place_cache, GINT_TO_POINTER(id));
+osm_db_ok=FALSE;
+place_cache=g_hash_table_new(g_direct_hash, g_direct_equal);
+dbt=g_timer_new();
+
+if (!db || !*db) {
+       osmdb=NULL;
+       return FALSE;
 }
 
-static void
-osm_place_cache_add(guint32 id, osm_place *p)
-{
-if (osm_place_cache_lookup(id)==NULL)
-       g_hash_table_insert(_place_cache, GINT_TO_POINTER(id), p);
+osmdb=*db;
+if (osm_db_prepare(osmdb)==FALSE) {
+       g_printerr("Failed to prepare OSM SQL statements:");
+       g_printf("SQLITE: %s\n", sqlite3_errmsg(osmdb));
+       return FALSE;
+}
+osm_db_ok=TRUE;
+return TRUE;
 }
 
-static void
-osm_place_cache_gc(void)
+/*****************************************************************************/
+
+osm_way_node *
+osm_way_node_new(guint id, gint lat, gint lon, gint flags)
 {
-g_hash_table_foreach_remove(_place_cache, g_free, NULL);
+osm_way_node *n=g_slice_new(osm_way_node);
+
+n->id=id;
+n->lat=lat;
+n->lon=lon;
+n->flags=flags;
+return n;
 }
 
-/*****************************************************************************/
+void
+osm_way_node_free(osm_way_node *n)
+{
+if (n)
+       g_slice_free(osm_way_node, n);
+}
 
 /**
  * Free way nodes list 
@@ -158,12 +318,81 @@ if (w->int_ref)
 g_slice_free(osm_way, w);
 }
 
+/*****************************************************************************/
+
+static void
+osm_place_free(osm_place *p)
+{
+if (p->name)
+       g_free(p->name);
+g_slice_free(osm_place, p);
+}
+
+static gboolean
+osm_place_remove(gpointer k, gpointer v, gpointer ud)
+{
+osm_place_free((osm_place *)v);
+return TRUE;
+}
+
+static osm_place *
+osm_place_new(void)
+{
+return g_slice_new0(osm_place);
+}
+
+static osm_place *
+osm_place_cache_lookup(guint32 id)
+{
+return g_hash_table_lookup(place_cache, GINT_TO_POINTER(id));
+}
+
+static void
+osm_place_cache_add(osm_place *p)
+{
+if (osm_place_cache_lookup(p->id)==NULL)
+       g_hash_table_insert(place_cache, GINT_TO_POINTER(p->id), p);
+}
+
+static void
+osm_place_cache_gc(void)
+{
+gint r;
+r=g_hash_table_foreach_remove(place_cache, osm_place_remove, NULL);
+}
+
+static void
+osm_place_update_distance(osm_place *p, gint lat, gint lon)
+{
+gdouble lam, lom;
+
+lam=(gdouble)((lat-p->lat)*(lat-p->lat));
+lom=(gdouble)((lon-p->lon)*(lon-p->lon));
+
+p->dist=sqrt(lam+lom);
+}
+
 /**
  * Get place with given id and distance to current location
  */
 gboolean
-osm_place_get(guint32 id, gint lat, gint lon, osm_place *n)
+osm_place_get(guint32 id, gint lat, gint lon, osm_place **nr)
 {
+osm_place *n;
+
+n=*nr;
+n=osm_place_cache_lookup(id);
+if (n) {
+       g_print("*P!\n");
+       osm_place_update_distance(n, lat, lon);
+       return TRUE;
+}
+n=NULL;
+
+/* XXX: better place for this */
+if (g_hash_table_size(place_cache)>OSM_PLACE_CACHE_MAX_ITEMS)
+       osm_place_cache_gc();
+
 sqlite3_clear_bindings(sql.select_place);
 sqlite3_reset(sql.select_place);
 
@@ -178,6 +407,7 @@ if (SQLITE_ROW == sqlite3_step(sql.select_place)) {
        const gchar *place;
        guint32 dist;
 
+       n=osm_place_new();
        place=sqlite3_column_text(sql.select_place, 0);
        n->name=g_strdup(place);
        dist=sqlite3_column_int(sql.select_place, 1);
@@ -185,19 +415,21 @@ if (SQLITE_ROW == sqlite3_step(sql.select_place)) {
        n->lat=sqlite3_column_int(sql.select_place, 2);
        n->lon=sqlite3_column_int(sql.select_place, 3);
        n->type=sqlite3_column_int(sql.select_place, 4);
-       n->isin=sqlite3_column_int(sql.select_place, 5);
+       n->isin_p=sqlite3_column_int(sql.select_place, 5);
+/*     n->isin_c=sqlite3_column_int(sql.select_place, 6); */
        return TRUE;
 }
 return FALSE;
 }
 
 /**
- * Search for the nearest place, type
+ * Search for the nearest place with given type
  */
 gboolean
-osm_find_nearest_place(node_type_t type, gint lat, gint lon, osm_place *n)
+osm_find_nearest_place(node_type_t type, gint lat, gint lon, osm_place **nr)
 {
 gint range;
+osm_place *n=NULL;
 
 switch (type) {
        case NODE_PLACE_SUBURB:
@@ -227,11 +459,8 @@ if (SQLITE_OK != sqlite3_bind_int(sql.select_near_place, 1, lat) ||
        return FALSE;
 }
 
-if (n->name) {
-       g_free(n->name);
-       n->name=NULL;
-}
-n->isin=n->lat=n->lon=n->dist=0;
+n=osm_place_new();
+n->isin_p=n->lat=n->lon=n->dist=0;
 if (SQLITE_ROW == sqlite3_step(sql.select_near_place)) {
        const gchar *place;
        guint32 dist;
@@ -243,84 +472,147 @@ if (SQLITE_ROW == sqlite3_step(sql.select_near_place)) {
        n->lat=sqlite3_column_int(sql.select_near_place, 2);
        n->lon=sqlite3_column_int(sql.select_near_place, 3);
        n->id=sqlite3_column_int(sql.select_near_place, 4);
-       n->isin=sqlite3_column_int(sql.select_near_place, 5);
+       n->isin_p=sqlite3_column_int(sql.select_near_place, 5);
+/*     n->isin_c=sqlite3_column_int(sql.select_near_place, 6); */
        n->type=type;
 
+       osm_place_cache_add(n);
+
+       *nr=n;
        return TRUE;
 }
+*nr=n;
 return FALSE;
 }
 
-/* Way helper */
+/*
+ * Way helper 
+ *
+ */
 static GList *
 osm_find_nearest_way_nodes(gint lat, gint lon, guint range)
 {
 GList *ways=NULL;
 osm_way *w;
+gulong tms;
+guint wc=0;
 
-sqlite3_reset(sql.select_way);
-sqlite3_clear_bindings(sql.select_way);
+sqlite3_reset(sql.select_way2);
+sqlite3_clear_bindings(sql.select_way2);
 
-if (SQLITE_OK != sqlite3_bind_int(sql.select_way, 1, lat) ||
-    SQLITE_OK != sqlite3_bind_int(sql.select_way, 2, lon) ||
-    SQLITE_OK != sqlite3_bind_int(sql.select_way, 3, range)) {
+if (SQLITE_OK != sqlite3_bind_int(sql.select_way2, 1, lat) ||
+    SQLITE_OK != sqlite3_bind_int(sql.select_way2, 2, lon) ||
+    SQLITE_OK != sqlite3_bind_int(sql.select_way2, 3, range) ||
+    SQLITE_OK != sqlite3_bind_int(sql.select_way2, 4, WAY_ROAD_START) ||
+    SQLITE_OK != sqlite3_bind_int(sql.select_way2, 5, WAY_ROAD_END)) {
        g_printerr("Failed to bind values for way\n");
        return NULL;
 }
 
-while (SQLITE_ROW == sqlite3_step(sql.select_way)) {
+#ifdef DEBUG_OSM_TIME
+g_timer_start(dbt);
+#endif
+
+while (SQLITE_ROW == sqlite3_step(sql.select_way2)) {
        guint32 dist;
+       gint lat, lon;
 
+       wc++;
        w=g_slice_new0(osm_way);
-       w->id=sqlite3_column_int(sql.select_way, 0);
-       w->type=sqlite3_column_int(sql.select_way, 1);
-       w->nodecnt=sqlite3_column_int(sql.select_way, 2);
-       w->flags=sqlite3_column_int(sql.select_way, 3);
-       dist=sqlite3_column_int(sql.select_way, 4);
+       w->id=sqlite3_column_int(sql.select_way2, 0);
+       w->type=sqlite3_column_int(sql.select_way2, 1);
+       w->nodecnt=sqlite3_column_int(sql.select_way2, 2);
+       w->flags=sqlite3_column_int(sql.select_way2, 3);
+       dist=sqlite3_column_int(sql.select_way2, 4);
        w->dist=sqrt((gdouble)dist);
-       w->node_num=sqlite3_column_int(sql.select_way, 5);
+       w->f=sqlite3_column_int(sql.select_way2, 5);
+       w->t=sqlite3_column_int(sql.select_way2, 6);
+
+       lat=sqlite3_column_int(sql.select_way2, 7);
+       lon=sqlite3_column_int(sql.select_way2, 8);
+
+       w->node_f=osm_way_node_new(w->f, lat, lon, 0);
+
        ways=g_list_prepend(ways, w);
 }
 
+#ifdef DEBUG_OSM_TIME
+g_timer_stop(dbt);
+g_printf("Query took: %f sec, found: %d ways\n", g_timer_elapsed(dbt, &tms), wc);
+#endif
+
 return ways;
 }
 
-static gdouble magnitude(gdouble x1, gdouble y1, gdouble x2, gdouble y2)
+/*****************************************************************************/
+
+GSList *
+osm_get_route_node(guint nid, osm_node_direction d)
 {
-gdouble x,y;
-x=x2-x1;
-y=y2-y1;
+GSList *r=NULL;
+osm_way *w;
+guint wc=0;
+sqlite3_stmt *psql=NULL;
 
-return sqrt((x*x)+(y*y));
+switch (d) {
+       case OSM_NODE_NEXT:
+               psql=sql.select_node_next;
+       break;
+       case OSM_NODE_PREV:
+               psql=sql.select_node_prev;
+       break;
+       default:
+               g_assert_not_reached();
+       break;
 }
 
-gboolean distance_point_to_line(gdouble x, gdouble y, gdouble x1, gdouble y1, gdouble x2, gdouble y2, gdouble *d)
-{
-gdouble lm,u,tmp;
-gdouble ix,iy;
+sqlite3_reset(psql);
+sqlite3_clear_bindings(psql);
 
-lm=magnitude(x1,y1,x2,y2);
-if (lm==0.0f)
-       return FALSE;
+if (SQLITE_OK != sqlite3_bind_int(psql, 1, nid)) {
+       g_printerr("Failed to bind values for route node\n");
+       return NULL;
+}
 
-tmp=((x-x1)*(x2-x1))+((y-y1)*(y2-y1));
-u=tmp/(lm*lm);
+while (SQLITE_ROW == sqlite3_step(psql)) {
+       gdouble lat, lon;
 
-if (u<0.0f || u>1.0f)
-       return FALSE;
-ix=x1+u*(x2-x1);
-iy=y1+u*(y2-y1);
-*d=magnitude(x,y, ix, iy);
-return TRUE;
+       wc++;
+       w=g_slice_new0(osm_way);
+       w->id=sqlite3_column_int(psql, 0);
+       w->type=sqlite3_column_int(psql, 1);
+       w->flags=sqlite3_column_int(psql, 2);
+       w->speed=sqlite3_column_int(psql, 3);
+
+       lat=sqlite3_column_double(psql, 5);
+       lon=sqlite3_column_double(psql, 6);
+
+       w->f=sqlite3_column_int(psql, 7);
+       w->t=sqlite3_column_int(psql, 8);
+#if 0
+       w->node=
+       w->node->flags=sqlite3_column_int(psql, 9);
+       w->node->links=sqlite3_column_int(psql, 10);
+#endif
+
+       r=g_slist_prepend(r, w);
+}
+
+return r;
 }
 
-gboolean osm_way_distance(gint lat, gint lon, osm_way_node *f, osm_way_node *t, gdouble *d)
+
+/*****************************************************************************/
+gboolean 
+osm_way_distance(gint lat, gint lon, osm_way_node *f, osm_way_node *t, gdouble *d)
 {
-if (!f || !t)
+if (!f) {
        return FALSE;
+}
+
+if (!t) {
+       return FALSE;
+}
 
 return distance_point_to_line((gdouble)lon, (gdouble)lat, (gdouble)f->lon, (gdouble)f->lat, (gdouble)t->lon, (gdouble)t->lat, d);
 }
@@ -334,84 +626,76 @@ return distance_point_to_line((gdouble)lon, (gdouble)lat, (gdouble)f->lon, (gdou
  *   - Store result if closer than before
  * - Return closest way
  */
+
+#define START_DIST (900000.0)
+
 osm_way *
 osm_find_nearest_way(gint lat, gint lon)
 {
 GList *iter;
 GList *w=NULL;
-guint range=8192;
+guint range=OSM_RANGE_START;
 osm_way *cw=NULL;
+gdouble pdist=START_DIST, dist_n, dist_p;
 
-while ((w=osm_find_nearest_way_nodes(lat, lon, range))==NULL && range<=65536) {
-       range=range<<1;
+while ((w=osm_find_nearest_way_nodes(lat, lon, range))==NULL && range<=OSM_RANGE_STOP) {
+       range+=OSM_RANGE_STEP;
        g_printf("Trying with range: %d\n", range);
 }
+#ifdef DEBUG_OSM
+g_printf("Found %d ways withing range %d\n", g_list_length(w), range);
+#endif
 
-g_printf("Found ways: %d\n", g_list_length(w));
+if (g_list_length(w)==0)
+       return NULL;
 
-switch (g_list_length(w)) {
-       case 0:
-               return NULL;
-       break;
-       default:
-       {
-               gdouble pdist=900000.0, pndist=9000000.0;
-
-               for (iter=w; iter!=NULL; iter=iter->next) {
-                       osm_way_node *wnf;
-                       osm_way_node *wnt;
-
-                       osm_way *way=(osm_way*)iter->data;
-
-                       g_printf("WAY %d (%d) HAS %d NODES, nearest is %d\n", 
-                               way->id, way->type, way->nodecnt, way->node_num);
-
-                       if (osm_way_get_nodes(way)==FALSE)
-                               continue;
-
-                       if (way->nodes==0) {
-                               g_printerr("Way with 0 nodes ? Skipping\n");
-                               continue;
-                       }
-
-                       wnf=g_list_nth_data(way->nodes, way->node_num);
-                       if (!wnf) {
-                               osm_way_free(way);
-                               continue;
-                       }
-
-                       if ( (way->node_num==way->nodecnt) || (way->node_num==0)) {
-                               wnt=g_list_nth_data(way->nodes, way->node_num==way->nodecnt ? way->nodecnt-1 : 1);
-                               if (osm_way_distance(lat, lon, wnf, wnt, &pndist)==FALSE) {
-                                       osm_way_free(way);
-                                       continue;
-                               }
-                       } else {
-                               wnt=g_list_nth_data(way->nodes, way->node_num-1);
-                               if (osm_way_distance(lat, lon, wnf, wnt, &pndist)==FALSE) {
-                                       wnt=g_list_nth_data(way->nodes, way->node_num+1);
-                                       if (osm_way_distance(lat, lon, wnf, wnt, &pndist)==FALSE) {
-                                               osm_way_free(way);
-                                               continue;
-                                       }
-                               }
-                       }
-
-                       if (pndist<pdist) {
-                               g_printf("Found close way, distance: %f (Previous distance: %f)\n", pndist, pdist);
-                               pdist=pndist;
-                               way->node_f=wnf;
-                               way->node_t=wnt;
-                               way->distance=pndist;
-                               cw=way;
-                       } else {
-                               g_printf("Way is not closer, freeing\n");
-                               osm_way_free(way);
-                               way=NULL;
-                       }
+for (iter=w; iter!=NULL; iter=iter->next) {
+       osm_way_node *wnn;
+       osm_way_node *wnp;
+       osm_way *way=(osm_way*)iter->data;
+
+#ifdef DEBUG_OSM
+       g_printf("Way: %d (%d) has %d nodes, nearest is %d,%d\n", 
+               way->id, way->type, way->nodecnt, way->f, way->t);
+#endif
+
+       way->node_t=NULL;
+
+       wnn=osm_way_get_next_node(way);
+       if (osm_way_distance(lat, lon, way->node_f, wnn, &dist_n)==FALSE) {
+               osm_way_node_free(wnn);
+               dist_n=START_DIST;
+       } else if (dist_n<pdist) {
+               pdist=dist_n;
+               cw=way;
+               way->distance=dist_n;
+               way->node_t=wnn;
+               g_printf("#1 distance: %f (%f)\n", dist_n, pdist);
+       }
+
+       wnp=osm_way_get_prev_node(way);
+       if (osm_way_distance(lat, lon, way->node_f, wnp, &dist_p)==FALSE) {
+               osm_way_node_free(wnp);
+               dist_p=START_DIST;
+       } else if (dist_p<pdist) {
+               pdist=dist_p;
+               cw=way;
+               way->distance=dist_n;
+               if (way->node_t) {
+                       osm_way_node_free(wnn);
                }
+               way->node_t=wnp;
+               g_printf("#2 distance: %f (%f)\n", dist_p, pdist);
+       }
+
+#ifdef DEBUG_OSM
+       g_printf("Found close way, distance: %f %f (%f)\n", dist_n, dist_p, pdist);
+#endif
+
+       if (!cw) {
+               osm_way_free(way);
+               way=NULL;
        }
-       break;
 }
 
 g_list_free(w);
@@ -425,19 +709,78 @@ if (cw->type==WAY_MOTORWAY || cw->type==WAY_TRUNK ||
                osm_way_get_ref(cw);
 }
 
-g_printf("BEST WAY(%d): %s (%s,%s)\n", 
+#ifdef DEBUG_OSM
+g_printf("BEST WAY(%d): %s [%s][%s]\n", 
        cw->id, cw->name, cw->ref, cw->int_ref);
-g_printf("\tT: %d F: %d N: %d D: %f\n", 
+g_printf("\tType: %d Flags: %d Nodes: %d Dist: %f\n", 
        cw->type, cw->flags, cw->nodecnt, cw->dist);
-g_printf("\tNF: %d NT: %d DT %f\n", 
-       cw->node_f->num, 
-       cw->node_t->num, cw->distance);
+g_printf("\tNF: %d NT: %d Distance: %f\n", 
+       cw->f, 
+       cw->t, 
+       cw->distance);
+#endif
 
 return cw;
 }
 
+/* XXX: These two should be combined to save memory */
+/**
+ * Get previous node/segment of given way node
+ *
+ */
+osm_way_node *
+osm_way_get_prev_node(osm_way *w)
+{
+sqlite3_reset(sql.select_way_prev_seg);
+sqlite3_clear_bindings(sql.select_way_prev_seg);
+
+if (SQLITE_OK != sqlite3_bind_int(sql.select_way_prev_seg, 1, w->id) ||
+       SQLITE_OK != sqlite3_bind_int(sql.select_way_prev_seg, 2, w->f)  ) {
+       g_printerr("Failed to bind values for prev seg\n");
+       return NULL;
+}
+
+if (SQLITE_ROW == sqlite3_step(sql.select_way_prev_seg)) {
+       return osm_way_node_new(
+               sqlite3_column_int(sql.select_way_prev_seg, 0),
+               sqlite3_column_int(sql.select_way_prev_seg, 1),
+               sqlite3_column_int(sql.select_way_prev_seg, 2),
+               0);
+}
+
+return NULL;
+}
+
+/**
+ * Get next node/segment of given way node
+ *
+ */
+osm_way_node *
+osm_way_get_next_node(osm_way *w)
+{
+sqlite3_reset(sql.select_way_next_seg);
+sqlite3_clear_bindings(sql.select_way_next_seg);
+
+if (SQLITE_OK != sqlite3_bind_int(sql.select_way_next_seg, 1, w->id) ||
+       SQLITE_OK != sqlite3_bind_int(sql.select_way_next_seg, 2, w->f)  ) {
+       g_printerr("Failed to bind values for next seg\n");
+       return NULL;
+}
+
+if (SQLITE_ROW == sqlite3_step(sql.select_way_next_seg)) {
+       return osm_way_node_new(
+               sqlite3_column_int(sql.select_way_next_seg, 0),
+               sqlite3_column_int(sql.select_way_next_seg, 1),
+               sqlite3_column_int(sql.select_way_next_seg, 2),
+               0);
+}
+
+return NULL;
+}
+
 /**
  * Get list of nodes for given way
+ *
  */
 gboolean
 osm_way_get_nodes(osm_way *w)
@@ -457,7 +800,7 @@ while (SQLITE_ROW == sqlite3_step(sql.select_way_nodes)) {
        osm_way_node *n;
 
        n=g_slice_new(osm_way_node);
-       n->num=sqlite3_column_int(sql.select_way_nodes, 0);
+       n->id=sqlite3_column_int(sql.select_way_nodes, 0);
        n->lat=sqlite3_column_int(sql.select_way_nodes, 1);
        n->lon=sqlite3_column_int(sql.select_way_nodes, 2);
        w->nodes=g_list_append(w->nodes, n);
@@ -466,6 +809,10 @@ while (SQLITE_ROW == sqlite3_step(sql.select_way_nodes)) {
 return (w->nodes==NULL) ? FALSE : TRUE;
 }
 
+/**
+ * Get way name
+ *
+ */
 gboolean
 osm_way_get_name(osm_way *w)
 {
@@ -485,6 +832,33 @@ if (SQLITE_ROW == sqlite3_step(sql.select_way_name)) {
 return FALSE;
 }
 
+#if 0
+gboolean
+osm_way_get_name_nls(osm_way *w)
+{
+sqlite3_reset(sql.select_way_name_nls);
+sqlite3_clear_bindings(sql.select_way_name_nls);
+
+if (SQLITE_OK != sqlite3_bind_int(sql.select_way_name_nls, 1, w->id) ||
+       SQLITE_OK != sqlite3_bind_) {
+       g_printerr("Failed to bind values for way name nls\n");
+       return FALSE;
+}
+
+if (SQLITE_ROW == sqlite3_step(sql.select_way_name_nls)) {
+       const gchar *place;
+       place=sqlite3_column_text(sql.select_way_name_nls, 0);
+       w->name=g_strdup(place);
+}
+return FALSE;
+}
+#endif
+
+
+/**
+ * Get Way ref and int_ref
+ *
+ */
 gboolean
 osm_way_get_ref(osm_way *w)
 {
@@ -506,3 +880,195 @@ if (SQLITE_ROW == sqlite3_step(sql.select_way_ref)) {
 return FALSE;
 }
 
+/******************************************************************************/
+
+/**
+ * Try to figure out where the given lat,lon is. Fills in the given struct,
+ * with street, secondary (suburb) and primary (city,town,village) location.
+ * Will try to minimize the amount of database access by skipping queries
+ * if we haven't moved or if we don't know where we are.
+ *
+ */
+gboolean 
+osm_get_location_data(gint lat, gint lon, osm_location *map_loc)
+{
+gdouble dist;
+gboolean check_place=FALSE;
+gulong d;
+
+if (map_loc->valid==FALSE) {
+       map_loc->lat=lat;
+       map_loc->lon=lon;
+       map_loc->valid=TRUE;
+       d=way_dist_range*5;
+} else {
+       d=calculate_idistance(lat,lon,map_loc->lat,map_loc->lon);
+}
+
+/* Check if we are still near the same way as last time */
+if (map_loc->street && osm_way_distance(lat, lon, map_loc->street->node_f, map_loc->street->node_t, &dist)==TRUE) {
+       /* We are probably on the same way as last time */
+       if ( (dist>(gdouble)way_dist_range) || (fabs(_gps->data.heading-map_loc->heading)>10.0)) {
+               /* We have moved a large amount, check way again */
+               g_printf("*** dist %f over range, checking again\n", dist);
+               osm_way_free(map_loc->street);
+               map_loc->street=osm_find_nearest_way(lat, lon);
+               check_place=TRUE;
+               map_loc->changed=TRUE;
+       } else {
+#if 0
+               g_printf("*** No change in location: %f %d\n", dist, way_dist_range);
+#endif
+               /* We are still on the same way as last time */
+               check_place=FALSE;
+               map_loc->changed=FALSE;
+       }
+       map_loc->lat=lat;
+       map_loc->lon=lon;
+} else {
+       /* We didn't know our location, so check it, but only if we have moved */
+       if (d>way_dist_range) {
+               g_print("*** Must check location\n");
+               check_place=TRUE;
+               osm_way_free(map_loc->street);
+               map_loc->street=osm_find_nearest_way(lat, lon);
+#if 0
+               map_loc->lat=lat;
+               map_loc->lon=lon;
+#endif
+       } 
+
+       if (!map_loc->street) {
+               g_print("*** Street not known\n");
+               map_loc->nfcnt++;
+               map_loc->changed=TRUE;
+       } else {
+               g_print("*** Street known\n");
+               map_loc->nfcnt=0;
+               map_loc->changed=TRUE;
+               check_place=TRUE;
+       }
+}
+
+if (map_loc->changed==TRUE) {
+       map_loc->heading=_gps->data.heading;
+       map_loc->speed=_gps->data.speed;
+}
+
+#if 0
+g_printf("NFC: %d\n", map_loc->nfcnt);
+g_printf("D: %ld %ld\n", d,(gulong)way_dist_range);
+#endif
+
+if (check_place==TRUE && d>way_dist_range*4) {
+       gboolean fs;
+
+       fs=osm_find_nearest_place(NODE_PLACE_SUBURB, lat, lon, &map_loc->secondary);
+       if (fs==TRUE && map_loc->secondary && map_loc->secondary->isin_p!=0) {
+               if (osm_place_get(map_loc->secondary->isin_p, lat, lon, &(map_loc->primary))==FALSE) {
+                       if (osm_find_nearest_place(NODE_PLACE_CITY, lat, lon, &map_loc->primary)==TRUE)
+                               g_printf("Near city: %s\n", map_loc->primary->name);
+                       else if (osm_find_nearest_place(NODE_PLACE_TOWN, lat, lon, &map_loc->primary)==TRUE)
+                               g_printf("Near town: %s\n", map_loc->primary->name);
+                       else
+                               g_printf("Unknown\n");
+               } else {
+                       g_printf("In: %s\n", map_loc->primary ? map_loc->primary->name : "?");
+               }
+       } else if (map_loc->street && map_loc->street->isin_p!=0) {
+               if (osm_place_get(map_loc->street->isin_p, lat, lon, &map_loc->primary)==FALSE) {
+                       g_printf("Street location not know.\n");
+               } else {
+                       g_printf("Street is in: %s\n", map_loc->primary ? map_loc->primary->name : "?");
+               }
+       } else {
+               if (osm_find_nearest_place(NODE_PLACE_CITY, lat, lon, &map_loc->primary)==TRUE)
+                       g_printf("Near city: %s\n", map_loc->primary->name);
+               else if (osm_find_nearest_place(NODE_PLACE_TOWN, lat, lon, &map_loc->primary)==TRUE)
+                       g_printf("Near town: %s\n", map_loc->primary->name);
+               else
+                       g_printf("Unknown\n");
+
+       }
+}
+
+return map_loc->street ? TRUE : FALSE;
+}
+
+/**
+ * osm_way_search
+ *
+ * Search for a street(way) starting with given 'text', next given lat/lon
+ *
+ */
+gboolean
+osm_way_search(gdouble lat, gdouble lon, gchar *text, GtkListStore **store)
+{
+GtkTreeIter iter;
+gchar *ltext=NULL;
+guint rows=0;
+gchar tmp1[16], tmp2[16];
+gdouble range=6;
+
+g_printf("Way Search: [%s] around %.6f %.6f\n", text, lat, lon);
+
+ltext=g_strdup_printf("%s%%", text);
+
+if (SQLITE_OK != sqlite3_bind_double(sql.select_way_name_search, 1, lat) ||
+    SQLITE_OK != sqlite3_bind_double(sql.select_way_name_search, 2, lon) ||
+    SQLITE_OK != sqlite3_bind_int(sql.select_way_name_search,   3, WAY_ROAD_START) ||
+    SQLITE_OK != sqlite3_bind_int(sql.select_way_name_search,    4, WAY_ROAD_END) ||
+    SQLITE_OK != sqlite3_bind_double(sql.select_way_name_search, 6, range) ||
+       SQLITE_OK != sqlite3_bind_text(sql.select_way_name_search,   5, ltext, -1, SQLITE_TRANSIENT)) {
+               g_printerr("Failed to bind values for sql.select_way_name_search\n");
+               sqlite3_clear_bindings(sql.select_way_name_search);
+               g_free(ltext);
+               return FALSE;
+}
+
+if (ltext)
+       g_free(ltext);
+
+*store = gtk_list_store_new(ITEM_NUM_COLUMNS, 
+                               G_TYPE_INT,             /* ID */
+                               G_TYPE_INT,             /*  */
+                               G_TYPE_DOUBLE,  /* Latitude */
+                               G_TYPE_DOUBLE,  /* Longitude */
+                               G_TYPE_DOUBLE,  /* Distance */
+                               G_TYPE_STRING,  /* Lat/Lon */
+                               G_TYPE_STRING,  /* Label */
+                               G_TYPE_STRING,  /* Desc. */
+                               G_TYPE_STRING,  /* Category */
+                               G_TYPE_STRING,  /* Dummy */
+                               G_TYPE_STRING); /* Dummy */
+
+while (SQLITE_ROW == sqlite3_step(sql.select_way_name_search)) {
+       gdouble rlat, rlon, dist;
+
+       rlat=sqlite3_column_double(sql.select_way_name_search, 3);
+       rlon=sqlite3_column_double(sql.select_way_name_search, 4);
+       lat_format(_degformat, rlat, tmp1);
+       lon_format(_degformat, rlon, tmp2);
+       dist=calculate_distance(lat, lon, rlat, rlon) * UNITS_CONVERT[_units];
+
+       gtk_list_store_append(*store, &iter);
+       gtk_list_store_set(*store, &iter,
+               ITEM_ID, sqlite3_column_int(sql.select_way_name_search, 0),
+               ITEM_LAT, rlat,
+               ITEM_LON, rlon,
+               ITEM_DIST, dist,
+               ITEM_LATLON, g_strdup_printf("%s, %s", tmp1, tmp2),
+               ITEM_LABEL, sqlite3_column_text(sql.select_way_name_search, 1),
+               -1);
+       rows++;
+}
+
+g_printf("Found: %d items\n", rows);
+
+sqlite3_reset(sql.select_way_name_search);
+sqlite3_clear_bindings(sql.select_way_name_search);
+
+return TRUE;
+}
+
+