From: Sarah Hoffmann Date: Sun, 15 Sep 2013 22:05:26 +0000 (+0200) Subject: reenable reverse order queries, leave disabled for structured queries X-Git-Tag: v2.2.0~23 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c574c933e41a784e0ee6167e0d16bab0a2495035 reenable reverse order queries, leave disabled for structured queries --- diff --git a/lib/Geocode.php b/lib/Geocode.php index 4d0c4865..0ea56c7a 100644 --- 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 b87f60e0..7e96e10e 100755 --- 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 {