From: curt <curt>
Date: Thu, 6 Jul 2000 20:10:41 +0000 (+0000)
Subject: fg_time.* becomes sg_time.*, FGTime becomes SGTime ...
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8159b749f49be587e794a8438db7a4373d527b1d;p=simgear.git

fg_time.* becomes sg_time.*, FGTime becomes SGTime ...
---

diff --git a/simgear/ephemeris/celestialBody.cxx b/simgear/ephemeris/celestialBody.cxx
index d8ea4b36..4762f20e 100644
--- a/simgear/ephemeris/celestialBody.cxx
+++ b/simgear/ephemeris/celestialBody.cxx
@@ -34,7 +34,7 @@
 
 
 /**************************************************************************
- * void CelestialBody::updatePosition(fgTIME *t, Star *ourSun)
+ * void CelestialBody::updatePosition(SGTime *t, Star *ourSun)
  *
  * Basically, this member function provides a general interface for 
  * calculating the right ascension and declinaion. This function is 
@@ -45,14 +45,14 @@
  * position is calculated an a slightly different manner.  
  *
  * arguments:
- * fgTIME t: provides the current time.
+ * SGTime t: provides the current time.
  * Star *ourSun: the sun's position is needed to convert heliocentric 
  *               coordinates into geocentric coordinates.
  *
  * return value: none
  *
  *************************************************************************/
-void CelestialBody::updatePosition(FGTime *t, Star *ourSun)
+void CelestialBody::updatePosition(SGTime *t, Star *ourSun)
 {
   double eccAnom, v, ecl, actTime, 
     xv, yv, xh, yh, zh, xg, yg, zg, xe, ye, ze;
diff --git a/simgear/ephemeris/celestialBody.hxx b/simgear/ephemeris/celestialBody.hxx
index c9cda8b9..96f67787 100644
--- a/simgear/ephemeris/celestialBody.hxx
+++ b/simgear/ephemeris/celestialBody.hxx
@@ -32,7 +32,7 @@
 
 
 #include <simgear/constants.h>
-#include <simgear/timing/fg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 class Star;
 
@@ -61,8 +61,8 @@ protected:              // make the data protected, in order to give the
   double lonEcl, latEcl;
 
   double fgCalcEccAnom(double M, double e);
-  double fgCalcActTime(FGTime *t);
-  void updateOrbElements(FGTime *t);
+  double fgCalcActTime(SGTime *t);
+  void updateOrbElements(SGTime *t);
 
 public:
   CelestialBody(double Nf, double Ns,
@@ -70,7 +70,7 @@ public:
 		double wf, double ws,
 		double af, double as,
 		double ef, double es,
-		double Mf, double Ms, FGTime *t);
+		double Mf, double Ms, SGTime *t);
   CelestialBody(double Nf, double Ns,
 		double If, double Is,
 		double wf, double ws,
@@ -84,7 +84,7 @@ public:
   double getMagnitude();
   double getLon();
   double getLat(); 
-  void updatePosition(FGTime *t, Star *ourSun);
+  void updatePosition(SGTime *t, Star *ourSun);
 };
 
 /*****************************************************************************
@@ -112,7 +112,7 @@ inline CelestialBody::CelestialBody(double Nf, double Ns,
 				    double wf, double ws,
 				    double af, double as,
 				    double ef, double es,
-				    double Mf, double Ms, FGTime *t)
+				    double Mf, double Ms, SGTime *t)
 {
   NFirst = Nf;     NSec = Ns;
   iFirst = If;     iSec = Is;
@@ -139,15 +139,15 @@ inline CelestialBody::CelestialBody(double Nf, double Ns,
 };
 
 /****************************************************************************
- * inline void CelestialBody::updateOrbElements(FGTime *t)
+ * inline void CelestialBody::updateOrbElements(SGTime *t)
  * given the current time, this private member calculates the actual 
  * orbital elements
  *
- * Arguments: FGTime *t: the current time:
+ * Arguments: SGTime *t: the current time:
  *
  * return value: none
  ***************************************************************************/
-inline void CelestialBody::updateOrbElements(FGTime *t)
+inline void CelestialBody::updateOrbElements(SGTime *t)
 {
   double actTime = fgCalcActTime(t);
    M = DEG_TO_RAD * (MFirst + (MSec * actTime));
@@ -158,7 +158,7 @@ inline void CelestialBody::updateOrbElements(FGTime *t)
    a = aFirst + (aSec * actTime);
 }
 /*****************************************************************************
- * inline double CelestialBody::fgCalcActTime(FGTime *t)
+ * inline double CelestialBody::fgCalcActTime(SGTime *t)
  * this private member function returns the offset in days from the epoch for
  * wich the orbital elements are calculated (Jan, 1st, 2000).
  * 
@@ -166,7 +166,7 @@ inline void CelestialBody::updateOrbElements(FGTime *t)
  *
  * return value: the (fractional) number of days until Jan 1, 2000.
  ****************************************************************************/
-inline double CelestialBody::fgCalcActTime(FGTime *t)
+inline double CelestialBody::fgCalcActTime(SGTime *t)
 {
   return (t->getMjd() - 36523.5);
 }
diff --git a/simgear/ephemeris/ephemeris.cxx b/simgear/ephemeris/ephemeris.cxx
index 957556f9..1a53918c 100644
--- a/simgear/ephemeris/ephemeris.cxx
+++ b/simgear/ephemeris/ephemeris.cxx
@@ -57,7 +57,7 @@ FGEphemeris::~FGEphemeris( void ) {
 
 // Update (recalculate) the positions of all objects for the specified
 // time
-void FGEphemeris::update( FGTime *t, double lat ) {
+void FGEphemeris::update( SGTime *t, double lat ) {
     // update object positions
     our_sun->updatePosition( t );
     moon->updatePosition( t, lat, our_sun );
diff --git a/simgear/ephemeris/ephemeris.hxx b/simgear/ephemeris/ephemeris.hxx
index 063dcf54..7340d5e1 100644
--- a/simgear/ephemeris/ephemeris.hxx
+++ b/simgear/ephemeris/ephemeris.hxx
@@ -32,7 +32,7 @@
 
 #include <plib/sg.h>
 
-#include <simgear/timing/fg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include "star.hxx"
 #include "moon.hxx"
@@ -77,7 +77,7 @@ public:
 
     // Update (recalculate) the positions of all objects for the
     // specified time
-    void update(FGTime *t, double lat);
+    void update(SGTime *t, double lat);
 
     // sun
     inline Star *get_sun() const { return our_sun; }
diff --git a/simgear/ephemeris/jupiter.cxx b/simgear/ephemeris/jupiter.cxx
index fe490d84..820cdab1 100644
--- a/simgear/ephemeris/jupiter.cxx
+++ b/simgear/ephemeris/jupiter.cxx
@@ -31,13 +31,13 @@
 #include "jupiter.hxx"
 
 /*************************************************************************
- * Jupiter::Jupiter(FGTime *t)
+ * Jupiter::Jupiter(SGTime *t)
  * Public constructor for class Jupiter
  * Argument: The current time.
  * the hard coded orbital elements for Jupiter are passed to 
  * CelestialBody::CelestialBody();
  ************************************************************************/
-Jupiter::Jupiter(FGTime *t) :
+Jupiter::Jupiter(SGTime *t) :
   CelestialBody(100.4542,  2.7685400E-5,	
 		1.3030,   -1.557E-7,
 		273.8777,  1.6450500E-5,
@@ -58,13 +58,13 @@ Jupiter::Jupiter() :
 }
 
 /*************************************************************************
- * void Jupiter::updatePosition(FGTime *t, Star *ourSun)
+ * void Jupiter::updatePosition(SGTime *t, Star *ourSun)
  * 
  * calculates the current position of Jupiter, by calling the base class,
  * CelestialBody::updatePosition(); The current magnitude is calculated using 
  * a Jupiter specific equation
  *************************************************************************/
-void Jupiter::updatePosition(FGTime *t, Star *ourSun)
+void Jupiter::updatePosition(SGTime *t, Star *ourSun)
 {
   CelestialBody::updatePosition(t, ourSun);
   magnitude = -9.25 + 5*log10( r*R ) + 0.014 * FV;
diff --git a/simgear/ephemeris/jupiter.hxx b/simgear/ephemeris/jupiter.hxx
index ddf74ddd..b250fa7b 100644
--- a/simgear/ephemeris/jupiter.hxx
+++ b/simgear/ephemeris/jupiter.hxx
@@ -24,7 +24,7 @@
 #ifndef _JUPITER_HXX_
 #define _JUPITER_HXX_
 
-#include <simgear/timing/fg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include "celestialBody.hxx"
 #include "star.hxx"
@@ -32,9 +32,9 @@
 class Jupiter : public CelestialBody
 {
 public:
-  Jupiter (FGTime *t);
+  Jupiter (SGTime *t);
   Jupiter ();
-  void updatePosition(FGTime *t, Star *ourSun);
+  void updatePosition(SGTime *t, Star *ourSun);
 };
 
 #endif // _JUPITER_HXX_
diff --git a/simgear/ephemeris/mars.cxx b/simgear/ephemeris/mars.cxx
index 14bc9222..3cb53bce 100644
--- a/simgear/ephemeris/mars.cxx
+++ b/simgear/ephemeris/mars.cxx
@@ -30,13 +30,13 @@
 #include "mars.hxx"
 
 /*************************************************************************
- * Mars::Mars(FGTime *t)
+ * Mars::Mars(SGTime *t)
  * Public constructor for class Mars
  * Argument: The current time.
  * the hard coded orbital elements for Mars are passed to 
  * CelestialBody::CelestialBody();
  ************************************************************************/
-Mars::Mars(FGTime *t) :
+Mars::Mars(SGTime *t) :
   CelestialBody(49.55740,  2.1108100E-5,
 		1.8497,   -1.78E-8,
 		286.5016,  2.9296100E-5,
@@ -55,13 +55,13 @@ Mars::Mars() :
 {
 }
 /*************************************************************************
- * void Mars::updatePosition(FGTime *t, Star *ourSun)
+ * void Mars::updatePosition(SGTime *t, Star *ourSun)
  * 
  * calculates the current position of Mars, by calling the base class,
  * CelestialBody::updatePosition(); The current magnitude is calculated using 
  * a Mars specific equation
  *************************************************************************/
-void Mars::updatePosition(FGTime *t, Star *ourSun)
+void Mars::updatePosition(SGTime *t, Star *ourSun)
 {
   CelestialBody::updatePosition(t, ourSun);
   magnitude = -1.51 + 5*log10( r*R ) + 0.016 * FV;
diff --git a/simgear/ephemeris/mars.hxx b/simgear/ephemeris/mars.hxx
index d773e06e..1b896af4 100644
--- a/simgear/ephemeris/mars.hxx
+++ b/simgear/ephemeris/mars.hxx
@@ -24,7 +24,7 @@
 #ifndef _MARS_HXX_
 #define _MARS_HXX_
 
-#include <simgear/timing/fg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include "celestialBody.hxx"
 #include "star.hxx"
@@ -32,9 +32,9 @@
 class Mars : public CelestialBody
 {
 public:
-  Mars ( FGTime *t);
+  Mars ( SGTime *t);
   Mars ();
-  void updatePosition(FGTime *t, Star *ourSun);
+  void updatePosition(SGTime *t, Star *ourSun);
 };
 
 #endif // _MARS_HXX_
diff --git a/simgear/ephemeris/mercury.cxx b/simgear/ephemeris/mercury.cxx
index b55eb3a5..7aba2f4f 100644
--- a/simgear/ephemeris/mercury.cxx
+++ b/simgear/ephemeris/mercury.cxx
@@ -30,13 +30,13 @@
 #include "mercury.hxx"
 
 /*************************************************************************
- * Mercury::Mercury(FGTime *t)
+ * Mercury::Mercury(SGTime *t)
  * Public constructor for class Mercury
  * Argument: The current time.
  * the hard coded orbital elements for Mercury are passed to 
  * CelestialBody::CelestialBody();
  ************************************************************************/
-Mercury::Mercury(FGTime *t) :
+Mercury::Mercury(SGTime *t) :
   CelestialBody (48.33130,   3.2458700E-5,
                   7.0047,    5.00E-8,
                   29.12410,  1.0144400E-5,
@@ -55,13 +55,13 @@ Mercury::Mercury() :
 {
 }
 /*************************************************************************
- * void Mercury::updatePosition(FGTime *t, Star *ourSun)
+ * void Mercury::updatePosition(SGTime *t, Star *ourSun)
  * 
  * calculates the current position of Mercury, by calling the base class,
  * CelestialBody::updatePosition(); The current magnitude is calculated using 
  * a Mercury specific equation
  *************************************************************************/
-void Mercury::updatePosition(FGTime *t, Star *ourSun)
+void Mercury::updatePosition(SGTime *t, Star *ourSun)
 {
   CelestialBody::updatePosition(t, ourSun);
   magnitude = -0.36 + 5*log10( r*R ) + 0.027 * FV + 2.2E-13 * pow(FV, 6); 
diff --git a/simgear/ephemeris/mercury.hxx b/simgear/ephemeris/mercury.hxx
index 8f92f080..39b37d27 100644
--- a/simgear/ephemeris/mercury.hxx
+++ b/simgear/ephemeris/mercury.hxx
@@ -24,7 +24,7 @@
 #ifndef _MERCURY_HXX_
 #define _MERCURY_HXX_
 
-#include <simgear/timing/fg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include "celestialBody.hxx"
 #include "star.hxx"
@@ -32,9 +32,9 @@
 class Mercury : public CelestialBody
 {
 public:
-  Mercury ( FGTime *t);
+  Mercury ( SGTime *t);
   Mercury ();
-  void updatePosition(FGTime *t, Star* ourSun);
+  void updatePosition(SGTime *t, Star* ourSun);
 };
 
 #endif // _MERURY_HXX_
diff --git a/simgear/ephemeris/moon.cxx b/simgear/ephemeris/moon.cxx
index 79267dc3..e28b8f7a 100644
--- a/simgear/ephemeris/moon.cxx
+++ b/simgear/ephemeris/moon.cxx
@@ -39,14 +39,14 @@
 
 
 /*************************************************************************
- * Moon::Moon(FGTime *t)
+ * Moon::Moon(SGTime *t)
  * Public constructor for class Moon. Initializes the orbital elements and 
  * sets up the moon texture.
  * Argument: The current time.
  * the hard coded orbital elements for Moon are passed to 
  * CelestialBody::CelestialBody();
  ************************************************************************/
-Moon::Moon(FGTime *t) :
+Moon::Moon(SGTime *t) :
   CelestialBody(125.1228, -0.0529538083,
 		5.1454,    0.00000,
 		318.0634,  0.1643573223,
@@ -73,12 +73,12 @@ Moon::~Moon()
 
 
 /*****************************************************************************
- * void Moon::updatePosition(FGTime *t, Star *ourSun)
+ * void Moon::updatePosition(SGTime *t, Star *ourSun)
  * this member function calculates the actual topocentric position (i.e.) 
  * the position of the moon as seen from the current position on the surface
  * of the moon. 
  ****************************************************************************/
-void Moon::updatePosition(FGTime *t, double lat, Star *ourSun)
+void Moon::updatePosition(SGTime *t, double lat, Star *ourSun)
 {
   double 
     eccAnom, ecl, actTime,
diff --git a/simgear/ephemeris/moon.hxx b/simgear/ephemeris/moon.hxx
index 4f3ca4f8..4756e70a 100644
--- a/simgear/ephemeris/moon.hxx
+++ b/simgear/ephemeris/moon.hxx
@@ -26,7 +26,7 @@
 
 
 #include <simgear/constants.h>
-#include <simgear/timing/fg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include "celestialBody.hxx"
 #include "star.hxx"
@@ -49,10 +49,10 @@ private:
 
 public:
 
-    Moon( FGTime *t);
+    Moon( SGTime *t);
     Moon();
     ~Moon();
-    void updatePosition(FGTime *t, double lat, Star *ourSun);
+    void updatePosition(SGTime *t, double lat, Star *ourSun);
     // void newImage();
 };
 
diff --git a/simgear/ephemeris/neptune.cxx b/simgear/ephemeris/neptune.cxx
index 241bf651..302c5df9 100644
--- a/simgear/ephemeris/neptune.cxx
+++ b/simgear/ephemeris/neptune.cxx
@@ -30,13 +30,13 @@
 #include "neptune.hxx"
 
 /*************************************************************************
- * Neptune::Neptune(FGTime *t)
+ * Neptune::Neptune(SGTime *t)
  * Public constructor for class Neptune
  * Argument: The current time.
  * the hard coded orbital elements for Neptune are passed to 
  * CelestialBody::CelestialBody();
  ************************************************************************/
-Neptune::Neptune(FGTime *t) :
+Neptune::Neptune(SGTime *t) :
   CelestialBody(131.7806,   3.0173000E-5,
 		1.7700,	   -2.550E-7,
 		272.8461,  -6.027000E-6,	
@@ -55,13 +55,13 @@ Neptune::Neptune() :
 {
 }
 /*************************************************************************
- * void Neptune::updatePosition(FGTime *t, Star *ourSun)
+ * void Neptune::updatePosition(SGTime *t, Star *ourSun)
  * 
  * calculates the current position of Neptune, by calling the base class,
  * CelestialBody::updatePosition(); The current magnitude is calculated using 
  * a Neptune specific equation
  *************************************************************************/
-void Neptune::updatePosition(FGTime *t, Star *ourSun)
+void Neptune::updatePosition(SGTime *t, Star *ourSun)
 {
   CelestialBody::updatePosition(t, ourSun);
   magnitude = -6.90 + 5*log10 (r*R) + 0.001 *FV;
diff --git a/simgear/ephemeris/neptune.hxx b/simgear/ephemeris/neptune.hxx
index 17e6f7d1..3fe30b0e 100644
--- a/simgear/ephemeris/neptune.hxx
+++ b/simgear/ephemeris/neptune.hxx
@@ -24,7 +24,7 @@
 #ifndef _NEPTUNE_HXX_
 #define _NEPTUNE_HXX_
 
-#include <simgear/timing/fg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include "celestialBody.hxx"
 #include "star.hxx"
@@ -32,9 +32,9 @@
 class Neptune : public CelestialBody
 {
 public:
-  Neptune ( FGTime *t);
+  Neptune ( SGTime *t);
   Neptune ();
-  void updatePosition(FGTime *t, Star *ourSun);
+  void updatePosition(SGTime *t, Star *ourSun);
 };
 
 #endif // _NEPTUNE_HXX_
diff --git a/simgear/ephemeris/saturn.cxx b/simgear/ephemeris/saturn.cxx
index eb61496f..254629ec 100644
--- a/simgear/ephemeris/saturn.cxx
+++ b/simgear/ephemeris/saturn.cxx
@@ -30,13 +30,13 @@
 #include "saturn.hxx"
 
 /*************************************************************************
- * Saturn::Saturn(FGTime *t)
+ * Saturn::Saturn(SGTime *t)
  * Public constructor for class Saturn
  * Argument: The current time.
  * the hard coded orbital elements for Saturn are passed to 
  * CelestialBody::CelestialBody();
  ************************************************************************/
-Saturn::Saturn(FGTime *t) :
+Saturn::Saturn(SGTime *t) :
   CelestialBody(113.6634,   2.3898000E-5,
 		2.4886,	   -1.081E-7,
 		339.3939,   2.9766100E-5,
@@ -56,13 +56,13 @@ Saturn::Saturn() :
 }
 
 /*************************************************************************
- * void Saturn::updatePosition(FGTime *t, Star *ourSun)
+ * void Saturn::updatePosition(SGTime *t, Star *ourSun)
  * 
  * calculates the current position of Saturn, by calling the base class,
  * CelestialBody::updatePosition(); The current magnitude is calculated using 
  * a Saturn specific equation
  *************************************************************************/
-void Saturn::updatePosition(FGTime *t, Star *ourSun)
+void Saturn::updatePosition(SGTime *t, Star *ourSun)
 {
   CelestialBody::updatePosition(t, ourSun);
   
diff --git a/simgear/ephemeris/saturn.hxx b/simgear/ephemeris/saturn.hxx
index ab42adff..58c16860 100644
--- a/simgear/ephemeris/saturn.hxx
+++ b/simgear/ephemeris/saturn.hxx
@@ -24,7 +24,7 @@
 #ifndef _SATURN_HXX_
 #define _SATURN_HXX_
 
-#include <simgear/timing/fg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include "celestialBody.hxx"
 #include "star.hxx"
@@ -32,9 +32,9 @@
 class Saturn : public CelestialBody
 {
 public:
-  Saturn ( FGTime *t);
+  Saturn ( SGTime *t);
   Saturn ();
-  void updatePosition(FGTime *t, Star *ourSun);
+  void updatePosition(SGTime *t, Star *ourSun);
 };
 
 #endif // _SATURN_HXX_
diff --git a/simgear/ephemeris/star.cxx b/simgear/ephemeris/star.cxx
index 3aff95db..6eba5589 100644
--- a/simgear/ephemeris/star.cxx
+++ b/simgear/ephemeris/star.cxx
@@ -34,7 +34,7 @@
 
 
 /*************************************************************************
- * Star::Star(FGTime *t)
+ * Star::Star(SGTime *t)
  * Public constructor for class Star
  * Argument: The current time.
  * the hard coded orbital elements our sun are passed to 
@@ -42,7 +42,7 @@
  * note that the word sun is avoided, in order to prevent some compilation
  * problems on sun systems 
  ************************************************************************/
-Star::Star(FGTime *t) :
+Star::Star(SGTime *t) :
     CelestialBody (0.000000,  0.0000000000,
 		   0.0000,    0.00000,
 		   282.9404,  4.7093500E-5,	
@@ -70,11 +70,11 @@ Star::~Star()
 
 
 /*************************************************************************
- * void Star::updatePosition(FGTime *t, Star *ourSun)
+ * void Star::updatePosition(SGTime *t, Star *ourSun)
  * 
  * calculates the current position of our sun.
  *************************************************************************/
-void Star::updatePosition(FGTime *t)
+void Star::updatePosition(SGTime *t)
 {
   double 
     actTime, eccAnom, 
diff --git a/simgear/ephemeris/star.hxx b/simgear/ephemeris/star.hxx
index 5c4ffa69..5440f724 100644
--- a/simgear/ephemeris/star.hxx
+++ b/simgear/ephemeris/star.hxx
@@ -25,7 +25,6 @@
 #define _STAR_HXX_
 
 
-// #include <Time/fg_time.hxx>
 #include "celestialBody.hxx"
 
 
@@ -39,10 +38,10 @@ private:
 
 public:
 
-    Star (FGTime *t);
+    Star (SGTime *t);
     Star ();
     ~Star();
-    void updatePosition(FGTime *t);
+    void updatePosition(SGTime *t);
     double getM();
     double getw();
     double getxs();
diff --git a/simgear/ephemeris/uranus.cxx b/simgear/ephemeris/uranus.cxx
index eb4581ce..35c65e96 100644
--- a/simgear/ephemeris/uranus.cxx
+++ b/simgear/ephemeris/uranus.cxx
@@ -30,13 +30,13 @@
 #include "uranus.hxx"
 
 /*************************************************************************
- * Uranus::Uranus(FGTime *t)
+ * Uranus::Uranus(SGTime *t)
  * Public constructor for class Uranus
  * Argument: The current time.
  * the hard coded orbital elements for Uranus are passed to 
  * CelestialBody::CelestialBody();
  ************************************************************************/
-Uranus::Uranus(FGTime *t) :
+Uranus::Uranus(SGTime *t) :
   CelestialBody(74.00050,   1.3978000E-5,
 		0.7733,     1.900E-8,
 		96.66120,   3.0565000E-5,
@@ -56,13 +56,13 @@ Uranus::Uranus() :
 }
 
 /*************************************************************************
- * void Uranus::updatePosition(FGTime *t, Star *ourSun)
+ * void Uranus::updatePosition(SGTime *t, Star *ourSun)
  * 
  * calculates the current position of Uranus, by calling the base class,
  * CelestialBody::updatePosition(); The current magnitude is calculated using 
  * a Uranus specific equation
  *************************************************************************/
-void Uranus::updatePosition(FGTime *t, Star *ourSun)
+void Uranus::updatePosition(SGTime *t, Star *ourSun)
 {
   CelestialBody::updatePosition(t, ourSun);
   magnitude = -7.15 + 5*log10( r*R) + 0.001 * FV;
diff --git a/simgear/ephemeris/uranus.hxx b/simgear/ephemeris/uranus.hxx
index c5cf448e..2d414511 100644
--- a/simgear/ephemeris/uranus.hxx
+++ b/simgear/ephemeris/uranus.hxx
@@ -24,7 +24,7 @@
 #ifndef _URANUS_HXX_
 #define _URANUS_HXX_
 
-#include <simgear/timing/fg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include "celestialBody.hxx"
 #include "star.hxx"
@@ -32,9 +32,9 @@
 class Uranus : public CelestialBody
 {
 public:
-  Uranus ( FGTime *t);
+  Uranus ( SGTime *t);
   Uranus ();
-  void updatePosition(FGTime *t, Star *ourSun);
+  void updatePosition(SGTime *t, Star *ourSun);
 };
 
 #endif // _URANUS_HXX_
diff --git a/simgear/ephemeris/venus.cxx b/simgear/ephemeris/venus.cxx
index 89e8737e..c2bfb8d9 100644
--- a/simgear/ephemeris/venus.cxx
+++ b/simgear/ephemeris/venus.cxx
@@ -30,13 +30,13 @@
 #include "venus.hxx"
 
 /*************************************************************************
- * Venus::Venus(FGTime *t)
+ * Venus::Venus(SGTime *t)
  * Public constructor for class Venus
  * Argument: The current time.
  * the hard coded orbital elements for Venus are passed to 
  * CelestialBody::CelestialBody();
  ************************************************************************/
-Venus::Venus(FGTime *t) :
+Venus::Venus(SGTime *t) :
   CelestialBody(76.67990,  2.4659000E-5, 
 		3.3946,    2.75E-8,
 		54.89100,  1.3837400E-5,
@@ -56,13 +56,13 @@ Venus::Venus() :
 }
 
 /*************************************************************************
- * void Venus::updatePosition(FGTime *t, Star *ourSun)
+ * void Venus::updatePosition(SGTime *t, Star *ourSun)
  * 
  * calculates the current position of Venus, by calling the base class,
  * CelestialBody::updatePosition(); The current magnitude is calculated using 
  * a Venus specific equation
  *************************************************************************/
-void Venus::updatePosition(FGTime *t, Star *ourSun)
+void Venus::updatePosition(SGTime *t, Star *ourSun)
 {
   CelestialBody::updatePosition(t, ourSun);
   magnitude = -4.34 + 5*log10( r*R ) + 0.013 * FV + 4.2E-07 * pow(FV,3);
diff --git a/simgear/ephemeris/venus.hxx b/simgear/ephemeris/venus.hxx
index aa2935b4..1c0b727d 100644
--- a/simgear/ephemeris/venus.hxx
+++ b/simgear/ephemeris/venus.hxx
@@ -24,7 +24,7 @@
 #ifndef _VENUS_HXX_
 #define _VENUS_HXX_
 
-#include <simgear/timing/fg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
 
 #include "celestialBody.hxx"
 #include "star.hxx"
@@ -32,9 +32,9 @@
 class Venus : public CelestialBody
 {
 public:
-  Venus ( FGTime *t);
+  Venus ( SGTime *t);
   Venus ();
-  void updatePosition(FGTime *t, Star *ourSun);
+  void updatePosition(SGTime *t, Star *ourSun);
 };
 
 #endif // _VENUS_HXX_
diff --git a/simgear/timing/Makefile.am b/simgear/timing/Makefile.am
index 16f6416d..f2521b17 100644
--- a/simgear/timing/Makefile.am
+++ b/simgear/timing/Makefile.am
@@ -3,14 +3,14 @@ includedir = @includedir@/timing
 lib_LIBRARIES = libsgtiming.a
 
 include_HEADERS = \
-	fg_time.hxx \
 	geocoord.h \
+	sg_time.hxx \
 	timezone.h
 
 libsgtiming_a_SOURCES = \
-	fg_time.cxx \
 	geocoord.cxx \
 	lowleveltime.cxx lowleveltime.h \
+	sg_time.cxx \
 	timezone.cxx \
 	# event.cxx event.hxx \
 	# fg_timer.cxx fg_timer.hxx \
diff --git a/simgear/timing/fg_time.cxx b/simgear/timing/fg_time.cxx
deleted file mode 100644
index d5263dc4..00000000
--- a/simgear/timing/fg_time.cxx
+++ /dev/null
@@ -1,544 +0,0 @@
-// fg_time.cxx -- data structures and routines for managing time related stuff.
-//
-// Written by Curtis Olson, started August 1997.
-//
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-// $Id$
-
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <simgear/compiler.h>
-
-#ifdef FG_HAVE_STD_INCLUDES
-#  include <cmath>
-#  include <cstdio>
-#  include <cstdlib>
-#  include <ctime>
-#else
-#  include <math.h>
-#  include <stdio.h>
-#  include <stdlib.h>
-#  include <time.h>
-#endif
-
-#ifdef HAVE_SYS_TIMEB_H
-#  include <sys/timeb.h> // for ftime() and struct timeb
-#endif
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>    // for gettimeofday()
-#endif
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>  // for get/setitimer, gettimeofday, struct timeval
-#endif
-
-#include <simgear/constants.h>
-#include <simgear/debug/logstream.hxx>
-// #include <simgear/magvar/magvar.hxx>
-#include <simgear/misc/fgpath.hxx>
-
-// #include <FDM/flight.hxx>
-// #include <Main/options.hxx>
-// #include <Time/light.hxx>
-
-#include "fg_time.hxx"
-#include "timezone.h"
-#include "lowleveltime.h"
-// #include "moonpos.hxx"
-// #include "sunpos.hxx"
-
-
-#define DEGHR(x)        ((x)/15.)
-#define RADHR(x)        DEGHR(x*RAD_TO_DEG)
-
-
-// #define MK_TIME_IS_GMT 0         // default value
-// #define TIME_ZONE_OFFSET_WORK 0  // default value
-
-
-FGTime::FGTime( const string& root )
-{
-    if (cur_time_params) {
-	FG_LOG( FG_GENERAL, FG_ALERT, 
-		"Error: only one instance of FGTime allowed" );
-	exit(-1);
-    }
-
-    cur_time_params = this;
-
-    FGPath zone( root );
-    zone.append( "Timezone" );
-    zone.append( "zone.tab" );
-
-    FG_LOG( FG_EVENT, FG_INFO, "Reading timezone info from: " << zone.str() );
-    tzContainer = new TimezoneContainer( zone.c_str() );
-    warp=0;
-    warp_delta=0;
-}
-
-
-FGTime::~FGTime()
-{
-    delete tzContainer;
-    delete zonename;
-}
-
-void FGTime::updateLocal( double lon, double lat, const string& root )
-{
-  time_t currGMT;
-  time_t aircraftLocalTime;
-  GeoCoord location( RAD_TO_DEG * lat, RAD_TO_DEG * lon );
-  GeoCoord* nearestTz = tzContainer->getNearest(location);
-  FGPath zone( root );
-  zone.append ("Timezone" );
-  zone.append ( nearestTz->getDescription() );
-  if ( zonename ) {
-      delete zonename;
-  }
-  zonename = strdup( zone.c_str() );
-  currGMT = get_gmt( gmtime(&cur_time) );
-  aircraftLocalTime = get_gmt( (fgLocaltime(&cur_time, zone.c_str())) );
-  localOffset = aircraftLocalTime - currGMT;
-  // cerr << "Using " << localOffset << " as local time offset Timezone is " 
-  //      << zonename << endl;
-}
-
-// Initialize the time dependent variables (maybe I'll put this in the
-// constructor later)
-void FGTime::init( double lon, double lat, const string& root, 
-		   time_t timeOffset, sgTimingOffsetType offsetType )
-{
-    FG_LOG( FG_EVENT, FG_INFO, "Initializing Time" );
-    gst_diff = -9999.0;
-    FG_LOG( FG_EVENT, FG_DEBUG, 
-	    "time offset = " << timeOffset );
-    // time_t timeOffset = current_options.get_time_offset();
-    // int offsetType = current_options.get_time_offset_type();
-
-    time_t currGMT;
-    time_t systemLocalTime;
-    time_t aircraftLocalTime;
-
-    // would it be better to put these sanity checks in the options
-    // parsing code? (CLO)
-
-    cur_time = time(NULL); 
-
-    // printf ("Current greenwich mean time = %24s", asctime(gmtime(&cur_time)));
-    // printf ("Current local time          = %24s", asctime(localtime(&cur_time)));
-    // time_t tmp = cur_time;
-    GeoCoord location( RAD_TO_DEG * lat, RAD_TO_DEG * lon );
-
-    GeoCoord* nearestTz = tzContainer->getNearest(location);
-
-    FGPath zone( root );
-    zone.append( "Timezone" );
-    zone.append( nearestTz->getDescription() );
-
-    // printf("Using %s for timezone information\n", buffer);
-    zonename = strdup( zone.c_str() );
-    //show( buffer.c_str(), cur_time, 1); 
-    //printf ("Current greenwich mean time = %24s", asctime(gmtime(&cur_time)));
-    //printf ("Current local time          = %24s", asctime(localtime(&cur_time)));
-    currGMT = get_gmt( gmtime(&cur_time) );
-    systemLocalTime = get_gmt( localtime(&cur_time) );
-    aircraftLocalTime = get_gmt( fgLocaltime(&cur_time, zone.c_str()) ); 
-    //printf ("Current greenwich mean time = %24s", asctime(gmtime(&cur_time)));
-    //printf ("Current local time          = %24s", asctime(localtime(&cur_time)));
-
-    //printf("LT  = %d\n", computerLocalTime);
-    // Okay, in principle, this trick allows to calculate the
-    // difference between GMT and localtime, in seconds.
-    // printf("Gmt = %d, SLT = %d, (difference = %d)\n", currGMT, systemLocalTime,   (currGMT - systemLocalTime));
-    // printf("Gmt = %d, ALT = %d, (difference = %d)\n", currGMT, aircraftLocalTime, (currGMT - aircraftLocalTime));
-    // exit(1);
-    // Okay, we now have six possible scenarios
-    switch (offsetType)
-	{
-	case SG_TIME_SYS_OFFSET:
-	    warp = timeOffset;
-	    break;
-	case SG_TIME_GMT_OFFSET:
-	    warp = timeOffset - (currGMT - systemLocalTime);
-	    break;
-	case SG_TIME_LAT_OFFSET:
-	    // warp = timeOffset - (currGMT - systemLocalTime + 
-	    //        (currGMT - aircraftLocalTime));
-	    warp = timeOffset - (aircraftLocalTime - systemLocalTime); 
-	    break;
-	case SG_TIME_SYS_ABSOLUTE:
-	    warp = timeOffset - cur_time;
-	    //printf("warp = %d\n", warp); 
-	    break;
-	case SG_TIME_GMT_ABSOLUTE:
-	    warp = timeOffset - currGMT;
-	    break;
-	case SG_TIME_LAT_ABSOLUTE:
-	    warp = timeOffset - (aircraftLocalTime - systemLocalTime) - 
-		cur_time; 
-	    break;
-	default:
-	    printf("Unsupported type\n");
-	    exit(1);
-	}
-
-    warp_delta = 0;
-    // pause = current_options.get_pause();
-}
-
-
-// given a date in months, mn, days, dy, years, yr, return the
-// modified Julian date (number of days elapsed since 1900 jan 0.5),
-// mjd.  Adapted from Xephem.
-
-void FGTime::cal_mjd (int mn, double dy, int yr) 
-{
-    //static double last_mjd, last_dy;
-    //double mjd;
-    //static int last_mn, last_yr;
-    int b, d, m, y;
-    long c;
-  
-    if (mn == last_mn && yr == last_yr && dy == last_dy) {
-	mjd = last_mjd;
-	//return(mjd);
-    }
-  
-    m = mn;
-    y = (yr < 0) ? yr + 1 : yr;
-    if (mn < 3) {
-	m += 12;
-	y -= 1;
-    }
-  
-    if (yr < 1582 || (yr == 1582 && (mn < 10 || (mn == 10 && dy < 15)))) {
-	b = 0;
-    } else {
-	int a;
-	a = y/100;
-	b = 2 - a + a/4;
-    }
-  
-    if (y < 0) {
-	c = (long)((365.25*y) - 0.75) - 694025L;
-    } else {
-	c = (long)(365.25*y) - 694025L;
-    }
-  
-    d = (int)(30.6001*(m+1));
-  
-    mjd = b + c + d + dy - 0.5;
-  
-    last_mn = mn;
-    last_dy = dy;
-    last_yr = yr;
-    last_mjd = mjd;
-  
-    //return(mjd);
-}
-
-
-// given an mjd, calculate greenwich mean sidereal time, gst
-void FGTime::utc_gst () 
-{
-    double day = floor(mjd-0.5)+0.5;
-    double hr = (mjd-day)*24.0;
-    double T, x;
-
-    T = ((int)(mjd - 0.5) + 0.5 - J2000)/36525.0;
-    x = 24110.54841 + (8640184.812866 + (0.093104 - 6.2e-6 * T) * T) * T;
-    x /= 3600.0;
-    gst = (1.0/SIDRATE)*hr + x;
-
-    FG_LOG( FG_EVENT, FG_DEBUG, "  gst => " << gst );
-}
-
-
-// given Julian Date and Longitude (decimal degrees West) compute
-// Local Sidereal Time, in decimal hours.
-//
-// Provided courtesy of ecdowney@noao.edu (Elwood Downey) 
-
-double FGTime::sidereal_precise (double lng) 
-{
-    double lstTmp;
-
-    /* printf ("Current Lst on JD %13.5f at %8.4f degrees West: ", 
-       mjd + MJD0, lng); */
-
-    // convert to required internal units
-    lng *= DEG_TO_RAD;
-
-    // compute LST and print
-    utc_gst();
-    lstTmp = gst - RADHR (lng);
-    lstTmp -= 24.0*floor(lstTmp/24.0);
-    // printf ("%7.4f\n", lstTmp);
-
-    // that's all
-    return (lstTmp);
-}
-
-
-// return a courser but cheaper estimate of sidereal time
-double FGTime::sidereal_course(double lng) 
-{
-    //struct tm *gmt;
-    //double lstTmp;
-    time_t start_gmt, now;
-    double diff, part, days, hours, lstTmp;
-    char tbuf[64];
-  
-    //gmt = t->gmt;
-    //now = t->cur_time;
-    now = cur_time;
-    start_gmt = get_gmt(gmt->tm_year, 2, 21, 12, 0, 0);
-  
-    FG_LOG( FG_EVENT, FG_DEBUG, "  COURSE: GMT = " << format_time(gmt, tbuf) );
-    FG_LOG( FG_EVENT, FG_DEBUG, "  March 21 noon (GMT) = " << start_gmt );
-  
-    diff = (now - start_gmt) / (3600.0 * 24.0);
-  
-    FG_LOG( FG_EVENT, FG_DEBUG, 
-	    "  Time since 3/21/" << gmt->tm_year << " GMT = " << diff );
-  
-    part = fmod(diff, 1.0);
-    days = diff - part;
-    hours = gmt->tm_hour + gmt->tm_min/60.0 + gmt->tm_sec/3600.0;
-  
-    lstTmp = (days - lng)/15.0 + hours - 12;
-  
-    while ( lstTmp < 0.0 ) {
-	lstTmp += 24.0;
-    }
-  
-    FG_LOG( FG_EVENT, FG_DEBUG,
-	    "  days = " << days << "  hours = " << hours << "  lon = " 
-	    << lng << "  lst = " << lstTmp );
-  
-    return(lstTmp);
-}
-
-
-// Update time variables such as gmt, julian date, and sidereal time
-void FGTime::update( double lon, double lat, double alt_m ) {
-    double gst_precise, gst_course;
-
-    FG_LOG( FG_EVENT, FG_DEBUG, "Updating time" );
-
-    // get current Unix calendar time (in seconds)
-    warp += warp_delta;
-    cur_time = time(NULL) + warp;
-    FG_LOG( FG_EVENT, FG_DEBUG, 
-	    "  Current Unix calendar time = " << cur_time 
-	    << "  warp = " << warp << "  delta = " << warp_delta );
-
-#if 0
-    if ( warp_delta ) {
-	// time is changing so force an update
-	local_update_sky_and_lighting_params();
-    }
-#endif
-
-    // get GMT break down for current time
-    gmt = gmtime(&cur_time);
-    FG_LOG( FG_EVENT, FG_DEBUG, 
-	    "  Current GMT = " << gmt->tm_mon+1 << "/" 
-	    << gmt->tm_mday << "/" << gmt->tm_year << " "
-	    << gmt->tm_hour << ":" << gmt->tm_min << ":" 
-	    << gmt->tm_sec );
-
-    // calculate modified Julian date
-    // t->mjd = cal_mjd ((int)(t->gmt->tm_mon+1), (double)t->gmt->tm_mday, 
-    //     (int)(t->gmt->tm_year + 1900));
-    cal_mjd ((int)(gmt->tm_mon+1), (double)gmt->tm_mday, 
-	     (int)(gmt->tm_year + 1900));
-
-    // add in partial day
-    mjd += (gmt->tm_hour / 24.0) + (gmt->tm_min / (24.0 * 60.0)) +
-	(gmt->tm_sec / (24.0 * 60.0 * 60.0));
-
-    // convert "back" to Julian date + partial day (as a fraction of one)
-    jd = mjd + MJD0;
-    FG_LOG( FG_EVENT, FG_DEBUG, "  Current Julian Date = " << jd );
-
-    // printf("  Current Longitude = %.3f\n", FG_Longitude * RAD_TO_DEG);
-
-    // Calculate local side real time
-    if ( gst_diff < -100.0 ) {
-	// first time through do the expensive calculation & cheap
-        // calculation to get the difference.
-	FG_LOG( FG_EVENT, FG_INFO, "  First time, doing precise gst" );
-	gst_precise = gst = sidereal_precise(0.00);
-	gst_course = sidereal_course(0.00);
-      
-	gst_diff = gst_precise - gst_course;
-
-	lst = sidereal_course(-(lon * RAD_TO_DEG)) + gst_diff;
-    } else {
-	// course + difference should drift off very slowly
-	gst = sidereal_course( 0.00 ) + gst_diff;
-	lst = sidereal_course( -(lon * RAD_TO_DEG)) + gst_diff;
-    }
-
-    FG_LOG( FG_EVENT, FG_DEBUG,
-	    "  Current lon=0.00 Sidereal Time = " << gst );
-    FG_LOG( FG_EVENT, FG_DEBUG,
-	    "  Current LOCAL Sidereal Time = " << lst << " (" 
-	    << sidereal_precise(-(lon * RAD_TO_DEG)) 
-	    << ") (diff = " << gst_diff << ")" );
-}
-
-
-/******************************************************************
- * The following are some functions that were included as FGTime
- * members, although they currently don't make use of any of the
- * class's variables. Maybe this'll change in the future
- *****************************************************************/
-
-// Return time_t for Sat Mar 21 12:00:00 GMT
-//
-// On many systems it is ambiguous if mktime() assumes the input is in
-// GMT, or local timezone.  To address this, a new function called
-// timegm() is appearing.  It works exactly like mktime() but
-// explicitely interprets the input as GMT.
-//
-// timegm() is available and documented under FreeBSD.  It is
-// available, but completely undocumented on my current Debian 2.1
-// distribution.
-//
-// In the absence of timegm() we have to guess what mktime() might do.
-//
-// Many older BSD style systems have a mktime() that assumes the input
-// time in GMT.  But FreeBSD explicitly states that mktime() assumes
-// local time zone
-//
-// The mktime() on many SYSV style systems (such as Linux) usually
-// returns its result assuming you have specified the input time in
-// your local timezone.  Therefore, in the absence if timegm() you
-// have to go to extra trouble to convert back to GMT.
-//
-// If you are having problems with incorrectly positioned astronomical
-// bodies, this is a really good place to start looking.
-
-time_t FGTime::get_gmt(int year, int month, int day, int hour, int min, int sec)
-{
-    struct tm mt;
-
-    mt.tm_mon = month;
-    mt.tm_mday = day;
-    mt.tm_year = year;
-    mt.tm_hour = hour;
-    mt.tm_min = min;
-    mt.tm_sec = sec;
-    mt.tm_isdst = -1; // let the system determine the proper time zone
-
-    // For now we assume that if daylight is not defined in
-    // /usr/include/time.h that we have a machine with a mktime() that
-    // assumes input is in GMT ... this only matters if we are
-    // building on a system that does not have timegm()
-#if !defined(HAVE_DAYLIGHT)
-#  define MK_TIME_IS_GMT 1
-#endif
-
-#if defined( HAVE_TIMEGM ) 
-    return ( timegm(&mt) );
-#elif defined( MK_TIME_IS_GMT )
-    return ( mktime(&mt) );
-#else // ! defined ( MK_TIME_IS_GMT )
-
-    // timezone seems to work as a proper offset for Linux & Solaris
-#   if defined( __linux__ ) || defined( __sun__ ) 
-#       define TIMEZONE_OFFSET_WORKS 1
-#   endif
-
-    long int start = mktime(&mt);
-
-    FG_LOG( FG_EVENT, FG_DEBUG, "start1 = " << start );
-    // the ctime() call can screw up time progression on some versions
-    // of Linux
-    // fgPrintf( FG_EVENT, FG_DEBUG, "start2 = %s", ctime(&start));
-    FG_LOG( FG_EVENT, FG_DEBUG, "(tm_isdst = " << mt.tm_isdst << ")" );
-
-    timezone = fix_up_timezone( timezone );
-
-#  if defined( TIMEZONE_OFFSET_WORKS )
-    FG_LOG( FG_EVENT, FG_DEBUG, 
-	    "start = " << start << ", timezone = " << timezone );
-    return( start - timezone );
-#  else // ! defined( TIMEZONE_OFFSET_WORKS )
-
-    daylight = mt.tm_isdst;
-    if ( daylight > 0 ) {
-	daylight = 1;
-    } else if ( daylight < 0 ) {
-	FG_LOG( FG_EVENT, FG_WARN, 
-		"OOOPS, problem in fg_time.cxx, no daylight savings info." );
-    }
-
-    long int offset = -(timezone / 3600 - daylight);
-
-    FG_LOG( FG_EVENT, FG_DEBUG, "  Raw time zone offset = " << timezone );
-    FG_LOG( FG_EVENT, FG_DEBUG, "  Daylight Savings = " << daylight );
-    FG_LOG( FG_EVENT, FG_DEBUG, "  Local hours from GMT = " << offset );
-    
-    long int start_gmt = start - timezone + (daylight * 3600);
-    
-    FG_LOG( FG_EVENT, FG_DEBUG, "  March 21 noon (CST) = " << start );
-
-    return ( start_gmt );
-#  endif // ! defined( TIMEZONE_OFFSET_WORKS )
-#endif // ! defined ( MK_TIME_IS_GMT )
-}
-
-// Fix up timezone if using ftime()
-long int FGTime::fix_up_timezone( long int timezone_orig ) 
-{
-#if !defined( HAVE_GETTIMEOFDAY ) && defined( HAVE_FTIME )
-    // ftime() needs a little extra help finding the current timezone
-    struct timeb current;
-    ftime(&current);
-    return( current.timezone * 60 );
-#else
-    return( timezone_orig );
-#endif
-}
-
-
-char* FGTime::format_time( const struct tm* p, char* buf )
-{
-    sprintf( buf, "%d/%d/%2d %d:%02d:%02d", 
-	     p->tm_mon, p->tm_mday, p->tm_year,
-	     p->tm_hour, p->tm_min, p->tm_sec);
-    return buf;
-}
-
-
-#if 0
-// Force an update of the sky and lighting parameters
-void FGTime::local_update_sky_and_lighting_params( void ) {
-    fgUpdateSunPos();
-    fgUpdateMoonPos();
-    cur_light_params.Update();
-}
-#endif
-
-
-FGTime* FGTime::cur_time_params = 0;
diff --git a/simgear/timing/fg_time.hxx b/simgear/timing/fg_time.hxx
deleted file mode 100644
index a29a53c4..00000000
--- a/simgear/timing/fg_time.hxx
+++ /dev/null
@@ -1,169 +0,0 @@
-// fg_time.hxx -- data structures and routines for managing time related stuff.
-//
-// Written by Curtis Olson, started August 1997.
-//
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-// $Id$
-
-
-#ifndef _FG_TIME_HXX
-#define _FG_TIME_HXX
-
-
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
-#endif
-
-#include <GL/glut.h>
-
-#include <simgear/compiler.h>
-
-#ifdef FG_HAVE_STD_INCLUDES
-#  include <ctime>
-#else
-#  include <time.h>
-#endif
-
-// #include <FDM/flight.hxx>
-
-#include "timezone.h"
-// #include "lowleveltime.h"
-
-
-enum sgTimingOffsetType {
-    SG_TIME_SYS_OFFSET   = 0,
-    SG_TIME_GMT_OFFSET   = 1,
-    SG_TIME_LAT_OFFSET   = 2,
-    SG_TIME_SYS_ABSOLUTE = 3,
-    SG_TIME_GMT_ABSOLUTE = 4,
-    SG_TIME_LAT_ABSOLUTE = 5
-};
-
-
-// Define a structure containing time parameters
-class FGTime {
-
-private:
-    // tzContainer stores all the current Timezone control points/
-    TimezoneContainer* tzContainer;
-
-    //Store the current local timezone name;
-    char *zonename;
-
-    // Unix "calendar" time in seconds
-    time_t cur_time;
-
-    // Break down of GMT time
-    struct tm *gmt;
-
-    // Julian date
-    double jd;
-
-    // modified Julian date
-    double mjd;
-
-    double last_mjd, last_dy;
-    int last_mn, last_yr;
-
-    // side real time at prime meridian
-    double gst;
-
-    // local sidereal time
-    double lst;
-
-    // local offset to GMT
-    time_t localOffset;
-
-    // the difference between the precise sidereal time algorithm
-    // result and the course result.  course + diff has good accuracy
-    // for the short term
-    double gst_diff;
-
-    // An offset in seconds from the true time.  Allows us to adjust
-    // the effective time of day.
-    long int warp;
-
-    // How much to change the value of warp each iteration.  Allows us
-    // to make time progress faster than normal.
-    long int warp_delta;
-
-public:
-
-    FGTime( const string& root );
-    ~FGTime();
-
-    inline double getJD() const { return jd; };
-    inline double getMjd() const { return mjd; };
-    inline double getLst() const { return lst; };
-    inline double getGst() const { return gst; };
-    inline time_t get_cur_time() const { return cur_time; };
-    inline struct tm* getGmt()const { return gmt; };
-  
-    void adjust_warp(int val) { warp += val; };
-    void adjust_warp_delta(int val) { warp_delta += val; };
-
-    // Initialize the time dependent variables
-    void init( double lon, double lat, const string& root, 
-	       time_t timeOffset, sgTimingOffsetType offsetType );
-
-    // Update the time dependent variables
-    void update( double lon, double lat, double alt_m );
-    void updateLocal( double lon, double lat, const string& root );
-
-    void cal_mjd (int mn, double dy, int yr);
-    void utc_gst(); 
-    double sidereal_precise (double lng);
-    double sidereal_course(double lng); 
-    static FGTime *cur_time_params;
-
-    // Some other stuff which were changed to FGTime members on
-    // questionable grounds -:)
-    // time_t get_start_gmt(int year);
-    time_t get_gmt(int year, int month, int day, 
-		   int hour, int minute, int second);
-    time_t get_gmt(struct tm* the_time);
-  
-    char* format_time( const struct tm* p, char* buf );
-    long int fix_up_timezone( long int timezone_orig );
-
-    inline int get_warp_delta() const { return warp_delta; }
-};
-
-
-inline time_t FGTime::get_gmt(struct tm* the_time) // this is just a wrapper
-{
-  //printf("Using: %24s as input\n", asctime(the_time));
-  return get_gmt(the_time->tm_year,
-	  the_time->tm_mon,
-	  the_time->tm_mday,
-	  the_time->tm_hour,
-	  the_time->tm_min,
-	  the_time->tm_sec);
-}
-
-
-#endif // _FG_TIME_HXX
diff --git a/simgear/timing/sg_time.cxx b/simgear/timing/sg_time.cxx
new file mode 100644
index 00000000..29750535
--- /dev/null
+++ b/simgear/timing/sg_time.cxx
@@ -0,0 +1,534 @@
+// sg_time.cxx -- data structures and routines for managing time related stuff.
+//
+// Written by Curtis Olson, started August 1997.
+//
+// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// $Id$
+
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <simgear/compiler.h>
+
+#ifdef FG_HAVE_STD_INCLUDES
+#  include <cmath>
+#  include <cstdio>
+#  include <cstdlib>
+#  include <ctime>
+#else
+#  include <math.h>
+#  include <stdio.h>
+#  include <stdlib.h>
+#  include <time.h>
+#endif
+
+#ifdef HAVE_SYS_TIMEB_H
+#  include <sys/timeb.h> // for ftime() and struct timeb
+#endif
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>    // for gettimeofday()
+#endif
+#ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>  // for get/setitimer, gettimeofday, struct timeval
+#endif
+
+#include <simgear/constants.h>
+#include <simgear/debug/logstream.hxx>
+// #include <simgear/magvar/magvar.hxx>
+#include <simgear/misc/fgpath.hxx>
+
+// #include <FDM/flight.hxx>
+// #include <Main/options.hxx>
+// #include <Time/light.hxx>
+
+#include "sg_time.hxx"
+#include "timezone.h"
+#include "lowleveltime.h"
+// #include "moonpos.hxx"
+// #include "sunpos.hxx"
+
+
+#define DEGHR(x)        ((x)/15.)
+#define RADHR(x)        DEGHR(x*RAD_TO_DEG)
+
+
+// #define MK_TIME_IS_GMT 0         // default value
+// #define TIME_ZONE_OFFSET_WORK 0  // default value
+
+
+SGTime::SGTime( const string& root )
+{
+    if (cur_time_params) {
+	FG_LOG( FG_GENERAL, FG_ALERT, 
+		"Error: only one instance of SGTime allowed" );
+	exit(-1);
+    }
+
+    cur_time_params = this;
+
+    FGPath zone( root );
+    zone.append( "Timezone" );
+    zone.append( "zone.tab" );
+
+    FG_LOG( FG_EVENT, FG_INFO, "Reading timezone info from: " << zone.str() );
+    tzContainer = new TimezoneContainer( zone.c_str() );
+    warp=0;
+    warp_delta=0;
+}
+
+
+SGTime::~SGTime()
+{
+    delete tzContainer;
+    delete zonename;
+}
+
+void SGTime::updateLocal( double lon, double lat, const string& root )
+{
+  time_t currGMT;
+  time_t aircraftLocalTime;
+  GeoCoord location( RAD_TO_DEG * lat, RAD_TO_DEG * lon );
+  GeoCoord* nearestTz = tzContainer->getNearest(location);
+  FGPath zone( root );
+  zone.append ("Timezone" );
+  zone.append ( nearestTz->getDescription() );
+  if ( zonename ) {
+      delete zonename;
+  }
+  zonename = strdup( zone.c_str() );
+  currGMT = get_gmt( gmtime(&cur_time) );
+  aircraftLocalTime = get_gmt( (fgLocaltime(&cur_time, zone.c_str())) );
+  localOffset = aircraftLocalTime - currGMT;
+  // cerr << "Using " << localOffset << " as local time offset Timezone is " 
+  //      << zonename << endl;
+}
+
+// Initialize the time dependent variables (maybe I'll put this in the
+// constructor later)
+void SGTime::init( double lon, double lat, const string& root, 
+		   time_t timeOffset, sgTimingOffsetType offsetType )
+{
+    FG_LOG( FG_EVENT, FG_INFO, "Initializing Time" );
+    gst_diff = -9999.0;
+    FG_LOG( FG_EVENT, FG_DEBUG, 
+	    "time offset = " << timeOffset );
+    // time_t timeOffset = current_options.get_time_offset();
+    // int offsetType = current_options.get_time_offset_type();
+
+    time_t currGMT;
+    time_t systemLocalTime;
+    time_t aircraftLocalTime;
+
+    // would it be better to put these sanity checks in the options
+    // parsing code? (CLO)
+
+    cur_time = time(NULL); 
+
+    // printf ("Current greenwich mean time = %24s", asctime(gmtime(&cur_time)));
+    // printf ("Current local time          = %24s", asctime(localtime(&cur_time)));
+    // time_t tmp = cur_time;
+    GeoCoord location( RAD_TO_DEG * lat, RAD_TO_DEG * lon );
+
+    GeoCoord* nearestTz = tzContainer->getNearest(location);
+
+    FGPath zone( root );
+    zone.append( "Timezone" );
+    zone.append( nearestTz->getDescription() );
+
+    // printf("Using %s for timezone information\n", buffer);
+    zonename = strdup( zone.c_str() );
+    //show( buffer.c_str(), cur_time, 1); 
+    //printf ("Current greenwich mean time = %24s", asctime(gmtime(&cur_time)));
+    //printf ("Current local time          = %24s", asctime(localtime(&cur_time)));
+    currGMT = get_gmt( gmtime(&cur_time) );
+    systemLocalTime = get_gmt( localtime(&cur_time) );
+    aircraftLocalTime = get_gmt( fgLocaltime(&cur_time, zone.c_str()) ); 
+    //printf ("Current greenwich mean time = %24s", asctime(gmtime(&cur_time)));
+    //printf ("Current local time          = %24s", asctime(localtime(&cur_time)));
+
+    //printf("LT  = %d\n", computerLocalTime);
+    // Okay, in principle, this trick allows to calculate the
+    // difference between GMT and localtime, in seconds.
+    // printf("Gmt = %d, SLT = %d, (difference = %d)\n", currGMT, systemLocalTime,   (currGMT - systemLocalTime));
+    // printf("Gmt = %d, ALT = %d, (difference = %d)\n", currGMT, aircraftLocalTime, (currGMT - aircraftLocalTime));
+    // exit(1);
+    // Okay, we now have six possible scenarios
+    switch (offsetType)
+	{
+	case SG_TIME_SYS_OFFSET:
+	    warp = timeOffset;
+	    break;
+	case SG_TIME_GMT_OFFSET:
+	    warp = timeOffset - (currGMT - systemLocalTime);
+	    break;
+	case SG_TIME_LAT_OFFSET:
+	    // warp = timeOffset - (currGMT - systemLocalTime + 
+	    //        (currGMT - aircraftLocalTime));
+	    warp = timeOffset - (aircraftLocalTime - systemLocalTime); 
+	    break;
+	case SG_TIME_SYS_ABSOLUTE:
+	    warp = timeOffset - cur_time;
+	    //printf("warp = %d\n", warp); 
+	    break;
+	case SG_TIME_GMT_ABSOLUTE:
+	    warp = timeOffset - currGMT;
+	    break;
+	case SG_TIME_LAT_ABSOLUTE:
+	    warp = timeOffset - (aircraftLocalTime - systemLocalTime) - 
+		cur_time; 
+	    break;
+	default:
+	    printf("Unsupported type\n");
+	    exit(1);
+	}
+
+    warp_delta = 0;
+    // pause = current_options.get_pause();
+}
+
+
+// given a date in months, mn, days, dy, years, yr, return the
+// modified Julian date (number of days elapsed since 1900 jan 0.5),
+// mjd.  Adapted from Xephem.
+
+void SGTime::cal_mjd (int mn, double dy, int yr) 
+{
+    //static double last_mjd, last_dy;
+    //double mjd;
+    //static int last_mn, last_yr;
+    int b, d, m, y;
+    long c;
+  
+    if (mn == last_mn && yr == last_yr && dy == last_dy) {
+	mjd = last_mjd;
+	//return(mjd);
+    }
+  
+    m = mn;
+    y = (yr < 0) ? yr + 1 : yr;
+    if (mn < 3) {
+	m += 12;
+	y -= 1;
+    }
+  
+    if (yr < 1582 || (yr == 1582 && (mn < 10 || (mn == 10 && dy < 15)))) {
+	b = 0;
+    } else {
+	int a;
+	a = y/100;
+	b = 2 - a + a/4;
+    }
+  
+    if (y < 0) {
+	c = (long)((365.25*y) - 0.75) - 694025L;
+    } else {
+	c = (long)(365.25*y) - 694025L;
+    }
+  
+    d = (int)(30.6001*(m+1));
+  
+    mjd = b + c + d + dy - 0.5;
+  
+    last_mn = mn;
+    last_dy = dy;
+    last_yr = yr;
+    last_mjd = mjd;
+  
+    //return(mjd);
+}
+
+
+// given an mjd, calculate greenwich mean sidereal time, gst
+void SGTime::utc_gst () 
+{
+    double day = floor(mjd-0.5)+0.5;
+    double hr = (mjd-day)*24.0;
+    double T, x;
+
+    T = ((int)(mjd - 0.5) + 0.5 - J2000)/36525.0;
+    x = 24110.54841 + (8640184.812866 + (0.093104 - 6.2e-6 * T) * T) * T;
+    x /= 3600.0;
+    gst = (1.0/SIDRATE)*hr + x;
+
+    FG_LOG( FG_EVENT, FG_DEBUG, "  gst => " << gst );
+}
+
+
+// given Julian Date and Longitude (decimal degrees West) compute
+// Local Sidereal Time, in decimal hours.
+//
+// Provided courtesy of ecdowney@noao.edu (Elwood Downey) 
+
+double SGTime::sidereal_precise (double lng) 
+{
+    double lstTmp;
+
+    /* printf ("Current Lst on JD %13.5f at %8.4f degrees West: ", 
+       mjd + MJD0, lng); */
+
+    // convert to required internal units
+    lng *= DEG_TO_RAD;
+
+    // compute LST and print
+    utc_gst();
+    lstTmp = gst - RADHR (lng);
+    lstTmp -= 24.0*floor(lstTmp/24.0);
+    // printf ("%7.4f\n", lstTmp);
+
+    // that's all
+    return (lstTmp);
+}
+
+
+// return a courser but cheaper estimate of sidereal time
+double SGTime::sidereal_course(double lng) 
+{
+    //struct tm *gmt;
+    //double lstTmp;
+    time_t start_gmt, now;
+    double diff, part, days, hours, lstTmp;
+    char tbuf[64];
+  
+    //gmt = t->gmt;
+    //now = t->cur_time;
+    now = cur_time;
+    start_gmt = get_gmt(gmt->tm_year, 2, 21, 12, 0, 0);
+  
+    FG_LOG( FG_EVENT, FG_DEBUG, "  COURSE: GMT = " << format_time(gmt, tbuf) );
+    FG_LOG( FG_EVENT, FG_DEBUG, "  March 21 noon (GMT) = " << start_gmt );
+  
+    diff = (now - start_gmt) / (3600.0 * 24.0);
+  
+    FG_LOG( FG_EVENT, FG_DEBUG, 
+	    "  Time since 3/21/" << gmt->tm_year << " GMT = " << diff );
+  
+    part = fmod(diff, 1.0);
+    days = diff - part;
+    hours = gmt->tm_hour + gmt->tm_min/60.0 + gmt->tm_sec/3600.0;
+  
+    lstTmp = (days - lng)/15.0 + hours - 12;
+  
+    while ( lstTmp < 0.0 ) {
+	lstTmp += 24.0;
+    }
+  
+    FG_LOG( FG_EVENT, FG_DEBUG,
+	    "  days = " << days << "  hours = " << hours << "  lon = " 
+	    << lng << "  lst = " << lstTmp );
+  
+    return(lstTmp);
+}
+
+
+// Update time variables such as gmt, julian date, and sidereal time
+void SGTime::update( double lon, double lat, double alt_m ) {
+    double gst_precise, gst_course;
+
+    FG_LOG( FG_EVENT, FG_DEBUG, "Updating time" );
+
+    // get current Unix calendar time (in seconds)
+    warp += warp_delta;
+    cur_time = time(NULL) + warp;
+    FG_LOG( FG_EVENT, FG_DEBUG, 
+	    "  Current Unix calendar time = " << cur_time 
+	    << "  warp = " << warp << "  delta = " << warp_delta );
+
+#if 0
+    if ( warp_delta ) {
+	// time is changing so force an update
+	local_update_sky_and_lighting_params();
+    }
+#endif
+
+    // get GMT break down for current time
+    gmt = gmtime(&cur_time);
+    FG_LOG( FG_EVENT, FG_DEBUG, 
+	    "  Current GMT = " << gmt->tm_mon+1 << "/" 
+	    << gmt->tm_mday << "/" << gmt->tm_year << " "
+	    << gmt->tm_hour << ":" << gmt->tm_min << ":" 
+	    << gmt->tm_sec );
+
+    // calculate modified Julian date
+    // t->mjd = cal_mjd ((int)(t->gmt->tm_mon+1), (double)t->gmt->tm_mday, 
+    //     (int)(t->gmt->tm_year + 1900));
+    cal_mjd ((int)(gmt->tm_mon+1), (double)gmt->tm_mday, 
+	     (int)(gmt->tm_year + 1900));
+
+    // add in partial day
+    mjd += (gmt->tm_hour / 24.0) + (gmt->tm_min / (24.0 * 60.0)) +
+	(gmt->tm_sec / (24.0 * 60.0 * 60.0));
+
+    // convert "back" to Julian date + partial day (as a fraction of one)
+    jd = mjd + MJD0;
+    FG_LOG( FG_EVENT, FG_DEBUG, "  Current Julian Date = " << jd );
+
+    // printf("  Current Longitude = %.3f\n", FG_Longitude * RAD_TO_DEG);
+
+    // Calculate local side real time
+    if ( gst_diff < -100.0 ) {
+	// first time through do the expensive calculation & cheap
+        // calculation to get the difference.
+	FG_LOG( FG_EVENT, FG_INFO, "  First time, doing precise gst" );
+	gst_precise = gst = sidereal_precise(0.00);
+	gst_course = sidereal_course(0.00);
+      
+	gst_diff = gst_precise - gst_course;
+
+	lst = sidereal_course(-(lon * RAD_TO_DEG)) + gst_diff;
+    } else {
+	// course + difference should drift off very slowly
+	gst = sidereal_course( 0.00 ) + gst_diff;
+	lst = sidereal_course( -(lon * RAD_TO_DEG)) + gst_diff;
+    }
+
+    FG_LOG( FG_EVENT, FG_DEBUG,
+	    "  Current lon=0.00 Sidereal Time = " << gst );
+    FG_LOG( FG_EVENT, FG_DEBUG,
+	    "  Current LOCAL Sidereal Time = " << lst << " (" 
+	    << sidereal_precise(-(lon * RAD_TO_DEG)) 
+	    << ") (diff = " << gst_diff << ")" );
+}
+
+
+/******************************************************************
+ * The following are some functions that were included as SGTime
+ * members, although they currently don't make use of any of the
+ * class's variables. Maybe this'll change in the future
+ *****************************************************************/
+
+// Return time_t for Sat Mar 21 12:00:00 GMT
+//
+// On many systems it is ambiguous if mktime() assumes the input is in
+// GMT, or local timezone.  To address this, a new function called
+// timegm() is appearing.  It works exactly like mktime() but
+// explicitely interprets the input as GMT.
+//
+// timegm() is available and documented under FreeBSD.  It is
+// available, but completely undocumented on my current Debian 2.1
+// distribution.
+//
+// In the absence of timegm() we have to guess what mktime() might do.
+//
+// Many older BSD style systems have a mktime() that assumes the input
+// time in GMT.  But FreeBSD explicitly states that mktime() assumes
+// local time zone
+//
+// The mktime() on many SYSV style systems (such as Linux) usually
+// returns its result assuming you have specified the input time in
+// your local timezone.  Therefore, in the absence if timegm() you
+// have to go to extra trouble to convert back to GMT.
+//
+// If you are having problems with incorrectly positioned astronomical
+// bodies, this is a really good place to start looking.
+
+time_t SGTime::get_gmt(int year, int month, int day, int hour, int min, int sec)
+{
+    struct tm mt;
+
+    mt.tm_mon = month;
+    mt.tm_mday = day;
+    mt.tm_year = year;
+    mt.tm_hour = hour;
+    mt.tm_min = min;
+    mt.tm_sec = sec;
+    mt.tm_isdst = -1; // let the system determine the proper time zone
+
+    // For now we assume that if daylight is not defined in
+    // /usr/include/time.h that we have a machine with a mktime() that
+    // assumes input is in GMT ... this only matters if we are
+    // building on a system that does not have timegm()
+#if !defined(HAVE_DAYLIGHT)
+#  define MK_TIME_IS_GMT 1
+#endif
+
+#if defined( HAVE_TIMEGM ) 
+    return ( timegm(&mt) );
+#elif defined( MK_TIME_IS_GMT )
+    return ( mktime(&mt) );
+#else // ! defined ( MK_TIME_IS_GMT )
+
+    // timezone seems to work as a proper offset for Linux & Solaris
+#   if defined( __linux__ ) || defined( __sun__ ) 
+#       define TIMEZONE_OFFSET_WORKS 1
+#   endif
+
+    long int start = mktime(&mt);
+
+    FG_LOG( FG_EVENT, FG_DEBUG, "start1 = " << start );
+    // the ctime() call can screw up time progression on some versions
+    // of Linux
+    // fgPrintf( FG_EVENT, FG_DEBUG, "start2 = %s", ctime(&start));
+    FG_LOG( FG_EVENT, FG_DEBUG, "(tm_isdst = " << mt.tm_isdst << ")" );
+
+    timezone = fix_up_timezone( timezone );
+
+#  if defined( TIMEZONE_OFFSET_WORKS )
+    FG_LOG( FG_EVENT, FG_DEBUG, 
+	    "start = " << start << ", timezone = " << timezone );
+    return( start - timezone );
+#  else // ! defined( TIMEZONE_OFFSET_WORKS )
+
+    daylight = mt.tm_isdst;
+    if ( daylight > 0 ) {
+	daylight = 1;
+    } else if ( daylight < 0 ) {
+	FG_LOG( FG_EVENT, FG_WARN, 
+		"OOOPS, problem in sg_time.cxx, no daylight savings info." );
+    }
+
+    long int offset = -(timezone / 3600 - daylight);
+
+    FG_LOG( FG_EVENT, FG_DEBUG, "  Raw time zone offset = " << timezone );
+    FG_LOG( FG_EVENT, FG_DEBUG, "  Daylight Savings = " << daylight );
+    FG_LOG( FG_EVENT, FG_DEBUG, "  Local hours from GMT = " << offset );
+    
+    long int start_gmt = start - timezone + (daylight * 3600);
+    
+    FG_LOG( FG_EVENT, FG_DEBUG, "  March 21 noon (CST) = " << start );
+
+    return ( start_gmt );
+#  endif // ! defined( TIMEZONE_OFFSET_WORKS )
+#endif // ! defined ( MK_TIME_IS_GMT )
+}
+
+// Fix up timezone if using ftime()
+long int SGTime::fix_up_timezone( long int timezone_orig ) 
+{
+#if !defined( HAVE_GETTIMEOFDAY ) && defined( HAVE_FTIME )
+    // ftime() needs a little extra help finding the current timezone
+    struct timeb current;
+    ftime(&current);
+    return( current.timezone * 60 );
+#else
+    return( timezone_orig );
+#endif
+}
+
+
+char* SGTime::format_time( const struct tm* p, char* buf )
+{
+    sprintf( buf, "%d/%d/%2d %d:%02d:%02d", 
+	     p->tm_mon, p->tm_mday, p->tm_year,
+	     p->tm_hour, p->tm_min, p->tm_sec);
+    return buf;
+}
+
+
+SGTime* SGTime::cur_time_params = 0;
diff --git a/simgear/timing/sg_time.hxx b/simgear/timing/sg_time.hxx
new file mode 100644
index 00000000..0a1cd0a0
--- /dev/null
+++ b/simgear/timing/sg_time.hxx
@@ -0,0 +1,169 @@
+// sg_time.hxx -- data structures and routines for managing time related stuff.
+//
+// Written by Curtis Olson, started August 1997.
+//
+// Copyright (C) 1997  Curtis L. Olson  - curt@flightgear.org
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// $Id$
+
+
+#ifndef _SG_TIME_HXX
+#define _SG_TIME_HXX
+
+
+#ifndef __cplusplus                                                          
+# error This library requires C++
+#endif                                   
+
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#  include <windows.h>
+#endif
+
+#include <GL/glut.h>
+
+#include <simgear/compiler.h>
+
+#ifdef FG_HAVE_STD_INCLUDES
+#  include <ctime>
+#else
+#  include <time.h>
+#endif
+
+// #include <FDM/flight.hxx>
+
+#include "timezone.h"
+// #include "lowleveltime.h"
+
+
+enum sgTimingOffsetType {
+    SG_TIME_SYS_OFFSET   = 0,
+    SG_TIME_GMT_OFFSET   = 1,
+    SG_TIME_LAT_OFFSET   = 2,
+    SG_TIME_SYS_ABSOLUTE = 3,
+    SG_TIME_GMT_ABSOLUTE = 4,
+    SG_TIME_LAT_ABSOLUTE = 5
+};
+
+
+// Define a structure containing time parameters
+class SGTime {
+
+private:
+    // tzContainer stores all the current Timezone control points/
+    TimezoneContainer* tzContainer;
+
+    //Store the current local timezone name;
+    char *zonename;
+
+    // Unix "calendar" time in seconds
+    time_t cur_time;
+
+    // Break down of GMT time
+    struct tm *gmt;
+
+    // Julian date
+    double jd;
+
+    // modified Julian date
+    double mjd;
+
+    double last_mjd, last_dy;
+    int last_mn, last_yr;
+
+    // side real time at prime meridian
+    double gst;
+
+    // local sidereal time
+    double lst;
+
+    // local offset to GMT
+    time_t localOffset;
+
+    // the difference between the precise sidereal time algorithm
+    // result and the course result.  course + diff has good accuracy
+    // for the short term
+    double gst_diff;
+
+    // An offset in seconds from the true time.  Allows us to adjust
+    // the effective time of day.
+    long int warp;
+
+    // How much to change the value of warp each iteration.  Allows us
+    // to make time progress faster than normal.
+    long int warp_delta;
+
+public:
+
+    SGTime( const string& root );
+    ~SGTime();
+
+    inline double getJD() const { return jd; };
+    inline double getMjd() const { return mjd; };
+    inline double getLst() const { return lst; };
+    inline double getGst() const { return gst; };
+    inline time_t get_cur_time() const { return cur_time; };
+    inline struct tm* getGmt()const { return gmt; };
+  
+    void adjust_warp(int val) { warp += val; };
+    void adjust_warp_delta(int val) { warp_delta += val; };
+
+    // Initialize the time dependent variables
+    void init( double lon, double lat, const string& root, 
+	       time_t timeOffset, sgTimingOffsetType offsetType );
+
+    // Update the time dependent variables
+    void update( double lon, double lat, double alt_m );
+    void updateLocal( double lon, double lat, const string& root );
+
+    void cal_mjd (int mn, double dy, int yr);
+    void utc_gst(); 
+    double sidereal_precise (double lng);
+    double sidereal_course(double lng); 
+    static SGTime *cur_time_params;
+
+    // Some other stuff which were changed to SGTime members on
+    // questionable grounds -:)
+    // time_t get_start_gmt(int year);
+    time_t get_gmt(int year, int month, int day, 
+		   int hour, int minute, int second);
+    time_t get_gmt(struct tm* the_time);
+  
+    char* format_time( const struct tm* p, char* buf );
+    long int fix_up_timezone( long int timezone_orig );
+
+    inline int get_warp_delta() const { return warp_delta; }
+};
+
+
+inline time_t SGTime::get_gmt(struct tm* the_time) // this is just a wrapper
+{
+  //printf("Using: %24s as input\n", asctime(the_time));
+  return get_gmt(the_time->tm_year,
+	  the_time->tm_mon,
+	  the_time->tm_mday,
+	  the_time->tm_hour,
+	  the_time->tm_min,
+	  the_time->tm_sec);
+}
+
+
+#endif // _SG_TIME_HXX