bug fix on point in time service date checks

OneBusAway · Jan 12, 2024 · 526b879 · 526b879
1 parent dcfaaa8
commit 526b879
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/impl/calendar/CalendarServiceImpl.java b/onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/impl/calendar/CalendarServiceImpl.java
@@ -141,8 +141,8 @@ public boolean isLocalizedServiceIdActiveInRange(LocalizedServiceId localizedSer
     boolean active = isLocalizedServiceIdActiveOnDate(localizedServiceId, agencyServiceInterval.getServiceDate().getAsDate());
     if (active) {
       // even if a match is found enforce overlap in service intervals
-      if ( Math.max(activeService.getMinArrival(), serviceInterval.getMinArrival())
-              < Math.min(activeService.getMaxDeparture(), serviceInterval.getMaxDeparture())) {
+      if (Math.max(activeService.getMinArrival(), serviceInterval.getMinArrival())
+              <= Math.min(activeService.getMaxDeparture(), serviceInterval.getMaxDeparture())) {
         return true;
       }
     }

diff --git a/...tfs/src/test/java/org/onebusaway/gtfs/impl/calendar/CalendarServiceImplSyntheticTest.java b/...tfs/src/test/java/org/onebusaway/gtfs/impl/calendar/CalendarServiceImplSyntheticTest.java
@@ -463,13 +463,13 @@ public void testAgencyOverrideOverlap() {
     // 5 + 1 service interval
     AgencyServiceInterval fiveOclock1HourQuery = new AgencyServiceInterval(baseTime + hourToSec(5)*1000, oneHourOverride);
     active = service.isLocalizedServiceIdActiveInRange(lsid1, sixOclockScheudledService, fiveOclock1HourQuery);
-    assertFalse(active);
+    assertTrue(active);
 
     // active service 6:00 -> 7:00
     // 7 + 1 service interval
     AgencyServiceInterval sevenOclock1HourQuery = new AgencyServiceInterval(baseTime + hourToSec(7)*1000, oneHourOverride);
     active = service.isLocalizedServiceIdActiveInRange(lsid1, sixOclockScheudledService, sevenOclock1HourQuery);
-    assertFalse(active);
+    assertTrue(active);
 
     // active service 6:00 -> 7:00
     // 5 + 2 service interval
@@ -483,6 +483,13 @@ public void testAgencyOverrideOverlap() {
     ServiceInterval exactMatchInterval = new ServiceInterval(hourToSec(6), hourToSec(25));
     active = service.isLocalizedServiceIdActiveInRange(lsid1, exactMatchInterval, lunchInterval1HourOverride);
     assertTrue(active);
+
+    // point in time
+    AgencyServiceInterval stopCheck = new AgencyServiceInterval(baseTime + 43200, oneHourOverride);
+    ServiceInterval stopInterval = new ServiceInterval(43230,43230);
+    active = service.isLocalizedServiceIdActiveInRange(lsid1, stopInterval, lunchInterval1HourOverride);
+    assertTrue(active);
+
   }
 
   @Test