Changeset 36103 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/BoundaryFixer.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/BoundaryFixer.java (modified) (3 diffs)

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

@@ -6 +6 @@
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -11 +12 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -66 +68 @@
             r = rr;
         }
-        return fixed ? new ChangeCommand(MainApplication.getLayerManager().getEditDataSet(), rel, r) : null;
+        if (fixed) {
+            final DataSet ds = Utils.firstNonNull(rel.getDataSet(), MainApplication.getLayerManager().getEditDataSet());
+            return new ChangeCommand(ds, rel, r);
+        }
+        return null;
     }