Changeset 12412 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-06-17T23:12:53+02:00 (7 years ago)

Author:

michael2402

Message:

Fix #14946: Set the right data set for tag corrections when reversing a way.

Location:

trunk/src/org/openstreetmap/josm/corrector

Files:

• ReverseWayTagCorrector.java (modified) (1 diff)
• TagCorrector.java (modified) (4 diffs)

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

@@ -287 +287 @@
         }
 
-        return applyCorrections(tagCorrectionsMap, roleCorrectionMap,
+        return applyCorrections(oldway.getDataSet(), tagCorrectionsMap, roleCorrectionMap,
                 tr("When reversing this way, the following changes are suggested in order to maintain data consistency."));
     }

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

@@ -26 +26 @@
 import org.openstreetmap.josm.data.correction.RoleCorrection;
 import org.openstreetmap.josm.data.correction.TagCorrection;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -56 +57 @@
     };
 
+    /**
+     * Creates the commands to correct the tags. Asks the users about it.
+     * @param dataSet The data set the primitives will be in once the commands are executed
+     * @param tagCorrectionsMap The possible tag corrections
+     * @param roleCorrectionMap The possible role corrections
+     * @param description A description to add to the dialog.
+     * @return A list of commands
+     * @throws UserCancelException If the user canceled
+     */
     protected Collection<Command> applyCorrections(
+            DataSet dataSet,
             Map<OsmPrimitive, List<TagCorrection>> tagCorrectionsMap,
             Map<OsmPrimitive, List<RoleCorrection>> roleCorrectionMap,
@@ -175 +186 @@
                     // save the clone
                     if (!keysChanged.isEmpty()) {
-                        commands.add(new ChangeCommand(primitive.getDataSet(), primitive, clone));
+                        commands.add(new ChangeCommand(dataSet, primitive, clone));
                     }
                 }
@@ -185 +196 @@
                         RoleCorrection roleCorrection = roleCorrections.get(i);
                         if (roleTableMap.get(primitive).getCorrectionTableModel().getApply(i)) {
-                            commands.add(new ChangeRelationMemberRoleCommand(roleCorrection.relation.getDataSet(),
+                            commands.add(new ChangeRelationMemberRoleCommand(dataSet,
                                     roleCorrection.relation, roleCorrection.position, roleCorrection.newRole));
                         }