<Filter
Name="Lib_sgtiming"
>
- <File
- RelativePath="..\..\simgear\timing\geocoord.cxx"
- >
- </File>
- <File
- RelativePath="..\..\simgear\timing\geocoord.h"
- >
- </File>
<File
RelativePath="..\..\simgear\timing\lowleveltime.cxx"
>
lib_LIBRARIES = libsgtiming.a
include_HEADERS = \
- geocoord.h \
lowleveltime.h \
sg_time.hxx \
timestamp.hxx \
timezone.h
libsgtiming_a_SOURCES = \
- geocoord.cxx \
lowleveltime.cxx \
sg_time.cxx \
timestamp.cxx \
+++ /dev/null
-/* -*- Mode: C++ -*- *****************************************************
- * geocoord.h
- * Written by Durk Talsma. Started March 1998.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- **************************************************************************/
-
-/*************************************************************************
- *
- * This file defines a small and simple class to store geocentric
- * coordinates. Basically, class SGGeoCoord is intended as a base class for
- * any kind of of object, that can be categorized according to its
- * location on earth, be it navaids, or aircraft. This class for originally
- * written for FlightGear, in order to store Timezone control points.
- *
- ************************************************************************/
-#ifdef HAVE_CONFIG_H
-# include <simgear_config.h>
-#endif
-
-#include <simgear/math/SGMath.hxx>
-#include "geocoord.h"
-
-SGGeoCoord::SGGeoCoord(const SGGeoCoord& other)
-{
- lat = other.lat;
- lon = other.lon;
-}
-
-SGGeoCoord* SGGeoCoordContainer::getNearest(const SGGeoCoord& ref) const
-{
- if (data.empty())
- return 0;
-
- float maxCosAng = -2;
- SGVec3f refVec(ref.getX(), ref.getY(), ref.getZ());
- SGGeoCoordVectorConstIterator i, nearest;
- for (i = data.begin(); i != data.end(); ++i)
- {
- float cosAng = dot(refVec, SGVec3f((*i)->getX(), (*i)->getY(), (*i)->getZ()));
- if (maxCosAng < cosAng)
- {
- maxCosAng = cosAng;
- nearest = i;
- }
- }
- return *nearest;
-}
-
-
-SGGeoCoordContainer::~SGGeoCoordContainer()
-{
- SGGeoCoordVectorIterator i = data.begin();
- while (i != data.end())
- delete *i++;
-}
+++ /dev/null
-/* -*- Mode: C++ -*- *****************************************************
- * geocoord.h
- * Written by Durk Talsma. Started July 1999.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- **************************************************************************/
-
-/*************************************************************************
- *
- * This file defines a small and simple class to store geocentric
- * coordinates. Basically, class GeoCoord is intended as a base class for
- * any kind of of object, that can be categorized according to its
- * location on earth, be it navaids, or aircraft. This class for originally
- * written for FlightGear, in order to store Timezone control points.
- *
- ************************************************************************/
-
-
-#ifndef _GEOCOORD_H_
-#define _GEOCOORD_H_
-
-#include <simgear/compiler.h>
-
-
-#include <math.h>
-#include <vector>
-
-#include <simgear/constants.h>
-
-class SGGeoCoord
-{
-protected:
- float lat;
- float lon;
-
-public:
- SGGeoCoord() { lat = 0.0; lon = 0.0;};
- SGGeoCoord(float la, float lo) { lat = la; lon = lo;};
- SGGeoCoord(const SGGeoCoord& other);
- virtual ~SGGeoCoord() {};
-
- void set(float la, float lo) { lat = la; lon = lo; };
- float getLat() const { return lat; };
- float getLon() const { return lon; };
- float getX() const { return cos(SGD_DEGREES_TO_RADIANS*lat) * cos(SGD_DEGREES_TO_RADIANS*lon); };
- float getY() const { return cos(SGD_DEGREES_TO_RADIANS*lat) * sin(SGD_DEGREES_TO_RADIANS*lon); };
- float getZ() const { return sin(SGD_DEGREES_TO_RADIANS*lat); };
-
-
- virtual const char * getDescription() {return 0;};
-};
-
-typedef std::vector<SGGeoCoord*> SGGeoCoordVector;
-typedef std::vector<SGGeoCoord*>::iterator SGGeoCoordVectorIterator;
-typedef std::vector<SGGeoCoord*>::const_iterator SGGeoCoordVectorConstIterator;
-
-/************************************************************************
- * SGGeoCoordContainer is a simple container class, that stores objects
- * derived from SGGeoCoord. Basically, it is a wrapper around an STL vector,
- * with some added functionality
- ***********************************************************************/
-
-class SGGeoCoordContainer
-{
-protected:
- SGGeoCoordVector data;
-
-public:
- SGGeoCoordContainer() {};
- virtual ~SGGeoCoordContainer();
-
- const SGGeoCoordVector& getData() const { return data; };
- SGGeoCoord* getNearest(const SGGeoCoord& ref) const;
-};
-
-
-#endif // _GEO_COORD_H_
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() );
}
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();
#include "timezone.h"
-SGTimeZone::SGTimeZone(float la, float lo, char* cc, char* desc) :
- SGGeoCoord(la, lo)
+SGTimeZone::SGTimeZone(const SGGeod& geod, char* cc, char* desc) :
+ centerpoint(SGVec3d::fromGeod(geod))
{
countryCode = cc;
descriptor = desc;
}
/* Build a timezone object from a textline in zone.tab */
-SGTimeZone::SGTimeZone(const char *infoString) :
- SGGeoCoord()
+SGTimeZone::SGTimeZone(const char *infoString)
{
+ double lat = 0.0, lon = 0.0;
+
int i = 0;
while (infoString[i] != '\t')
i++;
strncpy(buffer, (&infoString[start]), size);
buffer[size] = 0;
descriptor = buffer;
+
+ centerpoint = SGVec3d::fromGeod(SGGeod::fromDeg(lon, lat));
}
/* the copy constructor */
SGTimeZone::SGTimeZone(const SGTimeZone& other)
{
- lat = other.getLat();
- lon = other.getLon();
+ centerpoint = other.centerpoint;
countryCode = other.countryCode;
descriptor = other.descriptor;
}
if (!(infile)) {
string e = "Unable to open time zone file '";
throw sg_exception(e + filename + '\'');
-
- } else {
- errno = 0;
+ }
- while (1) {
- fgets(buffer, 256, infile);
- if (feof(infile)) {
+ errno = 0;
+
+ while (1) {
+ fgets(buffer, 256, infile);
+ if (feof(infile)) {
+ break;
+ }
+ for (char *p = buffer; *p; p++) {
+ if (*p == '#') {
+ *p = 0;
break;
- }
- for (char *p = buffer; *p; p++) {
- if (*p == '#') {
- *p = 0;
- break;
- }
- }
- if (buffer[0]) {
- data.push_back(new SGTimeZone(buffer));
- }
+ }
}
- if ( errno ) {
- perror( "SGTimeZoneContainer()" );
- errno = 0;
+ if (buffer[0]) {
+ zones.push_back(new SGTimeZone(buffer));
}
}
+ if ( errno ) {
+ perror( "SGTimeZoneContainer()" );
+ errno = 0;
+ }
+
fclose(infile);
}
SGTimeZoneContainer::~SGTimeZoneContainer()
{
+ TZVec::iterator it = zones.begin();
+ for (; it != zones.end(); ++it) {
+ delete *it;
+ }
+}
+
+SGTimeZone* SGTimeZoneContainer::getNearest(const SGGeod& ref) const
+{
+ SGVec3d refCart(SGVec3d::fromGeod(ref));
+ SGTimeZone* match = NULL;
+ double minDist2 = HUGE_VAL;
+
+ TZVec::const_iterator it = zones.begin();
+ for (; it != zones.end(); ++it) {
+ double d2 = distSqr((*it)->cartCenterpoint(), refCart);
+ if (d2 < minDist2) {
+ match = *it;
+ minDist2 = d2;
+ }
+ }
+
+ return match;
}
+
#ifndef _TIMEZONE_H_
#define _TIMEZONE_H_
-#include <stdio.h>
#include <string>
+#include <vector>
-#include <simgear/timing/geocoord.h>
+#include <simgear/math/SGMath.hxx>
+#include <simgear/math/SGGeod.hxx>
/**
- * SGTimeZone is derived from geocoord, and stores the timezone centerpoint,
+ * SGTimeZone stores the timezone centerpoint,
* as well as the countrycode and the timezone descriptor. The latter is
* used in order to get the local time.
*
*/
-class SGTimeZone : public SGGeoCoord
+class SGTimeZone
{
private:
+ SGVec3d centerpoint; // centre of timezone, in cartesian coordinates
std::string countryCode;
std::string descriptor;
public:
- /**
- * Default constructor.
- */
- SGTimeZone() : SGGeoCoord()
- {
- countryCode.erase();
- descriptor.erase();
- };
-
/**
* Build a timezone object with a specifed latitude, longitude, country
* code, and descriptor
- * @param la latitude
- * @param lo longitude
+ * @param pt centerpoint
* @param cc country code
* @param desc descriptor
*/
- SGTimeZone(float la, float lo, char* cc, char* desc);
+ SGTimeZone(const SGGeod& pt, char* cc, char* desc);
/**
* Build a timezone object from a textline in zone.tab
* @param other the source object
*/
SGTimeZone(const SGTimeZone &other);
-
- /**
- * Virutal destructor
- */
- virtual ~SGTimeZone() { };
/**
* Return the descriptor string
* @return descriptor string (char array)
*/
- virtual const char * getDescription() { return descriptor.c_str(); };
+ const char * getDescription() { return descriptor.c_str(); };
+
+ const SGVec3d& cartCenterpoint() const
+ {
+ return centerpoint;
+ }
};
/**
- * SGTimeZoneContainer is derived from SGGeoCoordContainer, and has some
- * added functionality.
+ * SGTimeZoneContainer
*/
-class SGTimeZoneContainer : public SGGeoCoordContainer
+class SGTimeZoneContainer
{
- public:
+public:
SGTimeZoneContainer(const char *filename);
- virtual ~SGTimeZoneContainer();
+ ~SGTimeZoneContainer();
+
+ SGTimeZone* getNearest(const SGGeod& ref) const;
+
+private:
+ typedef std::vector<SGTimeZone*> TZVec;
+ TZVec zones;
};
projects / simgear.git / commitdiff