Whoops, work-around for #926 correctly.

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

diff --git a/src/Navaids/navrecord.hxx b/src/Navaids/navrecord.hxx
index 55a02af7ee20ebbe790c2eec1529ac36bdc07c4c..aa4c1cb4e81e67c68b447eef90c8f90fc62d35d5 100644 (file)
--- a/src/Navaids/navrecord.hxx
+++ b/src/Navaids/navrecord.hxx
@@ -28,21 +28,14 @@
 
 #include "positioned.hxx"
 
-#define FG_NAV_DEFAULT_RANGE 50 // nm
-#define FG_LOC_DEFAULT_RANGE 18 // nm
-#define FG_DME_DEFAULT_RANGE 50 // nm
-#define FG_NAV_MAX_RANGE 300    // nm
-
-// FIXME - get rid of these, and use the real enum directly
-#define FG_NAV_VOR FGPositioned::VOR
-#define FG_NAV_NDB FGPositioned::NDB
-#define FG_NAV_ILS FGPositioned::ILS
-#define FG_NAV_ANY FGPositioned::INVALID
-
-typedef FGPositioned::Type fg_nav_types;
+const double FG_NAV_DEFAULT_RANGE = 50; // nm
+const double FG_LOC_DEFAULT_RANGE = 18; // nm
+const double FG_DME_DEFAULT_RANGE = 50; // nm
+const double FG_NAV_MAX_RANGE = 300;    // nm
 
 // forward decls
 class FGRunway;
+class SGPropertyNode;
 
 class FGNavRecord : public FGPositioned 
 {
@@ -53,48 +46,49 @@ 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 mName;                // verbose name in nav database
+    PositionedID mRunway;        // associated runway, if there is one
 
     bool serviceable;          // for failure modeling
-    std::string trans_ident;         // for failure modeling
 
-  /**
-   * Helper to init data when a navrecord is associated with an airport
-   */
-  void initAirportRelation();
-  
-  void alignLocaliserWithRunway(FGRunway* aRunway, double aThreshold);
+  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);
+  FGNavRecord(PositionedID aGuid, Type type, const std::string& ident,
+              const std::string& name,
+              const SGGeod& aPos,
+              int freq, int range, double multiuse,
+              PositionedID aRunway);
     
     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(); }
+    inline const char *get_trans_ident() const { return get_ident(); }
 
+  virtual const std::string& name() const
+  { return mName; }
+  
+  /**
+   * Retrieve the runway this navaid is associated with (for ILS/LOC/GS)
+   */
+  FGRunway* runway() const;
+  
+  /**
+   * return the localizer width, in degrees
+   * computation is based up ICAO stdandard width at the runway threshold
+   * see implementation for further details.
+   */
+  double localizerWidth() const;
   
+  void bindToNode(SGPropertyNode* nd) const;
+  void unbindFromNode(SGPropertyNode* nd) const;
 };
 
 class FGTACANRecord : public SGReferenced {