X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/199532c802fafaa13ae77d1b24cf969e24e8a9d0..9c777560cee052d19f8cd555879d10feed89099e:/lib-sql/functions/placex_triggers.sql diff --git a/lib-sql/functions/placex_triggers.sql b/lib-sql/functions/placex_triggers.sql index fa7156ec..8ae8cf39 100644 --- a/lib-sql/functions/placex_triggers.sql +++ b/lib-sql/functions/placex_triggers.sql @@ -1,30 +1,33 @@ -- Trigger functions for the placex table. +-- Information returned by update preparation. +DROP TYPE IF EXISTS prepare_update_info CASCADE; +CREATE TYPE prepare_update_info AS ( + name HSTORE, + address HSTORE, + rank_address SMALLINT, + country_code TEXT, + class TEXT, + type TEXT, + linked_place_id BIGINT +); + -- Retrieve the data needed by the indexer for updating the place. --- --- Return parameters: --- name list of names --- address list of address tags, either from the object or a surrounding --- building --- country_feature If the place is a country feature, this contains the --- country code, otherwise it is null. -CREATE OR REPLACE FUNCTION placex_prepare_update(p placex, - OUT name HSTORE, - OUT address HSTORE, - OUT country_feature VARCHAR, - OUT linked_place_id BIGINT) +CREATE OR REPLACE FUNCTION placex_indexing_prepare(p placex) + RETURNS prepare_update_info AS $$ DECLARE location RECORD; + result prepare_update_info; BEGIN -- For POI nodes, check if the address should be derived from a surrounding -- building. IF p.rank_search < 30 OR p.osm_type != 'N' OR p.address is not null THEN - address := p.address; + result.address := p.address; ELSE -- The additional && condition works around the misguided query -- planner of postgis 3.0. - SELECT placex.address || hstore('_inherited', '') INTO address + SELECT placex.address || hstore('_inherited', '') INTO result.address FROM placex WHERE ST_Covers(geometry, p.centroid) and geometry && p.centroid @@ -34,27 +37,26 @@ BEGIN LIMIT 1; END IF; - address := address - '_unlisted_place'::TEXT; - name := p.name; + result.address := result.address - '_unlisted_place'::TEXT; + result.name := p.name; + result.class := p.class; + result.type := p.type; + result.country_code := p.country_code; + result.rank_address := p.rank_address; -- Names of linked places need to be merged in, so search for a linkable -- place already here. SELECT * INTO location FROM find_linked_place(p); IF location.place_id is not NULL THEN - linked_place_id := location.place_id; + result.linked_place_id := location.place_id; IF NOT location.name IS NULL THEN - name := location.name || name; + result.name := location.name || result.name; END IF; END IF; - country_feature := CASE WHEN p.admin_level = 2 - and p.class = 'boundary' and p.type = 'administrative' - and p.osm_type = 'R' - THEN p.country_code - ELSE null - END; + RETURN result; END; $$ LANGUAGE plpgsql STABLE; @@ -104,8 +106,7 @@ CREATE OR REPLACE FUNCTION find_parent_for_poi(poi_osm_type CHAR(1), poi_osm_id BIGINT, poi_partition SMALLINT, bbox GEOMETRY, - addr_street INTEGER[], - addr_place INTEGER[], + token_info JSONB, is_place_addr BOOLEAN) RETURNS BIGINT AS $$ @@ -119,8 +120,7 @@ BEGIN parent_place_id := find_associated_street(poi_osm_type, poi_osm_id); IF parent_place_id is null THEN - parent_place_id := find_parent_for_address(addr_street, addr_place, - poi_partition, bbox); + parent_place_id := find_parent_for_address(token_info, poi_partition, bbox); END IF; IF parent_place_id is null and poi_osm_type = 'N' THEN @@ -333,13 +333,14 @@ BEGIN WHERE s.place_id = parent_place_id; FOR addr_item IN - SELECT (get_addr_tag_rank(key, country)).*, match_tokens, search_tokens - FROM token_get_address_tokens(token_info) - WHERE not search_tokens <@ parent_address_vector + SELECT (get_addr_tag_rank(key, country)).*, key, + token_get_address_search_tokens(token_info, key) as search_tokens + FROM token_get_address_keys(token_info) as key + WHERE not token_get_address_search_tokens(token_info, key) <@ parent_address_vector LOOP addr_place := get_address_place(in_partition, geometry, addr_item.from_rank, addr_item.to_rank, - addr_item.extent, addr_item.match_tokens); + addr_item.extent, token_info, addr_item.key); IF addr_place is null THEN -- No place found in OSM that matches. Make it at least searchable. @@ -447,14 +448,16 @@ BEGIN FOR location IN SELECT (get_address_place(partition, geometry, from_rank, to_rank, - extent, match_tokens)).*, search_tokens - FROM (SELECT (get_addr_tag_rank(key, country)).*, match_tokens, search_tokens - FROM token_get_address_tokens(token_info)) x + extent, token_info, key)).*, key + FROM (SELECT (get_addr_tag_rank(key, country)).*, key + FROM token_get_address_keys(token_info) as key) x ORDER BY rank_address, distance, isguess desc LOOP IF location.place_id is null THEN {% if not db.reverse_only %} - nameaddress_vector := array_merge(nameaddress_vector, location.search_tokens); + nameaddress_vector := array_merge(nameaddress_vector, + token_get_address_search_tokens(token_info, + location.key)); {% endif %} ELSE {% if not db.reverse_only %} @@ -689,9 +692,6 @@ DECLARE parent_address_level SMALLINT; place_address_level SMALLINT; - addr_street INTEGER[]; - addr_place INTEGER[]; - max_rank SMALLINT; name_vector INTEGER[]; @@ -860,8 +860,6 @@ BEGIN END IF; NEW.housenumber := token_normalized_housenumber(NEW.token_info); - addr_street := token_addr_street_match_tokens(NEW.token_info); - addr_place := token_addr_place_match_tokens(NEW.token_info); NEW.postcode := null; @@ -907,7 +905,7 @@ BEGIN NEW.parent_place_id := find_parent_for_poi(NEW.osm_type, NEW.osm_id, NEW.partition, ST_Envelope(NEW.geometry), - addr_street, addr_place, + NEW.token_info, is_place_address); -- If we found the road take a shortcut here.