Fixing cache warning when using custom basemap URL

Author: kara-jensen

conanfile.py

@@ -4,7 +4,7 @@
 
 class QtBasemapPluginConan(ConanFile):
     name = 'QtBasemapPlugin'
-    version = '1.0.1-2'
+    version = '1.0.1-3'
     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/GeoTiledMappingManagerEngine.cpp

@@ -217,24 +217,27 @@ GeoTiledMappingManagerEngine::GeoTiledMappingManagerEngine(const QVariantMap& pa
 
     setTileFetcher(tileFetcher);
 
-    // Set up the tile cache
-    QString cacheDirectory;
-    if (usingMapBox && !getParameter(parameters, "cache_directory", cacheDirectory))
+    if (usingMapBox)
     {
-        cacheDirectory = QAbstractGeoTileCache::baseLocationCacheDirectory() + QLatin1String(pluginName);
-    }
+        // Set up the tile cache
+        QString cacheDirectory;
+        if (usingMapBox && !getParameter(parameters, "cache_directory", cacheDirectory))
+        {
+            cacheDirectory = QAbstractGeoTileCache::baseLocationCacheDirectory() + QLatin1String(pluginName);
+        }
 
-    auto tileCache = new GeoFileTileCache(mapTypes, scaleFactor, cacheDirectory);
-    tileCache->setCostStrategyDisk(QGeoFileTileCache::Unitary);
-    tileCache->setCostStrategyMemory(QGeoFileTileCache::ByteSize);
-    tileCache->setCostStrategyTexture(QGeoFileTileCache::ByteSize);
-    tileCache->setMaxDiskUsage(6000);
-    if (!usingMapBox)
+        auto tileCache = new GeoFileTileCache(mapTypes, scaleFactor, cacheDirectory);
+        tileCache->setCostStrategyDisk(QGeoFileTileCache::Unitary);
+        tileCache->setCostStrategyMemory(QGeoFileTileCache::ByteSize);
+        tileCache->setCostStrategyTexture(QGeoFileTileCache::ByteSize);
+        tileCache->setMaxDiskUsage(6000);
+        setTileCache(tileCache);
+    }
+    else
     {
         // Do not cache any custom user maps due to legality
         setCacheHint(QAbstractGeoTileCache::CacheArea::MemoryCache);
     }
-    setTileCache(tileCache);
 
     *error = QGeoServiceProvider::NoError;
     errorString->clear();