X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/84ea0753d8d7861ff6a47a6eb29f072a1d342879..8081896bc0e3933c7c8a497a012c674c125de66e:/sql/functions/placex_triggers.sql diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql index ffc83fa3..d23d39d2 100644 --- a/sql/functions/placex_triggers.sql +++ b/sql/functions/placex_triggers.sql @@ -204,9 +204,26 @@ BEGIN END IF; END IF; + -- If extratags has a place tag, look for linked nodes by their place type. + -- Area and node still have to have the same name. + IF bnd.extratags ? 'place' and bnd_name is not null THEN + FOR linked_placex IN + SELECT * FROM placex + WHERE make_standard_name(name->'name') = bnd_name + AND placex.class = 'place' AND placex.type = bnd.extratags->'place' + AND placex.osm_type = 'N' + AND placex.rank_search < 26 -- needed to select the right index + AND _st_covers(bnd.geometry, placex.geometry) + LOOP + --DEBUG: RAISE WARNING 'Found type-matching place node %', linked_placex.osm_id; + RETURN linked_placex; + END LOOP; + END IF; + -- Search for relation members with role admin_center. IF bnd.osm_type = 'R' and bnd_name is not null - and relation_members is not null THEN + and relation_members is not null + THEN FOR rel_member IN SELECT get_rel_node_members(relation_members, ARRAY['admin_center','admin_centre']) as member @@ -231,7 +248,7 @@ BEGIN END IF; -- Name searches can be done for ways as well as relations - IF bnd.osm_type in ('W','R') and bnd_name is not null THEN + IF bnd_name is not null THEN --DEBUG: RAISE WARNING 'Looking for nodes with matching names'; FOR linked_placex IN SELECT placex.* from placex @@ -241,7 +258,7 @@ BEGIN AND placex.rank_search < 26 -- needed to select the right index AND _st_covers(bnd.geometry, placex.geometry) LOOP - --DEBUG: RAISE WARNING 'Found matching place node %', linkedPlacex.osm_id; + --DEBUG: RAISE WARNING 'Found matching place node %', linked_placex.osm_id; RETURN linked_placex; END LOOP; END IF; @@ -370,11 +387,12 @@ BEGIN location_keywords := location.keywords; location_isaddress := NOT address_havelevel[location.rank_address]; + --DEBUG: RAISE WARNING 'should be address: %, is guess: %, rank: %', location_isaddress, location.isguess, location.rank_address; IF location_isaddress AND location.isguess AND location_parent IS NOT NULL THEN location_isaddress := ST_Contains(location_parent, location.centroid); END IF; - -- RAISE WARNING '% isaddress: %', location.place_id, location_isaddress; + --DEBUG: RAISE WARNING '% isaddress: %', location.place_id, location_isaddress; -- Add it to the list of search terms IF NOT %REVERSE-ONLY% THEN nameaddress_vector := array_merge(nameaddress_vector, @@ -394,9 +412,12 @@ BEGIN END IF; address_havelevel[location.rank_address] := true; - IF NOT location.isguess THEN - SELECT placex.geometry FROM placex - WHERE obj_place_id = location.place_id INTO location_parent; + -- add a hack against postcode ranks + IF NOT location.isguess + AND location.rank_address != 11 AND location.rank_address != 5 + THEN + SELECT p.geometry FROM placex p + WHERE p.place_id = location.place_id INTO location_parent; END IF; IF location.rank_address > parent_place_id_rank THEN @@ -404,7 +425,6 @@ BEGIN parent_place_id_rank = location.rank_address; END IF; END IF; - --DEBUG: RAISE WARNING ' Terms: (%) %',location, nameaddress_vector; END IF; END LOOP; @@ -592,6 +612,8 @@ DECLARE location RECORD; relation_members TEXT[]; + centroid GEOMETRY; + addr_street TEXT; addr_place TEXT; @@ -666,10 +688,10 @@ BEGIN -- Speed up searches - just use the centroid of the feature -- cheaper but less acurate NEW.centroid := ST_PointOnSurface(NEW.geometry); - -- For searching near features rather use the centroid - NEW.postcode := null; --DEBUG: RAISE WARNING 'Computing preliminary centroid at %',ST_AsText(NEW.centroid); + NEW.postcode := null; + -- recalculate country and partition IF NEW.rank_search = 4 AND NEW.address is not NULL AND NEW.address ? 'country' THEN -- for countries, believe the mapped country code, @@ -704,6 +726,7 @@ BEGIN and ( relation_members[i+1] != 'side_stream' or NEW.name->'name' = name->'name') LOOP UPDATE placex SET linked_place_id = NEW.place_id WHERE place_id = linked_node_id; + DELETE FROM search_name WHERE place_id = linked_node_id; END LOOP; END IF; END LOOP; @@ -818,11 +841,19 @@ BEGIN --DEBUG: RAISE WARNING 'Using full index mode for % %', NEW.osm_type, NEW.osm_id; SELECT * INTO location FROM find_linked_place(NEW); IF location.place_id is not null THEN - --DEBUG: RAISE WARNING 'Linked %', location; + --DEBUG: RAISE WARNING 'Linked %', location; + + -- Use the linked point as the centre point of the geometry, + -- but only if it is within the area of the boundary. + centroid := coalesce(location.centroid, ST_Centroid(location.geometry)); + IF centroid is not NULL AND ST_Within(centroid, NEW.geometry) THEN + NEW.centroid := centroid; + END IF; - -- Use this as the centre point of the geometry - NEW.centroid := coalesce(location.centroid, - ST_Centroid(location.geometry)); + -- Use the address rank of the linked place, if it has one + IF location.rank_address between 5 and 25 THEN + NEW.rank_address := location.rank_address; + END IF; -- merge in the label name IF NOT location.name IS NULL THEN @@ -830,13 +861,15 @@ BEGIN END IF; -- merge in extra tags - NEW.extratags := hstore(location.class, location.type) + NEW.extratags := hstore('linked_' || location.class, location.type) || coalesce(location.extratags, ''::hstore) || coalesce(NEW.extratags, ''::hstore); -- mark the linked place (excludes from search results) UPDATE placex set linked_place_id = NEW.place_id WHERE place_id = location.place_id; + -- ensure that those places are not found anymore + DELETE FROM search_name WHERE place_id = location.place_id; SELECT wikipedia, importance FROM compute_importance(location.extratags, NEW.country_code,