X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/06fdfad89ef04940e3922116f415b361ab1acaf4..b616fab64dcc28e1f4c7f80abfff4fddf63d83d6:/sql/functions/placex_triggers.sql diff --git a/sql/functions/placex_triggers.sql b/sql/functions/placex_triggers.sql index 9743eead..5c04ad06 100644 --- a/sql/functions/placex_triggers.sql +++ b/sql/functions/placex_triggers.sql @@ -220,30 +220,18 @@ BEGIN 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 - FOR rel_member IN - SELECT get_rel_node_members(relation_members, - ARRAY['admin_center','admin_centre']) as member + IF bnd.extratags ? 'wikidata' THEN + FOR linked_placex IN + SELECT * FROM placex + WHERE placex.class = 'place' AND placex.osm_type = 'N' + AND placex.extratags ? 'wikidata' -- needed to select right index + AND placex.extratags->'wikidata' = bnd.extratags->'wikidata' + AND placex.rank_search < 26 + AND _st_covers(bnd.geometry, placex.geometry) + ORDER BY make_standard_name(name->'name') = bnd_name desc LOOP - --DEBUG: RAISE WARNING 'Found admin_center member %', rel_member.member; - FOR linked_placex IN - SELECT * from placex - WHERE osm_type = 'N' and osm_id = rel_member.member - and class = 'place' - LOOP - -- For an admin centre we also want a name match - still not perfect, - -- for example 'new york, new york' - -- But that can be fixed by explicitly setting the label in the data - IF bnd_name = make_standard_name(linked_placex.name->'name') - AND bnd.rank_address = linked_placex.rank_address - THEN - RETURN linked_placex; - END IF; - --DEBUG: RAISE WARNING 'Linked admin_center'; - END LOOP; + --DEBUG: RAISE WARNING 'Found wikidata-matching place node %', linked_placex.osm_id; + RETURN linked_placex; END LOOP; END IF; @@ -253,7 +241,8 @@ BEGIN FOR linked_placex IN SELECT placex.* from placex WHERE make_standard_name(name->'name') = bnd_name - AND placex.rank_address = bnd.rank_address + AND ((bnd.rank_address > 0 and placex.rank_address = bnd.rank_address) + OR (bnd.rank_address = 0 and placex.rank_search = bnd.rank_search)) AND placex.osm_type = 'N' AND placex.rank_search < 26 -- needed to select the right index AND _st_covers(bnd.geometry, placex.geometry) @@ -387,11 +376,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, @@ -411,9 +401,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 @@ -421,7 +414,6 @@ BEGIN parent_place_id_rank = location.rank_address; END IF; END IF; - --DEBUG: RAISE WARNING ' Terms: (%) %',location, nameaddress_vector; END IF; END LOOP; @@ -609,6 +601,8 @@ DECLARE location RECORD; relation_members TEXT[]; + centroid GEOMETRY; + addr_street TEXT; addr_place TEXT; @@ -683,10 +677,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, @@ -721,6 +715,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; @@ -837,12 +832,17 @@ BEGIN IF location.place_id is not null THEN --DEBUG: RAISE WARNING 'Linked %', location; - -- Use this as the centre point of the geometry - NEW.centroid := coalesce(location.centroid, - ST_Centroid(location.geometry)); + -- 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 the address rank of the linked place - NEW.rank_address := location.rank_address; + -- 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 @@ -857,6 +857,8 @@ BEGIN -- 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,