Changeset 14203 in josm for trunk/src/org

Timestamp:

2018-08-29T21:15:20+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #15696, see #16688 - Don't use the localized decimal separator for coordinates

Location:

trunk/src/org/openstreetmap/josm/data/coor/conversion

Files:

• AbstractCoordinateFormat.java (modified) (2 diffs)
• DMSCoordinateFormat.java (modified) (1 diff)
• NauticalCoordinateFormat.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/coor/conversion/AbstractCoordinateFormat.java

@@ -17 +17 @@
     protected final String displayName;
 
-    /**
-     * The normal number format for server precision coordinates
-     */
-    protected static final DecimalFormat cDdFormatter;
-    static {
-        // Don't use the localized decimal separator. This way we can present
-        // a comma separated list of coordinates.
-        cDdFormatter = (DecimalFormat) NumberFormat.getInstance(Locale.UK);
-        cDdFormatter.applyPattern("###0.0######");
-    }
-
+    /** The normal number format for server precision coordinates */
+    protected static final DecimalFormat cDdFormatter = newUnlocalizedDecimalFormat("###0.0######");
     /** Character denoting South, as string */
     protected static final String SOUTH = trc("compass", "S");
@@ -40 +31 @@
         this.id = id;
         this.displayName = displayName;
+    }
+
+    /**
+     * Creates a new unlocalized {@link DecimalFormat}.
+     * By not using the localized decimal separator, we can present a comma separated list of coordinates.
+     * @param pattern decimal format pattern
+     * @return {@code DecimalFormat} using dot as decimal separator
+     * @see DecimalFormat#applyPattern
+     * @since 14203
+     */
+    public static DecimalFormat newUnlocalizedDecimalFormat(String pattern) {
+        DecimalFormat format = (DecimalFormat) NumberFormat.getInstance(Locale.UK);
+        format.applyPattern(pattern);
+        return format;
     }
 

trunk/src/org/openstreetmap/josm/data/coor/conversion/DMSCoordinateFormat.java

@@ -15 +15 @@
 public class DMSCoordinateFormat extends AbstractCoordinateFormat {
 
-    private static final DecimalFormat DMS_MINUTE_FORMATTER = new DecimalFormat("00");
-    private static final DecimalFormat DMS_SECOND_FORMATTER = new DecimalFormat(
+    private static final DecimalFormat DMS_MINUTE_FORMATTER = newUnlocalizedDecimalFormat("00");
+    private static final DecimalFormat DMS_SECOND_FORMATTER = newUnlocalizedDecimalFormat(
             Config.getPref() == null ? "00.0" : Config.getPref().get("latlon.dms.decimal-format", "00.0"));
     private static final String DMS60 = DMS_SECOND_FORMATTER.format(60.0);

trunk/src/org/openstreetmap/josm/data/coor/conversion/NauticalCoordinateFormat.java

@@ -14 +14 @@
  */
 public class NauticalCoordinateFormat extends AbstractCoordinateFormat {
-    private static final DecimalFormat DM_MINUTE_FORMATTER = new DecimalFormat(
+    private static final DecimalFormat DM_MINUTE_FORMATTER = newUnlocalizedDecimalFormat(
             Config.getPref() == null ? "00.000" : Config.getPref().get("latlon.dm.decimal-format", "00.000"));
     private static final String DM60 = DM_MINUTE_FORMATTER.format(60.0);