Fix tile version handling

Here maps plugin checks server for tile version.
When tile version is updated, update not only
the current camera tiles, but also scene tiles.

Task-number: QTBUG-44809
Change-Id: Iedb3add5308a2e61cc18e169e33ea4510e1a4fee
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

3 files changed, 2 insertions, 12 deletions

diff --git a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp
index bf58ad34..98777d09 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.cpp
@@ -110,13 +110,4 @@ void QGeoTiledMapNokia::evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTile
     emit copyrightsChanged(m_copyrightsSlab);
 }
 
-int QGeoTiledMapNokia::mapVersion()
-{
-    if (!m_engine.isNull())
-        return m_engine->mapVersion();
-    else
-        return QGeoTiledMap::mapVersion();
-
-}
-
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h
index d0253343..9651cc80 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotiledmap_nokia.h
@@ -54,7 +54,6 @@ public:
 
     QString getViewCopyright();
     void evaluateCopyrights(const QSet<QGeoTileSpec> &visibleTiles);
-    int mapVersion();
 
 private:
     QImage m_logo;
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
index 02e6f12c..54bf29af 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
@@ -258,8 +258,7 @@ void QGeoTiledMappingManagerEngineNokia::updateVersion(const QJsonObject &newVer
         m_mapVersion.setVersion(m_mapVersion.version() + 1);
 
         saveMapVersion();
-
-        emit mapVersionChanged();
+        setTileVersion(m_mapVersion.version());
     }
 }
 
@@ -297,6 +296,7 @@ void QGeoTiledMappingManagerEngineNokia::loadMapVersion()
 
     m_mapVersion.setVersion(object[QStringLiteral("version")].toInt());
     m_mapVersion.setVersionData(object[QStringLiteral("data")].toObject());
+    setTileVersion(m_mapVersion.version());
 }
 
 QString QGeoTiledMappingManagerEngineNokia::evaluateCopyrightsText(const QGeoMapType mapType,