service end date for stops for checking the status of a stop

Author: sharhio

application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java

@@ -39,13 +39,15 @@ protected Collection<KeyValue> map(RegularStop stop) {
       .findStopTimesInPattern(stop, serviceDate, ArrivalDeparture.BOTH, true)
       .stream()
       .anyMatch(stopTime -> stopTime.times.size() > 0);
+    var inService = transitService.isStopInService(stop);
 
     Collection<KeyValue> sharedKeyValues = getBaseKeyValues(stop, i18NStringMapper, transitService);
     return ListUtils.combine(
       sharedKeyValues,
       List.of(
         new KeyValue("closedByServiceAlert", noServiceAlert),
-        new KeyValue("servicesRunningOnServiceDate", stopTimesExist)
+        new KeyValue("servicesRunningOnServiceDate", stopTimesExist),
+        new KeyValue("servicesRunningInFuture", inService)
       )
     );
   }

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

@@ -474,6 +474,18 @@ public DataFetcher<String> vehicleMode() {
     };
   }
 
+  @Override
+  public DataFetcher<Boolean> hasFutureServices() {
+    return environment -> {
+      TransitService transitService = getTransitService(environment);
+      return getValue(
+        environment,
+        transitService::isStopInService,
+        transitService::isStationInService
+      );
+    };
+  }
+
   @Deprecated
   @Override
   public DataFetcher<Integer> vehicleType() {

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

@@ -1080,6 +1080,8 @@ public interface GraphQLStop {
 
     public DataFetcher<String> gtfsId();
 
+    public DataFetcher<Boolean> hasFutureServices();
+
     public DataFetcher<graphql.relay.Relay.ResolvedGlobalId> id();
 
     public DataFetcher<Double> lat();

application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java

@@ -813,4 +813,19 @@ public int compare(TripOnServiceDate t1, TripOnServiceDate t2) {
       }
     }
   }
+
+  @Override
+  public boolean isStopInService(StopLocation stop) {
+    return timetableRepositoryIndex.isStopInService(stop);
+  }
+
+  @Override
+  public boolean isStationInService(Station station) {
+    for (StopLocation stop : station.getChildStops()) {
+      if (isStopInService(stop)) {
+        return true;
+      }
+    }
+    return false;
+  }
 }

application/src/main/java/org/opentripplanner/transit/service/TimetableRepositoryIndex.java

@@ -50,6 +50,8 @@ class TimetableRepositoryIndex {
   private final Multimap<Route, TripPattern> patternsForRoute = ArrayListMultimap.create();
   private final Multimap<StopLocation, TripPattern> patternsForStop = ArrayListMultimap.create();
 
+  private final Map<StopLocation, LocalDate> endOfServiceDateForStop = new HashMap<>();
+  private final Map<FeedScopedId, LocalDate> endOfServiceDateForService = new HashMap<>();
   private final Map<LocalDate, TIntSet> serviceCodesRunningForDate = new HashMap<>();
   private final Map<TripIdAndServiceDate, TripOnServiceDate> tripOnServiceDateForTripAndDay =
     new HashMap<>();
@@ -103,6 +105,7 @@ class TimetableRepositoryIndex {
     }
 
     initalizeServiceCodesForDate(timetableRepository);
+    initializeTheEndOfServiceDateForStop();
 
     if (OTPFeature.FlexRouting.isOn()) {
       flexIndex = new FlexIndex(timetableRepository);
@@ -150,6 +153,14 @@ Collection<Trip> getTripsForStop(StopLocation stop) {
       .collect(Collectors.toList());
   }
 
+  boolean isStopInService(StopLocation stop) {
+    LocalDate endOfServiceDate = endOfServiceDateForStop.get(stop);
+    return (
+      endOfServiceDate != null &&
+      (endOfServiceDate.isAfter(LocalDate.now()) || endOfServiceDate.isEqual(LocalDate.now()))
+    );
+  }
+
   Operator getOperatorForId(FeedScopedId operatorId) {
     return operatorForId.get(operatorId);
   }
@@ -222,6 +233,14 @@ private void initalizeServiceCodesForDate(TimetableRepository timetableRepositor
       );
       for (LocalDate serviceDate : serviceDatesForService) {
         serviceIdsForServiceDate.put(serviceDate, serviceId);
+
+        // Save the last service date for each service.
+        if (
+          endOfServiceDateForService.get(serviceId) == null ||
+          (serviceDate != null && serviceDate.isAfter(endOfServiceDateForService.get(serviceId)))
+        ) {
+          endOfServiceDateForService.put(serviceId, serviceDate);
+        }
       }
     }
     for (LocalDate serviceDate : serviceIdsForServiceDate.keySet()) {
@@ -233,6 +252,25 @@ private void initalizeServiceCodesForDate(TimetableRepository timetableRepositor
     }
   }
 
+  private void initializeTheEndOfServiceDateForStop() {
+    for (StopLocation stop : patternsForStop.keySet()) {
+      for (TripPattern pattern : patternsForStop.get(stop)) {
+        pattern
+          .scheduledTripsAsStream()
+          .forEach(trip -> {
+            LocalDate tripEndDate = endOfServiceDateForService.get(trip.getServiceId());
+            LocalDate endOfServiceDate = endOfServiceDateForStop.get(stop);
+            if (
+              tripEndDate != null &&
+              (endOfServiceDate == null || tripEndDate.isAfter(endOfServiceDate))
+            ) {
+              endOfServiceDateForStop.put(stop, tripEndDate);
+            }
+          });
+      }
+    }
+  }
+
   Collection<GroupOfRoutes> getAllGroupOfRoutes() {
     return Collections.unmodifiableCollection(groupOfRoutesForId.values());
   }

application/src/main/java/org/opentripplanner/transit/service/TransitService.java

@@ -418,4 +418,14 @@ Collection<RegularStop> findRegularStopsByBoundingBox(
    * Returns a list of {@link StopLocation}s that match the filtering defined in the request.
    */
   Collection<StopLocation> findStopLocations(FindStopLocationsRequest request);
+
+  /**
+   * Returns boolean indicating if there are trips scheduled for a stop in the future.
+   */
+  boolean isStopInService(StopLocation stop);
+
+  /**
+   * Returns boolean indicating if there are trips scheduled for any child stop of the station in the future.
+   */
+  boolean isStationInService(Station station);
 }

application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls

@@ -2149,6 +2149,8 @@ type Stop implements Node & PlaceInterface {
   geometries: StopGeometries
   "ÌD of the stop in format `FeedId:StopId`"
   gtfsId: String!
+  "Stop has services running in the future"
+  hasFutureServices: Boolean
   "Global object ID provided by Relay. This value can be used to refetch this object using **node** query."
   id: ID!
   "Latitude of the stop (WGS 84)"

application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opentripplanner.transit.model.basic.TransitMode.BUS;
 import static org.opentripplanner.transit.model.basic.TransitMode.FERRY;
 import static org.opentripplanner.transit.model.basic.TransitMode.RAIL;
@@ -47,7 +48,10 @@ class DefaultTransitServiceTest {
     .withParentStation(STATION)
     .build();
   private static final RegularStop STOP_B = TEST_MODEL.stop("B").withParentStation(STATION).build();
-
+  private static final RegularStop STOP_C = TEST_MODEL.stop("C").withVehicleType(BUS).build();
+  private static final RegularStop STOP_ONE = TEST_MODEL.stop("Stop_1") // added automatically to pattern by timetableRepositoryTest (same name)
+    .withVehicleType(TRAM)
+    .build();
   private static final FeedScopedId SERVICE_ID = new FeedScopedId("FEED", "SERVICE");
   private static final int SERVICE_CODE = 0;
   private static final TripPattern FERRY_PATTERN = TEST_MODEL.pattern(FERRY).build();
@@ -90,6 +94,22 @@ class DefaultTransitServiceTest {
     .withServiceCode(SERVICE_CODE)
     .build();
 
+  static FeedScopedId CALENDAR_ID_TWO = TimetableRepositoryForTest.id("CAL_2");
+  static Trip TRIP_TODAY = TimetableRepositoryForTest.trip("12345")
+    .withHeadsign(I18NString.of("Trip Headsign"))
+    .withServiceId(CALENDAR_ID_TWO)
+    .build();
+  private static final ScheduledTripTimes SCHEDULED_TRIP_TIMES_TODAY = ScheduledTripTimes.of()
+    .withTrip(TRIP_TODAY)
+    .withArrivalTimes(new int[] { 0, 1 })
+    .withDepartureTimes(new int[] { 0, 1 })
+    .withServiceCode(SERVICE_CODE)
+    .build();
+  private static final TripPattern BUS_PATTERN_TODAY = TEST_MODEL.pattern(BUS)
+    .withStopPattern(REAL_TIME_STOP_PATTERN)
+    .withScheduledTimeTableBuilder(builder -> builder.addTripTimes(SCHEDULED_TRIP_TIMES_TODAY))
+    .build();
+
   private static final LocalDate SERVICE_DATE = LocalDate.of(2024, 1, 1);
   private static final LocalDate NO_SERVICE_DATE = LocalDate.of(2024, 1, 2);
 
@@ -107,43 +127,57 @@ static void setup() {
     var siteRepository = TEST_MODEL.siteRepositoryBuilder()
       .withRegularStop(STOP_A)
       .withRegularStop(STOP_B)
+      .withRegularStop(STOP_C)
+      .withRegularStop(STOP_ONE)
       .withStation(STATION)
       .build();
 
     var deduplicator = new Deduplicator();
-    var transitModel = new TimetableRepository(siteRepository, deduplicator);
+    var timetableRepository = new TimetableRepository(siteRepository, new Deduplicator());
     var canceledStopTimes = TEST_MODEL.stopTimesEvery5Minutes(3, TRIP, "11:30");
     var canceledTripTimes = TripTimesFactory.tripTimes(TRIP, canceledStopTimes, deduplicator)
       .createRealTimeFromScheduledTimes()
       .cancelTrip()
       .build();
-    transitModel.addTripPattern(RAIL_PATTERN.getId(), RAIL_PATTERN);
+    timetableRepository.addTripPattern(RAIL_PATTERN.getId(), RAIL_PATTERN);
 
     // Crate a calendar (needed for testing cancelled trips)
     CalendarServiceData calendarServiceData = new CalendarServiceData();
     var firstDate = LocalDate.of(2024, 8, 8);
     var secondDate = LocalDate.of(2024, 8, 9);
+    var today = LocalDate.now();
+
     calendarServiceData.putServiceDatesForServiceId(
       CALENDAR_ID,
-      List.of(firstDate, secondDate, SERVICE_DATE)
+      List.of(firstDate, secondDate, today, SERVICE_DATE)
+    );
+    calendarServiceData.putServiceDatesForServiceId(
+      CALENDAR_ID_TWO,
+      List.of(firstDate, secondDate)
     );
-    transitModel.getServiceCodes().put(CALENDAR_ID, 0);
-    transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP);
 
-    transitModel.index();
-    var timetableRepository = new TimetableRepository(siteRepository, new Deduplicator());
-    var calendar = new CalendarServiceData();
-    calendar.putServiceDatesForServiceId(SERVICE_ID, List.of(SERVICE_DATE));
     var serviceCodes = timetableRepository.getServiceCodes();
     serviceCodes.put(SERVICE_ID, SERVICE_CODE);
-    timetableRepository.updateCalendarServiceData(true, calendar, DataImportIssueStore.NOOP);
+    serviceCodes.put(CALENDAR_ID, SERVICE_CODE);
+    serviceCodes.put(CALENDAR_ID_TWO, 1);
+
     timetableRepository.addTripPattern(RAIL_PATTERN.getId(), RAIL_PATTERN);
+    timetableRepository.addTripPattern(BUS_PATTERN.getId(), BUS_PATTERN);
+    timetableRepository.addTripPattern(BUS_PATTERN_TODAY.getId(), BUS_PATTERN_TODAY);
+
+    timetableRepository.updateCalendarServiceData(
+      true,
+      calendarServiceData,
+      DataImportIssueStore.NOOP
+    );
+
     timetableRepository.index();
 
     TimetableSnapshot timetableSnapshot = new TimetableSnapshot();
     TripTimes tripTimes = ScheduledTripTimes.of()
       .withTrip(TimetableRepositoryForTest.trip("123").build())
       .withDepartureTimes(new int[] { 0, 1 })
+      .withServiceCode(SERVICE_CODE)
       .build();
     timetableSnapshot.update(new RealTimeTripUpdate(REAL_TIME_PATTERN, tripTimes, firstDate));
     timetableSnapshot.update(new RealTimeTripUpdate(RAIL_PATTERN, canceledTripTimes, firstDate));
@@ -273,4 +307,11 @@ void getRealtimeTripTimesForAddedTrip() {
   void getRealtimeTripTimesForAddedTripOnNoServiceDay() {
     assertEquals(Optional.empty(), service.getTripTimeOnDates(ADDED_TRIP, NO_SERVICE_DATE));
   }
+
+  @Test
+  void hasTripsForStop() {
+    assertTrue(service.isStopInService(STOP_ONE));
+    assertFalse(service.isStopInService(STOP_A));
+    assertFalse(service.isStopInService(STOP_C));
+  }
 }