X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/09f16616388490578ddebdb1d8be5ae545cd1d64..2bf546fbf4a4e3509978d3360060a3d2dc665c5c:/website/search.php diff --git a/website/search.php b/website/search.php index 4952465e..9f3ae470 100755 --- a/website/search.php +++ b/website/search.php @@ -28,36 +28,8 @@ if (CONST_Search_ReversePlanForAll // Format for output $sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2'), 'html'); -// Show / use polygons -if ($sOutputFormat == 'html') { - $oGeocode->setIncludePolygonAsGeoJSON($oParams->getBool('polygon_geojson')); - $bAsGeoJSON = false; -} else { - $bAsPoints = $oParams->getBool('polygon'); - $bAsGeoJSON = $oParams->getBool('polygon_geojson'); - $bAsKML = $oParams->getBool('polygon_kml'); - $bAsSVG = $oParams->getBool('polygon_svg'); - $bAsText = $oParams->getBool('polygon_text'); - $iWantedTypes = ($bAsGeoJSON?1:0) + ($bAsKML?1:0) + ($bAsSVG?1:0) + ($bAsText?1:0) + ($bAsPoints?1:0); - if ($iWantedTypes > CONST_PolygonOutput_MaximumTypes) { - if (CONST_PolygonOutput_MaximumTypes) { - userError("Select only ".CONST_PolygonOutput_MaximumTypes." polgyon output option"); - } else { - userError("Polygon output is disabled"); - } - exit; - } - $oGeocode->setIncludePolygonAsPoints($bAsPoints); - $oGeocode->setIncludePolygonAsText($bAsText); - $oGeocode->setIncludePolygonAsGeoJSON($bAsGeoJSON); - $oGeocode->setIncludePolygonAsKML($bAsKML); - $oGeocode->setIncludePolygonAsSVG($bAsSVG); -} - -// Polygon simplification threshold (optional) -$oGeocode->setPolygonSimplificationThreshold($oParams->getFloat('polygon_threshold', 0.0)); - -$oGeocode->loadParamArray($oParams); +$sForcedGeometry = ($sOutputFormat == 'html') ? 'geojson' : null; +$oGeocode->loadParamArray($oParams, $sForcedGeometry); if (CONST_Search_BatchMode && isset($_GET['batch'])) { $aBatch = json_decode($_GET['batch'], true); @@ -102,8 +74,8 @@ $sQuery = $oGeocode->getQueryString(); $aMoreParams = $oGeocode->getMoreUrlParams(); if ($sOutputFormat != 'html') $aMoreParams['format'] = $sOutputFormat; -if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) { - $aMoreParams['accept-language'] = $_SERVER["HTTP_ACCEPT_LANGUAGE"]; +if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { + $aMoreParams['accept-language'] = $_SERVER['HTTP_ACCEPT_LANGUAGE']; } $sMoreURL = CONST_Website_BaseURL.'search.php?'.http_build_query($aMoreParams);