hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-09 03:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

factor out computation of default names

Browse Source 
Also moves the computation down the line so that we never
have to do it twice.
This commit is contained in:
Sarah Hoffmann
2020-01-16 00:11:32 +01:00
parent c3dc66ce9c
commit 6dccc693d0
1 changed files with 68 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
sql/functions/placex_triggers.sql
View File

@@ -19,6 +19,26 @@ END;
$$ $$
LANGUAGE plpgsql IMMUTABLE; LANGUAGE plpgsql IMMUTABLE;
-- copy 'name' to or from the default language (if there is a default language)
CREATE OR REPLACE FUNCTION add_default_place_name(country_code VARCHAR(2),
INOUT name HSTORE)
AS $$
DECLARE
default_language VARCHAR(10);
BEGIN
IF name is not null AND array_upper(akeys(name),1) > 1 THEN
default_language := get_country_language_code(country_code);
IF default_language IS NOT NULL THEN
IF name ? 'name' AND NOT name ? ('name:'||default_language) THEN
name := name || hstore(('name:'||default_language), (name -> 'name'));
ELSEIF name ? ('name:'||default_language) AND NOT name ? 'name' THEN
name := name || hstore('name', (name -> ('name:'||default_language)));
END IF;
END IF;
END IF;
END;
$$
LANGUAGE plpgsql IMMUTABLE;
-- Try to find a linked place for the given object. -- Try to find a linked place for the given object.
CREATE OR REPLACE FUNCTION find_linked_place(bnd placex) CREATE OR REPLACE FUNCTION find_linked_place(bnd placex)
@@ -123,7 +143,6 @@ DECLARE
result BOOLEAN; result BOOLEAN;
is_area BOOLEAN; is_area BOOLEAN;
country_code VARCHAR(2); country_code VARCHAR(2);
default_language VARCHAR(10);
diameter FLOAT; diameter FLOAT;
classtable TEXT; classtable TEXT;
classtype TEXT; classtype TEXT;
@@ -138,18 +157,6 @@ BEGIN
NEW.partition := get_partition(NEW.country_code); NEW.partition := get_partition(NEW.country_code);
NEW.geometry_sector := geometry_sector(NEW.partition, NEW.geometry); NEW.geometry_sector := geometry_sector(NEW.partition, NEW.geometry);
-- copy 'name' to or from the default language (if there is a default language)
IF NEW.name is not null AND array_upper(akeys(NEW.name),1) > 1 THEN
default_language := get_country_language_code(NEW.country_code);
IF default_language IS NOT NULL THEN
IF NEW.name ? 'name' AND NOT NEW.name ? ('name:'||default_language) THEN
NEW.name := NEW.name || hstore(('name:'||default_language), (NEW.name -> 'name'));
ELSEIF NEW.name ? ('name:'||default_language) AND NOT NEW.name ? 'name' THEN
NEW.name := NEW.name || hstore('name', (NEW.name -> ('name:'||default_language)));
END IF;
END IF;
END IF;
IF NEW.osm_type = 'X' THEN IF NEW.osm_type = 'X' THEN
-- E'X'ternal records should already be in the right format so do nothing -- E'X'ternal records should already be in the right format so do nothing
ELSE ELSE
@@ -304,7 +311,6 @@ CREATE OR REPLACE FUNCTION placex_update()
AS $$ AS $$
DECLARE DECLARE
place_centroid GEOMETRY;
near_centroid GEOMETRY; near_centroid GEOMETRY;
search_maxdistance FLOAT[]; search_maxdistance FLOAT[];
@@ -317,7 +323,6 @@ DECLARE
way RECORD; way RECORD;
relation RECORD; relation RECORD;
relation_members TEXT[]; relation_members TEXT[];
linkedplacex RECORD;
addr_item RECORD; addr_item RECORD;
search_diameter FLOAT; search_diameter FLOAT;
search_prevdiameter FLOAT; search_prevdiameter FLOAT;
@@ -339,7 +344,6 @@ DECLARE
location_isaddress BOOLEAN; location_isaddress BOOLEAN;
location_keywords INTEGER[]; location_keywords INTEGER[];
default_language TEXT;
name_vector INTEGER[]; name_vector INTEGER[];
nameaddress_vector INTEGER[]; nameaddress_vector INTEGER[];
@@ -410,12 +414,11 @@ BEGIN
-- Speed up searches - just use the centroid of the feature -- Speed up searches - just use the centroid of the feature
-- cheaper but less acurate -- cheaper but less acurate
place_centroid := ST_PointOnSurface(NEW.geometry); NEW.centroid := ST_PointOnSurface(NEW.geometry);
-- For searching near features rather use the centroid -- For searching near features rather use the centroid
near_centroid := ST_Envelope(NEW.geometry); near_centroid := ST_Envelope(NEW.geometry);
NEW.centroid := null;
NEW.postcode := null; NEW.postcode := null;
--DEBUG: RAISE WARNING 'Computing preliminary centroid at %',ST_AsText(place_centroid); --DEBUG: RAISE WARNING 'Computing preliminary centroid at %',ST_AsText(NEW.centroid);
-- recalculate country and partition -- recalculate country and partition
IF NEW.rank_search = 4 AND NEW.address is not NULL AND NEW.address ? 'country' THEN IF NEW.rank_search = 4 AND NEW.address is not NULL AND NEW.address ? 'country' THEN
@@ -425,12 +428,12 @@ BEGIN
NEW.country_code := lower(NEW.address->'country'); NEW.country_code := lower(NEW.address->'country');
NEW.partition := get_partition(lower(NEW.country_code)); NEW.partition := get_partition(lower(NEW.country_code));
IF NEW.partition = 0 THEN IF NEW.partition = 0 THEN
NEW.country_code := lower(get_country_code(place_centroid)); NEW.country_code := lower(get_country_code(NEW.centroid));
NEW.partition := get_partition(NEW.country_code); NEW.partition := get_partition(NEW.country_code);
END IF; END IF;
ELSE ELSE
IF NEW.rank_search >= 4 THEN IF NEW.rank_search >= 4 THEN
NEW.country_code := lower(get_country_code(place_centroid)); NEW.country_code := lower(get_country_code(NEW.centroid));
ELSE ELSE
NEW.country_code := NULL; NEW.country_code := NULL;
END IF; END IF;
@@ -458,31 +461,6 @@ BEGIN
--DEBUG: RAISE WARNING 'Waterway processed'; --DEBUG: RAISE WARNING 'Waterway processed';
END IF; END IF;
-- What level are we searching from
search_maxrank := NEW.rank_search;
-- Thought this wasn't needed but when we add new languages to the country_name table
-- we need to update the existing names
IF NEW.name is not null AND array_upper(akeys(NEW.name),1) > 1 THEN
default_language := get_country_language_code(NEW.country_code);
IF default_language IS NOT NULL THEN
IF NEW.name ? 'name' AND NOT NEW.name ? ('name:'||default_language) THEN
NEW.name := NEW.name || hstore(('name:'||default_language), (NEW.name -> 'name'));
ELSEIF NEW.name ? ('name:'||default_language) AND NOT NEW.name ? 'name' THEN
NEW.name := NEW.name || hstore('name', (NEW.name -> ('name:'||default_language)));
END IF;
END IF;
END IF;
--DEBUG: RAISE WARNING 'Local names updated';
-- Initialise the name vector using our name
name_vector := make_keywords(NEW.name);
nameaddress_vector := '{}'::int[];
FOR i IN 1..28 LOOP
address_havelevel[i] := false;
END LOOP;
NEW.importance := null; NEW.importance := null;
SELECT wikipedia, importance SELECT wikipedia, importance
FROM compute_importance(NEW.extratags, NEW.country_code, NEW.osm_type, NEW.osm_id) FROM compute_importance(NEW.extratags, NEW.country_code, NEW.osm_type, NEW.osm_id)
@@ -495,17 +473,13 @@ BEGIN
IF (NEW.rank_search > 27 OR (NEW.type = 'postcode' AND NEW.rank_search = 25)) THEN IF (NEW.rank_search > 27 OR (NEW.type = 'postcode' AND NEW.rank_search = 25)) THEN
--DEBUG: RAISE WARNING 'finding street for % %', NEW.osm_type, NEW.osm_id; --DEBUG: RAISE WARNING 'finding street for % %', NEW.osm_type, NEW.osm_id;
-- We won't get a better centroid, besides these places are too small to care
NEW.centroid := place_centroid;
NEW.parent_place_id := null; NEW.parent_place_id := null;
-- if we have a POI and there is no address information, -- if we have a POI and there is no address information,
-- see if we can get it from a surrounding building -- see if we can get it from a surrounding building
IF NEW.osm_type = 'N' AND addr_street IS NULL AND addr_place IS NULL IF NEW.osm_type = 'N' AND addr_street IS NULL AND addr_place IS NULL
AND NEW.housenumber IS NULL THEN AND NEW.housenumber IS NULL THEN
FOR location IN select address from placex where ST_Covers(geometry, place_centroid) FOR location IN select address from placex where ST_Covers(geometry, NEW.centroid)
and address is not null and address is not null
and (address ? 'housenumber' or address ? 'street' or address ? 'place') and (address ? 'housenumber' or address ? 'street' or address ? 'place')
and rank_search > 28 AND ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') and rank_search > 28 AND ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon')
@@ -656,6 +630,9 @@ BEGIN
return NEW; return NEW;
END IF; END IF;
NEW.name := add_default_place_name(NEW.country_code, NEW.name);
name_vector := make_keywords(NEW.name);
-- Performance, it would be more acurate to do all the rest of the import -- Performance, it would be more acurate to do all the rest of the import
-- process but it takes too long -- process but it takes too long
-- Just be happy with inheriting from parent road only -- Just be happy with inheriting from parent road only
@@ -669,19 +646,17 @@ BEGIN
IF NOT %REVERSE-ONLY% THEN IF NOT %REVERSE-ONLY% THEN
-- Merge address from parent -- Merge address from parent
SELECT s.name_vector, s.nameaddress_vector FROM search_name s SELECT array_merge(s.name_vector, s.nameaddress_vector)
WHERE s.place_id = NEW.parent_place_id INTO location; INTO nameaddress_vector
FROM search_name s
nameaddress_vector := array_merge(nameaddress_vector, WHERE s.place_id = NEW.parent_place_id;
location.nameaddress_vector);
nameaddress_vector := array_merge(nameaddress_vector, location.name_vector);
INSERT INTO search_name (place_id, search_rank, address_rank, INSERT INTO search_name (place_id, search_rank, address_rank,
importance, country_code, name_vector, importance, country_code, name_vector,
nameaddress_vector, centroid) nameaddress_vector, centroid)
VALUES (NEW.place_id, NEW.rank_search, NEW.rank_address, VALUES (NEW.place_id, NEW.rank_search, NEW.rank_address,
NEW.importance, NEW.country_code, name_vector, NEW.importance, NEW.country_code, name_vector,
nameaddress_vector, place_centroid); nameaddress_vector, NEW.centroid);
--DEBUG: RAISE WARNING 'Place added to search table'; --DEBUG: RAISE WARNING 'Place added to search table';
END IF; END IF;
@@ -693,65 +668,62 @@ BEGIN
-- --------------------------------------------------------------------------- -- ---------------------------------------------------------------------------
-- Full indexing -- Full indexing
--DEBUG: RAISE WARNING 'Using full index mode for % %', NEW.osm_type, NEW.osm_id; --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;
FOR linkedPlacex IN SELECT * FROM find_linked_place(NEW) LOOP -- Use this as the centre point of the geometry
-- If we don't already have one use this as the centre point of the geometry NEW.centroid := coalesce(location.centroid,
IF NEW.centroid IS NULL THEN ST_Centroid(location.geometry));
--DEBUG: RAISE WARNING 'Linked %', linkedPlacex;
NEW.centroid := coalesce(linkedPlacex.centroid,
ST_Centroid(linkedPlacex.geometry));
END IF;
place_centroid := NEW.centroid;
-- merge in the label name, re-init word vector -- merge in the label name
IF NOT linkedPlacex.name IS NULL THEN IF NOT location.name IS NULL THEN
NEW.name := linkedPlacex.name || NEW.name; NEW.name := location.name || NEW.name;
name_vector := array_merge(name_vector, make_keywords(linkedPlacex.name));
-- Place might have had only a name tag before but has now received
-- translations from the linked place. Make sure a name tag for the
-- default language exists in this case.
IF array_upper(akeys(NEW.name), 1) > 1 THEN
default_language := get_country_language_code(NEW.country_code);
IF default_language IS NOT NULL THEN
IF NEW.name ? 'name' AND NOT NEW.name ? ('name:'||default_language) THEN
NEW.name := NEW.name || hstore(('name:'||default_language), (NEW.name -> 'name'));
ELSEIF NEW.name ? ('name:'||default_language) AND NOT NEW.name ? 'name' THEN
NEW.name := NEW.name || hstore('name', (NEW.name -> ('name:'||default_language)));
END IF;
END IF;
END IF;
END IF; END IF;
-- merge in extra tags -- merge in extra tags
NEW.extratags := hstore(linkedPlacex.class, linkedPlacex.type) NEW.extratags := hstore(location.class, location.type)
|| coalesce(linkedPlacex.extratags, ''::hstore) || coalesce(location.extratags, ''::hstore)
|| coalesce(NEW.extratags, ''::hstore); || coalesce(NEW.extratags, ''::hstore);
-- mark the linked place (excludes from search results) -- mark the linked place (excludes from search results)
UPDATE placex set linked_place_id = NEW.place_id UPDATE placex set linked_place_id = NEW.place_id
WHERE place_id = linkedPlacex.place_id; WHERE place_id = location.place_id;
SELECT wikipedia, importance SELECT wikipedia, importance
FROM compute_importance(linkedPlacex.extratags, NEW.country_code, FROM compute_importance(location.extratags, NEW.country_code,
'N', linkedPlacex.osm_id) 'N', location.osm_id)
INTO linked_wikipedia,linked_importance; INTO linked_wikipedia,linked_importance;
-- Use the maximum importance if a one could be computed from the linked object. -- Use the maximum importance if one could be computed from the linked object.
IF linked_importance is not null AND IF linked_importance is not null AND
(NEW.importance is null or NEW.importance < linked_importance) (NEW.importance is null or NEW.importance < linked_importance)
THEN THEN
NEW.importance = linked_importance; NEW.importance = linked_importance;
END IF; END IF;
END IF;
END LOOP; -- What level are we searching from
search_maxrank := NEW.rank_search;
-- Initialise the name vector using our name
NEW.name := add_default_place_name(NEW.country_code, NEW.name);
name_vector := make_keywords(NEW.name);
nameaddress_vector := '{}'::int[];
-- make sure all names are in the word table -- make sure all names are in the word table
IF NEW.admin_level = 2 AND NEW.class = 'boundary' AND NEW.type = 'administrative' AND NEW.country_code IS NOT NULL AND NEW.osm_type = 'R' THEN IF NEW.admin_level = 2
perform create_country(NEW.name, lower(NEW.country_code)); AND NEW.class = 'boundary' AND NEW.type = 'administrative'
AND NEW.country_code IS NOT NULL AND NEW.osm_type = 'R'
THEN
PERFORM create_country(NEW.name, lower(NEW.country_code));
--DEBUG: RAISE WARNING 'Country names updated'; --DEBUG: RAISE WARNING 'Country names updated';
END IF; END IF;
FOR i IN 1..28 LOOP
address_havelevel[i] := false;
END LOOP;
NEW.parent_place_id = 0; NEW.parent_place_id = 0;
parent_place_id_rank = 0; parent_place_id_rank = 0;
@@ -808,13 +780,13 @@ BEGIN
location_parent := NULL; location_parent := NULL;
-- added ourself as address already -- added ourself as address already
address_havelevel[NEW.rank_address] := true; address_havelevel[NEW.rank_address] := true;
--DEBUG: RAISE WARNING ' getNearFeatures(%,''%'',%,''%'')',NEW.partition, place_centroid, search_maxrank, isin_tokens; --DEBUG: RAISE WARNING ' getNearFeatures(%,''%'',%,''%'')',NEW.partition, NEW.centroid, search_maxrank, isin_tokens;
FOR location IN FOR location IN
SELECT * from getNearFeatures(NEW.partition, SELECT * from getNearFeatures(NEW.partition,
CASE WHEN NEW.rank_search >= 26 CASE WHEN NEW.rank_search >= 26
AND NEW.rank_search < 30 AND NEW.rank_search < 30
THEN NEW.geometry THEN NEW.geometry
ELSE place_centroid END, ELSE NEW.centroid END,
search_maxrank, isin_tokens) search_maxrank, isin_tokens)
LOOP LOOP
IF location.rank_address != location_rank_search THEN IF location.rank_address != location_rank_search THEN
@@ -911,16 +883,11 @@ BEGIN
nameaddress_vector, centroid) nameaddress_vector, centroid)
VALUES (NEW.place_id, NEW.rank_search, NEW.rank_address, VALUES (NEW.place_id, NEW.rank_search, NEW.rank_address,
NEW.importance, NEW.country_code, name_vector, NEW.importance, NEW.country_code, name_vector,
nameaddress_vector, place_centroid); nameaddress_vector, NEW.centroid);
END IF; END IF;
END IF; END IF;
-- If we've not managed to pick up a better one - default centroid
IF NEW.centroid IS NULL THEN
NEW.centroid := place_centroid;
END IF;
--DEBUG: RAISE WARNING 'place update % % finsihed.', NEW.osm_type, NEW.osm_id; --DEBUG: RAISE WARNING 'place update % % finsihed.', NEW.osm_type, NEW.osm_id;
RETURN NEW; RETURN NEW;