reenable reverse order queries, leave disabled for structured queries

This commit is contained in:
Sarah Hoffmann
2013-09-16 00:05:26 +02:00
parent 77b9edd1e9
commit c574c933e4
2 changed files with 11 additions and 0 deletions

View File

@@ -43,6 +43,11 @@
$this->oDB =& $oDB; $this->oDB =& $oDB;
} }
function setReverseInPlan($bReverse)
{
$this->bReverseInPlan = $bReverse;
}
function setLanguagePreference($aLangPref) function setLanguagePreference($aLangPref)
{ {
$this->aLangPrefOrder = $aLangPref; $this->aLangPrefOrder = $aLangPref;

View File

@@ -20,6 +20,11 @@
$aLangPrefOrder = getPreferredLanguages(); $aLangPrefOrder = getPreferredLanguages();
$oGeocode->setLanguagePreference($aLangPrefOrder); $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) function loadParamsToGeocode($oGeocode, $aParams, $bBatch = false)
{ {
if (isset($aParams['addressdetails'])) $oGeocode->setIncludeAddressDetails((bool)$aParams['addressdetails']); if (isset($aParams['addressdetails'])) $oGeocode->setIncludeAddressDetails((bool)$aParams['addressdetails']);
@@ -107,6 +112,7 @@
if (!$sQuery) if (!$sQuery)
{ {
$oGeocode->setStructuredQuery(@$aParams['amenity'], @$aParams['street'], @$aParams['city'], @$aParams['county'], @$aParams['state'], @$aParams['country'], @$aParams['postalcode']); $oGeocode->setStructuredQuery(@$aParams['amenity'], @$aParams['street'], @$aParams['city'], @$aParams['county'], @$aParams['state'], @$aParams['country'], @$aParams['postalcode']);
$oGeocode->setReverseInPlan(false);
} }
else else
{ {