Changeset 34780 in osm for applications/editors/josm

Timestamp:

2018-12-14T10:40:49+01:00 (6 years ago)

Author:

gerdp

Message:

fix #16006 Using 'split adjacent ways' on multipolygons is unpredictable.

• If the actions splits two or more ways of the same relation, we cannot create a SequenceCommand because it would contain multiple change commands refering to the same relation. Work-around is to create multiple commands in this case and show a warning.
• Show a message when the selection was not usable for the action.

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java (modified) (4 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.swing.JOptionPane;
@@ -22 +25 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.Notification;
@@ -34 +38 @@
 public class SplitOnIntersectionsAction extends JosmAction {
     private static final String TITLE = tr("Split adjacent ways");
-
+    private static final String TOOL_DESC = tr("Split adjacent ways on T-intersections");
     public SplitOnIntersectionsAction() {
-        super(TITLE, "dumbutils/splitonintersections", tr("Split adjacent ways on T-intersections"),
-                Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", tr("Split adjacent ways")),
+        super(TITLE, "dumbutils/splitonintersections", TOOL_DESC,
+                Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", TITLE),
                         KeyEvent.VK_P, Shortcut.ALT_CTRL_SHIFT), true);
     }
@@ -84 +88 @@
         }
 
+                if (splitWays.isEmpty()) {
+                        new Notification(tr("The selection cannot be used for action ''{0}''", TOOL_DESC))
+                                        .setIcon(JOptionPane.WARNING_MESSAGE).show();
+                        return;
+                }
+
+                // fix #16006: Don't generate SequenceCommand when ways are part of the same relation.
+        boolean createSequenceCommand = true;
+        Set<Relation> allWayRefs = new HashSet<>();
         for (Way splitWay : splitWays.keySet()) {
-            List<List<Node>> wayChunks = SplitWayCommand.buildSplitChunks(splitWay, splitWays.get(splitWay));
-            if (wayChunks != null) {
-                list.add(SplitWayCommand.splitWay(splitWay, wayChunks, new ArrayList<>(selectedWays)));
+            for (Relation rel : OsmPrimitive.getFilteredList(splitWay.getReferrers(), Relation.class)) {
+                createSequenceCommand &= allWayRefs.add(rel);
             }
+        }
+        for (Entry<Way, List<Node>> entry : splitWays.entrySet()) {
+                SplitWayCommand cmd = SplitWayCommand.split(entry.getKey(), entry.getValue(), selectedWays);
+                if (!createSequenceCommand) {
+                        UndoRedoHandler.getInstance().add(cmd);
+                }
+                list.add(cmd);
         }
 
         if (!list.isEmpty()) {
-            UndoRedoHandler.getInstance().add(list.size() == 1 ? list.get(0) : new SequenceCommand(TITLE, list));
+            if (createSequenceCommand) {
+                UndoRedoHandler.getInstance().add(list.size() == 1 ? list.get(0) : new SequenceCommand(TITLE, list));
+            } else {
+                                new Notification(
+                                                tr("Affected ways are members of the same relation. {0} actions were created for this split.",
+                                                                list.size())).setIcon(JOptionPane.WARNING_MESSAGE).show();
+                        }
             getLayerManager().getEditDataSet().clearSelection();
         }