hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

output linked place into address details

Browse Source
This commit is contained in:
Sarah Hoffmann
2020-02-28 22:07:06 +01:00
parent acd8ca2ebd
commit 55fdf0abda
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/PlaceLookup.php
View File

@@ -215,7 +215,7 @@ class PlaceLookup
'ST_Collect(centroid)', 'ST_Collect(centroid)',
'min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END)' 'min(CASE WHEN placex.rank_search < 28 THEN placex.place_id ELSE placex.parent_place_id END)'
); );
$sSQL .= " (extratags->'place') AS extra_place "; $sSQL .= " COALESCE(extratags->'place', extratags->'linked_place') AS extra_place ";
$sSQL .= ' FROM placex'; $sSQL .= ' FROM placex';
$sSQL .= " WHERE place_id in ($sPlaceIDs) "; $sSQL .= " WHERE place_id in ($sPlaceIDs) ";
$sSQL .= ' AND ('; $sSQL .= ' AND (';

3
sql/partition-functions.src.sql
View File

@@ -20,7 +20,8 @@ BEGIN
FOR r IN FOR r IN
SELECT place_id, keywords, rank_address, rank_search, min(ST_Distance(feature, centroid)) as distance, isguess, postcode, centroid SELECT place_id, keywords, rank_address, rank_search, min(ST_Distance(feature, centroid)) as distance, isguess, postcode, centroid
FROM location_area_large_-partition- FROM location_area_large_-partition-
WHERE ST_Intersects(geometry, feature) and rank_search < maxrank WHERE ST_Intersects(geometry, feature)
AND rank_search < maxrank AND rank_address < maxrank
GROUP BY place_id, keywords, rank_address, rank_search, isguess, postcode, centroid GROUP BY place_id, keywords, rank_address, rank_search, isguess, postcode, centroid
ORDER BY rank_address, isin_tokens && keywords desc, isguess asc, ORDER BY rank_address, isin_tokens && keywords desc, isguess asc,
ST_Distance(feature, centroid) * ST_Distance(feature, centroid) *