Changeset 3700 in josm for trunk/src/org

Timestamp:

2010-12-05T17:56:01+01:00 (14 years ago)

Author:

bastiK

Message:

fixed #4742 - validator: do not warn about deleting a "out-of-downloaded-area node" with id:0 when repairing "doubled nodes"

File:

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

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

@@ -375 +375 @@
         }
 
-        if(checkAndConfirmOutlyingDeletes(nodes))
+        if(checkAndConfirmOutlyingDeletes(nodes, target))
             return MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodes, target);
 
@@ -390 +390 @@
      * Request confirmation if he is.
      */
-    private static boolean checkAndConfirmOutlyingDeletes(LinkedHashSet<Node> del) {
+    private static boolean checkAndConfirmOutlyingDeletes(LinkedHashSet<Node> del, Node ignore) {
         Area a = Main.main.getCurrentDataSet().getDataSourceArea();
         if (a != null) {
             for (OsmPrimitive osm : del) {
-                if (osm instanceof Node && !osm.isNew()) {
+                if (osm instanceof Node && !osm.isNew() && osm != ignore) {
                     Node n = (Node) osm;
                     if (!a.contains(n.getCoor())) {