Merge pull request #756 from OneBusAway/occupancy-status

Adds a couple new `occupancyStatus` fields to the enum and app
OneBusAway · Nov 24, 2024 · f12ca78 · f12ca78
2 parents 9b79182 + ac0d6c2
commit f12ca78
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Apps/Shared/app_shared.yml b/Apps/Shared/app_shared.yml
@@ -8,7 +8,7 @@ settings:
   base:
     CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED: true
     CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: false
-    MARKETING_VERSION: 24.3.0
+    MARKETING_VERSION: 24.3.1
 
 options:
   minimumXcodeGenVersion: 2.17

diff --git a/OBAKit/Stops/OccupancyStatusView.swift b/OBAKit/Stops/OccupancyStatusView.swift
@@ -66,8 +66,10 @@ class OccupancyStatusView: UIView {
             humanReadable = OBALoc("occupancy_status.crushed_standing_room_only", value: "Crushed standing room only", comment: "Vehicle occupancy is very high")
         case .full:
             humanReadable = OBALoc("occupancy_status.full", value: "Full", comment: "Vehicle occupancy is full")
+        case .notBoardable: fallthrough
         case .notAcceptingPassengers:
             humanReadable = OBALoc("occupancy_status.not_accepting_passengers", value: "Not accepting passengers", comment: "Vehicle is not accepting any passengers")
+        case .noDataAvailable: fallthrough
         case .unknown:
             humanReadable = OBALoc("occupancy_status.unknown", value: "Unknown", comment: "Vehicle occupancy status is unknown.")
         }
@@ -104,9 +106,11 @@ class OccupancyStatusView: UIView {
             showImageView(at: 0)
             showImageView(at: 1)
             showImageView(at: 2)
+        case .notBoardable: fallthrough
         case .notAcceptingPassengers:
             noPassengersWrapper.isHidden = false
             outerStack.insertArrangedSubview(noPassengersWrapper, at: 0)
+        case .noDataAvailable: fallthrough
         case .unknown:
             break
         }

diff --git a/OBAKitCore/Models/REST/ArrivalDeparture.swift b/OBAKitCore/Models/REST/ArrivalDeparture.swift
@@ -340,6 +340,8 @@ public class ArrivalDeparture: NSObject, Identifiable, Decodable, HasReferences
         case crushedStandingRoomOnly = "CRUSHED_STANDING_ROOM_ONLY"
         case full = "FULL"
         case notAcceptingPassengers = "NOT_ACCEPTING_PASSENGERS"
+        case noDataAvailable = "NO_DATA_AVAILABLE"
+        case notBoardable = "NOT_BOARDABLE"
     }
 
     // MARK: - Equality and Hashing