hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

use real centroid when looking for near roads

Browse Source 
The point-on-surface may be at the corner in large objects, so
that roads are too far away.

Fixes #1389.
This commit is contained in:
Sarah Hoffmann
2019-06-10 18:23:12 +02:00
parent 2c21cbb5e6
commit e05e413cc4
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/functions.sql
View File

@@ -1162,6 +1162,7 @@ TRIGGER
DECLARE DECLARE
place_centroid GEOMETRY; place_centroid GEOMETRY;
near_centroid GEOMETRY;
search_maxdistance FLOAT[]; search_maxdistance FLOAT[];
search_mindistance FLOAT[]; search_mindistance FLOAT[];
@@ -1266,6 +1267,8 @@ 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); place_centroid := ST_PointOnSurface(NEW.geometry);
-- For searching near features rather use the centroid
near_centroid := ST_Centroid(NEW.geometry);
NEW.centroid := null; 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(place_centroid);
@@ -1396,7 +1399,7 @@ BEGIN
IF NEW.parent_place_id IS NULL AND addr_street IS NOT NULL THEN IF NEW.parent_place_id IS NULL AND addr_street IS NOT NULL THEN
address_street_word_ids := get_name_ids(make_standard_name(addr_street)); address_street_word_ids := get_name_ids(make_standard_name(addr_street));
IF address_street_word_ids IS NOT NULL THEN IF address_street_word_ids IS NOT NULL THEN
SELECT place_id from getNearestNamedRoadFeature(NEW.partition, place_centroid, address_street_word_ids) INTO NEW.parent_place_id; SELECT place_id from getNearestNamedRoadFeature(NEW.partition, near_centroid, address_street_word_ids) INTO NEW.parent_place_id;
END IF; END IF;
END IF; END IF;
--DEBUG: RAISE WARNING 'Checked for addr:street (%)', NEW.parent_place_id; --DEBUG: RAISE WARNING 'Checked for addr:street (%)', NEW.parent_place_id;
@@ -1404,7 +1407,7 @@ BEGIN
IF NEW.parent_place_id IS NULL AND addr_place IS NOT NULL THEN IF NEW.parent_place_id IS NULL AND addr_place IS NOT NULL THEN
address_street_word_ids := get_name_ids(make_standard_name(addr_place)); address_street_word_ids := get_name_ids(make_standard_name(addr_place));
IF address_street_word_ids IS NOT NULL THEN IF address_street_word_ids IS NOT NULL THEN
SELECT place_id from getNearestNamedPlaceFeature(NEW.partition, place_centroid, address_street_word_ids) INTO NEW.parent_place_id; SELECT place_id from getNearestNamedPlaceFeature(NEW.partition, near_centroid, address_street_word_ids) INTO NEW.parent_place_id;
END IF; END IF;
END IF; END IF;
--DEBUG: RAISE WARNING 'Checked for addr:place (%)', NEW.parent_place_id; --DEBUG: RAISE WARNING 'Checked for addr:place (%)', NEW.parent_place_id;
@@ -1439,7 +1442,7 @@ BEGIN
IF location.address ? 'street' THEN IF location.address ? 'street' THEN
address_street_word_ids := get_name_ids(make_standard_name(location.address->'street')); address_street_word_ids := get_name_ids(make_standard_name(location.address->'street'));
IF address_street_word_ids IS NOT NULL THEN IF address_street_word_ids IS NOT NULL THEN
SELECT place_id from getNearestNamedRoadFeature(NEW.partition, place_centroid, address_street_word_ids) INTO NEW.parent_place_id; SELECT place_id from getNearestNamedRoadFeature(NEW.partition, near_centroid, address_street_word_ids) INTO NEW.parent_place_id;
EXIT WHEN NEW.parent_place_id is not NULL; EXIT WHEN NEW.parent_place_id is not NULL;
END IF; END IF;
END IF; END IF;
@@ -1448,7 +1451,7 @@ BEGIN
IF location.address ? 'place' THEN IF location.address ? 'place' THEN
address_street_word_ids := get_name_ids(make_standard_name(location.address->'place')); address_street_word_ids := get_name_ids(make_standard_name(location.address->'place'));
IF address_street_word_ids IS NOT NULL THEN IF address_street_word_ids IS NOT NULL THEN
SELECT place_id from getNearestNamedPlaceFeature(NEW.partition, place_centroid, address_street_word_ids) INTO NEW.parent_place_id; SELECT place_id from getNearestNamedPlaceFeature(NEW.partition, near_centroid, address_street_word_ids) INTO NEW.parent_place_id;
EXIT WHEN NEW.parent_place_id is not NULL; EXIT WHEN NEW.parent_place_id is not NULL;
END IF; END IF;
END IF; END IF;
@@ -1477,7 +1480,7 @@ BEGIN
-- Still nothing, just use the nearest road -- Still nothing, just use the nearest road
IF NEW.parent_place_id IS NULL THEN IF NEW.parent_place_id IS NULL THEN
SELECT place_id FROM getNearestRoadFeature(NEW.partition, place_centroid) INTO NEW.parent_place_id; SELECT place_id FROM getNearestRoadFeature(NEW.partition, near_centroid) INTO NEW.parent_place_id;
END IF; END IF;
--DEBUG: RAISE WARNING 'Checked for nearest way (%)', NEW.parent_place_id; --DEBUG: RAISE WARNING 'Checked for nearest way (%)', NEW.parent_place_id;
@@ -1500,7 +1503,7 @@ BEGIN
NEW.postcode := location.postcode; NEW.postcode := location.postcode;
END IF; END IF;
IF NEW.postcode is null THEN IF NEW.postcode is null THEN
NEW.postcode := get_nearest_postcode(NEW.country_code, place_centroid); NEW.postcode := get_nearest_postcode(NEW.country_code, near_centroid);
END IF; END IF;
END IF; END IF;
@@ -1770,7 +1773,7 @@ BEGIN
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 near_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