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

Ref T773, elevation handling style and minor improvements

Browse Source
This commit is contained in:
Klaus Basan
2020-02-13 20:01:40 +01:00
committed by Mat Sutcliffe
parent 287d96afea
commit 33b3cd5461
9 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/aviation/aircraftsituation.cpp
View File

@@ -300,6 +300,8 @@ namespace BlackMisc
bool CAircraftSituation::extrapolateElevation(CAircraftSituation &newSituation, const CAircraftSituation &oldSituation, const CAircraftSituation &olderSituation, const CAircraftSituationChange &oldChange)
{
if (newSituation.hasGroundElevation()) { return false; }
// if acceptable transfer
if (oldSituation.transferGroundElevationFromThis(newSituation)) { return true; }
if (oldSituation.isNull() || olderSituation.isNull()) { return false; }
@@ -310,7 +312,7 @@ namespace BlackMisc
const double deltaAltFt = qAbs(newSituation.getAltitude().value(CLengthUnit::ft()) - olderSituation.getAltitude().value(CLengthUnit::ft()));
if (deltaAltFt <= CAircraftSituationChange::allowedAltitudeDeviation().value(CLengthUnit::ft()))
{
// the ccurrent alt is also not much different
// the current alt is also not much different
newSituation.setGroundElevation(oldSituation.getGroundElevation(), Extrapolated);
return true;
}
@@ -1082,7 +1084,7 @@ namespace BlackMisc
if (!min.isNull()) { return min; }
return CLength(0, CLengthUnit::nullUnit());
}
const double seconds = milliseconds / 1000;
const double seconds = milliseconds / 1000.0;
const double gsMeterSecond = this->getGroundSpeed().value(CSpeedUnit::m_s());
const CLength d(seconds * gsMeterSecond, CLengthUnit::m());
if (!min.isNull() && d < min) { return min; }

1
src/blackmisc/aviation/aircraftsituationchange.cpp
View File

@@ -289,6 +289,7 @@ namespace BlackMisc
const CLength &CAircraftSituationChange::allowedAltitudeDeviation()
{
// approx. 1 meter
static const CLength allowedStdDev(3, CLengthUnit::ft());
return allowedStdDev;
}

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

@@ -594,7 +594,7 @@ namespace BlackMisc
return c;
}
CElevationPlane CAircraftSituationList::averageElevationOfNonMovingAircraft(const CAircraftSituation &reference, const CLength &range, int minValues) const
CElevationPlane CAircraftSituationList::averageElevationOfTaxiingOnGroundAircraft(const CAircraftSituation &reference, const CLength &range, int minValues) const
{
if (this->size() < minValues) { return CElevationPlane::null(); } // no change to succeed

4
src/blackmisc/aviation/aircraftsituationlist.h
View File

@@ -207,8 +207,8 @@ namespace BlackMisc
//! \pre requires a list which is sorted "latest first"
int transferElevationForward(const PhysicalQuantities::CLength &radius = Geo::CElevationPlane::singlePointRadius());
//! Average elevation for "nearby" aircraft "not moving" and having an elevation
Geo::CElevationPlane averageElevationOfNonMovingAircraft(const CAircraftSituation &reference, const PhysicalQuantities::CLength &range, int minValues = 1) const;
//! Average elevation for "nearby" aircraft "not/slowly moving" and having an elevation
Geo::CElevationPlane averageElevationOfTaxiingOnGroundAircraft(const CAircraftSituation &reference, const PhysicalQuantities::CLength &range, int minValues = 1) const;
};
//! Situation per callsign

4
src/blackmisc/simulation/remoteaircraftprovider.cpp
View File

@@ -264,7 +264,7 @@ namespace BlackMisc
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
BLACK_VERIFY_X(situation.getTimeOffsetMs() > 0, Q_FUNC_INFO, "Missing offset");
BLACK_VERIFY_X(situation.isValidVectorRange(), Q_FUNC_INFO, "Invalid vector");
BLACK_VERIFY_X(situation.isValidVectorRange(), Q_FUNC_INFO, "Invalid vector");
}
// add altitude offset (for testing only)
@@ -767,7 +767,7 @@ namespace BlackMisc
CElevationPlane CRemoteAircraftProvider::averageElevationOfNonMovingAircraft(const CAircraftSituation &reference, const CLength &range, int minValues) const
{
const CAircraftSituationList situations = this->latestOnGroundProviderElevations();
return situations.averageElevationOfNonMovingAircraft(reference, range, minValues);
return situations.averageElevationOfTaxiingOnGroundAircraft(reference, range, minValues);
}
bool CRemoteAircraftProvider::testAddAltitudeOffset(const CCallsign &callsign, const CLength &offset)