Melchior FRANZ:

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

diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx
index e1fe6077bdfcda9559f6888f2c098d105167ffc5..26aad8dcfeba8c86fb5f8ea86877a4371db21867 100644 (file)
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@@ -32,7 +32,16 @@ GPS::GPS ( SGPropertyNode *node)
       _last_longitude_deg(0),
       _last_latitude_deg(0),
       _last_altitude_m(0),
-      _last_speed_kts(0)
+      _last_speed_kts(0),
+      _wp0_latitude_deg(0),
+      _wp0_longitude_deg(0),
+      _wp0_altitude_m(0),
+      _wp1_latitude_deg(0),
+      _wp1_longitude_deg(0),
+      _wp1_altitude_m(0),
+      _alt_dist_ratio(0),
+      _distance_m(0),
+      _course_deg(0)
 {
     int i;
     for ( i = 0; i < node->nChildren(); ++i ) {
@@ -57,7 +66,16 @@ GPS::GPS ()
       _last_longitude_deg(0),
       _last_latitude_deg(0),
       _last_altitude_m(0),
-      _last_speed_kts(0)
+      _last_speed_kts(0),
+      _wp0_latitude_deg(0),
+      _wp0_longitude_deg(0),
+      _wp0_altitude_m(0),
+      _wp1_latitude_deg(0),
+      _wp1_longitude_deg(0),
+      _wp1_altitude_m(0),
+      _alt_dist_ratio(0),
+      _distance_m(0),
+      _course_deg(0)
 {
 }
 
@@ -90,7 +108,7 @@ GPS::init ()
 
     _wp0_longitude_node = wp0_node->getChild("longitude-deg", 0, true);
     _wp0_latitude_node = wp0_node->getChild("latitude-deg", 0, true);
-    _wp0_altitude_node = wp0_node->getChild("altitude-deg", 0, true);
+    _wp0_altitude_node = wp0_node->getChild("altitude-ft", 0, true);
     _wp0_ID_node = wp0_node->getChild("ID", 0, true);
     _wp0_name_node = wp0_node->getChild("name", 0, true);
     _wp0_course_node = wp0_node->getChild("desired-course-deg", 0, true);
@@ -110,7 +128,7 @@ GPS::init ()
 
     _wp1_longitude_node = wp1_node->getChild("longitude-deg", 0, true);
     _wp1_latitude_node = wp1_node->getChild("latitude-deg", 0, true);
-    _wp1_altitude_node = wp1_node->getChild("altitude-deg", 0, true);
+    _wp1_altitude_node = wp1_node->getChild("altitude-ft", 0, true);
     _wp1_ID_node = wp1_node->getChild("ID", 0, true);
     _wp1_name_node = wp1_node->getChild("name", 0, true);
     _wp1_course_node = wp1_node->getChild("desired-course-deg", 0, true);
@@ -325,12 +343,12 @@ GPS::update (double delta_time_sec)
             FGAirport a;
             //cout << "Airport found" << endl;
             a = globals->get_airports()->search(longitude_deg, latitude_deg, false);
-            _wp1_ID_node->setStringValue(a._id.c_str());
-            wp1_longitude_deg = a._longitude;
-            wp1_latitude_deg = a._latitude;
-            _wp1_name_node->setStringValue(a._name.c_str());
+            _wp1_ID_node->setStringValue(a.getId().c_str());
+            wp1_longitude_deg = a.getLongitude();
+            wp1_latitude_deg = a.getLatitude();
+            _wp1_name_node->setStringValue(a.getName().c_str());
             _get_nearest_airport_node->setBoolValue(false);
-            _last_wp1_ID = wp1_ID = a._id.c_str();
+            _last_wp1_ID = wp1_ID = a.getId().c_str();
         }
         
         // If the waypoint 0 ID has changed, try to find the new ID
@@ -341,11 +359,11 @@ GPS::update (double delta_time_sec)
             if (waypont_type == "airport") {
                 FGAirport a;
                 a = globals->get_airports()->search( wp0_ID );
-                if ( a._id == wp0_ID ) {
+                if ( a.getId() == wp0_ID ) {
                     //cout << "Airport found" << endl;
-                    wp0_longitude_deg = a._longitude;
-                    wp0_latitude_deg = a._latitude;
-                    _wp0_name_node->setStringValue(a._name.c_str());
+                    wp0_longitude_deg = a.getLongitude();
+                    wp0_latitude_deg = a.getLatitude();
+                    _wp0_name_node->setStringValue(a.getName().c_str());
                 }
             }
             else if (waypont_type == "nav") {
@@ -380,11 +398,11 @@ GPS::update (double delta_time_sec)
             if (waypont_type == "airport") {
                 FGAirport a;
                 a = globals->get_airports()->search( wp1_ID );
-                if ( a._id == wp1_ID ) {
+                if ( a.getId() == wp1_ID ) {
                     //cout << "Airport found" << endl;
-                    wp1_longitude_deg = a._longitude;
-                    wp1_latitude_deg = a._latitude;
-                    _wp1_name_node->setStringValue(a._name.c_str());
+                    wp1_longitude_deg = a.getLongitude();
+                    wp1_latitude_deg = a.getLatitude();
+                    _wp1_name_node->setStringValue(a.getName().c_str());
                 }
             }
             else if (waypont_type == "nav") {