Merge branch 'laitiju' into map

[situare] / src / map / mapengine.cpp

diff --git a/src/map/mapengine.cpp b/src/map/mapengine.cpp
index b8e37bf..5c57fdd 100644 (file)
--- a/src/map/mapengine.cpp
+++ b/src/map/mapengine.cpp
@@ -2,6 +2,7 @@
    Situare - A location system for Facebook
    Copyright (C) 2010  Ixonos Plc. Authors:
 
+       Sami Rämö - sami.ramo@ixonos.com
        Jussi Laitinen - jussi.laitinen@ixonos.com
 
    Situare is free software; you can redistribute it and/or
@@ -19,14 +20,59 @@
    USA.
 */
 
-#include <QtCore>
-#include <QtGlobal>
+#include <QDebug>
+#include <QString>
+#include <QStringList>
+#include <QUrl>
 
 #include "mapengine.h"
+#include "maptile.h"
+//#include "mapscene.h"
+
+#include <QtCore>
+#include <QtGlobal>
 
-MapEngine::MapEngine(QObject *parent)
+MapEngine::MapEngine(MapView *mapView, QWidget *parent)
     : QObject(parent)
 {
+    m_mapView = mapView;
+    m_mapScene = new MapScene(this);
+    mapView->setScene(m_mapScene);
+    m_zoomLevel = 14;
+
+    m_mapFetcher = new MapFetcher(this);
+}
+
+void MapEngine::setViewLocation(QPointF latLonCoordinate)
+{
+    m_mapView->setZoomLevel(m_zoomLevel);
+
+    /// Show some dummy map tiles for demo purposes
+    for (int x=9351; x<=9354; x++) {
+        for (int y=4261; y<=4264; y++) {
+
+        }
+    }
+}
+
+void MapEngine::mapImageReceived(const QUrl *url, const QPixmap *pixmap)
+{
+    //QString path = "http://tile.openstreetmap.org/mapnik/14/9353/4261.png";
+    QString path = url.path();
+    qDebug() << __PRETTY_FUNCTION__ << "path:" << path;
+
+    QStringList pathParts = path.split("/", QString::SkipEmptyParts);
+    qDebug() << __PRETTY_FUNCTION__ << "pathParts:" << pathParts;
+
+//    int zoom = (pathParts.at(1)).toInt();
+//    int x = (pathParts.at(2)).toInt();
+//    int y = (pathParts.at(3)).toInt();
+
+//    MapTile *mapTile = new MapTile();
+//    mapTile->setZoomLevel(zoom);
+//    mapTile->setTileNumber(QPoint(x, y));
+//    mapTile->setPixmap();
+//    m_mapScene->addMapTile(mapTile);
 }
 
 QPoint MapEngine::latLonToTile(qreal latitude, qreal longitude, int zoom)