Index: trunk/test/data/alignCircleBuildingsAfter.osm
===================================================================
--- trunk/test/data/alignCircleBuildingsAfter.osm (revision 18615)
+++ trunk/test/data/alignCircleBuildingsAfter.osm (revision 18615)
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/test/data/alignCircleBuildingsBefore.osm
===================================================================
--- trunk/test/data/alignCircleBuildingsBefore.osm (revision 18615)
+++ trunk/test/data/alignCircleBuildingsBefore.osm (revision 18615)
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java (revision 18614)
+++ trunk/test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java (revision 18615)
@@ -2,4 +2,5 @@
package org.openstreetmap.josm.actions;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -7,5 +8,8 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.IOException;
+import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
@@ -18,8 +22,11 @@
import org.openstreetmap.josm.actions.AlignInCircleAction.InvalidSelection;
import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.coor.ILatLon;
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.Way;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.io.OsmReader;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -182,3 +189,74 @@
}
}
+
+ /**
+ * Test case: Circularize a batch of (two) buildings.
+ * @throws IOException if the test file could not be read
+ * @throws IllegalDataException if the test file has been corrupted
+ */
+ @Test
+ void testMultipleWaysSelected() throws IOException, IllegalDataException {
+ final DataSet before;
+ try (InputStream fis = Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleBuildingsBefore.osm"))) {
+ before = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
+ }
+
+ Way firstBefore = null;
+ Way secondBefore = null;
+
+ for (Way w : before.getWays()) {
+ if ("first".equals(w.get("test"))) {
+ firstBefore = w;
+ } else if ("second".equals(w.get("test"))) {
+ secondBefore = w;
+ } else {
+ fail("There should only be \"first\" or \"second\" values in the key \"test\"");
+ }
+ }
+
+ assertNotNull(firstBefore);
+ assertNotNull(secondBefore);
+
+ before.clearSelection();
+ before.addSelected(firstBefore);
+ before.addSelected(secondBefore);
+
+ Command c = assertDoesNotThrow(() -> AlignInCircleAction.buildCommand(before));
+ c.executeCommand();
+
+ final DataSet after;
+ try (InputStream fis = Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleBuildingsAfter.osm"))) {
+ after = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE);
+ }
+ Way firstAfter = null;
+ Way secondAfter = null;
+
+ for (Way w : after.getWays()) {
+ if ("first".equals(w.get("test"))) {
+ firstAfter = w;
+ } else if ("second".equals(w.get("test"))) {
+ secondAfter = w;
+ } else {
+ fail("There should only be \"first\" or \"second\" values in the key \"test\"");
+ }
+ }
+
+ assertNotNull(firstAfter);
+ assertEquals(firstAfter.getNodesCount(), firstBefore.getNodesCount());
+ for (int i = 0; i < firstAfter.getNodesCount(); i++) {
+ Node bn = firstBefore.getNode(i);
+ Node an = firstAfter.getNode(i);
+ assertEquals(bn.lat(), an.lat(), ILatLon.MAX_SERVER_PRECISION);
+ assertEquals(bn.lon(), an.lon(), ILatLon.MAX_SERVER_PRECISION);
+ }
+
+ assertNotNull(secondAfter);
+ assertEquals(secondAfter.getNodesCount(), secondBefore.getNodesCount());
+ for (int i = 0; i < secondAfter.getNodesCount(); i++) {
+ Node bn = secondBefore.getNode(i);
+ Node an = secondAfter.getNode(i);
+ assertEquals(bn.lat(), an.lat(), ILatLon.MAX_SERVER_PRECISION);
+ assertEquals(bn.lon(), an.lon(), ILatLon.MAX_SERVER_PRECISION);
+ }
+ }
}