Changeset 35972 in osm for applications/editors

Timestamp:

2022-05-25T20:00:14+02:00 (2 years ago)

Author:

taylor.smock

Message:

ReverterUploadHook: Use modifyChangesetTags instead of checkUpload

This also fixes an issue where any reverter change on any OSM layer
would cause the changeset created_by tag to be changed, even if
the reverter plugin was not used on that OSM layer.

See #20025 for more information.

File:

• applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java (modified) (2 diffs)

applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package reverter;
+
+import java.util.Map;
+import java.util.Objects;
 
 import org.openstreetmap.josm.actions.upload.UploadHook;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -26 +28 @@
 
     @Override
-    public boolean checkUpload(APIDataSet apiDataSet) {
+    public void modifyChangesetTags(Map<String, String> tags) {
         if (ReverterPlugin.reverterUsed.get()) {
             for (Command cmd : UndoRedoHandler.getInstance().getUndoCommands()) {
-                if (isReverterCmd(cmd)) {
-                    MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("created_by", pluginString);
+                if (Objects.equals(MainApplication.getLayerManager().getEditDataSet(), cmd.getAffectedDataSet()) && isReverterCmd(cmd)) {
+                    tags.put("created_by", pluginString);
                     break;
                 }
             }
         }
-        return true;
     }