Restore GPS compatibility with 2.10

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

diff --git a/src/Instrumentation/tacan.hxx b/src/Instrumentation/tacan.hxx
old mode 100755 (executable)
new mode 100644 (file)
index abf710e..48ca925
--- a/src/Instrumentation/tacan.hxx
+++ b/src/Instrumentation/tacan.hxx
@@ -7,11 +7,6 @@
 #ifndef __INSTRUMENTS_TACAN_HXX
 #define __INSTRUMENTS_TACAN_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-#include <simgear/math/point3d.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
@@ -27,7 +22,6 @@
  * /heading
  * /systems/electrical/outputs/TACAN
  * /instrumentation/"name"/serviceable
- * /instrumentation/"name"/frequencies/source
  * /instrumentation/"name"/frequencies/selected-mhz
  *
  * Output properties:
@@ -37,40 +31,36 @@
  * /instrumentation/"name"/indicated-ground-speed-kt
  * /instrumentation/"name"/indicated-time-kt
  */
-class TACAN : public SGSubsystem
+class TACAN : public SGSubsystem, public SGPropertyChangeListener
 {
 
 public:
 
     TACAN ( SGPropertyNode *node );
-    TACAN ();
     virtual ~TACAN ();
 
     virtual void init ();
+    virtual void reinit ();
     virtual void update (double delta_time_sec);
 
 private:
 
-    void search (double frequency, double longitude_rad,
-                 double latitude_rad, double altitude_m);
-    double searchChannel (const string& channel);
+    void search (double frequency, const SGGeod& pos);
+  double searchChannel (const std::string& channel);
+    void valueChanged (SGPropertyNode *);
+
+    std::string _name;
+    unsigned int _num;
 
-    SGPropertyNode_ptr _longitude_node;
-    SGPropertyNode_ptr _latitude_node;
-    SGPropertyNode_ptr _altitude_node;
     SGPropertyNode_ptr _heading_node;
     SGPropertyNode_ptr _yaw_node;
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _electrical_node;
-    SGPropertyNode_ptr _source_node;
     SGPropertyNode_ptr _frequency_node;
     SGPropertyNode_ptr _display_node;
     SGPropertyNode_ptr _x_shift_node;
     SGPropertyNode_ptr _y_shift_node;
     SGPropertyNode_ptr _rotation_node;
-    /*SGPropertyNode_ptr _x_shift_calibration_node;
-    SGPropertyNode_ptr _y_shift_calibration_node;
-    SGPropertyNode_ptr _distance_calibration_node;*/
 
     SGPropertyNode_ptr _in_range_node;
     SGPropertyNode_ptr _distance_node;
@@ -80,15 +70,21 @@ private:
     SGPropertyNode_ptr _ident_node;
     SGPropertyNode_ptr _name_node;
 
-    SGPropertyNode_ptr _carrier_name_node;
     SGPropertyNode_ptr _channel_node;
-
-    SGPropertyNode_ptr _tanker_callsign_node;
-    SGPropertyNode_ptr _mp_callsign_node;
-
-    string _last_channel;
+    SGPropertyNode_ptr _channel_in0_node;
+    SGPropertyNode_ptr _channel_in1_node;
+    SGPropertyNode_ptr _channel_in2_node;
+    SGPropertyNode_ptr _channel_in3_node;
+    SGPropertyNode_ptr _channel_in4_node;
+
+    SGPropertyNode_ptr _carrier_name_node;             // FIXME unused
+    SGPropertyNode_ptr _tanker_callsign_node;          // FIXME
+    SGPropertyNode_ptr _mp_callsign_node;              // FIXME
+
+    bool _new_frequency;
+    std::string _channel;
     double _last_distance_nm;
-    double _last_frequency_mhz;
+    double _frequency_mhz;
     double _time_before_search_sec;
 
     bool _mobile_valid;
@@ -99,20 +95,17 @@ private:
     double _transmitter_range_nm;
     double _transmitter_bearing_deg;
     double _transmitter_bias;
-    string _transmitter_name;
-    string _transmitter_ident;
+    std::string _transmitter_name;
+    std::string _transmitter_ident;
 
-    double _mobile_lat, _mobile_lon;
-    double _mobile_elevation_ft;
+    SGGeod _mobilePos;
     double _mobile_range_nm;
     double _mobile_bearing_deg;
     double _mobile_bias;
-    string _mobile_name;
-    string _mobile_ident;
-
-    string _name;
-    int _num;
+    std::string _mobile_name;
+    std::string _mobile_ident;
 
+    int _listener_active;
 };