preserve admin level hierarchy between admin boundaries

When the address rank of an admin boundary is changed because
of an attached place type, it may happen that the admin_level
hierarchy gets inversed. Avoid that by adjusting the address
rank if an inversion is detected.
This commit is contained in:
Sarah Hoffmann
2020-07-28 22:15:25 +02:00
parent 0a710c0762
commit 6a3eb7edf2

View File

@@ -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