Fixed remaining review defects

diff --git a/src/map/mapscene.cpp b/src/map/mapscene.cpp
index 3a5694c..a0e829c 100644 (file)
--- a/src/map/mapscene.cpp
+++ b/src/map/mapscene.cpp
@@ -73,14 +73,10 @@ void MapScene::runNextStackedTilesRemoval()
     }
 
     // schedule removal of the next tile if the list is not empty
-    if (!m_removeStackedTilesList.isEmpty()) {
+    if (!m_removeStackedTilesList.isEmpty())
         QTimer::singleShot(0, this, SLOT(runNextStackedTilesRemoval()));
-    }
-    else {
+    else
         m_isRemoveStackedTilesRunning = false;
-        qDebug() << __PRETTY_FUNCTION__ << "Stacked tiles removal queue processing finished,"
-                                        << "items count:" << items().count();
-    }
 }
 
 void MapScene::removeOutOfViewTiles()
@@ -90,22 +86,16 @@ void MapScene::removeOutOfViewTiles()
     QList<QGraphicsItem *> viewTiles = items(m_viewRect, Qt::IntersectsItemBoundingRect);
     QList<QGraphicsItem *> allTiles = items();
 
-    qDebug() << __PRETTY_FUNCTION__ << "All tiles:" << allTiles.count();
-    qDebug() << __PRETTY_FUNCTION__ << "Tiles in view area:" << viewTiles.count();
-
     //Remove tiles which are in view from allTiles
     foreach (QGraphicsItem *tile, viewTiles)
         allTiles.removeOne(tile);
 
-
     //Remove tiles out of view
     foreach (QGraphicsItem *tile, allTiles) {
         MapTile *tileToRemove = dynamic_cast<MapTile *>(tile);
         if (tileToRemove)
             removeTile(tileToRemove);
     }
-
-    qDebug() << __PRETTY_FUNCTION__ << "finished, items count:" << items().count();
 }
 
 void MapScene::removeStackedTiles(MapTile *newTile)
@@ -134,14 +124,12 @@ void MapScene::removeTile(MapTile *tile)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    if (tile) {
-        m_mapTilesInScene.remove(MapEngine::tilePath(tile->zoomLevel(),
-                                                     tile->tileNumber().x(),
-                                                     tile->tileNumber().y()));
-        removeItem(tile);
-        m_removeStackedTilesList.removeAll(tile);
-        delete tile;
-    }
+    m_mapTilesInScene.remove(MapEngine::tilePath(tile->zoomLevel(),
+                                                 tile->tileNumber().x(),
+                                                 tile->tileNumber().y()));
+    removeItem(tile);
+    m_removeStackedTilesList.removeAll(tile);
+    delete tile;
 }
 
 void MapScene::setTilesDrawingLevels(int zoomLevel)

diff --git a/src/map/maptile.cpp b/src/map/maptile.cpp
index 5697cee..af9f5a0 100644 (file)
--- a/src/map/maptile.cpp
+++ b/src/map/maptile.cpp
@@ -90,15 +90,12 @@ void MapTile::setPosition()
 
     const int maxTileNumber = (1 << m_zoomLevel) - 1;
 
-    if ((m_zoomLevel >= MIN_MAP_ZOOM_LEVEL) && (m_zoomLevel <= MAX_MAP_ZOOM_LEVEL) &&
-        (m_tileNumber.x() >= 0) && (m_tileNumber.x() <= maxTileNumber) &&
-        (m_tileNumber.y() >= 0) && (m_tileNumber.y() <= maxTileNumber)) {
+    if ((m_zoomLevel >= MIN_MAP_ZOOM_LEVEL) && (m_zoomLevel <= MAX_MAP_ZOOM_LEVEL)
+        && (m_tileNumber.x() >= 0) && (m_tileNumber.x() <= maxTileNumber)
+        && (m_tileNumber.y() >= 0) && (m_tileNumber.y() <= maxTileNumber))
 
         setPos(MapEngine::convertTileNumberToSceneCoordinate(m_zoomLevel, m_tileNumber));
-        qDebug() << __PRETTY_FUNCTION__ << "tile position:" << pos();
-    }
-    else {
+    else
         setPos(UNDEFINED, UNDEFINED);
-    }
 }
 

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index 4cee084..ed28f6e 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -43,28 +43,21 @@ void MapView::setZoomLevel(int zoomLevel)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_zoomAnimation->stop();
-    m_zoomAnimation->setDuration(ZOOM_TIME);
-    m_zoomAnimation->setStartValue(viewScale());
-    m_zoomAnimation->setEndValue(pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL));
-
-    m_zoomAnimation->start();
-}
-
-qreal MapView::currentScale()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    QTransform currentTransform = transform();
-    return currentTransform.m11();
+    if (m_zoomAnimation) {
+        m_zoomAnimation->stop();
+        m_zoomAnimation->setDuration(ZOOM_TIME);
+        m_zoomAnimation->setStartValue(viewScale());
+        m_zoomAnimation->setEndValue(pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL));
+
+        m_zoomAnimation->start();
+    }
 }
 
 qreal MapView::viewScale()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QTransform currentTransform = transform();
-    return currentTransform.m11();
+    return transform().m11();
 }
 
 void MapView::setViewScale(qreal viewScale)

diff --git a/src/map/mapview.h b/src/map/mapview.h
index a5651dc..c45c2c0 100644 (file)
--- a/src/map/mapview.h
+++ b/src/map/mapview.h
@@ -99,13 +99,6 @@ public slots:
 
 private:
     /**
-    * @brief get current horizontal scale (vertical should be same)
-    *
-    * @return qreal Current horizontal scale value
-    */
-    qreal currentScale();
-
-    /**
     * @brief Set new view scale
     *
     * @param viewScale New scaling factor