remove duplicate reverse geocoding code

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 876a40b585692e9017f9cba2762d87ec97287575..2d246d98ae16b8209596de6ed470e88a95890c99 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1,5 +1,6 @@
 <?php
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
+       require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
 
        class Geocode
        {
@@ -1307,6 +1308,12 @@
                                                                }
                                                        }
                                                }
+                                               // If a coordinate is given, the search must either
+                                               // be for a name or a special search. Ignore everythin else.
+                                               else if ($aSearch['fLon'] && !sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['sClass'])
+                                               {
+                                                       $aPlaceIDs = array();
+                                               }
                                                else
                                                {
                                                        $aPlaceIDs = array();
@@ -1690,9 +1697,16 @@
                        else
                        {
                                // Just interpret as a reverse geocode
-                               $iPlaceID = geocodeReverse((float)$this->aNearPoint[0], (float)$this->aNearPoint[1]);
-                               if ($iPlaceID)
-                                       $aSearchResults = $this->getDetails(array($iPlaceID));
+                               $oReverse = new ReverseGeocode($this->oDB);
+                               $oReverse->setLatLon((float)$this->aNearPoint[0], (float)$this->aNearPoint[1]);
+                               $oReverse->setZoom(18);
+
+                               $aLookup = $oReverse->lookup(false);
+
+                               if (CONST_Debug) var_dump("Reverse search", $aLookup);
+
+                               if ($aLookup['place_id'])
+                                       $aSearchResults = $this->getDetails(array($aLookup['place_id'] => -1));
                                else
                                        $aSearchResults = array();
                        }