Fix cache mixing with high-dpi and low-dpi osm providers

This cache fixes the cache mixing problem that has been introduced
with the osm high dpi tiles support.

high dpi providers fall back to low dpi ones and ultimately
to hardcoded providers (also low dpi), and can also be enabled/disabled
via plugin parameter, thus leaving the cache for a given map id
dirty for the next run.

With this patch high dpi tiles are named differently from low dpi ones.
If high-dpi providers are selected, but become not available, the
cache can also change the tileset to load at runtime

Change-Id: I229692da07c1fc61c58fb0b6fae6ec5af16e43a7
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>

1 files changed, 19 insertions, 0 deletions

diff --git a/src/location/maps/qgeotiledmap.cpp b/src/location/maps/qgeotiledmap.cpp
index f59417f7..fedaecbc 100644
--- a/src/location/maps/qgeotiledmap.cpp
+++ b/src/location/maps/qgeotiledmap.cpp
@@ -116,6 +116,13 @@ void QGeoTiledMap::clearData()
     d->m_mapScene->clearTexturedTiles();
 }
 
+void QGeoTiledMap::clearScene(int mapId)
+{
+    Q_D(QGeoTiledMap);
+    if (activeMapType().mapId() == mapId)
+        d->clearScene();
+}
+
 void QGeoTiledMap::handleTileVersionChanged()
 {
     Q_D(QGeoTiledMap);
@@ -293,6 +300,11 @@ void QGeoTiledMapPrivate::prefetchTiles()
     }
 }
 
+QGeoMapType QGeoTiledMapPrivate::activeMapType()
+{
+    return m_visibleTiles->activeMapType();
+}
+
 void QGeoTiledMapPrivate::changeCameraData(const QGeoCameraData &cameraData)
 {
     Q_Q(QGeoTiledMap);
@@ -356,6 +368,13 @@ void QGeoTiledMapPrivate::changeTileVersion(int version)
     updateScene();
 }
 
+void QGeoTiledMapPrivate::clearScene()
+{
+    m_mapScene->clearTexturedTiles();
+    m_mapScene->setVisibleTiles(QSet<QGeoTileSpec>());
+    updateScene();
+}
+
 void QGeoTiledMapPrivate::changeMapSize(const QSize& size)
 {
     Q_Q(QGeoTiledMap);