refactoring, docs, remove unused

Author: sharhio

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

@@ -39,7 +39,7 @@ protected Collection<KeyValue> map(RegularStop stop) {
       .findStopTimesInPattern(stop, serviceDate, ArrivalDeparture.BOTH, true)
       .stream()
       .anyMatch(stopTime -> stopTime.times.size() > 0);
-    var inService = transitService.isStopInService(stop);
+    var inService = transitService.hasScheduledServicesAfter(LocalDate.now(), stop);
 
     Collection<KeyValue> sharedKeyValues = getBaseKeyValues(stop, i18NStringMapper, transitService);
     return ListUtils.combine(

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

@@ -815,17 +815,7 @@ 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;
+  public boolean hasScheduledServicesAfter(LocalDate date, StopLocation stop) {
+    return timetableRepositoryIndex.hasScheduledServicesAfter(date, stop);
   }
 }

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

@@ -50,8 +50,7 @@ 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 Map<StopLocation, LocalDate> endOfServiceDateForStop = new HashMap<>();
   private final Map<LocalDate, TIntSet> serviceCodesRunningForDate = new HashMap<>();
   private final Map<TripIdAndServiceDate, TripOnServiceDate> tripOnServiceDateForTripAndDay =
     new HashMap<>();
@@ -104,8 +103,7 @@ class TimetableRepositoryIndex {
       );
     }
 
-    initalizeServiceCodesForDate(timetableRepository);
-    initializeTheEndOfServiceDateForStop();
+    initializeServiceData(timetableRepository);
 
     if (OTPFeature.FlexRouting.isOn()) {
       flexIndex = new FlexIndex(timetableRepository);
@@ -154,16 +152,17 @@ Collection<Trip> getTripsForStop(StopLocation stop) {
   }
 
   /**
-   * Checks if the last scheduled service date for the stop is today or in the future.
+   * Checks if the last scheduled service date for the stop is on or after the given date.
+   * This does not include real-time updates, so it only checks the scheduled service dates.
    *
+   * @param date the date to check against
    * @param stop the stop to check
-   * @return true if the stop is in service today or later, false otherwise
+   * @return true if the stop has scheduled services after the given date, false otherwise
    */
-  boolean isStopInService(StopLocation stop) {
+  boolean hasScheduledServicesAfter(LocalDate date, StopLocation stop) {
     LocalDate endOfServiceDate = endOfServiceDateForStop.get(stop);
     return (
-      endOfServiceDate != null &&
-      (endOfServiceDate.isAfter(LocalDate.now()) || endOfServiceDate.isEqual(LocalDate.now()))
+      endOfServiceDate != null && (endOfServiceDate.isAfter(date) || endOfServiceDate.isEqual(date))
     );
   }
 
@@ -213,7 +212,7 @@ FlexIndex getFlexIndex() {
     return flexIndex;
   }
 
-  private void initalizeServiceCodesForDate(TimetableRepository timetableRepository) {
+  private void initializeServiceData(TimetableRepository timetableRepository) {
     CalendarService calendarService = timetableRepository.getCalendarService();
 
     if (calendarService == null) {
@@ -232,6 +231,7 @@ private void initalizeServiceCodesForDate(TimetableRepository timetableRepositor
     // Reconstruct set of all dates where service is defined, keeping track of which services
     // run on which days.
     Multimap<LocalDate, FeedScopedId> serviceIdsForServiceDate = HashMultimap.create();
+    Map<FeedScopedId, LocalDate> endOfServiceDateForService = new HashMap<>();
 
     for (FeedScopedId serviceId : calendarService.getServiceIds()) {
       Set<LocalDate> serviceDatesForService = calendarService.getServiceDatesForServiceId(
@@ -256,25 +256,31 @@ private void initalizeServiceCodesForDate(TimetableRepository timetableRepositor
       }
       serviceCodesRunningForDate.put(serviceDate, serviceCodesRunning);
     }
+
+    initializeTheEndOfServiceDateForStop(endOfServiceDateForService);
   }
 
-  private void initializeTheEndOfServiceDateForStop() {
+  private void initializeTheEndOfServiceDateForStop(
+    Map<FeedScopedId, LocalDate> endOfServiceDateForService
+  ) {
+    Map<StopLocation, LocalDate> endOfServiceDates = new HashMap<>();
     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);
+            LocalDate endOfServiceDate = endOfServiceDates.get(stop);
             if (
               tripEndDate != null &&
               (endOfServiceDate == null || tripEndDate.isAfter(endOfServiceDate))
             ) {
-              endOfServiceDateForStop.put(stop, tripEndDate);
+              endOfServiceDates.put(stop, tripEndDate);
             }
           });
       }
     }
+    endOfServiceDateForStop = Map.copyOf(endOfServiceDates);
   }
 
   Collection<GroupOfRoutes> getAllGroupOfRoutes() {

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

@@ -420,12 +420,8 @@ Collection<RegularStop> findRegularStopsByBoundingBox(
   Collection<StopLocation> findStopLocations(FindStopLocationsRequest request);
 
   /**
-   * Returns boolean indicating if there are trips scheduled for a stop in the future.
+   * Returns boolean indicating if there are scheduled services on or after the given date.
+   * This does not include real-time updates, so it only checks the scheduled service dates.
    */
-  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);
+  boolean hasScheduledServicesAfter(LocalDate date, StopLocation stop);
 }

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

@@ -310,8 +310,8 @@ void getRealtimeTripTimesForAddedTripOnNoServiceDay() {
 
   @Test
   void hasTripsForStop() {
-    assertTrue(service.isStopInService(STOP_ONE));
-    assertFalse(service.isStopInService(STOP_A));
-    assertFalse(service.isStopInService(STOP_C));
+    assertTrue(service.hasScheduledServicesAfter(LocalDate.now(), STOP_ONE));
+    assertFalse(service.hasScheduledServicesAfter(LocalDate.now(), STOP_A));
+    assertFalse(service.hasScheduledServicesAfter(LocalDate.now(), STOP_C));
   }
 }