Merge branch 'master' into next

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

diff --git a/src/Navaids/navrecord.hxx b/src/Navaids/navrecord.hxx
index 36cb4f2976fa7e4e4201148010cecea0a4600f5d..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 
 {
@@ -53,9 +54,8 @@ class FGNavRecord : public FGPositioned
                                 // (degrees) or localizer heading
                                 // (degrees) or dme bias (nm)
 
-    std::string name;                // verbose name in nav database
-    std::string apt_id;              // corresponding airport id
-
+    std::string _name;                // verbose name in nav database
+    FGRunway* mRunway;        // associated runway, if there is one
 
     bool serviceable;          // for failure modeling
     std::string trans_ident;         // for failure modeling
@@ -65,36 +65,37 @@ 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,
-      double lat, double lon, double aElevFt,
+      const SGGeod& aPos,
       int freq, int range, double multiuse);
     
     inline double get_lon() const { return longitude(); } // degrees
     inline double get_lat() const { return latitude(); } // degrees
     inline double get_elev_ft() const { return elevation(); }
-
-    const SGGeod& get_pos() const { return geod(); }
-    SGVec3d get_cart() const;
-    
-    Type get_fg_type() const { return type(); }
-    
+        
     inline int get_freq() const { return freq; }
     inline int get_range() const { return range; }
     inline double get_multiuse() const { return multiuse; }
     inline void set_multiuse( double m ) { multiuse = m; }
     inline const char *get_ident() const { return ident().c_str(); }
-    inline const std::string& get_name() const { return name; }
-    inline const std::string& get_apt_id() const { return apt_id; }
+
     inline bool get_serviceable() const { return serviceable; }
     inline const char *get_trans_ident() const { return trans_ident.c_str(); }
 
+  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 {