Changeset 18615 in josm

Timestamp:

2022-12-13T22:24:53+01:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22504: Circularize multiple selected ways (patch by qeef, modified)

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) (3 diffs)
• test/data/alignCircleBuildingsAfter.osm (added)
• test/data/alignCircleBuildingsBefore.osm (added)
• test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

@@ -150 +150 @@
      * Case 3: Only nodes are selected
      * --> Align these nodes, all are fix
+     * <p>
+     * Case 4: Circularize selected ways
+     * --&gt; Circularize each way of the selection.
      * @param ds data set in which the command operates
      * @return the resulting command to execute to perform action, or null if nothing was changed
@@ -227 +230 @@
             fixNodes.addAll(onWay);
             nodes = collectNodesAnticlockwise(ways);
+        } else if (!ways.isEmpty() && selectedNodes.isEmpty()) {
+            List<Command> rcmds = new LinkedList<>();
+            for (Way w : ways) {
+                if (!w.isDeleted() && w.isArea()) {
+                    List<Node> wnodes = w.getNodes();
+                    wnodes.remove(wnodes.size() - 1);
+                    if (validateGeometry(wnodes)) {
+                        center = Geometry.getCenter(wnodes);
+                    }
+                    if (center == null) {
+                        continue;
+                    }
+                    boolean skipThisWay = false;
+                    radius = 0;
+                    for (Node n : wnodes) {
+                        if (!n.isLatLonKnown()) {
+                            skipThisWay = true;
+                            break;
+                        } else {
+                            radius += center.distance(n.getEastNorth());
+                        }
+                    }
+                    if (skipThisWay) {
+                        continue;
+                    } else {
+                        radius /= wnodes.size();
+                    }
+                    Command c = moveNodesCommand(wnodes, Collections.emptySet(), center, radius);
+                    if (c != null) {
+                        rcmds.add(c);
+                    }
+                }
+            }
+            if (rcmds.isEmpty()) {
+                throw new InvalidSelection();
+            }
+            return new SequenceCommand(tr("Align each Way in Circle"), rcmds);
         } else {
             throw new InvalidSelection();
@@ -259 +299 @@
             radius = radius / nodes.size();
         }
-
+        return moveNodesCommand(nodes, fixNodes, center, radius);
+    }
+
+    /**
+     * Move each node of the list of nodes to be arranged in a circle.
+     * @param nodes The list of nodes to be moved.
+     * @param fixNodes The list of nodes that must not be moved.
+     * @param center A center of the circle formed by the nodes.
+     * @param radius A radius of the circle formed by the nodes.
+     * @return the command that arranges the nodes in a circle.
+     * @since 18615
+     */
+    public static Command moveNodesCommand(
+            List<Node> nodes,
+            Set<Node> fixNodes,
+            EastNorth center,
+            double radius) {
         List<Command> cmds = new LinkedList<>();
 

trunk/test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java

@@ -2 +2 @@
 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 +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 +22 @@
 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 +189 @@
         }
     }
+
+    /**
+     * 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);
+        }
+    }
 }