X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cd96354bc7afc298303ad8b80afec16a48397779..c70b6ccc6dd6f69e371dbf0bc9c40126a9a65e75:/sql/functions/placex_triggers.sql diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql index ab8f951f..b84a2d6d 100644 --- a/sql/functions/placex_triggers.sql +++ b/sql/functions/placex_triggers.sql @@ -498,6 +498,32 @@ END; $$ LANGUAGE plpgsql; +CREATE OR REPLACE FUNCTION get_parent_address_level(geom GEOMETRY, in_level SMALLINT) + RETURNS SMALLINT + AS $$ +DECLARE + address_rank SMALLINT; +BEGIN + IF in_level <= 3 or in_level > 15 THEN + address_rank := 3; + ELSE + SELECT rank_address INTO address_rank + FROM placex + WHERE osm_type = 'R' and class = 'boundary' and type = 'administrative' + and admin_level < in_level + and geometry && geom and ST_Covers(geometry, geom) + ORDER BY admin_level desc LIMIT 1; + END IF; + + IF address_rank is NULL or address_rank <= 3 THEN + RETURN 3; + END IF; + + RETURN address_rank; +END; +$$ +LANGUAGE plpgsql; + CREATE OR REPLACE FUNCTION placex_update() RETURNS TRIGGER @@ -508,6 +534,7 @@ DECLARE relation_members TEXT[]; centroid GEOMETRY; + parent_address_level SMALLINT; addr_street TEXT; addr_place TEXT; @@ -634,7 +661,7 @@ BEGIN UPDATE placex SET linked_place_id = NEW.place_id WHERE place_id = linked_node_id; IF NOT %REVERSE-ONLY% THEN DELETE FROM search_name WHERE place_id = linked_node_id; - END IF; + END IF; END LOOP; END IF; END LOOP; @@ -759,7 +786,11 @@ BEGIN END IF; -- Use the address rank of the linked place, if it has one - IF location.rank_address between 5 and 25 THEN + 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 + THEN NEW.rank_address := location.rank_address; END IF; @@ -780,6 +811,7 @@ BEGIN IF NOT %REVERSE-ONLY% THEN DELETE FROM search_name WHERE place_id = location.place_id; END IF; + PERFORM deleteLocationArea(NEW.partition, location.place_id, NEW.rank_search); SELECT wikipedia, importance FROM compute_importance(location.extratags, NEW.country_code,