Tweak data model

And some refactoring

Sources/TripKit/model/API/LocationAPIModel.swift

@@ -378,24 +378,25 @@ extension TKAPI {
     public struct Group: Codable, Hashable {
       public let key: String
       public let hashCode: Int
-      public let stops: [TKStopCoordinate]?
-      public let bikePods: [TKBikePodLocation]?
-      public let carPods: [TKCarPodLocation]?
-      public let carParks: [TKCarParkLocation]?
-      public let carRentals: [TKCarRentalLocation]?
-      public let freeFloating: [TKFreeFloatingVehicleLocation]?
-      public let onStreetParking: [TKOnStreetParkingLocation]?
-      public let facilities: [TKFacilityLocation]?
+
+      @EmptyLossyArray @LossyArray public var stops: [TKStopCoordinate]
+      @EmptyLossyArray @LossyArray public var bikePods: [TKBikePodLocation]
+      @EmptyLossyArray @LossyArray public var carPods: [TKCarPodLocation]
+      @EmptyLossyArray @LossyArray public var carParks: [TKCarParkLocation]
+      @EmptyLossyArray @LossyArray public var carRentals: [TKCarRentalLocation]
+      @EmptyLossyArray @LossyArray public var freeFloating: [TKFreeFloatingVehicleLocation]
+      @EmptyLossyArray @LossyArray public var onStreetParking: [TKOnStreetParkingLocation]
+      @EmptyLossyArray @LossyArray public var facilities: [TKFacilityLocation]
 
       public var all: [TKNamedCoordinate] {
-        return (stops ?? [])        as [TKNamedCoordinate]
-          + (bikePods ?? [])        as [TKNamedCoordinate]
-          + (carPods ?? [])         as [TKNamedCoordinate]
-          + (carParks ?? [])        as [TKNamedCoordinate]
-          + (carRentals ?? [])      as [TKNamedCoordinate]
-          + (freeFloating ?? [])    as [TKNamedCoordinate]
-          + (onStreetParking ?? []) as [TKNamedCoordinate]
-          + (facilities ?? [])      as [TKNamedCoordinate]
+        return stops        as [TKNamedCoordinate]
+          + bikePods        as [TKNamedCoordinate]
+          + carPods         as [TKNamedCoordinate]
+          + carParks        as [TKNamedCoordinate]
+          + carRentals      as [TKNamedCoordinate]
+          + freeFloating    as [TKNamedCoordinate]
+          + onStreetParking as [TKNamedCoordinate]
+          + facilities      as [TKNamedCoordinate]
       }
 
     }

Sources/TripKit/model/CoreData/SegmentTemplate+Data.swift

@@ -27,7 +27,7 @@ extension SegmentTemplate {
     set { encode(newValue, key: "miniInstruction") }
   }
 
-  @objc var modeInfo: TKModeInfo? {
+  var modeInfo: TKModeInfo? {
     get { decode(TKModeInfo.self, key: "modeInfo") }
     set { encode(newValue, key: "modeInfo") }
   }

Sources/TripKit/model/TKLocationTypes.swift

@@ -261,20 +261,22 @@ public class TKOnStreetParkingLocation: TKModeCoordinate {
 
 public class TKFacilityLocation: TKNamedCoordinate {
 
-  public enum FacilityType: String, Codable {
-    case parkAndRide = "Park-and-Ride"
-  }
-
-  public var facilityType: FacilityType
+  public var facilityType: String
+  public var primaryType: String?
+  public var secondaryType: String?
 
   private enum CodingKeys: String, CodingKey {
     case facilityID = "id"
     case facilityType
+    case primaryType = "type"
+    case secondaryType = "subType"
   }
 
   public required init(from decoder: Decoder) throws {
     let values = try decoder.container(keyedBy: CodingKeys.self)
-    facilityType = try values.decode(FacilityType.self, forKey: .facilityType)
+    facilityType = try values.decode(String.self, forKey: .facilityType)
+    primaryType = try values.decodeIfPresent(String.self, forKey: .primaryType)
+    secondaryType = try values.decodeIfPresent(String.self, forKey: .secondaryType)
     try super.init(from: decoder)
     locationID = try values.decode(String.self, forKey: .facilityID)
   }
@@ -284,24 +286,32 @@ public class TKFacilityLocation: TKNamedCoordinate {
     var container = encoder.container(keyedBy: CodingKeys.self)
     try container.encode(facilityType, forKey: .facilityType)
     try container.encode(locationID, forKey: .facilityID)
+    try container.encode(primaryType, forKey: .primaryType)
+    try container.encode(secondaryType, forKey: .secondaryType)
   }
 
   @objc public class override var supportsSecureCoding: Bool { true }
 
   public required init?(coder aDecoder: NSCoder) {
     guard 
-      let info = try? aDecoder.decode(FacilityType.self, forKey: CodingKeys.facilityType.rawValue),
+      let facilityType = try? aDecoder.decode(String.self, forKey: CodingKeys.facilityType.rawValue),
       let facilityID = try? aDecoder.decode(String.self, forKey: CodingKeys.facilityID.rawValue)
     else { return nil }
-    facilityType = info
+
+    self.facilityType = facilityType
+    self.primaryType = try? aDecoder.decode(String.self, forKey: CodingKeys.primaryType.rawValue)
+    self.secondaryType = try? aDecoder.decode(String.self, forKey: CodingKeys.secondaryType.rawValue)
+
     super.init(coder: aDecoder)
     locationID = facilityID
   }
 
   public override func encode(with aCoder: NSCoder) {
     super.encode(with: aCoder)
     try? aCoder.encode(encodable: facilityType, forKey: CodingKeys.facilityType.rawValue)
-    try? aCoder.encode(encodable: locationID, forKey: CodingKeys.facilityType.rawValue)
+    try? aCoder.encode(encodable: locationID, forKey: CodingKeys.facilityID.rawValue)
+    try? aCoder.encode(encodable: primaryType, forKey: CodingKeys.primaryType.rawValue)
+    try? aCoder.encode(encodable: secondaryType, forKey: CodingKeys.secondaryType.rawValue)
   }
 
 }

Sources/TripKitUI/view model/TKUIServiceViewModel+MapContent.swift

@@ -103,7 +103,7 @@ extension TKUIServiceViewModel.ServiceVisit: TKUIModeAnnotation {
   var title: String? { return visit.title }
   var subtitle: String? { return visit.subtitle }
   var coordinate: CLLocationCoordinate2D { return visit.coordinate }
-  var modeInfo: TKModeInfo! { return visit.modeInfo }
+  var modeInfo: TKModeInfo? { return visit.modeInfo }
   var clusterIdentifier: String? { return visit.clusterIdentifier }
 }
 
@@ -147,7 +147,7 @@ extension TKUIServiceViewModel {
 }
 
 extension TKUIServiceViewModel.ServiceEmbarkation: TKUIModeAnnotation {
-  var modeInfo: TKModeInfo! {
+  var modeInfo: TKModeInfo? {
     return visit.modeInfo
   }
 

Sources/TripKitUI/views/map annotations/TKUIAnnotations+TripKit.swift

@@ -15,7 +15,7 @@ import TripKit
 // MARK: TKUIModeAnnotation
 
 extension TKModeCoordinate: TKUIModeAnnotation {
-  public var modeInfo: TKModeInfo! {
+  public var modeInfo: TKModeInfo? {
     return stopModeInfo
   }
 }
@@ -74,7 +74,7 @@ extension Alert: TKUIImageAnnotation {
 // MARK: TKUIModeAnnotation
 
 extension StopLocation: TKUIModeAnnotation {
-  public var modeInfo: TKModeInfo! {
+  public var modeInfo: TKModeInfo? {
     return stopModeInfo
   }
 
@@ -93,7 +93,7 @@ extension StopLocation: TKUIStopAnnotation {}
 // MARK: TKUIModeAnnotation
 
 extension StopVisits: TKUIModeAnnotation {
-  public var modeInfo: TKModeInfo! {
+  public var modeInfo: TKModeInfo? {
     return service.findModeInfo() ?? .unknown
   }
 

Sources/TripKitUI/views/map annotations/TKUIAnnotations.swift

@@ -44,9 +44,8 @@ public protocol TKUISelectableOnMap {
 }
 
 /// For displaying an annotation in a `TKUIModeAnnotationView`
-@objc
-public protocol TKUIModeAnnotation: MKAnnotation {
-  var modeInfo: TKModeInfo! { get }
+public protocol TKUIModeAnnotation: TKUIImageAnnotation {
+  var modeInfo: TKModeInfo? { get }
   var clusterIdentifier: String? { get }
 }
 
@@ -56,7 +55,6 @@ public extension TKUIModeAnnotation {
   var imageIsTemplate: Bool { return modeInfo?.remoteImageIsTemplate ?? false }
 }
 
-@objc
 public protocol TKUIStopAnnotation: TKUIModeAnnotation {
   var stopCode: String { get }
   var timeZone: TimeZone? { get }