Changeset 15764 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-01-26T00:18:32+01:00 (5 years ago)

Author:

simon04

Message:

fix #17496 - AutoFilter: infer sensible default values for layer

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/search/SearchCompiler.java (modified) (3 diffs)
• gui/autofilter/AutoFilterManager.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -19 +19 @@
 import java.util.Optional;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -264 +265 @@
 
     /**
+     * Classes implementing this interface can provide Match instances themselves and do not rely on {@link #compile(String)}.
+     *
+     * @since 15764
+     */
+    @FunctionalInterface
+    public interface MatchSupplier extends Supplier<Match> {
+        @Override
+        Match get();
+    }
+
+    /**
      * Base class for all search criteria. If the criterion only depends on an object's tags,
      * inherit from {@link org.openstreetmap.josm.data.osm.search.SearchCompiler.TaggedMatch}.
@@ -1944 +1956 @@
      */
     public static Match compile(SearchSetting setting) throws SearchParseError {
+        if (setting instanceof MatchSupplier) {
+            return ((MatchSupplier) setting).get();
+        }
         if (setting.mapCSSSearch) {
             return compileMapCSS(setting.text);

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

@@ -20 +20 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.actions.mapmode.MapMode;
@@ -27 +29 @@
 import org.openstreetmap.josm.data.osm.FilterModel;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
 import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
@@ -38 +41 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.data.osm.search.SearchCompiler;
+import org.openstreetmap.josm.data.osm.search.SearchCompiler.MatchSupplier;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
@@ -77 +82 @@
 
     /**
+     * Property to determine if the auto filter should assume sensible defaults for values (such as layer=1 for bridge=yes).
+     */
+    private static final BooleanProperty PROP_AUTO_FILTER_DEFAULTS = new BooleanProperty("auto.filter.defaults", true);
+
+    /**
      * The unique instance.
      */
@@ -148 +158 @@
     }
 
+    static class CompiledFilter extends Filter implements MatchSupplier {
+        final String key;
+        final String value;
+
+        CompiledFilter(String key, String value) {
+            this.key = key;
+            this.value = value;
+            this.enable = true;
+            this.inverted = true;
+            this.text = key + "=" + value;
+        }
+
+        @Override
+        public SearchCompiler.Match get() {
+            return new SearchCompiler.Match() {
+                @Override
+                public boolean match(OsmPrimitive osm) {
+                    return getTagValuesForPrimitive(key, osm).anyMatch(value::equals);
+                }
+            };
+        }
+    }
+
     private synchronized void addNewButtons(NavigableSet<String> values) {
         int i = 0;
@@ -153 +186 @@
         MapView mapView = MainApplication.getMap().mapView;
         for (final String value : values.descendingSet()) {
-            Filter filter = new Filter();
-            filter.enable = true;
-            filter.inverted = true;
-            filter.text = enabledRule.getKey() + "=" + value;
+            Filter filter = new CompiledFilter(enabledRule.getKey(), value);
             String label = enabledRule.getValueFormatter().apply(value);
             AutoFilter autoFilter = new AutoFilter(label, filter.text, filter);
@@ -198 +228 @@
         if (ds != null) {
             BBox bbox = MainApplication.getMap().mapView.getState().getViewArea().getLatLonBoundsBox().toBBox();
-            Consumer<OsmPrimitive> consumer = getTagValuesConsumer(key, values);
+            Consumer<OsmPrimitive> consumer = o -> getTagValuesForPrimitive(key, o).forEach(values::add);
             ds.searchNodes(bbox).forEach(consumer);
             ds.searchWays(bbox).forEach(consumer);
@@ -206 +236 @@
     }
 
-    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);
-                    }
+    static Stream<String> getTagValuesForPrimitive(String key, OsmPrimitive osm) {
+        String value = osm.get(key);
+        if (value != null) {
+            Pattern p = Pattern.compile("(-?[0-9]+)-(-?[0-9]+)");
+            return OsmUtils.splitMultipleValues(value).flatMap(v -> {
+                Matcher m = p.matcher(v);
+                if (m.matches()) {
+                    int a = Integer.parseInt(m.group(1));
+                    int b = Integer.parseInt(m.group(2));
+                    return IntStream.rangeClosed(Math.min(a, b), Math.max(a, b))
+                            .mapToObj(Integer::toString);
+                } else {
+                    return Stream.of(v);
                 }
-            }
-        };
+            });
+        } else if (PROP_AUTO_FILTER_DEFAULTS.get() && "layer".equals(key)) {
+            // assume sensible defaults, see #17496
+            if (osm.hasTag("bridge") || osm.hasTag("power", "line") || osm.hasTag("location", "overhead")) {
+                return Stream.of("1");
+            } else if (osm.isKeyTrue("tunnel") || osm.hasTag("tunnel", "culvert") || osm.hasTag("location", "underground")) {
+                return Stream.of("-1");
+            } else if (osm.hasTag("tunnel", "building_passage") || osm.hasKey("highway", "railway", "waterway")) {
+                return Stream.of("0");
+            }
+        }
+        return Stream.empty();
     }