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

Timestamp:

2018-03-18T15:22:47+01:00 (7 years ago)

Author:

Don-vip

Message:

see #16102 - SimplifyWayAction performance improvements (patch by GerdP)

File:

• trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

@@ -141 +141 @@
      */
     protected static boolean isRequiredNode(Way way, Node node) {
-        int frequency = Collections.frequency(way.getNodes(), node);
-        if ((way.getNode(0) == node) && (way.getNode(way.getNodesCount()-1) == node)) {
-            frequency = frequency - 1; // closed way closing node counted only once
-        }
-        boolean isRequired = frequency > 1;
+        boolean isRequired = node.isTagged();
+        if (!isRequired) {
+            int frequency = Collections.frequency(way.getNodes(), node);
+            if ((way.getNode(0) == node) && (way.getNode(way.getNodesCount()-1) == node)) {
+                frequency = frequency - 1; // closed way closing node counted only once
+            }
+            isRequired = frequency > 1;
+        }
         if (!isRequired) {
             List<OsmPrimitive> parents = new LinkedList<>();
@@ -151 +154 @@
             parents.remove(way);
             isRequired = !parents.isEmpty();
-        }
-        if (!isRequired) {
-            isRequired = node.isTagged();
         }
         return isRequired;
@@ -210 +210 @@
             }
         }
+
+        if (newNodes.size() == w.getNodesCount()) return null;
 
         Set<Node> delNodes = new HashSet<>();