From: Sarah Hoffmann Date: Tue, 1 Sep 2020 15:59:26 +0000 (+0200) Subject: address rank adjustment for addressable boundaries only X-Git-Tag: v3.6.0~82^2~2 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/fae02fab00779b0f4c9aa3d6d541ba2c7eba165f?ds=inline;hp=--cc address rank adjustment for addressable boundaries only Only administrative boundaries with an address rank need to be adjusted. Otherwise just handle them like any other object. --- fae02fab00779b0f4c9aa3d6d541ba2c7eba165f diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql index 38b3421f..dc96efd4 100644 --- a/sql/functions/placex_triggers.sql +++ b/sql/functions/placex_triggers.sql @@ -596,7 +596,9 @@ BEGIN (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' and NEW.osm_type = 'R' THEN + IF NEW.class = 'boundary' and NEW.type = 'administrative' + and NEW.osm_type = 'R' and NEW.rank_address > 0 + THEN parent_address_level := get_parent_address_level(NEW.centroid, NEW.admin_level); IF parent_address_level >= NEW.rank_address THEN IF parent_address_level >= 24 THEN