Allow for reverse geocode returning no results

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 7eab3678563464042c986f42c2d3e5990dc38519..e5f3a1572832a3ed148dfca4704ac4e7c6f55543 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -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))."]";
 
                        // Get the details for display (is this a redundant extra step?)
                        $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$this->aLangPrefOrder))."]";
 
                        // 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
                                $aSearches = array(
                        {
                                // Start with a blank search
                                $aSearches = array(


@@ -1341,7 +1343,10 @@
                        {
                                // Just interpret as a reverse geocode
                                $iPlaceID = geocodeReverse((float)$this->aNearPoint[0], (float)$this->aNearPoint[1]);
                        {
                                // Just interpret as a reverse geocode
                                $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