diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index b51c99512..1fd8f4693 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -643,7 +643,7 @@ namespace BlackCore { Q_ASSERT(m_airspace); if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << model; } - bool c = m_airspace->updateAircraftModel(callsign, model, originator); + const bool c = m_airspace->updateAircraftModel(callsign, model, originator); if (c) { const CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign)); @@ -686,7 +686,7 @@ namespace BlackCore bool CContextNetwork::updateAircraftRendered(const CCallsign &callsign, bool rendered) { - bool c = m_airspace->updateAircraftRendered(callsign, rendered); + const bool c = m_airspace->updateAircraftRendered(callsign, rendered); return c; } diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index b7f728f29..c86be216c 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -127,10 +127,6 @@ namespace BlackMisc //! \threadsafe virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered) = 0; - //! Ground elevation of aircraft - //! \threadsafe - virtual bool updateAircraftGroundElevation(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Geo::CElevationPlane &elevation) = 0; - //! Mark all as not rendered //! \threadsafe virtual void updateMarkAllAsNotRendered() = 0; @@ -147,6 +143,10 @@ namespace BlackMisc //! \threadsafe virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates) = 0; + //! Ground elevation of aircraft + //! \threadsafe + virtual bool updateAircraftGroundElevation(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Geo::CElevationPlane &elevation) = 0; + //! Get reverse lookup meesages //! \threadsafe virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const = 0; @@ -179,9 +179,9 @@ namespace BlackMisc //! \note receiver is required for connection type virtual QList connectRemoteAircraftProviderSignals( QObject *receiver, - std::function addedSituationSlot, + std::function addedSituationSlot, std::function addedPartsSlot, - std::function removedAircraftSlot, + std::function removedAircraftSlot, std::function aircraftSnapshot ) = 0; diff --git a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp index bda13368e..fae711609 100644 --- a/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp +++ b/src/blackmisc/simulation/remoteaircraftproviderdummy.cpp @@ -142,7 +142,7 @@ namespace BlackMisc bool CRemoteAircraftProviderDummy::updateAircraftGroundElevation(const CCallsign &callsign, const CElevationPlane &elevation) { - CPropertyIndexVariantMap vm({ CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexGroundSpeed }, CVariant::fromValue(elevation)); + CPropertyIndexVariantMap vm({ CSimulatedAircraft::IndexSituation, CAircraftSituation::IndexGroundElevationPlane }, CVariant::fromValue(elevation)); const int c = this->m_aircraft.applyIfCallsign(callsign, vm); return c > 0; }