X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Ftiming%2Fsg_time.cxx;h=6c97e62a6abe1f5179b672bf8a12c76c34f32632;hb=b5d6aa3fe4c44ecbee7f6a0b679247514fc622be;hp=676251ba2e52cf3d4e0df65a6c8ecd5e2ea37648;hpb=2a2e2716bdfbecb3494ab935171ed6224a178470;p=simgear.git

diff --git a/simgear/timing/sg_time.cxx b/simgear/timing/sg_time.cxx
index 676251ba..6c97e62a 100644
--- a/simgear/timing/sg_time.cxx
+++ b/simgear/timing/sg_time.cxx
@@ -59,17 +59,17 @@
 #define DEGHR(x)        ((x)/15.)
 #define RADHR(x)        DEGHR(x*SGD_RADIANS_TO_DEGREES)
 
+using std::string;
 
 static const double MJD0    = 2415020.0;
 static const double J2000   = 2451545.0 - MJD0;
 static const double SIDRATE = 0.9972695677;
 
+// tzContainer stores all the current Timezone control points/
+std::auto_ptr<SGTimeZoneContainer> static_tzContainer;
 
-void SGTime::init( double lon_rad, double lat_rad,
-                   const string& root, time_t init_time )
+void SGTime::init( const SGGeod& location, const SGPath& root, time_t init_time )
 {
-    SG_LOG( SG_EVENT, SG_INFO, "Initializing Time" );
-
     gst_diff = -9999.0;
 
     if ( init_time ) {
@@ -78,51 +78,49 @@ void SGTime::init( double lon_rad, double lat_rad,
 	cur_time = time(NULL); 
     }
 
-    SG_LOG( SG_EVENT, SG_INFO,
+    SG_LOG( SG_EVENT, SG_DEBUG,
                 "Current greenwich mean time = " << asctime(gmtime(&cur_time)));
-    SG_LOG( SG_EVENT, SG_INFO,
+    SG_LOG( SG_EVENT, SG_DEBUG,
              "Current local time          = " << asctime(localtime(&cur_time)));
 
-    if ( !root.empty()) {
-        SGPath zone( root );
-        zone.append( "zone.tab" );
-        SG_LOG( SG_EVENT, SG_INFO, "Reading timezone info from: "
-                << zone.str() );
-        tzContainer = new SGTimeZoneContainer( zone.c_str() );
-        SGGeod location(SGGeod::fromRad(lon_rad, lat_rad));
-        SGTimeZone* nearestTz = tzContainer->getNearest(location);
+    if ( !root.isNull()) {
+        if (!static_tzContainer.get()) {
+            SGPath zone( root );
+            zone.append( "zone.tab" );
+            SG_LOG( SG_EVENT, SG_INFO, "Reading timezone info from: "
+                   << zone.str() );
+            static_tzContainer.reset(new SGTimeZoneContainer( zone.c_str() ));
+        }
+
+        SGTimeZone* nearestTz = static_tzContainer->getNearest(location);
 
         SGPath name( root );
         name.append( nearestTz->getDescription() );
         zonename = name.str();
-        SG_LOG( SG_EVENT, SG_INFO, "Using zonename = " << zonename );
+        SG_LOG( SG_EVENT, SG_DEBUG, "Using zonename = " << zonename );
     } else {
-        SG_LOG( SG_EVENT, SG_INFO, "*** NO TIME ZONE NAME ***" );
-        tzContainer = NULL;
         zonename.erase();
     }
 }
 
-SGTime::SGTime( double lon_rad, double lat_rad, const string& root,
-                time_t init_time )
+SGTime::SGTime( const SGGeod& location, const SGPath& root,
+           time_t init_time )
 {
-    init( lon_rad, lat_rad, root, init_time );
+    init(location, root, init_time);
 }
 
-
-SGTime::SGTime( const string& root ) {
-    init( 0.0, 0.0, root, 0 );
+SGTime::SGTime( const SGPath& root ) {
+    init( SGGeod(), root, 0 );
 }
 
 
 SGTime::SGTime() {
-    init( 0.0, 0.0, "", 0 );
+    init( SGGeod(), SGPath(), 0 );
 }
 
 
 SGTime::~SGTime()
 {
-    delete tzContainer;
 }
 
 
@@ -153,20 +151,12 @@ static double sidereal_course( time_t cur_time, const struct tm *gmt, double lng
 {
     time_t start_gmt, now;
     double diff, part, days, hours, lstTmp;
-    char tbuf[64];
   
     now = cur_time;
     start_gmt = sgTimeGetGMT(gmt->tm_year, 2, 21, 12, 0, 0);
   
-    SG_LOG( SG_EVENT, SG_DEBUG, "  COURSE: GMT = "
-	    << sgTimeFormatTime(gmt, tbuf) );
-    SG_LOG( SG_EVENT, SG_DEBUG, "  March 21 noon (GMT) = " << start_gmt );
-  
     diff = (now - start_gmt) / (3600.0 * 24.0);
   
-    SG_LOG( SG_EVENT, SG_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;
@@ -176,18 +166,12 @@ static double sidereal_course( time_t cur_time, const struct tm *gmt, double lng
     while ( lstTmp < 0.0 ) {
 	lstTmp += 24.0;
     }
-  
-    SG_LOG( SG_EVENT, SG_DEBUG,
-	    "  days = " << days << "  hours = " << hours << "  lon = " 
-	    << lng << "  lst = " << lstTmp );
-  
+    
     return lstTmp;
 }
 
-
 // Update the time related variables
-void SGTime::update( double lon_rad, double lat_rad,
-                     time_t ct, long int warp )
+void SGTime::update( const SGGeod& location, time_t ct, long int warp )
 {
     double gst_precise, gst_course;
 
@@ -195,8 +179,6 @@ void SGTime::update( double lon_rad, double lat_rad,
     tm * gmt = &m_gmt;
 
 
-    SG_LOG( SG_EVENT, SG_DEBUG, "Updating time" );
-
     // get current Unix calendar time (in seconds)
     // warp += warp_delta;
     if ( ct ) {
@@ -204,19 +186,10 @@ void SGTime::update( double lon_rad, double lat_rad,
     } else {
 	cur_time = time(NULL) + warp;
     }
-    SG_LOG( SG_EVENT, SG_DEBUG, 
-	    "  Current Unix calendar time = " << cur_time 
-	    << "  warp = " << warp );
 
     // get GMT break down for current time
 
     memcpy( gmt, gmtime(&cur_time), sizeof(tm) );
-    SG_LOG( SG_EVENT, SG_DEBUG, 
-	    "  Current GMT = " << gmt->tm_mon+1 << "/" 
-	    << gmt->tm_mday << "/" << (1900 + gmt->tm_year) << " "
-	    << gmt->tm_hour << ":" << gmt->tm_min << ":" 
-	    << gmt->tm_sec );
-
     // calculate modified Julian date starting with current
     mjd = sgTimeCurrentMJD( ct, warp );
 
@@ -226,7 +199,6 @@ void SGTime::update( double lon_rad, double lat_rad,
 
     // convert "back" to Julian date + partial day (as a fraction of one)
     jd = mjd + MJD0;
-    SG_LOG( SG_EVENT, SG_DEBUG, "  Current Julian Date = " << jd );
 
     // printf("  Current Longitude = %.3f\n", FG_Longitude * SGD_RADIANS_TO_DEGREES);
 
@@ -234,57 +206,33 @@ void SGTime::update( double lon_rad, double lat_rad,
     if ( gst_diff < -100.0 ) {
 	// first time through do the expensive calculation & cheap
         // calculation to get the difference.
-	SG_LOG( SG_EVENT, SG_INFO, "  First time, doing precise gst" );
+	SG_LOG( SG_EVENT, SG_DEBUG, "  First time, doing precise gst" );
 	gst_precise = gst = sidereal_precise( mjd, 0.00 );
 	gst_course = sidereal_course( cur_time, gmt, 0.00 );
       
 	gst_diff = gst_precise - gst_course;
 
 	lst = sidereal_course( cur_time, gmt,
-                               -(lon_rad * SGD_RADIANS_TO_DEGREES) ) + gst_diff;
+                               -location.getLongitudeDeg() ) + gst_diff;
     } else {
 	// course + difference should drift off very slowly
 	gst = sidereal_course( cur_time, gmt, 0.00 ) + gst_diff;
 	lst = sidereal_course( cur_time, gmt,
-                               -(lon_rad * SGD_RADIANS_TO_DEGREES) ) + gst_diff;
+                               -location.getLongitudeDeg()  ) + gst_diff;
     }
-
-    SG_LOG( SG_EVENT, SG_DEBUG,
-	    "  Current lon=0.00 Sidereal Time = " << gst );
-    SG_LOG( SG_EVENT, SG_DEBUG,
-	    "  Current LOCAL Sidereal Time = " << lst << " (" 
-	    << sidereal_precise( mjd, -(lon_rad * SGD_RADIANS_TO_DEGREES) ) 
-	    << ") (diff = " << gst_diff << ")" );
 }
 
 
 // Given lon/lat, update timezone information and local_offset
-void SGTime::updateLocal( double lon_rad, double lat_rad, const string& root ) {
-    // sanity checking
-    if ( lon_rad < -SGD_PI || lon_rad> SGD_PI ) {
-        // not within -180 ... 180
-        lon_rad = 0.0;
-    }
-    if ( lat_rad < -SGD_PI_2 || lat_rad > SGD_PI_2 ) {
-        // not within -90 ... 90
-        lat_rad = 0.0;
-    }
-    if ( lon_rad != lon_rad ) {
-        // only true if lon_rad == nan
-        SG_LOG( SG_EVENT, SG_ALERT,
-                "  Detected lon_rad == nan, resetting to 0.0" );
-        lon_rad = 0.0;
-    }
-    if ( lat_rad != lat_rad ) {
-        // only true if lat_rad == nan
-        SG_LOG( SG_EVENT, SG_ALERT,
-                "  Detected lat_rad == nan, resetting to 0.0" );
-        lat_rad = 0.0;
+void SGTime::updateLocal( const SGGeod& aLocation, const string& root ) {
+  SGGeod location(aLocation);
+    if (!aLocation.isValid()) {
+        location = SGGeod();
     }
+    
     time_t currGMT;
     time_t aircraftLocalTime;
-    SGGeod location(SGGeod::fromRad(lon_rad, lat_rad));
-    SGTimeZone* nearestTz = tzContainer->getNearest(location);
+    SGTimeZone* nearestTz = static_tzContainer->getNearest(location);
     SGPath zone( root );
     zone.append ( nearestTz->getDescription() );
     zonename = zone.str();
@@ -370,17 +318,9 @@ double sgTimeCurrentMJD( time_t ct, long int warp ) {
     } else {
         cur_time = time(NULL) + warp;
     }
-    SG_LOG( SG_EVENT, SG_DEBUG, 
-	    "  Current Unix calendar time = " << cur_time 
-	    << "  warp = " << warp );
 
     // get GMT break down for current time
     memcpy( gmt, gmtime(&cur_time), sizeof(tm) );
-    SG_LOG( SG_EVENT, SG_DEBUG, 
-	    "  Current GMT = " << gmt->tm_mon+1 << "/" 
-	    << gmt->tm_mday << "/" << (1900 + 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, 
@@ -405,8 +345,6 @@ double sgTimeCalcGST( double mjd ) {
     x /= 3600.0;
     gst = (1.0/SIDRATE)*hr + x;
 
-    SG_LOG( SG_EVENT, SG_DEBUG, "  gst => " << gst );
-
     return gst;
 }
 
@@ -537,7 +475,7 @@ time_t sgTimeGetGMT(int year, int month, int day, int hour, int min, int sec)
     if ( daylight > 0 ) {
 	daylight = 1;
     } else if ( daylight < 0 ) {
-	SG_LOG( SG_EVENT, FG_WARN, 
+	SG_LOG( SG_EVENT, SG_WARN, 
 		"OOOPS, problem in sg_time.cxx, no daylight savings info." );
     }