Changeset 5060 in josm

Timestamp:

Mar 8, 2012 10:02:30 PM (15 months ago)

Author:

simon04

Message:

fix #7470 - tune warning of nodes out of downloaded bbox

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/Command.java (modified) (1 diff)
• command/DeleteCommand.java (modified) (2 diffs)
• data/validation/tests/DuplicateNode.java (modified) (2 diffs)

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

@@ -177 +177 @@
     public static boolean checkAndConfirmOutlyingOperation(String operation,
             String dialogTitle, String outsideDialogMessage, String incompleteDialogMessage,
-            Area area, Collection<? extends OsmPrimitive> primitives, OsmPrimitive ignore) {
+            Area area, Collection<? extends OsmPrimitive> primitives,
+            Collection<? extends OsmPrimitive> ignore) {
         boolean outside = false;
         boolean incomplete = false;
-        if (area != null) {
-            for (OsmPrimitive osm : primitives) {
-                if (osm.isIncomplete()) {
-                    incomplete = true;
-                } else if (isOutlying(osm, area)
-                        && (ignore == null || !ignore.equals(osm))) {
-                    outside = true;
-                }
-            }
-        } else {
-            for (OsmPrimitive osm : primitives) {
-                if (osm.isIncomplete()) {
-                    incomplete = true;
-                }
+        for (OsmPrimitive osm : primitives) {
+            if (osm.isIncomplete()) {
+                incomplete = true;
+            } else if (area != null && isOutlying(osm, area)
+                    && (ignore == null || !ignore.contains(osm))) {
+                outside = true;
             }
         }

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

@@ -358 +358 @@
         }
 
-        if (!silent && !checkAndConfirmOutlyingDelete(layer, primitivesToDelete, null))
+        if (!silent && !checkAndConfirmOutlyingDelete(layer,
+                primitivesToDelete, Utils.filteredCollection(primitivesToDelete, Way.class)))
             return null;
 
@@ -454 +455 @@
     }
 
-    public static boolean checkAndConfirmOutlyingDelete(OsmDataLayer layer, Collection<? extends OsmPrimitive> primitives, OsmPrimitive ignore) {
+    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, OsmPrimitive ignore) {
+    public static boolean checkAndConfirmOutlyingDelete(Area area, Collection<? extends OsmPrimitive> primitives, Collection<? extends OsmPrimitive> ignore) {
         return Command.checkAndConfirmOutlyingOperation("delete",
                 tr("Delete confirmation"),

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

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -384 +385 @@
         }
 
-        if (DeleteCommand.checkAndConfirmOutlyingDelete(Main.main.getCurrentDataSet().getDataSourceArea(), nodes, target))
+        if (DeleteCommand.checkAndConfirmOutlyingDelete(Main.main.getCurrentDataSet().getDataSourceArea(), nodes, Collections.singleton(target)))
             return MergeNodesAction.mergeNodes(Main.main.getEditLayer(), nodes, target);