canvas::Text: get maximum width (if displayed on a single line).

[simgear.git] / simgear / math / SGGeod.hxx

diff --git a/simgear/math/SGGeod.hxx b/simgear/math/SGGeod.hxx
index 7124fdd1e870f844b157a84a121b7c5621cf2ea3..8eddbe92ba5f10c2fb9f20765c96ad9085dd8cf6 100644 (file)
--- a/simgear/math/SGGeod.hxx
+++ b/simgear/math/SGGeod.hxx
@@ -27,14 +27,6 @@ class SGGeod {
 public:
   /// Default constructor, initializes the instance to lat = lon = elev = 0
   SGGeod(void);
-  /// Initialize from a cartesian vector assumed to be in meters
-  /// Note that this conversion is relatively expensive to compute
-  /// depricated
-  SGGeod(const SGVec3<double>& cart);
-  /// Initialize from a geocentric position
-  /// Note that this conversion is relatively expensive to compute
-  /// depricated
-  SGGeod(const SGGeoc& geoc);
 
   /// Factory from angular values in radians and elevation is 0
   static SGGeod fromRad(double lon, double lat);
@@ -48,6 +40,10 @@ public:
   static SGGeod fromRadM(double lon, double lat, double elevation);
   /// Factory from angular values in degrees and elevation in m
   static SGGeod fromDegM(double lon, double lat, double elevation);
+  /// Factory from an other SGGeod and a different elevation in m
+  static SGGeod fromGeodM(const SGGeod& geod, double elevation);
+  /// Factory from an other SGGeod and a different elevation in ft
+  static SGGeod fromGeodFt(const SGGeod& geod, double elevation);
   /// Factory to convert position from a cartesian position assumed to be
   /// in wgs84 measured in meters
   /// Note that this conversion is relatively expensive to compute
@@ -86,13 +82,20 @@ public:
   /// Set the geodetic elevation from the argument given in feet
   void setElevationFt(double elevation);
 
+  /// Compare two geodetic positions for equality
+  bool operator == ( const SGGeod & other ) const;
+
+  /// check the Geod contains sane values (finite, inside appropriate
+  /// ranges for lat/lon)
+  bool isValid() const;
 private:
   /// This one is private since construction is not unique if you do
   /// not know the units of the arguments. Use the factory methods for
   /// that purpose
   SGGeod(double lon, double lat, double elevation);
 
-  /// The actual data, angles in degree, elevation in meters
+  //// FIXME: wrong comment!
+  /// The actual data, angles in degrees, elevation in meters
   /// The rationale for storing the values in degrees is that most code places
   /// in flightgear/terragear use degrees as a nativ input and output value.
   /// The places where it makes sense to use radians is when we convert
@@ -116,20 +119,6 @@ SGGeod::SGGeod(double lon, double lat, double elevation) :
 {
 }
 
-inline
-SGGeod::SGGeod(const SGVec3<double>& cart)
-{
-  SGGeodesy::SGCartToGeod(cart, *this);
-}
-
-inline
-SGGeod::SGGeod(const SGGeoc& geoc)
-{
-  SGVec3<double> cart;
-  SGGeodesy::SGGeocToCart(geoc, cart);
-  SGGeodesy::SGCartToGeod(cart, *this);
-}
-
 inline
 SGGeod
 SGGeod::fromRad(double lon, double lat)
@@ -200,6 +189,20 @@ SGGeod::fromDegM(double lon, double lat, double elevation)
 #endif
 }
 
+inline
+SGGeod
+SGGeod::fromGeodM(const SGGeod& geod, double elevation)
+{
+  return SGGeod(geod._lon, geod._lat, elevation);
+}
+
+inline
+SGGeod
+SGGeod::fromGeodFt(const SGGeod& geod, double elevation)
+{
+  return SGGeod(geod._lon, geod._lat, elevation*SG_FEET_TO_METER);
+}
+
 inline
 SGGeod
 SGGeod::fromCart(const SGVec3<double>& cart)
@@ -336,6 +339,32 @@ SGGeod::setElevationFt(double elevation)
   _elevation = elevation*SG_FEET_TO_METER;
 }
 
+inline
+bool
+SGGeod::operator == ( const SGGeod & other ) const
+{
+  return _lon == other._lon &&
+         _lat == other._lat &&
+         _elevation == other._elevation;
+}
+
+inline
+bool
+SGGeod::isValid() const
+{
+  if (SGMiscd::isNaN(_lon))
+      return false;
+  if (SGMiscd::isNaN(_lat))
+      return false;
+#ifdef SG_GEOD_NATIVE_DEGREE
+  return (_lon >= -180.0) && (_lon <= 180.0) &&
+  (_lat >= -90.0) && (_lat <= 90.0);
+#else
+  return (_lon >= -SGD_PI) && (_lon <= SGD_PI) &&
+  (_lat >= -SGD_PI_2) && (_lat <= SGD_PI_2);
+#endif
+}
+
 /// Output to an ostream
 template<typename char_type, typename traits_type>
 inline