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

ignore linked places for reverse geocoding

Browse Source 
Fixes #838.
This commit is contained in:
Sarah Hoffmann
2017-10-27 20:06:53 +02:00
parent 6a3c6c43ea
commit f7258e314d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ReverseGeocode.php
View File

@@ -134,7 +134,7 @@ class ReverseGeocode
$sSQL .= ' rank_search != 28 and rank_search >= '.$iMaxRank; $sSQL .= ' rank_search != 28 and rank_search >= '.$iMaxRank;
$sSQL .= ' and (name is not null or housenumber is not null)'; $sSQL .= ' and (name is not null or housenumber is not null)';
$sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')'; $sSQL .= ' and class not in (\'waterway\',\'railway\',\'tunnel\',\'bridge\',\'man_made\')';
$sSQL .= ' and indexed_status = 0 '; $sSQL .= ' and indexed_status = 0 and linked_place_id is null';
$sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') '; $sSQL .= ' and (ST_GeometryType(geometry) not in (\'ST_Polygon\',\'ST_MultiPolygon\') ';
$sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))'; $sSQL .= ' OR ST_DWithin('.$sPointSQL.', centroid, '.$fSearchDiam.'))';
$sSQL .= ' ORDER BY distance ASC limit 1'; $sSQL .= ' ORDER BY distance ASC limit 1';
@@ -205,9 +205,9 @@ class ReverseGeocode
} else { } else {
$iPlaceID = $oResult->iId; $iPlaceID = $oResult->iId;
} }
$sSQL = 'select address_place_id'; $sSQL = 'select coalesce(p.linked_place_id, a.address_place_id)';
$sSQL .= ' FROM place_addressline'; $sSQL .= ' FROM place_addressline a, placex p';
$sSQL .= " WHERE place_id = $iPlaceID"; $sSQL .= " WHERE a.place_id = $iPlaceID and a.place_id = p.place_id";
$sSQL .= " ORDER BY abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc"; $sSQL .= " ORDER BY abs(cached_rank_address - $iMaxRank) asc,cached_rank_address desc,isaddress desc,distance desc";
$sSQL .= ' LIMIT 1'; $sSQL .= ' LIMIT 1';
$iPlaceID = chksql($this->oDB->getOne($sSQL), 'Could not get parent for place.'); $iPlaceID = chksql($this->oDB->getOne($sSQL), 'Could not get parent for place.');