parse v1300 files
This commit is contained in:
parent
e701da1d4a
commit
43d8d23343
4 changed files with 103 additions and 65 deletions
|
@ -337,6 +337,39 @@ std::string ClosedPoly::GetMaterial(int surface)
|
|||
case 15:
|
||||
break;
|
||||
|
||||
case 20: // Light colored asphalt
|
||||
case 21:
|
||||
case 22:
|
||||
case 23:
|
||||
case 24: // Asphalt
|
||||
case 25:
|
||||
case 26:
|
||||
case 27: // Darker colored asphalt
|
||||
case 28:
|
||||
case 29:
|
||||
case 30:
|
||||
case 31: // Very dark colored asphalt
|
||||
case 32:
|
||||
case 33:
|
||||
case 34:
|
||||
case 35: // Near black, ‘new’ looking asphalt
|
||||
case 36:
|
||||
case 37:
|
||||
case 38:
|
||||
material = "pa_tiedown";
|
||||
break;
|
||||
|
||||
case 50: // Light “new” looking concrete
|
||||
case 51:
|
||||
case 52:
|
||||
case 53: // Concrete
|
||||
case 54:
|
||||
case 55: // Dark concrete
|
||||
case 56:
|
||||
case 57:
|
||||
material = "pc_tiedown";
|
||||
break;
|
||||
|
||||
default:
|
||||
TG_LOG(SG_GENERAL, SG_ALERT, "ClosedPoly::BuildBtg: unknown surface type " << surface_type);
|
||||
exit(1);
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#define LF_SAFETYZONE_CENTERLINE (7)
|
||||
#define LF_SINGLE_LANE_QUEUE (8)
|
||||
#define LF_DOUBLE_LANE_QUEUE (9)
|
||||
|
||||
#define LF_SOLID_YELLOW_WIDE (10)
|
||||
#define LF_TAXI_HOLD_WIDE (11)
|
||||
#define LF_DOUBLE_HOLD_WIDE (12)
|
||||
|
|
|
@ -16,103 +16,105 @@
|
|||
#include "trafficFlow.hxx"
|
||||
|
||||
|
||||
#define STATE_NONE (1)
|
||||
#define STATE_PARSE_SIMPLE (2)
|
||||
#define STATE_PARSE_BOUNDARY (3)
|
||||
#define STATE_PARSE_PAVEMENT (4)
|
||||
#define STATE_PARSE_FEATURE (5)
|
||||
#define STATE_DONE (10)
|
||||
#define STATE_NONE (1)
|
||||
#define STATE_PARSE_SIMPLE (2)
|
||||
#define STATE_PARSE_BOUNDARY (3)
|
||||
#define STATE_PARSE_PAVEMENT (4)
|
||||
#define STATE_PARSE_FEATURE (5)
|
||||
#define STATE_DONE (10)
|
||||
|
||||
//-------------------------------------
|
||||
|
||||
// [[deprecated]]
|
||||
#define TAXIWAY_CODE (10)
|
||||
#define TAXIWAY_CODE (10)
|
||||
// [[deprecated]]
|
||||
#define AIRPLANE_STARTUP_LOCATION_CODE (15)
|
||||
#define AIRPLANE_STARTUP_LOCATION_CODE (15)
|
||||
|
||||
// [[deprecated]]
|
||||
#define COMM_FREQ1_CODE (50)
|
||||
#define COMM_FREQ1_CODE (50)
|
||||
// [[deprecated]]
|
||||
#define COMM_FREQ2_CODE (51)
|
||||
#define COMM_FREQ2_CODE (51)
|
||||
// [[deprecated]]
|
||||
#define COMM_FREQ3_CODE (52)
|
||||
#define COMM_FREQ3_CODE (52)
|
||||
// [[deprecated]]
|
||||
#define COMM_FREQ4_CODE (53)
|
||||
#define COMM_FREQ4_CODE (53)
|
||||
// [[deprecated]]
|
||||
#define COMM_FREQ5_CODE (54)
|
||||
#define COMM_FREQ5_CODE (54)
|
||||
// [[deprecated]]
|
||||
#define COMM_FREQ6_CODE (55)
|
||||
#define COMM_FREQ6_CODE (55)
|
||||
// [[deprecated]]
|
||||
#define COMM_FREQ7_CODE (56)
|
||||
#define COMM_FREQ7_CODE (56)
|
||||
|
||||
// [[deprecated]]
|
||||
#define RWY_ARR_DEP_CONSTRAINTS (1100)
|
||||
#define RWY_ARR_DEP_CONSTRAINTS (1100)
|
||||
|
||||
// [[deprecated]]
|
||||
#define TAXI_ROUTE_NETWORK_OBSOLETE (1203)
|
||||
|
||||
//-------------------------------------
|
||||
|
||||
#define LAND_AIRPORT_CODE (1)
|
||||
#define SEA_AIRPORT_CODE (16)
|
||||
#define HELIPORT_CODE (17)
|
||||
#define LAND_AIRPORT_CODE (1)
|
||||
#define SEA_AIRPORT_CODE (16)
|
||||
#define HELIPORT_CODE (17)
|
||||
|
||||
#define AIRPORT_VIEWPOINT_CODE (14)
|
||||
#define LIGHT_BEACON_CODE (18)
|
||||
#define WINDSOCK_CODE (19)
|
||||
#define TAXIWAY_SIGN (20)
|
||||
#define LIGHTING_OBJECT (21)
|
||||
#define AIRPORT_VIEWPOINT_CODE (14)
|
||||
#define LIGHT_BEACON_CODE (18)
|
||||
#define WINDSOCK_CODE (19)
|
||||
#define TAXIWAY_SIGN (20)
|
||||
#define LIGHTING_OBJECT (21)
|
||||
|
||||
#define LAND_RUNWAY_CODE (100)
|
||||
#define WATER_RUNWAY_CODE (101)
|
||||
#define HELIPAD_CODE (102)
|
||||
#define LAND_RUNWAY_CODE (100)
|
||||
#define WATER_RUNWAY_CODE (101)
|
||||
#define HELIPAD_CODE (102)
|
||||
|
||||
#define PAVEMENT_CODE (110)
|
||||
#define NODE_CODE (111)
|
||||
#define BEZIER_NODE_CODE (112)
|
||||
#define CLOSE_NODE_CODE (113)
|
||||
#define CLOSE_BEZIER_NODE_CODE (114)
|
||||
#define TERM_NODE_CODE (115)
|
||||
#define TERM_BEZIER_NODE_CODE (116)
|
||||
#define PAVEMENT_CODE (110)
|
||||
#define NODE_CODE (111)
|
||||
#define BEZIER_NODE_CODE (112)
|
||||
#define CLOSE_NODE_CODE (113)
|
||||
#define CLOSE_BEZIER_NODE_CODE (114)
|
||||
#define TERM_NODE_CODE (115)
|
||||
#define TERM_BEZIER_NODE_CODE (116)
|
||||
|
||||
#define LINEAR_FEATURE_CODE (120)
|
||||
#define BOUNDARY_CODE (130)
|
||||
#define LINEAR_FEATURE_CODE (120)
|
||||
#define BOUNDARY_CODE (130)
|
||||
|
||||
#define END_OF_FILE (99)
|
||||
#define END_OF_FILE (99)
|
||||
|
||||
// TODO: not implemented yet
|
||||
|
||||
#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)
|
||||
#define TRAFFIC_FLOW_TIME_RULE (1004)
|
||||
#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)
|
||||
#define TRAFFIC_FLOW_TIME_RULE (1004)
|
||||
|
||||
#define COMM_RECORDED (1050) // 8.33 kHz; AWOS, ASOS or ATIS
|
||||
#define COMM_UNICOM (1051) // 8.33 kHz; Unicom (US), CTAF (US), Radio (UK)
|
||||
#define COMM_CLD (1052) // 8.33 kHz; Clearance Delivery
|
||||
#define COMM_GND (1053) // 8.33 kHz; Ground
|
||||
#define COMM_TWR (1054) // 8.33 kHz; Tower
|
||||
#define COMM_APP (1055) // 8.33 kHz; Approach
|
||||
#define COMM_DEP (1056) // 8.33 kHz; Departure
|
||||
#define COMM_RECORDED (1050) // 8.33 kHz; AWOS, ASOS or ATIS
|
||||
#define COMM_UNICOM (1051) // 8.33 kHz; Unicom (US), CTAF (US), Radio (UK)
|
||||
#define COMM_CLD (1052) // 8.33 kHz; Clearance Delivery
|
||||
#define COMM_GND (1053) // 8.33 kHz; Ground
|
||||
#define COMM_TWR (1054) // 8.33 kHz; Tower
|
||||
#define COMM_APP (1055) // 8.33 kHz; Approach
|
||||
#define COMM_DEP (1056) // 8.33 kHz; Departure
|
||||
|
||||
#define VFR_TRAFFIC_PATTERN (1101)
|
||||
#define RWY_IN_USE_CONSTRAINTS (1110)
|
||||
#define VFR_TRAFFIC_PATTERN (1101)
|
||||
#define RWY_IN_USE_CONSTRAINTS (1110)
|
||||
|
||||
#define TAXI_ROUTE_NETWORK_HEADER (1200)
|
||||
#define TAXI_ROUTE_NETWORK_NODE (1201)
|
||||
#define TAXI_ROUTE_NETWORK_EDGE (1202)
|
||||
#define TAXI_ROUTE_NETWORK_OBSOLETE (1203)
|
||||
#define TAXI_ROUTE_EDGE_ACTIVE_ZONE (1204)
|
||||
#define TAXI_ROUTE_EDGE_CONTROL (1205)
|
||||
#define TAXI_ROUTE_EDGE_GROUND_VEHICLES (1206)
|
||||
#define TAXI_ROUTE_NETWORK_HEADER (1200)
|
||||
#define TAXI_ROUTE_NETWORK_NODE (1201)
|
||||
#define TAXI_ROUTE_NETWORK_EDGE (1202)
|
||||
#define TAXI_ROUTE_EDGE_ACTIVE_ZONE (1204)
|
||||
#define TAXI_ROUTE_EDGE_CONTROL (1205)
|
||||
#define TAXI_ROUTE_EDGE_GROUND_VEHICLES (1206)
|
||||
|
||||
#define START_UP_LOCATION (1300)
|
||||
#define START_UP_LOCATION_METADATA (1301)
|
||||
#define AIRPORT_IDENTIFICATION_METADATA (1302)
|
||||
#define START_UP_LOCATION (1300)
|
||||
#define START_UP_LOCATION_METADATA (1301)
|
||||
#define AIRPORT_IDENTIFICATION_METADATA (1302)
|
||||
|
||||
#define TRUCK_PARKING_LOCATION (1400)
|
||||
#define TRUCK_DESTINATION_LOCATION (1401)
|
||||
#define TRUCK_PARKING_LOCATION (1400)
|
||||
#define TRUCK_DESTINATION_LOCATION (1401)
|
||||
|
||||
#define JETWAY_ACTIVE (1500)
|
||||
#define JETWAY_CUSTOM (1501)
|
||||
#define JETWAY_ACTIVE (1500)
|
||||
#define JETWAY_CUSTOM (1501)
|
||||
|
||||
|
||||
class Parser : public SGThread
|
||||
|
|
|
@ -753,10 +753,12 @@ void Runway::gen_rwy(tgpolygon_list& rwy_polys,
|
|||
|
||||
switch (rwy.marking[rwhalf]) {
|
||||
case 2:
|
||||
case 6: // EASA-style non-precision approach
|
||||
rw_marking_list.insert(rw_marking_list.begin(), nprec, nprec + sizeof(nprec) / sizeof(nprec[0]));
|
||||
break;
|
||||
|
||||
case 3:
|
||||
case 7: // EASA-style precision approach
|
||||
rw_marking_list.insert(rw_marking_list.begin(), prec, prec + sizeof(prec) / sizeof(prec[0]));
|
||||
break;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue