Upstream merge 2025-01-03

.github/workflows/performance-test.yml

@@ -88,7 +88,7 @@ jobs:
       - name: Build graph
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
         run: |
-          cp shaded-jar/target/otp-*-SNAPSHOT-shaded.jar otp.jar
+          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

.github/workflows/smoke-tests.yml

@@ -23,8 +23,8 @@ jobs:
             sleep: 15
           - name: houston
             sleep: 30
-          - name: denver
-            sleep: 15
+          #- name: denver
+          #  sleep: 15
           - name: septa
             sleep: 15
           - name: portland

README.md

@@ -31,10 +31,11 @@ We run a speed test (included in the code) to measure the performance for every
 
 ## Repository layout
 
-The main Java server code is in `application/src/main/`. OTP also includes a Javascript client based on the
-MapLibre mapping library in `client/src/`. This client is now used for testing, with most major
-deployments building custom clients from reusable components. The Maven build produces a unified ("shaded")
-JAR file at `shaded-jar/target/otp-VERSION.jar` containing all necessary code and dependencies to run OpenTripPlanner.
+The main Java server code is in `application/src/main/`. OTP also includes a Javascript client 
+based on the MapLibre mapping library in `client/src/`. This client is now used for testing, with
+most major deployments building custom clients from reusable components. The Maven build produces a
+unified ("shaded") JAR file at `otp-shaded/target/otp-shaded-VERSION.jar` containing all necessary
+code and dependencies to run OpenTripPlanner.
 
 Additional information and instructions are available in
 the [main documentation](http://docs.opentripplanner.org/en/dev-2.x/), including a
@@ -59,7 +60,11 @@ the world.
 
 ## Getting in touch
 
-The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner) where most of the core developers are. Bug reports may be filed via the Github [issue tracker](https://github.com/openplans/OpenTripPlanner/issues). The OpenTripPlanner [mailing list](http://groups.google.com/group/opentripplanner-users) is used almost exclusively for project announcements. The mailing list and issue tracker are not intended for support questions or discussions. Please use the chat for this purpose. Other details of [project governance](http://docs.opentripplanner.org/en/dev-2.x/Governance/) can be found in the main documentation.
+The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner) where most of the core developers
+are. Bug reports may be filed via the Github [issue tracker](https://github.com/openplans/OpenTripPlanner/issues). The OpenTripPlanner [mailing list](http://groups.google.com/group/opentripplanner-users)
+is used almost exclusively for project announcements. The mailing list and issue tracker are not
+intended for support questions or discussions. Please use the chat for this purpose. Other details
+of [project governance](http://docs.opentripplanner.org/en/dev-2.x/Governance/) can be found in the main documentation.
 
 ## OTP Ecosystem
 

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/2024/12/2024-12-09T10:11/assets/index-Cy40AOLN.js"></script>
-    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/12/2024-12-09T10:11/assets/index-DygGy0HD.css">
+    <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">
   </head>
   <body>
     <div id="root"></div>

application/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java

@@ -9,7 +9,7 @@
 import org.locationtech.jts.geom.LineString;
 import org.opentripplanner.model.fare.FareProductUse;
 import org.opentripplanner.model.plan.Leg;
-import org.opentripplanner.model.plan.LegTime;
+import org.opentripplanner.model.plan.LegCallTime;
 import org.opentripplanner.model.plan.Place;
 import org.opentripplanner.model.plan.StopArrival;
 import org.opentripplanner.model.plan.TransitLeg;
@@ -55,12 +55,12 @@ public Trip getTrip() {
   }
 
   @Override
-  public LegTime start() {
+  public LegCallTime start() {
     return first.start();
   }
 
   @Override
-  public LegTime end() {
+  public LegCallTime end() {
     return second.end();
   }
 

application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java

@@ -8,6 +8,7 @@
 import java.util.Map;
 import org.opentripplanner.ext.flex.trip.FlexTrip;
 import org.opentripplanner.model.PathTransfer;
+import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.Route;
 import org.opentripplanner.transit.model.site.GroupStop;
@@ -18,15 +19,19 @@ public class FlexIndex {
 
   private final Multimap<StopLocation, PathTransfer> transfersToStop = ArrayListMultimap.create();
 
+  private final Multimap<StopLocation, PathTransfer> transfersFromStop = ArrayListMultimap.create();
+
   private final Multimap<StopLocation, FlexTrip<?, ?>> flexTripsByStop = HashMultimap.create();
 
   private final Map<FeedScopedId, Route> routeById = new HashMap<>();
 
   private final Map<FeedScopedId, FlexTrip<?, ?>> tripById = new HashMap<>();
 
   public FlexIndex(TimetableRepository timetableRepository) {
-    for (PathTransfer transfer : timetableRepository.getAllPathTransfers()) {
+    // Flex transfers should only use WALK mode transfers.
+    for (PathTransfer transfer : timetableRepository.findTransfers(StreetMode.WALK)) {
       transfersToStop.put(transfer.to, transfer);
+      transfersFromStop.put(transfer.from, transfer);
     }
     for (FlexTrip<?, ?> flexTrip : timetableRepository.getAllFlexTrips()) {
       routeById.put(flexTrip.getTrip().getRoute().getId(), flexTrip.getTrip().getRoute());
@@ -47,6 +52,10 @@ public Collection<PathTransfer> getTransfersToStop(StopLocation stopLocation) {
     return transfersToStop.get(stopLocation);
   }
 
+  public Collection<PathTransfer> getTransfersFromStop(StopLocation stopLocation) {
+    return transfersFromStop.get(stopLocation);
+  }
+
   public Collection<FlexTrip<?, ?>> getFlexTripsByStop(StopLocation stopLocation) {
     return flexTripsByStop.get(stopLocation);
   }

application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java

@@ -192,7 +192,7 @@ public TransitStopVertex getStopVertexForStopId(FeedScopedId stopId) {
 
     @Override
     public Collection<PathTransfer> getTransfersFromStop(StopLocation stop) {
-      return transitService.findPathTransfers(stop);
+      return transitService.getFlexIndex().getTransfersFromStop(stop);
     }
 
     @Override

application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java

@@ -13,7 +13,7 @@
 import org.opentripplanner.model.PickDrop;
 import org.opentripplanner.model.fare.FareProductUse;
 import org.opentripplanner.model.plan.Leg;
-import org.opentripplanner.model.plan.LegTime;
+import org.opentripplanner.model.plan.LegCallTime;
 import org.opentripplanner.model.plan.Place;
 import org.opentripplanner.model.plan.StopArrival;
 import org.opentripplanner.model.plan.TransitLeg;
@@ -87,13 +87,13 @@ public Accessibility getTripWheelchairAccessibility() {
   }
 
   @Override
-  public LegTime start() {
-    return LegTime.ofStatic(startTime);
+  public LegCallTime start() {
+    return LegCallTime.ofStatic(startTime);
   }
 
   @Override
-  public LegTime end() {
-    return LegTime.ofStatic(endTime);
+  public LegCallTime end() {
+    return LegCallTime.ofStatic(endTime);
   }
 
   @Override

application/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java

@@ -87,7 +87,7 @@ public ApiLeg mapLeg(
 
     api.departureDelay = domain.getDepartureDelay();
     api.arrivalDelay = domain.getArrivalDelay();
-    api.realTime = domain.getRealTime();
+    api.realTime = domain.isRealTimeUpdated();
     api.isNonExactFrequency = domain.getNonExactFrequency();
     api.headway = domain.getHeadway();
     api.distance = round3Decimals(domain.getDistanceMeters());

application/src/ext/java/org/opentripplanner/ext/restapi/mapping/WalkStepMapper.java

@@ -42,7 +42,7 @@ public ApiWalkStep mapWalkStep(WalkStep domain) {
     api.exit = domain.getExit();
     api.stayOn = domain.isStayOn();
     api.area = domain.getArea();
-    api.bogusName = domain.getBogusName();
+    api.bogusName = domain.nameIsDerived();
     if (domain.getStartLocation() != null) {
       api.lon = domain.getStartLocation().longitude();
       api.lat = domain.getStartLocation().latitude();

application/src/main/java/org/opentripplanner/api/parameter/QualifiedModeSet.java

@@ -126,9 +126,10 @@ public RequestModes getRequestModes() {
             mBuilder.withEgressMode(StreetMode.CAR_HAILING);
             mBuilder.withDirectMode(StreetMode.WALK);
           } else {
-            mBuilder.withAccessMode(StreetMode.WALK);
-            mBuilder.withTransferMode(StreetMode.WALK);
-            mBuilder.withEgressMode(StreetMode.WALK);
+            // This is necessary for transfer calculations.
+            mBuilder.withAccessMode(StreetMode.CAR);
+            mBuilder.withTransferMode(StreetMode.CAR);
+            mBuilder.withEgressMode(StreetMode.CAR);
             mBuilder.withDirectMode(StreetMode.CAR);
           }
         }

application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java

@@ -2,13 +2,15 @@
 
 import java.time.Instant;
 import java.util.Locale;
+import javax.annotation.Nullable;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLFilterPlaceType;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLFormFactor;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRoutingErrorCode;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLWheelchairBoarding;
 import org.opentripplanner.framework.i18n.I18NString;
+import org.opentripplanner.model.StopTime;
 import org.opentripplanner.routing.api.response.InputField;
 import org.opentripplanner.routing.api.response.RoutingErrorCode;
 import org.opentripplanner.routing.graphfinder.PlaceType;
@@ -109,4 +111,17 @@ public static boolean startsWith(String str, String name, Locale locale) {
   public static boolean startsWith(I18NString str, String name, Locale locale) {
     return str != null && str.toString(locale).toLowerCase(locale).startsWith(name);
   }
+
+  /**
+   * Generally the missing values are removed during the graph build. However, for flex trips they
+   * are not and have to be converted to null here.
+   */
+  @Nullable
+  public static Integer stopTimeToInt(int value) {
+    if (value == StopTime.MISSING_VALUE) {
+      return null;
+    } else {
+      return value;
+    }
+  }
 }

application/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java

@@ -31,18 +31,22 @@
 import org.opentripplanner.apis.gtfs.datafetchers.BikeRentalStationImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.BookingInfoImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.BookingTimeImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.CallScheduledTimeTypeResolver;
+import org.opentripplanner.apis.gtfs.datafetchers.CallStopLocationTypeResolver;
 import org.opentripplanner.apis.gtfs.datafetchers.CarParkImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.ContactInfoImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.CoordinatesImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.CurrencyImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.DefaultFareProductImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.DepartureRowImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.EstimatedTimeImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.FareProductTypeResolver;
 import org.opentripplanner.apis.gtfs.datafetchers.FareProductUseImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.FeedImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.GeometryImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.ItineraryImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.LegImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.LegTimeImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.MoneyImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.NodeTypeResolver;
 import org.opentripplanner.apis.gtfs.datafetchers.OpeningHoursImpl;
@@ -52,13 +56,15 @@
 import org.opentripplanner.apis.gtfs.datafetchers.PlanConnectionImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.PlanImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.QueryTypeImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.RealTimeEstimateImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RentalPlaceTypeResolver;
 import org.opentripplanner.apis.gtfs.datafetchers.RentalVehicleImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RentalVehicleTypeImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RideHailingEstimateImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RouteImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RouteTypeImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.RoutingErrorImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.StopCallImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StopGeometriesImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StopImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.StopOnRouteImpl;
@@ -71,6 +77,7 @@
 import org.opentripplanner.apis.gtfs.datafetchers.TranslatedStringImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.TripImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.TripOccupancyImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.TripOnServiceDateImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.UnknownImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.VehicleParkingImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.VehiclePositionImpl;
@@ -128,6 +135,8 @@ protected static GraphQLSchema buildSchema() {
         .type("StopPosition", type -> type.typeResolver(new StopPosition() {}))
         .type("FareProduct", type -> type.typeResolver(new FareProductTypeResolver()))
         .type("AlertEntity", type -> type.typeResolver(new AlertEntityTypeResolver()))
+        .type("CallStopLocation", type -> type.typeResolver(new CallStopLocationTypeResolver()))
+        .type("CallScheduledTime", type -> type.typeResolver(new CallScheduledTimeTypeResolver()))
         .type(typeWiring.build(AgencyImpl.class))
         .type(typeWiring.build(AlertImpl.class))
         .type(typeWiring.build(BikeParkImpl.class))
@@ -180,7 +189,12 @@ protected static GraphQLSchema buildSchema() {
         .type(typeWiring.build(CurrencyImpl.class))
         .type(typeWiring.build(FareProductUseImpl.class))
         .type(typeWiring.build(DefaultFareProductImpl.class))
+        .type(typeWiring.build(TripOnServiceDateImpl.class))
+        .type(typeWiring.build(StopCallImpl.class))
         .type(typeWiring.build(TripOccupancyImpl.class))
+        .type(typeWiring.build(LegTimeImpl.class))
+        .type(typeWiring.build(RealTimeEstimateImpl.class))
+        .type(typeWiring.build(EstimatedTimeImpl.class))
         .build();
       SchemaGenerator schemaGenerator = new SchemaGenerator();
       return schemaGenerator.makeExecutableSchema(typeRegistry, runtimeWiring);

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CallScheduledTimeTypeResolver.java

@@ -0,0 +1,21 @@
+package org.opentripplanner.apis.gtfs.datafetchers;
+
+import graphql.TypeResolutionEnvironment;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLSchema;
+import graphql.schema.TypeResolver;
+import org.opentripplanner.apis.gtfs.model.ArrivalDepartureTime;
+
+public class CallScheduledTimeTypeResolver implements TypeResolver {
+
+  @Override
+  public GraphQLObjectType getType(TypeResolutionEnvironment environment) {
+    Object o = environment.getObject();
+    GraphQLSchema schema = environment.getSchema();
+
+    if (o instanceof ArrivalDepartureTime) {
+      return schema.getObjectType("ArrivalDepartureTime");
+    }
+    return null;
+  }
+}

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/CallStopLocationTypeResolver.java

@@ -0,0 +1,21 @@
+package org.opentripplanner.apis.gtfs.datafetchers;
+
+import graphql.TypeResolutionEnvironment;
+import graphql.schema.GraphQLObjectType;
+import graphql.schema.GraphQLSchema;
+import graphql.schema.TypeResolver;
+import org.opentripplanner.transit.model.site.StopLocation;
+
+public class CallStopLocationTypeResolver implements TypeResolver {
+
+  @Override
+  public GraphQLObjectType getType(TypeResolutionEnvironment environment) {
+    Object o = environment.getObject();
+    GraphQLSchema schema = environment.getSchema();
+
+    if (o instanceof StopLocation) {
+      return schema.getObjectType("Stop");
+    }
+    return null;
+  }
+}

application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/EstimatedTimeImpl.java

@@ -0,0 +1,25 @@
+package org.opentripplanner.apis.gtfs.datafetchers;
+
+import graphql.schema.DataFetcher;
+import graphql.schema.DataFetchingEnvironment;
+import java.time.Duration;
+import java.time.OffsetDateTime;
+import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
+import org.opentripplanner.transit.model.timetable.EstimatedTime;
+
+public class EstimatedTimeImpl implements GraphQLDataFetchers.GraphQLEstimatedTime {
+
+  @Override
+  public DataFetcher<Duration> delay() {
+    return environment -> getSource(environment).delay();
+  }
+
+  @Override
+  public DataFetcher<OffsetDateTime> time() {
+    return environment -> getSource(environment).time().toOffsetDateTime();
+  }
+
+  private EstimatedTime getSource(DataFetchingEnvironment environment) {
+    return environment.getSource();
+  }
+}