Changeset 6639 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2014-01-06T12:27:11+01:00 (11 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/command

Files:

• Command.java (modified) (4 diffs)
• DeleteCommand.java (modified) (5 diffs)

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);
     }