introduce accessor function for URL parameter

[nominatim.git] / website / reverse.php

diff --git a/website/reverse.php b/website/reverse.php
index e2dfaef80eeccdadae886f0611ba575e8a789584..75eb26779550c31da55f6a7e17fb499383e68e1f 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,7 +1,8 @@
 <?php
        @define('CONST_ConnectionBucket_PageType', 'Reverse');
 
 <?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');
        require_once(CONST_BasePath.'/lib/log.php');
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/ReverseGeocode.php');


@@ -18,15 +19,36 @@
                }
        }
 
                }
        }
 

+
+       $bAsPoints = false;
+       $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) + ($bAsPoints?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
        $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();


@@ -34,24 +56,28 @@
        $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'))
+       $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 = new ReverseGeocode($oDB);
                $oReverseGeocode->setLanguagePreference($aLangPrefOrder);
 

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

 
                $aLookup = $oReverseGeocode->lookup();
                if (CONST_Debug) var_dump($aLookup);
        }
        else
        {
 
                $aLookup = $oReverseGeocode->lookup();
                if (CONST_Debug) var_dump($aLookup);
        }
        else
        {

-               $aLookup = null;
+               userError("Need coordinates or OSM object to lookup.");

        }
 
        if ($aLookup)
        }
 
        if ($aLookup)


@@ -63,6 +89,21 @@
                $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
 
                $aPlace = $oPlaceLookup->lookupPlace($aLookup);
                $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
 
                $aPlace = $oPlaceLookup->lookupPlace($aLookup);

+
+               $oPlaceLookup->setIncludePolygonAsPoints($bAsPoints);
+               $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
        {
        }
        else
        {


@@ -76,6 +117,10 @@
                exit;
        }
 
                exit;
        }
 

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

        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');
        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');