X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ce112f7c2083b145610a56362c2d6ddc026b695c..7a50d2f9964421e932313b15f5d7d3b05ded4c45:/website/search.php?ds=sidebyside

diff --git a/website/search.php b/website/search.php
index 31944974..3c85c8f7 100755
--- a/website/search.php
+++ b/website/search.php
@@ -5,6 +5,7 @@
 	require_once(CONST_BasePath.'/lib/init-website.php');
 	require_once(CONST_BasePath.'/lib/log.php');
 	require_once(CONST_BasePath.'/lib/Geocode.php');
+	require_once(CONST_BasePath.'/lib/output.php');
 
 	ini_set('memory_limit', '200M');
 
@@ -25,24 +26,20 @@
 	}
 
 	// Format for output
-	$sOutputFormat = 'html';
-	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'), 'html');
 
 	// Show / use polygons
 	if ($sOutputFormat == 'html')
 	{
-		if (isset($_GET['polygon'])) $oGeocode->setIncludePolygonAsText((bool)$_GET['polygon']);
+		$oGeocode->setIncludePolygonAsText(getParamBool('polygon'));
 	}
 	else
 	{
-		$bAsPoints = (boolean)isset($_GET['polygon']) && $_GET['polygon'];
-		$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'];
+		$bAsPoints = getParamBool('polygon');
+		$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)
@@ -68,9 +65,7 @@
 	}
 
 	// Polygon simplification threshold (optional)
-	$fThreshold = 0.0;
-	if (isset($_GET['polygon_threshold'])) $fThreshold = (float)$_GET['polygon_threshold'];
-	$oGeocode->setPolygonSimplificationThreshold($fThreshold);
+	$oGeocode->setPolygonSimplificationThreshold(getParamFloat('polygon_threshold', 0.0));
 
 	$oGeocode->loadParamArray($_GET);
 
@@ -91,7 +86,7 @@
 	}
 	else
 	{
-		if (!(isset($_GET['q']) && $_GET['q']) && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
+		if (!getParamString('q') && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
 		{
 			$sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);