Changeset 13309 in josm for trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java

Timestamp:

2018-01-13T00:52:54+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15766, see #15688 - fix performance regression introduced in r13229 when drawing a way of many nodes while the filter dialog is open

File:

• trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.search.SearchMode;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
@@ -225 +223 @@
 
     private static FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
-        MapFrame map = MainApplication.getMap();
-        if (primitive.isIncomplete() ||
-                (map != null && map.mapMode != null && map.mapMode.getPreservedPrimitives().contains(primitive)))
+        if (primitive.isIncomplete() || primitive.isPreserved())
             return FilterType.NOT_FILTERED;