Changeset 36103 in osm

Timestamp:

2023-07-24T17:55:34+02:00 (12 months 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.

Location:

applications/editors/josm/plugins/reltoolbox

Files:

• src/relcontext/relationfix/AssociatedStreetFixer.java (modified) (3 diffs)
• src/relcontext/relationfix/BoundaryFixer.java (modified) (3 diffs)
• src/relcontext/relationfix/MultipolygonFixer.java (modified) (4 diffs)
• src/relcontext/relationfix/PublicTransportFixer.java (modified) (3 diffs)
• test (added)
• test/unit (added)
• test/unit/relcontext (added)
• test/unit/relcontext/relationfix (added)
• test/unit/relcontext/relationfix/AssociatedStreetFixerTest.java (added)
• test/unit/relcontext/relationfix/BoundaryFixerTest.java (added)
• test/unit/relcontext/relationfix/MultipolygonFixerTest.java (added)
• test/unit/relcontext/relationfix/PublicTransportFixerTest.java (added)
• test/unit/relcontext/relationfix/RelationFixerTest.java (added)

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));
         }
 

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;
     }
 

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

@@ -11 +11 @@
 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.MultipolygonBuilder;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -47 +48 @@
     public Command fixRelation(Relation rel) {
         Relation rr = fixMultipolygonRoles(rel);
-        return rr != null ? new ChangeCommand(MainApplication.getLayerManager().getEditDataSet(), rel, rr) : null;
+        if (rr != null) {
+            final DataSet ds = Utils.firstNonNull(rel.getDataSet(), MainApplication.getLayerManager().getEditDataSet());
+            return new ChangeCommand(ds, rel, rr);
+        }
+        return null;
     }
 
@@ -54 +59 @@
      */
     protected Relation fixMultipolygonRoles(Relation source) {
-        Collection<Way> ways = new ArrayList<>();
-        for (OsmPrimitive p : source.getMemberPrimitives()) {
-            if (p instanceof Way) {
-                ways.add((Way) p);
-            }
-        }
+        Collection<Way> ways = new ArrayList<>(source.getMemberPrimitives(Way.class));
         MultipolygonBuilder mpc = new MultipolygonBuilder();
         String error = mpc.makeFromWays(ways);

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/PublicTransportFixer.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.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -11 +12 @@
 import org.openstreetmap.josm.gui.MainApplication;
 
+import org.openstreetmap.josm.tools.Utils;
 import relcontext.actions.PublicTransportHelper;
 
@@ -61 +63 @@
             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;
     }