Merge branch 'next' of git://gitorious.org/fg/simgear into next

[simgear.git] / simgear / timing / sg_time.cxx

diff --git a/simgear/timing/sg_time.cxx b/simgear/timing/sg_time.cxx
index 12afd26cb1c9add69f6f25322ff32b0de3dbb985..d32302ee1eef9c5575a5595f82ea612ea1ce734d 100644 (file)
--- a/simgear/timing/sg_time.cxx
+++ b/simgear/timing/sg_time.cxx
@@ -14,10 +14,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Library General Public License for more details.
 //
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA  02111-1307, USA.
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -30,15 +29,10 @@
 
 #include <errno.h>             // for errno
 
-#ifdef SG_HAVE_STD_INCLUDES
-#  include <cstdio>
-#  include <cstdlib>
-#  include <ctime>
-#else
-#  include <math.h>
-#  include <stdio.h>
-#  include <stdlib.h>
-#endif
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
+#include <cstring>
 
 #include <string>
 
@@ -65,6 +59,7 @@
 #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;
@@ -95,9 +90,8 @@ void SGTime::init( double lon_rad, double lat_rad,
         SG_LOG( SG_EVENT, SG_INFO, "Reading timezone info from: "
                 << zone.str() );
         tzContainer = new SGTimeZoneContainer( zone.c_str() );
-
-        SGGeoCoord location( SGD_RADIANS_TO_DEGREES * lat_rad, SGD_RADIANS_TO_DEGREES * lon_rad );
-        SGGeoCoord* nearestTz = tzContainer->getNearest(location);
+        SGGeod location(SGGeod::fromRad(lon_rad, lat_rad));
+        SGTimeZone* nearestTz = tzContainer->getNearest(location);
 
         SGPath name( root );
         name.append( nearestTz->getDescription() );
@@ -129,11 +123,7 @@ SGTime::SGTime() {
 
 SGTime::~SGTime()
 {
-    if ( tzContainer != NULL ) {
-        SGTimeZoneContainer *tmp = tzContainer;
-        tzContainer = NULL;
-       delete tmp;
-    }
+    delete tzContainer;
 }
 
 
@@ -202,9 +192,9 @@ void SGTime::update( double lon_rad, double lat_rad,
 {
     double gst_precise, gst_course;
 
-#if defined(_MSC_VER) || defined(__MINGW32__)
+
     tm * gmt = &m_gmt;
-#endif
+
 
     SG_LOG( SG_EVENT, SG_DEBUG, "Updating time" );
 
@@ -220,11 +210,8 @@ void SGTime::update( double lon_rad, double lat_rad,
            << "  warp = " << warp );
 
     // get GMT break down for current time
-#if defined(_MSC_VER) || defined(__MINGW32__)
+
     memcpy( gmt, gmtime(&cur_time), sizeof(tm) );
-#else
-    gmt = gmtime(&cur_time);
-#endif
     SG_LOG( SG_EVENT, SG_DEBUG, 
            "  Current GMT = " << gmt->tm_mon+1 << "/" 
            << gmt->tm_mday << "/" << (1900 + gmt->tm_year) << " "
@@ -297,9 +284,8 @@ void SGTime::updateLocal( double lon_rad, double lat_rad, const string& root ) {
     }
     time_t currGMT;
     time_t aircraftLocalTime;
-    SGGeoCoord location( SGD_RADIANS_TO_DEGREES * lat_rad,
-                         SGD_RADIANS_TO_DEGREES * lon_rad );
-    SGGeoCoord* nearestTz = tzContainer->getNearest(location);
+    SGGeod location(SGGeod::fromRad(lon_rad, lat_rad));
+    SGTimeZone* nearestTz = tzContainer->getNearest(location);
     SGPath zone( root );
     zone.append ( nearestTz->getDescription() );
     zonename = zone.str();
@@ -374,12 +360,8 @@ double sgTimeCalcMJD(int mn, double dy, int yr) {
 // since 1900 jan 0.5), mjd.
 double sgTimeCurrentMJD( time_t ct, long int warp ) {
 
-#if defined(_MSC_VER) || defined(__MINGW32__)
     struct tm m_gmt;    // copy of system gmtime(&time_t) structure
     struct tm *gmt = &m_gmt;
-#else
-    struct tm *gmt;
-#endif
 
     // get current Unix calendar time (in seconds)
     // warp += warp_delta;
@@ -394,11 +376,7 @@ double sgTimeCurrentMJD( time_t ct, long int warp ) {
            << "  warp = " << warp );
 
     // get GMT break down for current time
-#if defined(_MSC_VER) || defined(__MINGW32__)
     memcpy( gmt, gmtime(&cur_time), sizeof(tm) );
-#else
-    gmt = gmtime(&cur_time);
-#endif
     SG_LOG( SG_EVENT, SG_DEBUG, 
            "  Current GMT = " << gmt->tm_mon+1 << "/" 
            << gmt->tm_mday << "/" << (1900 + gmt->tm_year) << " "