Ref T562, fix 2-letter aircraft ICAO codes

* added constexpr for aircraft ICAO min/max length
* use ICAO designator in FP if there is no "getCombinedPrefixIcaoSuffix"
This commit is contained in:
Klaus Basan
2019-03-06 03:23:14 +01:00
committed by Mat Sutcliffe
parent e31fa91052
commit a4dc89a295
4 changed files with 10 additions and 4 deletions

View File

@@ -660,8 +660,11 @@ namespace BlackCore
//! \fixme that would be the official string, can this be used?
// const QString alt = flightPlan.getCruiseAltitude().asFpAltitudeString();
QString act = flightPlan.getCombinedPrefixIcaoSuffix();
if (act.isEmpty()) { act = flightPlan.getAircraftIcao().getDesignator(); } // fallback
QByteArray acTypeTemp, altAptTemp, cruiseAltTemp, depAptTemp, destAptTemp, routeTemp, remarksTemp;
vatlibFP.aircraftType = acTypeTemp = toFSDnoColon(flightPlan.getCombinedPrefixIcaoSuffix());
vatlibFP.aircraftType = acTypeTemp = toFSDnoColon(act);
vatlibFP.alternateAirport = altAptTemp = toFSDnoColon(flightPlan.getAlternateAirportIcao().asString());
vatlibFP.cruiseAltitude = cruiseAltTemp = toFSDnoColon(alt);
vatlibFP.departAirport = depAptTemp = toFSDnoColon(flightPlan.getOriginAirportIcao().asString());