Changeset 35334 in osm for applications/editors/josm

Timestamp:

2020-02-21T11:35:40+01:00 (5 years ago)

Author:

gerdp

Message:

improve performance of Adjacent Ways action (regression from o35177)
Way.isUsable() is complex as it involves a loop over all nodes in hasIncompleteNodes()
First collect parent ways, then check each way only once.

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java (modified) (2 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java

@@ -8 +8 @@
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
@@ -95 +96 @@
         List<Node> nodes = w.getNodes();
         boolean flag = ways.contains(w);
-        for (Node n: nodes) {
-            filteredAddAll(ways, n.getParentWays());
-        }
+        Set<Way> parents = new LinkedHashSet<>();
+        nodes.forEach(n -> parents.addAll(n.getParentWays()));
+        filteredAddAll(ways, parents);
         if (!flag) ways.remove(w);
         return ways.size() - s;