Heading bug (and bfi) now deals with magnetic compass heading rather than

[flightgear.git] / src / Cockpit / radiostack.cxx

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index 8a9b167e8d5654e0f85c95e9a4901d3c799b0e4a..097b57aecb42cd7d2096807b29e9abd5674ae360 100644 (file)
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -52,12 +52,22 @@ void FGRadioStack::update( double lon, double lat, double elev ) {
     double az1, az2, s;
 
     if ( nav1_valid ) {
-       // staightline distance
-       station = Point3D( nav1_dme_x, nav1_dme_y, nav1_dme_z );
-       nav1_dme_dist = aircraft.distance3D( station );
-       if ( nav1_loc ) {
+       station = Point3D( nav1_x, nav1_y, nav1_z );
+       nav1_loc_dist = aircraft.distance3D( station );
+
+       if ( nav1_has_dme ) {
+           // staightline distance
+           station = Point3D( nav1_dme_x, nav1_dme_y, nav1_dme_z );
+           nav1_dme_dist = aircraft.distance3D( station );
+       } else {
+           nav1_dme_dist = 0.0;
+       }
+
+       if ( nav1_has_gs ) {
            station = Point3D( nav1_gs_x, nav1_gs_y, nav1_gs_z );
            nav1_gs_dist = aircraft.distance3D( station );
+       } else {
+           nav1_gs_dist = 0.0;
        }
        
        if ( nav1_dme_dist < nav1_effective_range * NM_TO_METER ) {
@@ -85,12 +95,22 @@ void FGRadioStack::update( double lon, double lat, double elev ) {
     }
 
     if ( nav2_valid ) {
-       // staightline distance
-       station = Point3D( nav2_dme_x, nav2_dme_y, nav2_dme_z );
-       nav2_dme_dist = aircraft.distance3D( station );
-       if ( nav2_loc ) {
+       station = Point3D( nav2_x, nav2_y, nav2_z );
+       nav2_loc_dist = aircraft.distance3D( station );
+
+       if ( nav2_has_dme ) {
+           // staightline distance
+           station = Point3D( nav2_dme_x, nav2_dme_y, nav2_dme_z );
+           nav2_dme_dist = aircraft.distance3D( station );
+       } else {
+           nav2_dme_dist = 0.0;
+       }
+
+       if ( nav2_has_gs ) {
            station = Point3D( nav2_gs_x, nav2_gs_y, nav2_gs_z );
            nav2_gs_dist = aircraft.distance3D( station );
+       } else {
+           nav2_gs_dist = 0.0;
        }
 
        if ( nav2_dme_dist < nav2_effective_range * NM_TO_METER ) {
@@ -151,7 +171,8 @@ void FGRadioStack::search( double lon, double lat, double elev ) {
     if ( current_ilslist->query( lon, lat, elev, nav1_freq, &ils ) ) {
        nav1_valid = true;
        nav1_loc = true;
-       nav1_dme = true;
+       nav1_has_dme = ils.get_has_dme();
+       nav1_has_gs = ils.get_has_gs();
 
        nav1_loclon = ils.get_loclon();
        nav1_loclat = ils.get_loclat();
@@ -165,6 +186,9 @@ void FGRadioStack::search( double lon, double lat, double elev ) {
        nav1_radial = ils.get_locheading();
        while ( nav1_radial <   0.0 ) { nav1_radial += 360.0; }
        while ( nav1_radial > 360.0 ) { nav1_radial -= 360.0; }
+       nav1_x = ils.get_x();
+       nav1_y = ils.get_y();
+       nav1_z = ils.get_z();
        nav1_gs_x = ils.get_gs_x();
        nav1_gs_y = ils.get_gs_y();
        nav1_gs_z = ils.get_gs_z();
@@ -176,16 +200,17 @@ void FGRadioStack::search( double lon, double lat, double elev ) {
     } else if ( current_navlist->query( lon, lat, elev, nav1_freq, &nav ) ) {
        nav1_valid = true;
        nav1_loc = false;
-       nav1_dme = nav.get_dme();
+       nav1_has_dme = nav.get_has_dme();
+       nav1_has_gs = false;
        nav1_loclon = nav.get_lon();
        nav1_loclat = nav.get_lat();
        nav1_elev = nav.get_elev();
        nav1_effective_range = nav.get_range();
        nav1_target_gs = 0.0;
        nav1_radial = nav1_sel_radial;
-       nav1_dme_x = nav.get_x();
-       nav1_dme_y = nav.get_y();
-       nav1_dme_y = nav.get_z();
+       nav1_x = nav1_dme_x = nav.get_x();
+       nav1_y = nav1_dme_y = nav.get_y();
+       nav1_z = nav1_dme_z = nav.get_z();
        // cout << "Found a vor station in range" << endl;
        // cout << " id = " << nav.get_ident() << endl;
     } else {
@@ -196,7 +221,8 @@ void FGRadioStack::search( double lon, double lat, double elev ) {
     if ( current_ilslist->query( lon, lat, elev, nav2_freq, &ils ) ) {
        nav2_valid = true;
        nav2_loc = true;
-       nav2_dme = true;
+       nav2_has_dme = ils.get_has_dme();
+       nav2_has_gs = ils.get_has_gs();
 
        nav2_loclon = ils.get_loclon();
        nav2_loclat = ils.get_loclat();
@@ -206,6 +232,9 @@ void FGRadioStack::search( double lon, double lat, double elev ) {
        nav2_radial = ils.get_locheading();
        while ( nav2_radial <   0.0 ) { nav2_radial += 360.0; }
        while ( nav2_radial > 360.0 ) { nav2_radial -= 360.0; }
+       nav2_x = ils.get_x();
+       nav2_y = ils.get_y();
+       nav2_z = ils.get_z();
        nav2_gs_x = ils.get_gs_x();
        nav2_gs_y = ils.get_gs_y();
        nav2_gs_z = ils.get_gs_z();
@@ -217,17 +246,17 @@ void FGRadioStack::search( double lon, double lat, double elev ) {
     } else if ( current_navlist->query( lon, lat, elev, nav2_freq, &nav ) ) {
        nav2_valid = true;
        nav2_loc = false;
-       nav2_dme = nav.get_dme();
-
+       nav2_has_dme = nav.get_has_dme();
+       nav2_has_dme = false;
        nav2_loclon = nav.get_lon();
        nav2_loclat = nav.get_lat();
        nav2_elev = nav.get_elev();
        nav2_effective_range = nav.get_range();
        nav2_target_gs = 0.0;
        nav2_radial = nav2_sel_radial;
-       nav2_dme_x = nav.get_x();
-       nav2_dme_y = nav.get_y();
-       nav2_dme_z = nav.get_z();
+       nav2_x = nav2_dme_x = nav.get_x();
+       nav2_y = nav2_dme_y = nav.get_y();
+       nav2_z = nav2_dme_z = nav.get_z();
        // cout << "Found a vor station in range" << endl;
        // cout << " id = " << nav.get_ident() << endl;
     } else {