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

refs #707, allow to resolve airline by callsign directly in airline ICAO list

Browse Source
This commit is contained in:
Klaus Basan
2016-07-13 02:50:11 +02:00
parent e497b43e06
commit c7d89c7b2c
8 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,35 +88,36 @@ namespace BlackMisc
});
}
CAirlineIcaoCode CAirlineIcaoCodeList::smartAirlineIcaoSelector(const CAirlineIcaoCode &icaoPattern) const
CAirlineIcaoCode CAirlineIcaoCodeList::smartAirlineIcaoSelector(const CAirlineIcaoCode &icaoPattern, const CCallsign &callsign) const
{
if (icaoPattern.hasValidDbKey())
const CAirlineIcaoCode patternUsed = icaoPattern.thisOrCallsignCode(callsign);
if (patternUsed.hasValidDbKey())
{
return this->findByKey(icaoPattern.getDbKey(), icaoPattern);
}
// search by parts
CAirlineIcaoCodeList codes;
if (icaoPattern.hasValidDesignator())
if (patternUsed.hasValidDesignator())
{
codes = this->findByVDesignator(icaoPattern.getVDesignator());
codes = this->findByVDesignator(patternUsed.getVDesignator());
}
else
{
codes = this->findByIataCode(icaoPattern.getIataCode());
codes = this->findByIataCode(patternUsed.getIataCode());
}
if (codes.size() == 1) { return codes.front(); }
// further reduce
if (icaoPattern.hasValidCountry())
if (patternUsed.hasValidCountry())
{
CAirlineIcaoCodeList countryCodes = codes.findByCountryIsoCode(icaoPattern.getCountry().getIsoCode());
CAirlineIcaoCodeList countryCodes = codes.findByCountryIsoCode(patternUsed.getCountry().getIsoCode());
if (!countryCodes.isEmpty()) { return countryCodes.front(); }
}
if (!codes.isEmpty()) { return codes.front(); }
return icaoPattern;
return patternUsed;
}
CAirlineIcaoCode CAirlineIcaoCodeList::findBestMatchByCallsign(const CCallsign &callsign) const