Merge pull request opentripplanner#6530 from HSLdevcom/entrance-bug

Fix entrances being removed from walk steps

Author: vesameskanen

application/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java

@@ -138,6 +138,10 @@ public String directionTextNoParens() {
     return str;
   }
 
+  public boolean hasEntrance() {
+    return entrance != null;
+  }
+
   public WalkStepBuilder addStreetNotes(Set<StreetNote> notes) {
     this.streetNotes.addAll(notes);
     return this;

application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java

@@ -275,11 +275,11 @@ private void processState(State backState, State forwardState) {
         boolean isOnSameStreet = lastStep
           .directionTextNoParens()
           .equals(threeBack.directionTextNoParens());
-        if (twoBack.distance() < MAX_ZAG_DISTANCE && isOnSameStreet) {
+        if (twoBack.distance() < MAX_ZAG_DISTANCE && isOnSameStreet && !twoBack.hasEntrance()) {
           if (isUTurn(twoBack, lastStep)) {
             steps.remove(lastIndex - 1);
             processUTurn(lastStep, twoBack);
-          } else {
+          } else if (!lastStep.hasEntrance()) {
             // total hack to remove zags.
             steps.remove(lastIndex);
             steps.remove(lastIndex - 1);

application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java

@@ -34,6 +34,21 @@ void elevator() {
     assertTrue(elevatorStep.getAbsoluteDirection().isEmpty());
   }
 
+  @Test
+  void stationEntrance() {
+    var walkSteps = buildWalkSteps(
+      TestStateBuilder.ofWalking()
+        .streetEdge("name", 1)
+        .entrance("name")
+        .streetEdge()
+        .areaEdge("name", 10)
+    );
+    assertEquals(3, walkSteps.size());
+    assertEquals(RelativeDirection.DEPART, walkSteps.get(0).getRelativeDirection());
+    assertEquals(RelativeDirection.ENTER_OR_EXIT_STATION, walkSteps.get(1).getRelativeDirection());
+    assertEquals(RelativeDirection.CONTINUE, walkSteps.get(2).getRelativeDirection());
+  }
+
   @Test
   void enterStation() {
     final TestStateBuilder builder = TestStateBuilder.ofWalking()

application/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java

@@ -13,6 +13,8 @@
 import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex;
 import org.opentripplanner.street.model.RentalFormFactor;
 import org.opentripplanner.street.model.StreetTraversalPermission;
+import org.opentripplanner.street.model.edge.AreaEdgeBuilder;
+import org.opentripplanner.street.model.edge.AreaGroup;
 import org.opentripplanner.street.model.edge.StreetEdge;
 import org.opentripplanner.street.model.edge.StreetEdgeBuilder;
 import org.opentripplanner.street.model.vertex.IntersectionVertex;
@@ -87,6 +89,29 @@ public static StreetEdge streetEdge(
     return streetEdgeBuilder(vA, vB, length, perm).buildAndConnect();
   }
 
+  public static StreetEdge areaEdge(
+    StreetVertex vA,
+    StreetVertex vB,
+    String name,
+    StreetTraversalPermission perm
+  ) {
+    Coordinate[] coords = new Coordinate[2];
+    coords[0] = vA.getCoordinate();
+    coords[1] = vB.getCoordinate();
+    LineString geom = GeometryUtils.getGeometryFactory().createLineString(coords);
+
+    AreaGroup AREA = new AreaGroup(null);
+
+    return new AreaEdgeBuilder()
+      .withFromVertex(vA)
+      .withToVertex(vB)
+      .withGeometry(geom)
+      .withPermission(perm)
+      .withName(name)
+      .withArea(AREA)
+      .buildAndConnect();
+  }
+
   public static StreetEdge streetEdge(
     StreetVertex from,
     StreetVertex to,

application/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java

@@ -31,6 +31,7 @@
 import org.opentripplanner.street.model.edge.StreetTransitStopLink;
 import org.opentripplanner.street.model.vertex.ElevatorOffboardVertex;
 import org.opentripplanner.street.model.vertex.ElevatorOnboardVertex;
+import org.opentripplanner.street.model.vertex.StationEntranceVertex;
 import org.opentripplanner.street.model.vertex.StreetVertex;
 import org.opentripplanner.street.model.vertex.TransitStopVertex;
 import org.opentripplanner.street.search.TraverseMode;
@@ -131,6 +132,40 @@ public TestStateBuilder streetEdge() {
     return this;
   }
 
+  public TestStateBuilder streetEdge(String name, int distance) {
+    count++;
+    var from = (StreetVertex) currentState.vertex;
+    var to = StreetModelForTest.intersectionVertex(count, count);
+    var edge = StreetModelForTest.streetEdgeBuilder(
+      from,
+      to,
+      distance,
+      StreetTraversalPermission.PEDESTRIAN
+    )
+      .withName(name)
+      .buildAndConnect();
+
+    var states = edge.traverse(currentState);
+    if (states.length != 1) {
+      throw new IllegalStateException("Only single state transitions are supported.");
+    }
+    currentState = states[0];
+    return this;
+  }
+
+  public TestStateBuilder areaEdge(String name, int distance) {
+    count++;
+    var from = (StreetVertex) currentState.vertex;
+    var to = StreetModelForTest.intersectionVertex(count, count);
+    var area = StreetModelForTest.areaEdge(from, to, name, StreetTraversalPermission.PEDESTRIAN);
+    var states = area.traverse(currentState);
+    if (states.length != 1) {
+      throw new IllegalStateException("Only single state transitions are supported.");
+    }
+    currentState = states[0];
+    return this;
+  }
+
   /**
    * Traverse a street edge and switch to Car mode
    */
@@ -205,6 +240,23 @@ public TestStateBuilder elevator() {
     return this;
   }
 
+  public TestStateBuilder entrance(String name) {
+    count++;
+    var from = (StreetVertex) currentState.vertex;
+    var to = new StationEntranceVertex(count, count, 12345, "A", Accessibility.POSSIBLE);
+
+    var edge = StreetModelForTest.streetEdgeBuilder(
+      from,
+      to,
+      30,
+      StreetTraversalPermission.PEDESTRIAN
+    )
+      .withName(name)
+      .buildAndConnect();
+    currentState = edge.traverse(currentState)[0];
+    return this;
+  }
+
   public TestStateBuilder stop(RegularStop stop) {
     return arriveAtStop(stop);
   }