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

[Matching] Do not use FsInn data if the model string is NOT known

Browse Source 
This can override a swift livery string with invalid data
This was already addressed in Ref T701, but obviously incomplete
This commit is contained in:
Klaus Basan
2019-10-29 00:00:35 +01:00
committed by Mat Sutcliffe
parent 209c00b430
commit cb1e56d7e3
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackcore/airspacemonitor.cpp
View File

@@ -592,7 +592,8 @@ namespace BlackCore
const bool complete = validRemoteCs && const bool complete = validRemoteCs &&
minSituations && ( minSituations && (
readiness.receivedAll() || readiness.receivedAll() ||
(remoteAircraft.getModel().getModelType() == CAircraftModel::TypeFSInnData) || // here we know we have all data // disable, because it can be model string is unknown in FsInn data
// (remoteAircraft.getModel().getModelType() == CAircraftModel::TypeFSInnData) || // here we know we have all data
(remoteAircraft.hasModelString()) // we cannot expect more info (remoteAircraft.hasModelString()) // we cannot expect more info
); );
@@ -631,11 +632,10 @@ namespace BlackCore
// some checks for special conditions, e.g. logout -> empty list, but still signals pending // some checks for special conditions, e.g. logout -> empty list, but still signals pending
if (validRemoteCs) if (validRemoteCs)
{ {
static const QString readyForMatching("Ready for matching callsign '%1' with model type '%2', '%3'"); static const QString readyForMatching("Ready (%1) for matching callsign '%2' with model type '%3', ICAO: '%4' '%5'");
readiness.setFlag(ReadyForMatchingSent); // stored as readiness as reference readiness.setFlag(ReadyForMatchingSent); // stored as readiness as reference
const QString readyMsg = readyForMatching.arg(readiness.toQString(), callsign.toQString(), remoteAircraft.getModel().getModelTypeAsString(), remoteAircraft.getAircraftIcaoCode().getDesignatorDbKey(), remoteAircraft.getAirlineIcaoCode().getDesignatorDbKey());
const QString readyMsg = readyForMatching.arg(callsign.toQString(), remoteAircraft.getModel().getModelTypeAsString(), readiness.toQString());
const CStatusMessage m = CLogUtilities::logMessage(callsign, readyMsg, getLogCategories()); const CStatusMessage m = CLogUtilities::logMessage(callsign, readyMsg, getLogCategories());
this->addReverseLookupMessage(callsign, m); this->addReverseLookupMessage(callsign, m);
@@ -815,10 +815,13 @@ namespace BlackCore
QStringLiteral("FsInn modelstring ignored, as modelstring '%1' is not known").arg(modelString)); QStringLiteral("FsInn modelstring ignored, as modelstring '%1' is not known").arg(modelString));
} }
// with no model we pretend to be a normal "queried model" // if model string is empty, FsInn data are pointless
const CAircraftModel::ModelType modelType = usedModelString.isEmpty() ? CAircraftModel::TypeQueriedFromNetwork : CAircraftModel::TypeFSInnData; // in order not to override swift livery string data, we ignore those
this->addOrUpdateAircraftInRange(callsign, aircraftIcaoDesignator, airlineIcaoDesignator, QString(), usedModelString, modelType, pReverseLookupMessages); if (!usedModelString.isEmpty())
{
this->addOrUpdateAircraftInRange(callsign, aircraftIcaoDesignator, airlineIcaoDesignator, QString(), usedModelString, CAircraftModel::TypeFSInnData, pReverseLookupMessages);
this->addReverseLookupMessages(callsign, reverseLookupMessages); this->addReverseLookupMessages(callsign, reverseLookupMessages);
}
this->sendReadyForModelMatching(callsign, ReceivedFsInnPacket); // from FSInn this->sendReadyForModelMatching(callsign, ReceivedFsInnPacket); // from FSInn
} }
} }