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

Ref T259, Ref T243 guess gnd flag in airspace monitor if not available

Browse Source
This commit is contained in:
Klaus Basan
2018-03-22 01:28:45 +01:00
parent 7a05a5ae3a
commit 6cb050a727
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/blackcore/airspacemonitor.cpp
View File

@@ -1243,9 +1243,35 @@ namespace BlackCore
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "empty callsign"); BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "empty callsign");
if (callsign.isEmpty()) { return; } if (callsign.isEmpty()) { return; }
CAircraftSituation correctedSituation = situation; CAircraftSituation correctedSituation(situation);
const CAircraftPartsList parts = this->remoteAircraftParts(callsign); if (!correctedSituation.hasGroundElevation() && !correctedSituation.canLikelySkipNearGroundInterpolation())
if (!parts.isEmpty()) { correctedSituation.adjustGroundFlag(parts); } {
const CElevationPlane ep = this->findClosestElevationWithinRange(correctedSituation, correctedSituation.getDistancePerTime(1000));
correctedSituation.setGroundElevation(ep);
}
// do we already have ground details?
if (situation.getOnGroundDetails() == CAircraftSituation::NotSet)
{
const CClient client = this->getClientOrDefaultForCallsign(callsign);
if (client.hasCapability(CClient::FsdWithGroundFlag))
{
// we rely on situation gnd.flag
correctedSituation.setOnGroundDetails(CAircraftSituation::InFromNetwork);
}
else if (client.hasCapability(CClient::FsdWithAircraftConfig))
{
const CAircraftPartsList parts = this->remoteAircraftParts(callsign);
if (!parts.isEmpty()) { correctedSituation.adjustGroundFlag(parts); }
}
}
if (situation.getOnGroundDetails() != CAircraftSituation::NotSet)
{
const bool vtol = this->isVtolAircraft(callsign);
const CLength cg = this->getCG(callsign);
correctedSituation.guessOnGround(vtol, cg);
}
// list from new to old // list from new to old
QWriteLocker lock(&m_lockSituations); QWriteLocker lock(&m_lockSituations);