From 35283d8887726684493e32e71b4e9cb837dfd4bd Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 20 Oct 2016 03:37:41 +0200 Subject: [PATCH] refs #748, fixed airport entity and reader resolution --- src/blackcore/webdataservices.cpp | 3 +++ src/blackcore/webreaderflags.cpp | 5 +++++ src/blackmisc/network/entityflags.cpp | 2 ++ 3 files changed, 10 insertions(+) diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 327bee740..7ecdd1799 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -708,6 +708,9 @@ namespace BlackCore { case CWebReaderFlags::IcaoDataReader: return this->m_icaoDataReader; case CWebReaderFlags::ModelReader: return this->m_modelDataReader; + case CWebReaderFlags::AirportReader: return this->m_airportDataReader; + default: + break; } return nullptr; } diff --git a/src/blackcore/webreaderflags.cpp b/src/blackcore/webreaderflags.cpp index 440712371..28a6ecdfd 100644 --- a/src/blackcore/webreaderflags.cpp +++ b/src/blackcore/webreaderflags.cpp @@ -26,6 +26,11 @@ namespace BlackCore f |= ModelReader; } + if (entity.testFlag(CEntityFlags::AirportEntity)) + { + f |= AirportReader; + } + if (entity.testFlag(CEntityFlags::InfoObjectEntity)) { f |= InfoDataReader; } if (entity.testFlag(CEntityFlags::BookingEntity)) { f |= VatsimBookingReader; } if (entity.testFlag(CEntityFlags::VatsimDataFile)) { f |= VatsimDataReader; } diff --git a/src/blackmisc/network/entityflags.cpp b/src/blackmisc/network/entityflags.cpp index ef8f45903..49d5e2321 100644 --- a/src/blackmisc/network/entityflags.cpp +++ b/src/blackmisc/network/entityflags.cpp @@ -135,6 +135,7 @@ namespace BlackMisc bool CEntityFlags::anySwiftDbEntity(Entity entities) { return + entities.testFlag(AirportEntity) || entities.testFlag(AircraftIcaoEntity) || entities.testFlag(AirlineIcaoEntity) || entities.testFlag(CountryEntity) || entities.testFlag(DistributorEntity) || entities.testFlag(ModelEntity) || entities.testFlag(LiveryEntity); @@ -144,6 +145,7 @@ namespace BlackMisc { if (name.contains("aircraft", Qt::CaseInsensitive)) { return AircraftIcaoEntity; } if (name.contains("airline", Qt::CaseInsensitive)) { return AirlineIcaoEntity; } + if (name.contains("airport", Qt::CaseInsensitive)) { return AirportEntity; } if (name.contains("distributor", Qt::CaseInsensitive)) { return DistributorEntity; } if (name.contains("countr", Qt::CaseInsensitive)) { return CountryEntity; } if (name.contains("model", Qt::CaseInsensitive)) { return ModelEntity; }