- adjusted for no-value constructor for FGPanel

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

diff --git a/src/Navaids/nav.hxx b/src/Navaids/nav.hxx
index 84bd8132ee28f67cf3c9bf18d44c9c9bdfcf36b7..967b6a3cc66e3278fdcf05dca5ee2f361b2a5b83 100644 (file)
--- a/src/Navaids/nav.hxx
+++ b/src/Navaids/nav.hxx
@@ -28,12 +28,13 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 #include <simgear/magvar/magvar.hxx>
+#include <simgear/timing/sg_time.hxx>
 
-#ifdef FG_HAVE_STD_INCLUDES
+#ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>
-#elif defined( FG_HAVE_NATIVE_SGI_COMPILERS )
+#elif defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 #  include <iostream.h>
 #elif defined( __BORLANDC__ )
 #  include <iostream>
@@ -41,8 +42,8 @@
 #  include <istream.h>
 #endif
 
-#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-FG_USING_STD(istream);
+#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
+SG_USING_STD(istream);
 #endif
 
 
@@ -58,6 +59,11 @@ class FGNav {
     string ident;              // to avoid a core dump with corrupt data
     double magvar;             // magvar from true north (negative = W)
 
+    // for failure modeling
+    string trans_ident;                // transmitted ident
+    bool nav_failed;           // nav failed?
+    bool dme_failed;           // dme failed?
+
 public:
 
     inline FGNav(void) {}
@@ -74,6 +80,7 @@ public:
     inline int get_range() const { return range; }
     inline bool get_has_dme() const { return has_dme; }
     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; }
@@ -95,7 +102,16 @@ operator >> ( istream& in, FGNav& n )
     double f;
     char c /* , magvar_dir */ ;
     string magvar_s;
-    
+
+    static SGTime time_params;
+    static bool first_time = true;
+    static double julian_date = 0;
+    if ( first_time ) {
+       time_params.update( 0.0, 0.0, 0 );
+       julian_date = time_params.getJD();
+       first_time = false;
+    }
+
     in >> n.type >> n.lat >> n.lon >> n.elev >> f >> n.range 
        >> c >> n.ident >> magvar_s;
 
@@ -110,9 +126,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)
-       n.magvar = -sgGetMagVar(n.lon * DEG_TO_RAD, n.lat * DEG_TO_RAD,
-                               n.elev * FEET_TO_METER,
-                               2447892.5) * RAD_TO_DEG;
+       // cout << "lat = " << n.lat << " lon = " << n.lon << " elev = " 
+       //      << n.elev << " 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,
+                               julian_date) * SGD_RADIANS_TO_DEGREES;
        // cout << "Default variation at " << n.lon << ',' << n.lat
        //      << " is " << var << endl;
 #if 0
@@ -130,19 +149,22 @@ operator >> ( istream& in, FGNav& n )
        int var;
        sscanf(magvar_s.c_str(), "%d%c", &var, &direction);
        n.magvar = var;
-       if (direction == 'E')
-           n.magvar = 0 - n.magvar;
+       if (direction == 'W')
+           n.magvar = -n.magvar;
        // cout << "Explicit magvar of " << n.magvar << endl;
     }
-    cout << n.ident << " " << n.magvar << endl;
+    // cout << n.ident << " " << n.magvar << endl;
 
     // generate cartesian coordinates
-    Point3D geod( n.lon * DEG_TO_RAD, n.lat * DEG_TO_RAD, n.elev );
+    Point3D geod( n.lon * SGD_DEGREES_TO_RADIANS, n.lat * SGD_DEGREES_TO_RADIANS, n.elev );
     Point3D cart = sgGeodToCart( geod );
     n.x = cart.x();
     n.y = cart.y();
     n.z = cart.z();
 
+    n.trans_ident = n.ident;
+    n.nav_failed = n.dme_failed = false;
+
     return in >> skipeol;
 }