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

Ref T268, elevation handling improvements

Browse Source 
* utility functions
* made storeAircraftSituation virtual and return Aviation::CAircraftSituation
* coordinate toQString in deg/rad
This commit is contained in:
Klaus Basan
2018-07-11 02:34:58 +02:00
parent 226abd0d38
commit a5acd0a1ec
13 changed files with 71 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/blackcore/airspacemonitor.cpp
View File

@@ -965,26 +965,29 @@ namespace BlackCore
this->setOtherClient(client);
}
void CAirspaceMonitor::storeAircraftSituation(const CAircraftSituation &situation)
CAircraftSituation CAirspaceMonitor::storeAircraftSituation(const CAircraftSituation &situation, bool allowTestOffset)
{
const CCallsign callsign(situation.getCallsign());
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "empty callsign");
if (callsign.isEmpty()) { return; }
if (callsign.isEmpty()) { return situation; }
CAircraftSituation correctedSituation(this->testAddAltitudeOffsetToSituation(situation));
if (!correctedSituation.hasGroundElevation() && !correctedSituation.canLikelySkipNearGroundInterpolation())
CAircraftSituation correctedSituation(allowTestOffset ? this->testAddAltitudeOffsetToSituation(situation) : situation);
bool haveRequestedElevation = false;
const bool canLikelySkipNearGround = correctedSituation.canLikelySkipNearGroundInterpolation();
if (!correctedSituation.hasGroundElevation() && !canLikelySkipNearGround)
{
// fetch from cache or request
const CAircraftSituationList situations = this->remoteAircraftSituations(callsign);
CElevationPlane ep = situations.findCLosestElevationWithinRange(correctedSituation, correctedSituation.getDistancePerTime(100, CElevationPlane::singlePointRadius()));
if (!ep.isNull())
const CAircraftSituation situationWithElv = situations.findCLosestElevationWithinRange(correctedSituation, correctedSituation.getDistancePerTime(100, CElevationPlane::singlePointRadius()));
if (!situationWithElv.getGroundElevation().isNull())
{
correctedSituation.setGroundElevation(ep, CAircraftSituation::FromOtherSituations);
correctedSituation.transferGroundElevation(situationWithElv);
}
else
{
const CLength distance(correctedSituation.getDistancePerTime250ms(CElevationPlane::singlePointRadius())); // distnacee per ms
ep = this->findClosestElevationWithinRangeOrRequest(correctedSituation, distance, callsign);
const CElevationPlane ep = this->findClosestElevationWithinRangeOrRequest(correctedSituation, distance, callsign);
haveRequestedElevation = ep.isNull(); // NULL means we requested
Q_ASSERT_X(ep.isNull() || !ep.getRadius().isNull(), Q_FUNC_INFO, "null radius");
correctedSituation.setGroundElevation(ep, CAircraftSituation::FromCache);
}
@@ -1032,13 +1035,23 @@ namespace BlackCore
// CG from provider
const CLength cg = this->getCG(callsign); // always x-check against simulator to override guessed values and reflect changed CGs
if (!cg.isNull())
{
correctedSituation.setCG(cg);
}
if (!cg.isNull()) { correctedSituation.setCG(cg); }
// store change object
CRemoteAircraftProvider::storeAircraftSituation(correctedSituation, false); // we already added offset if any
correctedSituation = CRemoteAircraftProvider::storeAircraftSituation(correctedSituation, false); // we already added offset if any
// check if we STILL want to request
if (!haveRequestedElevation && !canLikelySkipNearGround)
{
// we have not requested so far, but we are NEAR ground
// we expect at least not transferred cache or we are moving and have no provider elevation yet
if (correctedSituation.isThisElevationInfoBetter(CAircraftSituation::FromCache, false) || (correctedSituation.isMoving() && correctedSituation.isThisElevationInfoBetter(CAircraftSituation::FromProvider, false)))
{
haveRequestedElevation = this->requestElevation(correctedSituation);
}
}
return correctedSituation;
}
void CAirspaceMonitor::sendInitialAtcQueries(const CCallsign &callsign)

2
src/blackcore/airspacemonitor.h
View File

@@ -224,7 +224,7 @@ namespace BlackCore
//! \threadsafe
//! \remark sets gnd flag from parts if parts are available
//! \remark uses gnd elevation if found
void storeAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
virtual BlackMisc::Aviation::CAircraftSituation storeAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation, bool allowTestOffset = true) override;
//! Add or update aircraft
BlackMisc::Simulation::CSimulatedAircraft addOrUpdateAircraftInRange(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcao, const QString &airlineIcao, const QString &livery, const QString &modelString, BlackMisc::Simulation::CAircraftModel::ModelType modelType, BlackMisc::CStatusMessageList *log);

2
src/blackcore/simulator.cpp
View File

@@ -45,7 +45,7 @@ namespace BlackCore
return setup;
}
bool ISimulator::requestElevation(const Geo::ICoordinateGeodetic &reference, const CCallsign &callsign)
bool ISimulator::requestElevation(const ICoordinateGeodetic &reference, const CCallsign &callsign)
{
Q_UNUSED(reference);
Q_UNUSED(callsign);