Merge remote-tracking branch 'upstream/dev-2.x' into siri-gtfs

leonardehrenfried · Jan 24, 2025 · 0723ab3 · 0723ab3
2 parents b9cba70 + 12b5cb6
commit 0723ab3
Show file tree

Hide file tree

Showing 75 changed files with 3,767 additions and 898 deletions.
diff --git a/application/src/client/index.html b/application/src/client/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/img/otp-logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>OTP Debug</title>
-    <script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2025/01/2025-01-19T18:39/assets/index-c0j8tbTf.js"></script>
-    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2025/01/2025-01-19T18:39/assets/index-BDL0-veX.css">
+    <script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2025/01/2025-01-23T16:53/assets/index-DbQDy0wD.js"></script>
+    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2025/01/2025-01-23T16:53/assets/index-DjMJ6mws.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java
@@ -199,7 +199,7 @@ private FlexAccessEgress createFlexAccessEgress(
       return null;
     }
 
-    final var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState, transferEdges);
+    final var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState[0], transferEdges);
 
     return finalStateOpt
       .map(finalState -> {

diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java
@@ -113,7 +113,7 @@ private Optional<DirectFlexPath> createDirectGraphPath(
 
     final State[] afterFlexState = flexEdge.traverse(accessNearbyStop.state);
 
-    var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState, egress.edges);
+    var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState[0], egress.edges);
 
     if (finalStateOpt.isEmpty()) {
       return Optional.empty();