X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b4fec57b6d53f8e8a45c46ff11f13cbcbea1006a..8677da2a72bb54a86e91ed79e4adb943fa9ef40b:/lib-php/ParameterParser.php?ds=inline diff --git a/lib-php/ParameterParser.php b/lib-php/ParameterParser.php index d4068aa3..98b95388 100644 --- a/lib-php/ParameterParser.php +++ b/lib-php/ParameterParser.php @@ -1,4 +1,12 @@ $fLanguagePref) { - $aLangPrefOrder['name:'.$sLanguage] = 'name:'.$sLanguage; + $this->addNameTag($aLangPrefOrder, 'name:'.$sLanguage); } - $aLangPrefOrder['name'] = 'name'; - $aLangPrefOrder['brand'] = 'brand'; + $this->addNameTag($aLangPrefOrder, 'name'); + $this->addNameTag($aLangPrefOrder, 'brand'); foreach ($aLanguages as $sLanguage => $fLanguagePref) { - $aLangPrefOrder['official_name:'.$sLanguage] = 'official_name:'.$sLanguage; - $aLangPrefOrder['short_name:'.$sLanguage] = 'short_name:'.$sLanguage; + $this->addNameTag($aLangPrefOrder, 'official_name:'.$sLanguage); + $this->addNameTag($aLangPrefOrder, 'short_name:'.$sLanguage); } - $aLangPrefOrder['official_name'] = 'official_name'; - $aLangPrefOrder['short_name'] = 'short_name'; - $aLangPrefOrder['ref'] = 'ref'; - $aLangPrefOrder['type'] = 'type'; + $this->addNameTag($aLangPrefOrder, 'official_name'); + $this->addNameTag($aLangPrefOrder, 'short_name'); + $this->addNameTag($aLangPrefOrder, 'ref'); + $this->addNameTag($aLangPrefOrder, 'type'); return $aLangPrefOrder; } + private function addNameTag(&$aLangPrefOrder, $sTag) + { + $aLangPrefOrder[$sTag] = $sTag; + $aLangPrefOrder['_place_'.$sTag] = '_place_'.$sTag; + } + public function hasSetAny($aParamNames) { foreach ($aParamNames as $sName) {