Add start and end to schema

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;
+    }
+  }
 }

src/main/java/org/opentripplanner/apis/gtfs/datafetchers/DatedTripImpl.java

@@ -1,13 +1,18 @@
 package org.opentripplanner.apis.gtfs.datafetchers;
 
+import static org.opentripplanner.apis.gtfs.GraphQLUtils.stopTimeToInt;
+
 import graphql.relay.Relay;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.time.Instant;
 import java.time.LocalDate;
+import java.time.ZonedDateTime;
 import java.util.List;
+import javax.annotation.Nullable;
 import org.opentripplanner.apis.gtfs.GraphQLRequestContext;
 import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
+import org.opentripplanner.apis.gtfs.model.DatedTripTime;
 import org.opentripplanner.ext.restapi.mapping.LocalDateMapper;
 import org.opentripplanner.framework.time.ServiceDateUtils;
 import org.opentripplanner.model.Timetable;
@@ -16,6 +21,7 @@
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.timetable.DatedTrip;
 import org.opentripplanner.transit.model.timetable.Trip;
+import org.opentripplanner.transit.model.timetable.TripTimes;
 import org.opentripplanner.transit.service.TransitService;
 
 public class DatedTripImpl implements GraphQLDataFetchers.GraphQLDatedTrip {
@@ -25,6 +31,24 @@ public DataFetcher<LocalDate> date() {
     return env -> getSource(env).serviceDate();
   }
 
+  @Override
+  public DataFetcher<DatedTripTime> end() {
+    return env -> {
+      var tripTimes = getTripTimes(env);
+      if (tripTimes == null) {
+        return null;
+      }
+      var stopIndex = tripTimes.getNumStops() - 1;
+      var scheduledTime = getZonedDateTime(env, tripTimes.getScheduledArrivalTime(stopIndex));
+      if (scheduledTime == null) {
+        return null;
+      }
+      return tripTimes.isRealtimeUpdated(stopIndex)
+        ? DatedTripTime.of(scheduledTime, tripTimes.getArrivalDelay(stopIndex))
+        : DatedTripTime.ofStatic(scheduledTime);
+    };
+  }
+
   @Override
   public DataFetcher<Relay.ResolvedGlobalId> id() {
     return env ->
@@ -46,6 +70,23 @@ public DataFetcher<Route> route() {
     return environment -> getSource(environment).trip().getRoute();
   }
 
+  @Override
+  public DataFetcher<DatedTripTime> start() {
+    return env -> {
+      var tripTimes = getTripTimes(env);
+      if (tripTimes == null) {
+        return null;
+      }
+      var scheduledTime = getZonedDateTime(env, tripTimes.getScheduledDepartureTime(0));
+      if (scheduledTime == null) {
+        return null;
+      }
+      return tripTimes.isRealtimeUpdated(0)
+        ? DatedTripTime.of(scheduledTime, tripTimes.getDepartureDelay(0))
+        : DatedTripTime.ofStatic(scheduledTime);
+    };
+  }
+
   @Override
   public DataFetcher<Iterable<Object>> stops() {
     return this::getStops;
@@ -56,18 +97,12 @@ public DataFetcher<Iterable<TripTimeOnDate>> stoptimes() {
     return environment -> {
       TransitService transitService = getTransitService(environment);
       Trip trip = getSource(environment).trip();
-
       var serviceDate = getSource(environment).serviceDate();
-      TripPattern tripPattern = transitService.getPatternForTrip(trip, serviceDate);
-      // no matching pattern found
-      if (tripPattern == null) {
-        return List.of();
-      }
 
       Instant midnight = ServiceDateUtils
         .asStartOfService(serviceDate, transitService.getTimeZone())
         .toInstant();
-      Timetable timetable = transitService.getTimetableForTripPattern(tripPattern, serviceDate);
+      Timetable timetable = getTimetable(environment, trip, serviceDate);
       if (timetable == null) {
         return List.of();
       }
@@ -101,6 +136,43 @@ private TripPattern getTripPattern(DataFetchingEnvironment environment) {
     return getTransitService(environment).getPatternForTrip(getSource(environment).trip());
   }
 
+  @Nullable
+  private Timetable getTimetable(
+    DataFetchingEnvironment environment,
+    Trip trip,
+    LocalDate serviceDate
+  ) {
+    TransitService transitService = getTransitService(environment);
+    TripPattern tripPattern = transitService.getPatternForTrip(trip, serviceDate);
+    // no matching pattern found
+    if (tripPattern == null) {
+      return null;
+    }
+
+    return transitService.getTimetableForTripPattern(tripPattern, serviceDate);
+  }
+
+  @Nullable
+  private TripTimes getTripTimes(DataFetchingEnvironment environment) {
+    Trip trip = getSource(environment).trip();
+    var serviceDate = getSource(environment).serviceDate();
+    var timetable = getTimetable(environment, trip, serviceDate);
+    if (timetable == null) {
+      return null;
+    }
+    return timetable.getTripTimes(trip);
+  }
+
+  private ZonedDateTime getZonedDateTime(DataFetchingEnvironment environment, int time) {
+    var fixedTime = stopTimeToInt(time);
+    if (fixedTime == null) {
+      return null;
+    }
+    var serviceDate = getSource(environment).serviceDate();
+    TransitService transitService = getTransitService(environment);
+    return ServiceDateUtils.toZonedDateTime(serviceDate, transitService.getTimeZone(), fixedTime);
+  }
+
   private TransitService getTransitService(DataFetchingEnvironment environment) {
     return environment.<GraphQLRequestContext>getContext().transitService();
   }

src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java

@@ -1,10 +1,11 @@
 package org.opentripplanner.apis.gtfs.datafetchers;
 
+import static org.opentripplanner.apis.gtfs.GraphQLUtils.stopTimeToInt;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
 import org.opentripplanner.framework.graphql.GraphQLUtils;
-import org.opentripplanner.model.StopTime;
 import org.opentripplanner.model.TripTimeOnDate;
 import org.opentripplanner.transit.model.timetable.RealTimeState;
 import org.opentripplanner.transit.model.timetable.Trip;
@@ -13,7 +14,7 @@ public class StoptimeImpl implements GraphQLDataFetchers.GraphQLStoptime {
 
   @Override
   public DataFetcher<Integer> arrivalDelay() {
-    return environment -> missingValueToNull(getSource(environment).getArrivalDelay());
+    return environment -> stopTimeToInt(getSource(environment).getArrivalDelay());
   }
 
   @Override
@@ -58,12 +59,12 @@ public DataFetcher<Boolean> realtime() {
 
   @Override
   public DataFetcher<Integer> realtimeArrival() {
-    return environment -> missingValueToNull(getSource(environment).getRealtimeArrival());
+    return environment -> stopTimeToInt(getSource(environment).getRealtimeArrival());
   }
 
   @Override
   public DataFetcher<Integer> realtimeDeparture() {
-    return environment -> missingValueToNull(getSource(environment).getRealtimeDeparture());
+    return environment -> stopTimeToInt(getSource(environment).getRealtimeDeparture());
   }
 
   @Override
@@ -76,12 +77,12 @@ public DataFetcher<String> realtimeState() {
 
   @Override
   public DataFetcher<Integer> scheduledArrival() {
-    return environment -> missingValueToNull(getSource(environment).getScheduledArrival());
+    return environment -> stopTimeToInt(getSource(environment).getScheduledArrival());
   }
 
   @Override
   public DataFetcher<Integer> scheduledDeparture() {
-    return environment -> missingValueToNull(getSource(environment).getScheduledDeparture());
+    return environment -> stopTimeToInt(getSource(environment).getScheduledDeparture());
   }
 
   @Override
@@ -112,16 +113,4 @@ public DataFetcher<Trip> trip() {
   private TripTimeOnDate getSource(DataFetchingEnvironment environment) {
     return environment.getSource();
   }
-
-  /**
-   * 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.
-   */
-  private Integer missingValueToNull(int value) {
-    if (value == StopTime.MISSING_VALUE) {
-      return null;
-    } else {
-      return value;
-    }
-  }
 }

src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java

@@ -21,6 +21,7 @@
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRelativeDirection;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRoutingErrorCode;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode;
+import org.opentripplanner.apis.gtfs.model.DatedTripTime;
 import org.opentripplanner.apis.gtfs.model.FeedPublisher;
 import org.opentripplanner.apis.gtfs.model.PlanPageInfo;
 import org.opentripplanner.apis.gtfs.model.RideHailingProvider;
@@ -319,12 +320,16 @@ public interface GraphQLCurrency {
   public interface GraphQLDatedTrip {
     public DataFetcher<java.time.LocalDate> date();
 
+    public DataFetcher<DatedTripTime> end();
+
     public DataFetcher<graphql.relay.Relay.ResolvedGlobalId> id();
 
     public DataFetcher<TripPattern> pattern();
 
     public DataFetcher<Route> route();
 
+    public DataFetcher<DatedTripTime> start();
+
     public DataFetcher<Iterable<Object>> stops();
 
     public DataFetcher<Iterable<TripTimeOnDate>> stoptimes();
@@ -354,6 +359,16 @@ public interface GraphQLDatedTripEdge {
     public DataFetcher<DatedTrip> node();
   }
 
+  /**
+   * Information about a dated trip's start or end times. May contain real-time information if
+   * available.
+   */
+  public interface GraphQLDatedTripTime {
+    public DataFetcher<Object> estimated();
+
+    public DataFetcher<java.time.OffsetDateTime> scheduledTime();
+  }
+
   /**
    * The standard case of a fare product: it only has a single price to be paid by the passenger
    * and no discounts are applied.

src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml

@@ -62,6 +62,7 @@ config:
     DatedTrip: org.opentripplanner.transit.model.timetable.DatedTrip#DatedTrip
     DatedTripConnection: graphql.relay.Connection#Connection<DatedTrip>
     DatedTripEdge: graphql.relay.Edge#Edge<DatedTrip>
+    DatedTripTime: org.opentripplanner.apis.gtfs.model.DatedTripTime#DatedTripTime
     debugOutput: org.opentripplanner.api.resource.DebugOutput#DebugOutput
     DepartureRow: org.opentripplanner.routing.graphfinder.PatternAtStop#PatternAtStop
     elevationProfileComponent: org.opentripplanner.model.plan.ElevationProfile.Step

src/main/java/org/opentripplanner/apis/gtfs/model/DatedTripTime.java

@@ -0,0 +1,31 @@
+package org.opentripplanner.apis.gtfs.model;
+
+import java.time.Duration;
+import java.time.ZonedDateTime;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * A scheduled time of a trip's start or end with an optional realtime information.
+ */
+public record DatedTripTime(
+  @Nonnull ZonedDateTime scheduledTime,
+  @Nullable RealTimeEstimate estimated
+) {
+  @Nonnull
+  public static DatedTripTime of(ZonedDateTime realtime, int delaySecs) {
+    var delay = Duration.ofSeconds(delaySecs);
+    return new DatedTripTime(realtime.minus(delay), new RealTimeEstimate(realtime, delay));
+  }
+
+  @Nonnull
+  public static DatedTripTime ofStatic(ZonedDateTime staticTime) {
+    return new DatedTripTime(staticTime, null);
+  }
+
+  /**
+   * Realtime information about a vehicle at a certain place.
+   * @param delay Delay or "earliness" of a vehicle. Earliness is expressed as a negative number.
+   */
+  record RealTimeEstimate(ZonedDateTime time, Duration delay) {}
+}

src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java

@@ -219,11 +219,8 @@ public int getArrivalDelay() {
   @Override
   public boolean getRealTime() {
     return (
-      !tripTimes.isScheduled() &&
-      (
-        !tripTimes.isNoDataStop(boardStopPosInPattern) ||
-        !tripTimes.isNoDataStop(alightStopPosInPattern)
-      )
+      tripTimes.isRealtimeUpdated(boardStopPosInPattern) ||
+      tripTimes.isRealtimeUpdated(alightStopPosInPattern)
     );
   }
 

src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java

@@ -198,6 +198,13 @@ public boolean isPredictionInaccurate(int stop) {
     return isStopRealTimeStates(stop, StopRealTimeState.INACCURATE_PREDICTIONS);
   }
 
+  public boolean isRealtimeUpdated(int stop) {
+    return (
+      realTimeState != RealTimeState.SCHEDULED &&
+      !isStopRealTimeStates(stop, StopRealTimeState.NO_DATA)
+    );
+  }
+
   public void setOccupancyStatus(int stop, OccupancyStatus occupancyStatus) {
     prepareForRealTimeUpdates();
     this.occupancyStatus[stop] = occupancyStatus;

src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java

@@ -234,6 +234,11 @@ public boolean isPredictionInaccurate(int stop) {
     return false;
   }
 
+  @Override
+  public boolean isRealtimeUpdated(int stop) {
+    return false;
+  }
+
   @Override
   public I18NString getTripHeadsign() {
     return trip.getHeadsign();

src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java

@@ -123,6 +123,11 @@ default int compareTo(TripTimes other) {
 
   boolean isPredictionInaccurate(int stop);
 
+  /**
+   * Return if trip has been updated and stop has not been given a NO_DATA update.
+   */
+  boolean isRealtimeUpdated(int stop);
+
   /**
    * @return the whole trip's headsign. Individual stops can have different headsigns.
    */