X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/89d47d26f0c1db031287ce58ace0224dcb245626..253dc7d7cd6cae88b8f2d777c1b2996390b37e54:/lib-sql/functions/placex_triggers.sql?ds=sidebyside diff --git a/lib-sql/functions/placex_triggers.sql b/lib-sql/functions/placex_triggers.sql index 99d2872f..01f99715 100644 --- a/lib-sql/functions/placex_triggers.sql +++ b/lib-sql/functions/placex_triggers.sql @@ -2,7 +2,7 @@ -- -- This file is part of Nominatim. (https://nominatim.org) -- --- Copyright (C) 2022 by the Nominatim developer community. +-- Copyright (C) 2024 by the Nominatim developer community. -- For a full list of authors see the git log. -- Trigger functions for the placex table. @@ -88,12 +88,18 @@ BEGIN -- Add all names from the place nodes that deviate from the name -- in the relation with the prefix '_place_'. Deviation means that -- either the value is different or a given key is missing completely - SELECT hstore(array_agg('_place_' || key), array_agg(value)) INTO extra_names - FROM each(location.name - result.name); - {% if debug %}RAISE WARNING 'Extra names: %', extra_names;{% endif %} + IF result.name is null THEN + SELECT hstore(array_agg('_place_' || key), array_agg(value)) + INTO result.name + FROM each(location.name); + ELSE + SELECT hstore(array_agg('_place_' || key), array_agg(value)) INTO extra_names + FROM each(location.name - result.name); + {% if debug %}RAISE WARNING 'Extra names: %', extra_names;{% endif %} - IF extra_names is not null THEN - result.name := result.name || extra_names; + IF extra_names is not null THEN + result.name := result.name || extra_names; + END IF; END IF; {% if debug %}RAISE WARNING 'Final names: %', result.name;{% endif %} @@ -113,12 +119,14 @@ CREATE OR REPLACE FUNCTION find_associated_street(poi_osm_type CHAR(1), AS $$ DECLARE location RECORD; + member JSONB; parent RECORD; result BIGINT; distance FLOAT; new_distance FLOAT; waygeom GEOMETRY; BEGIN +{% if db.middle_db_format == '1' %} FOR location IN SELECT members FROM planet_osm_rels WHERE parts @> ARRAY[poi_osm_id] @@ -155,6 +163,40 @@ BEGIN END LOOP; END LOOP; +{% else %} + FOR member IN + SELECT value FROM planet_osm_rels r, LATERAL jsonb_array_elements(members) + WHERE planet_osm_member_ids(members, poi_osm_type::char(1)) && ARRAY[poi_osm_id] + and tags->>'type' = 'associatedStreet' + and value->>'role' = 'street' + LOOP + FOR parent IN + SELECT place_id, geometry + FROM placex + WHERE osm_type = (member->>'type')::char(1) + and osm_id = (member->>'ref')::bigint + and name is not null + and rank_search between 26 and 27 + LOOP + -- Find the closest 'street' member. + -- Avoid distance computation for the frequent case where there is + -- only one street member. + IF waygeom is null THEN + result := parent.place_id; + waygeom := parent.geometry; + ELSE + distance := coalesce(distance, ST_Distance(waygeom, bbox)); + new_distance := ST_Distance(parent.geometry, bbox); + IF new_distance < distance THEN + distance := new_distance; + result := parent.place_id; + waygeom := parent.geometry; + END IF; + END IF; + END LOOP; + END LOOP; +{% endif %} + RETURN result; END; $$ @@ -251,7 +293,11 @@ CREATE OR REPLACE FUNCTION find_linked_place(bnd placex) RETURNS placex AS $$ DECLARE +{% if db.middle_db_format == '1' %} relation_members TEXT[]; +{% else %} + relation_members JSONB; +{% endif %} rel_member RECORD; linked_placex placex%ROWTYPE; bnd_name TEXT; @@ -435,24 +481,20 @@ BEGIN name_vector := array_merge(name_vector, hnr_vector); END IF; - IF is_place_addr THEN - addr_place_ids := token_addr_place_search_tokens(token_info); - IF not addr_place_ids <@ parent_name_vector THEN - -- make sure addr:place terms are always searchable - nameaddress_vector := array_merge(nameaddress_vector, addr_place_ids); - -- If there is a housenumber, also add the place name as a name, - -- so we can search it by the usual housenumber+place algorithms. - IF hnr_vector is not null THEN - name_vector := array_merge(name_vector, addr_place_ids); - END IF; - END IF; - END IF; - -- Cheating here by not recomputing all terms but simply using the ones -- from the parent object. nameaddress_vector := array_merge(nameaddress_vector, parent_name_vector); nameaddress_vector := array_merge(nameaddress_vector, parent_address_vector); + -- make sure addr:place terms are always searchable + IF is_place_addr THEN + addr_place_ids := token_addr_place_search_tokens(token_info); + IF hnr_vector is not null AND not addr_place_ids <@ parent_name_vector + THEN + name_vector := array_merge(name_vector, hnr_vector); + END IF; + nameaddress_vector := array_merge(nameaddress_vector, addr_place_ids); + END IF; END; $$ LANGUAGE plpgsql; @@ -672,6 +714,12 @@ BEGIN NEW.country_code := NULL; END IF; + -- Simplify polygons with a very large memory footprint when they + -- do not take part in address computation. + IF NEW.rank_address = 0 THEN + NEW.geometry := simplify_large_polygons(NEW.geometry); + END IF; + END IF; {% if debug %}RAISE WARNING 'placex_insert:END: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type;{% endif %} @@ -679,10 +727,12 @@ BEGIN {% if not disable_diff_updates %} -- The following is not needed until doing diff updates, and slows the main index process down - IF NEW.rank_address > 0 THEN + IF NEW.rank_address between 2 and 27 THEN IF (ST_GeometryType(NEW.geometry) in ('ST_Polygon','ST_MultiPolygon') AND ST_IsValid(NEW.geometry)) THEN -- Performance: We just can't handle re-indexing for country level changes - IF st_area(NEW.geometry) < 1 THEN + IF (NEW.rank_address < 26 and st_area(NEW.geometry) < 1) + OR (NEW.rank_address >= 26 and st_area(NEW.geometry) < 0.01) + THEN -- mark items within the geometry for re-indexing -- RAISE WARNING 'placex poly insert: % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type; @@ -697,9 +747,11 @@ BEGIN or name is not null or (NEW.rank_address >= 16 and address ? 'place')); END IF; - ELSE + ELSEIF ST_GeometryType(NEW.geometry) not in ('ST_LineString', 'ST_MultiLineString') + OR ST_Length(NEW.geometry) < 0.5 + THEN -- mark nearby items for re-indexing, where 'nearby' depends on the features rank_search and is a complete guess :( - diameter := update_place_diameter(NEW.rank_search); + diameter := update_place_diameter(NEW.rank_address); IF diameter > 0 THEN -- RAISE WARNING 'placex point insert: % % % % %',NEW.osm_type,NEW.osm_id,NEW.class,NEW.type,diameter; IF NEW.rank_search >= 26 THEN @@ -743,7 +795,11 @@ CREATE OR REPLACE FUNCTION placex_update() DECLARE i INTEGER; location RECORD; +{% if db.middle_db_format == '1' %} relation_members TEXT[]; +{% else %} + relation_member JSONB; +{% endif %} geom GEOMETRY; parent_address_level SMALLINT; @@ -788,6 +844,9 @@ BEGIN result := deleteLocationArea(NEW.partition, NEW.place_id, NEW.rank_search); NEW.extratags := NEW.extratags - 'linked_place'::TEXT; + IF NEW.extratags = ''::hstore THEN + NEW.extratags := NULL; + END IF; -- NEW.linked_place_id contains the precomputed linkee. Save this and restore -- the previous link status. @@ -962,6 +1021,7 @@ BEGIN -- waterway ways are linked when they are part of a relation and have the same class/type IF NEW.osm_type = 'R' and NEW.class = 'waterway' THEN +{% if db.middle_db_format == '1' %} FOR relation_members IN select members from planet_osm_rels r where r.id = NEW.osm_id and r.parts != array[]::bigint[] LOOP FOR i IN 1..array_upper(relation_members, 1) BY 2 LOOP @@ -980,6 +1040,29 @@ BEGIN END IF; END LOOP; END LOOP; +{% else %} + FOR relation_member IN + SELECT value FROM planet_osm_rels r, LATERAL jsonb_array_elements(r.members) + WHERE r.id = NEW.osm_id + LOOP + IF relation_member->>'role' IN ('', 'main_stream', 'side_stream') + and relation_member->>'type' = 'W' + THEN + {% if debug %}RAISE WARNING 'waterway parent %, child %', NEW.osm_id, relation_member;{% endif %} + FOR linked_node_id IN + SELECT place_id FROM placex + WHERE osm_type = 'W' and osm_id = (relation_member->>'ref')::bigint + and class = NEW.class and type in ('river', 'stream', 'canal', 'drain', 'ditch') + and (relation_member->>'role' != 'side_stream' or NEW.name->'name' = name->'name') + LOOP + UPDATE placex SET linked_place_id = NEW.place_id WHERE place_id = linked_node_id; + {% if 'search_name' in db.tables %} + DELETE FROM search_name WHERE place_id = linked_node_id; + {% endif %} + END LOOP; + END IF; + END LOOP; +{% endif %} {% if debug %}RAISE WARNING 'Waterway processed';{% endif %} END IF; @@ -996,7 +1079,7 @@ BEGIN {% if debug %}RAISE WARNING 'finding street for % %', NEW.osm_type, NEW.osm_id;{% endif %} NEW.parent_place_id := null; - is_place_address := coalesce(not NEW.address ? 'street' and NEW.address ? 'place', FALSE); + is_place_address := not token_is_street_address(NEW.token_info); -- We have to find our parent road. NEW.parent_place_id := find_parent_for_poi(NEW.osm_type, NEW.osm_id, @@ -1013,7 +1096,7 @@ BEGIN SELECT p.country_code, p.postcode, p.name FROM placex p WHERE p.place_id = NEW.parent_place_id INTO location; - IF is_place_address THEN + IF is_place_address and NEW.address ? 'place' THEN -- Check if the addr:place tag is part of the parent name SELECT count(*) INTO i FROM svals(location.name) AS pname WHERE pname = NEW.address->'place'; @@ -1182,6 +1265,8 @@ BEGIN END IF; ELSEIF NEW.rank_address > 25 THEN max_rank := 25; + ELSEIF NEW.class in ('place','boundary') and NEW.type in ('postcode','postal_code') THEN + max_rank := NEW.rank_search; ELSE max_rank := NEW.rank_address; END IF; @@ -1235,7 +1320,9 @@ BEGIN OR ST_GeometryType(NEW.geometry) not in ('ST_LineString','ST_MultiLineString') OR ST_Length(NEW.geometry) < 0.02) THEN - NEW.postcode := get_nearest_postcode(NEW.country_code, NEW.geometry); + NEW.postcode := get_nearest_postcode(NEW.country_code, + CASE WHEN NEW.rank_address > 25 + THEN NEW.centroid ELSE NEW.geometry END); END IF; {% if debug %}RAISE WARNING 'place update % % finished.', NEW.osm_type, NEW.osm_id;{% endif %} @@ -1316,6 +1403,8 @@ BEGIN {% if debug %}RAISE WARNING 'placex_delete:12 % %',OLD.osm_type,OLD.osm_id;{% endif %} + UPDATE location_postcode SET indexed_status = 2 WHERE parent_place_id = OLD.place_id; + RETURN OLD; END;