Merge branch 'dev-2.x' into rrb_transfer

Jnction · Jan 30, 2025 · 0788a73 · 0788a73
2 parents c4f681c + c8fbf02
commit 0788a73
Show file tree

Hide file tree

Showing 237 changed files with 8,462 additions and 2,755 deletions.
diff --git a/.github/workflows/debug-client.yml b/.github/workflows/debug-client.yml
@@ -41,7 +41,7 @@ jobs:
         working-directory: client
         run: |
           npm install
-          npm run build -- --base https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/${VERSION}/
+          npm run build -- --base https://www.opentripplanner.org/debug-client-assets/${VERSION}/
           npm run coverage
 
       - name: Deploy compiled assets to repo

diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml
@@ -91,7 +91,7 @@ jobs:
           cp otp-shaded/target/otp-shaded-*-SNAPSHOT.jar otp.jar
           java -Xmx32G -jar otp.jar --build --save test/performance/${{ matrix.location }}/
 
-      - name: Run speed test
+      - name: Run RAPTOR speed test
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
         env:
           PERFORMANCE_INFLUX_DB_PASSWORD: ${{ secrets.PERFORMANCE_INFLUX_DB_PASSWORD }}
@@ -113,3 +113,12 @@ jobs:
         with:
           name: ${{ matrix.location }}-flight-recorder
           path: application/${{ matrix.location }}-speed-test.jfr
+
+      - name: Run transfer cache speed test
+        if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
+        env:
+          PERFORMANCE_INFLUX_DB_PASSWORD: ${{ secrets.PERFORMANCE_INFLUX_DB_PASSWORD }}
+          SPEEDTEST_LOCATION: ${{ matrix.location }}
+          MAVEN_OPTS: "-Xmx50g -Dmaven.repo.local=/home/lenni/.m2/repository/"
+        run: |
+          mvn --projects application exec:java -Dexec.mainClass="org.opentripplanner.transit.speed_test.TransferCacheTest" -Dexec.classpathScope=test -Dexec.args="--dir=test/performance/${{ matrix.location }}"
diff --git a/application/pom.xml b/application/pom.xml
@@ -296,7 +296,7 @@
         <dependency>
             <groupId>org.onebusaway</groupId>
             <artifactId>onebusaway-gtfs</artifactId>
-            <version>4.3.0</version>
+            <version>5.0.2</version>
         </dependency>
         <!-- Processing is used for the debug GUI (though we could probably use just Java2D) -->
         <dependency>
@@ -312,9 +312,9 @@
         </dependency>
         <!-- OpenStreetMap protobuf (PBF) definitions and parser -->
         <dependency>
-            <groupId>org.openstreetmap.osmosis</groupId>
-            <artifactId>osmosis-osm-binary</artifactId>
-            <version>0.48.3</version>
+            <groupId>org.openstreetmap.pbf</groupId>
+            <artifactId>osmpbf</artifactId>
+            <version>1.6.0</version>
         </dependency>
         <!-- Command line parameter parsing -->
         <dependency>

diff --git a/application/src/client/graphiql/index.html b/application/src/client/graphiql/index.html
@@ -30,13 +30,14 @@
     copy them directly into your environment, or perhaps include them in your
     favored resource bundler.
    -->
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/graphiql@3.0.4/graphiql.min.css" integrity="sha256-wTzfn13a+pLMB5rMeysPPR1hO7x0SwSeQI+cnw7VdbE=" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/graphiql@3.8.3/graphiql.min.css" integrity="sha256-sYaCR/jgUCzYaeWB9fPLVbM0hi5/UbHWy6zhEFm5rcI=" crossorigin="anonymous">
   <title>OTP GraphQL Explorer</title>
 </head>
 
 <body>
 <div id="graphiql">Loading...</div>
-<script src="https://cdn.jsdelivr.net/npm/graphiql@3.0.4/graphiql.min.js" integrity="sha256-t0BNtgZ2L82dpHhlgKJl4yJ1tbQxcp1N5NkEjR82A7E=" crossorigin="anonymous"></script>
+
+<script src="https://cdn.jsdelivr.net/npm/graphiql@3.8.3/graphiql.min.js" integrity="sha256-IvqrlAZ7aV5feVlhn75obrzIlVACoMl9mGvLukrUvCw=" crossorigin="anonymous"></script>
 
 <script>
   const gtfsExampleQuery = `
@@ -131,6 +132,11 @@
     updateURL();
   }
 
+  function onEditHeaders(headers) {
+    parameters.headers = headers;
+    updateURL();
+  }
+
   function updateURL() {
     if(parameters["query"] !== gtfsExampleQuery && parameters["query"] !== transmodelExampleQuery) {
 
@@ -168,16 +174,18 @@
     window.location.reload();
   };
 
-  function graphQLFetcher(graphQLParams) {
+  function graphQLFetcher(query, { headers }) {
+    const defaultHeaders = {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    }
+    const mergedHeaders = Object.assign({}, defaultHeaders, headers);
     return fetch(
             urls[apiFlavor],
             {
               method: 'post',
-              headers: {
-                Accept: 'application/json',
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify(graphQLParams),
+              headers: mergedHeaders,
+              body: JSON.stringify(query),
               credentials: 'omit',
             },
     ).then(function (response) {
@@ -198,10 +206,12 @@
             defaultVariableEditorOpen: true,
             query: parameters.query || defaultQueries[apiFlavor],
             variables: parameters.variables,
+            headers: parameters.headers,
             operationName: parameters.operationName,
             onEditQuery: onEditQuery,
             onEditVariables: onEditVariables,
             onEditOperationName: onEditOperationName,
+            onEditHeaders: onEditHeaders,
             defaultEditorToolsVisibility: true
           },
           React.createElement(GraphiQL.Logo, {}, [header, select]));

diff --git a/application/src/client/index.html b/application/src/client/index.html
@@ -5,10 +5,10 @@
     <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-02T15:56/assets/index-DODY0n0n.js"></script>
-    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2025/01/2025-01-02T15:56/assets/index-BDL0-veX.css">
+    <script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2025/01/2025-01-28T11:22/assets/index-BHcP0Ndc.js"></script>
+    <link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2025/01/2025-01-28T11:22/assets/index-DjMJ6mws.css">
   </head>
   <body>
     <div id="root"></div>
   </body>
-</html>
+</html>
diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2ServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2ServiceTest.java
@@ -12,7 +12,7 @@
 import java.util.Set;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.opentripplanner.ext.fares.model.Distance;
+import org.opentripplanner.transit.model.basic.Distance;
 import org.opentripplanner.ext.fares.model.FareDistance;
 import org.opentripplanner.ext.fares.model.FareDistance.LinearDistance;
 import org.opentripplanner.ext.fares.model.FareLegRule;
@@ -331,15 +331,22 @@ class DistanceFares {
     List<FareLegRule> distanceRules = List.of(
       FareLegRule
         .of(DISTANCE_ID, tenKmProduct)
-        .withFareDistance(new LinearDistance(Distance.ofKilometers(7), Distance.ofKilometers(10)))
+        .withFareDistance(new LinearDistance(
+          Distance.ofKilometersBoxed(7d, ignore -> {}).orElse(null),
+          Distance.ofKilometersBoxed(10d, ignore -> {}).orElse(null)))
         .build(),
       FareLegRule
         .of(DISTANCE_ID, threeKmProduct)
-        .withFareDistance(new LinearDistance(Distance.ofKilometers(3), Distance.ofKilometers(6)))
+        .withFareDistance(new LinearDistance(
+          Distance.ofKilometersBoxed(3d, ignore -> {}).orElse(null),
+          Distance.ofKilometersBoxed(6d, ignore -> {}).orElse(null)))
         .build(),
       FareLegRule
         .of(DISTANCE_ID, twoKmProduct)
-        .withFareDistance(new LinearDistance(Distance.ofMeters(0), Distance.ofMeters(2000)))
+        .withFareDistance(new LinearDistance(
+          Distance.ofMetersBoxed(0d, ignore -> {}).orElse(null),
+          Distance.ofMetersBoxed(2000d, ignore -> {}).orElse(null))
+        )
         .build()
     );
 

diff --git a/application/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/EnumMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/EnumMapperTest.java
@@ -8,39 +8,11 @@
 import java.util.Map;
 import java.util.function.Function;
 import org.junit.jupiter.api.Test;
-import org.opentripplanner.ext.restapi.model.ApiAbsoluteDirection;
-import org.opentripplanner.ext.restapi.model.ApiRelativeDirection;
 import org.opentripplanner.ext.restapi.model.ApiVertexType;
-import org.opentripplanner.model.plan.AbsoluteDirection;
-import org.opentripplanner.model.plan.RelativeDirection;
 import org.opentripplanner.model.plan.VertexType;
 
 public class EnumMapperTest {
 
-  private static final String MSG =
-    "Assert that the API enums have the exact same values that " +
-    "the domain enums of the same type, and that the specialized mapper is mapping all " +
-    "values. If this assumtion does not hold, create a new test.";
-
-  @Test
-  public void map() {
-    try {
-      verifyExactMatch(
-        AbsoluteDirection.class,
-        ApiAbsoluteDirection.class,
-        AbsoluteDirectionMapper::mapAbsoluteDirection
-      );
-      verifyExactMatch(
-        RelativeDirection.class,
-        ApiRelativeDirection.class,
-        RelativeDirectionMapper::mapRelativeDirection
-      );
-    } catch (RuntimeException ex) {
-      System.out.println(MSG);
-      throw ex;
-    }
-  }
-
   @Test
   public void testVertexTypeMapping() {
     verifyExplicitMatch(
@@ -75,17 +47,4 @@ private <D extends Enum<?>, A extends Enum<?>> void verifyExplicitMatch(
     assertTrue(rest.isEmpty());
   }
 
-  private <D extends Enum<?>, A extends Enum<?>> void verifyExactMatch(
-    Class<D> domainClass,
-    Class<A> apiClass,
-    Function<D, A> mapper
-  ) {
-    List<A> rest = new ArrayList<>(List.of(apiClass.getEnumConstants()));
-    for (D it : domainClass.getEnumConstants()) {
-      A result = mapper.apply(it);
-      assertEquals(result.name(), it.name());
-      rest.remove(result);
-    }
-    assertTrue(rest.isEmpty());
-  }
 }
diff --git a/...on/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java b/...on/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java
@@ -7,6 +7,7 @@
 
 import java.time.Duration;
 import java.util.Locale;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.service.vehicleparking.model.VehicleParkingState;
 import org.opentripplanner.test.support.ResourceLoader;
@@ -17,6 +18,7 @@
 public class BikelyUpdaterTest {
 
   @Test
+  @Disabled
   void parseBikeBoxes() {
     var uri = ResourceLoader.of(this).uri("bikely.json");
     var parameters = new BikelyUpdaterParameters(
@@ -41,8 +43,9 @@ void parseBikeBoxes() {
 
     assertEquals(
       "First 12 hour(s) is NOK0.00, afterwards NOK10.00 per 1 hour(s)",
-      first.getNote().toString(Locale.ENGLISH)
+      first.getNote().toString(Locale.ROOT)
     );
+    // This test fails in the entur ci pipline
     assertEquals(
       "Første 12 time(r) er kr 0,00. Deretter kr 10,00 per 1 time(r)",
       first.getNote().toString(Locales.NORWEGIAN_BOKMAL)

diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/Distance.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/Distance.java
diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareDistance.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareDistance.java
@@ -1,5 +1,7 @@
 package org.opentripplanner.ext.fares.model;
 
+import org.opentripplanner.transit.model.basic.Distance;
+
 /** Represents a distance metric used in distance-based fare computation*/
 public sealed interface FareDistance {
   /** Represents the number of stops as a distance metric in fare computation */

diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java
@@ -64,6 +64,10 @@ public Route getRouteById(FeedScopedId id) {
     return routeById.get(id);
   }
 
+  public boolean contains(Route route) {
+    return routeById.containsKey(route.getId());
+  }
+
   public Collection<Route> getAllFlexRoutes() {
     return routeById.values();
   }

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();

diff --git a/...ication/src/ext/java/org/opentripplanner/ext/restapi/mapping/RelativeDirectionMapper.java b/...ication/src/ext/java/org/opentripplanner/ext/restapi/mapping/RelativeDirectionMapper.java
@@ -14,7 +14,7 @@ public static ApiRelativeDirection mapRelativeDirection(RelativeDirection domain
       case HARD_LEFT -> ApiRelativeDirection.HARD_LEFT;
       case LEFT -> ApiRelativeDirection.LEFT;
       case SLIGHTLY_LEFT -> ApiRelativeDirection.SLIGHTLY_LEFT;
-      case CONTINUE -> ApiRelativeDirection.CONTINUE;
+      case CONTINUE, ENTER_OR_EXIT_STATION -> ApiRelativeDirection.CONTINUE;
       case SLIGHTLY_RIGHT -> ApiRelativeDirection.SLIGHTLY_RIGHT;
       case RIGHT -> ApiRelativeDirection.RIGHT;
       case HARD_RIGHT -> ApiRelativeDirection.HARD_RIGHT;

diff --git a/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/WalkStepMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/WalkStepMapper.java
@@ -39,7 +39,7 @@ public ApiWalkStep mapWalkStep(WalkStep domain) {
     api.streetName = domain.getDirectionText().toString(locale);
     api.absoluteDirection =
       domain.getAbsoluteDirection().map(AbsoluteDirectionMapper::mapAbsoluteDirection).orElse(null);
-    api.exit = domain.getExit();
+    api.exit = domain.highwayExit().orElse(null);
     api.stayOn = domain.isStayOn();
     api.area = domain.getArea();
     api.bogusName = domain.nameIsDerived();

diff --git a/...t/resources/org/opentripplanner/ext/apis/transmodel/custom-documentation-entur.properties b/...t/resources/org/opentripplanner/ext/apis/transmodel/custom-documentation-entur.properties
@@ -0,0 +1,27 @@
+# Use:
+#   <TypeName>[.<FieldName>].(description|deprecated)[.append]
+#
+# Examples
+#  // Replace the existing type description
+#  Quay.description=The place for boarding/alighting a vehicle
+#
+#  // Append to the existing type description
+#  Quay.description.append=Append
+#
+#  // Replace the existing field description
+#  Quay.name.description=The public name
+#
+#  // Append to the existing field description
+#  Quay.name.description.append=(Source NSR)
+#
+#  // Insert deprecated reason. Due to a bug in the Java GraphQL lib, an existing deprecated
+#  // reason cannot be updated. Deleting the reason from the schema, and adding it back using
+#  // the "default" TransmodelApiDocumentationProfile is a workaround.
+#  Quay.name.deprecated=This field is deprecated ...
+
+
+TariffZone.description=A **zone** used to define a zonal fare structure in a zone-counting or \
+  zone-matrix system. This includes TariffZone, as well as the specialised FareZone elements. \
+  TariffZones are deprecated, please use FareZones. \
+  \
+  **TariffZone data will not be maintained from 1. MAY 2025 (Entur).**