Move viewer-related sources to separate folder.

[flightgear.git] / src / Autopilot / route_mgr.cxx

diff --git a/src/Autopilot/route_mgr.cxx b/src/Autopilot/route_mgr.cxx
index 4abd9286f1fec2a99b32f4d6dcfdff2182eac8b7..b16318da76f5906054f5a081a3de6afa6ad18b6f 100644 (file)
--- a/src/Autopilot/route_mgr.cxx
+++ b/src/Autopilot/route_mgr.cxx
@@ -341,6 +341,8 @@ void FGRouteMgr::init() {
   
   totalDistance = fgGetNode(RM "total-distance", true);
   totalDistance->setDoubleValue(0.0);
+  distanceToGo = fgGetNode(RM "distance-remaining-nm", true);
+  distanceToGo->setDoubleValue(0.0);
   
   ete = fgGetNode(RM "ete", true);
   ete->setDoubleValue(0.0);
@@ -456,34 +458,44 @@ void FGRouteMgr::update( double dt )
   double distanceM;
   boost::tie(courseDeg, distanceM) = curWpt->courseAndDistanceFrom(currentPos);
   
-// update wp0 / wp1 / wp-last for legacy users
+// update wp0 / wp1 / wp-last
   wp0->setDoubleValue("dist", distanceM * SG_METER_TO_NM);
+  wp0->setDoubleValue("true-bearing-deg", courseDeg);
   courseDeg -= magvar->getDoubleValue(); // expose magnetic bearing
   wp0->setDoubleValue("bearing-deg", courseDeg);
   setETAPropertyFromDistance(wp0->getChild("eta"), distanceM);
   
+  double totalPathDistance = totalDistance->getDoubleValue() * SG_NM_TO_METER;
   double totalDistanceRemaining = distanceM; // distance to current waypoint
+  double pathDistance = cachedWaypointPathTotalDistance(_currentIndex);
+  
+// total distance to go, is direct distance to wp0, plus the remaining
+// path distance from wp0
+  totalDistanceRemaining += (totalPathDistance - pathDistance);
+  
+  wp0->setDoubleValue("distance-along-route-nm", 
+                      pathDistance * SG_METER_TO_NM);
+  wp0->setDoubleValue("remaining-distance-nm", 
+                      (totalPathDistance - pathDistance) * SG_METER_TO_NM);
   
   Waypt* nextWpt = nextWaypt();
   if (nextWpt) {
     boost::tie(courseDeg, distanceM) = nextWpt->courseAndDistanceFrom(currentPos);
      
     wp1->setDoubleValue("dist", distanceM * SG_METER_TO_NM);
+    wp1->setDoubleValue("true-bearing-deg", courseDeg);
     courseDeg -= magvar->getDoubleValue(); // expose magnetic bearing
     wp1->setDoubleValue("bearing-deg", courseDeg);
     setETAPropertyFromDistance(wp1->getChild("eta"), distanceM);
-  }
-  
-  Waypt* prev = curWpt;
-  for (unsigned int i=_currentIndex + 1; i<_route.size(); ++i) {
-    Waypt* w = _route[i];
-    if (w->flag(WPT_DYNAMIC)) continue;
-    totalDistanceRemaining += SGGeodesy::distanceM(prev->position(), w->position());
-    prev = w;
-    
     
+    double pathDistance = cachedWaypointPathTotalDistance(_currentIndex + 1);    
+    wp1->setDoubleValue("distance-along-route-nm", 
+                        pathDistance * SG_METER_TO_NM);
+    wp1->setDoubleValue("remaining-distance-nm", 
+                        (totalPathDistance - pathDistance) * SG_METER_TO_NM);
   }
   
+  distanceToGo->setDoubleValue(totalDistanceRemaining * SG_METER_TO_NM);
   wpn->setDoubleValue("dist", totalDistanceRemaining * SG_METER_TO_NM);
   ete->setDoubleValue(totalDistanceRemaining * SG_METER_TO_NM / groundSpeed * 3600.0);
   setETAPropertyFromDistance(wpn->getChild("eta"), totalDistanceRemaining);
@@ -992,6 +1004,8 @@ void FGRouteMgr::update_mirror()
   mirror->removeChildren("wp");
   
   int num = numWaypts();
+  double totalDistanceEnroute = 0.0;
+    
   for (int i = 0; i < num; i++) {
     Waypt* wp = _route[i];
     SGPropertyNode *prop = mirror->getChild("wp", i, 1);
@@ -1008,6 +1022,8 @@ void FGRouteMgr::update_mirror()
         next->courseAndDistanceFrom(pos);
       prop->setDoubleValue("leg-bearing-true-deg", crsDist.first);
       prop->setDoubleValue("leg-distance-nm", crsDist.second * SG_METER_TO_NM);
+      prop->setDoubleValue("distance-along-route-nm", totalDistanceEnroute);
+      totalDistanceEnroute += crsDist.second * SG_METER_TO_NM;
     }
     
     if (wp->altitudeRestriction() != RESTRICT_NONE) {
@@ -1049,6 +1065,28 @@ void FGRouteMgr::update_mirror()
   if (rmDlg) {
     rmDlg->updateValues();
   }
+    
+  if (_departure) {
+    departure->setDoubleValue("field-elevation-ft", _departure->getElevation());
+  }
+  
+  if (_destination) {
+    destination->setDoubleValue("field-elevation-ft", _destination->getElevation());
+  }
+  
+  totalDistance->setDoubleValue(totalDistanceEnroute);
+}
+
+double FGRouteMgr::cachedLegPathDistanceM(int index) const
+{
+  SGPropertyNode *prop = mirror->getChild("wp", index, 1);
+  return prop->getDoubleValue("leg-distance-nm") * SG_NM_TO_METER;
+}
+
+double FGRouteMgr::cachedWaypointPathTotalDistance(int index) const
+{
+  SGPropertyNode *prop = mirror->getChild("wp", index, 1);
+  return prop->getDoubleValue("distance-along-route-nm") * SG_NM_TO_METER;
 }
 
 // command interface /autopilot/route-manager/input: