Canvas: fix element mouse hit detection with OSG 3.3.2.

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

diff --git a/simgear/math/SGGeod.hxx b/simgear/math/SGGeod.hxx
index a7153334d5d78fe0e9061bde320270179279bfe4..8eddbe92ba5f10c2fb9f20765c96ad9085dd8cf6 100644 (file)
--- a/simgear/math/SGGeod.hxx
+++ b/simgear/math/SGGeod.hxx
@@ -20,10 +20,6 @@
 
 #include <simgear/constants.h>
 
-#ifndef NO_OPENSCENEGRAPH_INTERFACE
-#include <osg/Matrix>
-#endif
-
 // #define SG_GEOD_NATIVE_DEGREE
 
 /// Class representing a geodetic location
@@ -86,22 +82,12 @@ public:
   /// Set the geodetic elevation from the argument given in feet
   void setElevationFt(double elevation);
 
-  // Compare two geodetic positions for equality
+  /// Compare two geodetic positions for equality
   bool operator == ( const SGGeod & other ) const;
 
-#ifndef NO_OPENSCENEGRAPH_INTERFACE
-  // Create a local coordinate frame in the earth-centered frame of
-  // reference. X points north, Z points down.
-  // makeSimulationFrameRelative() only includes rotation.
-  osg::Matrix makeSimulationFrameRelative() const;
-  osg::Matrix makeSimulationFrame() const;
-
-  // Create a Z-up local coordinate frame in the earth-centered frame
-  // of reference. This is what scenery models, etc. expect.
-  // makeZUpFrameRelative() only includes rotation.
-  osg::Matrix makeZUpFrameRelative() const;
-  osg::Matrix makeZUpFrame() const;
-#endif
+  /// 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
@@ -362,6 +348,23 @@ SGGeod::operator == ( const SGGeod & other ) const
          _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