Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
	src/ui/mapviewscreen.cpp

diff --cc src/map/mapengine.cpp
index b08fe4f,f7afee6..5a9400a
--- 1/src/map/mapengine.cpp
--- 2/src/map/mapengine.cpp
+++ b/src/map/mapengine.cpp
@@@ -246,8 -187,11 +246,11 @@@ void MapEngine::zoomIn(
  
      m_zoomLevel++;
      emit zoomLevelChanged(m_zoomLevel);
+ 
+     setZValues();
+ 
      /// @todo START FETCHING TILES
 -    calculateTileGrid();
 +    calculateTileGrid(m_sceneCoordinate);
  }
  
  void MapEngine::zoomOut()
@@@ -257,16 -201,23 +260,33 @@@
  
      m_zoomLevel--;
      emit zoomLevelChanged(m_zoomLevel);
+ 
+     setZValues();
+ 
      /// @todo START FETCHING TILES
 -    calculateTileGrid();
 +    calculateTileGrid(m_sceneCoordinate);
 +}
 +
 +void MapEngine::setZoomLevel(int zoomLevel)
 +{
 +    m_zoomLevel = zoomLevel;
 +}
 +
 +int MapEngine::getZoomLevel()
 +{
 +    return m_zoomLevel;
  }
+ 
+ void MapEngine::setZValues()
+ {
+     //qDebug() << __PRETTY_FUNCTION__ << "m_zoomLevel:" << m_zoomLevel;
+ 
+     QList<QGraphicsItem *> items = m_mapScene->items();
+ 
+     for (int i = 0; i < items.size(); ++i) {
+         MapTile *item = dynamic_cast<MapTile *>(items.at(i));
+         if (item)
+             item->setSceneLevel(m_zoomLevel);
+     }
+ 
+ }

diff --cc src/map/mapengine.h
Simple merge

diff --cc src/ui/mapviewscreen.cpp
index 90ceb61,3726e91..978d368
--- 1/src/ui/mapviewscreen.cpp
--- 2/src/ui/mapviewscreen.cpp
+++ b/src/ui/mapviewscreen.cpp
@@@ -71,14 -68,4 +68,4 @@@ void MapViewScreen::searchMap(
      qDebug() << lat << "," << lon;
  
      mapEngine->setViewLocation(QPointF(lon, lat));
--}
- 
- void MapViewScreen::zoomInMap()
- {
- 
- }
- 
- void MapViewScreen::zoomOutMap()
- {
-     //mapEngine->zoomLevelChanged();
- }
++}