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

Upfront of refs #369

Browse Source 
* consolidated ICoordinateGeodetic (e.g. fixed nested properties)
* shifted common functionality for objects/containers with callsign into interface
* shifted common functionality for objects/containers with geo position into interface
* shifted common functionality for objects/containers with timestamp into interface
* updated corresponding value objects / specialized lists
* adjusted all places where renamed functions are used
This commit is contained in:
Klaus Basan
2015-01-27 03:27:01 +01:00
parent ea68170202
commit ce86c902b5
45 changed files with 1257 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/blackmisc/avatcstationlist.cpp
View File

@@ -1,7 +1,11 @@
/* Copyright (C) 2013 VATSIM Community / authors
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* Copyright (C) 2013
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#include "avatcstationlist.h"
#include "predicates.h"
@@ -39,41 +43,6 @@ namespace BlackMisc
registerMetaValueType<CAtcStationList>();
}
/*
* Find by callsign
*/
CAtcStationList CAtcStationList::findByCallsign(const CCallsign &callsign) const
{
return this->findBy(&CAtcStation::getCallsign, callsign);
}
/*
* Find by callsigns
*/
CAtcStationList CAtcStationList::findByCallsigns(const CCallsignList &callsigns) const
{
return this->findBy(Predicates::MemberIsAnyOf(&CAtcStation::getCallsign, callsigns));
}
/*
* Find first by callsign
*/
CAtcStation CAtcStationList::findFirstByCallsign(const CCallsign &callsign, const CAtcStation &ifNotFound) const
{
return this->findByCallsign(callsign).frontOrDefault(ifNotFound);
}
/*
* Stations within range
*/
CAtcStationList CAtcStationList::findWithinRange(const BlackMisc::Geo::ICoordinateGeodetic &coordinate, const PhysicalQuantities::CLength &range) const
{
return this->findBy([&](const CAtcStation & atcStation)
{
return greatCircleDistance(atcStation, coordinate) <= range;
});
}
/*
* Find if on frequency of COM unit
*/
@@ -85,28 +54,6 @@ namespace BlackMisc
});
}
/*
* Find by suffix
*/
CAtcStationList CAtcStationList::findBySuffix(const QString &suffix) const
{
CAtcStationList r;
if (suffix.isEmpty()) { return r; }
r = this->findBy(&CAtcStation::getCallsignSuffix, suffix);
return r;
}
/*
* Distances to own plane
*/
void CAtcStationList::calculateDistancesToPlane(const Geo::CCoordinateGeodetic &position)
{
std::for_each(this->begin(), this->end(), [ & ](CAtcStation & station)
{
station.calculcateDistanceToPlane(position);
});
}
/*
* All controllers
*/
@@ -115,28 +62,6 @@ namespace BlackMisc
return this->findBy(Predicates::MemberValid(&CAtcStation::getController)).transform(Predicates::MemberTransform(&CAtcStation::getController));
}
/*
* Suffixes with count
*/
QMap<QString, int> CAtcStationList::getSuffixes() const
{
QMap<QString, int> r;
for (const CAtcStation &station : (*this))
{
const QString s = station.getCallsignSuffix();
if (s.isEmpty()) { continue; }
if (r.contains(s))
{
r[s] = r[s] + 1;
}
else
{
r.insert(s, 1);
}
}
return r;
}
/*
* Merge with booking, both (online/booking will be updated)
*/
@@ -205,11 +130,13 @@ namespace BlackMisc
onlineAtcStation.syncronizeControllerData(bookedAtcStation);
if (onlineAtcStation.hasValidDistance())
{
bookedAtcStation.setDistanceToPlane(onlineAtcStation.getDistanceToPlane());
bookedAtcStation.setDistanceToOwnAircraft(onlineAtcStation.getDistanceToOwnAircraft());
bookedAtcStation.setBearingToOwnAircraft(onlineAtcStation.getBearingToOwnAIrcraft());
}
else if (bookedAtcStation.hasValidDistance())
{
onlineAtcStation.setDistanceToPlane(bookedAtcStation.getDistanceToPlane());
onlineAtcStation.setDistanceToOwnAircraft(bookedAtcStation.getDistanceToOwnAircraft());
onlineAtcStation.setBearingToOwnAircraft(bookedAtcStation.getBearingToOwnAIrcraft());
}
// update
@@ -248,5 +175,6 @@ namespace BlackMisc
}
return true;
}
} // namespace
} // namespace