From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 28 Oct 2019 21:12:21 +0000 (+0100)
Subject: demote short_name in the list of names to display
X-Git-Tag: v3.5.0~145
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/52922397147d8e7466147edfb7cbdaffc6f34498?ds=sidebyside;hp=-c

demote short_name in the list of names to display

The usage of short_name in OSM has changed with time. It is no
longer suitable as a display name.

Fixes #783.
---

52922397147d8e7466147edfb7cbdaffc6f34498
diff --git a/lib/ParameterParser.php b/lib/ParameterParser.php
index ad281d70..cb03c6cc 100644
--- a/lib/ParameterParser.php
+++ b/lib/ParameterParser.php
@@ -104,16 +104,16 @@ class ParameterParser
         }
 
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
-            $aLangPrefOrder['short_name:'.$sLanguage] = 'short_name:'.$sLanguage;
             $aLangPrefOrder['name:'.$sLanguage] = 'name:'.$sLanguage;
         }
-        $aLangPrefOrder['short_name'] = 'short_name';
         $aLangPrefOrder['name'] = 'name';
         $aLangPrefOrder['brand'] = 'brand';
         foreach ($aLanguages as $sLanguage => $fLanguagePref) {
             $aLangPrefOrder['official_name:'.$sLanguage] = 'official_name:'.$sLanguage;
+            $aLangPrefOrder['short_name:'.$sLanguage] = 'short_name:'.$sLanguage;
         }
         $aLangPrefOrder['official_name'] = 'official_name';
+        $aLangPrefOrder['short_name'] = 'short_name';
         $aLangPrefOrder['ref'] = 'ref';
         $aLangPrefOrder['type'] = 'type';
         return $aLangPrefOrder;