flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 08:36:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T773, use correct transfer, avoid continously transferring because of wrong coordinates

Browse Source 
* do not use own situation as reference for ground plane, but original coordinates of ground elv. position
* some functions renamed
This commit is contained in:
Klaus Basan
2020-02-26 22:17:06 +01:00
committed by Mat Sutcliffe
parent 08186e6559
commit acd5ee5a3c
5 changed files with 64 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackmisc/aviation/aircraftsituationlist.cpp
View File

@@ -400,14 +400,19 @@ namespace BlackMisc
CAircraftSituation CAircraftSituationList::findClosestElevationWithinRange(const ICoordinateGeodetic &coordinate, const CLength &range) const
{
CLength r = range.isNull() || range < CElevationPlane::singlePointRadius() ? CElevationPlane::singlePointRadius() : range;
const CLength r = range.isNull() || range < CElevationPlane::singlePointRadius() ? CElevationPlane::singlePointRadius() : range;
CAircraftSituation situationWithElevation = CAircraftSituation::null();
CLength bestDistance = CLength::null();
for (const CAircraftSituation &s : *this)
{
if (!s.hasGroundElevation()) { continue; }
const CLength distance = s.calculateGreatCircleDistance(coordinate);
// we need to calculate distance to coordinates of the plane
// not the situation using the coordinate
// const CLength distance = s.calculateGreatCircleDistance(coordinate);
const CLength distance = s.getGroundElevationPlane().calculateGreatCircleDistance(coordinate);
if (distance > r) { continue; }
if (bestDistance.isNull() || bestDistance > distance)
{
@@ -601,7 +606,7 @@ namespace BlackMisc
{
const CAircraftSituation &oldSituation = (*this)[i];
CAircraftSituation &newSituation = (*this)[i - 1];
if (oldSituation.transferGroundElevationFromThis(newSituation, radius)) { c++; }
if (oldSituation.transferGroundElevationFromMe(newSituation, radius)) { c++; }
}
return c;
}