Changeset 18759 in josm

Timestamp:

2023-06-14T20:58:53+02:00 (18 months ago)

Author:

taylor.smock

Message:

Fix #22279: Add new split mode for quick splitting of ways (patch by Woazboat, modified)

Modifications are as follows:

• Simplify/inline some variables
• Move an inner class used only in a class that it is not in into the appropriate class
• Fix a pre-existing bug where InputEvent.META_MASK would not be mapped to InputEvent.META_DOWN_MASK
• Override some additional methods in SplitMode (layerIsSupported and getModeHelpText)

Location:

trunk

Files:

• resources/images/mapmode/splitway.svg (moved) (moved from trunk/resources/images/splitway.svg )
• src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/actions/mapmode/MapMode.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/SplitMode.java (added)
• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/util/HighlightHelper.java (modified) (3 diffs)

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

@@ -65 +65 @@
      */
     public SplitWayAction() {
-        super(tr("Split Way"), "splitway", tr("Split a way at the selected node."),
+        super(tr("Split Way"), "mapmode/splitway", tr("Split a way at the selected node."),
                 Shortcut.registerShortcut("tools:splitway", tr("Tools: {0}", tr("Split Way")), KeyEvent.VK_P, Shortcut.DIRECT), true);
         setHelpId(ht("/Action/SplitWay"));
@@ -147 +147 @@
         // Finally, applicableWays contains only one perfect way
         final Way selectedWay = applicableWays.get(0);
-        final List<List<Node>> wayChunks = SplitWayCommand.buildSplitChunks(selectedWay, selectedNodes);
+        final List<OsmPrimitive> sel = new ArrayList<>(ds.getSelectedRelations());
+        sel.addAll(selectedWays);
+        doSplitWayShowSegmentSelection(selectedWay, selectedNodes, sel);
+    }
+
+    /**
+     * Perform way splitting after presenting the user with a choice which way segment history should be preserved (in expert mode)
+     * @param splitWay The way to split
+     * @param splitNodes The nodes at which the way should be split
+     * @param selection (Optional) selection which should be updated
+     *
+     * @since 18759
+     */
+    public static void doSplitWayShowSegmentSelection(Way splitWay, List<Node> splitNodes, List<OsmPrimitive> selection) {
+        final List<List<Node>> wayChunks = SplitWayCommand.buildSplitChunks(splitWay, splitNodes);
         if (wayChunks != null) {
-            final List<OsmPrimitive> sel = new ArrayList<>(ds.getSelectedRelations());
-            sel.addAll(selectedWays);
-
-            final List<Way> newWays = SplitWayCommand.createNewWaysFromChunks(selectedWay, wayChunks);
+            final List<Way> newWays = SplitWayCommand.createNewWaysFromChunks(splitWay, wayChunks);
             final Way wayToKeep = SplitWayCommand.Strategy.keepLongestChunk().determineWayToKeep(newWays);
 
-            if (ExpertToggleAction.isExpert() && !selectedWay.isNew()) {
-                final ExtendedDialog dialog = new SegmentToKeepSelectionDialog(selectedWay, newWays, wayToKeep, selectedNodes, sel);
+            if (ExpertToggleAction.isExpert() && !splitWay.isNew()) {
+                final ExtendedDialog dialog = new SegmentToKeepSelectionDialog(splitWay, newWays, wayToKeep, splitNodes, selection);
                 dialog.toggleEnable("way.split.segment-selection-dialog");
                 if (!dialog.toggleCheckState()) {
@@ -165 +176 @@
             }
             if (wayToKeep != null) {
-                doSplitWay(selectedWay, wayToKeep, newWays, sel);
+                doSplitWay(splitWay, wayToKeep, newWays, selection);
             }
         }

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

@@ -185 +185 @@
      * @return extended modifiers
      */
-    @SuppressWarnings("deprecation")
     private static int mapOldModifiers(int modifiers) {
         if ((modifiers & InputEvent.CTRL_MASK) != 0) {
             modifiers |= InputEvent.CTRL_DOWN_MASK;
+        }
+        if ((modifiers & InputEvent.META_MASK) != 0) {
+            modifiers |= InputEvent.META_DOWN_MASK;
         }
         if ((modifiers & InputEvent.ALT_MASK) != 0) {

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -52 +52 @@
 import org.openstreetmap.josm.actions.mapmode.SelectAction;
 import org.openstreetmap.josm.actions.mapmode.SelectLassoAction;
+import org.openstreetmap.josm.actions.mapmode.SplitMode;
 import org.openstreetmap.josm.actions.mapmode.ZoomAction;
 import org.openstreetmap.josm.data.ViewportData;
@@ -246 +247 @@
         mapModeDelete = new DeleteAction();
 
-        addMapMode(new IconToggleButton(mapModeSelect));
+        addMapMode(new IconToggleButton(mapModeSelect, false));
         addMapMode(new IconToggleButton(mapModeSelectLasso, true));
-        addMapMode(new IconToggleButton(mapModeDraw));
+        addMapMode(new IconToggleButton(mapModeDraw, false));
         addMapMode(new IconToggleButton(mapModeZoom, true));
         addMapMode(new IconToggleButton(mapModeDelete, true));
@@ -254 +255 @@
         addMapMode(new IconToggleButton(new ExtrudeAction(), true));
         addMapMode(new IconToggleButton(new ImproveWayAccuracyAction(), false));
+        addMapMode(new IconToggleButton(new SplitMode(), false));
         toolBarActionsGroup.setSelected(allMapModeButtons.get(0).getModel(), true);
         toolBarActions.setFloatable(false);

trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java

@@ -80 +80 @@
      */
     public boolean setHighlight(OsmPrimitive p, boolean flag) {
-        return setHighlight(p, flag, new HashSet<Relation>());
+        return setHighlight(p, flag, new HashSet<>());
     }
 
@@ -109 +109 @@
 
     /**
+     * Returns an (unmodifiable) set of currently highlighted primitives
+     * @return Currently highlighted primitives
+     * 
+     * @since 18759
+     */
+    public Set<OsmPrimitive> getHighlighted() {
+        return Collections.unmodifiableSet(highlightedPrimitives);
+    }
+
+    /**
      * Clear highlighting of all remembered primitives
      */
@@ -116 +126 @@
         }
         highlightedPrimitives.clear();
+    }
+
+    /**
+     * Check whether there are any primitives highlighted
+     * @return true when there are highlighted primitives
+     * 
+     * @since 18759
+     */
+    public boolean anyHighlighted() {
+        return !highlightedPrimitives.isEmpty();
     }