[Flightgear-commitlogs] FlightGear branch, next, updated. 369e6b564f41591531bc877d7bfc8c4d1832827b

[Flightgear-commitlogs <ma...@hy...>]

The branch, next has been updated

- Log -----------------------------------------------------------------
commit 369e6b564f41591531bc877d7bfc8c4d1832827b
Author: James Turner
Date:   Mon Dec 31 17:39:52 2012 +0000

    Flightplan delegate hook for clearing the FP.
    
    This allows delegates to take action when the flightlan is cleared, and especially, for the default delegate in the route-manager to deactivate itself, and hence the GPS LEG mode - which fixes bug 940 I hope.

commit 5ff8311acca298b5c46809f2c8d773139c012826
Author: James Turner
Date:   Mon Dec 31 17:21:05 2012 +0000

    Fix route-path display of long legs.
    
    When leg spans more than a threshold (currently 0.5 degrees) of longitude, interpolate the actual path flown by the GPS/RM, which is a true great-circle. Previous we rendered a Rhumb line which does not agree at all. (Especially noticeable in the MapWidget and NavDisplay code, both of which use RoutePath to tesselate the route before rendering)


- Summary -------------------------------------------------------------

 src/Instrumentation/gps.cxx       |    2 +-
 src/Navaids/FlightPlan.cxx        |    9 ++++++
 src/Navaids/FlightPlan.hxx        |    5 ++--
 src/Navaids/routePath.cxx         |   60 +++++++++++++++++++++++++++++++++----
 src/Navaids/routePath.hxx         |    2 ++
 src/Scripting/NasalPositioned.cxx |    5 ++++
 6 files changed, 75 insertions(+), 8 deletions(-)


- Diff ----------------------------------------------------------------

diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx
index 158b87c..21485d4 100644
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@@ -716,7 +716,7 @@ void GPS::routeManagerSequenced()
   if ((index < 0) || (index >= count)) {
     _currentWaypt=NULL;
     _prevWaypt=NULL;
-    SG_LOG(SG_INSTR, SG_ALERT, "GPS: malformed route, index=" << index);
+    // no active leg on the route
     return;
   }
   
diff --git a/src/Navaids/FlightPlan.cxx b/src/Navaids/FlightPlan.cxx
index b66108f..eda1e2d 100644
--- a/src/Navaids/FlightPlan.cxx
+++ b/src/Navaids/FlightPlan.cxx
@@ -226,6 +226,9 @@ void FlightPlan::clear()
   }
   _legs.clear();  
   
+  if (_delegate) {
+    _delegate->runCleared();
+  }
   unlockDelegate();
 }
   
@@ -1205,5 +1208,11 @@ void FlightPlan::Delegate::runCurrentWaypointChanged()
   if (_inner) _inner->runCurrentWaypointChanged();
   currentWaypointChanged();
 }
+
+void FlightPlan::Delegate::runCleared()
+{
+  if (_inner) _inner->runCleared();
+  cleared();
+}  
   
 } // of namespace flightgear
diff --git a/src/Navaids/FlightPlan.hxx b/src/Navaids/FlightPlan.hxx
index 3eeb02c..8494406 100644
--- a/src/Navaids/FlightPlan.hxx
+++ b/src/Navaids/FlightPlan.hxx
@@ -104,7 +104,7 @@ public:
     virtual void departureChanged() { }
     virtual void arrivalChanged() { }
     virtual void waypointsChanged() { }
-    
+    virtual void cleared() { }
     virtual void currentWaypointChanged() { }
   
   protected:
@@ -117,7 +117,8 @@ public:
     void runArrivalChanged();
     void runWaypointsChanged();
     void runCurrentWaypointChanged();
-    
+    void runCleared();
+      
     friend class FlightPlan;
     
     bool _deleteWithPlan;
diff --git a/src/Navaids/routePath.cxx b/src/Navaids/routePath.cxx
index 6353fb5..e17c8c4 100644
--- a/src/Navaids/routePath.cxx
+++ b/src/Navaids/routePath.cxx
@@ -52,6 +52,25 @@ double pointsKnownDistanceFromGC(const SGGeoc& a, const SGGeoc&b, const SGGeoc&
   return SGMiscd::min(dp1Nm, dp2Nm);
 }
 
+// http://williams.best.vwh.net/avform.htm#Int
+double latitudeForGCLongitude(const SGGeoc& a, const SGGeoc& b, double lon)
+{
+#if 0
+Intermediate points {lat,lon} lie on the great circle connecting points 1 and 2 when:
+
+lat=atan((sin(lat1)*cos(lat2)*sin(lon-lon2)
+     -sin(lat2)*cos(lat1)*sin(lon-lon1))/(cos(lat1)*cos(lat2)*sin(lon1-lon2)))
+#endif
+  double lonDiff = a.getLongitudeRad() - b.getLongitudeRad();
+  double cosLat1 = cos(a.getLatitudeRad()),
+      cosLat2 = cos(b.getLatitudeRad());
+  double x = sin(a.getLatitudeRad()) * cosLat2 * sin(lon - b.getLongitudeRad());
+  double y = sin(b.getLatitudeRad()) * cosLat1 * sin(lon - a.getLongitudeRad());
+  double denom = cosLat1 * cosLat2 * sin(lonDiff);
+  double lat = atan((x - y) / denom);
+  return lat;
+}
+
 RoutePath::RoutePath(const flightgear::WayptVec& wpts) :
   _waypts(wpts)
 {
@@ -89,17 +108,24 @@ SGGeodVec RoutePath::pathForIndex(int index) const
   }
     
   SGGeodVec r;
-  SGGeod pos;
-  if (!computedPositionForIndex(index-1, pos)) {
+  SGGeod from, to;
+  if (!computedPositionForIndex(index-1, from)) {
     return SGGeodVec();
   }
   
-  r.push_back(pos);
-  if (!computedPositionForIndex(index, pos)) {
+  r.push_back(from);
+  if (!computedPositionForIndex(index, to)) {
     return SGGeodVec();
   }
   
-  r.push_back(pos);
+  // compute rounding offset, we want to round towards the direction of travel
+  // which depends on the east/west sign of the longitude change
+  double lonDelta = to.getLongitudeDeg() - from.getLongitudeDeg();
+  if (fabs(lonDelta) > 0.5) {
+    interpolateGreatCircle(from, to, r);
+  }
+  
+  r.push_back(to);
   
   if (_waypts[index]->type() == "runway") {
     // runways get an extra point, at the end. this is particularly
@@ -111,6 +137,30 @@ SGGeodVec RoutePath::pathForIndex(int index) const
   return r;
 }
 
+void RoutePath::interpolateGreatCircle(const SGGeod& aFrom, const SGGeod& aTo, SGGeodVec& r) const
+{
+  SGGeoc gcFrom = SGGeoc::fromGeod(aFrom),
+    gcTo = SGGeoc::fromGeod(aTo);
+  
+  double lonDelta = gcTo.getLongitudeRad() - gcFrom.getLongitudeRad();
+  if (fabs(lonDelta) < 1e-3) {
+    return;
+  }
+  
+  lonDelta = SGMiscd::normalizeAngle2(lonDelta);
+
+  int steps = static_cast<int>(fabs(lonDelta) * SG_RADIANS_TO_DEGREES * 2);
+  double lonStep = (lonDelta / steps);
+  
+  double lon = gcFrom.getLongitudeRad() + lonStep;
+  for (int s=0; s < (steps - 1); ++s) {
+    double lat = latitudeForGCLongitude(gcFrom, gcTo, lon);
+    r.push_back(SGGeod::fromGeoc(SGGeoc::fromRadM(lon, lat, SGGeodesy::EQURAD)));
+    //SG_LOG(SG_GENERAL, SG_INFO, "lon:" << lon * SG_RADIANS_TO_DEGREES << " gives lat " << lat * SG_RADIANS_TO_DEGREES);
+    lon += lonStep;
+  }
+}
+
 SGGeod RoutePath::positionForIndex(int index) const
 {
   SGGeod r;
diff --git a/src/Navaids/routePath.hxx b/src/Navaids/routePath.hxx
index 97513a7..778e0d0 100644
--- a/src/Navaids/routePath.hxx
+++ b/src/Navaids/routePath.hxx
@@ -55,6 +55,8 @@ private:
   double computeAltitudeForIndex(int index) const;
   double computeTrackForIndex(int index) const;
   
+  void interpolateGreatCircle(const SGGeod& aFrom, const SGGeod& aTo, SGGeodVec& r) const;
+  
   /**
    * Find the distance (in Nm) to climb/descend a height in feet
    */
diff --git a/src/Scripting/NasalPositioned.cxx b/src/Scripting/NasalPositioned.cxx
index 2523425..cfdadf6 100644
--- a/src/Scripting/NasalPositioned.cxx
+++ b/src/Scripting/NasalPositioned.cxx
@@ -1772,6 +1772,11 @@ public:
   {
     callDelegateMethod("currentWaypointChanged");
   }
+    
+  virtual void cleared()
+  {
+    callDelegateMethod("cleared");
+  }
 private:
   
   void callDelegateMethod(const char* method)


-----------------------------------------------------------------------


FlightGear