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

refs #720, finder by Telephony designator (aka callsign) and name

Browse Source
This commit is contained in:
Klaus Basan
2016-08-09 18:24:07 +02:00
committed by Mathew Sutcliffe
parent dbdea2d846
commit 009bfc3ed1
6 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackmisc/aviation/liverylist.cpp
View File

@@ -59,6 +59,17 @@ namespace BlackMisc
});
}
CLiveryList CLiveryList::findStdLiveriesByNamesOrTelephonyDesignator(const QString &candidate) const
{
if (candidate.isEmpty()) { return CLiveryList(); }
return this->findBy([&](const CLivery & livery)
{
// keep isAirlineStandardLivery first (faster)
return livery.isAirlineStandardLivery() &&
livery.getAirlineIcaoCode().matchesNamesOrTelephonyDesignator(candidate);
});
}
CLivery CLiveryList::findStdLiveryByAirlineIcaoVDesignator(const CAirlineIcaoCode &icao) const
{
return this->findStdLiveryByAirlineIcaoVDesignator(icao.getVDesignator());
@@ -92,15 +103,10 @@ namespace BlackMisc
CLivery CLiveryList::smartLiverySelector(const CLivery &liveryPattern) const
{
// multiple searches are slow, maybe we can performance optimize this
// in the futuew
// in the future
// first try on id, that would be perfect
if (liveryPattern.hasValidDbKey())
{
int k = liveryPattern.getDbKey();
const CLivery l(this->findByKey(k));
if (l.hasCompleteData()) { return l; }
}
if (liveryPattern.hasValidDbKey()) { return liveryPattern; }
// by combined code
if (liveryPattern.hasCombinedCode())
@@ -122,7 +128,7 @@ namespace BlackMisc
if (liveryPattern.getAirlineIcaoCode().hasName())
{
const QString search(liveryPattern.getAirlineIcaoCode().getSimplifiedName());
const CLiveryList liveries(this->findStdLiveriesBySimplifiedAirlineName(search));
const CLiveryList liveries(this->findStdLiveriesByNamesOrTelephonyDesignator(search));
if (!liveries.isEmpty())
{
return liveries.front();