+-- SPDX-License-Identifier: GPL-2.0-only
+--
+-- This file is part of Nominatim. (https://nominatim.org)
+--
+-- Copyright (C) 2022 by the Nominatim developer community.
+-- For a full list of authors see the git log.
+
-- 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)
+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
- RAISE WARNING 'self address for % %', p.osm_type, p.osm_id;
- address := p.address;
- ELSE
+ IF p.rank_search < 30 OR p.osm_type != 'N' THEN
+ result.address := p.address;
+ ELSEIF p.address is null THEN
-- 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
and (placex.address ? 'housenumber' or placex.address ? 'street' or placex.address ? 'place')
and rank_search = 30 AND ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon')
LIMIT 1;
- RAISE WARNING 'other address for % %: % (%)', p.osm_type, p.osm_id, address, p.centroid;
+ ELSE
+ result.address := p.address;
+ -- See if we can inherit addtional address tags from an interpolation.
+ -- These will become permanent.
+ FOR location IN
+ SELECT (address - 'interpolation'::text - 'housenumber'::text) as address
+ FROM place, planet_osm_ways w
+ WHERE place.osm_type = 'W' and place.address ? 'interpolation'
+ and place.geometry && p.geometry
+ and place.osm_id = w.id
+ and p.osm_id = any(w.nodes)
+ LOOP
+ result.address := location.address || result.address;
+ END LOOP;
+ END IF;
+
+ 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
+ result.linked_place_id := location.place_id;
+
+ IF NOT location.name IS NULL THEN
+ result.name := location.name || result.name;
+ END IF;
END IF;
- address := address - '_unlisted_place'::TEXT;
- name := p.name;
+ RETURN result;
+END;
+$$
+LANGUAGE plpgsql STABLE;
- 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;
+
+CREATE OR REPLACE FUNCTION find_associated_street(poi_osm_type CHAR(1),
+ poi_osm_id BIGINT)
+ RETURNS BIGINT
+ AS $$
+DECLARE
+ location RECORD;
+ parent RECORD;
+BEGIN
+ FOR location IN
+ SELECT members FROM planet_osm_rels
+ WHERE parts @> ARRAY[poi_osm_id]
+ and members @> ARRAY[lower(poi_osm_type) || poi_osm_id]
+ and tags @> ARRAY['associatedStreet']
+ LOOP
+ FOR i IN 1..array_upper(location.members, 1) BY 2 LOOP
+ IF location.members[i+1] = 'street' THEN
+ FOR parent IN
+ SELECT place_id from placex
+ WHERE osm_type = 'W' and osm_id = substring(location.members[i],2)::bigint
+ and name is not null
+ and rank_search between 26 and 27
+ LOOP
+ RETURN parent.place_id;
+ END LOOP;
+ END IF;
+ END LOOP;
+ END LOOP;
+
+ RETURN NULL;
END;
$$
LANGUAGE plpgsql STABLE;
poi_osm_id BIGINT,
poi_partition SMALLINT,
bbox GEOMETRY,
- addr_street TEXT,
- addr_place TEXT,
- fallback BOOL = true)
+ token_info JSONB,
+ is_place_addr BOOLEAN)
RETURNS BIGINT
AS $$
DECLARE
parent_place_id BIGINT DEFAULT NULL;
location RECORD;
- parent RECORD;
BEGIN
- {% if debug %}RAISE WARNING 'finding street for % %', poi_osm_type, poi_osm_id;{% endif %}
+ {% if debug %}RAISE WARNING 'finding street for % %', poi_osm_type, poi_osm_id;{% endif %}
+
+ -- Is this object part of an associatedStreet relation?
+ parent_place_id := find_associated_street(poi_osm_type, poi_osm_id);
- -- Is this object part of an associatedStreet relation?
+ IF parent_place_id is null THEN
+ 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
FOR location IN
- SELECT members FROM planet_osm_rels
- WHERE parts @> ARRAY[poi_osm_id]
- and members @> ARRAY[lower(poi_osm_type) || poi_osm_id]
- and tags @> ARRAY['associatedStreet']
+ SELECT p.place_id, p.osm_id, p.rank_search, p.address,
+ coalesce(p.centroid, ST_Centroid(p.geometry)) as centroid
+ FROM placex p, planet_osm_ways w
+ WHERE p.osm_type = 'W' and p.rank_search >= 26
+ and p.geometry && bbox
+ and w.id = p.osm_id and poi_osm_id = any(w.nodes)
LOOP
- FOR i IN 1..array_upper(location.members, 1) BY 2 LOOP
- IF location.members[i+1] = 'street' THEN
- FOR parent IN
- SELECT place_id from placex
- WHERE osm_type = 'W' and osm_id = substring(location.members[i],2)::bigint
- and name is not null
- and rank_search between 26 and 27
- LOOP
- RETURN parent.place_id;
- END LOOP;
- END IF;
- END LOOP;
- END LOOP;
+ {% if debug %}RAISE WARNING 'Node is part of way % ', location.osm_id;{% endif %}
- parent_place_id := find_parent_for_address(addr_street, addr_place,
- poi_partition, bbox);
- IF parent_place_id is not null THEN
- RETURN parent_place_id;
- END IF;
+ -- Way IS a road then we are on it - that must be our road
+ IF location.rank_search < 28 THEN
+ {% if debug %}RAISE WARNING 'node in way that is a street %',location;{% endif %}
+ RETURN location.place_id;
+ END IF;
- IF poi_osm_type = 'N' THEN
- -- Is this node part of an interpolation?
- FOR parent IN
- SELECT q.parent_place_id
- FROM location_property_osmline q, planet_osm_ways x
- WHERE q.linegeo && bbox and x.id = q.osm_id
- and poi_osm_id = any(x.nodes)
- LIMIT 1
+ parent_place_id := find_associated_street('W', location.osm_id);
+ END LOOP;
+ END IF;
+
+ IF parent_place_id is NULL THEN
+ IF is_place_addr THEN
+ -- The address is attached to a place we don't know.
+ -- Instead simply use the containing area with the largest rank.
+ FOR location IN
+ SELECT place_id FROM placex
+ WHERE bbox && geometry AND _ST_Covers(geometry, ST_Centroid(bbox))
+ AND rank_address between 5 and 25
+ ORDER BY rank_address desc
LOOP
- {% if debug %}RAISE WARNING 'Get parent from interpolation: %', parent.parent_place_id;{% endif %}
- RETURN parent.parent_place_id;
+ RETURN location.place_id;
END LOOP;
-
- -- Is this node part of any other way?
+ ELSEIF ST_Area(bbox) < 0.005 THEN
+ -- for smaller features get the nearest road
+ SELECT getNearestRoadPlaceId(poi_partition, bbox) INTO parent_place_id;
+ {% if debug %}RAISE WARNING 'Checked for nearest way (%)', parent_place_id;{% endif %}
+ ELSE
+ -- for larger features simply find the area with the largest rank that
+ -- contains the bbox, only use addressable features
FOR location IN
- SELECT p.place_id, p.osm_id, p.rank_search, p.address,
- coalesce(p.centroid, ST_Centroid(p.geometry)) as centroid
- FROM placex p, planet_osm_ways w
- WHERE p.osm_type = 'W' and p.rank_search >= 26
- and p.geometry && bbox
- and w.id = p.osm_id and poi_osm_id = any(w.nodes)
+ SELECT place_id FROM placex
+ WHERE bbox && geometry AND _ST_Covers(geometry, ST_Centroid(bbox))
+ AND rank_address between 5 and 25
+ ORDER BY rank_address desc
LOOP
- {% if debug %}RAISE WARNING 'Node is part of way % ', location.osm_id;{% endif %}
-
- -- Way IS a road then we are on it - that must be our road
- IF location.rank_search < 28 THEN
- {% if debug %}RAISE WARNING 'node in way that is a street %',location;{% endif %}
- return location.place_id;
- END IF;
-
- SELECT find_parent_for_poi('W', location.osm_id, poi_partition,
- location.centroid,
- location.address->'street',
- location.address->'place',
- false)
- INTO parent_place_id;
- IF parent_place_id is not null THEN
- RETURN parent_place_id;
- END IF;
+ RETURN location.place_id;
END LOOP;
END IF;
+ END IF;
- IF fallback THEN
- IF addr_street is null and addr_place is not null THEN
- -- The address is attached to a place we don't know.
- -- Instead simply use the containing area with the largest rank.
- FOR location IN
- SELECT place_id FROM placex
- WHERE bbox && geometry AND _ST_Covers(geometry, ST_Centroid(bbox))
- AND rank_address between 5 and 25
- ORDER BY rank_address desc
- LOOP
- RETURN location.place_id;
- END LOOP;
- ELSEIF ST_Area(bbox) < 0.005 THEN
- -- for smaller features get the nearest road
- SELECT getNearestRoadPlaceId(poi_partition, bbox) INTO parent_place_id;
- {% if debug %}RAISE WARNING 'Checked for nearest way (%)', parent_place_id;{% endif %}
- ELSE
- -- for larger features simply find the area with the largest rank that
- -- contains the bbox, only use addressable features
- FOR location IN
- SELECT place_id FROM placex
- WHERE bbox && geometry AND _ST_Covers(geometry, ST_Centroid(bbox))
- AND rank_address between 5 and 25
- ORDER BY rank_address desc
- LOOP
- RETURN location.place_id;
- END LOOP;
- END IF;
- END IF;
-
- RETURN parent_place_id;
+ RETURN parent_place_id;
END;
$$
LANGUAGE plpgsql STABLE;
CREATE OR REPLACE FUNCTION create_poi_search_terms(obj_place_id BIGINT,
in_partition SMALLINT,
parent_place_id BIGINT,
- address HSTORE,
+ is_place_addr BOOLEAN,
country TEXT,
token_info JSONB,
geometry GEOMETRY,
hnr_vector INTEGER[];
addr_item RECORD;
+ addr_place RECORD;
parent_address_place_ids BIGINT[];
- filtered_address HSTORE;
BEGIN
nameaddress_vector := '{}'::INTEGER[];
FROM search_name s
WHERE s.place_id = parent_place_id;
- -- Find all address tags that don't appear in the parent search names.
- SELECT hstore(array_agg(ARRAY[k, v])) INTO filtered_address
- FROM (SELECT skeys(address) as k, svals(address) as v) a
- WHERE not addr_ids_from_name(v) && parent_address_vector
- AND k not in ('country', 'street', 'place', 'postcode',
- 'housenumber', 'streetnumber', 'conscriptionnumber');
-
- -- Compute all search terms from the addr: tags.
- IF filtered_address IS NOT NULL THEN
- FOR addr_item IN
- SELECT * FROM
- get_places_for_addr_tags(in_partition, geometry, filtered_address, country)
- LOOP
- IF addr_item.place_id is null THEN
- nameaddress_vector := array_merge(nameaddress_vector,
- addr_item.keywords);
- CONTINUE;
- END IF;
+ FOR addr_item IN
+ SELECT ranks.*, key,
+ token_get_address_search_tokens(token_info, key) as search_tokens
+ FROM token_get_address_keys(token_info) as key,
+ LATERAL get_addr_tag_rank(key, country) as ranks
+ 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, token_info, addr_item.key);
- IF parent_address_place_ids is null THEN
- SELECT array_agg(parent_place_id) INTO parent_address_place_ids
- FROM place_addressline
- WHERE place_id = parent_place_id;
- END IF;
+ IF addr_place is null THEN
+ -- No place found in OSM that matches. Make it at least searchable.
+ nameaddress_vector := array_merge(nameaddress_vector, addr_item.search_tokens);
+ ELSE
+ IF parent_address_place_ids is null THEN
+ SELECT array_agg(parent_place_id) INTO parent_address_place_ids
+ FROM place_addressline
+ WHERE place_id = parent_place_id;
+ END IF;
- IF not parent_address_place_ids @> ARRAY[addr_item.place_id] THEN
- nameaddress_vector := array_merge(nameaddress_vector,
- addr_item.keywords);
+ -- If the parent already lists the place in place_address line, then we
+ -- are done. Otherwise, add its own place_address line.
+ IF not parent_address_place_ids @> ARRAY[addr_place.place_id] THEN
+ nameaddress_vector := array_merge(nameaddress_vector, addr_place.keywords);
- INSERT INTO place_addressline (place_id, address_place_id, fromarea,
- isaddress, distance, cached_rank_address)
- VALUES (obj_place_id, addr_item.place_id, not addr_item.isguess,
- true, addr_item.distance, addr_item.rank_address);
- END IF;
- END LOOP;
- END IF;
+ INSERT INTO place_addressline (place_id, address_place_id, fromarea,
+ isaddress, distance, cached_rank_address)
+ VALUES (obj_place_id, addr_place.place_id, not addr_place.isguess,
+ true, addr_place.distance, addr_place.rank_address);
+ END IF;
+ END IF;
+ END LOOP;
name_vector := token_get_name_search_tokens(token_info);
name_vector := array_merge(name_vector, hnr_vector);
END IF;
- IF not address ? 'street' and address ? 'place' THEN
- addr_place_ids := addr_ids_from_name(address->'place');
+ 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,
- ARRAY[getorcreate_name_id(make_standard_name(address->'place'))]);
+ name_vector := array_merge(name_vector, addr_place_ids);
END IF;
END IF;
END IF;
CREATE OR REPLACE FUNCTION insert_addresslines(obj_place_id BIGINT,
partition SMALLINT,
maxrank SMALLINT,
- address HSTORE,
+ token_info JSONB,
geometry GEOMETRY,
country TEXT,
OUT parent_place_id BIGINT,
current_node_area GEOMETRY := NULL;
parent_place_rank INT := 0;
- addr_place_ids BIGINT[];
+ addr_place_ids BIGINT[] := '{}'::int[];
+ new_address_vector INT[];
location RECORD;
BEGIN
address_havelevel := array_fill(false, ARRAY[maxrank]);
FOR location IN
- SELECT * FROM get_places_for_addr_tags(partition, geometry,
- address, country)
- ORDER BY rank_address, distance, isguess desc
+ SELECT apl.*, key
+ FROM (SELECT extra.*, key
+ FROM token_get_address_keys(token_info) as key,
+ LATERAL get_addr_tag_rank(key, country) as extra) x,
+ LATERAL get_address_place(partition, geometry, from_rank, to_rank,
+ extent, token_info, key) as apl
+ ORDER BY rank_address, distance, isguess desc
LOOP
- {% if not db.reverse_only %}
+ IF location.place_id is null THEN
+ {% if not db.reverse_only %}
nameaddress_vector := array_merge(nameaddress_vector,
- location.keywords::int[]);
- {% endif %}
+ token_get_address_search_tokens(token_info,
+ location.key));
+ {% endif %}
+ ELSE
+ {% if not db.reverse_only %}
+ nameaddress_vector := array_merge(nameaddress_vector, location.keywords::INTEGER[]);
+ {% endif %}
- IF location.place_id is not null THEN
location_isaddress := not address_havelevel[location.rank_address];
IF not address_havelevel[location.rank_address] THEN
address_havelevel[location.rank_address] := true;
VALUES (obj_place_id, location.place_id, not location.isguess,
true, location.distance, location.rank_address);
- addr_place_ids := array_append(addr_place_ids, location.place_id);
+ addr_place_ids := addr_place_ids || location.place_id;
END IF;
END LOOP;
FOR location IN
SELECT * FROM getNearFeatures(partition, geometry, maxrank)
- WHERE addr_place_ids is null or not addr_place_ids @> ARRAY[place_id]
+ WHERE not addr_place_ids @> ARRAY[place_id]
ORDER BY rank_address, isguess asc,
distance *
CASE WHEN rank_address = 16 AND rank_search = 15 THEN 0.2
{% if not disable_diff_updates %}
-- The following is not needed until doing diff updates, and slows the main index process down
- IF NEW.osm_type = 'N' and NEW.rank_search > 28 THEN
- -- might be part of an interpolation
- result := osmline_reinsert(NEW.osm_id, NEW.geometry);
- ELSEIF NEW.rank_address > 0 THEN
+ IF NEW.rank_address > 0 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
-- roads may cause reparenting for >27 rank places
update placex set indexed_status = 2 where indexed_status = 0 and rank_search > NEW.rank_search and ST_DWithin(placex.geometry, NEW.geometry, diameter);
-- reparenting also for OSM Interpolation Lines (and for Tiger?)
- update location_property_osmline set indexed_status = 2 where indexed_status = 0 and ST_DWithin(location_property_osmline.linegeo, NEW.geometry, diameter);
+ update location_property_osmline set indexed_status = 2 where indexed_status = 0 and startnumber is not null and ST_DWithin(location_property_osmline.linegeo, NEW.geometry, diameter);
ELSEIF NEW.rank_search >= 16 THEN
-- up to rank 16, street-less addresses may need reparenting
update placex set indexed_status = 2 where indexed_status = 0 and rank_search > NEW.rank_search and ST_DWithin(placex.geometry, NEW.geometry, diameter) and (rank_search < 28 or name is not null or address ? 'place');
parent_address_level SMALLINT;
place_address_level SMALLINT;
- addr_street TEXT;
- addr_place TEXT;
-
max_rank SMALLINT;
name_vector INTEGER[];
nameaddress_vector INTEGER[];
addr_nameaddress_vector INTEGER[];
+ linked_place BIGINT;
+
linked_node_id BIGINT;
linked_importance FLOAT;
linked_wikipedia TEXT;
+ is_place_address BOOLEAN;
result BOOLEAN;
BEGIN
-- deferred delete
NEW.extratags := NEW.extratags - 'linked_place'::TEXT;
+ -- NEW.linked_place_id contains the precomputed linkee. Save this and restore
+ -- the previous link status.
+ linked_place := NEW.linked_place_id;
+ NEW.linked_place_id := OLD.linked_place_id;
+
IF NEW.linked_place_id is not null THEN
- {% if debug %}RAISE WARNING 'place already linked to %', NEW.linked_place_id;{% endif %}
+ NEW.token_info := null;
+ {% if debug %}RAISE WARNING 'place already linked to %', OLD.linked_place_id;{% endif %}
RETURN NEW;
END IF;
-- imported as place=postcode. That's why relations are allowed to pass here.
-- This can go away in a couple of versions.
IF NEW.class = 'place' and NEW.type = 'postcode' and NEW.osm_type != 'R' THEN
+ NEW.token_info := null;
RETURN NEW;
END IF;
- -- Speed up searches - just use the centroid of the feature
- -- cheaper but less acurate
+ -- Compute a preliminary centroid.
NEW.centroid := ST_PointOnSurface(NEW.geometry);
- {% if debug %}RAISE WARNING 'Computing preliminary centroid at %',ST_AsText(NEW.centroid);{% endif %}
+
+ -- 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,
+ -- so that we remain in the right partition if the boundaries
+ -- suddenly expand.
+ NEW.country_code := lower(NEW.address->'country');
+ NEW.partition := get_partition(lower(NEW.country_code));
+ IF NEW.partition = 0 THEN
+ NEW.country_code := lower(get_country_code(NEW.centroid));
+ NEW.partition := get_partition(NEW.country_code);
+ END IF;
+ ELSE
+ IF NEW.rank_search >= 4 THEN
+ NEW.country_code := lower(get_country_code(NEW.centroid));
+ ELSE
+ NEW.country_code := NULL;
+ END IF;
+ NEW.partition := get_partition(NEW.country_code);
+ END IF;
+ {% if debug %}RAISE WARNING 'Country updated: "%"', NEW.country_code;{% endif %}
+
-- recompute the ranks, they might change when linking changes
SELECT * INTO NEW.rank_search, NEW.rank_address
parent_address_level := 3;
END IF;
- {% if debug %}RAISE WARNING 'Copy over address tags';{% endif %}
- -- housenumber is a computed field, so start with an empty value
NEW.housenumber := token_normalized_housenumber(NEW.token_info);
- IF NEW.address is not NULL THEN
- addr_street := NEW.address->'street';
- addr_place := NEW.address->'place';
-
- IF NEW.address ? 'postcode' and NEW.address->'postcode' not similar to '%(:|,|;)%' THEN
- i := getorcreate_postcode_id(NEW.address->'postcode');
- END IF;
- END IF;
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,
- -- so that we remain in the right partition if the boundaries
- -- suddenly expand.
- NEW.country_code := lower(NEW.address->'country');
- NEW.partition := get_partition(lower(NEW.country_code));
- IF NEW.partition = 0 THEN
- NEW.country_code := lower(get_country_code(NEW.centroid));
- NEW.partition := get_partition(NEW.country_code);
- END IF;
- ELSE
- IF NEW.rank_search >= 4 THEN
- NEW.country_code := lower(get_country_code(NEW.centroid));
- ELSE
- NEW.country_code := NULL;
- END IF;
- NEW.partition := get_partition(NEW.country_code);
- END IF;
- {% if debug %}RAISE WARNING 'Country updated: "%"', NEW.country_code;{% endif %}
-
-- 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
FOR relation_members IN select members from planet_osm_rels r where r.id = NEW.osm_id and r.parts != array[]::bigint[]
{% 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);
-- We have to find our parent road.
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.
-- Otherwise fall back to the full address getting method below.
SELECT p.country_code, p.postcode, p.name FROM placex p
WHERE p.place_id = NEW.parent_place_id INTO location;
- IF addr_street is null and addr_place is not null THEN
+ IF is_place_address 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 = addr_place;
+ FROM svals(location.name) AS pname WHERE pname = NEW.address->'place';
IF i = 0 THEN
- NEW.address = NEW.address || hstore('_unlisted_place', addr_place);
+ NEW.address = NEW.address || hstore('_unlisted_place', NEW.address->'place');
END IF;
END IF;
{% if debug %}RAISE WARNING 'Got parent details from search name';{% endif %}
-- determine postcode
- IF NEW.address is not null AND NEW.address ? 'postcode' THEN
- NEW.postcode = upper(trim(NEW.address->'postcode'));
- ELSE
- NEW.postcode := location.postcode;
- END IF;
- IF NEW.postcode is null THEN
- NEW.postcode := get_nearest_postcode(NEW.country_code, NEW.geometry);
- END IF;
+ NEW.postcode := coalesce(token_normalized_postcode(NEW.address->'postcode'),
+ location.postcode,
+ get_nearest_postcode(NEW.country_code, NEW.centroid));
IF NEW.name is not NULL THEN
NEW.name := add_default_place_name(NEW.country_code, NEW.name);
SELECT * INTO name_vector, nameaddress_vector
FROM create_poi_search_terms(NEW.place_id,
NEW.partition, NEW.parent_place_id,
- NEW.address, NEW.country_code,
+ is_place_address, NEW.country_code,
NEW.token_info, NEW.centroid);
IF array_length(name_vector, 1) is not NULL THEN
-- ---------------------------------------------------------------------------
-- Full indexing
{% if debug %}RAISE WARNING 'Using full index mode for % %', NEW.osm_type, NEW.osm_id;{% endif %}
- SELECT * INTO location FROM find_linked_place(NEW);
- IF location.place_id is not null THEN
+ IF linked_place is not null THEN
+ SELECT * INTO location FROM placex WHERE place_id = linked_place;
+
{% if debug %}RAISE WARNING 'Linked %', location;{% endif %}
-- Use the linked point as the centre point of the geometry,
NEW.rank_address := location.rank_address;
END IF;
- -- merge in the label name
- IF NOT location.name IS NULL THEN
- NEW.name := location.name || NEW.name;
- END IF;
-
-- merge in extra tags
NEW.extratags := hstore('linked_' || location.class, location.type)
|| coalesce(location.extratags, ''::hstore)
END IF;
END IF;
- -- 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
- -- Update the list of country names. Adding an additional sanity
- -- check here: make sure the country does overlap with the area where
- -- we expect it to be as per static country grid.
+ -- Update the list of country names.
+ -- Only take the name from the largest area for the given country code
+ -- in the hope that this is the authoritive one.
+ -- Also replace any old names so that all mapping mistakes can
+ -- be fixed through regular OSM updates.
FOR location IN
- SELECT country_code FROM country_osm_grid
- WHERE ST_Covers(geometry, NEW.centroid) and country_code = NEW.country_code
+ SELECT osm_id FROM placex
+ WHERE rank_search = 4 and osm_type = 'R'
+ and country_code = NEW.country_code
+ ORDER BY ST_Area(geometry) desc
LIMIT 1
LOOP
- {% if debug %}RAISE WARNING 'Updating names for country '%' with: %', NEW.country_code, NEW.name;{% endif %}
- UPDATE country_name SET name = name || NEW.name WHERE country_code = NEW.country_code;
+ IF location.osm_id = NEW.osm_id THEN
+ {% if debug %}RAISE WARNING 'Updating names for country '%' with: %', NEW.country_code, NEW.name;{% endif %}
+ UPDATE country_name SET derived_name = NEW.name WHERE country_code = NEW.country_code;
+ END IF;
END LOOP;
END IF;
ELSEIF NEW.rank_address > 25 THEN
max_rank := 25;
ELSE
- max_rank = NEW.rank_address;
+ max_rank := NEW.rank_address;
END IF;
SELECT * FROM insert_addresslines(NEW.place_id, NEW.partition, max_rank,
- NEW.address, geom, NEW.country_code)
+ NEW.token_info, geom, NEW.country_code)
INTO NEW.parent_place_id, NEW.postcode, nameaddress_vector;
{% if debug %}RAISE WARNING 'RETURN insert_addresslines: %, %, %', NEW.parent_place_id, NEW.postcode, nameaddress_vector;{% endif %}
- IF NEW.address is not null AND NEW.address ? 'postcode'
- AND NEW.address->'postcode' not similar to '%(,|;)%' THEN
- NEW.postcode := upper(trim(NEW.address->'postcode'));
- END IF;
-
- IF NEW.postcode is null AND NEW.rank_search > 8 THEN
- NEW.postcode := get_nearest_postcode(NEW.country_code, NEW.geometry);
- END IF;
+ NEW.postcode := coalesce(token_normalized_postcode(NEW.address->'postcode'),
+ NEW.postcode);
-- if we have a name add this to the name search table
IF NEW.name IS NOT NULL THEN
IF NEW.rank_search <= 25 and NEW.rank_address > 0 THEN
result := add_location(NEW.place_id, NEW.country_code, NEW.partition,
name_vector, NEW.rank_search, NEW.rank_address,
- upper(trim(NEW.address->'postcode')), NEW.geometry, NEW.centroid);
+ NEW.postcode, NEW.geometry, NEW.centroid);
{% if debug %}RAISE WARNING 'added to location (full)';{% endif %}
END IF;
{% if debug %}RAISE WARNING 'insert into road location table (full)';{% endif %}
END IF;
- result := insertSearchName(NEW.partition, NEW.place_id,
- token_get_name_match_tokens(NEW.token_info),
- NEW.rank_search, NEW.rank_address, NEW.geometry);
+ IF NEW.rank_address between 16 and 27 THEN
+ result := insertSearchName(NEW.partition, NEW.place_id,
+ token_get_name_match_tokens(NEW.token_info),
+ NEW.rank_search, NEW.rank_address, NEW.geometry);
+ END IF;
{% if debug %}RAISE WARNING 'added to search name (full)';{% endif %}
{% if not db.reverse_only %}
NEW.importance, NEW.country_code, name_vector,
nameaddress_vector, NEW.centroid);
{% endif %}
+ END IF;
+ IF NEW.postcode is null AND NEW.rank_search > 8 THEN
+ NEW.postcode := get_nearest_postcode(NEW.country_code, NEW.geometry);
END IF;
{% if debug %}RAISE WARNING 'place update % % finsihed.', NEW.osm_type, NEW.osm_id;{% endif %}
projects / nominatim.git / blobdiff