Changeset 6639 in josm for trunk

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

Files:

• actions/JoinAreasAction.java (modified) (3 diffs)
• actions/SimplifyWayAction.java (modified) (1 diff)
• actions/UnGlueAction.java (modified) (1 diff)
• command/Command.java (modified) (4 diffs)
• command/DeleteCommand.java (modified) (5 diffs)
• data/osm/Node.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/Relation.java (modified) (1 diff)
• data/osm/Way.java (modified) (1 diff)
• data/validation/tests/BarriersEntrances.java (modified) (1 diff)
• data/validation/tests/DuplicateNode.java (modified) (1 diff)
• data/validation/tests/WayConnectedToArea.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.awt.geom.Area;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -338 +337 @@
 
         // TODO: Only display this warning when nodes outside dataSourceArea are deleted
-        Area dataSourceArea = Main.main.getCurrentDataSet().getDataSourceArea();
         boolean ok = Command.checkAndConfirmOutlyingOperation("joinarea", tr("Join area confirmation"),
                 trn("The selected way has nodes outside of the downloaded data region.",
@@ -347 +345 @@
                     + tr("Please abort if you are not sure"),
                 tr("The selected area is incomplete. Continue?"),
-                dataSourceArea, allNodes, null);
+                allNodes, null);
         if(!ok) return;
 

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

@@ -49 +49 @@
 
     protected boolean confirmWayWithNodesOutsideBoundingBox(List<? extends OsmPrimitive> primitives) {
-        return DeleteCommand.checkAndConfirmOutlyingDelete(Main.main.getEditLayer(), primitives, null);
+        return DeleteCommand.checkAndConfirmOutlyingDelete(primitives, null);
     }
 

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -438 +438 @@
                         + "This will cause problems because you don''t see the real object."
                         + "<br>" + "Do you really want to unglue?"),
-                getEditLayer().data.getDataSourceArea(), primitives, null);
+                primitives, null);
     }
 }

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -191 +191 @@
      * @param outsideDialogMessage the message text to be displayed when data is outside of the download area
      * @param incompleteDialogMessage the message text to be displayed when data is incomplete
-     * @param area the area used to determine whether data is outlying
      * @param primitives the primitives to operate on
      * @param ignore {@code null} or a primitive to be ignored
@@ -198 +197 @@
     public static boolean checkAndConfirmOutlyingOperation(String operation,
             String dialogTitle, String outsideDialogMessage, String incompleteDialogMessage,
-            Area area, Collection<? extends OsmPrimitive> primitives,
+            Collection<? extends OsmPrimitive> primitives,
             Collection<? extends OsmPrimitive> ignore) {
         boolean outside = false;
@@ -205 +204 @@
             if (osm.isIncomplete()) {
                 incomplete = true;
-            } else if (area != null && isOutlying(osm, area)
+            } else if (osm.isOutsideDownloadArea()
                     && (ignore == null || !ignore.contains(osm))) {
                 outside = true;
@@ -241 +240 @@
     }
 
-    private static boolean isOutlying(OsmPrimitive osm, Area area) {
-        if (osm instanceof Node && !osm.isNewOrUndeleted()) {
-            return !((Node) osm).getCoor().isIn(area);
-        } else if (osm instanceof Way) {
-            for (Node n : ((Way) osm).getNodes()) {
-                if (isOutlying(n, area)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        return false;
-    }
 }

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -7 +7 @@
 
 import java.awt.GridBagLayout;
-import java.awt.geom.Area;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -253 +252 @@
         if (parents.isEmpty())
             return null;
-        if (!silent && !checkAndConfirmOutlyingDelete(layer, parents, null))
+        if (!silent && !checkAndConfirmOutlyingDelete(parents, null))
             return null;
         return new DeleteCommand(layer,parents);
@@ -355 +354 @@
         }
 
-        if (!silent && !checkAndConfirmOutlyingDelete(layer,
+        if (!silent && !checkAndConfirmOutlyingDelete(
                 primitivesToDelete, Utils.filteredCollection(primitivesToDelete, Way.class)))
             return null;
@@ -450 +449 @@
     }
 
-    public static boolean checkAndConfirmOutlyingDelete(OsmDataLayer layer, Collection<? extends OsmPrimitive> primitives, Collection<? extends OsmPrimitive> ignore) {
-        return checkAndConfirmOutlyingDelete(layer.data.getDataSourceArea(), primitives, ignore);
-    }
-
-    public static boolean checkAndConfirmOutlyingDelete(Area area, Collection<? extends OsmPrimitive> primitives, Collection<? extends OsmPrimitive> ignore) {
+    public static boolean checkAndConfirmOutlyingDelete(Collection<? extends OsmPrimitive> primitives, Collection<? extends OsmPrimitive> ignore) {
         return Command.checkAndConfirmOutlyingOperation("delete",
                 tr("Delete confirmation"),
@@ -466 +461 @@
                         + "This will cause problems because you don''t see the real object."
                         + "<br>" + "Do you really want to delete?"),
-                area, primitives, ignore);
+                primitives, ignore);
     }
 

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

@@ -376 +376 @@
         return false;
     }
+
+    @Override
+    public boolean isOutsideDownloadArea() {
+        return !isNewOrUndeleted() && getDataSet() != null && getDataSet().getDataSourceArea() != null
+                && !getCoor().isIn(getDataSet().getDataSourceArea());
+    }
 }

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

@@ -1367 +1367 @@
      */
     public abstract boolean concernsArea();
+
+    /**
+     * Tests if this primitive lies outside of the downloaded area of its {@link DataSet}.
+     * @return {@code true} if this primitive lies outside of the downloaded area
+     */
+    public abstract boolean isOutsideDownloadArea();
 }

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

@@ -550 +550 @@
         return isMultipolygon() && hasAreaTags();
     }
+
+    @Override
+    public boolean isOutsideDownloadArea() {
+        return false;
+    }
 }

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

@@ -726 +726 @@
         return hasAreaTags();
     }
+
+    @Override
+    public boolean isOutsideDownloadArea() {
+        for (final Node n : nodes) {
+            if (n.isOutsideDownloadArea()) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

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 {