no more grace period for arrive by

Author: RyanCheung555

app/build.gradle.kts

@@ -25,8 +25,8 @@ android {
         applicationId = "com.cornellappdev.transit"
         minSdk = 26
         targetSdk = 36
-        versionCode = 10
-        versionName = "2.0"
+        versionCode = 11
+        versionName = "2.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/java/com/cornellappdev/transit/util/RouteOptionsDisplayProcessor.kt

@@ -258,13 +258,13 @@ private fun Route.effectiveArrivalInstantOrNull(
     return endInstant.plusSeconds(delaySeconds.toLong())
 }
 
-/** True when route arrives on or before provided cutoff (including grace already applied by caller). */
+/** True when route arrives on or before provided cutoff (strict, no grace period). */
 private fun Route.arrivesBy(
-    cutoffWithGrace: Instant,
+    cutoff: Instant,
     diagnostics: RouteProcessingDiagnostics? = null,
 ): Boolean {
     val arrivalInstant = effectiveArrivalInstantOrNull(diagnostics) ?: return false
-    return !arrivalInstant.isAfter(cutoffWithGrace)
+    return !arrivalInstant.isAfter(cutoff)
 }
 
 /** Comparator for Arrive By ordering: latest departure first, then shorter distance. */
@@ -333,18 +333,16 @@ private fun compareByEffectiveLeaveTime(
 
 /**
  * Section-level Arrive By filtering and ordering.
- * Keeps routes that arrive by cutoff (with grace), then sorts by latest departure first.
+ * Keeps routes that arrive by cutoff, then sorts by latest departure first.
  */
 private fun List<Route>?.filterAndSortRoutesForArriveBy(
     cutoff: Instant,
     diagnostics: RouteProcessingDiagnostics? = null,
 ): List<Route>? {
     if (this == null) return null
 
-    val cutoffWithGrace = cutoff.plus(Duration.ofMinutes(ARRIVE_BY_CUTOFF_GRACE_MINUTES))
-
     return this
-        .filter { route -> route.arrivesBy(cutoffWithGrace, diagnostics) }
+        .filter { route -> route.arrivesBy(cutoff, diagnostics) }
         .sortedWith(::compareArriveByRoutes)
 }
 

app/src/main/java/com/cornellappdev/transit/util/TransitConstants.kt

@@ -22,7 +22,6 @@ const val LEAVE_CUTOFF_HORIZON_MINUTES = 45L
 
 const val LEAVE_CUTOFF_GRACE_MINUTES = 2L
 
-const val ARRIVE_BY_CUTOFF_GRACE_MINUTES = 2L
 
 // Hide transit options when walking arrives at the same time or sooner (+ tie buffer).
 const val WALKING_TRANSIT_TIE_MINUTES = 1L