implement parsing of apt.dat version 1200

src/Airports/GenAirports850/CMakeLists.txt

@@ -23,6 +23,7 @@ add_executable(genapts850
     rwy_gen.cxx
     scheduler.cxx scheduler.hxx
     taxiway.cxx taxiway.hxx
+    trafficFlow.cxx trafficFlow.hxx
 )
 
 target_link_libraries(genapts850

src/Airports/GenAirports850/parser.hxx

@@ -1,3 +1,4 @@
+
 #pragma once
 
 #include <fstream>
@@ -12,6 +13,7 @@
 #include "linearfeature.hxx"
 #include "runway.hxx"
 #include "scheduler.hxx"
+#include "trafficFlow.hxx"
 
 
 #define STATE_NONE (1)
@@ -21,6 +23,7 @@
 #define STATE_PARSE_FEATURE (5)
 #define STATE_DONE (10)
 
+//-------------------------------------
 
 // [[deprecated]]
 #define TAXIWAY_CODE (10)
@@ -42,6 +45,10 @@
 // [[deprecated]]
 #define COMM_FREQ7_CODE (56)
 
+// [[deprecated]]
+#define RWY_ARR_DEP_CONSTRAINTS (1100)
+
+//-------------------------------------
 
 #define LAND_AIRPORT_CODE (1)
 #define SEA_AIRPORT_CODE (16)
@@ -72,7 +79,7 @@
 
 // TODO: not implemented yet
 
-#define AIRPORT_TRAFFIC_FLOW (1000)
+#define TRAFFIC_FLOW_HEADER (1000)
 #define TRAFFIC_FLOW_WIND_RULE (1001)
 #define TRAFFIC_FLOW_MIN_CEILING_RULE (1002)
 #define TRAFFIC_FLOW_MIN_VISIBILITY_RULE (1003)
@@ -86,8 +93,8 @@
 #define COMM_APP (1055)          // 8.33 kHz; Approach
 #define COMM_DEP (1056)          // 8.33 kHz; Departure
 
-#define RWY_ARR_DEP_CONSTRAINTS (1100)
 #define VFR_TRAFFIC_PATTERN (1101)
+#define RWY_IN_USE_CONSTRAINTS (1110)
 
 #define TAXI_ROUTE_NETWORK_HEADER (1200)
 #define TAXI_ROUTE_NETWORK_NODE (1201)
@@ -104,8 +111,8 @@
 #define TRUCK_PARKING_LOCATION (1400)
 #define TRUCK_DESTINATION_LOCATION (1401)
 
-#define ACTIVE_JETWAY (1500)
-#define CUSTOM_JETWAY (1501)
+#define JETWAY_ACTIVE (1500)
+#define JETWAY_CUSTOM (1501)
 
 
 class Parser : public SGThread
@@ -149,6 +156,7 @@ private:
     std::shared_ptr<LinearFeature> ParseFeature(char* line);
     std::shared_ptr<ClosedPoly> ParsePavement(char* line);
     std::shared_ptr<ClosedPoly> ParseBoundary(char* line);
+    std::shared_ptr<TrafficFlow> ParseTrafficFlow(char* line);
 
     int ParseLine(char* line);
 

src/Airports/GenAirports850/trafficFlow.cxx

@@ -0,0 +1,9 @@
+
+#include <string>
+
+#include "trafficFlow.hxx"
+
+TrafficFlow::TrafficFlow(char* def)
+{
+    description = std::string {def};
+}

src/Airports/GenAirports850/trafficFlow.hxx

@@ -0,0 +1,12 @@
+
+#pragma once
+
+
+class TrafficFlow
+{
+public:
+    explicit TrafficFlow(char* def);
+
+private:
+    std::string description = nullptr;
+};