NavData: can refresh some in-place.

(Hacking to support faster scenery-path switching)

diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx
index 84205a27620a9de91f27cf0e6c69170aa31d6bc7..4dc8660767be7d0dc745f8a72af91148385c356f 100644 (file)
--- a/src/Airports/runways.cxx
+++ b/src/Airports/runways.cxx
@@ -204,6 +204,16 @@ FGRunway::getApproaches(flightgear::ProcedureType type) const
   return result;
 }
 
+void FGRunway::updateThreshold(const SGGeod& newThreshold, double newHeading,
+                     double newDisplacedThreshold,
+                     double newStopway)
+{
+    modifyPosition(newThreshold);
+    _heading = newHeading;
+    _stopway = newStopway;
+    _displ_thresh = newDisplacedThreshold;
+}
+
 FGHelipad::FGHelipad(PositionedID aGuid,
                         PositionedID aAirport, const string& aIdent,
                         const SGGeod& aGeod,

diff --git a/src/Airports/runways.hxx b/src/Airports/runways.hxx
index 03434ab8efff2a6c629f9b6c0d35e2872614e095..ae440475359793e4090e30a89179dbd110fbcf76 100644 (file)
--- a/src/Airports/runways.hxx
+++ b/src/Airports/runways.hxx
@@ -117,6 +117,10 @@ public:
     flightgear::ProcedureType type = flightgear::PROCEDURE_INVALID
   ) const;
   
+  void updateThreshold(const SGGeod& newThreshold,
+                       double newHeading,
+                       double newDisplacedThreshold,
+                       double newStopway);
 };
 
 class FGHelipad : public FGRunwayBase

diff --git a/src/Navaids/navrecord.cxx b/src/Navaids/navrecord.cxx
index 8700a577f5ec1bab04dcac85d3944d815b130749..cb83fd02d189fbdb3794f8637ce338fdb152523a 100644 (file)
--- a/src/Navaids/navrecord.cxx
+++ b/src/Navaids/navrecord.cxx
@@ -103,6 +103,12 @@ void FGNavRecord::setColocatedDME(PositionedID other)
   mColocated = other;
 }
 
+void FGNavRecord::updateFromXML(const SGGeod& geod, double heading)
+{
+    modifyPosition(geod);
+    multiuse = heading;
+}
+
 FGTACANRecord::FGTACANRecord(void) :
     channel(""),
     freq(0)

diff --git a/src/Navaids/navrecord.hxx b/src/Navaids/navrecord.hxx
index e4f28c5f8598ad71555f1d92399d4aa6a662d937..a96e171d85b1398a0135efac02f80886ba69d10c 100644 (file)
--- a/src/Navaids/navrecord.hxx
+++ b/src/Navaids/navrecord.hxx
@@ -49,7 +49,6 @@ class FGNavRecord : public FGPositioned
     PositionedID mColocated;     // Colocated DME at a navaid (ILS, VOR, TACAN, NDB)
     bool serviceable;          // for failure modeling
 
-  void processSceneryILS(SGPropertyNode* aILSNode);
 public:
   FGNavRecord(PositionedID aGuid, Type type, const std::string& ident,
               const std::string& name,
@@ -90,6 +89,8 @@ public:
 
   void setColocatedDME(PositionedID other);
   bool hasDME();
+    
+    void updateFromXML(const SGGeod& geod, double heading);
 };
 
 class FGTACANRecord : public SGReferenced {