From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 18 Jun 2013 19:06:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~604
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/00a3e843e3fb4a6fc735a019cdf7a3e38558cad6?hp=27ea1bb42db0356a81eb9fadb5515f9abf2bb130

Merge remote-tracking branch 'upstream/master'
---

diff --git a/sql/functions.sql b/sql/functions.sql
index d254e33e..929e5376 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1689,6 +1689,11 @@ BEGIN
         END IF;
       END IF;
 
+    END IF;
+
+    -- Name searches can be done for ways as well as relations
+    IF NEW.osm_type in ('W','R') AND NEW.rank_search < 26 THEN
+
       -- not found one yet? how about doing a name search
       IF NEW.centroid IS NULL AND (NEW.name->'name') is not null and make_standard_name(NEW.name->'name') != '' THEN