Changeset 15842 in josm for trunk/src/org

Timestamp:

2020-02-11T20:31:02+01:00 (5 years ago)

Author:

simon04

Message:

fix #17109 - Autofilter: support 0.5 steps for level

File:

• trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterRule.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.autofilter;
 
+import java.text.DecimalFormat;
 import java.util.Arrays;
 import java.util.Objects;
@@ -122 +123 @@
                 Matcher m = p.matcher(v);
                 if (m.matches()) {
-                    int a = Integer.parseInt(m.group(1));
-                    int b = Integer.parseInt(m.group(2));
+                    int a = valueExtractor.applyAsInt(m.group(1));
+                    int b = valueExtractor.applyAsInt(m.group(2));
                     return IntStream.rangeClosed(Math.min(a, b), Math.max(a, b));
                 } else {
@@ -144 +145 @@
     public static AutoFilterRule[] defaultRules() {
         return new AutoFilterRule[]{
-            new AutoFilterRule("level", 17),
+            new AutoFilterRule("level", 17)
+                // #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.)),
             new AutoFilterRule("layer", 16)
                     .setDefaultValueSupplier(AutoFilterRule::defaultLayer),