Various Irix compiler tweaks.

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

diff --git a/src/Navaids/nav.hxx b/src/Navaids/nav.hxx
index 97a7f24815296a60901e223bcedb2f6a7fd847af..5a521130472641e933b7536ee05bf0c051612625 100644 (file)
--- a/src/Navaids/nav.hxx
+++ b/src/Navaids/nav.hxx
@@ -28,13 +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>
@@ -42,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
 
 
@@ -103,16 +103,20 @@ operator >> ( istream& in, FGNav& n )
     char c /* , magvar_dir */ ;
     string magvar_s;
 
-    static SGTime time_params;
     static bool first_time = true;
     static double julian_date = 0;
+    static const double MJD0    = 2415020.0;
     if ( first_time ) {
-       time_params.update( 0.0, 0.0, 0 );
-       julian_date = time_params.getJD();
+       julian_date = sgTimeCurrentMJD( 0 ) + MJD0;
        first_time = false;
     }
 
-    in >> n.type >> n.lat >> n.lon >> n.elev >> f >> n.range 
+    in >> n.type;
+    
+    if ( n.type == '[' )
+      return in >> skipeol;
+
+    in >> n.lat >> n.lon >> n.elev >> f >> n.range 
        >> c >> n.ident >> magvar_s;
 
     n.freq = (int)(f*100.0 + 0.5);
@@ -129,9 +133,11 @@ operator >> ( istream& in, FGNav& n )
        // cout << "lat = " << n.lat << " lon = " << n.lon << " elev = " 
        //      << n.elev << " JD = " 
        //      << julian_date << endl;
-       n.magvar = sgGetMagVar(n.lon * DEG_TO_RAD, n.lat * DEG_TO_RAD,
-                               n.elev * FEET_TO_METER,
-                               julian_date) * RAD_TO_DEG;
+       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
@@ -156,7 +162,7 @@ operator >> ( istream& in, FGNav& n )
     // 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();