WIP: Begin cleaning up duct sizing routes.

Sources/ViewController/Extensions/DatabaseExtensions.swift

@@ -26,11 +26,14 @@ extension DatabaseClient.Projects {
 
 extension DatabaseClient {
 
-  func calculateDuctSizes(projectID: Project.ID) async throws -> [DuctSizing.RoomContainer] {
+  func calculateDuctSizes(
+    projectID: Project.ID
+  ) async throws -> (rooms: [DuctSizing.RoomContainer], trunks: [DuctSizing.TrunkContainer]) {
     @Dependency(\.manualD) var manualD
 
     return try await manualD.calculate(
       rooms: rooms.fetch(projectID),
+      trunks: trunkSizes.fetch(projectID),
       designFrictionRateResult: designFrictionRate(projectID: projectID),
       projectSHR: projects.getSensibleHeatRatio(projectID)
     )

Sources/ViewController/Extensions/ManualDClient+extensions.swift

@@ -6,20 +6,22 @@ extension ManualDClient {
 
   func calculate(
     rooms: [Room],
+    trunks: [DuctSizing.TrunkSize],
     designFrictionRateResult: (EquipmentInfo, EffectiveLength.MaxContainer, Double)?,
     projectSHR: Double?,
     logger: Logger? = nil
-  ) async throws -> [DuctSizing.RoomContainer] {
-    guard let designFrictionRateResult else { return [] }
+  ) async throws -> (rooms: [DuctSizing.RoomContainer], trunks: [DuctSizing.TrunkContainer]) {
+    guard let designFrictionRateResult else { return ([], []) }
     let equipmentInfo = designFrictionRateResult.0
     let effectiveLengths = designFrictionRateResult.1
     let designFrictionRate = designFrictionRateResult.2
 
-    guard let maxSupply = effectiveLengths.supply else { return [] }
-    guard let maxReturn = effectiveLengths.return else { return [] }
+    guard let maxSupply = effectiveLengths.supply else { return ([], []) }
+    guard let maxReturn = effectiveLengths.return else { return ([], []) }
 
     let ductRooms = try await self.calculateSizes(
       rooms: rooms,
+      trunks: trunks,
       equipmentInfo: equipmentInfo,
       maxSupplyLength: maxSupply,
       maxReturnLength: maxReturn,

Sources/ViewController/Extensions/TrunkSizeForm+extensions.swift

@@ -0,0 +1,44 @@
+import Foundation
+import Logging
+import ManualDCore
+
+extension SiteRoute.View.ProjectRoute.DuctSizingRoute.TrunkSizeForm {
+
+  func toCreate(logger: Logger? = nil) throws -> DuctSizing.TrunkSize.Create {
+    try .init(
+      projectID: projectID,
+      type: type,
+      rooms: makeRooms(logger: logger),
+      height: height
+    )
+  }
+
+  func makeRooms(logger: Logger?) throws -> [Room.ID: [Int]] {
+    var retval = [Room.ID: [Int]]()
+    for room in rooms {
+      let split = room.split(separator: "_")
+      guard let idString = split.first,
+        let id = UUID(uuidString: String(idString))
+      else {
+        logger?.error("Could not parse id from: \(room)")
+        throw RoomError()
+      }
+      guard let registerString = split.last,
+        let register = Int(registerString)
+      else {
+        logger?.error("Could not register number from: \(room)")
+        throw RoomError()
+      }
+      if var currRegisters = retval[id] {
+        currRegisters.append(register)
+        retval[id] = currRegisters
+      } else {
+        retval[id] = [register]
+      }
+
+    }
+    return retval
+  }
+}
+
+struct RoomError: Error {}