Changeset 17283 in josm for trunk/src

Timestamp:

2020-10-29T17:56:01+01:00 (4 years ago)

Author:

GerdP

Message:

fix #19438: DataIntegrityProblemException: Deleted node referenced during conflict solving

• use Way.calculateRemoveNodes() if way is not incomplete

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (1 diff)

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

@@ -792 +792 @@
             Set<Way> result = new HashSet<>();
             for (Way way : node.getParentWays()) {
-                List<Node> wayNodes = way.getNodes();
-                if (wayNodes.removeIf(node::equals)) {
+                List<Node> wayNodes;
+                if (!way.isIncomplete()) {
+                    wayNodes = way.calculateRemoveNodes(Collections.singleton(node));
+                } else {
+                    wayNodes = way.getNodes();
+                    wayNodes.removeIf(node::equals);
+                }
+                if (wayNodes.size() < way.getNodesCount()) {
                     if (wayNodes.size() < 2) {
                         deleteWay(way);