Changes for setting the zValue of the MapTile

diff --git a/src/map/mapengine.cpp b/src/map/mapengine.cpp
index c4cdc9c..b8986e5 100644 (file)
--- a/src/map/mapengine.cpp
+++ b/src/map/mapengine.cpp
@@ -101,9 +101,7 @@ void MapEngine::mapImageReceived(const QUrl &url, const QPixmap &pixmap)
     if (!m_mapScene->isTileInScene(hashKey)) {
 
         MapTile *mapTile = new MapTile();
-        /// @todo SET SCENE LEVEL AUTOMATICALLY WHEN CHANGING ZOOM LEVEL
-        mapTile->setZoomLevel(zoom);
-        mapTile->setSceneLevel(m_zoomLevel);
+        mapTile->setZoomLevel(zoom, m_zoomLevel);
         mapTile->setTileNumber(QPoint(x, y));
         mapTile->setPixmap(pixmap);
 
@@ -112,7 +110,6 @@ void MapEngine::mapImageReceived(const QUrl &url, const QPixmap &pixmap)
         m_mapScene->debugItemsCount();
 
         m_mapScene->enqueueRemoveStackedTiles(mapTile);
-        //m_mapScene->removeStackedTiles(mapTile, viewRect());
    }
 }
 

diff --git a/src/map/maptile.cpp b/src/map/maptile.cpp
index b4ecbe3..c538f5d 100644 (file)
--- a/src/map/maptile.cpp
+++ b/src/map/maptile.cpp
@@ -39,12 +39,12 @@ int MapTile::zoomLevel()
     return m_zoomLevel;
 }
 
-void MapTile::setZoomLevel(int zoomLevel)
+void MapTile::setZoomLevel(int tileZoomLevel, int currentViewZoomLevel)
 {
-    m_zoomLevel = zoomLevel;
+    m_zoomLevel = tileZoomLevel;
     setPosition();
 
-    setZValue(static_cast<qreal>(MIN_MAP_SCENE_NORMAL_LEVEL + zoomLevel));
+    setSceneLevel(currentViewZoomLevel);
 
     qreal zoomFactor = static_cast<qreal>(1 << (MAX_MAP_ZOOM_LEVEL - m_zoomLevel));
     setScale(zoomFactor);

diff --git a/src/map/maptile.h b/src/map/maptile.h
index 7e40cce..097d827 100644 (file)
--- a/src/map/maptile.h
+++ b/src/map/maptile.h
@@ -63,9 +63,12 @@ public:
     /**
     * @brief Setter for zoom level
     *
-    * @param zoomLevel Zoom level
+    * Does also set the zValue.
+    *
+    * @param tileZoomLevel Zoom level of the tile
+    * @param currentViewZoomLevel Current view zoom level
     */
-    void setZoomLevel(int zoomLevel);
+    void setZoomLevel(int tileZoomLevel, int currentViewZoomLevel);
 
     /**
     * @brief Getter for tile number