Changeset 15395 in josm

Timestamp:

2019-09-30T23:31:03+02:00 (5 years ago)

Author:

Don-vip

Message:

sets the default system of measurement based on current country

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/SystemOfMeasurement.java (modified) (13 diffs)
• tools/I18n.java (modified) (1 diff)
• tools/LanguageInfo.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java

@@ -5 +5 @@
 
 import java.text.NumberFormat;
-import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.data.preferences.StringProperty;
@@ -25 +26 @@
 
     /**
-     * Preferences entry for system of measurement.
-     * @since 12674 (moved from ProjectionPreference)
-     */
-    public static final StringProperty PROP_SYSTEM_OF_MEASUREMENT = new StringProperty("system_of_measurement", "Metric");
-
-    /**
      * Interface to notify listeners of the change of the system of measurement.
      * @since 8554
@@ -49 +44 @@
      * @since 3406
      */
-    public static final SystemOfMeasurement METRIC = new SystemOfMeasurement(1, "m", 1000, "km", "km/h", 3.6, 10_000, "ha");
+    public static final SystemOfMeasurement METRIC = new SystemOfMeasurement(marktr("Metric"), 1, "m", 1000, "km", "km/h", 3.6, 10_000, "ha");
 
     /**
@@ -57 +52 @@
      * @since 3406
      */
-    public static final SystemOfMeasurement CHINESE = new SystemOfMeasurement(1.0/3.0, "\u5e02\u5c3a" /* chi */, 500, "\u5e02\u91cc" /* li */,
-            "km/h", 3.6, 666.0 + 2.0/3.0, "\u4ea9" /* mu */);
+    public static final SystemOfMeasurement CHINESE = new SystemOfMeasurement(marktr("Chinese"),
+            1.0/3.0, "\u5e02\u5c3a" /* chi */, 500, "\u5e02\u91cc" /* li */, "km/h", 3.6, 666.0 + 2.0/3.0, "\u4ea9" /* mu */);
 
     /**
@@ -64 +59 @@
      * @since 3406
      */
-    public static final SystemOfMeasurement IMPERIAL = new SystemOfMeasurement(0.3048, "ft", 1609.344, "mi", "mph", 2.23694, 4046.86, "ac");
+    public static final SystemOfMeasurement IMPERIAL = new SystemOfMeasurement(marktr("Imperial"),
+            0.3048, "ft", 1609.344, "mi", "mph", 2.23694, 4046.86, "ac");
 
     /**
@@ -70 +66 @@
      * @since 5549
      */
-    public static final SystemOfMeasurement NAUTICAL_MILE = new SystemOfMeasurement(185.2, "kbl", 1852, "NM", "kn", 1.94384);
+    public static final SystemOfMeasurement NAUTICAL_MILE = new SystemOfMeasurement(marktr("Nautical Mile"),
+            185.2, "kbl", 1852, "NM", "kn", 1.94384);
 
     /**
@@ -76 +73 @@
      * @since 3406
      */
-    public static final Map<String, SystemOfMeasurement> ALL_SYSTEMS;
-    static {
-        Map<String, SystemOfMeasurement> map = new LinkedHashMap<>();
-        map.put(marktr("Metric"), METRIC);
-        map.put(marktr("Chinese"), CHINESE);
-        map.put(marktr("Imperial"), IMPERIAL);
-        map.put(marktr("Nautical Mile"), NAUTICAL_MILE);
-        ALL_SYSTEMS = Collections.unmodifiableMap(map);
-    }
+    public static final Map<String, SystemOfMeasurement> ALL_SYSTEMS = Stream.of(METRIC, CHINESE, IMPERIAL, NAUTICAL_MILE)
+            .collect(Collectors.toMap(SystemOfMeasurement::getName, Function.identity()));
+
+    /**
+     * Preferences entry for system of measurement.
+     * @since 12674 (moved from ProjectionPreference)
+     */
+    public static final StringProperty PROP_SYSTEM_OF_MEASUREMENT = new StringProperty("system_of_measurement", getDefault().getName());
 
     private static final CopyOnWriteArrayList<SoMChangeListener> somChangeListeners = new CopyOnWriteArrayList<>();
@@ -142 +138 @@
     }
 
+    /** Translated name of this system of measurement. */
+    private final String name;
     /** First value, in meters, used to translate unit according to above formula. */
     public final double aValue;
@@ -169 +167 @@
      * x_a == x_m / aValue
      *
+     * @param name Translated name of this system of measurement
      * @param aValue First value, in meters, used to translate unit according to above formula.
      * @param aName First unit used to format text.
@@ -175 +174 @@
      * @param speedName the most common speed symbol (kmh/h, mph, kn, etc.)
      * @param speedValue the speed value for the most common speed symbol, for 1 meter per second
-     * @since 10175
-     */
-    public SystemOfMeasurement(double aValue, String aName, double bValue, String bName, String speedName, double speedValue) {
-        this(aValue, aName, bValue, bName, speedName, speedValue, -1, null);
+     * @since 15395
+     */
+    public SystemOfMeasurement(String name, double aValue, String aName, double bValue, String bName, String speedName, double speedValue) {
+        this(name, aValue, aName, bValue, bName, speedName, speedValue, -1, null);
     }
 
@@ -187 +186 @@
      * x_a == x_m / aValue
      *
+     * @param name Translated name of this system of measurement
      * @param aValue First value, in meters, used to translate unit according to above formula.
      * @param aName First unit used to format text.
@@ -197 +197 @@
      * @param areaCustomName Specific optional area unit. Set to {@code null} if not used.
      *
-     * @since 10175
-     */
-    public SystemOfMeasurement(double aValue, String aName, double bValue, String bName, String speedName, double speedValue,
+     * @since 15395
+     */
+    public SystemOfMeasurement(String name, double aValue, String aName, double bValue, String bName, String speedName, double speedValue,
             double areaCustomValue, String areaCustomName) {
+        this.name = name;
         this.aValue = aValue;
         this.aName = aName;
@@ -271 +272 @@
     }
 
+    /**
+     * Returns the translated name of this system of measurement.
+     * @return the translated name of this system of measurement
+     * @since 15395
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Returns the default system of measurement for the current country.
+     * @return the default system of measurement for the current country
+     * @since 15395
+     */
+    public static SystemOfMeasurement getDefault() {
+        switch (Locale.getDefault().getCountry()) {
+            case "US":
+                // https://en.wikipedia.org/wiki/Metrication_in_the_United_States#Current_use
+                // Imperial units still used in transportation and Earth sciences
+                return IMPERIAL;
+            default:
+                return METRIC;
+        }
+    }
+
     private static String formatText(double v, String unit, NumberFormat format) {
         if (format != null) {

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -392 +392 @@
         /* try initial language settings, may be changed later again */
         if (!load(LanguageInfo.getJOSMLocaleCode())) {
-            Locale.setDefault(Locale.ENGLISH);
+            Locale.setDefault(new Locale("en", Locale.getDefault().getCountry()));
         }
     }

trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java

@@ -203 +203 @@
             l = new Locale(localeName.substring(0, country), localeName.substring(country + 1));
         } else {
-            l = new Locale(localeName);
+            l = new Locale(localeName, Locale.getDefault().getCountry());
         }
         return l;