mark checkpoint_segments parameter as deprecated

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index 79a950124d8e077f7ed98418d18073d73ddec9fd..f7c01860f0fb30438e1843937ac2721d7c06d88e 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -6,31 +6,14 @@
        require_once(CONST_BasePath.'/lib/log.php');
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
        require_once(CONST_BasePath.'/lib/log.php');
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/ReverseGeocode.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;
-               }
-       }
-
-
-       $bAsPoints = false;
-       $bAsGeoJSON = (boolean)isset($_GET['polygon_geojson']) && $_GET['polygon_geojson'];
-       $bAsKML = (boolean)isset($_GET['polygon_kml']) && $_GET['polygon_kml'];
-       $bAsSVG = (boolean)isset($_GET['polygon_svg']) && $_GET['polygon_svg'];
-       $bAsText = (boolean)isset($_GET['polygon_text']) && $_GET['polygon_text'];
-       if ( ( ($bAsGeoJSON?1:0)
-                        + ($bAsKML?1:0)
-                        + ($bAsSVG?1:0)
-                        + ($bAsText?1:0)
-                        + ($bAsPoints?1:0)
-                        ) > CONST_PolygonOutput_MaximumTypes)
+       require_once(CONST_BasePath.'/lib/output.php');
+
+       $bAsGeoJSON = getParamBool('polygon_geojson');
+       $bAsKML = getParamBool('polygon_kml');
+       $bAsSVG = getParamBool('polygon_svg');
+       $bAsText = getParamBool('polygon_text');
+       if ((($bAsGeoJSON?1:0) + ($bAsKML?1:0) + ($bAsSVG?1:0)
+               + ($bAsText?1:0)) > CONST_PolygonOutput_MaximumTypes)

        {
                if (CONST_PolygonOutput_MaximumTypes)
                {
        {
                if (CONST_PolygonOutput_MaximumTypes)
                {


@@ -45,19 +28,14 @@
 
 
        // Polygon simplification threshold (optional)
 
 
        // Polygon simplification threshold (optional)

-       $fThreshold = 0.0;
-       if (isset($_GET['polygon_threshold'])) $fThreshold = (float)$_GET['polygon_threshold'];
+       $fThreshold = getParamFloat('polygon_threshold', 0.0);

 
 
        $oDB =& getDB();
        ini_set('memory_limit', '200M');
 
        // Format for output
 
 
        $oDB =& getDB();
        ini_set('memory_limit', '200M');
 
        // Format for output

-       $sOutputFormat = 'xml';
-       if (isset($_GET['format']) && ( $_GET['format'] == 'html' || $_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
-       {
-               $sOutputFormat = $_GET['format'];
-       }
+       $sOutputFormat = getParamSet('format', array('html', 'xml', 'json', 'jsonv2'), 'xml');

 
        // Preferred language
        $aLangPrefOrder = getPreferredLanguages();
 
        // Preferred language
        $aLangPrefOrder = getPreferredLanguages();


@@ -65,37 +43,39 @@
        $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 
        $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 

-       if (isset($_GET['osm_type']) && isset($_GET['osm_id']) && (int)$_GET['osm_id'] && ($_GET['osm_type'] == 'N' || $_GET['osm_type'] == 'W' || $_GET['osm_type'] == 'R'))
+       $oPlaceLookup = new PlaceLookup($oDB);
+       $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
+       $oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true));
+       $oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false));
+       $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
+
+       $sOsmType = getParamSet('osm_type', array('N', 'W', 'R'));
+       $iOsmId = getParamInt('osm_id', -1);
+       $fLat = getParamFloat('lat');
+       $fLon = getParamFloat('lon');
+       if ($sOsmType && $iOsmId > 0)

        {
        {

-               $aLookup = array('osm_type' => $_GET['osm_type'], 'osm_id' => $_GET['osm_id']);
+               $aPlace = $oPlaceLookup->lookupOSMID($sOsmType, $iOsmId);

        }
        }

-       else if (isset($_GET['lat']) && isset($_GET['lon']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lat']) && preg_match('/^[+-]?[0-9]*\.?[0-9]+$/', $_GET['lon']))
+       else if ($fLat !== false && $fLon !== false)

        {
                $oReverseGeocode = new ReverseGeocode($oDB);
        {
                $oReverseGeocode = new ReverseGeocode($oDB);

-               $oReverseGeocode->setLanguagePreference($aLangPrefOrder);
-
-               $oReverseGeocode->setLatLon($_GET['lat'], $_GET['lon']);
-               $oReverseGeocode->setZoom(@$_GET['zoom']);
+               $oReverseGeocode->setZoom(getParamInt('zoom', 18));

 
 

-               $aLookup = $oReverseGeocode->lookup();
+               $aLookup = $oReverseGeocode->lookup($fLat, $fLon);

                if (CONST_Debug) var_dump($aLookup);
                if (CONST_Debug) var_dump($aLookup);

+
+               $aPlace = $oPlaceLookup->lookup((int)$aLookup['place_id'],
+                                               $aLookup['type'], $aLookup['fraction']);

        }
        }

-       else
+       else if ($sOutputFormat != 'html')

        {
        {

-               $aLookup = null;
+               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($bAsPoints);
+               $oPlaceLookup->setIncludePolygonAsPoints(false);

                $oPlaceLookup->setIncludePolygonAsText($bAsText);
                $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON);
                $oPlaceLookup->setIncludePolygonAsKML($bAsKML);
                $oPlaceLookup->setIncludePolygonAsText($bAsText);
                $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON);
                $oPlaceLookup->setIncludePolygonAsKML($bAsKML);


@@ -103,13 +83,14 @@
                $oPlaceLookup->setPolygonSimplificationThreshold($fThreshold);
 
                $fRadius = $fDiameter = getResultDiameter($aPlace);
                $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);

 
 

-               $aPlace = array_merge($aPlace, $aOutlineResult);
-       }
-       else
-       {
-               $aPlace = null;
+               if ($aOutlineResult)
+               {
+                       $aPlace = array_merge($aPlace, $aOutlineResult);
+               }

        }
 
 
        }
 
 


@@ -121,7 +102,7 @@
 
        if ($sOutputFormat=='html')
        {
 
        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;
        }
                $sTileURL = CONST_Map_Tile_URL;
                $sTileAttribution = CONST_Map_Tile_Attribution;
        }