country_code TEXT,
class TEXT,
type TEXT,
- linked_place_id BIGINT
+ linked_place_id BIGINT,
+ centroid_x float,
+ centroid_y float
);
-- Retrieve the data needed by the indexer for updating the place.
result prepare_update_info;
extra_names HSTORE;
BEGIN
+ IF not p.address ? '_inherited' THEN
+ result.address := p.address;
+ END IF;
+
-- For POI nodes, check if the address should be derived from a surrounding
-- building.
- 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 result.address
- FROM placex
- WHERE ST_Covers(geometry, p.centroid)
- and geometry && p.centroid
- and placex.address is not null
- 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;
- 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;
+ IF p.rank_search = 30 AND p.osm_type = 'N' THEN
+ IF p.address is null THEN
+ -- The additional && condition works around the misguided query
+ -- planner of postgis 3.0.
+ SELECT placex.address || hstore('_inherited', '') INTO result.address
+ FROM placex
+ WHERE ST_Covers(geometry, p.centroid)
+ and geometry && p.centroid
+ and placex.address is not null
+ 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;
+ ELSE
+ -- See if we can inherit additional 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;
END IF;
-- remove internal and derived names
result.type := p.type;
result.country_code := p.country_code;
result.rank_address := p.rank_address;
+ result.centroid_x := ST_X(p.centroid);
+ result.centroid_y := ST_Y(p.centroid);
-- Names of linked places need to be merged in, so search for a linkable
-- place already here.
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
+ WHERE osm_type = upper(substring(location.members[i], 1, 1))::char(1)
+ and osm_id = substring(location.members[i], 2)::bigint
and name is not null
and rank_search between 26 and 27
LOOP
SELECT place_id FROM placex
WHERE bbox && geometry AND _ST_Covers(geometry, ST_Centroid(bbox))
AND rank_address between 5 and 25
+ AND ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon')
ORDER BY rank_address desc
LOOP
RETURN location.place_id;
SELECT place_id FROM placex
WHERE bbox && geometry AND _ST_Covers(geometry, ST_Centroid(bbox))
AND rank_address between 5 and 25
+ AND ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon')
ORDER BY rank_address desc
LOOP
RETURN location.place_id;
-- 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
+ IF bnd.extratags ? 'place' and bnd.extratags->'place' != 'postcode'
+ and bnd_name is not null
+ THEN
FOR linked_placex IN
SELECT * FROM placex
WHERE (position(lower(name->'name') in bnd_name) > 0
OR position(bnd_name in lower(name->'name')) > 0)
AND placex.class = 'place' AND placex.type = bnd.extratags->'place'
AND placex.osm_type = 'N'
- AND placex.linked_place_id is null
+ AND (placex.linked_place_id is null or placex.linked_place_id = bnd.place_id)
AND placex.rank_search < 26 -- needed to select the right index
- AND placex.type != 'postcode'
AND ST_Covers(bnd.geometry, placex.geometry)
LOOP
{% if debug %}RAISE WARNING 'Found type-matching place node %', linked_placex.osm_id;{% endif %}
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.linked_place_id is null
+ AND (placex.linked_place_id is null or placex.linked_place_id = bnd.place_id)
AND placex.rank_search < 26
AND _st_covers(bnd.geometry, placex.geometry)
ORDER BY lower(name->'name') = bnd_name desc
OR (bnd.rank_address = 0 and placex.rank_search = bnd.rank_search))
AND placex.osm_type = 'N'
AND placex.class = 'place'
- AND placex.linked_place_id is null
+ AND (placex.linked_place_id is null or placex.linked_place_id = bnd.place_id)
AND placex.rank_search < 26 -- needed to select the right index
AND placex.type != 'postcode'
AND ST_Covers(bnd.geometry, placex.geometry)
DELETE FROM place_addressline WHERE place_id = NEW.place_id;
result := deleteRoad(NEW.partition, NEW.place_id);
result := deleteLocationArea(NEW.partition, NEW.place_id, NEW.rank_search);
- UPDATE placex set linked_place_id = null, indexed_status = 2
- where linked_place_id = NEW.place_id;
- -- update not necessary for osmline, cause linked_place_id does not exist
NEW.extratags := NEW.extratags - 'linked_place'::TEXT;
linked_place := NEW.linked_place_id;
NEW.linked_place_id := OLD.linked_place_id;
- IF NEW.linked_place_id is not null THEN
- NEW.token_info := null;
- {% if debug %}RAISE WARNING 'place already linked to %', OLD.linked_place_id;{% endif %}
- RETURN NEW;
- END IF;
+ -- Remove linkage, if we have computed a different new linkee.
+ UPDATE placex SET linked_place_id = null, indexed_status = 2
+ WHERE linked_place_id = NEW.place_id
+ and (linked_place is null or linked_place_id != linked_place);
+ -- update not necessary for osmline, cause linked_place_id does not exist
-- Postcodes are just here to compute the centroids. They are not searchable
-- unless they are a boundary=postal_code.
NEW.class, NEW.type, NEW.admin_level,
(NEW.extratags->'capital') = 'yes',
NEW.address->'postcode');
+
+ -- Short-cut out for linked places. Note that this must happen after the
+ -- address rank has been recomputed. The linking might nullify a shift in
+ -- address rank.
+ IF NEW.linked_place_id is not null THEN
+ NEW.token_info := null;
+ {% if debug %}RAISE WARNING 'place already linked to %', OLD.linked_place_id;{% endif %}
+ RETURN NEW;
+ END IF;
+
-- We must always increase the address level relative to the admin boundary.
IF NEW.class = 'boundary' and NEW.type = 'administrative'
and NEW.osm_type = 'R' and NEW.rank_address > 0
FROM placex
WHERE osm_type = 'R' and class = 'boundary' and type = 'administrative'
and admin_level < NEW.admin_level and admin_level > 3
- and rank_address > 0
+ and rank_address between 1 and 25 -- for index selection
+ and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') -- for index selection
and geometry && NEW.centroid and _ST_Covers(geometry, NEW.centroid)
ORDER BY admin_level desc LIMIT 1
LOOP
IF NEW.rank_address > 9 THEN
-- Second check that the boundary is not completely contained in a
- -- place area with a higher address rank
+ -- place area with a equal or higher address rank.
FOR location IN
- SELECT rank_address FROM placex
- WHERE class = 'place' and rank_address < 24
- and rank_address > NEW.rank_address
+ SELECT rank_address
+ FROM placex,
+ LATERAL compute_place_rank(country_code, 'A', class, type,
+ admin_level, False, null) prank
+ WHERE class = 'place' and rank_address between 1 and 23
+ and prank.address_rank >= NEW.rank_address
+ and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') -- select right index
and geometry && NEW.geometry
and geometry ~ NEW.geometry -- needed because ST_Relate does not do bbox cover test
and ST_Relate(geometry, NEW.geometry, 'T*T***FF*') -- contains but not equal
- ORDER BY rank_address desc LIMIT 1
+ ORDER BY prank.address_rank desc LIMIT 1
LOOP
NEW.rank_address := location.rank_address + 2;
END LOOP;
END IF;
+ ELSEIF NEW.class = 'place'
+ and ST_GeometryType(NEW.geometry) in ('ST_Polygon', 'ST_MultiPolygon')
+ and NEW.rank_address between 16 and 23
+ THEN
+ -- For place areas make sure they are not completely contained in an area
+ -- with a equal or higher address rank.
+ FOR location IN
+ SELECT rank_address
+ FROM placex,
+ LATERAL compute_place_rank(country_code, 'A', class, type,
+ admin_level, False, null) prank
+ WHERE prank.address_rank < 24
+ and rank_address between 1 and 25 -- select right index
+ and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') -- select right index
+ and prank.address_rank >= NEW.rank_address
+ and geometry && NEW.geometry
+ and geometry ~ NEW.geometry -- needed because ST_Relate does not do bbox cover test
+ and ST_Relate(geometry, NEW.geometry, 'T*T***FF*') -- contains but not equal
+ ORDER BY prank.address_rank desc LIMIT 1
+ LOOP
+ NEW.rank_address := location.rank_address + 2;
+ END LOOP;
ELSEIF NEW.class = 'place' and NEW.osm_type = 'N'
- and NEW.rank_address between 16 and 23
+ and NEW.rank_address between 16 and 23
THEN
- -- If a place node is contained in a admin boundary with the same address level
- -- and has not been linked, then make the node a subpart by increasing the
- -- address rank (city level and above).
+ -- If a place node is contained in an admin or place boundary with the same
+ -- address level and has not been linked, then make the node a subpart
+ -- by increasing the address rank (city level and above).
FOR location IN
- SELECT rank_address FROM placex
- WHERE osm_type = 'R' and class = 'boundary' and type = 'administrative'
- and rank_address = NEW.rank_address
+ SELECT rank_address
+ FROM placex,
+ LATERAL compute_place_rank(country_code, 'A', class, type,
+ admin_level, False, null) prank
+ WHERE osm_type = 'R'
+ and rank_address between 1 and 25 -- select right index
+ and ST_GeometryType(geometry) in ('ST_Polygon','ST_MultiPolygon') -- select right index
+ and ((class = 'place' and prank.address_rank = NEW.rank_address)
+ or (class = 'boundary' and rank_address = NEW.rank_address))
and geometry && NEW.centroid and _ST_Covers(geometry, NEW.centroid)
LIMIT 1
LOOP
NEW.importance := null;
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.rank_search, NEW.centroid)
INTO NEW.wikipedia,NEW.importance;
{% if debug %}RAISE WARNING 'Importance computed from wikipedia: %', NEW.importance;{% endif %}
{% if debug %}RAISE WARNING 'Got parent details from search name';{% endif %}
-- determine postcode
- NEW.postcode := coalesce(token_normalized_postcode(NEW.address->'postcode'),
+ NEW.postcode := coalesce(token_get_postcode(NEW.token_info),
location.postcode,
get_nearest_postcode(NEW.country_code, NEW.centroid));
{% endif %}
NEW.token_info := token_strip_info(NEW.token_info);
- -- If the address was inherited from a surrounding building,
- -- do not add it permanently to the table.
- IF NEW.address ? '_inherited' THEN
- IF NEW.address ? '_unlisted_place' THEN
- NEW.address := hstore('_unlisted_place', NEW.address->'_unlisted_place');
- ELSE
- NEW.address := null;
- END IF;
- END IF;
RETURN NEW;
END IF;
-- Full indexing
{% if debug %}RAISE WARNING 'Using full index mode for % %', NEW.osm_type, NEW.osm_id;{% endif %}
IF linked_place is not null THEN
- SELECT * INTO location FROM placex WHERE place_id = linked_place;
+ -- Recompute the ranks here as the ones from the linked place might
+ -- have been shifted to accommodate surrounding boundaries.
+ SELECT place_id, osm_id, class, type, extratags, rank_search,
+ centroid, geometry,
+ (compute_place_rank(country_code, osm_type, class, type, admin_level,
+ (extratags->'capital') = 'yes', null)).*
+ INTO location
+ FROM placex WHERE place_id = linked_place;
{% if debug %}RAISE WARNING 'Linked %', location;{% endif %}
NEW.centroid := geom;
END IF;
- {% if debug %}RAISE WARNING 'parent address: % rank address: %', parent_address_level, location.rank_address;{% endif %}
- IF location.rank_address > parent_address_level
- and location.rank_address < 26
+ {% if debug %}RAISE WARNING 'parent address: % rank address: %', parent_address_level, location.address_rank;{% endif %}
+ IF location.address_rank > parent_address_level
+ and location.address_rank < 26
THEN
- NEW.rank_address := location.rank_address;
+ NEW.rank_address := location.address_rank;
END IF;
-- merge in extra tags
|| coalesce(NEW.extratags, ''::hstore);
-- mark the linked place (excludes from search results)
- UPDATE placex set linked_place_id = NEW.place_id
+ -- Force reindexing to remove any traces from the search indexes and
+ -- reset the address rank if necessary.
+ UPDATE placex set linked_place_id = NEW.place_id, indexed_status = 2
WHERE place_id = location.place_id;
-- ensure that those places are not found anymore
{% if 'search_name' in db.tables %}
SELECT wikipedia, importance
FROM compute_importance(location.extratags, NEW.country_code,
- 'N', location.osm_id)
+ location.rank_search, NEW.centroid)
INTO linked_wikipedia,linked_importance;
-- Use the maximum importance if one could be computed from the linked object.
END IF;
END IF;
+ {% if not disable_diff_updates %}
+ IF OLD.rank_address != NEW.rank_address THEN
+ -- After a rank shift all addresses containing us must be updated.
+ UPDATE placex p SET indexed_status = 2 FROM place_addressline pa
+ WHERE pa.address_place_id = NEW.place_id and p.place_id = pa.place_id
+ and p.indexed_status = 0 and p.rank_address between 4 and 25;
+ END IF;
+ {% endif %}
+
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.
-- Only take the name from the largest area for the given country code
- -- in the hope that this is the authoritive one.
+ -- in the hope that this is the authoritative one.
-- Also replace any old names so that all mapping mistakes can
-- be fixed through regular OSM updates.
FOR location IN
{% if debug %}RAISE WARNING 'RETURN insert_addresslines: %, %, %', NEW.parent_place_id, NEW.postcode, nameaddress_vector;{% endif %}
- NEW.postcode := coalesce(token_normalized_postcode(NEW.address->'postcode'),
- NEW.postcode);
+ NEW.postcode := coalesce(token_get_postcode(NEW.token_info), NEW.postcode);
-- if we have a name add this to the name search table
IF NEW.name IS NOT NULL 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 %}
+ {% if debug %}RAISE WARNING 'place update % % finished.', NEW.osm_type, NEW.osm_id;{% endif %}
NEW.token_info := token_strip_info(NEW.token_info);
RETURN NEW;
projects / nominatim.git / blobdiff