#include <Aircraft/aircraft.hxx>
#include <FDM/UIUCModel/uiuc_aircraftdir.h>
+#include <Airports/apt_loader.hxx>
#include <Airports/runways.hxx>
#include <Airports/simple.hxx>
#include <ATC/ATCdisplay.hxx>
result = globals->get_airports()->search( id );
- if ( result.id.empty() ) {
+ if ( result._id.empty() ) {
SG_LOG( SG_GENERAL, SG_ALERT,
"Failed to find " << id << " in basic.dat.gz" );
return false;
SG_LOG( SG_GENERAL, SG_INFO,
"Position for " << id << " is ("
- << a->longitude << ", "
- << a->latitude << ")" );
+ << a->_longitude << ", "
+ << a->_latitude << ")" );
return true;
}
"Finding elevation for airport: " << id );
if ( fgFindAirportID( id, &a ) ) {
- return a.elevation;
+ return a._elevation;
} else {
return -9999.0;
}
float fudge_lat = .003f - fudge_lon;
if ( fgFindAirportID( id, &a ) ) {
- fgSetDouble("/sim/tower/longitude-deg", a.longitude + fudge_lon);
- fgSetDouble("/sim/tower/latitude-deg", a.latitude + fudge_lat);
- fgSetDouble("/sim/tower/altitude-ft", a.elevation + towerheight);
+ fgSetDouble("/sim/tower/longitude-deg", a._longitude + fudge_lon);
+ fgSetDouble("/sim/tower/latitude-deg", a._latitude + fudge_lat);
+ fgSetDouble("/sim/tower/altitude-ft", a._elevation + towerheight);
return true;
} else {
return false;
}
double lat2, lon2, az2;
- double heading = r.heading;
+ double heading = r._heading;
double azimuth = heading + 180.0;
while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
SG_LOG( SG_GENERAL, SG_INFO,
- "runway = " << r.lon << ", " << r.lat
- << " length = " << r.length * SG_FEET_TO_METER
+ "runway = " << r._lon << ", " << r._lat
+ << " length = " << r._length * SG_FEET_TO_METER
<< " heading = " << azimuth );
- geo_direct_wgs_84 ( 0, r.lat, r.lon, azimuth,
- r.length * SG_FEET_TO_METER * 0.5 - 5.0,
+ geo_direct_wgs_84 ( 0, r._lat, r._lon, azimuth,
+ r._length * SG_FEET_TO_METER * 0.5 - 5.0,
&lat2, &lon2, &az2 );
if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON ) {
}
double lat2, lon2, az2;
- double heading = r.heading;
+ double heading = r._heading;
double azimuth = heading + 180.0;
while ( azimuth >= 360.0 ) { azimuth -= 360.0; }
SG_LOG( SG_GENERAL, SG_INFO,
- "runway = " << r.lon << ", " << r.lat
- << " length = " << r.length * SG_FEET_TO_METER
+ "runway = " << r._lon << ", " << r._lat
+ << " length = " << r._length * SG_FEET_TO_METER
<< " heading = " << azimuth );
- geo_direct_wgs_84 ( 0, r.lat, r.lon,
+ geo_direct_wgs_84 ( 0, r._lat, r._lon,
azimuth,
- r.length * SG_FEET_TO_METER * 0.5 - 5.0,
+ r._length * SG_FEET_TO_METER * 0.5 - 5.0,
&lat2, &lon2, &az2 );
if ( fabs( fgGetDouble("/sim/presets/offset-distance") ) > SG_EPSILON )
bool
fgInitNav ()
{
- SG_LOG(SG_GENERAL, SG_INFO, "Loading Simple Airport List");
- SGPath p_simple( globals->get_fg_root() );
- p_simple.append( "Airports/basic.dat" );
+ SG_LOG(SG_GENERAL, SG_INFO, "Loading Airport Database ...");
+
+ SGPath aptdb( globals->get_fg_root() );
+ aptdb.append( "Airports/apt.dat" );
+
SGPath p_metar( globals->get_fg_root() );
p_metar.append( "Airports/metar.dat" );
- FGAirportList *airports = new FGAirportList(p_simple.str(), p_metar.str());
- globals->set_airports( airports );
- SG_LOG(SG_GENERAL, SG_INFO, "Loading Runway List");
- SGPath p_runway( globals->get_fg_root() );
- p_runway.append( "Airports/runways.dat" );
- FGRunwayList *runways = new FGRunwayList( p_runway.str() );
+ FGAirportList *airports = new FGAirportList();
+ globals->set_airports( airports );
+ FGRunwayList *runways = new FGRunwayList();
globals->set_runways( runways );
+ fgAirportDBLoad( airports, runways, aptdb.str(), p_metar.str() );
+
FGNavList *navlist = new FGNavList;
FGNavList *loclist = new FGNavList;
FGNavList *gslist = new FGNavList;
globals->add_subsystem("Traffic Manager", new FGTrafficManager);
FGTrafficManager *dispatcher =
(FGTrafficManager*) globals->get_subsystem("Traffic Manager");
-
- readXML(string(globals->get_fg_root() + string("/Traffic/fgtraffic.xml")),
+ SGPath path =globals->get_fg_root();
+ path.append("Traffic/fgtraffic.xml");
+ readXML(path.str(),
*dispatcher);
globals->get_subsystem("Traffic Manager")->init();