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

Conflicts:
	src/map/mapengine.cpp

diff --cc src/map/mapengine.cpp
index fdc1ce3,633b6b2..67b07c6
--- 1/src/map/mapengine.cpp
--- 2/src/map/mapengine.cpp
+++ b/src/map/mapengine.cpp
@@@ -174,8 -174,22 +174,30 @@@ void MapEngine::calculateTileGrid(
      }
  }
  
 +void MapEngine::viewResized(const QSize &size)
 +{
 +    m_viewSize = size;
 +    setLocation(m_sceneCoordinate);
 +}
++
+ void MapEngine::zoomIn()
+ {
+     if (m_zoomLevel >= MAX_ZOOM_LEVEL)
+         return;
+ 
+     m_zoomLevel++;
+     emit zoomLevelChanged(m_zoomLevel);
+     /// @todo START FETCHING TILES
++    calculateTileGrid();
+ }
+ 
+ void MapEngine::zoomOut()
+ {
+     if (m_zoomLevel <= MIN_ZOOM_LEVEL)
+         return;
+ 
+     m_zoomLevel--;
+     emit zoomLevelChanged(m_zoomLevel);
+     /// @todo START FETCHING TILES
++    calculateTileGrid();
+ }

diff --cc src/map/mapengine.h
index 4629f0a,b2da7a6..75b9275
--- 1/src/map/mapengine.h
--- 2/src/map/mapengine.h
+++ b/src/map/mapengine.h
@@@ -172,8 -162,26 +171,20 @@@ private slots
      */
      void mapImageReceived(const QUrl &url, const QPixmap &pixmap);
  
 -    /**
 -    * @brief Slot for setting current view location
 -    *
 -    * Emits locationChanged signal.
 -    * @param sceneCoordinate Scene coordinates for new position
 -    */
 -    void setLocation(QPointF sceneCoordinate);
 +    void viewResized(const QSize &size);
  
+     /**
+     * @brief Slot for zooming in
+     *
+     */
+     void zoomIn();
+ 
+     /**
+     * @brief Slot for zooming out
+     *
+     */
+     void zoomOut();
+ 
  signals:
      /**
      * @brief Signal for view location change

diff --cc src/map/mapview.h
index 2879b72,6e62130..4d04e30
--- 1/src/map/mapview.h
--- 2/src/map/mapview.h
+++ b/src/map/mapview.h
@@@ -41,16 -41,22 +41,27 @@@ public
      MapView(QWidget *parent = 0);
  
  signals:
+     /**
+     * @brief Signal for view scroll events
+     *
+     * Signal is emitted when view scroll is requested with mouse (or finger).
+     * @param sceneCoordinate Scene coordinates of the new requested center point of the view
+     */
      void viewScrolled(QPointF sceneCoordinate);
  
 +    void viewResized(const QSize &size);
 +
  public slots:
+     /**
+     * @brief Slot for centering view to new location
+     *
+     * @param sceneCoordinate Scene coordinates of the new center point
+     */
      void centerToSceneCoordinates(QPointF sceneCoordinate);
  
 +protected:
 +    void resizeEvent(QResizeEvent *event);
 +
  private slots:
      /**
      * @brief Slot for mouse move events

diff --cc src/ui/mapviewscreen.cpp
Simple merge