Merge pull request opentripplanner#7079 from HSLdevcom/fix-elevator-vertices

Refactor `ElevatorProcessor` and add tests for elevators

Author: VillePihlava

application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java

@@ -34,7 +34,7 @@
 import org.opentripplanner.street.model.edge.StreetVehicleParkingLink;
 import org.opentripplanner.street.model.edge.TemporaryFreeEdge;
 import org.opentripplanner.street.model.edge.TemporaryPartialStreetEdge;
-import org.opentripplanner.street.model.vertex.ElevatorVertex;
+import org.opentripplanner.street.model.vertex.ElevatorHopVertex;
 import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex;
 import org.opentripplanner.utils.collection.ListUtils;
 
@@ -280,7 +280,7 @@ private static List<StyleBuilder> elevators(VectorSourceLayer edges, VectorSourc
         .group(ELEVATORS_GROUP)
         .typeCircle()
         .vectorSourceLayer(vertices)
-        .vertexFilter(ElevatorVertex.class)
+        .vertexFilter(ElevatorHopVertex.class)
         .circleStroke(BLACK, CIRCLE_STROKE)
         .circleRadius(
           new ZoomDependentNumber(List.of(new ZoomStop(15, 1), new ZoomStop(MAX_ZOOM, 7)))

application/src/main/java/org/opentripplanner/graph_builder/issues/AllWaysOfElevatorNodeOnSameLevel.java

@@ -0,0 +1,26 @@
+package org.opentripplanner.graph_builder.issues;
+
+import org.opentripplanner.graph_builder.issue.api.DataImportIssue;
+import org.opentripplanner.osm.model.OsmNode;
+
+public record AllWaysOfElevatorNodeOnSameLevel(OsmNode node) implements DataImportIssue {
+  private static final String FMT =
+    "All ways connected to elevator node %s are on the same level. " +
+    "Level information is parsed from the level or layer tag and defaults to 0 without tag data. " +
+    "Please check whether the node is correctly modeled.";
+
+  private static final String HTMLFMT =
+    "All ways connected to <a href='%s'>elevator node %s</a> are on the same level. " +
+    "Level information is parsed from the level or layer tag and defaults to 0 without tag data. " +
+    "Please check whether the node is correctly modeled.";
+
+  @Override
+  public String getMessage() {
+    return String.format(FMT, node.getId());
+  }
+
+  @Override
+  public String getHTMLMessage() {
+    return String.format(HTMLFMT, node.url(), node.getId());
+  }
+}

application/src/main/java/org/opentripplanner/graph_builder/issues/OnlyOneConnectionToElevatorNode.java

@@ -0,0 +1,26 @@
+package org.opentripplanner.graph_builder.issues;
+
+import org.opentripplanner.graph_builder.issue.api.DataImportIssue;
+import org.opentripplanner.osm.model.OsmNode;
+
+public record OnlyOneConnectionToElevatorNode(OsmNode node) implements DataImportIssue {
+  private static final String FMT =
+    "Elevator node %s has only one routable connection. " +
+    "This makes the elevator unusable. " +
+    "Please check whether the node is correctly modeled.";
+
+  private static final String HTMLFMT =
+    "<a href='%s'>Elevator node %s</a> has only one routable connection. " +
+    "This makes the elevator unusable. " +
+    "Please check whether the node is correctly modeled.";
+
+  @Override
+  public String getMessage() {
+    return String.format(FMT, node.getId());
+  }
+
+  @Override
+  public String getHTMLMessage() {
+    return String.format(HTMLFMT, node.url(), node.getId());
+  }
+}

application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToGraph.java

@@ -17,7 +17,7 @@
 import org.opentripplanner.street.model.edge.ElevatorBoardEdge;
 import org.opentripplanner.street.model.edge.ElevatorHopEdge;
 import org.opentripplanner.street.model.edge.PathwayEdge;
-import org.opentripplanner.street.model.vertex.ElevatorVertex;
+import org.opentripplanner.street.model.vertex.ElevatorHopVertex;
 import org.opentripplanner.street.model.vertex.StationElementVertex;
 import org.opentripplanner.street.model.vertex.TransitBoardingAreaVertex;
 import org.opentripplanner.street.model.vertex.TransitEntranceVertex;
@@ -211,7 +211,7 @@ private void createPathwayEdgesAndAddThemToGraph() {
 
   /**
    * Create elevator edges from pathways. As pathway based elevators are not vertices, but edges in
-   * the pathway model, we have to model each possible movement as an ElevatorVertex-StationElementVertex pair,
+   * the pathway model, we have to model each possible movement as an ElevatorHopVertex-StationElementVertex pair,
    * instead of having only one set of vertices per level and edges between them.
    */
   private void createElevatorEdgesAndAddThemToGraph(
@@ -227,15 +227,13 @@ private void createElevatorEdgesAndAddThemToGraph(
       levels = Math.abs(fromLevel.index() - toLevel.index());
     }
 
-    ElevatorVertex fromOnboardVertex = vertexFactory.elevator(
+    ElevatorHopVertex fromOnboardVertex = vertexFactory.elevator(
       fromVertex,
-      getElevatorLabel(fromVertex, pathway),
-      fromLevel.index()
+      getElevatorLabel(fromVertex, pathway)
     );
-    ElevatorVertex toOnboardVertex = vertexFactory.elevator(
+    ElevatorHopVertex toOnboardVertex = vertexFactory.elevator(
       toVertex,
-      getElevatorLabel(toVertex, pathway),
-      toLevel.index()
+      getElevatorLabel(toVertex, pathway)
     );
 
     ElevatorBoardEdge.createElevatorBoardEdge(fromVertex, fromOnboardVertex);