From 93bc3694d07ce123a4662f58f50fdd219643f5c4 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sat, 11 Jul 2020 09:57:44 -0700 Subject: [PATCH] Ability to determine Bing provider --- src/QtLocationPlugin/BingMapProvider.h | 3 +++ src/QtLocationPlugin/MapProvider.cpp | 4 ---- src/QtLocationPlugin/MapProvider.h | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/QtLocationPlugin/BingMapProvider.h b/src/QtLocationPlugin/BingMapProvider.h index 414aa1c99..5ae9ac72c 100644 --- a/src/QtLocationPlugin/BingMapProvider.h +++ b/src/QtLocationPlugin/BingMapProvider.h @@ -20,6 +20,9 @@ public: ~BingMapProvider() = default; + bool _isBingProvider() const override { return true; } + + protected: const QString _versionBingMaps = QStringLiteral("563"); }; diff --git a/src/QtLocationPlugin/MapProvider.cpp b/src/QtLocationPlugin/MapProvider.cpp index 790f6a4e4..0179ab632 100644 --- a/src/QtLocationPlugin/MapProvider.cpp +++ b/src/QtLocationPlugin/MapProvider.cpp @@ -89,10 +89,6 @@ int MapProvider::lat2tileY(const double lat, const int z) const { 2.0 * pow(2.0, z))); } -bool MapProvider::_isElevationProvider() const { - return false; -} - QGCTileSet MapProvider::getTileCount(const int zoom, const double topleftLon, const double topleftLat, const double bottomRightLon, const double bottomRightLat) const { diff --git a/src/QtLocationPlugin/MapProvider.h b/src/QtLocationPlugin/MapProvider.h index 5dfe7dc73..d61a023d8 100644 --- a/src/QtLocationPlugin/MapProvider.h +++ b/src/QtLocationPlugin/MapProvider.h @@ -45,7 +45,8 @@ public: virtual int lat2tileY(const double lat, const int z) const; - virtual bool _isElevationProvider() const; + virtual bool _isElevationProvider() const { return false; } + virtual bool _isBingProvider() const { return false; } virtual QGCTileSet getTileCount(const int zoom, const double topleftLon, const double topleftLat, const double bottomRightLon, -- 2.22.0