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

Update VATSIM data file reader to read new JSON data file format

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-12-05 15:41:06 +00:00
parent 9014a673f1
commit 50eebb799d
8 changed files with 138 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -745,20 +745,49 @@ namespace BlackMisc
QString CFlightPlan::aircraftIcaoCodeFromEquipmentCode(const QString &equipmentCodeAndAircraft)
{
// 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("/.");
QString aircraftIcaoCode(equipmentCodeAndAircraft);
aircraftIcaoCode = aircraftIcaoCode.replace(reg, "").trimmed().toUpper();
return aircraftIcaoCode;
return splitEquipmentCode(equipmentCodeAndAircraft)[1].trimmed().toUpper();
}
QStringList CFlightPlan::splitEquipmentCode(const QString &equipmentCodeAndAircraft)
{
static const QStringList empty({"", "", ""});
if (empty.isEmpty()) { return empty; }
QStringList firstSplit = equipmentCodeAndAircraft.split('-');
if (firstSplit.size() >= 2)
{
// format like B789/H-SDE1E2E3FGHIJ2J3J4J5M1RWXY/LB1D1
QString equipment = firstSplit.size() >= 2 ? firstSplit[1] : "";
QStringList split = firstSplit[0].split('/');
if (split.size() >= 3)
{
return { split[2], split[1], equipment.isEmpty() ? split[0] : equipment }; // "F/B789/H"
}
else if (split.size() >= 2)
{
if (split[0].size() <= 1) // "H/B789"
{
return { split[0], split[1], equipment };
}
else // "B789/H"
{
return { split[1], split[0], equipment };
}
}
else // "B789"
{
return { {}, split[0], equipment };
}
}
QStringList split = equipmentCodeAndAircraft.split('/');
if (split.length() == 3) { return split; } // "H/B738/F"
if (split.length() >= 3)
{
if (split[1].size() == 1 && CAircraftIcaoCode::isValidDesignator(split[0]))
{
using std::swap;
swap(split[0], split[1]); // "A359/H/L"
}
return split; // "H/B738/F"
}
if (split.length() == 2)
{
if (split[0].length() == 1)
@@ -766,6 +795,7 @@ namespace BlackMisc
// we assume prefix + ICAO
// e.g. "H/B748"
split.push_back("");
return split;
}
else
{