Merge pull request #683 from OneBusAway/fix-681

Attempts to fix wildly incorrect arrival-departure predictions

OBAKitCore/Models/Helpers/ModelHelpers.swift

@@ -10,12 +10,13 @@
 import Foundation
 
 class ModelHelpers: NSObject {
-    /// Converts a date that represents the 1970 epoch date to `nil`.
-    ///
+    /// Converts a date from before the specified `earlierDate` to `nil`.
+    /// 
     /// - Parameter date: A date
-    /// - Returns: Nil if the date was represented by the value `0` and the date otherwise.
-    public static func nilifyEpochDate(_ date: Date) -> Date? {
-        if date == Date(timeIntervalSince1970: 0) {
+    /// - Parameter earlierDate: The lower bound for returning `date`.
+    /// - Returns: `date` if date >= `earlierDate`; otherwise `nil`.
+    public static func nilifyDate(_ date: Date, earlierThan earlierDate: Date) -> Date? {
+        if date < earlierDate {
             return nil
         }
         else {

OBAKitCore/Models/REST/ArrivalDeparture.swift

@@ -145,13 +145,13 @@ public class ArrivalDeparture: NSObject, Identifiable, Decodable, HasReferences
         predicted = try container.decode(Bool.self, forKey: .predicted)
 
         if let predictedArrivalDate = try container.decodeIfPresent(Date.self, forKey: .predictedArrival) {
-            predictedArrival = ModelHelpers.nilifyEpochDate(predictedArrivalDate)
+            predictedArrival = ModelHelpers.nilifyDate(predictedArrivalDate, earlierThan: Date(timeIntervalSinceReferenceDate: 1.0))
         } else {
             predictedArrival = nil
         }
 
         if let predictedDepartureDate = try container.decodeIfPresent(Date.self, forKey: .predictedDeparture) {
-            predictedDeparture = ModelHelpers.nilifyEpochDate(predictedDepartureDate)
+            predictedDeparture = ModelHelpers.nilifyDate(predictedDepartureDate, earlierThan: Date(timeIntervalSinceReferenceDate: 1.0))
         } else {
             predictedDeparture = nil
         }