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 T472, improved scoring for ICAO code and added category support

Browse Source
This commit is contained in:
Klaus Basan
2019-03-09 02:05:51 +01:00
committed by Mat Sutcliffe
parent 54adb40329
commit 13de708944
2 changed files with 59 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/blackmisc/aviation/aircrafticaocode.cpp
View File

@@ -156,19 +156,55 @@ namespace BlackMisc
{
if (this->hasFamily() && this->getFamily() == otherCode.getFamily())
{
score += 30;
score += 40;
CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Added family: %1").arg(score));
}
else if (this->hasValidCombinedType() && otherCode.getCombinedType() == this->getCombinedType())
{
score += 20;
score += 30;
CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Added combined code: %1").arg(score));
}
else if (this->hasValidCombinedType())
{
if (this->getEnginesCount() == otherCode.getEnginesCount()) { score += 2; }
if (this->getEngineType() == otherCode.getEngineType()) { score += 2; }
if (this->getAircraftType() == otherCode.getAircraftType()) { score += 2; }
// totally 15
// engine count
const int eMy = this->getEnginesCount();
const int eOther = otherCode.getEnginesCount();
if (eMy == eOther && eMy >= 0)
{
score += 4;
}
else if (eMy > 0 && eOther > 0)
{
const int eDiff = qAbs(eMy - eOther);
if (eDiff == 1) { score += 2; }
else if (eDiff == 2) { score += 1; }
}
// engine type
const QString tMy = this->getEngineType();
const QString tOther = this->getEngineType();
if (tMy == tOther)
{
score += 4;
}
else if (!tMy.isEmpty() && !tOther.isEmpty())
{
if (isEPTEngineType(tMy[0]) && isEPTEngineType(tOther[0])) { score += 2; }
}
// aircraft type
if (this->getAircraftType() == otherCode.getAircraftType())
{
score += 7;
}
else if (this->isVtol() && otherCode.isVtol())
{
score += 4;
}
CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Added combined code parts: %1").arg(score));
}
}
@@ -189,9 +225,14 @@ namespace BlackMisc
}
// 0..75 so far
if (this->isMilitary() == otherCode.isMilitary())
if (this->hasCategory() && otherCode.hasCategory() && this->getCategory() == otherCode.getCategory())
{
score += 10;
score += 8;
CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Matches military flag '%1': %2").arg(boolToYesNo(this->isMilitary())).arg(score));
}
else if (this->isMilitary() == otherCode.isMilitary())
{
score += 8;
CMatchingUtils::addLogDetailsToList(log, *this, QStringLiteral("Matches military flag '%1': %2").arg(boolToYesNo(this->isMilitary())).arg(score));
}
// 0..85
@@ -441,8 +482,8 @@ namespace BlackMisc
void CAircraftIcaoCode::setCodeFlags(bool military, bool legacy, bool realWorld)
{
m_military = military;
m_legacy = legacy;
m_military = military;
m_legacy = legacy;
m_realWorld = realWorld;
}
@@ -775,6 +816,12 @@ namespace BlackMisc
return codes;
}
bool CAircraftIcaoCode::isEPTEngineType(const QChar engineType)
{
const QChar e = engineType.toUpper();
return e == 'P' || e == 'E' || e == 'T';
}
CAircraftIcaoCode CAircraftIcaoCode::fromDatabaseJson(const QJsonObject &json, const QString &prefix)
{
if (!existsKey(json, prefix))

3
src/blackmisc/aviation/aircrafticaocode.h
View File

@@ -348,6 +348,9 @@ namespace BlackMisc
//! Create relaxed combined codes, e.g "L2J" -> "L3J", ...
static QStringList alternativeCombinedCodes(const QString &combinedCode);
//! Engine tye is Electric, Piston, TurboProp
static bool isEPTEngineType(const QChar engineType);
//! From our database JSON format
static CAircraftIcaoCode fromDatabaseJson(const QJsonObject &json, const QString &prefix = QString());