Changeset 36103 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java

Timestamp:

2023-07-24T17:55:34+02:00 (2 years ago)

Author:

taylor.smock

Message:

reltoolbox: Preferentially use the source relation dataset

If the source relation does not have a dataset, use the current edit dataset instead.

This also adds some basic tests.

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java (modified) (3 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java

@@ -12 +12 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -18 +19 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.tools.Utils;
 
 public class AssociatedStreetFixer extends RelationFixer {
@@ -135 +137 @@
         List<Command> commandList = new ArrayList<>();
         if (fixed) {
-            commandList.add(new ChangeCommand(MainApplication.getLayerManager().getEditDataSet(), source, rel));
+            final DataSet ds = Utils.firstNonNull(source.getDataSet(), MainApplication.getLayerManager().getEditDataSet());
+            commandList.add(new ChangeCommand(ds, source, rel));
         }