Ticket #18127: 18127.4.patch

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

@@ -61 +61 @@
 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.SharpAngles;
 import org.openstreetmap.josm.data.validation.tests.SimilarNamedWays;
 import org.openstreetmap.josm.data.validation.tests.TagChecker;
 import org.openstreetmap.josm.data.validation.tests.TurnrestrictionTest;
@@ -148 +149 @@
         LongSegment.class, // 3500 .. 3599
         PublicTransportRouteTest.class, // 3600 .. 3699
         RightAngleBuildingTest.class, // 3700 .. 3799
+        SharpAngles.class, // 3800 .. 3899
     };
 
     /**

src/org/openstreetmap/josm/data/validation/tests/SharpAngles.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.TreeSet;
+
+import org.openstreetmap.josm.data.coor.EastNorth;
+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.data.osm.WaySegment;
+import org.openstreetmap.josm.data.validation.Severity;
+import org.openstreetmap.josm.data.validation.Test;
+import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.tools.Geometry;
+import org.openstreetmap.josm.tools.Logging;
+
+/**
+ * Find highways that have sharp angles
+ * @author Taylor Smock
+ *
+ */
+public class SharpAngles extends Test {
+    private static final int SHARPANGLESCODE = 3800; // TODO change this before commit
+    /** The code for a sharp angle */
+    protected static final int SHARP_ANGLES = SHARPANGLESCODE + 0;
+    /** The maximum angle for sharp angles */
+    protected static final double MAX_ANGLE = 45.0; // degrees
+    /** The stepping points for severity */
+    protected static final Map<Double, Severity> severityBreakPoints = new LinkedHashMap<>();
+    static {
+        severityBreakPoints.put(MAX_ANGLE, Severity.OTHER);
+        severityBreakPoints.put(MAX_ANGLE * 2 / 3, Severity.WARNING);
+        severityBreakPoints.put(MAX_ANGLE / 3, Severity.ERROR);
+    }
+    /** Specific highway types to ignore */
+    protected static final Collection<String> ignoreHighways = new TreeSet<>();
+    static {
+        ignoreHighways.add("rest_area");
+        ignoreHighways.add("platform");
+        ignoreHighways.add("services");
+    }
+
+    ArrayList<Way> allWays;
+    /**
+     * Construct a new {@code IntersectionIssues} object
+     */
+    public SharpAngles() {
+        super(tr("Sharp angles"), tr("Check for sharp angles on roads"));
+    }
+
+    @Override
+    public void startTest(ProgressMonitor monitor) {
+        super.startTest(monitor);
+        allWays = new ArrayList<>();
+    }
+
+    @Override
+    public void endTest() {
+        Way pWay = null;
+        try {
+            for (Way way : allWays) {
+                pWay = way;
+                checkWayForSharpAngles(way);
+            }
+        } catch (Exception e) {
+            if (pWay != null) {
+                Logging.debug("Way https://osm.org/way/{0} caused an error ({1})", pWay.getOsmId(), e);
+            }
+            Logging.warn(e);
+        }
+        allWays = null;
+        super.endTest();
+    }
+
+    @Override
+    public void visit(Way way) {
+        if (!way.isUsable()) return;
+        if (way.hasKey("highway")) {
+            if ((way.hasKey("area") && way.get("area").equalsIgnoreCase("yes")) ||
+                    ignoreHighways.contains(way.get("highway"))) {
+                return;
+            }
+            allWays.add(way);
+        }
+    }
+
+    /**
+     * Check nodes in a way for sharp angles
+     * @param way A way to check for sharp angles
+     */
+    public void checkWayForSharpAngles(Way way) {
+        Node node1 = null;
+        Node node2 = null;
+        Node node3 = null;
+        int i = -2;
+        for (Node node : way.getNodes()) {
+            node1 = node2;
+            node2 = node3;
+            node3 = node;
+            checkAngle(node1, node2, node3, i, way, false);
+            i++;
+        }
+        if (way.isClosed() && way.getNodesCount() > 2) {
+            node1 = node2;
+            node2 = node3;
+            // Get the second node, not the first node, since a closed way has first node == second node
+            node3 = way.getNode(1);
+            checkAngle(node1, node2, node3, i, way, true);
+        }
+    }
+
+    private void checkAngle(Node node1, Node node2, Node node3, Integer i, Way way, Boolean last) {
+        if (node1 == null || node2 == null || node3 == null) return;
+        EastNorth n1 = node1.getEastNorth();
+        EastNorth n2 = node2.getEastNorth();
+        EastNorth n3 = node3.getEastNorth();
+        Double angle = Math.toDegrees(Math.abs(Geometry.getCornerAngle(n1, n2, n3)));
+        if (angle < MAX_ANGLE) {
+            processSharpAngleForErrorCreation(angle, i, way, last);
+        }
+    }
+
+    private void processSharpAngleForErrorCreation(Double angle, Integer i, Way way, Boolean last) {
+        List<WaySegment> waysegmentList = new ArrayList<>();
+        waysegmentList.add(new WaySegment(way, i));
+        if (last) {
+            waysegmentList.add(new WaySegment(way, 0));
+        } else {
+            waysegmentList.add(new WaySegment(way, i+1));
+        }
+        Optional<WaySegment> possibleShortSegment = waysegmentList.stream()
+                .min(Comparator.comparing(segment -> segment.toWay().getLength()));
+        if (possibleShortSegment.isPresent() && possibleShortSegment.get().toWay().getLength() < 1) {
+            createNearlyOverlappingError(angle,
+                    Collections.singleton(way), Collections.singleton(possibleShortSegment.get()));
+        } else {
+            createNearlyOverlappingError(angle, Collections.singleton(way), waysegmentList);
+        }
+    }
+
+    private void createNearlyOverlappingError(Double angle,
+            Collection<? extends OsmPrimitive> primitiveIssues, Collection<WaySegment> waysegments) {
+        TestError.Builder testError = TestError.builder(this, getSeverity(angle), SHARP_ANGLES)
+                .primitives(primitiveIssues)
+                .highlightWaySegments(waysegments)
+                .message(tr("Sharp angle"));
+        errors.add(testError.build());
+    }
+
+    private Severity getSeverity(Double angle) {
+        Severity rSeverity = Severity.OTHER;
+        for (Entry<Double, Severity> entry : severityBreakPoints.entrySet()) {
+            if (angle < entry.getKey()) {
+                rSeverity = entry.getValue();
+            }
+        }
+        return rSeverity;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other instanceof SharpAngles) {
+            SharpAngles otherReal = (SharpAngles) other;
+            if (otherReal.allWays.equals(allWays)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+}

test/unit/org/openstreetmap/josm/data/validation/tests/SharpAnglesTest.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+
+/**
+ * JUnit Test of the Sharp Angles validation test.
+ */
+
+public class SharpAnglesTest {
+    private SharpAngles angles;
+
+    /**
+     * Setup test.
+     * @throws Exception if an error occurs
+     */
+    @Before
+    public void setUp() throws Exception {
+        JOSMFixture.createUnitTestFixture().init();
+        angles = new SharpAngles();
+        angles.initialize();
+        angles.startTest(null);
+    }
+
+    /**
+     * Check a closed loop with no sharp angles
+     */
+    @Test
+    public void closedLoopNoSharpAngles() {
+        Way way = TestUtils.newWay("highway=residential",
+                new Node(new LatLon(0, 0)), new Node(new LatLon(0.1, 0.1)),
+                new Node(new LatLon(0.1, -0.2)), new Node(new LatLon(-0.1, -0.1)));
+        way.addNode(way.firstNode());
+        angles.visit(way);
+        angles.endTest();
+        Assert.assertEquals(0, angles.getErrors().size());
+    }
+
+    /**
+     * Check a closed loop with a sharp angle
+     */
+    @Test
+    public void closedLoopSharpAngles() {
+        Way way = TestUtils.newWay("highway=residential",
+                new Node(new LatLon(0, 0)), new Node(new LatLon(0.1, 0.1)),
+                new Node(new LatLon(0.1, -0.2)));
+        way.addNode(way.firstNode());
+        angles.visit(way);
+        angles.endTest();
+        Assert.assertEquals(1, angles.getErrors().size());
+    }
+
+    /**
+     * Check a way for multiple sharp angles
+     */
+    @Test
+    public void testMultipleSharpAngles() {
+        Way way = TestUtils.newWay("highway=residential",
+                new Node(new LatLon(0.005069377713748322, -0.0014832642674429382)),
+                new Node(new LatLon(0.005021097951663415, 0.0008636686205880686)),
+                new Node(new LatLon(0.005085470967776624, -0.00013411313295197088)),
+                new Node(new LatLon(0.005031826787678042, 0.0020116540789620915)));
+        angles.visit(way);
+        angles.endTest();
+        Assert.assertEquals(2,  angles.getErrors().size());
+    }
+
+    /**
+     * Check for no sharp angles
+     */
+    @Test
+    public void testNoSharpAngles() {
+        Way way = TestUtils.newWay("highway=residential",
+                new Node(new LatLon(0, 0)), new Node(new LatLon(0.1, 0.1)),
+                new Node(new LatLon(0.2, 0.3)), new Node(new LatLon(0.3, 0.1)));
+        angles.visit(way);
+        angles.endTest();
+        Assert.assertEquals(0, angles.getErrors().size());
+    }
+
+    /**
+     * Ensure that we aren't accidentally using the same node twice.
+     * This was found during initial testing. See way 10041221 (on 20190914)
+     */
+    @Test
+    public void testCheckBadAnglesFromSameNodeTwice() {
+        Way way = TestUtils.newWay("highway=service oneway=yes",
+                new Node(new LatLon(52.8903308, 8.4302322)),
+                new Node(new LatLon(52.8902468, 8.4302138)),
+                new Node(new LatLon(52.8902191, 8.4302282)),
+                new Node(new LatLon(52.8901155, 8.4304753)),
+                new Node(new LatLon(52.8900669, 8.430763)),
+                new Node(new LatLon(52.8901138, 8.4308262)),
+                new Node(new LatLon(52.8902482, 8.4307568)));
+        way.addNode(way.firstNode());
+        angles.visit(way);
+        angles.endTest();
+        Assert.assertEquals(0, angles.getErrors().size());
+    }
+
+    /**
+     * Check that special cases are ignored
+     */
+    @Test
+    public void testIgnoredCases() {
+        Way way = TestUtils.newWay("highway=residential",
+                new Node(new LatLon(0, 0)), new Node(new LatLon(0.1, 0.1)),
+                new Node(new LatLon(0, 0.01)));
+        angles.visit(way);
+        angles.endTest();
+        Assert.assertEquals(1, angles.getErrors().size());
+
+        way.put("highway", "rest_area");
+        angles.startTest(null);
+        angles.visit(way);
+        angles.endTest();
+        Assert.assertEquals(0, angles.getErrors().size());
+
+        way.put("highway", "residential");
+        angles.startTest(null);
+        angles.visit(way);
+        angles.endTest();
+        Assert.assertEquals(1, angles.getErrors().size());
+        way.put("area", "yes");
+        angles.startTest(null);
+        angles.visit(way);
+        angles.endTest();
+        Assert.assertEquals(0, angles.getErrors().size());
+        way.put("area", "no");
+        angles.startTest(null);
+        angles.visit(way);
+        angles.endTest();
+        Assert.assertEquals(1, angles.getErrors().size());
+    }
+}
+ No newline at end of file