Changeset 15874 in josm for trunk

Timestamp:

2020-02-17T14:33:26+01:00 (5 years ago)

Author:

GerdP

Message:

see #18728: Join overlapping Areas is slow when combining many complex ways
Improve performance of DeleteCommand.delete() when thousands of ways are removed

Don't calculate set of nodes inside the loop which adds delete commands for the ways, the set doesn't change in this loop.

File:

• trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -441 +441 @@
 
         Collection<Command> cmds = new LinkedList<>();
+        Set<Node> nodesToRemove = new HashSet<>(Utils.filteredCollection(primitivesToDelete, Node.class));
         for (Way w : waysToBeChanged) {
             Way wnew = new Way(w);
-            wnew.removeNodes(new HashSet<>(Utils.filteredCollection(primitivesToDelete, Node.class)));
+            wnew.removeNodes(nodesToRemove);
             if (wnew.getNodesCount() < 2) {
                 primitivesToDelete.add(w);