Changeset 12356 in josm for trunk/src/org/openstreetmap/josm/corrector/TagCorrector.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/corrector/TagCorrector.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java

@@ -175 +175 @@
                     // save the clone
                     if (!keysChanged.isEmpty()) {
-                        commands.add(new ChangeCommand(primitive, clone));
+                        commands.add(new ChangeCommand(primitive.getDataSet(), primitive, clone));
                     }
                 }
@@ -185 +185 @@
                         RoleCorrection roleCorrection = roleCorrections.get(i);
                         if (roleTableMap.get(primitive).getCorrectionTableModel().getApply(i)) {
-                            commands.add(new ChangeRelationMemberRoleCommand(
+                            commands.add(new ChangeRelationMemberRoleCommand(roleCorrection.relation.getDataSet(),
                                     roleCorrection.relation, roleCorrection.position, roleCorrection.newRole));
                         }