Changeset 19045 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

Timestamp:

2024-04-19T11:48:22+02:00 (2 years ago)

Author:

stoecker

Message:

support language keys not following the naming of languages in JOSM, allow more than one language specific code, see #23627

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

@@ -145 +145 @@
          * The list of default name tags from which a label candidate is derived.
          */
-        private static final String[] DEFAULT_NAME_TAGS = {
-            "name:" + LanguageInfo.getJOSMLocaleCode(),
-            "name",
-            "int_name",
-            "distance",
-            "railway:position",
-            "ref",
-            "operator",
-            "brand",
-            "addr:unit",
-            "addr:flats",
-            "addr:housenumber"
-        };
+        private static final String[] DEFAULT_NAME_TAGS = getDefaultNameTags();
 
         /**
@@ -175 +163 @@
             Config.getPref().addPreferenceChangeListener(this);
             initNameTagsFromPreferences();
+        }
+
+        /* Is joining an array really that complicated in Java? */
+        private static String[] getDefaultNameTags() {
+            ArrayList<String> tags = new ArrayList<String>(Arrays.asList(LanguageInfo.getOSMLocaleCodes("name:")));
+            tags.addAll(Arrays.asList(new String[]{
+                "name",
+                "int_name",
+                "distance",
+                "railway:position",
+                "ref",
+                "operator",
+                "brand",
+                "addr:unit",
+                "addr:flats",
+                "addr:housenumber"
+            }));
+            return tags.toArray(String[]::new);
         }