Changeset 13670 in josm for trunk

Timestamp:

2018-04-23T23:13:03+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16189 - Add "almost square check" for buildings (patch by marxin, modified)

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/Way.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/RightAngleBuildingTest.java (added)
• src/org/openstreetmap/josm/tools/Geometry.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/GeometryTest.java (modified) (3 diffs)

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

@@ -188 +188 @@
      * @return a rectifying command
      * @throws InvalidUserInputException if the selection is invalid
-     */
-    static SequenceCommand orthogonalize(Iterable<OsmPrimitive> selection) throws InvalidUserInputException {
+     * @since 13670
+     */
+    public static SequenceCommand orthogonalize(Iterable<OsmPrimitive> selection) throws InvalidUserInputException {
         final List<Node> nodeList = new ArrayList<>();
         final List<WayData> wayDataList = new ArrayList<>();
@@ -619 +620 @@
     /**
      * Exception: unsuited user input
-     */
-    protected static class InvalidUserInputException extends Exception {
+     * @since 13670
+     */
+    public static final class InvalidUserInputException extends Exception {
         InvalidUserInputException(String message) {
             super(message);

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -16 +16 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CopyList;
+import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Utils;
@@ -780 +781 @@
         }
     }
+
+    /**
+     * Returns angles of vertices.
+     * @return angles of the way
+     * @since 13670
+     */
+    public synchronized List<Pair<Double, Node>> getAngles() {
+        List<Pair<Double, Node>> angles = new ArrayList<>();
+
+        for (int i = 1; i < nodes.length - 1; i++) {
+            Node n0 = nodes[i - 1];
+            Node n1 = nodes[i];
+            Node n2 = nodes[i + 1];
+
+            double angle = Geometry.getNormalizedAngleInDegrees(Geometry.getCornerAngle(
+                    n0.getEastNorth(), n1.getEastNorth(), n2.getEastNorth()));
+            angles.add(new Pair<>(angle, n1));
+        }
+
+        angles.add(new Pair<>(Geometry.getNormalizedAngleInDegrees(Geometry.getCornerAngle(
+                nodes[nodes.length - 2].getEastNorth(),
+                nodes[0].getEastNorth(),
+                nodes[1].getEastNorth())), nodes[0]));
+
+        return angles;
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -53 +53 @@
 import org.openstreetmap.josm.data.validation.tests.PublicTransportRouteTest;
 import org.openstreetmap.josm.data.validation.tests.RelationChecker;
+import org.openstreetmap.josm.data.validation.tests.RightAngleBuildingTest;
 import org.openstreetmap.josm.data.validation.tests.SelfIntersectingWay;
 import org.openstreetmap.josm.data.validation.tests.SimilarNamedWays;
@@ -141 +142 @@
         LongSegment.class, // 3500 .. 3599
         PublicTransportRouteTest.class, // 3600 .. 3699
+        RightAngleBuildingTest.class, // 3700 .. 3799
     };
 

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -794 +794 @@
 
         return result;
+    }
+
+    /** 
+     * Get angles in radians and return it's value in range [0, 180].
+     *
+     * @param angle the angle in radians
+     * @return normalized angle in degrees
+     * @since 13670
+     */
+    public static double getNormalizedAngleInDegrees(double angle) {
+        return Math.abs(180 * angle / Math.PI);
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/GeometryTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools;
+
+import static org.junit.Assert.assertEquals;
 
 import java.io.FileInputStream;
@@ -10 +12 @@
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -109 +113 @@
         }
     }
+
+    /**
+     * Test of {@link Geometry#getNormalizedAngleInDegrees(double)} method.
+     */
+    @Test
+    public void testRightAngle() {
+        Node n1 = new Node(1);
+        Node n2 = new Node(2);
+        Node n3 = new Node(3);
+        n1.setCoor(new LatLon(10.22873540462851, 6.169719398316592));
+        n2.setCoor(new LatLon(10.229332494162811, 6.16978130985785));
+        n3.setCoor(new LatLon(10.22924937004949, 6.17060908367496));
+
+        double angle = Geometry.getNormalizedAngleInDegrees(Geometry.getCornerAngle(n1.getEastNorth(),
+                n2.getEastNorth(), n3.getEastNorth()));
+        assertEquals(90, angle, 1e-8);
+        angle = Geometry.getNormalizedAngleInDegrees(Geometry.getCornerAngle(n1.getEastNorth(),
+                n2.getEastNorth(), n1.getEastNorth()));
+        assertEquals(0, angle, 1e-8);
+
+        n1.setCoor(new LatLon(10.2295011, 6.1693106));
+        n2.setCoor(new LatLon(10.2294958, 6.16930635));
+        n3.setCoor(new LatLon(10.2294895, 6.1693039));
+
+        angle = Geometry.getNormalizedAngleInDegrees(Geometry.getCornerAngle(n1.getEastNorth(),
+                n2.getEastNorth(), n3.getEastNorth()));
+        assertEquals(162.66381817961337, angle, 1e-5);
+
+        angle = Geometry.getNormalizedAngleInDegrees(Geometry.getCornerAngle(n3.getEastNorth(),
+                n2.getEastNorth(), n1.getEastNorth()));
+        assertEquals(162.66381817961337, angle, 1e-5);
+    }
 }