Merge remote-tracking branch 'upstream/master'

[nominatim.git] / sql / functions.sql

diff --git a/sql/functions.sql b/sql/functions.sql
index 4e77e633b54711b43024d4bb1c3c1ccb596b4fee..94a0323157f5f83f9fcc657339c988d9e13db8b6 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -853,6 +853,9 @@ BEGIN
       END IF;
     ELSEIF NEW.class = 'boundary' AND NOT is_area THEN
         return NULL;
+    ELSEIF NEW.class = 'boundary' AND NEW.type = 'administrative'
+           AND NEW.admin_level <= 4 AND NEW.osm_type = 'W' THEN
+        return NULL;
     ELSEIF NEW.class = 'railway' AND NEW.type in ('rail') THEN
         return NULL;
     ELSEIF NEW.osm_type = 'N' AND NEW.class = 'highway' THEN