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

Ref T129, use utility function in CFlightPlanUtils in VATSIM file reader

Browse Source
This commit is contained in:
Klaus Basan
2017-10-01 21:58:58 +02:00
committed by Mathew Sutcliffe
parent 784cf287f0
commit 0d3882032b
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackcore/vatsim/vatsimdatafilereader.cpp
View File

@@ -212,7 +212,7 @@ namespace BlackCore
}
this->logNetworkReplyReceived(nwReplyPtr);
QStringList illegalIcaoCodes;
QStringList illegalEquipmentCodes;
if (nwReply->error() == QNetworkReply::NoError)
{
const QString dataFileData = nwReply->readAll();
@@ -307,20 +307,17 @@ namespace BlackCore
situation.setGroundSpeed(CSpeed(groundspeedKts, CSpeedUnit::kts()));
CSimulatedAircraft currentAircraft(user.getCallsign().getStringAsSet(), user, situation);
QString aircraftIcaoCode = clientPartsMap["planned_aircraft"];
if (!aircraftIcaoCode.isEmpty())
const QString equipmentCodeAndAircraft = clientPartsMap["planned_aircraft"].trimmed();
if (!equipmentCodeAndAircraft.isEmpty())
{
// http://uk.flightaware.com/about/faq_aircraft_flight_plan_suffix.rvt
// we expect something like H/B772/F B773 B773/F
thread_local const QRegularExpression reg("/.");
aircraftIcaoCode = aircraftIcaoCode.replace(reg, "").trimmed().toUpper();
const QString aircraftIcaoCode = CFlightPlanUtils::aircraftIcaoCodeFromEquipmentCode(equipmentCodeAndAircraft);
if (CAircraftIcaoCode::isValidDesignator(aircraftIcaoCode))
{
currentAircraft.setAircraftIcaoDesignator(aircraftIcaoCode);
}
else
{
illegalIcaoCodes.append(aircraftIcaoCode);
illegalEquipmentCodes.append(equipmentCodeAndAircraft);
}
}
@@ -413,10 +410,10 @@ namespace BlackCore
}
// warnings, if required
if (!illegalIcaoCodes.isEmpty())
if (!illegalEquipmentCodes.isEmpty())
{
logInconsistentData(
CStatusMessage(this, CStatusMessage::SeverityInfo, "Illegal / ignored ICAO code(s) in VATSIM data file: " + illegalIcaoCodes.join(", "))
CStatusMessage(this, CStatusMessage::SeverityInfo, "Illegal / ignored equipment code(s) in VATSIM data file: " + illegalEquipmentCodes.join(", "))
);
}