Remove unit tests for parser and rely on E2E tests to validate parsing

Author: RISCfuture

Package.swift

@@ -33,9 +33,7 @@ let package = Package(
       name: "SwiftNASRTests",
       dependencies: ["SwiftNASR", "Quick", "Nimble"],
       resources: [
-        .copy("Resources/MockDistribution"),
-        .copy("Resources/FailingMockDistribution"),
-        .copy("Resources/MockCSVDistribution")
+        .copy("Resources/FailingMockDistribution")
       ],
       linkerSettings: [.linkedLibrary("swift_Concurrency")]
     ),

Sources/SwiftNASR/Models/Records/CodedDepartureRoute.swift

@@ -24,8 +24,26 @@ public struct CodedDepartureRoute: Record, Identifiable {
   /// Full route string (e.g., "KORD MZV LMN J64 CIVET CIVET4 LAX").
   public let routeString: String
 
-  /// ARTCC identifier (e.g., "KZAU").
-  public let ARTCCIdentifier: String
+  /// Departure center ARTCC identifier (e.g., "ZAU").
+  public let departureCenterIdentifier: String
+
+  /// Arrival center ARTCC identifier (e.g., "ZLA").
+  public let arrivalCenterIdentifier: String?
+
+  /// Space-separated list of transition center ARTCC identifiers.
+  public let transitionCenterIdentifiers: String?
+
+  /// Whether coordination is required for this route.
+  public let coordinationRequired: Bool?
+
+  /// Play information or notes for this route.
+  public let playInfo: String?
+
+  /// Navigation equipment requirements.
+  public let navigationEquipment: String?
+
+  /// Route length in nautical miles.
+  public let lengthNM: UInt?
 
   /// Reference to parent NASRData for cross-referencing.
   weak var data: NASRData?
@@ -42,7 +60,12 @@ public struct CodedDepartureRoute: Record, Identifiable {
     routeString.split(separator: " ").map(String.init)
   }
 
+  /// Backward-compatible alias for `departureCenterIdentifier`.
+  public var ARTCCIdentifier: String { departureCenterIdentifier }
+
   public enum CodingKeys: String, CodingKey {
-    case routeCode, origin, destination, departureFix, routeString, ARTCCIdentifier
+    case routeCode, origin, destination, departureFix, routeString
+    case departureCenterIdentifier, arrivalCenterIdentifier, transitionCenterIdentifiers
+    case coordinationRequired, playInfo, navigationEquipment, lengthNM
   }
 }

Sources/SwiftNASR/NASRData.swift

@@ -82,8 +82,10 @@ public actor NASRData {
       for navaidIndex in 0..<navaids!.count {
         navaids![navaidIndex].data = self
         let findStateByCode = navaids![navaidIndex].findStateByCode()
+        let findAirportById = navaids![navaidIndex].findAirportById()
         for checkpointIndex in 0..<navaids![navaidIndex].checkpoints.count {
           navaids![navaidIndex].checkpoints[checkpointIndex].findStateByCode = findStateByCode
+          navaids![navaidIndex].checkpoints[checkpointIndex].findAirportById = findAirportById
         }
       }
     }

Sources/SwiftNASR/Parsers/CSV/Parsers/CSVCodedDepartureRouteParser.swift

@@ -4,30 +4,42 @@ import ZIPFoundation
 
 /// CSV Coded Departure Route Parser for parsing CDR.csv
 ///
-/// CDR is a comma-delimited file with 6 fields:
-/// Route Code, Origin, Destination, Departure Fix, Route String, ARTCC
+/// CDR is a comma-delimited file with 12 fields:
+/// RCode, Orig, Dest, DepFix, Route String, DCNTR, ACNTR, TCNTRs, CoordReq, Play, NavEqp, Length
 class CSVCodedDepartureRouteParser: CSVParser {
   var csvDirectory = URL(fileURLWithPath: "/")
   var routes = [String: CodedDepartureRoute]()
 
   // CSV field mapping (0-based indices)
-  // Fields: Route Code, Origin, Destination, Departure Fix, Route String, ARTCC
+  // Fields: RCode, Orig, Dest, DepFix, Route String, DCNTR, ACNTR, TCNTRs, CoordReq, Play, NavEqp, Length
   private let csvFieldMapping: [Int] = [
-    0,  // 0: Route Code
-    1,  // 1: Origin
-    2,  // 2: Destination
-    3,  // 3: Departure Fix
+    0,  // 0: RCode (Route Code)
+    1,  // 1: Orig (Origin)
+    2,  // 2: Dest (Destination)
+    3,  // 3: DepFix (Departure Fix)
     4,  // 4: Route String
-    5  // 5: ARTCC
+    5,  // 5: DCNTR (Departure Center)
+    6,  // 6: ACNTR (Arrival Center)
+    7,  // 7: TCNTRs (Transition Centers)
+    8,  // 8: CoordReq (Coordination Required)
+    9,  // 9: Play (Play Info)
+    10,  // 10: NavEqp (Navigation Equipment)
+    11  // 11: Length
   ]
 
   private let transformer = CSVTransformer([
-    .string(),  // 0: Route Code
-    .string(),  // 1: Origin
-    .string(),  // 2: Destination
-    .string(),  // 3: Departure Fix
+    .string(),  // 0: RCode
+    .string(),  // 1: Orig
+    .string(),  // 2: Dest
+    .string(),  // 3: DepFix
     .string(),  // 4: Route String
-    .string()  // 5: ARTCC
+    .string(),  // 5: DCNTR
+    .string(nullable: .blank),  // 6: ACNTR
+    .string(nullable: .blank),  // 7: TCNTRs
+    .string(nullable: .blank),  // 8: CoordReq (Y/N)
+    .string(nullable: .blank),  // 9: Play
+    .string(nullable: .blank),  // 10: NavEqp
+    .unsignedInteger(nullable: .blank)  // 11: Length
   ])
 
   func prepare(distribution: Distribution) throws {
@@ -44,35 +56,50 @@ class CSVCodedDepartureRouteParser: CSVParser {
   }
 
   func parse(data _: Data) async throws {
-    try await parseCSVFile(filename: "CDR.csv", expectedFieldCount: 6) { fields in
-      guard fields.count >= 3 else {
+    try await parseCSVFile(filename: "CDR.csv", expectedFieldCount: 12) { fields in
+      guard fields.count >= 6 else {
         throw ParserError.truncatedRecord(
           recordType: "CDR",
-          expectedMinLength: 3,
+          expectedMinLength: 6,
           actualLength: fields.count
         )
       }
 
-      var mappedFields = [String](repeating: "", count: 6)
+      var mappedFields = [String](repeating: "", count: 12)
       for (transformerIndex, csvIndex) in self.csvFieldMapping.enumerated()
       where csvIndex < fields.count {
         mappedFields[transformerIndex] = fields[csvIndex]
       }
 
       let transformedValues = try self.transformer.applyTo(
         mappedFields,
-        indices: Array(0..<6)
+        indices: Array(0..<12)
       )
 
       let routeCode = transformedValues[0] as! String
 
+      // Parse CoordReq (Y/N) to Bool
+      let coordReqString = transformedValues[8] as? String
+      let coordinationRequired: Bool?
+      switch coordReqString?.uppercased() {
+        case "Y": coordinationRequired = true
+        case "N": coordinationRequired = false
+        default: coordinationRequired = nil
+      }
+
       let route = CodedDepartureRoute(
         routeCode: routeCode,
         origin: transformedValues[1] as! String,
         destination: transformedValues[2] as! String,
         departureFix: transformedValues[3] as! String,
         routeString: transformedValues[4] as! String,
-        ARTCCIdentifier: transformedValues[5] as! String
+        departureCenterIdentifier: transformedValues[5] as! String,
+        arrivalCenterIdentifier: transformedValues[6] as? String,
+        transitionCenterIdentifiers: transformedValues[7] as? String,
+        coordinationRequired: coordinationRequired,
+        playInfo: transformedValues[9] as? String,
+        navigationEquipment: transformedValues[10] as? String,
+        lengthNM: transformedValues[11] as? UInt
       )
 
       self.routes[routeCode] = route