Frederic Bouvier:

[flightgear.git] / src / Navaids / nav.hxx

diff --git a/src/Navaids/nav.hxx b/src/Navaids/nav.hxx
index ae8cf431bb2e3fc2daff396009e7e18fbf028341..074670651ba936840e54ab5cd161581317871512 100644 (file)
--- a/src/Navaids/nav.hxx
+++ b/src/Navaids/nav.hxx
@@ -34,30 +34,27 @@
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
-#  include <iostream.h>
-#elif defined( __BORLANDC__ )
+#elif defined( __BORLANDC__ ) || (__APPLE__)
 #  include <iostream>
 #else
 #  include <istream.h>
 #endif
 
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(istream);
-#endif
 
 
 class FGNav {
 
     char type;
     double lon, lat;
-    double elev;
+    double elev_ft;
     double x, y, z;
     int freq;
     int range;
     bool has_dme;
     string ident;              // to avoid a core dump with corrupt data
     double magvar;             // magvar from true north (negative = W)
+    string name;
 
     // for failure modeling
     string trans_ident;                // transmitted ident
@@ -66,13 +63,13 @@ class FGNav {
 
 public:
 
-    inline FGNav(void) {}
+    inline FGNav(void);
     inline ~FGNav(void) {}
 
     inline char get_type() const { return type; }
     inline double get_lon() const { return lon; }
     inline double get_lat() const { return lat; }
-    inline double get_elev() const { return elev; }
+    inline double get_elev_ft() const { return elev_ft; }
     inline double get_x() const { return x; }
     inline double get_y() const { return y; }
     inline double get_z() const { return z; }
@@ -82,20 +79,31 @@ public:
     inline const char *get_ident() { return ident.c_str(); }
     inline string get_trans_ident() { return trans_ident; }
     inline double get_magvar () const { return magvar; }
-
-    /* inline void set_type( char t ) { type = t; }
-    inline void set_lon( double l ) { lon = l; }
-    inline void set_lat( double l ) { lat = l; }
-    inline void set_elev( double e ) { elev = e; }
-    inline void set_freq( int f ) { freq = f; }
-    inline void set_range( int r ) { range = r; }
-    inline void set_dme( bool b ) { dme = b; }
-    inline void set_ident( char *i ) { strncpy( ident, i, 5 ); } */
+    inline string get_name () { return name; }
 
     friend istream& operator>> ( istream&, FGNav& );
 };
 
 
+inline
+FGNav::FGNav(void) :
+    type(0),
+    lon(0.0), lat(0.0),
+    elev_ft(0.0),
+    x(0.0), y(0.0), z(0.0),
+    freq(0),
+    range(0),
+    has_dme(false),
+    ident(""),
+    magvar(0.0),
+    name(""),
+    trans_ident(""),
+    nav_failed(false),
+    dme_failed(false)
+{
+}
+
+
 inline istream&
 operator >> ( istream& in, FGNav& n )
 {
@@ -107,7 +115,7 @@ operator >> ( istream& in, FGNav& n )
     static double julian_date = 0;
     static const double MJD0    = 2415020.0;
     if ( first_time ) {
-       julian_date = sgTimeCurrentMJD() + MJD0;
+       julian_date = sgTimeCurrentMJD(0,0) + MJD0;
        first_time = false;
     }
 
@@ -116,9 +124,15 @@ operator >> ( istream& in, FGNav& n )
     if ( n.type == '[' )
       return in >> skipeol;
 
-    in >> n.lat >> n.lon >> n.elev >> f >> n.range 
+    in >> n.lat >> n.lon >> n.elev_ft >> f >> n.range 
        >> c >> n.ident >> magvar_s;
 
+    getline(in,n.name);
+    // Remove the space before the name
+    if ( n.name.substr(0,1) == " " ) {
+        n.name = n.name.erase(0,1);
+    }
+
     n.freq = (int)(f*100.0 + 0.5);
     if ( c == 'Y' ) {
        n.has_dme = true;
@@ -130,12 +144,12 @@ operator >> ( istream& in, FGNav& n )
     // cout << "Calculating magvar for navaid " << n.ident << endl;
     if (magvar_s == "XXX") {
        // default to mag var as of 1990-01-01 (Julian 2447892.5)
-       // cout << "lat = " << n.lat << " lon = " << n.lon << " elev = " 
-       //      << n.elev << " JD = " 
+       // cout << "lat = " << n.lat << " lon = " << n.lon << " elev_ft = " 
+       //      << n.elev_ft << " JD = " 
        //      << julian_date << endl;
        n.magvar = sgGetMagVar( n.lon * SGD_DEGREES_TO_RADIANS,
                                 n.lat * SGD_DEGREES_TO_RADIANS,
-                                n.elev * SG_FEET_TO_METER,
+                                n.elev_ft * SG_FEET_TO_METER,
                                 julian_date )
             * SGD_RADIANS_TO_DEGREES;
        // cout << "Default variation at " << n.lon << ',' << n.lat
@@ -162,7 +176,7 @@ operator >> ( istream& in, FGNav& n )
     // cout << n.ident << " " << n.magvar << endl;
 
     // generate cartesian coordinates
-    Point3D geod( n.lon * SGD_DEGREES_TO_RADIANS, n.lat * SGD_DEGREES_TO_RADIANS, n.elev );
+    Point3D geod( n.lon * SGD_DEGREES_TO_RADIANS, n.lat * SGD_DEGREES_TO_RADIANS, n.elev_ft * SG_FEET_TO_METER );
     Point3D cart = sgGeodToCart( geod );
     n.x = cart.x();
     n.y = cart.y();
@@ -171,7 +185,7 @@ operator >> ( istream& in, FGNav& n )
     n.trans_ident = n.ident;
     n.nav_failed = n.dme_failed = false;
 
-    return in >> skipeol;
+    return in;
 }