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

refs #291, improved airport class

Browse Source 
* supports bearing (to own plane)
* elevation
* Fixed Property index
This commit is contained in:
Klaus Basan
2014-07-06 16:43:00 +02:00
parent d8ca4241af
commit 4d3b3d213d
4 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/avairportlist.cpp
View File

@@ -47,7 +47,7 @@ namespace BlackMisc
void CAirportList::replaceOrAddByIcao(const CAirport &addedOrReplacedAirport)
{
Q_ASSERT(addedOrReplacedAirport.hasValidIcaoCode());
if (!addedOrReplacedAirport.hasValidIcaoCode()) return; // ignore invalid airport
this->replaceOrAdd(&CAirport::getIcao, addedOrReplacedAirport.getIcao(), addedOrReplacedAirport);
}
@@ -75,28 +75,28 @@ namespace BlackMisc
/*
* Distances to own plane
*/
void CAirportList::calculateDistancesToPlane(const Geo::CCoordinateGeodetic &position)
void CAirportList::calculcateDistanceAndBearingToPlane(const Geo::CCoordinateGeodetic &position)
{
std::for_each(this->begin(), this->end(), [ & ](CAirport & airport)
{
airport.calculcateDistanceToPlane(position);
airport.calculcateDistanceAndBearingToPlane(position);
});
}
void CAirportList::removeIfOutsideRange(const Geo::CCoordinateGeodetic &position, const CLength &distance, bool updateDistance)
void CAirportList::removeIfOutsideRange(const Geo::CCoordinateGeodetic &position, const CLength &maxDistance, bool updateDistance)
{
CLength d;
for (CAirportList::iterator i = begin(); i != end();)
{
if (updateDistance)
{
d = i->calculcateDistanceToPlane(position);
d = i->calculcateDistanceAndBearingToPlane(position);
}
else
{
d = i->greatCircleDistance(position);
}
if (distance > d)
if (maxDistance < d)
{
i = this->erase(i);
}