Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index 872d9801761a58664fa25b7221a47ceb9aa2f677..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';
@@ -68,6 +70,11 @@
                $oGeocode->setIncludePolygonAsSVG($bAsSVG);
        }
 
+       // 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']))
@@ -87,7 +94,7 @@
        } else {
         if (!(isset($_GET['q']) && $_GET['q']) && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
         {
-            $sQuery = substr($_SERVER['PATH_INFO'], 1);
+            $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);
 
             // reverse order of '/' separated string
             $aPhrases = explode('/', $sQuery);