Changeset 17096 in josm for trunk/src

Timestamp:

2020-10-07T19:45:21+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19581: Fixing duplicated nodes does not work

• also check if there is a download area, if not, don't offer auto fix

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

@@ -334 +334 @@
         if (testError.getCode() == DUPLICATE_NODE) return false;
         // cannot merge nodes outside download area
-        final Iterator<? extends OsmPrimitive> it = testError.getPrimitives().iterator();
-        return it.hasNext() && !it.next().isOutsideDownloadArea();
+        return testError.getPrimitives().stream().filter(p -> !p.isDeleted()).count() > 1
+                && Command.checkOutlyingOrIncompleteOperation(testError.getPrimitives(), null) == Command.IS_OK;
         // everything else is ok to merge
     }