reenable reverse order queries, leave disabled for structured queries

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 4d0c48656cf1c10ddaba056a7618524b349e4bf1..0ea56c7a106368f33a5cb1c732173b792a972826 100644 (file)
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -43,6 +43,11 @@
                        $this->oDB =& $oDB;
                }
 
+               function setReverseInPlan($bReverse)
+               {
+                       $this->bReverseInPlan = $bReverse;
+               }
+
                function setLanguagePreference($aLangPref)
                {
                        $this->aLangPrefOrder = $aLangPref;

diff --git a/website/search.php b/website/search.php
index b87f60e071aa8674cd46252b59e65576da35c377..7e96e10e629ce7a208687190af3dc64477b25852 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -20,6 +20,11 @@
        $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']);
@@ -107,6 +112,7 @@
                if (!$sQuery)
                {
                        $oGeocode->setStructuredQuery(@$aParams['amenity'], @$aParams['street'], @$aParams['city'], @$aParams['county'], @$aParams['state'], @$aParams['country'], @$aParams['postalcode']);
+                       $oGeocode->setReverseInPlan(false);
                }
                else
                {