Merge branch 'master' into next

[flightgear.git] / src / Navaids / navrecord.hxx

diff --git a/src/Navaids/navrecord.hxx b/src/Navaids/navrecord.hxx
index 57c199d6cea225f17e5ad2bacc81c57fb9898619..afb60083b2473d33a811561b8f7c6f1bf9ef43c1 100644 (file)
--- a/src/Navaids/navrecord.hxx
+++ b/src/Navaids/navrecord.hxx
@@ -43,6 +43,7 @@ typedef FGPositioned::Type fg_nav_types;
 
 // forward decls
 class FGRunway;
+class SGPropertyNode;
 
 class FGNavRecord : public FGPositioned 
 {
@@ -54,7 +55,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,12 +65,13 @@ class FGNavRecord : public FGPositioned
    */
   void initAirportRelation();
   
-  void alignLocaliserWithRunway(FGRunway* aRunway, double aThreshold);
+  void alignLocaliserWithRunway(double aThreshold);
+  
+  void readAirportSceneryData();
+  void processSceneryILS(SGPropertyNode* aILSNode);
 public:
   inline ~FGNavRecord(void) {}
 
-  static FGNavRecord* createFromStream(std::istream& aStream);
-
     FGNavRecord(Type type, const std::string& ident, const std::string& name,
       const SGGeod& aPos,
       int freq, int range, double multiuse);
@@ -89,6 +91,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 {