Changeset 12969 in josm for trunk/src

Timestamp:

2017-10-09T21:26:26+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15420 - should fix NPE in ParallelWays.copyNode (probably caused by an incomplete or empty way)

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• ParallelWayAction.java (modified) (1 diff)
• ParallelWays.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

@@ -505 +505 @@
             return false;
 
+        sourceWays.removeIf(w -> w.isIncomplete() || w.getNodesCount() == 0);
+
         if (!sourceWays.contains(referenceSegment.way)) {
             clearSourceWays();

trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java

@@ -44 +44 @@
      */
     public ParallelWays(Collection<Way> sourceWays, boolean copyTags, int refWayIndex) {
-        // Possible/sensible to use PrimetiveDeepCopy here?
+        // Possible/sensible to use PrimitiveDeepCopy here?
 
         // Make a deep copy of the ways, keeping the copied ways connected
@@ -50 +50 @@
         Map<Node, Node> splitNodeMap = new HashMap<>(sourceWays.size());
         for (Way w : sourceWays) {
-            if (!splitNodeMap.containsKey(w.firstNode())) {
-                splitNodeMap.put(w.firstNode(), copyNode(w.firstNode(), copyTags));
-            }
-            if (!splitNodeMap.containsKey(w.lastNode())) {
-                splitNodeMap.put(w.lastNode(), copyNode(w.lastNode(), copyTags));
-            }
+            copyNodeInMap(splitNodeMap, w.firstNode(), copyTags);
+            copyNodeInMap(splitNodeMap, w.lastNode(), copyTags);
         }
         ways = new ArrayList<>(sourceWays.size());
@@ -125 +121 @@
     }
 
+    private static void copyNodeInMap(Map<Node, Node> splitNodeMap, Node node, boolean copyTags) {
+        if (!splitNodeMap.containsKey(node)) {
+            splitNodeMap.put(node, copyNode(node, copyTags));
+        }
+    }
+
     /**
      * Determines if the nodes graph form a closed path