Changeset 15843 in josm

Timestamp:

2020-02-11T21:53:29+01:00 (5 years ago)

Author:

simon04

Message:

see #17109 - Autofilter: use dot as decimal separator

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/autofilter/AutoFilterRuleTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java

@@ -4 +4 @@
 import java.text.DecimalFormat;
 import java.util.Arrays;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
@@ -148 +149 @@
                 // #17109, support values like 0.5 or 1.5 - level values are multiplied by 2 when parsing, values are divided by 2 for formatting
                 .setValueExtractor(s -> (int) (Double.parseDouble(s) * 2.))
-                .setValueFormatter(v -> DecimalFormat.getInstance().format(v / 2.)),
+                .setValueFormatter(v -> DecimalFormat.getInstance(Locale.ROOT).format(v / 2.)),
             new AutoFilterRule("layer", 16)
                     .setDefaultValueSupplier(AutoFilterRule::defaultLayer),

trunk/test/unit/org/openstreetmap/josm/gui/autofilter/AutoFilterRuleTest.java

@@ -6 +6 @@
 
 import java.util.NoSuchElementException;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import org.junit.Rule;
@@ -42 +44 @@
         assertTagValuesForPrimitive(level, "way level=10;12-13", 20, 24, 25, 26);
         assertTagValuesForPrimitive(level, "way level=0;0.5;1;1.5;2;2.5;3", 0, 1, 2, 3, 4, 5, 6);
+        assertEquals("0 0.5 1 1.5 2 2.5 3",
+                IntStream.of(0, 1, 2, 3, 4, 5, 6).mapToObj(level::formatValue).collect(Collectors.joining(" ")));
     }