#895: AI traffic not working when system is offline but real-wx is enabled

Add a timeout when waiting for valid METAR.

diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index acc9fa90c883c7cd2acb8d3caa1c68f1585dd718..0d895a8c9dae751cf3fa5797c492d7d1820a012a 100644 (file)
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -151,6 +151,7 @@ private:
 FGTrafficManager::FGTrafficManager() :
   inited(false),
   doingInit(false),
+  waitingMetarTime(0.0),
   enabled("/sim/traffic-manager/enabled"),
   aiEnabled("/sim/ai/enabled"),
   realWxEnabled("/environment/realwx/enabled"),
@@ -339,7 +340,36 @@ void FGTrafficManager::loadHeuristics()
     }
 }
 
-void FGTrafficManager::update(double /*dt */ )
+bool FGTrafficManager::metarReady(double dt)
+{
+    // wait for valid METAR (when realWX is enabled only), since we need
+    // to know the active runway
+    if (metarValid || !realWxEnabled)
+    {
+        waitingMetarTime = 0.0;
+        return true;
+    }
+
+    // METAR timeout: when running offline, remote server is down etc
+    if (waitingMetarStation != fgGetString("/environment/metar/station-id"))
+    {
+        // station has changed: wait for reply, restart timeout
+        waitingMetarTime = 0.0;
+        waitingMetarStation = fgGetString("/environment/metar/station-id");
+        return false;
+    }
+
+    // timeout elapsed (10 seconds)?
+    if (waitingMetarTime > 20.0)
+    {
+        return true;
+    }
+
+    waitingMetarTime += dt;
+    return false;
+}
+
+void FGTrafficManager::update(double dt)
 {
     if (!enabled)
     {
@@ -348,9 +378,8 @@ void FGTrafficManager::update(double /*dt */ )
         return;
     }
 
-    if ((realWxEnabled && !metarValid)) {
+    if (!metarReady(dt))
         return;
-    }
 
     if (!aiEnabled)
     {

diff --git a/src/Traffic/TrafficMgr.hxx b/src/Traffic/TrafficMgr.hxx
index bc27058041b61de1f1561b85158b7471bb4963af..5be7fd3cdf0b21fbcbdd4864c983920e568ad758 100644 (file)
--- a/src/Traffic/TrafficMgr.hxx
+++ b/src/Traffic/TrafficMgr.hxx
@@ -86,6 +86,8 @@ class FGTrafficManager : public SGSubsystem, public XMLVisitor
 private:
   bool inited;
   bool doingInit;
+  double waitingMetarTime;
+  std::string waitingMetarStation;
   
   ScheduleVector scheduledAircraft;
   ScheduleVectorIterator currAircraft, currAircraftClosest;
@@ -122,9 +124,11 @@ private:
   
   // helper to read and parse the schedule data.
   // this is run on a helper thread, so be careful about
-  // accesing properties during parsing
+  // accessing properties during parsing
   void parseSchedule(const SGPath& path);
   
+  bool metarReady(double dt);
+
 public:
   FGTrafficManager();
   ~FGTrafficManager();