diff --git a/src/blackcore/vatsimdatafilereader.h b/src/blackcore/vatsimdatafilereader.h index c23862279..323e5c142 100644 --- a/src/blackcore/vatsimdatafilereader.h +++ b/src/blackcore/vatsimdatafilereader.h @@ -74,6 +74,9 @@ namespace BlackCore //! ICAO info for callsign BlackMisc::Aviation::CAircraftIcao getIcaoInfo(const BlackMisc::Aviation::CCallsign &callsign); + //! Update with VATSIM aircraft data from data file + void updateWithVatsimDataFileData(BlackMisc::Aviation::CAircraft &aircraftToBeUdpated) const { this->m_aircrafts.updateWithVatsimDataFileData(aircraftToBeUdpated); } + private slots: //! Data have been read void loadFinished(QNetworkReply *nwReply); diff --git a/src/blackmisc/avaircraft.cpp b/src/blackmisc/avaircraft.cpp index 60958e598..1318f4bc6 100644 --- a/src/blackmisc/avaircraft.cpp +++ b/src/blackmisc/avaircraft.cpp @@ -49,7 +49,7 @@ namespace BlackMisc /* * Distance to plane */ - const PhysicalQuantities::CLength &CAircraft::calculcateDistanceToPlane(const Geo::CCoordinateGeodetic &position) + const PhysicalQuantities::CLength &CAircraft::setCalculcatedDistanceToPosition(const Geo::CCoordinateGeodetic &position) { this->m_distanceToPlane = Geo::greatCircleDistance(position, this->m_situation.getPosition()); return this->m_distanceToPlane; @@ -83,6 +83,17 @@ namespace BlackMisc { return this->getCom1System() != com1 || this->getCom2System() != com2 || this->getTransponder() != transponder; } + + /* + * Distance to plane + */ + PhysicalQuantities::CLength CAircraft::calculcateDistanceToPosition(const Geo::CCoordinateGeodetic &position) const + { + return Geo::greatCircleDistance(position, this->m_situation.getPosition()); + } + + + /* * Same COM system data */ bool CAircraft::hasSameComData(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder) diff --git a/src/blackmisc/avaircraft.h b/src/blackmisc/avaircraft.h index b8e415f9a..60dfe78d9 100644 --- a/src/blackmisc/avaircraft.h +++ b/src/blackmisc/avaircraft.h @@ -90,11 +90,14 @@ namespace BlackMisc //! Valid designators? bool hasValidAircraftAndAirlineDesignator() const { return this->m_icao.hasAircraftAndAirlineDesignator(); } + //! Distance to aircraft + PhysicalQuantities::CLength calculcateDistanceToPosition(const Geo::CCoordinateGeodetic &position) const; + /*! * Calculcate distance to plane, set it, and also return it * \param position calculated from this postion to my own aircraft */ - const BlackMisc::PhysicalQuantities::CLength &calculcateDistanceToPlane(const BlackMisc::Geo::CCoordinateGeodetic &position); + const BlackMisc::PhysicalQuantities::CLength &setCalculcatedDistanceToPosition(const BlackMisc::Geo::CCoordinateGeodetic &position); //! Get position BlackMisc::Geo::CCoordinateGeodetic getPosition() const { return this->m_situation.getPosition(); } diff --git a/src/blackmisc/avaircraftlist.cpp b/src/blackmisc/avaircraftlist.cpp index 722d70fc6..10b466190 100644 --- a/src/blackmisc/avaircraftlist.cpp +++ b/src/blackmisc/avaircraftlist.cpp @@ -85,7 +85,7 @@ namespace BlackMisc /* * Merge with aircraft */ - bool CAircraftList::updateFromVatsimDataFileAircraft(CAircraft &aircraftToBeUpdated) const + bool CAircraftList::updateWithVatsimDataFileData(CAircraft &aircraftToBeUpdated) const { if (this->isEmpty()) return false; if (aircraftToBeUpdated.hasValidRealName() && aircraftToBeUpdated.hasValidId() && aircraftToBeUpdated.hasValidAircraftAndAirlineDesignator()) return false; diff --git a/src/blackmisc/avaircraftlist.h b/src/blackmisc/avaircraftlist.h index 0cc40469b..5d58edf61 100644 --- a/src/blackmisc/avaircraftlist.h +++ b/src/blackmisc/avaircraftlist.h @@ -62,7 +62,7 @@ namespace BlackMisc //! \brief Update aircraft with data from VATSIM data file //! \remarks The list used needs to contain the VATSIM data file objects - bool updateFromVatsimDataFileAircraft(CAircraft &aircraftToBeUpdated) const; + bool updateWithVatsimDataFileData(CAircraft &aircraftToBeUpdated) const; }; } //namespace