Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index ecf584ae97500d4d5f9a4f8368bb5c96029ad90c..18b47e1ddc5d1bcb2dd9a0a833ba4b660e91557e 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -20,10 +20,12 @@
        $aLangPrefOrder = getPreferredLanguages();
        $oGeocode->setLanguagePreference($aLangPrefOrder);
 
+    /*
        if (isset($aLangPrefOrder['name:de'])) $oGeocode->setReverseInPlan(true);
        if (isset($aLangPrefOrder['name:ru'])) $oGeocode->setReverseInPlan(true);
        if (isset($aLangPrefOrder['name:ja'])) $oGeocode->setReverseInPlan(true);
        if (isset($aLangPrefOrder['name:pl'])) $oGeocode->setReverseInPlan(true);
+    */
 
        // Format for output
        $sOutputFormat = 'html';
@@ -44,8 +46,6 @@
                $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'];
-               $fThreshold = 0.0;
-               if (isset($_GET['polygon_threshold'])) $fThreshold = (float)$_GET['polygon_threshold'];
                if ( ( ($bAsGeoJSON?1:0)
                     + ($bAsKML?1:0)
                     + ($bAsSVG?1:0)
@@ -68,9 +68,13 @@
                $oGeocode->setIncludePolygonAsGeoJSON($bAsGeoJSON);
                $oGeocode->setIncludePolygonAsKML($bAsKML);
                $oGeocode->setIncludePolygonAsSVG($bAsSVG);
-               $oGeocode->setPolygonSimplificationThreshold($fThreshold);
        }
 
+       // Polygon simplification threshold (optional)
+       $fThreshold = 0.0;
+       if (isset($_GET['polygon_threshold'])) $fThreshold = (float)$_GET['polygon_threshold'];
+       $oGeocode->setPolygonSimplificationThreshold($fThreshold);
+
        $oGeocode->loadParamArray($_GET);
 
        if (CONST_Search_BatchMode && isset($_GET['batch']))