Changeset 12356 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

Timestamp:

2017-06-09T11:40:32+02:00 (7 years ago)

Author:

michael2402

Message:

CombineWayAction: Allow merging ways that are not in the current edit data set.

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (3 diffs)

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

@@ -20 +20 @@
 import java.util.Set;
 import java.util.Stack;
+import java.util.stream.Collectors;
 
 import javax.swing.JOptionPane;
@@ -112 +113 @@
         ways = new LinkedHashSet<>(ways);
 
+        List<DataSet> dataSets = ways.stream().map(Way::getDataSet).distinct().collect(Collectors.toList());
+        if (dataSets.size() != 1) {
+            throw new IllegalArgumentException("Cannot combine ways of multiple data sets.");
+        }
+
         // try to build a new way which includes all the combined ways
-        //
         NodeGraph graph = NodeGraph.createNearlyUndirectedGraphFromNodeWays(ways);
         List<Node> path = graph.buildSpanningPath();
@@ -194 +199 @@
         deletedWays.remove(targetWay);
 
-        cmds.add(new ChangeCommand(targetWay, modifiedTargetWay));
+        cmds.add(new ChangeCommand(dataSets.get(0), targetWay, modifiedTargetWay));
         cmds.addAll(reverseWayTagCommands);
         cmds.addAll(resolution);
-        cmds.add(new DeleteCommand(deletedWays));
+        cmds.add(new DeleteCommand(dataSets.get(0), deletedWays));
         final Command sequenceCommand = new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
                 trn("Combine {0} way", "Combine {0} ways", ways.size(), ways.size()), cmds);