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

Allow for reverse geocode returning no results

Browse Source
This commit is contained in:
Brian Quinion
2013-08-30 13:13:21 +01:00
parent cdd129de70
commit 5f941407b3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Geocode.php
View File

@@ -218,6 +218,8 @@
function getDetails($aPlaceIDs, $iMinAddressRank = 0, $iMaxAddressRank = 30, $aAddressRankList = false, $sAllowedTypesSQLList = false, $bDeDupe = false) function getDetails($aPlaceIDs, $iMinAddressRank = 0, $iMaxAddressRank = 30, $aAddressRankList = false, $sAllowedTypesSQLList = false, $bDeDupe = false)
{ {
if (sizeof($aPlaceIDs) == 0) return array();
$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]"; $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
// Get the details for display (is this a redundant extra step?) // Get the details for display (is this a redundant extra step?)
@@ -391,7 +393,7 @@
} }
$aSearchResults = array(); $aSearchResults = array();
if ($sQuery || $aStructuredQuery) if ($sQuery || $this->aStructuredQuery)
{ {
// Start with a blank search // Start with a blank search
$aSearches = array( $aSearches = array(
@@ -1341,7 +1343,10 @@
{ {
// Just interpret as a reverse geocode // Just interpret as a reverse geocode
$iPlaceID = geocodeReverse((float)$this->aNearPoint[0], (float)$this->aNearPoint[1]); $iPlaceID = geocodeReverse((float)$this->aNearPoint[0], (float)$this->aNearPoint[1]);
$aSearchResults = $this->getDetails(array($iPlaceID)); if ($iPlaceID)
$aSearchResults = $this->getDetails(array($iPlaceID));
else
$aSearchResults = array();
} }
// No results? Done // No results? Done