Small fix to way name search sql

diff --git a/src/osm-db.c b/src/osm-db.c
index f53bd239b1352d08a58b7ccec5d657e05d3d5661..7a1643e90ea508a3e2df39e3b0384f564f4b82f2 100644 (file)
--- a/src/osm-db.c
+++ b/src/osm-db.c
@@ -157,7 +157,7 @@ if (sqlite3_prepare_v2(db, "select name,(($LAT-lat)*($LAT-lat))+(($LON-lon)*($LO
        return FALSE;
 
 /* Ways */
-/* Select neareset ways inside lat,lon+-range */
+/* Select nearest ways inside lat,lon+-range */
 if (sqlite3_prepare_v2(db, "select wid,type,nodes,flags,"
                                        "(($LAT-lat)*($LAT-lat))+(($LON-lon)*($LON-lon)) as d,wn.f,wn.t,n.lat,n.lon "
                                        " from way as w,way_n2n as wn,nodes as n "
@@ -169,10 +169,10 @@ if (sqlite3_prepare_v2(db, "select wid,type,nodes,flags,"
                    -1, &sql.select_way2, NULL)!=SQLITE_OK)
        return FALSE;
 
-if (sqlite3_prepare_v2(db, "select w.wid,w.name as name from way_names where w.type between $WTS and $WTY and w.name like ? "
+if (sqlite3_prepare_v2(db, "select w.wid,w.name as name from way_names as w,way as ww where ww.type between $WTS and $WTY and w.wid=ww.wid and w.name like ? "
                                        " union "
-                                       " select w.wid,n.name as name from way_names as w,way_names_nls as n on w.wid=n.wid where "
-                                       " w.type between $WTS and $WTY and n.name like ? order by name",
+                                       " select w.wid,n.name as name 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 ? order by name",
                        -1, &sql.select_way_name_search, NULL)!=SQLITE_OK)
        return FALSE;