A couple more straggling instrumentation clean ups.

[flightgear.git] / src / Instrumentation / gps.hxx

diff --git a/src/Instrumentation/gps.hxx b/src/Instrumentation/gps.hxx
index cb3df424e7d37921dc862f453fd365429b06d857..fabf4e776916dea7380ea1dce7b5b08ee38d21ff 100644 (file)
--- a/src/Instrumentation/gps.hxx
+++ b/src/Instrumentation/gps.hxx
@@ -12,6 +12,7 @@
 #endif
 
 #include <simgear/props/props.hxx>
+#include <simgear/route/route.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
 
@@ -66,6 +67,7 @@ class GPS : public SGSubsystem
 
 public:
 
+    GPS (SGPropertyNode *node);
     GPS ();
     virtual ~GPS ();
 
@@ -77,10 +79,6 @@ private:
     void search (double frequency, double longitude_rad,
                  double latitude_rad, double altitude_m);
 
-    double degrange360 (double deg);
-    double degrange180 (double deg);
-    double degrange (double deg, double min, double max);
-
     SGPropertyNode_ptr _longitude_node;
     SGPropertyNode_ptr _latitude_node;
     SGPropertyNode_ptr _altitude_node;
@@ -143,6 +141,12 @@ private:
     SGPropertyNode_ptr _leg_to_flag_node;
     SGPropertyNode_ptr _alt_deviation_node;
 
+    SGPropertyNode *_route;
+    SGPropertyNode *addWp;
+    SGPropertyNode *popWp;
+
+    SGRoute *route;
+
     bool _last_valid;
     double _last_longitude_deg;
     double _last_latitude_deg;
@@ -168,6 +172,9 @@ private:
     double range_error;
     double elapsed_time;
 
+    string name;
+    int num;
+
 };