use the proper namespace

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

diff --git a/simgear/math/SGGeodesy.hxx b/simgear/math/SGGeodesy.hxx
index deb16ae1dc1cd6c3242ac7407daed7e79d0ddac4..cce38199b6b252de56afde984f67c3cbaf6c988d 100644 (file)
--- a/simgear/math/SGGeodesy.hxx
+++ b/simgear/math/SGGeodesy.hxx
@@ -10,21 +10,14 @@
 // 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.
 //
 
 #ifndef SGGeodesy_H
 #define SGGeodesy_H
 
-class SGGeoc;
-class SGGeod;
-
-template<typename T>
-class SGVec3;
-
 class SGGeodesy {
 public:
   // Hard numbers from the WGS84 standard.
@@ -52,6 +45,39 @@ public:
   /// Takes a geocentric coordinate data and returns the cartesian
   /// coordinates.
   static void SGGeocToCart(const SGGeoc& geoc, SGVec3<double>& cart);
+
+  // Geodetic course/distance computation
+  static bool direct(const SGGeod& p1, double course1,
+                     double distance, SGGeod& p2, double& course2);
+
+  /// overloaded version of above, returns new value directly, throws
+  /// an sg_exception on failure.
+  static SGGeod direct(const SGGeod& p1, double course1,
+                     double distance);
+
+  static bool inverse(const SGGeod& p1, const SGGeod& p2, double& course1,
+                      double& course2, double& distance);
+
+  static double courseDeg(const SGGeod& from, const SGGeod& to);
+  static double distanceM(const SGGeod& from, const SGGeod& to);
+  static double distanceNm(const SGGeod& from, const SGGeod& to);
+    
+  // Geocentric course/distance computation
+  static void advanceRadM(const SGGeoc& geoc, double course, double distance,
+                          SGGeoc& result);
+  static double courseRad(const SGGeoc& from, const SGGeoc& to);
+  static double distanceRad(const SGGeoc& from, const SGGeoc& to);
+  static double distanceM(const SGGeoc& from, const SGGeoc& to);
+  
+  /**
+   * compute the intersection of two (true) radials (in degrees), or return false
+   * if no intersection culd be computed.
+   */
+  static bool radialIntersection(const SGGeoc& a, double aRadial, 
+    const SGGeoc& b, double bRadial, SGGeoc& result);
+    
+  static bool radialIntersection(const SGGeod& a, double aRadial, 
+    const SGGeod& b, double bRadial, SGGeod& result);
 };
 
 #endif