Changeset 12407 in josm for trunk

Timestamp:

2017-06-14T22:44:40+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14929 - add support for numeric ranges + unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/autofilter (added)
• test/unit/org/openstreetmap/josm/gui/autofilter/AutoFilterManagerTest.java (added)

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

@@ -18 +18 @@
 import java.util.TreeSet;
 import java.util.function.Consumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.Main;
@@ -175 +177 @@
         if (ds != null) {
             BBox bbox = Main.map.mapView.getState().getViewArea().getLatLonBoundsBox().toBBox();
-            Consumer<OsmPrimitive> consumer = o -> {
-                String value = o.get(key);
-                if (value != null) {
-                    for (String v : value.split(";")) {
+            Consumer<OsmPrimitive> consumer = getTagValuesConsumer(key, values);
+            ds.searchNodes(bbox).forEach(consumer);
+            ds.searchWays(bbox).forEach(consumer);
+            ds.searchRelations(bbox).forEach(consumer);
+        }
+        return values;
+    }
+
+    static Consumer<OsmPrimitive> getTagValuesConsumer(String key, Set<String> values) {
+        return o -> {
+            String value = o.get(key);
+            if (value != null) {
+                Pattern p = Pattern.compile("(-?[0-9]+)-(-?[0-9]+)");
+                for (String v : value.split(";")) {
+                    Matcher m = p.matcher(v);
+                    if (m.matches()) {
+                        int a = Integer.parseInt(m.group(1));
+                        int b = Integer.parseInt(m.group(2));
+                        for (int i = Math.min(a, b); i <= Math.max(a, b); i++) {
+                            values.add(Integer.toString(i));
+                        }
+                    } else {
                         values.add(v);
                     }
                 }
-            };
-            ds.searchNodes(bbox).forEach(consumer);
-            ds.searchWays(bbox).forEach(consumer);
-            ds.searchRelations(bbox).forEach(consumer);
-        }
-        return values;
+            }
+        };
     }