remove now unused bAsPoints in reverse API

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index f760dc09043e588e920bc8538efefdaca0c1cb8b..430d9e39c2b208bb82ebfcb3d7956cf98808968c 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,7 +1,8 @@
 <?php
        @define('CONST_ConnectionBucket_PageType', 'Reverse');
 
-       require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+       require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+       require_once(CONST_BasePath.'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/ReverseGeocode.php');
@@ -18,15 +19,35 @@
                }
        }
 
+
+       $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)
+               {
+                       userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option");
+               }
+               else
+               {
+                       userError("Polygon output is disabled");
+               }
+               exit;
+       }
+
+
+       // Polygon simplification threshold (optional)
+       $fThreshold = getParamFloat('polygon_threshold', 0.0);
+
+
        $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();
@@ -34,24 +55,28 @@
        $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'))
+       $sOsmType = getParamSet('osmtype', array('N', 'W', 'R'));
+       $iOsmId = getParamInt('osmid', -1);
+       $fLat = getParamFloat('lat');
+       $fLon = getParamFloat('lon');
+       if ($sOsmType && $iOsmId > 0)
        {
-               $aLookup = array('osm_type' => $_GET['osm_type'], 'osm_id' => $_GET['osm_id']);
+               $aLookup = array('osm_type' => $sOsmType, 'osm_id' => $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->setLanguagePreference($aLangPrefOrder);
 
-               $oReverseGeocode->setLatLon($_GET['lat'], $_GET['lon']);
-               $oReverseGeocode->setZoom(@$_GET['zoom']);
+               $oReverseGeocode->setLatLon($fLat, $fLon);
+               $oReverseGeocode->setZoom(getParamInt('zoom', 18));
 
                $aLookup = $oReverseGeocode->lookup();
                if (CONST_Debug) var_dump($aLookup);
        }
-       else
+       else if ($sOutputFormat != 'html')
        {
-               $aLookup = null;
+               userError("Need coordinates or OSM object to lookup.");
        }
 
        if ($aLookup)
@@ -63,6 +88,21 @@
                $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
 
                $aPlace = $oPlaceLookup->lookupPlace($aLookup);
+
+               $oPlaceLookup->setIncludePolygonAsPoints(false);
+               $oPlaceLookup->setIncludePolygonAsText($bAsText);
+               $oPlaceLookup->setIncludePolygonAsGeoJSON($bAsGeoJSON);
+               $oPlaceLookup->setIncludePolygonAsKML($bAsKML);
+               $oPlaceLookup->setIncludePolygonAsSVG($bAsSVG);
+               $oPlaceLookup->setPolygonSimplificationThreshold($fThreshold);
+
+               $fRadius = $fDiameter = getResultDiameter($aPlace);
+               $aOutlineResult = $oPlaceLookup->getOutlines($aPlace['place_id'], $aPlace['lon'], $aPlace['lat'], $fRadius);
+
+               if ($aOutlineResult)
+               {
+                       $aPlace = array_merge($aPlace, $aOutlineResult);
+               }
        }
        else
        {