Ensure individual log-level setting works.

[simgear.git] / simgear / magvar / magvar.hxx

diff --git a/simgear/magvar/magvar.hxx b/simgear/magvar/magvar.hxx
index 4180c9612883b8734954ebfc3576dae425d7ffb0..605bece722bc09a99a80a249f803db8e84870048 100644 (file)
--- a/simgear/magvar/magvar.hxx
+++ b/simgear/magvar/magvar.hxx
@@ -5,7 +5,7 @@
 
 // Written by Curtis Olson, started July 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -19,7 +19,7 @@
 //
 // 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -28,14 +28,13 @@
 #define _MAGVAR_HXX
 
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
+#endif
 
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+// forward decls
+class SGGeod;
 
 /**
  * Magnetic variation wrapper class.
@@ -82,6 +81,11 @@ public:
      */
     void update( double lon, double lat, double alt_m, double jd );
 
+    /**
+     * overloaded variant taking an SGGeod to specify position
+     */
+    void update( const SGGeod& geod, double jd );
+
     /** @return the current magnetic variation in radians. */
     double get_magvar() const { return magvar; }
 
@@ -99,5 +103,9 @@ public:
  */
 double sgGetMagVar( double lon, double lat, double alt_m, double jd );
 
+/**
+ * overload version of the above to take a SGGeod
+ */
+double sgGetMagVar( const SGGeod& pos, double jd );
 
 #endif // _MAGVAR_HXX