Ticket #24482: autofilter_03_fractional.patch

src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java

@@ -14 +14 @@
 import java.util.Objects;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.function.Consumer;
 
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.osm.BBox;
@@ -196 +195 @@
 
         @Override
         public boolean match(OsmPrimitive osm) {
-            return rule.getTagValuesForPrimitive(osm).anyMatch(v -> v == value);
+            return rule.getTagValuesForPrimitive(osm, false).anyMatch(v -> v == value);
         }
 
         @Override
@@ -260 +259 @@
         }
         BBox bbox = MainApplication.getMap().mapView.getState().getViewArea().getLatLonBoundsBox().toBBox();
         NavigableSet<Integer> values = new TreeSet<>();
-        Consumer<OsmPrimitive> consumer = o -> enabledRule.getTagValuesForPrimitive(o).forEach(values::add);
-        ds.searchNodes(bbox).forEach(consumer);
-        ds.searchWays(bbox).forEach(consumer);
-        ds.searchRelations(bbox).forEach(consumer);
+        for (var primitiveList : List.of(ds.searchNodes(bbox), ds.searchWays(bbox), ds.searchRelations(bbox))) {
+            // add all values that are directly mentioned
+            primitiveList.forEach(o -> enabledRule.getTagValuesForPrimitive(o, true).forEach(values::add));
+            // only add integer values from value ranges, not fractional values
+            primitiveList.forEach(o -> enabledRule.getTagValuesForPrimitive(o, false)
+                    .filter(v -> !enabledRule.formatValue(v).contains("."))
+                    .forEach(values::add));
+
+        }
         return values;
     }
 

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

@@ -130 +130 @@
 
     /**
      * Returns the numeric values for the given OSM primitive
-     * @param osm the primitive
+     *
+     * @param osm              the primitive
+     * @param directValuesOnly whether "inner" values from ranges (such as 6 and 7 for 5-8) should be omitted
      * @return a stream of numeric values
      */
-    public IntStream getTagValuesForPrimitive(OsmPrimitive osm) {
+    public IntStream getTagValuesForPrimitive(OsmPrimitive osm, boolean directValuesOnly) {
         if (allKeys.size() == 1) {
-            IntStream values = getTagValuesForPrimitive(osm, key);
+            IntStream values = getTagValuesForPrimitive(osm, key, directValuesOnly);
             if (values != null) return values;
         } else {
             Set<Integer> allValues = new HashSet<>();
             for (String k : allKeys) {
-                IntStream values = getTagValuesForPrimitive(osm, k);
+                IntStream values = getTagValuesForPrimitive(osm, k, directValuesOnly);
                 if (values != null) { values.forEach(allValues::add); }
             }
             if (!allValues.isEmpty()) return allValues.stream().mapToInt(it -> it).sorted();
@@ -148 +150 @@
         return Boolean.TRUE.equals(PROP_AUTO_FILTER_DEFAULTS.get()) ? defaultValueSupplier.apply(osm) : IntStream.empty();
     }
 
-    private IntStream getTagValuesForPrimitive(OsmPrimitive osm, String key) {
+    private IntStream getTagValuesForPrimitive(OsmPrimitive osm, String key, boolean directValuesOnly) {
         String value = osm.get(key);
         if (value != null) {
             Pattern p = Pattern.compile("(-?[0-9]+)-(-?[0-9]+)");
@@ -157 +159 @@
                 if (m.matches()) {
                     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));
+                    if (directValuesOnly && a != b) {
+                        return IntStream.of(a, b).sorted();
+                    } else {
+                        return IntStream.rangeClosed(Math.min(a, b), Math.max(a, b));
+                    }
                 } else {
                     try {
                         return IntStream.of(valueExtractor.applyAsInt(v));

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

@@ -22 +22 @@
 @I18n
 class AutoFilterRuleTest {
     /**
-     * Unit test of {@link AutoFilterRule#getTagValuesForPrimitive(OsmPrimitive)}.
+     * Unit test of {@link AutoFilterRule#getTagValuesForPrimitive(OsmPrimitive, boolean)}.
      */
     @Test
     void testTagValuesForPrimitive() {
@@ -43 +43 @@
     }
 
     /**
-     * Unit test of {@link AutoFilterRule#getTagValuesForPrimitive(OsmPrimitive)} to deal with {@code %} of key {@code incline}.
+     * Unit test of {@link AutoFilterRule#getTagValuesForPrimitive(OsmPrimitive, boolean)} to deal with {@code %} of key {@code incline}.
      */
     @Test
     void testTagValuesForPrimitiveInclineUnit() {
@@ -54 +54 @@
     }
 
     /**
-     * Unit test of {@link AutoFilterRule#getTagValuesForPrimitive(OsmPrimitive)} provides sensible defaults, see #17496.
+     * Unit test of {@link AutoFilterRule#getTagValuesForPrimitive(OsmPrimitive, boolean)} provides sensible defaults, see #17496.
      */
     @Test
     void testTagValuesForPrimitivesDefaults() {
@@ -71 +71 @@
 
     private void assertTagValuesForPrimitive(AutoFilterRule rule, String assertion, int... expected) {
         final OsmPrimitive primitive = OsmUtils.createPrimitive(assertion);
-        final int[] actual = rule.getTagValuesForPrimitive(primitive).toArray();
+        final int[] actual = rule.getTagValuesForPrimitive(primitive, false).toArray();
         assertArrayEquals(expected, actual);
     }