flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 03:45:35 +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

7
src/blackmisc/aviation/airlineicaocode.cpp
View File

@@ -125,6 +125,13 @@ namespace BlackMisc
return this->matchesVDesignator(candidate) || this->matchesIataCode(candidate);
}
bool CAirlineIcaoCode::matchesNamesOrTelephonyDesignator(const QString &candidate) const
{
const QString cand(candidate.toUpper().trimmed());
if (this->getName().contains(cand, Qt::CaseInsensitive) || this->getTelephonyDesignator().contains(cand, Qt::CaseInsensitive)) { return true; }
return this->isContainedInSimplifiedName(candidate);
}
bool CAirlineIcaoCode::isContainedInSimplifiedName(const QString &candidate) const
{
if (candidate.isEmpty() || !this->hasName()) { return false; }

3
src/blackmisc/aviation/airlineicaocode.h
View File

@@ -149,6 +149,9 @@ namespace BlackMisc
//! Matches IATA code or v-designator?
bool matchesVDesignatorOrIataCode(const QString &candidate) const;
//! Relaxed check by name or telephony designator (aka callsign, not to be confused with CCallsign)
bool matchesNamesOrTelephonyDesignator(const QString &candidate) const;
//! Does simplified name contain the candidate
bool isContainedInSimplifiedName(const QString &candidate) const;

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

@@ -89,6 +89,15 @@ namespace BlackMisc
});
}
CAirlineIcaoCodeList CAirlineIcaoCodeList::findByNamesOrTelephonyDesignator(const QString &candidate) const
{
if (candidate.isEmpty()) { return CAirlineIcaoCodeList(); }
return this->findBy([&](const CAirlineIcaoCode & code)
{
return code.matchesNamesOrTelephonyDesignator(candidate);
});
}
CAirlineIcaoCodeList CAirlineIcaoCodeList::findByMilitary(bool military) const
{
return this->findBy([&](const CAirlineIcaoCode & code)
@@ -99,33 +108,44 @@ namespace BlackMisc
CAirlineIcaoCode CAirlineIcaoCodeList::smartAirlineIcaoSelector(const CAirlineIcaoCode &icaoPattern, const CCallsign &callsign) const
{
if (icaoPattern.hasValidDbKey()) { return icaoPattern; }
const CAirlineIcaoCode patternUsed = icaoPattern.thisOrCallsignCode(callsign);
if (patternUsed.hasValidDbKey())
{
return this->findByKey(icaoPattern.getDbKey(), icaoPattern);
}
// search by parts
CAirlineIcaoCodeList codes;
CAirlineIcaoCodeList codesFound;
if (patternUsed.hasValidDesignator())
{
codes = this->findByVDesignator(patternUsed.getVDesignator());
codesFound = this->findByVDesignator(patternUsed.getVDesignator());
}
else
{
codes = this->findByIataCode(patternUsed.getIataCode());
codesFound = this->findByIataCode(patternUsed.getIataCode());
}
if (codes.size() == 1) { return codes.front(); }
if (codesFound.size() == 1) { return codesFound.front(); }
if (codesFound.isEmpty())
{
codesFound = this->findByNamesOrTelephonyDesignator(patternUsed.getName());
}
else
{
// further reduce
if (patternUsed.hasName())
{
CAirlineIcaoCodeList backup(codesFound);
codesFound = this->findByNamesOrTelephonyDesignator(patternUsed.getName());
if (codesFound.isEmpty()) { codesFound = backup; }
}
}
// further reduce
if (patternUsed.hasValidCountry())
{
CAirlineIcaoCodeList countryCodes = codes.findByCountryIsoCode(patternUsed.getCountry().getIsoCode());
CAirlineIcaoCodeList countryCodes = codesFound.findByCountryIsoCode(patternUsed.getCountry().getIsoCode());
if (!countryCodes.isEmpty()) { return countryCodes.front(); }
}
if (!codes.isEmpty()) { return codes.front(); }
if (!codesFound.isEmpty()) { return codesFound.front(); }
return patternUsed;
}
@@ -205,5 +225,5 @@ namespace BlackMisc
if (sort) { c.sort(); }
return c;
}
} // namespace
} // namespace
} // ns
} // ns

3
src/blackmisc/aviation/airlineicaocodelist.h
View File

@@ -69,6 +69,9 @@ namespace BlackMisc
//! Find if simplified name contains search string
CAirlineIcaoCodeList findBySimplifiedNameContaining(const QString &containedString) const;
//! Find by names or telephony designator (aka callsign, not to be confused with CCallsign)
CAirlineIcaoCodeList findByNamesOrTelephonyDesignator(const QString &candidate) const;
//! Find by military flag
CAirlineIcaoCodeList findByMilitary(bool military) const;

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();

5
src/blackmisc/aviation/liverylist.h
View File

@@ -55,6 +55,9 @@ namespace BlackMisc
//! By simplified name
CLiveryList findStdLiveriesBySimplifiedAirlineName(const QString &containedString) const;
//! By names or telephony designator(aka callsign)
CLiveryList findStdLiveriesByNamesOrTelephonyDesignator(const QString &candidate) const;
//! Find livery by combined code
CLivery findByCombinedCode(const QString &combinedCode) const;
@@ -64,7 +67,7 @@ namespace BlackMisc
//! All combined codes plus more info
QStringList getCombinedCodesPlusInfo(bool sort = false) const;
//! Find
//! Find by multiple criteria
CLivery smartLiverySelector(const CLivery &liveryPattern) const;
};
} //namespace