X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNavaids%2Fnav.hxx;h=074670651ba936840e54ab5cd161581317871512;hb=bd3c57beee2c368b8947b35e627a4a82c0d9b637;hp=6f38b4ae8a6c0b31f9e30196719b96a4759818cb;hpb=5127740c725bce21fa9b95b277e226a3530043fd;p=flightgear.git

diff --git a/src/Navaids/nav.hxx b/src/Navaids/nav.hxx
index 6f38b4ae8..074670651 100644
--- a/src/Navaids/nav.hxx
+++ b/src/Navaids/nav.hxx
@@ -24,74 +24,114 @@
 #ifndef _FG_NAV_HXX
 #define _FG_NAV_HXX
 
+#include <stdio.h>
 
 #include <simgear/compiler.h>
-#include <simgear/math/fg_geodesy.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/math/sg_geodesy.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 )
-#  include <iostream.h>
-#elif defined( __BORLANDC__ )
+#elif defined( __BORLANDC__ ) || (__APPLE__)
 #  include <iostream>
 #else
 #  include <istream.h>
 #endif
 
-#if ! defined( FG_HAVE_NATIVE_SGI_COMPILERS )
-FG_USING_STD(istream);
-#endif
+SG_USING_STD(istream);
 
 
 class FGNav {
 
     char type;
     double lon, lat;
-    double elev;
+    double elev_ft;
     double x, y, z;
     int freq;
     int range;
     bool has_dme;
-    char ident[5];
+    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
+    bool nav_failed;		// nav failed?
+    bool dme_failed;		// dme failed?
 
 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; }
     inline int get_freq() const { return freq; }
     inline int get_range() const { return range; }
     inline bool get_has_dme() const { return has_dme; }
-    inline char *get_ident() { return ident; }
-
-    /* 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 const char *get_ident() { return ident.c_str(); }
+    inline string get_trans_ident() { return trans_ident; }
+    inline double get_magvar () const { return magvar; }
+    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 )
 {
     double f;
-    char c;
-    in >> n.type >> n.lat >> n.lon >> n.elev >> f >> n.range 
-       >> c >> n.ident;
+    char c /* , magvar_dir */ ;
+    string magvar_s;
+
+    static bool first_time = true;
+    static double julian_date = 0;
+    static const double MJD0    = 2415020.0;
+    if ( first_time ) {
+	julian_date = sgTimeCurrentMJD(0,0) + MJD0;
+	first_time = false;
+    }
+
+    in >> n.type;
+    
+    if ( n.type == '[' )
+      return in >> skipeol;
+
+    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' ) {
@@ -100,14 +140,52 @@ operator >> ( istream& in, FGNav& n )
 	n.has_dme = false;
     }
 
+    // Calculate the magvar from true north.
+    // 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_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_ft * SG_FEET_TO_METER,
+                                julian_date )
+            * SGD_RADIANS_TO_DEGREES;
+	// cout << "Default variation at " << n.lon << ',' << n.lat
+	// 	<< " is " << var << endl;
+#if 0
+	// I don't know what this is for - CLO 1 Feb 2001
+	if (var - int(var) >= 0.5)
+	    n.magvar = int(var) + 1;
+	else if (var - int(var) <= -0.5)
+	    n.magvar = int(var) - 1;
+	else
+	    n.magvar = int(var);
+#endif
+	// cout << "Defaulted to magvar of " << n.magvar << endl;
+    } else {
+	char direction;
+	int var;
+	sscanf(magvar_s.c_str(), "%d%c", &var, &direction);
+	n.magvar = var;
+	if (direction == 'W')
+	    n.magvar = -n.magvar;
+	// cout << "Explicit magvar of " << 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 cart = fgGeodToCart( geod );
+    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();
     n.z = cart.z();
 
-    return in >> skipeol;
+    n.trans_ident = n.ident;
+    n.nav_failed = n.dme_failed = false;
+
+    return in;
 }