Merge remote-tracking branch 'upstream/master' into move-mouse-position-info-on-map

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 7f5eca78e5cea47237dbcbf5279761f0f38403ad..50ce4787350ecd2b5c76824fde1fa197f500f757 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -7,24 +7,14 @@
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
        require_once(CONST_BasePath.'/lib/output.php');
+       ini_set('memory_limit', '200M');
 
-       if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
-       {
-               $fLoadAvg = getLoadAverage();
-               if ($fLoadAvg > 2) sleep(60);
-               if ($fLoadAvg > 4) sleep(120);
-               if ($fLoadAvg > 6)
-               {
-                       echo "Bulk User: Temporary block due to high server load\n";
-                       exit;
-               }
-       }
-
+       $oParams = new ParameterParser();
 
-       $bAsGeoJSON = getParamBool('polygon_geojson');
-       $bAsKML = getParamBool('polygon_kml');
-       $bAsSVG = getParamBool('polygon_svg');
-       $bAsText = getParamBool('polygon_text');
+       $bAsGeoJSON = $oParams->getBool('polygon_geojson');
+       $bAsKML = $oParams->getBool('polygon_kml');
+       $bAsSVG = $oParams->getBool('polygon_svg');
+       $bAsText = $oParams->getBool('polygon_text');
        if ((($bAsGeoJSON?1:0) + ($bAsKML?1:0) + ($bAsSVG?1:0)
                + ($bAsText?1:0)) > CONST_PolygonOutput_MaximumTypes)
        {
@@ -36,60 +26,54 @@
                {
                        userError("Polygon output is disabled");
                }
-               exit;
        }
 
-
        // Polygon simplification threshold (optional)
-       $fThreshold = getParamFloat('polygon_threshold', 0.0);
-
-
-       $oDB =& getDB();
-       ini_set('memory_limit', '200M');
+       $fThreshold = $oParams->getFloat('polygon_threshold', 0.0);
 
        // Format for output
-       $sOutputFormat = getParamSet('format', array('html', 'xml', 'json', 'jsonv2'), 'xml');
+       $sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2'), 'xml');
 
        // Preferred language
-       $aLangPrefOrder = getPreferredLanguages();
+       $aLangPrefOrder = $oParams->getPreferredLanguages();
+
+       $oDB =& getDB();
 
        $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 
-       $sOsmType = getParamSet('osm_type', array('N', 'W', 'R'));
-       $iOsmId = getParamInt('osm_id', -1);
-       $fLat = getParamFloat('lat');
-       $fLon = getParamFloat('lon');
+       $oPlaceLookup = new PlaceLookup($oDB);
+       $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
+       $oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true));
+       $oPlaceLookup->setIncludeExtraTags($oParams->getBool('extratags', false));
+       $oPlaceLookup->setIncludeNameDetails($oParams->getBool('namedetails', false));
+
+       $sOsmType = $oParams->getSet('osm_type', array('N', 'W', 'R'));
+       $iOsmId = $oParams->getInt('osm_id', -1);
+       $fLat = $oParams->getFloat('lat');
+       $fLon = $oParams->getFloat('lon');
        if ($sOsmType && $iOsmId > 0)
        {
-               $aLookup = array('osm_type' => $sOsmType, 'osm_id' => $iOsmId);
+               $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId);
        }
-       else if ($fLat !== false && $fLon !==false)
+       else if ($fLat !== false && $fLon !== false)
        {
                $oReverseGeocode = new ReverseGeocode($oDB);
-               $oReverseGeocode->setLanguagePreference($aLangPrefOrder);
-
-               $oReverseGeocode->setLatLon($fLat, $fLon);
-               $oReverseGeocode->setZoom(getParamInt('zoom', 18));
+               $oReverseGeocode->setZoom($oParams->getInt('zoom', 18));
 
-               $aLookup = $oReverseGeocode->lookup();
+               $aLookup = $oReverseGeocode->lookup($fLat, $fLon);
                if (CONST_Debug) var_dump($aLookup);
+
+               $aPlace = $oPlaceLookup->lookup((int)$aLookup['place_id'],
+                                               $aLookup['type'], $aLookup['fraction']);
        }
        else if ($sOutputFormat != 'html')
        {
                userError("Need coordinates or OSM object to lookup.");
        }
 
-       if ($aLookup)
+       if ($aPlace)
        {
-               $oPlaceLookup = new PlaceLookup($oDB);
-               $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
-               $oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true));
-               $oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false));
-               $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
-
-               $aPlace = $oPlaceLookup->lookupPlace($aLookup);
-
                $oPlaceLookup->setIncludePolygonAsPoints(false);
                $oPlaceLookup->setIncludePolygonAsText($bAsText);
                $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON);
@@ -98,17 +82,15 @@
                $oPlaceLookup->setPolygonSimplificationThreshold($fThreshold);
 
                $fRadius = $fDiameter = getResultDiameter($aPlace);
-               $aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'], $aPlace['lon'], $aPlace['lat'], $fRadius);
+               $aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'],
+                                                            $aPlace['lon'], $aPlace['lat'],
+                                                            $fRadius);
 
                if ($aOutlineResult)
                {
                        $aPlace = array_merge($aPlace, $aOutlineResult);
                }
        }
-       else
-       {
-               $aPlace = null;
-       }
 
 
        if (CONST_Debug)