Make custom basemap option of of the map types

Author: viktor-kopp-pix4d

conanfile.py

@@ -4,7 +4,7 @@
 
 class QtBasemapPluginConan(ConanFile):
     name = 'QtBasemapPlugin'
-    version = '1.0.1-4'
+    version = '1.1.0-1'
     license = 'LGPL3'
     url = 'http://code.qt.io/cgit/qt/qtlocation.git/tree/src/plugins/geoservices/mapbox?h=5.10'
     description = 'Qt GeoServices plugin for basemaps including MapBox'

src/GeoFileTileCache.cpp

@@ -16,7 +16,7 @@ GeoFileTileCache::GeoFileTileCache(const QList<QGeoMapType>& mapTypes,
     m_scaleFactor = qBound(1, scaleFactor, 2);
     for (int i = 0; i < mapTypes.size(); i++)
     {
-        m_mapNameToId.insert(mapTypes[i].name(), i + 1);
+        m_mapNameToId.insert(mapTypes[i].name(), i);
     }
 }
 
@@ -32,7 +32,7 @@ QString GeoFileTileCache::tileSpecToFilename(const QGeoTileSpec& spec,
     QString filename = spec.plugin();
 
     filename += QLatin1String("-");
-    filename += m_mapTypes[spec.mapId() - 1].name();
+    filename += m_mapTypes[spec.mapId()].name();
     filename += QLatin1String("-");
     filename += QString::number(spec.zoom());
     filename += QLatin1String("-");

src/GeoTileFetcher.cpp

@@ -150,11 +150,13 @@ QGeoTiledMapReply* GeoTileFetcher::getTileImage(const QGeoTileSpec& spec)
     request.setRawHeader("User-Agent", m_userAgent);
     request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
 
-    if (m_customBasemapUrl.isEmpty())
+    const bool isCustomBasemapRequest = (spec.mapId() < m_mapIds.size()) && !m_customBasemapUrl.isEmpty() && (m_mapIds[spec.mapId()] == PIX4D_CUSTOM);
+
+    QUrl tileUrl;
+    if (!isCustomBasemapRequest)
     {
-        request.setUrl(
-           QUrl(QStringLiteral("https://api.mapbox.com/styles/v1/cloudpix4d/")
-                + ((spec.mapId() > m_mapIds.size()) ? PIX4D_STREET : m_mapIds[spec.mapId() - 1])
+        tileUrl = QUrl(QStringLiteral("https://api.mapbox.com/styles/v1/cloudpix4d/")
+                + ((spec.mapId() > m_mapIds.size()) ? PIX4D_STREET : m_mapIds[spec.mapId()])
                 + QLatin1String("/tiles/256/")
                 + QString::number(spec.zoom())
                 + QLatin1Char('/')
@@ -164,7 +166,7 @@ QGeoTiledMapReply* GeoTileFetcher::getTileImage(const QGeoTileSpec& spec)
                 + ((m_scaleFactor > 1) ? (QLatin1Char('@') + QString::number(m_scaleFactor) + QLatin1Char('x')) : QString())
                 + QLatin1Char('?')
                 + QStringLiteral("access_token=")
-                + m_accessToken));
+                + m_accessToken);
     }
     else
     {
@@ -260,8 +262,10 @@ QGeoTiledMapReply* GeoTileFetcher::getTileImage(const QGeoTileSpec& spec)
             qInfo() << "Basemap tile requested" << urlDetails;
         }
 
-        request.setUrl(QUrl(basemapUrl));
+        tileUrl = QUrl(basemapUrl);
     }
 
+    request.setUrl(tileUrl);
+
     return new GeoMapReply(m_networkManager->get(request), spec, m_replyFormat, m_enableLogging);
 }

src/GeoTileFetcher.h

@@ -21,9 +21,12 @@ class GeoTileFetcher : public QGeoTileFetcher
     QGeoTiledMapReply* getTileImage(const QGeoTileSpec& spec);
 
 public:
-    // The list of map style ids
+    // The list of map style names:
+    // The two values below are part of url allowing to fetch corresponsing mapbox tiles
     static constexpr const char* PIX4D_STREET = "ck8zz9gpq0vty1ip30bji3b5a";
     static constexpr const char* PIX4D_STREETS_SATELLITE = "ck8zzfxb30vwp1jo04yktjtbg";
+    // name for custom basemap tiles requests
+    static constexpr const char* PIX4D_CUSTOM = "custom";
 
 private:
     QNetworkAccessManager* m_networkManager{nullptr};

src/GeoTiledMappingManagerEngine.cpp

@@ -63,44 +63,58 @@ GeoTiledMappingManagerEngine::GeoTiledMappingManagerEngine(const QVariantMap& pa
     cameraCaps.setOverzoomEnabled(true);
     setCameraCapabilities(cameraCaps);
 
-    QString customBasemapUrl;
-    getParameter(parameters, "custom_basemap_url", customBasemapUrl);
-    const bool usingMapBox = customBasemapUrl.isEmpty();
-
     setTileSize(QSize(256, 256));
     m_noMapTiles = getParameter(parameters, "no_map_tiles");
 
     QList<QGeoMapType> mapTypes;
-    QVector<QString> mapIds;
-    if (usingMapBox)
-    {
-        mapTypes << QGeoMapType(QGeoMapType::SatelliteMapDay,
-                                GeoTileFetcher::PIX4D_STREETS_SATELLITE,
-                                QStringLiteral("Satellite"),
-                                false,
-                                false,
-                                mapTypes.size() + 1,
-                                pluginName,
-                                cameraCaps);
-        mapTypes << QGeoMapType(QGeoMapType::StreetMap,
-                                GeoTileFetcher::PIX4D_STREET,
-                                QStringLiteral("Street"),
+    mapTypes << QGeoMapType(QGeoMapType::SatelliteMapDay,
+                            GeoTileFetcher::PIX4D_STREETS_SATELLITE,
+                            QStringLiteral("Satellite"),
+                            false,
+                            false,
+                            mapTypes.size(),
+                            pluginName,
+                            cameraCaps);
+    mapTypes << QGeoMapType(QGeoMapType::StreetMap,
+                            GeoTileFetcher::PIX4D_STREET,
+                            QStringLiteral("Street"),
+                            false,
+                            false,
+                            mapTypes.size(),
+                            pluginName,
+                            cameraCaps);
+
+    QString customBasemapUrl;
+    getParameter(parameters, "custom_basemap_url", customBasemapUrl);
+    if (!customBasemapUrl.isEmpty())
+        mapTypes << QGeoMapType(QGeoMapType::CustomMap,
+                                "custom",
+                                QStringLiteral("Custom"),
                                 false,
                                 false,
-                                mapTypes.size() + 1,
+                                mapTypes.size(),
                                 pluginName,
                                 cameraCaps);
 
-        for (const auto& type : mapTypes)
+    if (enableLogging)
+    {
+        qInfo() << "Plugin supports " << mapTypes.size() <<" map types:";
+        for (const auto& t : qAsConst(mapTypes))
         {
-            mapIds.push_back(type.name());
+            qInfo() << t.description();
         }
     }
+
     setSupportedMapTypes(mapTypes);
 
     // Set up the tile fetcher
     const int scaleFactor = getParameter(parameters, "highdpi_tiles") ? 2 : 1;
     auto tileFetcher = new GeoTileFetcher(scaleFactor, enableLogging, customBasemapUrl, this);
+    QVector<QString> mapIds;
+    for (const auto& type : qAsConst(mapTypes))
+    {
+        mapIds.push_back(type.name());
+    }
     tileFetcher->setMapIds(mapIds);
 
     QString format;
@@ -121,11 +135,11 @@ GeoTiledMappingManagerEngine::GeoTiledMappingManagerEngine(const QVariantMap& pa
 
     setTileFetcher(tileFetcher);
 
-    if (usingMapBox)
+    if (customBasemapUrl.isEmpty())
     {
         // Set up the tile cache
         QString cacheDirectory;
-        if (usingMapBox && !getParameter(parameters, "cache_directory", cacheDirectory))
+        if (!getParameter(parameters, "cache_directory", cacheDirectory))
         {
             cacheDirectory = QAbstractGeoTileCache::baseLocationCacheDirectory() + QLatin1String(pluginName);
         }
@@ -157,7 +171,7 @@ QGeoMap* GeoTiledMappingManagerEngine::createMap()
     return m_noMapTiles ? new NoGeoTiledMap(this, 0) : new QGeoTiledMap(this, 0);
 }
 
-QSGNode* NoGeoTiledMap::updateSceneGraph(QSGNode*, QQuickWindow* window)
+QSGNode* NoGeoTiledMap::updateSceneGraph(QSGNode*, QQuickWindow*)
 {
     return nullptr;
 }