refs #793, added updateAircraftNetworkModel in provider

* adjusted network context (implementing provider interface)
* and airspace monitor (also implementing provider interface)
* also formatted provider / context to new style (less copydoc)

src/blackcore/airspacemonitor.cpp

@@ -223,6 +223,14 @@ namespace BlackCore
         return c > 0;
     }
 
+    bool CAirspaceMonitor::updateAircraftNetworkModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator)
+    {
+        if (CIdentifiable::isMyIdentifier(originator)) { return false; }
+        const CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexNetworkModel, CVariant::from(model));
+        const int c = this->updateAircraftInRange(callsign, vm);
+        return c > 0;
+    }
+
     bool CAirspaceMonitor::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositonUpdates)
     {
         const CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositonUpdates));
@@ -928,6 +936,7 @@ namespace BlackCore
             // Use anonymous as originator here, since the remote aircraft provider is ourselves and the call to updateAircraftModel() would
             // return without doing anything.
             this->updateAircraftModel(callsign, model, CIdentifier::anonymous());
+            this->updateAircraftNetworkModel(callsign, model, CIdentifier::anonymous());
         }
         else
         {

src/blackcore/airspacemonitor.h

@@ -97,6 +97,7 @@ namespace BlackCore
         virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
         virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering) override;
         virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
+        virtual bool updateAircraftNetworkModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
         virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates) override;
         virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered) override;
         virtual void updateMarkAllAsNotRendered() override;

src/blackcore/context/contextnetwork.h

@@ -257,9 +257,12 @@ namespace BlackCore
             //! Enable/disable rendering
             virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering) = 0;
 
-            //! Change model string
+            //! Change model
             virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) = 0;
 
+            //! Change network model
+            virtual bool updateAircraftNetworkModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) = 0;
+
             //! Change fast position updates
             virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending) = 0;
 

src/blackcore/context/contextnetworkempty.h

@@ -271,6 +271,16 @@ namespace BlackCore
                 return false;
             }
 
+            //! \copydoc IContextNetwork::updateAircraftNetworkModel
+            virtual bool updateAircraftNetworkModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override
+            {
+                Q_UNUSED(callsign);
+                Q_UNUSED(model);
+                Q_UNUSED(originator);
+                logEmptyContextWarning(Q_FUNC_INFO);
+                return false;
+            }
+
             //! \copydoc IContextNetwork::updateFastPositionEnabled
             virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending) override
             {

src/blackcore/context/contextnetworkimpl.cpp

@@ -552,10 +552,10 @@ namespace BlackCore
             this->m_airspace->requestAtisUpdates();
         }
 
-        bool CContextNetwork::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering)
+        bool CContextNetwork::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRendering)
         {
-            if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enabledForRedering; }
+            if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << enabledForRendering; }
-            bool c = this->m_airspace->updateAircraftEnabled(callsign, enabledForRedering);
+            bool c = this->m_airspace->updateAircraftEnabled(callsign, enabledForRendering);
             if (c)
             {
                 CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign));
@@ -570,7 +570,20 @@ namespace BlackCore
             bool c = this->m_airspace->updateAircraftModel(callsign, model, originator);
             if (c)
             {
-                CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign));
+                const CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign));
+                Q_ASSERT_X(!aircraft.getCallsign().isEmpty(), Q_FUNC_INFO, "missing callsign");
+                emit this->changedRemoteAircraftModel(aircraft, originator);
+            }
+            return c;
+        }
+
+        bool CContextNetwork::updateAircraftNetworkModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator)
+        {
+            if (this->isDebugEnabled()) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign << model; }
+            bool c = this->m_airspace->updateAircraftNetworkModel(callsign, model, originator);
+            if (c)
+            {
+                const CSimulatedAircraft aircraft(this->getAircraftInRangeForCallsign(callsign));
                 emit this->changedRemoteAircraftModel(aircraft, originator);
             }
             return c;

src/blackcore/context/contextnetworkimpl.h

@@ -132,12 +132,16 @@ namespace BlackCore
         public slots:
             //! \copydoc IContextNetwork::updateAircraftEnabled
             //! \ingroup remoteaircraftprovider
-            virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering) override;
+            virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering) override;
 
             //! \copydoc IContextNetwork::updateAircraftModel
             //! \ingroup remoteaircraftprovider
             virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
 
+            //! \copydoc IContextNetwork::updateAircraftNetworkModel
+            //! \ingroup remoteaircraftprovider
+            virtual bool updateAircraftNetworkModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
+
             //! \copydoc IContextNetwork::updateFastPositionEnabled
             //! \ingroup remoteaircraftprovider
             virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates) override;

src/blackcore/context/contextnetworkproxy.cpp

@@ -196,6 +196,11 @@ namespace BlackCore
             return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateAircraftModel"), callsign, model, originator);
         }
 
+        bool CContextNetworkProxy::updateAircraftNetworkModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator)
+        {
+            return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateAircraftNetworkModel"), callsign, model, originator);
+        }
+
         bool CContextNetworkProxy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionSending)
         {
             return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateFastPositionEnabled"), callsign, enableFastPositionSending);

src/blackcore/context/contextnetworkproxy.h

@@ -70,119 +70,48 @@ namespace BlackCore
             virtual ~CContextNetworkProxy() {}
 
         public slots:
-            //! \copydoc IContextNetwork::readAtcBookingsFromSource()
+            //! \name Interface overrides
+            //! @{
             virtual void readAtcBookingsFromSource() const override;
-
-            //! \copydoc IContextNetwork::getAtcStationsOnline()
             virtual BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const override;
-
-            //! \copydoc IContextNetwork::getAtcStationsBooked()
             virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override;
-
-            //! \copydoc IContextNetwork::getAircraftInRange()
             virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
-
-            //! \copydoc IContextNetwork::getAircraftInRangeCallsigns()
             virtual BlackMisc::Aviation::CCallsignSet getAircraftInRangeCallsigns() const override;
-
-            //! \copydoc IContextNetwork::getAircraftInRangeCount
             virtual int getAircraftInRangeCount() const override;
-
-            //! \copydoc IContextNetwork::getAircraftInRangeForCallsign
             virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IContextNetwork::getOnlineStationForCallsign
             virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IContextNetwork::connectToNetwork
             virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, BlackCore::INetwork::LoginMode mode) override;
-
-            //! \copydoc IContextNetwork::disconnectFromNetwork()
             virtual BlackMisc::CStatusMessage disconnectFromNetwork() override;
-
-            //! \copydoc IContextNetwork::isConnected()
             virtual bool isConnected() const override;
-
-            //! \copydoc IContextNetwork::getConnectedServer
             virtual BlackMisc::Network::CServer getConnectedServer() const override;
-
-            //! \copydoc IContextNetwork::parseCommandLine
             virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override;
-
-            //! \copydoc IContextNetwork::sendTextMessages()
             virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) override;
-
-            //! \copydoc IContextNetwork::sendFlightPlan()
             virtual void sendFlightPlan(const BlackMisc::Aviation::CFlightPlan &flightPlan) override;
-
-            //! \copydoc IContextNetwork::loadFlightPlanFromNetwork()
             virtual BlackMisc::Aviation::CFlightPlan loadFlightPlanFromNetwork(const BlackMisc::Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IContextNetwork::getMetarForAirport
             BlackMisc::Weather::CMetar getMetarForAirport(const BlackMisc::Aviation::CAirportIcaoCode &airportIcaoCode) const override;
-
-            //! \copydoc IContextNetwork::getSelectedVoiceRooms()
             virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const override;
-
-            //! \copydoc IContextNetwork::getSelectedAtcStations
             virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const override;
-
-            //! \copydoc IContextNetwork::getUsers()
             virtual BlackMisc::Network::CUserList getUsers() const override;
-
-            //! \copydoc IContextNetwork::getUsersForCallsigns
             virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;
-
-            //! \copydoc IContextNetwork::getUserForCallsign
             virtual BlackMisc::Network::CUser getUserForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IContextNetwork::getOtherClients
             virtual BlackMisc::Network::CClientList getOtherClients() const override;
-
-            //! \copydoc IContextNetwork::getVatsimVoiceServers
             virtual BlackMisc::Network::CServerList getVatsimVoiceServers() const override;
-
-            //! \copydoc IContextNetwork::getVatsimFsdServers
             virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override;
-
-            //! \copydoc IContextNetwork::getOtherClientsForCallsigns
             virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;
-
-            //! \copydoc IContextNetwork::requestDataUpdates
             virtual void requestDataUpdates()override;
-
-            //! \copydoc IContextNetwork::requestAtisUpdates
             virtual void requestAtisUpdates() override;
-
-            //! \copydoc IContextNetwork::updateAircraftEnabled
             virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering) override;
-
-            //! \copydoc IContextNetwork::updateAircraftModel
             virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
-
+            virtual bool updateAircraftNetworkModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
-            //! \copydoc IContextNetwork::updateFastPositionEnabled
             virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositionSending) override;
-
-            //! \copydoc IContextNetwork::setFastPositionEnabledCallsigns
             virtual void setFastPositionEnabledCallsigns(BlackMisc::Aviation::CCallsignSet &callsigns) override;
-
-            //! \copydoc IContextNetwork::getFastPositionEnabledCallsigns
             virtual BlackMisc::Aviation::CCallsignSet getFastPositionEnabledCallsigns() override;
-
-            //! \copydoc IContextNetwork::getReverseLookupMessages
             virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IContextNetwork::isReverseLookupMessagesEnabled
             virtual bool isReverseLookupMessagesEnabled() const override;
-
-            //! \copydoc IContextNetwork::enableReverseLookupMessages
             virtual void enableReverseLookupMessages(bool enabled) override;
-
-            //! \copydoc IContextNetwork::testCreateDummyOnlineAtcStations
             virtual void testCreateDummyOnlineAtcStations(int number) override;
-
-            //! \copydoc IContextNetwork::testAddAircraftParts
             virtual void testAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts, bool incremental) override;
+            //! @}
 
         private:
             BlackMisc::CGenericDBusInterface *m_dBusInterface; /*!< DBus interface */

src/blackmisc/simulation/remoteaircraftprovider.cpp

@@ -15,7 +15,6 @@ namespace BlackMisc
 {
     namespace Simulation
     {
-
         CSimulatedAircraftList CRemoteAircraftAware::getAircraftInRange() const
         {
             Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
@@ -82,6 +81,12 @@ namespace BlackMisc
             return this->m_remoteAircraftProvider->updateAircraftModel(callsign, model, originator);
         }
 
+        bool CRemoteAircraftAware::updateAircraftNetworkModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator)
+        {
+            Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
+            return this->m_remoteAircraftProvider->updateAircraftNetworkModel(callsign, model, originator);
+        }
+
         bool CRemoteAircraftAware::updateAircraftRendered(const CCallsign &callsign, bool rendered)
         {
             Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");

src/blackmisc/simulation/remoteaircraftprovider.h

@@ -112,10 +112,14 @@ namespace BlackMisc
             //! \threadsafe
             virtual void updateMarkAllAsNotRendered() = 0;
 
-            //! Change model string
+            //! Change model
             //! \threadsafe
             virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) = 0;
 
+            //! Change network model
+            //! \threadsafe
+            virtual bool updateAircraftNetworkModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) = 0;
+
             //! Change fast position updates
             //! \threadsafe
             virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates) = 0;
@@ -190,6 +194,9 @@ namespace BlackMisc
             //! \copydoc IRemoteAircraftProvider::updateAircraftModel
             virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator);
 
+            //! \copydoc IRemoteAircraftProvider::updateAircraftNetworkModel
+            virtual bool updateAircraftNetworkModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator);
+
             //! \copydoc IRemoteAircraftProvider::updateAircraftRendered
             virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered);
 

src/blackmisc/simulation/remoteaircraftproviderdummy.cpp

@@ -117,6 +117,14 @@ namespace BlackMisc
             return n > 0;
         }
 
+        bool CRemoteAircraftProviderDummy::updateAircraftNetworkModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator)
+        {
+            Q_UNUSED(originator);
+            CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexNetworkModel, CVariant::from(model));
+            int n = this->m_aircraft.applyIfCallsign(callsign, vm);
+            return n > 0;
+        }
+
         bool CRemoteAircraftProviderDummy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionUpdates)
         {
             CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexFastPositionUpdates, CVariant::fromValue(enableFastPositionUpdates));

src/blackmisc/simulation/remoteaircraftproviderdummy.h

@@ -53,72 +53,6 @@ namespace BlackMisc
             //! Constructor
             CRemoteAircraftProviderDummy(QObject *parent = nullptr);
 
-            //! IRemoteAircraftProvider::getAircraftInRange
-            virtual CSimulatedAircraftList getAircraftInRange() const override;
-
-            //! IRemoteAircraftProvider::getAircraftInRangeCount
-            virtual int getAircraftInRangeCount() const override;
-
-            //! IRemoteAircraftProvider::getAircraftInRangeCallsigns
-            virtual Aviation::CCallsignSet getAircraftInRangeCallsigns() const override;
-
-            //! IRemoteAircraftProvider::getAircraftInRangeForCallsign
-            virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
-
-            //! IRemoteAircraftProvider::getAircraftInRangeModelForCallsign
-            virtual BlackMisc::Simulation::CAircraftModel getAircraftInRangeModelForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IRemoteAircraftProvider::getLatestAirspaceAircraftSnapshot
-            virtual BlackMisc::Simulation::CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const override;
-
-            //! \copydoc IRemoteAircraftProvider::remoteAircraftParts
-            virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const override;
-
-            //! \copydoc IRemoteAircraftProvider::remoteAircraftSituations
-            virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IRemoteAircraftProvider::remoteAircraftSituationsCount
-            virtual int remoteAircraftSituationsCount(const Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IRemoteAircraftProvider::remoteAircraftSupportingParts
-            virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
-
-            //! \copydoc IRemoteAircraftProvider::isRemoteAircraftSupportingParts
-            virtual bool isRemoteAircraftSupportingParts(const Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IRemoteAircraftProvider::connectRemoteAircraftProviderSignals
-            virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
-                QObject *receiver,
-                std::function<void(const BlackMisc::Aviation::CAircraftSituation &)>          addedSituationSlot,
-                std::function<void(const BlackMisc::Aviation::CCallsign &, const BlackMisc::Aviation::CAircraftParts &)>    addedPartsSlot,
-                std::function<void(const BlackMisc::Aviation::CCallsign &)>                   removedAircraftSlot,
-                std::function<void(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &)> aircraftSnapshotSlot
-            ) override;
-
-            //! \copydoc IRemoteAircraftProvider::updateAircraftEnabled
-            virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering) override;
-
-            //! \copydoc IRemoteAircraftProvider::updateAircraftModel
-            virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
-
-            //! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled
-            virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates) override;
-
-            //! \copydoc IRemoteAircraftProvider::updateAircraftRendered
-            virtual bool updateAircraftRendered(const Aviation::CCallsign &callsign, bool rendered) override;
-
-            //! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered
-            virtual void updateMarkAllAsNotRendered() override;
-
-            //! \copydoc IRemoteAircraftProvider::getReverseLookupMessages
-            virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
-
-            //! \copydoc IRemoteAircraftProvider::isReverseLookupMessagesEnabled
-            virtual bool isReverseLookupMessagesEnabled() const override;
-
-            //! \copydoc IRemoteAircraftProvider::enableReverseLookupMessages
-            virtual void enableReverseLookupMessages(bool enabled) override;
-
             //! For testing, add new situation and fire signals
             void insertNewSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
 
@@ -128,6 +62,37 @@ namespace BlackMisc
             //! Clear all data
             void clear();
 
+            //! \name Interface overrides
+            //! @{
+            virtual CSimulatedAircraftList getAircraftInRange() const override;
+            virtual int getAircraftInRangeCount() const override;
+            virtual Aviation::CCallsignSet getAircraftInRangeCallsigns() const override;
+            virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
+            virtual BlackMisc::Simulation::CAircraftModel getAircraftInRangeModelForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
+            virtual BlackMisc::Simulation::CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const override;
+            virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const override;
+            virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const Aviation::CCallsign &callsign) const override;
+            virtual int remoteAircraftSituationsCount(const Aviation::CCallsign &callsign) const override;
+            virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
+            virtual bool isRemoteAircraftSupportingParts(const Aviation::CCallsign &callsign) const override;
+            virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
+                QObject *receiver,
+                std::function<void(const BlackMisc::Aviation::CAircraftSituation &)>          addedSituationSlot,
+                std::function<void(const BlackMisc::Aviation::CCallsign &, const BlackMisc::Aviation::CAircraftParts &)>    addedPartsSlot,
+                std::function<void(const BlackMisc::Aviation::CCallsign &)>                   removedAircraftSlot,
+                std::function<void(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &)> aircraftSnapshotSlot
+            ) override;
+            virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering) override;
+            virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
+            virtual bool updateAircraftNetworkModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const BlackMisc::CIdentifier &originator) override;
+            virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates) override;
+            virtual bool updateAircraftRendered(const Aviation::CCallsign &callsign, bool rendered) override;
+            virtual void updateMarkAllAsNotRendered() override;
+            virtual BlackMisc::CStatusMessageList getReverseLookupMessages(const BlackMisc::Aviation::CCallsign &callsign) const override;
+            virtual bool isReverseLookupMessagesEnabled() const override;
+            virtual void enableReverseLookupMessages(bool enabled) override;
+            //! @}
+
         signals:
             //! Added situation
             void addedRemoteAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation);