cleanup interface of PlaceLookup

[nominatim.git] / lib / Geocode.php

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 2d246d98ae16b8209596de6ed470e88a95890c99..3d1e82d33d6ff3084215420223bc0e6b92e3d921 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -1698,10 +1698,11 @@
                        {
                                // Just interpret as a reverse geocode
                                $oReverse = new ReverseGeocode($this->oDB);
-                               $oReverse->setLatLon((float)$this->aNearPoint[0], (float)$this->aNearPoint[1]);
                                $oReverse->setZoom(18);
 
-                               $aLookup = $oReverse->lookup(false);
+                               $aLookup = $oReverse->lookup((float)$this->aNearPoint[0],
+                                                            (float)$this->aNearPoint[1],
+                                                            false);
 
                                if (CONST_Debug) var_dump("Reverse search", $aLookup);
 
@@ -1734,19 +1735,19 @@
 
                        if (CONST_Debug) { echo '<i>Recheck words:<\i>'; var_dump($aRecheckWords); }
 
+                       $oPlaceLookup = new PlaceLookup($this->oDB);
+                       $oPlaceLookup->setIncludePolygonAsPoints($this->bIncludePolygonAsPoints);
+                       $oPlaceLookup->setIncludePolygonAsText($this->bIncludePolygonAsText);
+                       $oPlaceLookup->setIncludePolygonAsGeoJSON($this->bIncludePolygonAsGeoJSON);
+                       $oPlaceLookup->setIncludePolygonAsKML($this->bIncludePolygonAsKML);
+                       $oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG);
+                       $oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
+
                        foreach($aSearchResults as $iResNum => $aResult)
                        {
                                // Default
                                $fDiameter = getResultDiameter($aResult);
 
-                               $oPlaceLookup = new PlaceLookup($this->oDB);
-                               $oPlaceLookup->setIncludePolygonAsPoints($this->bIncludePolygonAsPoints);
-                               $oPlaceLookup->setIncludePolygonAsText($this->bIncludePolygonAsText);
-                               $oPlaceLookup->setIncludePolygonAsGeoJSON($this->bIncludePolygonAsGeoJSON);
-                               $oPlaceLookup->setIncludePolygonAsKML($this->bIncludePolygonAsKML);
-                               $oPlaceLookup->setIncludePolygonAsSVG($this->bIncludePolygonAsSVG);
-                               $oPlaceLookup->setPolygonSimplificationThreshold($this->fPolygonSimplificationThreshold);
-
                                $aOutlineResult = $oPlaceLookup->getOutlines($aResult['place_id'], $aResult['lon'], $aResult['lat'], $fDiameter/2);
                                if ($aOutlineResult)
                                {