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

Timestamp:

2011-01-09T16:33:27+01:00 (13 years ago)

Author:

framm

Message:

disallow auto-"fixing" when nodes with different tags are at the same location -
this causes more problems than it solves. we will also have to reduce the amount
of damage than can be done by "fixing" highway duplicates (which will often introduce
bogus junctions).

File:

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

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

@@ -360 +360 @@
     @Override
     public Command fixError(TestError testError) {
+        if (!isFixable(testError)) return null;
         Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>(testError.getPrimitives());
         LinkedHashSet<Node> nodes = new LinkedHashSet<Node>(OsmPrimitive.getFilteredList(sel, Node.class));
@@ -375 +376 @@
         }
 
-        if(checkAndConfirmOutlyingDeletes(nodes, target))
+        if (checkAndConfirmOutlyingDeletes(nodes, target))
             return MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodes, target);
 
@@ -383 +384 @@
     @Override
     public boolean isFixable(TestError testError) {
-        return (testError.getTester() instanceof DuplicateNode);
+        return (testError.getTester() instanceof DuplicateNode && testError.getSeverity() == Severity.ERROR);
     }