Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / ParameterParser.php

diff --git a/lib-php/ParameterParser.php b/lib-php/ParameterParser.php
index 46e69501cef878e8efd811c0dbf562cd06e1dc6f..070be36c24a3856448ef3de965298690001dac33 100644 (file)
--- a/lib-php/ParameterParser.php
+++ b/lib-php/ParameterParser.php
@@ -70,7 +70,7 @@ class ParameterParser
             return $sDefault;
         }
 
             return $sDefault;
         }
 

-        if (!in_array($this->aParams[$sName], $aValues)) {
+        if (!in_array($this->aParams[$sName], $aValues, true)) {

             userError("Parameter '$sName' must be one of: ".join(', ', $aValues));
         }
 
             userError("Parameter '$sName' must be one of: ".join(', ', $aValues));
         }
 


@@ -114,22 +114,27 @@ class ParameterParser
         }
 
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
         }
 
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {

-            $aLangPrefOrder[$sLanguage] = $sLanguage;
+            $this->addNameTag($aLangPrefOrder, 'name:'.$sLanguage);

         }
         }

- 
-        $aLangPrefOrder['default'] = 'default';
-        $aLangPrefOrder['brand'] = 'brand';
+        $this->addNameTag($aLangPrefOrder, 'name');
+        $this->addNameTag($aLangPrefOrder, 'brand');

         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
         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;
     }
 
         return $aLangPrefOrder;
     }
 

+    private function addNameTag(&$aLangPrefOrder, $sTag)
+    {
+        $aLangPrefOrder[$sTag] = $sTag;
+        $aLangPrefOrder['_place_'.$sTag] = '_place_'.$sTag;
+    }
+

     public function hasSetAny($aParamNames)
     {
         foreach ($aParamNames as $sName) {
     public function hasSetAny($aParamNames)
     {
         foreach ($aParamNames as $sName) {