Directly associate runways objects with their ILS navrecord (if one exists)

diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx
index fc70d8384237883cf6920471a80d7f7eb75d0576..e6f62d88bb03274d7e057c1b480bac1601c86612 100644 (file)
--- a/src/Airports/runways.cxx
+++ b/src/Airports/runways.cxx
@@ -71,7 +71,8 @@ FGRunway::FGRunway(FGAirport* aAirport, const string& aIdent,
   _airport(aAirport),
   _reciprocal(reciprocal),
   _displ_thresh(displ_thresh),
-  _stopway(stopway)
+  _stopway(stopway),
+  _ils(NULL)
 {
 }
 

diff --git a/src/Airports/runways.hxx b/src/Airports/runways.hxx
index 397db76518294fb534c7ed0f51867b9b7156d9ae..595c77b8bd53cc23145815ea9c3d2d539d02fd49 100644 (file)
--- a/src/Airports/runways.hxx
+++ b/src/Airports/runways.hxx
@@ -30,6 +30,7 @@
 
 // forward decls
 class FGAirport;
+class FGNavRecord;
 
 class FGRunway : public FGRunwayBase
 {
@@ -37,6 +38,7 @@ class FGRunway : public FGRunwayBase
   bool _reciprocal;
   double _displ_thresh;
   double _stopway;
+  FGNavRecord* _ils;
 public:
   
   FGRunway(FGAirport* aAirport, const std::string& rwy_no,
@@ -90,7 +92,7 @@ public:
   double stopwayM() const
   { return _stopway * SG_FEET_TO_METER; }
   
-    /**
+  /**
    * Airport this runway is located at
    */
   FGAirport* airport() const
@@ -99,6 +101,9 @@ public:
   // FIXME - should die once airport / runway creation is cleaned up
   void setAirport(FGAirport* aAirport)
   { _airport = aAirport; }
+  
+  FGNavRecord* ILS() const { return _ils; }
+  void setILS(FGNavRecord* nav) { _ils = nav; }
 };
 
 #endif // _FG_RUNWAYS_HXX

diff --git a/src/Navaids/navrecord.cxx b/src/Navaids/navrecord.cxx
index 0695010cdf60df96e30b9a8dface8928f290f63f..2689f3d3bc4a3fb4065574c1718509b09d487ec3 100644 (file)
--- a/src/Navaids/navrecord.cxx
+++ b/src/Navaids/navrecord.cxx
@@ -29,6 +29,7 @@
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
+#include <simgear/sg_inlines.h>
 
 #include <Navaids/navrecord.hxx>
 #include <Navaids/navdb.hxx>
@@ -43,6 +44,7 @@ FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent,
   range(aRange),
   multiuse(aMultiuse),
   _name(aName),
+  mRunway(NULL),
   serviceable(true),
   trans_ident(aIdent)
 { 
@@ -82,10 +84,14 @@ void FGNavRecord::initAirportRelation()
     return; // not airport-located
   }
   
-  FGRunway* runway = getRunwayFromName(_name);    
+  mRunway = getRunwayFromName(_name);    
   // fudge elevation to the runway elevation if it's not specified
   if (fabs(elevation()) < 0.01) {
-    mPosition.setElevationFt(runway->elevation());
+    mPosition.setElevationFt(mRunway->elevation());
+  }
+  
+  if (type() == ILS) {
+    mRunway->setILS(this);
   }
   
   // align localizers with their runway
@@ -96,35 +102,29 @@ void FGNavRecord::initAirportRelation()
     
    double threshold 
      = fgGetDouble( "/sim/navdb/localizers/auto-align-threshold-deg", 5.0 );
-    alignLocaliserWithRunway(runway, threshold);
+    alignLocaliserWithRunway(threshold);
   }
 }
 
-void FGNavRecord::alignLocaliserWithRunway(FGRunway* aRunway, double aThreshold)
+void FGNavRecord::alignLocaliserWithRunway(double aThreshold)
 {
 // find the distance from the threshold to the localizer
-  SGGeod runwayThreshold(aRunway->threshold());
+  SGGeod runwayThreshold(mRunway->threshold());
   double dist, az1, az2;
   SGGeodesy::inverse(mPosition, runwayThreshold, az1, az2, dist);
 
 // back project that distance along the runway center line
-  SGGeod newPos = aRunway->pointOnCenterline(dist);
+  SGGeod newPos = mRunway->pointOnCenterline(dist);
 
-  double hdg_diff = get_multiuse() - aRunway->headingDeg();
-
-  // clamp to [-180.0 ... 180.0]
-  if ( hdg_diff < -180.0 ) {
-      hdg_diff += 360.0;
-  } else if ( hdg_diff > 180.0 ) {
-      hdg_diff -= 360.0;
-  }
+  double hdg_diff = get_multiuse() - mRunway->headingDeg();
+  SG_NORMALIZE_RANGE(hdg_diff, -180.0, 180.0);
 
   if ( fabs(hdg_diff) <= aThreshold ) {
     mPosition = newPos;
-    set_multiuse( aRunway->headingDeg() );
+    set_multiuse( mRunway->headingDeg() );
   } else {
     SG_LOG(SG_GENERAL, SG_WARN, "localizer:" << ident() << ", aligning with runway " 
-      << aRunway->ident() << " exceeded heading threshold");
+      << mRunway->ident() << " exceeded heading threshold");
   }
 }
 

diff --git a/src/Navaids/navrecord.hxx b/src/Navaids/navrecord.hxx
index 5d205d654706e7392a31f542617dd8c51b9d0569..f686d1c157dae22d97125caac67b879655de58f3 100644 (file)
--- a/src/Navaids/navrecord.hxx
+++ b/src/Navaids/navrecord.hxx
@@ -54,7 +54,7 @@ class FGNavRecord : public FGPositioned
                                 // (degrees) or dme bias (nm)
 
     std::string _name;                // verbose name in nav database
-    FGRunway* runway;
+    FGRunway* mRunway;        // associated runway, if there is one
 
     bool serviceable;          // for failure modeling
     std::string trans_ident;         // for failure modeling
@@ -64,7 +64,7 @@ class FGNavRecord : public FGPositioned
    */
   void initAirportRelation();
   
-  void alignLocaliserWithRunway(FGRunway* aRunway, double aThreshold);
+  void alignLocaliserWithRunway(double aThreshold);
 public:
   inline ~FGNavRecord(void) {}
 
@@ -87,6 +87,11 @@ public:
 
   virtual const std::string& name() const
   { return _name; }
+  
+  /**
+   * Retrieve the runway this navaid is associated with (for ILS/LOC/GS)
+   */
+  FGRunway* runway() const { return mRunway; }
 };
 
 class FGTACANRecord : public SGReferenced {