Merge pull request opentripplanner#6780 from Aubin-MaaS/north-based-angles

Use North-based angle in internal representation

Author: leonardehrenfried

application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java

@@ -553,14 +553,15 @@ public boolean isSlopeOverride() {
   }
 
   /**
-   * Return the azimuth of the first segment in this edge in integer degrees clockwise from South.
-   * TODO change everything to clockwise from North
+   * Return the azimuth of the first segment in this edge in integer degrees clockwise from North.
    */
   public int getInAngle() {
     return IntUtils.round((this.inAngle * 180) / 128.0);
   }
 
-  /** Return the azimuth of the last segment in this edge in integer degrees clockwise from South. */
+  /**
+   * Return the azimuth of the last segment in this edge in integer degrees clockwise from North.
+   */
   public int getOutAngle() {
     return IntUtils.round((this.outAngle * 180) / 128.0);
   }
@@ -1226,14 +1227,12 @@ public static LineStringInOutAngles of(LineString geometry) {
 
     /**
      * Conversion from radians to internal representation as a single signed byte.
-     * We also reorient the angles since OTP seems to use South as a reference
-     * while the azimuth functions use North.
-     * FIXME Use only North as a reference, not a mix of North and South!
+     * <p>
      * Range restriction happens automatically due to Java signed overflow behavior.
      * 180 degrees exists as a negative rather than a positive due to the integer range.
      */
     private static byte convertRadianToByte(double angleRadians) {
-      return (byte) Math.round((angleRadians * 128) / Math.PI + 128);
+      return (byte) Math.round((angleRadians * 128) / Math.PI);
     }
   }
 }

application/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java

@@ -3,15 +3,13 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opentripplanner.street.model.StreetTraversalPermission.ALL;
 import static org.opentripplanner.street.model._data.StreetModelForTest.intersectionVertex;
 import static org.opentripplanner.street.model._data.StreetModelForTest.streetEdge;
 import static org.opentripplanner.street.model._data.StreetModelForTest.streetEdgeBuilder;
 
-import java.time.Instant;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
@@ -25,7 +23,6 @@
 import org.opentripplanner.routing.util.ElevationUtils;
 import org.opentripplanner.routing.util.SlopeCosts;
 import org.opentripplanner.street.model.StreetTraversalPermission;
-import org.opentripplanner.street.model.TurnRestriction;
 import org.opentripplanner.street.model._data.StreetModelForTest;
 import org.opentripplanner.street.model.vertex.IntersectionVertex;
 import org.opentripplanner.street.model.vertex.LabelledIntersectionVertex;
@@ -35,7 +32,6 @@
 import org.opentripplanner.street.search.request.StreetSearchRequest;
 import org.opentripplanner.street.search.request.StreetSearchRequestBuilder;
 import org.opentripplanner.street.search.state.State;
-import org.opentripplanner.street.search.state.StateData;
 
 public class StreetEdgeTest {
 
@@ -68,15 +64,15 @@ void testInAndOutAngles() {
     StreetEdge e1 = streetEdge(v1, v2, 1.0, ALL);
 
     // Edge has same first and last angle.
-    assertEquals(90, e1.getInAngle());
-    assertEquals(90, e1.getOutAngle());
+    assertEquals(-90, e1.getInAngle());
+    assertEquals(-90, e1.getOutAngle());
 
     // 2 new ones
     StreetVertex u = intersectionVertex("test1", 1.0, 2.0);
     StreetVertex v = intersectionVertex("test2", 2.0, 2.0);
 
-    // Second edge, heading straight North
-    StreetEdge e2 = streetEdge(u, v, 1.0, ALL);
+    // Second edge, heading straight South
+    StreetEdge e2 = streetEdge(v, u, 1.0, ALL);
 
     // 180 degrees could be expressed as 180 or -180. Our implementation happens to use -180.
     assertEquals(180, Math.abs(e2.getInAngle()));

application/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java

@@ -48,17 +48,17 @@ public void testCalculateTurnAngle() {
     edge(v2, v3, 1.0, false);
 
     // Edge has same first and last angle.
-    assertEquals(90, e1.getInAngle());
-    assertEquals(90, e1.getOutAngle());
+    assertEquals(-90, e1.getInAngle());
+    assertEquals(-90, e1.getOutAngle());
 
     // 2 new ones
     IntersectionVertex v4 = vertex("test2", new Coordinate(1.0, 1.0), false, false);
 
     // Third edge
     StreetEdge e3 = edge(v2, v4, 1.0, false);
 
-    assertEquals(0, e3.getInAngle());
-    assertEquals(0, e3.getOutAngle());
+    assertEquals(-180, e3.getInAngle());
+    assertEquals(-180, e3.getOutAngle());
 
     // Difference should be about 90.
     int diff = (e1.getOutAngle() - e3.getInAngle());