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

refs #706, callsign to airline plus testing resulting in multiple smaller improvements (refs #707)

Browse Source 
* added functions to callsign / callsign list
* used in aircraft matcher
* also resolve std.livery in matcher
* also allow to find aircraft ICAO designator ending with string (e.g. 737 for B737)
* renamed CAircraftMatcher::reverseLookup -> CAircraftMatcher::reverselLookupModel
* threadsafe isInRange (CAIrspaceMonitor)
This commit is contained in:
Klaus Basan
2016-07-09 18:29:37 +02:00
parent 19040af654
commit 64cee7fba8
16 changed files with 196 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/aviation/airlineicaocodelist.cpp
View File

@@ -119,12 +119,23 @@ namespace BlackMisc
return icaoPattern;
}
CAirlineIcaoCode CAirlineIcaoCodeList::findBestMatchByCallsign(const CCallsign &callsign) const
{
if (this->isEmpty() || callsign.isEmpty()) { return CAirlineIcaoCode(); }
const QString airline = callsign.getAirlineSuffix().toUpper();
if (airline.isEmpty()) { return CAirlineIcaoCode(); }
const CAirlineIcaoCode airlineCode = (airline.length() == 3) ?
this->findFirstByOrDefault(&CAirlineIcaoCode::getDesignator, airline) :
this->findFirstByOrDefault(&CAirlineIcaoCode::getVDesignator, airline);
return airlineCode;
}
CAirlineIcaoCodeList CAirlineIcaoCodeList::fromDatabaseJson(const QJsonArray &array, bool ignoreIncomplete)
{
CAirlineIcaoCodeList codes;
for (const QJsonValue &value : array)
{
CAirlineIcaoCode icao(CAirlineIcaoCode::fromDatabaseJson(value.toObject()));
const CAirlineIcaoCode icao(CAirlineIcaoCode::fromDatabaseJson(value.toObject()));
if (ignoreIncomplete && !icao.hasCompleteData()) { continue; }
codes.push_back(icao);
}