Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index b87f60e071aa8674cd46252b59e65576da35c377..e85c33697fa66554a7bb532aadf3ff3001cadedb 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -20,6 +20,13 @@
        $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);
+    */
+
        function loadParamsToGeocode($oGeocode, $aParams, $bBatch = false)
        {
                if (isset($aParams['addressdetails'])) $oGeocode->setIncludeAddressDetails((bool)$aParams['addressdetails']);
@@ -29,6 +36,8 @@
                if (isset($aParams['limit'])) $oGeocode->setLimit((int)$aParams['limit']);
                if (isset($aParams['offset'])) $oGeocode->setOffset((int)$aParams['offset']);
 
+               if (isset($aParams['fallback'])) $oGeocode->setFallback((int)$aParams['fallback']);
+
                // List of excluded Place IDs - used for more acurate pageing
                if (isset($aParams['exclude_place_ids']) && $aParams['exclude_place_ids'])
                {
@@ -107,6 +116,7 @@
                if (!$sQuery)
                {
                        $oGeocode->setStructuredQuery(@$aParams['amenity'], @$aParams['street'], @$aParams['city'], @$aParams['county'], @$aParams['state'], @$aParams['country'], @$aParams['postalcode']);
+                       $oGeocode->setReverseInPlan(false);
                }
                else
                {