// Get a heading in degrees from one lat/lon to another.
// This function assumes the world is spherical. If geodetic accuracy is required use the functions is sg_geodesy instead!
-// Warning - at the moment we are not checking for identical points - currently it returns 90 in this instance.
+// Warning - at the moment we are not checking for identical points - currently it returns 0 in this instance.
double GetHeadingFromTo(Point3D A, Point3D B) {
double latA = A.lat() * DCL_DEGREES_TO_RADIANS;
double lonA = A.lon() * DCL_DEGREES_TO_RADIANS;
double lonB = B.lon() * DCL_DEGREES_TO_RADIANS;
double xdist = sin(lonB - lonA) * (double)SG_EQUATORIAL_RADIUS_M * cos((latA+latB)/2.0);
double ydist = sin(latB - latA) * (double)SG_EQUATORIAL_RADIUS_M;
-
- if(xdist >= 0) {
- if(ydist > 0) {
- return(atan(xdist/ydist) * DCL_RADIANS_TO_DEGREES);
- } else if (ydist == 0) {
- return(90.0);
- } else {
- return(180.0 - atan(xdist/fabs(ydist)) * DCL_RADIANS_TO_DEGREES);
- }
- } else {
- if(ydist > 0) {
- return(360.0 - atan(fabs(xdist)/ydist) * DCL_RADIANS_TO_DEGREES);
- } else if (ydist == 0) {
- return(270.0);
- } else {
- return(180.0 + atan(xdist/ydist) * DCL_RADIANS_TO_DEGREES);
- }
- }
+ double heading = atan2(xdist, ydist) * DCL_RADIANS_TO_DEGREES;
+ return heading < 0.0 ? heading + 360 : heading;
}
// Given a heading (in degrees), bound it from 0 -> 360
// in fg_init.cxx, and are just here temporarily until some rationalisation occurs.
// find basic airport location info from airport database
bool dclFindAirportID( const string& id, FGAirport *a ) {
- FGAirport result;
+ const FGAirport* result;
if ( id.length() ) {
SG_LOG( SG_GENERAL, SG_INFO, "Searching for airport code = " << id );
- result = globals->get_airports()->search( id );
- if ( result.getId().empty() ) {
+ result = globals->get_airports()->search(id);
+ if ( result == NULL ) {
SG_LOG( SG_GENERAL, SG_WARN,
- "Failed to find " << id << " in basic.dat.gz" );
+ "Failed to find " << id << " in apt.dat.gz" );
return false;
}
} else {
return false;
}
- *a = result;
+ *a = *result;
SG_LOG( SG_GENERAL, SG_INFO,
"Position for " << id << " is ("