Index: trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 4460) +++ trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 4461) @@ -22,7 +22,5 @@ import org.openstreetmap.josm.command.DeleteCommand; import org.openstreetmap.josm.command.SequenceCommand; -import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.data.osm.DataSource; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -31,5 +29,4 @@ import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; import org.openstreetmap.josm.gui.help.HelpUtil; -import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.Shortcut; @@ -42,57 +39,7 @@ } - protected List getCurrentEditBounds() { - LinkedList bounds = new LinkedList(); - OsmDataLayer dataLayer = Main.map.mapView.getEditLayer(); - for (DataSource ds : dataLayer.data.dataSources) { - if (ds.bounds != null) { - bounds.add(ds.bounds); - } - } - return bounds; - } - - protected boolean isInBounds(Node node, List bounds) { - for (Bounds b : bounds) { - if (b.contains(node.getCoor())) - return true; - } - return false; - } - - protected boolean confirmWayWithNodesOutsideBoundingBox() { - ButtonSpec[] options = new ButtonSpec[] { - new ButtonSpec( - tr("Yes, delete nodes"), - ImageProvider.get("ok"), - tr("Delete nodes outside of downloaded data regions"), - null - ), - new ButtonSpec( - tr("No, abort"), - ImageProvider.get("cancel"), - tr("Cancel operation"), - null - ) - }; - int ret = HelpAwareOptionPane.showOptionDialog( - Main.parent, - "" - + trn("The selected way has nodes outside of the downloaded data region.", - "The selected ways have nodes outside of the downloaded data region.", - getCurrentDataSet().getSelectedWays().size()) - - + "
" - + tr("This can lead to nodes being deleted accidentally.") + "
" - + tr("Do you want to delete them anyway?") - + "", - tr("Delete nodes outside of data regions?"), - JOptionPane.WARNING_MESSAGE, - null, // no special icon - options, - options[0], - HelpUtil.ht("/Action/SimplifyWay#ConfirmDeleteNodesOutsideBoundingBoxes") - ); - return ret == 0; + protected boolean confirmWayWithNodesOutsideBoundingBox(List primitives) { + System.out.println(primitives); + return DeleteCommand.checkAndConfirmOutlyingDelete(Main.map.mapView.getEditLayer(), primitives, null); } @@ -143,30 +90,12 @@ try { - Collection selection = ds.getSelected(); - - List bounds = getCurrentEditBounds(); - for (OsmPrimitive prim : selection) { - if (! (prim instanceof Way)) { - continue; - } - if (bounds.size() > 0) { - Way way = (Way) prim; - // We check if each node of each way is at least in one download - // bounding box. Otherwise nodes may get deleted that are necessary by - // unloaded ways (see Ticket #1594) - for (Node node : way.getNodes()) { - if (!isInBounds(node, bounds)) { - if (!confirmWayWithNodesOutsideBoundingBox()) - return; - break; - } - } - } - } - List ways = OsmPrimitive.getFilteredList(selection, Way.class); + List ways = OsmPrimitive.getFilteredList(ds.getSelected(), Way.class); if (ways.isEmpty()) { alertSelectAtLeastOneWay(); return; - } else if (ways.size() > 10) { + } else if (!confirmWayWithNodesOutsideBoundingBox(ways)) { + return; + } + else if (ways.size() > 10) { if (!confirmSimplifyManyWays(ways.size())) return; Index: trunk/src/org/openstreetmap/josm/command/Command.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/Command.java (revision 4460) +++ trunk/src/org/openstreetmap/josm/command/Command.java (revision 4461) @@ -183,7 +183,12 @@ * Request confirmation if he is. * - * @param layer the layer in whose context data is deleted + * @param operation the operation name which is used for setting some preferences + * @param dialogTitle the title of the dialog being displayed + * @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 - * @return true, if deleting outlying primitives is OK; false, otherwise + * @param ignore {@code null} or a primitive to be ignored + * @return true, if operating on outlying primitives is OK; false, otherwise */ public static boolean checkAndConfirmOutlyingOperation(String operation, @@ -196,6 +201,5 @@ if (osm.isIncomplete()) { incomplete = true; - } else if (osm instanceof Node && !osm.isNewOrUndeleted() - && !area.contains(((Node) osm).getCoor()) + } else if (isOutlying(osm, area) && (ignore == null || !ignore.equals(osm))) { outside = true; @@ -240,3 +244,16 @@ } + private static boolean isOutlying(OsmPrimitive osm, Area area) { + if (osm instanceof Node) { + return !osm.isNewOrUndeleted() && !area.contains(((Node) osm).getCoor()); + } else if (osm instanceof Way) { + for (Node n : ((Way) osm).getNodes()) { + if (isOutlying(n, area)) { + return true; + } + } + return false; + } + return false; + } }