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

Ref T704, improved airline prefix parsing (from callsign)

Browse Source
This commit is contained in:
Klaus Basan
2019-07-15 01:44:22 +02:00
parent e1a66a3849
commit 5eec43c03c
3 changed files with 97 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,27 +195,57 @@ namespace BlackMisc
QString CCallsign::getAirlinePrefix(QString &flightNumber) const
{
QString identification;
return this->getAirlinePrefix(flightNumber, identification);
}
QString CCallsign::getAirlinePrefix(QString &flightNumber, QString &flightIdentification) const
{
// DLH1WP only 11 number
// UPSE123 4 characters, then number
flightNumber.clear();
if (m_callsign.length() < 3) { return {}; }
if (this->isAtcCallsign()) { return {}; }
thread_local const QRegularExpression regExp("^[A-Z]{3,}");
QRegularExpressionMatch match = regExp.match(m_callsign);
thread_local const QRegularExpression regExp("(^[A-Z]{3,})(\\d+)");
const QRegularExpressionMatch match = regExp.match(m_callsign);
if (!match.hasMatch()) { return {}; }
const QString airline = match.captured(0);
flightNumber = match.captured(1);
// 0 is whole capture
const QString airline = match.captured(1);
flightNumber = match.captured(2); // null string if not exits
// hard facts
if (airline.length() == 3) { return airline; } // we allow 3 letters
if (airline.length() == 4 && airline.startsWith('V')) { return airline; } // we allow virtual 4 letter codes, e.g. VDLD
if (airline.length() == 3) // we allow 3 letters
{
flightIdentification = m_callsign.length() > 3 ? m_callsign.mid(3) : QString();
return airline;
}
if (airline.length() == 4 && airline.startsWith('V')) // we allow virtual 4 letter codes, e.g. VDLD
{
flightIdentification = m_callsign.length() > 4 ? m_callsign.mid(4) : QString();
return airline;
}
// some people use callsigns like UPSE123
flightNumber = match.captured(1);
if (flightNumber.length() >= 3 && airline.length() == 4) { return airline.left(3); }
if (flightNumber.length() >= 1 && airline.length() == 4)
{
flightIdentification = m_callsign.mid(3);
return airline.left(3);
}
return {}; // invalid
}
QString CCallsign::getFlightIndentification() const
{
if (this->isAtcCallsign()) { return {}; }
QString flightNumber;
QString identification;
const QString airline = this->getAirlinePrefix(flightNumber, identification);
return airline.isEmpty() ? QString() : identification;
}
QString CCallsign::getFlightNumber() const
{
if (this->isAtcCallsign()) { return {}; }

4
src/blackmisc/aviation/callsign.h
View File

@@ -113,8 +113,12 @@ namespace BlackMisc
//! Airline suffix (e.g. DLH1234 -> DLH) if applicable @{
QString getAirlinePrefix() const;
QString getAirlinePrefix(QString &flightNumber) const;
QString getAirlinePrefix(QString &flightNumber, QString &flightIdentification) const;
// @}
//! Flight number (e.g. DLH1234 -> 1234) if applicable
QString getFlightIndentification() const;
//! Flight number (e.g. DLH1234 -> 1234) if applicable
QString getFlightNumber() const;

84
tests/blackmisc/aviation/testaviation/testaviation.cpp
View File

@@ -131,7 +131,7 @@ namespace BlackMiscTest
void CTestAviation::transponder()
{
CTransponder t1 = CTransponder::getStandardTransponder(7000, CTransponder::StateStandby);
const CTransponder t1 = CTransponder::getStandardTransponder(7000, CTransponder::StateStandby);
CTransponder t2 = t1;
QVERIFY2(t1 == t2, "Transponders shall be equal");
t2.setTransponderMode(CTransponder::ModeC);
@@ -150,21 +150,47 @@ namespace BlackMiscTest
void CTestAviation::callsignWithContainers()
{
CCallsign cs1("EDDm_twr");
CCallsign cs2("eddm_TWR");
CCallsign cs3("EDDm_app", "München Radar");
const CCallsign cs1("EDDm_twr");
const CCallsign cs2("eddm_TWR");
const CCallsign cs3("EDDm_app", "München Radar");
QVERIFY2(cs1 == cs2, "Callsigns shall be equal");
QVERIFY2(cs1 != cs3, "Callsigns shall not be equal");
CCallsign pilot("DLH123");
CCallsign copilot1("DLH123A");
CCallsign copilot2("DLH1233");
CCallsign copilot3("DLH12");
const CCallsign pilot("DLH123");
const CCallsign copilot1("DLH123A");
const CCallsign copilot2("DLH1233");
const CCallsign copilot3("DLH12");
QVERIFY(copilot1.isMaybeCopilotCallsign(pilot));
QVERIFY(!pilot.isMaybeCopilotCallsign(pilot));
QVERIFY(!copilot2.isMaybeCopilotCallsign(pilot));
QVERIFY(!copilot3.isMaybeCopilotCallsign(pilot));
QString flightnumber;
QString identifier;
QString prefix = pilot.getAirlinePrefix(flightnumber, identifier);
QVERIFY(prefix == "DLH");
QVERIFY(flightnumber == "123");
QVERIFY(flightnumber == identifier);
prefix = copilot1.getAirlinePrefix(flightnumber, identifier);
QVERIFY(prefix == "DLH");
QVERIFY(flightnumber == "123");
QVERIFY(flightnumber != identifier);
prefix = copilot3.getAirlinePrefix(flightnumber);
QVERIFY(prefix == "DLH");
QVERIFY(flightnumber == "12");
const CCallsign pilotX1("DLHFOO");
prefix = pilotX1.getAirlinePrefix(flightnumber);
QVERIFY(prefix.isEmpty()); // no prefix
QVERIFY(flightnumber.isEmpty());
const CCallsign pilotX2("DLH1WP");
prefix = pilotX2.getAirlinePrefix(flightnumber, identifier);
QVERIFY(prefix == "DLH"); // no prefix
QVERIFY(flightnumber == "1");
QVERIFY(identifier == "1WP");
CCallsignSet set;
set.push_back(cs1);
QVERIFY2(set.size() == 1, "List shall be 1");
@@ -186,50 +212,50 @@ namespace BlackMiscTest
void CTestAviation::copyAndEqual()
{
CFrequency f1(123.45, CFrequencyUnit::MHz());
CFrequency f2(f1);
const CFrequency f1(123.45, CFrequencyUnit::MHz());
const CFrequency f2(f1);
QVERIFY2(f1 == f2, "frequencies shall be equal");
CCallsign c1("EABCD");
CCallsign c2(c1);
const CCallsign c1("EABCD");
const CCallsign c2(c1);
QVERIFY2(c1 == c2, "callsigns shall be equal");
CInformationMessage im1(CInformationMessage::METAR, "I am a metar");
CInformationMessage im2(im1);
const CInformationMessage im1(CInformationMessage::METAR, "I am a metar");
const CInformationMessage im2(im1);
QVERIFY2(im1 == im2, "information shall be equal");
CUser user1("112233dd", "Joe", "", "secret");
CUser user2(user1);
const CUser user1("112233dd", "Joe", "", "secret");
const CUser user2(user1);
QVERIFY2(user1 == user2, "information shall be equal");
CServer server1 = CServer::swiftFsdTestServer();
CServer server2(server1);
const CServer server1 = CServer::swiftFsdTestServer();
const CServer server2(server1);
QVERIFY2(server1 == server2, "server shall be equal");
CAircraftSituation situation1(
const CAircraftSituation situation1(
CCoordinateGeodetic(
CLatitude::fromWgs84("N 049° 18' 17"),
CLongitude::fromWgs84("E 008° 27' 05"),
CAltitude(312, CLengthUnit::ft()))
);
CAircraftSituation situation2(situation1);
const CAircraftSituation situation2(situation1);
QVERIFY2(situation1 == situation2, "situations shall be equal");
CAircraftIcaoCode aircraftIcao1("C172", "L1P");
CAircraftIcaoCode aircraftIcao2(aircraftIcao1);
const CAircraftIcaoCode aircraftIcao1("C172", "L1P");
const CAircraftIcaoCode aircraftIcao2(aircraftIcao1);
QVERIFY2(aircraftIcao1 == aircraftIcao2, "aircraft ICAOs shall be equal");
CAirlineIcaoCode airlineIcao1("GA");
CAirlineIcaoCode airlineIcao2(airlineIcao1);
const CAirlineIcaoCode airlineIcao1("GA");
const CAirlineIcaoCode airlineIcao2(airlineIcao1);
QVERIFY2(airlineIcao1 == airlineIcao2, "airline ICAOs shall be equal");
CCallsign call1("EDDS_N_APP", CCallsign::Atc);
CCallsign call2("edds_n_app", CCallsign::Atc);
const CCallsign call1("EDDS_N_APP", CCallsign::Atc);
const CCallsign call2("edds_n_app", CCallsign::Atc);
QVERIFY2(call1 == call2, "Callsigns shall be equal");
CAtcStation atc1(c1, user1, f1, situation1.getPosition(), CLength(), false, QDateTime(), QDateTime(), CInformationMessage(CInformationMessage::ATIS, "foo"));
CAtcStation atc2(c1, user1, f1, situation1.getPosition(), CLength(), false, QDateTime(), QDateTime(), CInformationMessage(CInformationMessage::ATIS, "foo"));
CAtcStation atc3(c1, user1, f1, situation1.getPosition(), CLength(), false, QDateTime(), QDateTime(), CInformationMessage(CInformationMessage::ATIS, "bar"));
const CAtcStation atc1(c1, user1, f1, situation1.getPosition(), CLength(), false, QDateTime(), QDateTime(), CInformationMessage(CInformationMessage::ATIS, "foo"));
const CAtcStation atc2(c1, user1, f1, situation1.getPosition(), CLength(), false, QDateTime(), QDateTime(), CInformationMessage(CInformationMessage::ATIS, "foo"));
const CAtcStation atc3(c1, user1, f1, situation1.getPosition(), CLength(), false, QDateTime(), QDateTime(), CInformationMessage(CInformationMessage::ATIS, "bar"));
QVERIFY2(atc1 == atc2, "ATC stations shall be equal");
QVERIFY2(atc1 != atc3, "ATC stations shall not be equal");
}