fly/terragear
1
0
Fork 0
Code Activity

Support Robin's new data field in the runway record that lists the glideslope

Browse source 
angle for each end of the runway (affects vasi/papi alignment.)
This commit is contained in:
curt 2005-04-20 18:20:15 +00:00
parent e9eb9f2797
commit ade941fb6f
3 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Airports/GenAirports/build.cxx
View file

@ -426,6 +426,11 @@ void build_airport( string airport_id, float alt_m,
rwy.smoothness = atof( token[13].c_str() ); rwy.smoothness = atof( token[13].c_str() );
rwy.dist_remaining = (atoi( token[14].c_str() ) == 1 ); rwy.dist_remaining = (atoi( token[14].c_str() ) == 1 );
string vasi_angles = token[15];
vector<string> vasis = simgear::strutils::split( vasi_angles, "." );
rwy.gs_angle1 = atoi( vasis[0].c_str() );
rwy.gs_angle2 = atoi( vasis[1].c_str() );
SG_LOG( SG_GENERAL, SG_DEBUG, " no = " << rwy.rwy_no); SG_LOG( SG_GENERAL, SG_DEBUG, " no = " << rwy.rwy_no);
SG_LOG( SG_GENERAL, SG_DEBUG, " lat = " << rwy.lat); SG_LOG( SG_GENERAL, SG_DEBUG, " lat = " << rwy.lat);
SG_LOG( SG_GENERAL, SG_DEBUG, " lon = " << rwy.lon); SG_LOG( SG_GENERAL, SG_DEBUG, " lon = " << rwy.lon);

32
src/Airports/GenAirports/lights.cxx
View file

@ -679,7 +679,7 @@ static TGSuperPoly gen_touchdown_zone_lights( const TGRunway& rwy_info,
} }
// generate a simple 2 bar VASI for a 3 degree approach // generate a simple 2 bar VASI
static TGSuperPoly gen_vasi( const TGRunway& rwy_info, float alt_m, static TGSuperPoly gen_vasi( const TGRunway& rwy_info, float alt_m,
bool recip, TGPolygon *apt_base ) bool recip, TGPolygon *apt_base )
{ {
@ -687,6 +687,7 @@ static TGSuperPoly gen_vasi( const TGRunway& rwy_info, float alt_m,
point_list normals; normals.clear(); point_list normals; normals.clear();
int i; int i;
string flag; string flag;
double gs_angle = 3.0;
cout << "gen vasi " << rwy_info.rwy_no << endl; cout << "gen vasi " << rwy_info.rwy_no << endl;
@ -714,14 +715,21 @@ static TGSuperPoly gen_vasi( const TGRunway& rwy_info, float alt_m,
length_hdg = rwy_info.heading + 180.0; length_hdg = rwy_info.heading + 180.0;
if ( length_hdg > 360.0 ) { length_hdg -= 360.0; } if ( length_hdg > 360.0 ) { length_hdg -= 360.0; }
flag = rwy_info.rwy_no + "-i"; flag = rwy_info.rwy_no + "-i";
gs_angle = rwy_info.gs_angle1;
} else { } else {
ref = corner[2]; ref = corner[2];
length_hdg = rwy_info.heading; length_hdg = rwy_info.heading;
flag = rwy_info.rwy_no; flag = rwy_info.rwy_no;
gs_angle = rwy_info.gs_angle2;
} }
left_hdg = length_hdg - 90.0; left_hdg = length_hdg - 90.0;
if ( left_hdg < 0 ) { left_hdg += 360.0; } if ( left_hdg < 0 ) { left_hdg += 360.0; }
if ( gs_angle < 0.5 ) {
gs_angle = 3.0;
}
// offset 600' upwind // offset 600' upwind
geo_direct_wgs_84 ( alt_m, ref.lat(), ref.lon(), length_hdg, geo_direct_wgs_84 ( alt_m, ref.lat(), ref.lon(), length_hdg,
600 * SG_FEET_TO_METER, &lat, &lon, &r ); 600 * SG_FEET_TO_METER, &lat, &lon, &r );
@ -732,7 +740,7 @@ static TGSuperPoly gen_vasi( const TGRunway& rwy_info, float alt_m,
ref = Point3D( lon, lat, 0.0 ); ref = Point3D( lon, lat, 0.0 );
// downwind bar // downwind bar
normal = gen_runway_light_vector( rwy_info, 2.5, recip ); normal = gen_runway_light_vector( rwy_info, gs_angle - 0.5, recip );
// unit1 // unit1
Point3D pt1 = ref; Point3D pt1 = ref;
@ -779,7 +787,7 @@ static TGSuperPoly gen_vasi( const TGRunway& rwy_info, float alt_m,
700 * SG_FEET_TO_METER, &lat, &lon, &r ); 700 * SG_FEET_TO_METER, &lat, &lon, &r );
ref = Point3D( lon, lat, 0.0 ); ref = Point3D( lon, lat, 0.0 );
normal = gen_runway_light_vector( rwy_info, 3.0, recip ); normal = gen_runway_light_vector( rwy_info, gs_angle, recip );
// unit1 // unit1
pt1 = ref; pt1 = ref;
@ -837,7 +845,7 @@ static TGSuperPoly gen_vasi( const TGRunway& rwy_info, float alt_m,
} }
// generate a simple PAPI for a 3 degree approach // generate a simple PAPI
static TGSuperPoly gen_papi( const TGRunway& rwy_info, float alt_m, static TGSuperPoly gen_papi( const TGRunway& rwy_info, float alt_m,
bool recip, TGPolygon *apt_base ) bool recip, TGPolygon *apt_base )
{ {
@ -845,6 +853,7 @@ static TGSuperPoly gen_papi( const TGRunway& rwy_info, float alt_m,
point_list normals; normals.clear(); point_list normals; normals.clear();
int i; int i;
string flag; string flag;
double gs_angle = 3.0;
cout << "gen papi " << rwy_info.rwy_no << endl; cout << "gen papi " << rwy_info.rwy_no << endl;
@ -872,16 +881,23 @@ static TGSuperPoly gen_papi( const TGRunway& rwy_info, float alt_m,
length_hdg = rwy_info.heading + 180.0; length_hdg = rwy_info.heading + 180.0;
if ( length_hdg > 360.0 ) { length_hdg -= 360.0; } if ( length_hdg > 360.0 ) { length_hdg -= 360.0; }
flag = rwy_info.rwy_no + "-i"; flag = rwy_info.rwy_no + "-i";
gs_angle = rwy_info.gs_angle1;
} else { } else {
ref = corner[2]; ref = corner[2];
length_hdg = rwy_info.heading; length_hdg = rwy_info.heading;
flag = rwy_info.rwy_no; flag = rwy_info.rwy_no;
gs_angle = rwy_info.gs_angle2;
} }
left_hdg = length_hdg - 90.0; left_hdg = length_hdg - 90.0;
if ( left_hdg < 0 ) { left_hdg += 360.0; } if ( left_hdg < 0 ) { left_hdg += 360.0; }
cout << "length hdg = " << length_hdg cout << "length hdg = " << length_hdg
<< " left heading = " << left_hdg << endl; << " left heading = " << left_hdg << endl;
if ( gs_angle < 0.5 ) {
gs_angle = 3.0;
}
// offset 950' upwind // offset 950' upwind
geo_direct_wgs_84 ( alt_m, ref.lat(), ref.lon(), length_hdg, geo_direct_wgs_84 ( alt_m, ref.lat(), ref.lon(), length_hdg,
950 * SG_FEET_TO_METER, &lat, &lon, &r ); 950 * SG_FEET_TO_METER, &lat, &lon, &r );
@ -894,7 +910,7 @@ static TGSuperPoly gen_papi( const TGRunway& rwy_info, float alt_m,
// unit1 // unit1
Point3D pt1 = ref; Point3D pt1 = ref;
lights.push_back( pt1 ); lights.push_back( pt1 );
normal = gen_runway_light_vector( rwy_info, 3.5, recip ); normal = gen_runway_light_vector( rwy_info, gs_angle + 0.5, recip );
normals.push_back( normal ); normals.push_back( normal );
// unit2 // unit2
@ -902,7 +918,7 @@ static TGSuperPoly gen_papi( const TGRunway& rwy_info, float alt_m,
30 * SG_FEET_TO_METER, &lat, &lon, &r ); 30 * SG_FEET_TO_METER, &lat, &lon, &r );
pt1 = Point3D( lon, lat, 0.0 ); pt1 = Point3D( lon, lat, 0.0 );
lights.push_back( pt1 ); lights.push_back( pt1 );
normal = gen_runway_light_vector( rwy_info, 3.167, recip ); normal = gen_runway_light_vector( rwy_info, gs_angle + 0.167, recip );
normals.push_back( normal ); normals.push_back( normal );
// unit3 // unit3
@ -910,7 +926,7 @@ static TGSuperPoly gen_papi( const TGRunway& rwy_info, float alt_m,
30 * SG_FEET_TO_METER, &lat, &lon, &r ); 30 * SG_FEET_TO_METER, &lat, &lon, &r );
pt1 = Point3D( lon, lat, 0.0 ); pt1 = Point3D( lon, lat, 0.0 );
lights.push_back( pt1 ); lights.push_back( pt1 );
normal = gen_runway_light_vector( rwy_info, 2.833, recip ); normal = gen_runway_light_vector( rwy_info, gs_angle - 0.167, recip );
normals.push_back( normal ); normals.push_back( normal );
// unit4 // unit4
@ -918,7 +934,7 @@ static TGSuperPoly gen_papi( const TGRunway& rwy_info, float alt_m,
30 * SG_FEET_TO_METER, &lat, &lon, &r ); 30 * SG_FEET_TO_METER, &lat, &lon, &r );
pt1 = Point3D( lon, lat, 0.0 ); pt1 = Point3D( lon, lat, 0.0 );
lights.push_back( pt1 ); lights.push_back( pt1 );
normal = gen_runway_light_vector( rwy_info, 2.5, recip ); normal = gen_runway_light_vector( rwy_info, gs_angle - 0.5, recip );
normals.push_back( normal ); normals.push_back( normal );
// grass base // grass base

3
src/Airports/GenAirports/runway.hxx
View file

@ -54,6 +54,9 @@ struct TGRunway {
double smoothness; double smoothness;
bool dist_remaining; bool dist_remaining;
double gs_angle1;
double gs_angle2;
TGPolygon threshold; TGPolygon threshold;
TGPolygon tens, tens_margin, ones, ones_margin; TGPolygon tens, tens_margin, ones, ones_margin;
TGPolygon letter, letter_margin_left, letter_margin_right; TGPolygon letter, letter_margin_left, letter_margin_right;