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

Fixed ATC callsign detection

Browse Source 
* use uc callsign for detection
* added suffix DEP

see https://discordapp.com/channels/539048679160676382/539486309882789888/640324593155964947
This commit is contained in:
Klaus Basan
2019-11-03 17:47:20 +01:00
committed by Mat Sutcliffe
parent 076813e866
commit 336ad1c160
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackmisc/aviation/callsign.cpp
View File

@@ -70,23 +70,25 @@ namespace BlackMisc
QString CCallsign::unifyCallsign(const QString &callsign, TypeHint hint) QString CCallsign::unifyCallsign(const QString &callsign, TypeHint hint)
{ {
const QString ucCallsign = callsign.trimmed().toUpper();
// Ref T664, allow ATC with hyphen, such as Ml-SNO_CTR // Ref T664, allow ATC with hyphen, such as Ml-SNO_CTR
switch (hint) switch (hint)
{ {
// ATC allows "-", aircraft not // ATC allows "-", aircraft not
case Atc: return removeChars(callsign.toUpper().trimmed(), [](QChar c) { return !c.isLetterOrNumber() && c != '_' && c != '-'; }); case Atc: return removeChars(ucCallsign, [](QChar c) { return !c.isLetterOrNumber() && c != '_' && c != '-'; });
case Aircraft: return removeChars(callsign.toUpper().trimmed(), [](QChar c) { return !c.isLetterOrNumber() && c != '_'; }); case Aircraft: return removeChars(ucCallsign, [](QChar c) { return !c.isLetterOrNumber() && c != '_'; });
default: break; default: break;
} }
// no hint // no hint
if (CCallsign::looksLikeAtcCallsign(callsign)) if (CCallsign::looksLikeAtcCallsign(ucCallsign))
{ {
return removeChars(callsign.toUpper().trimmed(), [](QChar c) { return !c.isLetterOrNumber() && c != '_' && c != '-'; }); return removeChars(ucCallsign, [](QChar c) { return !c.isLetterOrNumber() && c != '_' && c != '-'; });
} }
// strict check // strict check
return removeChars(callsign.toUpper().trimmed(), [](QChar c) { return !c.isLetterOrNumber() && c != '_'; }); return removeChars(ucCallsign, [](QChar c) { return !c.isLetterOrNumber() && c != '_'; });
} }
const CIcon &CCallsign::convertToIcon(const CCallsign &callsign) const CIcon &CCallsign::convertToIcon(const CCallsign &callsign)
@@ -372,22 +374,24 @@ namespace BlackMisc
const QStringList &CCallsign::atcCallsignSuffixes() const QStringList &CCallsign::atcCallsignSuffixes()
{ {
static const QStringList a({ "APP", "GND", "TWR", "DEL", "CTR" }); static const QStringList a({ "APP", "GND", "DEP", "TWR", "DEL", "CTR" });
return a; return a;
} }
const QStringList &CCallsign::atcAlikeCallsignSuffixes() const QStringList &CCallsign::atcAlikeCallsignSuffixes()
{ {
static const QStringList a({ "ATIS", "APP", "GND", "OBS", "TWR", "DEL", "CTR", "SUP", "FSS", "INS" }); static const QStringList a({ "ATIS", "APP", "GND", "OBS", "DEP", "TWR", "DEL", "CTR", "SUP", "FSS", "INS" });
return a; return a;
} }
bool CCallsign::looksLikeAtcCallsign(const QString &callsign) bool CCallsign::looksLikeAtcCallsign(const QString &callsign)
{ {
if (!callsign.contains("_")) { return false; } if (!callsign.contains("_")) { return false; }
const QStringView uc = callsign.toUpper();
for (const QString &r : CCallsign::atcAlikeCallsignSuffixes()) for (const QString &r : CCallsign::atcAlikeCallsignSuffixes())
{ {
if (callsign.endsWith(r)) { return true; } if (uc.endsWith(r)) { return true; }
} }
return false; return false;
} }