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 982292e631bd8bd78be95304e793f07bdde4103f..aa4c1cb4e81e67c68b447eef90c8f90fc62d35d5 100644 (file)
--- a/src/Navaids/navrecord.hxx
+++ b/src/Navaids/navrecord.hxx
@@ -28,10 +28,10 @@
 
 #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
+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;
@@ -46,26 +46,18 @@ class FGNavRecord : public FGPositioned
                                 // (degrees) or localizer heading
                                 // (degrees) or dme bias (nm)
 
-    std::string _name;                // verbose name in nav database
-    FGRunway* mRunway;        // associated runway, if there is one
+    std::string mName;                // verbose name in nav database
+    PositionedID mRunway;        // associated runway, if there is one
 
     bool serviceable;          // for failure modeling
 
-  /**
-   * Helper to init data when a navrecord is associated with an airport
-   */
-  void initAirportRelation();
-  
-  void alignLocaliserWithRunway(double aThreshold);
-  
-  void readAirportSceneryData();
   void processSceneryILS(SGPropertyNode* aILSNode);
 public:
-  inline ~FGNavRecord(void) {}
-
-    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
@@ -81,12 +73,12 @@ public:
     inline const char *get_trans_ident() const { return get_ident(); }
 
   virtual const std::string& name() const
-  { return _name; }
+  { return mName; }
   
   /**
    * Retrieve the runway this navaid is associated with (for ILS/LOC/GS)
    */
-  FGRunway* runway() const { return mRunway; }
+  FGRunway* runway() const;
   
   /**
    * return the localizer width, in degrees