Changeset 12400 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

2017-06-11T22:26:15+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14929 - Automatic filters on numeric tag values (level, layer, maxspeed, voltage)

File:

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

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -50 +50 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.gui.MapViewState.MapViewRectangle;
+import org.openstreetmap.josm.gui.autofilter.AutoFilterManager;
 import org.openstreetmap.josm.gui.datatransfer.OsmTransferHandler;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -289 +290 @@
             add(c);
         }
+        if (AutoFilterManager.PROP_AUTO_FILTER_ENABLED.get()) {
+            AutoFilterManager.getInstance().enableAutoFilterRule(AutoFilterManager.PROP_AUTO_FILTER_RULE.get());
+        }
         setTransferHandler(new OsmTransferHandler());
     }
@@ -558 +562 @@
         }
 
-        if (Main.isDisplayingMapView() && Main.map.filterDialog != null) {
+        if (AutoFilterManager.getInstance().getCurrentAutoFilter() != null) {
+            AutoFilterManager.getInstance().drawOSDText(tempG);
+        } else if (Main.isDisplayingMapView() && Main.map.filterDialog != null) {
             Main.map.filterDialog.drawOSDText(tempG);
         }