Changeset 35628 in osm for applications/editors/josm/plugins/comfort0

Timestamp:

2020-10-29T00:14:21+01:00 (4 years ago)

Author:

simon04

Message:

EditLevel0LAction: move nodes

Location:

applications/editors/josm/plugins/comfort0

Files:

• src/net/simon04/comfort0/EditLevel0LAction.java (modified) (2 diffs)
• test/unit/net/simon04/comfort0/EditLevel0LActionTest.java (modified) (6 diffs)

applications/editors/josm/plugins/comfort0/src/net/simon04/comfort0/EditLevel0LAction.java

@@ -22 +22 @@
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
@@ -140 +142 @@
                 commands.add(command);
             }
+
+            if (fromDataSet instanceof Node && !Objects.equals(((Node) fromDataSet).getCoor(), ((Node) newInstance).getCoor())) {
+                final MoveCommand command = new MoveCommand(((Node) fromDataSet), ((Node) newInstance).getCoor());
+                commands.add(command);
+            }
         }
         if (commands.isEmpty()) {

applications/editors/josm/plugins/comfort0/test/unit/net/simon04/comfort0/EditLevel0LActionTest.java

@@ -4 +4 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -13 +14 @@
 import org.junit.Test;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.PseudoCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
@@ -34 +36 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences();
+    public JOSMTestRules test = new JOSMTestRules().preferences().projection();
 
     private SequenceCommand buildChangeCommands(DataSet dataSet) throws ParseException {
@@ -44 +46 @@
     }
 
-    private ChangePropertyCommand buildChangeCommand(DataSet dataSet) throws ParseException {
+    private <T extends PseudoCommand> T buildChangeCommand(DataSet dataSet, Class<T> type) throws ParseException {
         SequenceCommand commands = buildChangeCommands(dataSet);
         assertThat(commands.getChildren(), hasSize(1));
         final PseudoCommand command = commands.getChildren().iterator().next();
-        assertThat(command, instanceOf(ChangePropertyCommand.class));
-        return (ChangePropertyCommand) command;
+        assertThat(command, instanceOf(type));
+        return type.cast(command);
     }
 
@@ -58 +60 @@
         final DataSet dataSet = new DataSet(node);
 
-        ChangePropertyCommand command = buildChangeCommand(dataSet);
+        ChangePropertyCommand command = buildChangeCommand(dataSet, ChangePropertyCommand.class);
         assertThat(command.getTags(), is(new TagMap("name", "Neu Broderstorf", "traffic_sign", "city_limit")));
 
@@ -66 +68 @@
 
         node.put("fixme", "delete me!");
-        command = buildChangeCommand(dataSet);
+        command = buildChangeCommand(dataSet, ChangePropertyCommand.class);
         assertThat(command.getTags(), is(new TagMap("name", "Neu Broderstorf", "traffic_sign", "city_limit")));
         node.remove("fixme");
 
         node.setCoor(new LatLon(55.0900666, 13.2539381));
-        assertThat(buildChangeCommands(dataSet), nullValue()); // TODO
+        assertThat(buildChangeCommand(dataSet, MoveCommand.class), notNullValue());
     }
 }