From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 11 Apr 2014 20:30:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~543
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/7a28f3a39e004e60f3b4277d66c01c015a6c1031?hp=671c08848c1531f0c52f0dfff9448086a6fc09cb

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

diff --git a/sql/functions.sql b/sql/functions.sql
index f6b221f9..21d03717 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1122,7 +1122,8 @@ BEGIN
     ELSEIF NEW.class = 'waterway' AND NEW.name is NULL THEN
       RETURN NULL;
     ELSEIF NEW.class = 'waterway' THEN
-      NEW.rank_address := 17;
+      NEW.rank_search := 17;
+      NEW.rank_address := 0;
     ELSEIF NEW.class = 'highway' AND NEW.osm_type != 'N' AND NEW.type in ('service','cycleway','path','footway','steps','bridleway','motorway_link','primary_link','trunk_link','secondary_link','tertiary_link') THEN
       NEW.rank_search := 27;
       NEW.rank_address := NEW.rank_search;
@@ -1991,15 +1992,18 @@ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION place_delete() RETURNS TRIGGER
   AS $$
 DECLARE
-  placeid BIGINT;
+  has_rank BOOLEAN;
 BEGIN
 
   --DEBUG: RAISE WARNING 'delete: % % % %',OLD.osm_type,OLD.osm_id,OLD.class,OLD.type;
 
   -- deleting large polygons can have a massive effect on the system - require manual intervention to let them through
   IF st_area(OLD.geometry) > 2 and st_isvalid(OLD.geometry) THEN
-    insert into import_polygon_delete values (OLD.osm_type,OLD.osm_id,OLD.class,OLD.type);
-    RETURN NULL;
+    SELECT bool_or(not (rank_address = 0 or rank_address > 26)) as ranked FROM placex WHERE osm_type = OLD.osm_type and osm_id = OLD.osm_id and class = OLD.class and type = OLD.type INTO has_rank;
+    IF has_rank THEN
+      insert into import_polygon_delete values (OLD.osm_type,OLD.osm_id,OLD.class,OLD.type);
+      RETURN NULL;
+    END IF;
   END IF;
 
   -- mark for delete