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

Ref T472, category support for ICAO value objects

Browse Source
This commit is contained in:
Klaus Basan
2019-02-17 16:34:12 +01:00
committed by Mat Sutcliffe
parent 3be2cd6c5f
commit c82efe441f
4 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/blackmisc/aviation/aircrafticaocodelist.cpp
View File

@@ -7,7 +7,8 @@
* contained in the LICENSE file.
*/
#include "blackmisc/aviation/aircrafticaocodelist.h"
#include "aircrafticaocodelist.h"
#include "aircraftcategorylist.h"
#include "blackmisc/range.h"
#include <QJsonObject>
@@ -314,19 +315,29 @@ namespace BlackMisc
{
const QMap<QString, int> counts(countManufacturers());
if (counts.isEmpty()) return { {}, 0 };
const auto pair = *std::max_element(counts.keyValueBegin(), counts.keyValueEnd(), [](const auto &a, const auto &b)
const auto pair = *std::max_element(counts.keyValueBegin(), counts.keyValueEnd(), [](const auto & a, const auto & b)
{
return a.second < b.second;
});
return { pair.first, pair.second };
}
CAircraftIcaoCodeList CAircraftIcaoCodeList::fromDatabaseJson(const QJsonArray &array, bool ignoreIncompleteAndDuplicates, CAircraftIcaoCodeList *inconsistent)
CAircraftIcaoCodeList CAircraftIcaoCodeList::fromDatabaseJson(const QJsonArray &array, const CAircraftCategoryList &categories, bool ignoreIncompleteAndDuplicates, CAircraftIcaoCodeList *inconsistent)
{
CAircraftIcaoCodeList codes;
for (const QJsonValue &value : array)
{
const CAircraftIcaoCode icao(CAircraftIcaoCode::fromDatabaseJson(value.toObject()));
CAircraftIcaoCode icao(CAircraftIcaoCode::fromDatabaseJson(value.toObject()));
const int catId = icao.getCategory().getDbKey();
if (!categories.isEmpty() && catId >= 0)
{
const CAircraftCategory category = categories.findByKey(catId);
if (!category.isNull())
{
icao.setCategory(category);
}
}
if (!icao.hasSpecialDesignator() && !icao.hasCompleteData())
{
if (ignoreIncompleteAndDuplicates) { continue; }