Changeset 18274 in josm for trunk/src/org

Timestamp:

2021-10-13T11:17:10+02:00 (3 years ago)

Author:

GerdP

Message:

fix #20899: Improve Way Accuracy Action: Warn when moving elements by a large distance
(patch w-confirmMovement.patch by ljdelight)
This patch updates the W-shortcut logic to check for nodes that move a large distance and show a warning dialog.

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• ImproveWayAccuracyAction.java (modified) (1 diff)
• SelectAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -512 +512 @@
                 UndoRedoHandler.getInstance().add(
                         new MoveCommand(candidateNode, cursorEN.east() - nodeEN.east(), cursorEN.north() - nodeEN.north()));
+
+                SelectAction.checkCommandForLargeDistance(UndoRedoHandler.getInstance().getLastCommand());
             }
         }

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -838 +838 @@
             showConfirmMoveDialog(ed);
         }
+
         final Command lastCommand = UndoRedoHandler.getInstance().getLastCommand();
         if (lastCommand == null) {
@@ -843 +844 @@
             return;
         }
+
+        SelectAction.checkCommandForLargeDistance(lastCommand);
+
+        final int moveCount = lastCommand.getParticipatingPrimitives().size();
+        final int max = Config.getPref().getInt("warn.move.maxelements", 20);
+        if (moveCount > max) {
+            final ConfirmMoveDialog ed = new ConfirmMoveDialog();
+            ed.setContent(
+                    /* for correct i18n of plural forms - see #9110 */
+                    trn("You moved more than {0} element. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
+                        "You moved more than {0} elements. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
+                        max, max));
+            ed.toggleEnable("movedManyElements");
+            showConfirmMoveDialog(ed);
+        } else {
+            // if small number of elements were moved,
+            updateKeyModifiers(e);
+            if (ctrl) mergePrims(e.getPoint());
+        }
+    }
+
+    static void checkCommandForLargeDistance(Command lastCommand) {
         final int moveCount = lastCommand.getParticipatingPrimitives().size();
         if (lastCommand instanceof MoveCommand) {
@@ -858 +881 @@
             }
         }
-        int max = Config.getPref().getInt("warn.move.maxelements", 20);
-        if (moveCount > max) {
-            final ConfirmMoveDialog ed = new ConfirmMoveDialog();
-            ed.setContent(
-                    /* for correct i18n of plural forms - see #9110 */
-                    trn("You moved more than {0} element. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
-                        "You moved more than {0} elements. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
-                        max, max));
-            ed.toggleEnable("movedManyElements");
-            showConfirmMoveDialog(ed);
-        } else {
-            // if small number of elements were moved,
-            updateKeyModifiers(e);
-            if (ctrl) mergePrims(e.getPoint());
-        }
-    }
-
-    private void showConfirmMoveDialog(ConfirmMoveDialog ed) {
+    }
+
+    private static void showConfirmMoveDialog(ConfirmMoveDialog ed) {
         if (ed.showDialog().getValue() != 1) {
             UndoRedoHandler.getInstance().undo();