refactor ReverseGeocode

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index c6c7305fe9d90ae88664f8f9b44d3d30ce94ffe2..07ef2d745b1d9517def19a83068068d964983c31 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -8,19 +8,6 @@
        require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
        require_once(CONST_BasePath.'/lib/output.php');
 
-       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;
-               }
-       }
-
-
        $bAsGeoJSON = getParamBool('polygon_geojson');
        $bAsKML = getParamBool('polygon_kml');
        $bAsSVG = getParamBool('polygon_svg');
@@ -56,8 +43,8 @@
        $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 
-       $sOsmType = getParamSet('osmtype', array('N', 'W', 'R'));
-       $iOsmId = getParamInt('osmid', -1);
+       $sOsmType = getParamSet('osm_type', array('N', 'W', 'R'));
+       $iOsmId = getParamInt('osm_id', -1);
        $fLat = getParamFloat('lat');
        $fLon = getParamFloat('lon');
        if ($sOsmType && $iOsmId > 0)
@@ -67,12 +54,9 @@
        else if ($fLat !== false && $fLon !==false)
        {
                $oReverseGeocode = new ReverseGeocode($oDB);
-               $oReverseGeocode->setLanguagePreference($aLangPrefOrder);
-
-               $oReverseGeocode->setLatLon($fLat, $fLon);
                $oReverseGeocode->setZoom(getParamInt('zoom', 18));
 
-               $aLookup = $oReverseGeocode->lookup();
+               $aLookup = $oReverseGeocode->lookup($fLat, $fLon);
                if (CONST_Debug) var_dump($aLookup);
        }
        else if ($sOutputFormat != 'html')
@@ -119,7 +103,7 @@
 
        if ($sOutputFormat=='html')
        {
-               $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
+               $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
                $sTileURL = CONST_Map_Tile_URL;
                $sTileAttribution = CONST_Map_Tile_Attribution;
        }