Changeset 6639 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests

Timestamp:

2014-01-06T12:27:11+01:00 (10 years ago)

Author:

simon04

Message:

fix #9544 - Skip nodes outside of download area for BarriersEntrances and WayConnectedToArea validation tests

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• BarriersEntrances.java (modified) (1 diff)
• DuplicateNode.java (modified) (1 diff)
• WayConnectedToArea.java (modified) (1 diff)

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

@@ -27 +27 @@
     @Override
     public void visit(Node n) {
-        if (n.hasTag("barrier", "entrance")) {
+        if (n.hasTag("barrier", "entrance") && !n.isOutsideDownloadArea()) {
             for (OsmPrimitive p : n.getReferrers()) {
                 if (p.hasKey("barrier")) {

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

@@ -409 +409 @@
             }
 
-            if (DeleteCommand.checkAndConfirmOutlyingDelete(Main.main.getCurrentDataSet().getDataSourceArea(), nodes, Collections.singleton(target)))
+            if (DeleteCommand.checkAndConfirmOutlyingDelete(nodes, Collections.singleton(target)))
                 return MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodes, target);
         }

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

@@ -64 +64 @@
 
     private void testForError(Way w, Node wayNode, OsmPrimitive p) {
-        if (isArea(p)) {
+        if (wayNode.isOutsideDownloadArea()) {
+        } else if (isArea(p)) {
             addError(w, wayNode, p);
         } else {