safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

use the linked_place_id for adress search if a place node is found with a linked_place_id

Browse Source
This commit is contained in:
gemo1011
2018-04-20 14:35:24 +02:00
parent d0741f21b1
commit 237e31b3ce
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/ReverseGeocode.php
View File

@@ -89,7 +89,7 @@ class ReverseGeocode
$iRankSearch = $aPoly['rank_search']; $iRankSearch = $aPoly['rank_search'];
$iGeometry = $aPoly['geometry']; $iGeometry = $aPoly['geometry'];
$sSQL = 'select place_id,parent_place_id,rank_search,country_code,'; $sSQL = 'select place_id,parent_place_id,rank_search,country_code, linked_place_id,';
$sSQL .=' ST_distance('.$sPointSQL.', geometry) as distance'; $sSQL .=' ST_distance('.$sPointSQL.', geometry) as distance';
$sSQL .= ' FROM placex'; $sSQL .= ' FROM placex';
$sSQL .= ' WHERE osm_type = \'N\''; $sSQL .= ' WHERE osm_type = \'N\'';
@@ -194,17 +194,26 @@ class ReverseGeocode
}else{ }else{
$aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
if ($aPlace) { if ($aPlace) {
$oResult = new Result($aPlace['place_id']); // if place node is found adress goes over linked_place_id
if (!empty($aPlace['linked_place_id'])) {
$oResult = new Result($aPlace['linked_place_id']);
}else{
$oResult = new Result($aPlace['place_id']);
}
} }
} }
// lower than street level ($iMaxRank < 26 ) // lower than street level ($iMaxRank < 26 )
}else{ }else{
$aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank); $aPlace = $this->lookupPolygon($sPointSQL, $iMaxRank);
if ($aPlace) { if ($aPlace) {
$oResult = new Result($aPlace['place_id']); // if place node is found adress goes over linked_place_id
if (!empty($aPlace['linked_place_id'])) {
$oResult = new Result($aPlace['linked_place_id']);
}else{
$oResult = new Result($aPlace['place_id']);
}
}
} }
}
return $oResult; return $oResult;
} }