From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 29 Jul 2020 07:20:34 +0000 (+0200)
Subject: Merge pull request #1894 from lonvia/fix-hierarchy-by-admin-level
X-Git-Tag: v3.6.0~104
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/f8e1d392085fe5319dce03957874d9efddd9fc54?hp=955dae5d4bcfc17bbddb60c1af3a392a2f6d90ca

Merge pull request #1894 from lonvia/fix-hierarchy-by-admin-level

Preserve admin level hierarchy between admin boundaries
---

diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql
index 8d537855..7542edfd 100644
--- a/sql/functions/placex_triggers.sql
+++ b/sql/functions/placex_triggers.sql
@@ -588,7 +588,15 @@ BEGIN
                             NEW.class, NEW.type, NEW.admin_level,
                             (NEW.extratags->'capital') = 'yes',
                             NEW.address->'postcode');
-
+  -- We must always increase the address level relative to the admin boundary.
+  IF NEW.class = 'boundary' and NEW.type = 'administrative' THEN
+    parent_address_level := get_parent_address_level(NEW.geometry, NEW.admin_level);
+    IF parent_address_level >= NEW.rank_address THEN
+      NEW.rank_address := parent_address_level + 2;
+    END IF;
+  ELSE
+    parent_address_level := 3;
+  END IF;
 
   --DEBUG: RAISE WARNING 'Copy over address tags';
   -- housenumber is a computed field, so start with an empty value
@@ -785,8 +793,6 @@ BEGIN
         NEW.centroid := centroid;
     END IF;
 
-    -- Use the address rank of the linked place, if it has one
-    parent_address_level := get_parent_address_level(NEW.geometry, NEW.admin_level);
     --DEBUG: RAISE WARNING 'parent address: % rank address: %', parent_address_level, location.rank_address;
     IF location.rank_address > parent_address_level
        and location.rank_address < 26