QGeoMapScene renamed to QGeoTiledMapScenev5.7.0-alpha1

Since the class QGeoMapScene is tightly coupled to QGeoTiledMap, this
patch renames it into QGeoTiledMapScene/QGeoTiledMapScenePrivate, to
clarify the structure of the module and avoid confusion, as otherwise
it would not be clear that this class is exclusively used by QGeoTiledMap.

Change-Id: Ifd76b02ff14d0f0690dc37fcb0a93b0e0702d05d
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

2 files changed, 392 insertions, 0 deletions

diff --git a/tests/auto/qgeotiledmapscene/qgeotiledmapscene.pro b/tests/auto/qgeotiledmapscene/qgeotiledmapscene.pro
new file mode 100644
index 00000000..c3ec6e91
--- /dev/null
+++ b/tests/auto/qgeotiledmapscene/qgeotiledmapscene.pro
@@ -0,0 +1,8 @@
+CONFIG += testcase
+TARGET = tst_qgeotiledmapscene
+
+INCLUDEPATH += ../../../src/location/maps
+
+SOURCES += tst_qgeotiledmapscene.cpp
+
+QT += location positioning-private testlib
diff --git a/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
new file mode 100644
index 00000000..3d43ebd8
--- /dev/null
+++ b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
@@ -0,0 +1,384 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//TESTED_COMPONENT=src/location/maps
+
+#include "qgeotilespec_p.h"
+#include "qgeotiledmapscene_p.h"
+#include "qgeocameratiles_p.h"
+#include "qgeocameradata_p.h"
+#include "qabstractgeotilecache_p.h"
+
+#include <QtPositioning/private/qgeoprojection_p.h>
+#include <QtPositioning/private/qdoublevector2d_p.h>
+
+#include <qtest.h>
+
+#include <QList>
+#include <QPair>
+#include <QDebug>
+
+#include <cmath>
+
+QT_USE_NAMESPACE
+
+class tst_QGeoTiledMapScene : public QObject
+{
+    Q_OBJECT
+
+    private:
+    void row(QString name, double screenX, double screenY, double cameraCenterX, double cameraCenterY,
+             double zoom, int tileSize, int screenWidth, int screenHeight, double mercatorX, double mercatorY){
+
+        // expected behaviour of wrapping
+        if (mercatorX <= 0.0)
+            mercatorX += 1.0;
+        else if (mercatorX > 1.0)
+            mercatorX -= 1.0;
+
+        QTest::newRow(qPrintable(name))
+                << screenX << screenY
+                << cameraCenterX << cameraCenterY
+                << zoom << tileSize
+                << screenWidth << screenHeight
+                << mercatorX
+                << mercatorY;
+    }
+
+    void screenPositions(QString name, double cameraCenterX, double cameraCenterY,  double zoom,
+                         int tileSize, int screenWidth, int screenHeight)
+    {
+        double screenX;
+        double screenY;
+        double mercatorX;
+        double mercatorY;
+
+        double halfLength = 1 / (std::pow(2.0, zoom) * 2);
+        double scaleX = screenWidth / tileSize;
+        double scaleY = screenHeight / tileSize;
+        double scaledHalfLengthX = halfLength * scaleX;
+        double scaledHalfLengthY = halfLength * scaleY;
+
+        // top left
+        screenX = 0.0;
+        screenY = 1.0 * screenHeight;
+        mercatorX = cameraCenterX - scaledHalfLengthX;
+        mercatorY = cameraCenterY + scaledHalfLengthY;
+        row (name + QString("_topLeftScreen"), screenX, screenY, cameraCenterX, cameraCenterY,
+                     zoom, tileSize, screenWidth, screenHeight, mercatorX, mercatorY);
+
+        // top
+        screenX = 0.5 * screenWidth;
+        screenY = 1.0 * screenHeight;
+        mercatorX = cameraCenterX;
+        mercatorY = cameraCenterY + scaledHalfLengthY;
+        row (name + QString("_topScreen"), screenX, screenY, cameraCenterX, cameraCenterY,
+                     zoom, tileSize, screenWidth, screenHeight, mercatorX, mercatorY);
+
+        // top right
+        screenX = 1.0 * screenWidth;
+        screenY = 1.0 * screenHeight;
+        mercatorX = cameraCenterX + scaledHalfLengthX;
+        mercatorY = cameraCenterY + scaledHalfLengthY;
+        row (name + QString("_topRightScreen"), screenX, screenY, cameraCenterX, cameraCenterY,
+                     zoom, tileSize, screenWidth, screenHeight, mercatorX, mercatorY);
+
+        // left
+        screenX = 0.0 * screenWidth;
+        screenY = 0.5 * screenHeight;
+        mercatorX = cameraCenterX - scaledHalfLengthX;
+        mercatorY = cameraCenterY;
+        row (name + QString("_leftScreen"), screenX, screenY, cameraCenterX, cameraCenterY,
+                     zoom, tileSize, screenWidth, screenHeight, mercatorX, mercatorY);
+
+        // center
+        screenX = 0.5 * screenWidth;
+        screenY = 0.5 * screenHeight;
+        mercatorX = cameraCenterX;
+        mercatorY = cameraCenterY;
+        row (name + QString("_centerScreen"), screenX, screenY, cameraCenterX, cameraCenterY,
+                     zoom, tileSize, screenWidth, screenHeight, mercatorX, mercatorY);
+
+        // right
+        screenX = 1.0 * screenWidth;
+        screenY = 0.5 * screenHeight;
+        mercatorX = cameraCenterX + scaledHalfLengthX;
+        mercatorY = cameraCenterY;
+        row (name + QString("_rightScreen"), screenX, screenY, cameraCenterX, cameraCenterY,
+                     zoom, tileSize, screenWidth, screenHeight, mercatorX, mercatorY);
+
+        // bottom left
+        screenX = 0.0;
+        screenY = 0.0;
+        mercatorX = cameraCenterX - scaledHalfLengthX;
+        mercatorY = cameraCenterY - scaledHalfLengthY;
+        row (name + QString("_bottomLeftrScreen"), screenX, screenY, cameraCenterX, cameraCenterY,
+                     zoom, tileSize, screenWidth, screenHeight, mercatorX, mercatorY);
+
+        // bottom
+        screenX = 0.5 * screenWidth;
+        screenY = 0.0;
+        mercatorX = cameraCenterX;
+        mercatorY = cameraCenterY - scaledHalfLengthY;
+        row (name + QString("_bottomScreen"), screenX, screenY, cameraCenterX, cameraCenterY,
+                     zoom, tileSize, screenWidth, screenHeight, mercatorX, mercatorY);
+
+        // bottom right
+        screenX = 1.0 * screenWidth;
+        screenY = 0.0;
+        mercatorX = cameraCenterX + scaledHalfLengthX;
+        mercatorY = cameraCenterY - scaledHalfLengthY;
+        row (name + QString("_bottomRightScreen"), screenX, screenY, cameraCenterX, cameraCenterY,
+                     zoom, tileSize, screenWidth, screenHeight, mercatorX, mercatorY);
+
+    }
+
+    void screenCameraPositions(QString name, double zoom, int tileSize,
+                               int screenWidth, int screenHeight)
+    {
+        double cameraCenterX;
+        double cameraCenterY;
+
+        // top left
+        cameraCenterX = 0;
+        cameraCenterY = 1.0;
+        screenPositions(name + QString("_topLeftCamera"), cameraCenterX, cameraCenterY,
+                        zoom, tileSize, screenWidth, screenHeight);
+
+        // top
+        cameraCenterX = 0.5;
+        cameraCenterY = 1.0;
+        screenPositions(name + QString("_topCamera"), cameraCenterX, cameraCenterY,
+                        zoom, tileSize, screenWidth, screenHeight);
+        // top right
+        cameraCenterX = 1.0;
+        cameraCenterY = 1.0;
+        screenPositions(name + QString("_topRightCamera"), cameraCenterX, cameraCenterY,
+                        zoom, tileSize, screenWidth, screenHeight);
+        // left
+        cameraCenterX = 0.0;
+        cameraCenterY = 0.5;
+        screenPositions(name + QString("_leftCamera"), cameraCenterX, cameraCenterY,
+                        zoom, tileSize, screenWidth, screenHeight);
+        // middle
+        cameraCenterX = 0.5;
+        cameraCenterY = 0.5;
+        screenPositions(name + QString("_middleCamera"), cameraCenterX, cameraCenterY,
+                        zoom, tileSize, screenWidth, screenHeight);
+        // right
+        cameraCenterX = 1.0;
+        cameraCenterY = 0.5;
+        screenPositions(name + QString("_rightCamera"), cameraCenterX, cameraCenterY,
+                        zoom, tileSize, screenWidth, screenHeight);
+        // bottom left
+        cameraCenterX = 0.0;
+        cameraCenterY = 0.0;
+        screenPositions(name + QString("_bottomLeftCamera"), cameraCenterX, cameraCenterY,
+                        zoom, tileSize, screenWidth, screenHeight);
+        // bottom
+        cameraCenterX = 0.5;
+        cameraCenterY = 0.0;
+        screenPositions(name + QString("_bottomCamera"), cameraCenterX, cameraCenterY,
+                        zoom, tileSize, screenWidth, screenHeight);
+        // bottom right
+        cameraCenterX = 1.0;
+        cameraCenterY = 0.0;
+        screenPositions(name + QString("_bottomRightCamera"), cameraCenterX, cameraCenterY,
+                        zoom, tileSize, screenWidth, screenHeight);
+    }
+
+    void populateScreenMercatorData(){
+        QTest::addColumn<double>("screenX");
+        QTest::addColumn<double>("screenY");
+        QTest::addColumn<double>("cameraCenterX");
+        QTest::addColumn<double>("cameraCenterY");
+        QTest::addColumn<double>("zoom");
+        QTest::addColumn<int>("tileSize");
+        QTest::addColumn<int>("screenWidth");
+        QTest::addColumn<int>("screenHeight");
+        QTest::addColumn<double>("mercatorX");
+        QTest::addColumn<double>("mercatorY");
+
+        int tileSize;
+        double zoom;
+        int screenWidth;
+        int screenHeight;
+        QString name;
+        tileSize = 16;
+        zoom = 4.0;
+
+        /*
+            ScreenWidth = t
+            ScreenHeight = t
+        */
+        screenWidth = tileSize;
+        screenHeight = tileSize;
+        name = QString("_(t x t)");
+        screenCameraPositions(name, zoom, tileSize, screenWidth, screenHeight);
+
+        /*
+            ScreenWidth = t * 2
+            ScreenHeight = t
+        */
+        screenWidth = tileSize * 2;
+        screenHeight = tileSize;
+        name = QString("_(2t x t)");
+        screenCameraPositions(name, zoom, tileSize, screenWidth, screenHeight);
+
+        /*
+            ScreenWidth = t
+            ScreenHeight = t * 2
+        */
+        screenWidth = tileSize;
+        screenHeight = tileSize * 2;
+        name = QString("_(2t x t)");
+        screenCameraPositions(name, zoom, tileSize, screenWidth, screenHeight);
+
+        /*
+            Screen Width = t * 2
+            Screen Height = t * 2
+        */
+        screenWidth = tileSize * 2;
+        screenHeight = tileSize * 2;
+        name = QString("_(2t x 2t)");
+        screenCameraPositions(name, zoom, tileSize, screenWidth, screenHeight);
+    }
+
+    private slots:
+
+       void useVerticalLock(){
+            QGeoCameraData camera;
+            camera.setZoomLevel(4.0);
+            camera.setCenter(QGeoProjection::mercatorToCoord(QDoubleVector2D(0.0, 0.0)));
+
+            QGeoCameraTiles ct;
+            ct.setTileSize(16);
+            ct.setCameraData(camera);
+            ct.setScreenSize(QSize(16,16));
+
+            QGeoTiledMapScene mapScene;
+            mapScene.setTileSize(16);
+            mapScene.setScreenSize(QSize(16,16*32));
+            mapScene.setCameraData(camera);
+            QVERIFY(!mapScene.verticalLock());
+            mapScene.setUseVerticalLock(true);
+            mapScene.setVisibleTiles(ct.createTiles());
+            QVERIFY(mapScene.verticalLock());
+
+            // Test the case when setting vertical lock has no effect
+            QGeoTiledMapScene mapScene2;
+            mapScene2.setTileSize(16);
+            mapScene2.setScreenSize(QSize(16,16));
+            mapScene2.setCameraData(camera);
+            QVERIFY(!mapScene2.verticalLock());
+            mapScene2.setUseVerticalLock(true);
+            mapScene2.setVisibleTiles(ct.createTiles());
+            QVERIFY(!mapScene2.verticalLock());
+        }
+
+        void screenToMercatorPositions(){
+            QFETCH(double, screenX);
+            QFETCH(double, screenY);
+            QFETCH(double, cameraCenterX);
+            QFETCH(double, cameraCenterY);
+            QFETCH(double, zoom);
+            QFETCH(int, tileSize);
+            QFETCH(int, screenWidth);
+            QFETCH(int, screenHeight);
+            QFETCH(double, mercatorX);
+            QFETCH(double, mercatorY);
+
+            QGeoCameraData camera;
+            camera.setZoomLevel(zoom);
+            camera.setCenter(QGeoProjection::mercatorToCoord(QDoubleVector2D(cameraCenterX, cameraCenterY)));
+
+            QGeoCameraTiles ct;
+            ct.setTileSize(tileSize);
+            ct.setCameraData(camera);
+            ct.setScreenSize(QSize(screenWidth,screenHeight));
+
+            QGeoTiledMapScene mapGeometry;
+            mapGeometry.setTileSize(tileSize);
+            mapGeometry.setScreenSize(QSize(screenWidth,screenHeight));
+            mapGeometry.setCameraData(camera);
+            mapGeometry.setVisibleTiles(ct.createTiles());
+
+            QDoubleVector2D point(screenX,screenY);
+            QDoubleVector2D mecartorPos = mapGeometry.itemPositionToMercator(point);
+
+            QCOMPARE(mecartorPos.x(),mercatorX);
+            QCOMPARE(mecartorPos.y(),mercatorY);
+        }
+
+        void screenToMercatorPositions_data()
+        {
+            populateScreenMercatorData();
+        }
+
+        void mercatorToScreenPositions(){
+            QFETCH(double, screenX);
+            QFETCH(double, screenY);
+            QFETCH(double, cameraCenterX);
+            QFETCH(double, cameraCenterY);
+            QFETCH(double, zoom);
+            QFETCH(int, tileSize);
+            QFETCH(int, screenWidth);
+            QFETCH(int, screenHeight);
+            QFETCH(double, mercatorX);
+            QFETCH(double, mercatorY);
+
+            QGeoCameraData camera;
+            camera.setZoomLevel(zoom);
+            camera.setCenter(QGeoProjection::mercatorToCoord(QDoubleVector2D(cameraCenterX, cameraCenterY)));
+
+            QGeoCameraTiles ct;
+            ct.setTileSize(tileSize);
+            ct.setCameraData(camera);
+            ct.setScreenSize(QSize(screenWidth,screenHeight));
+
+            QGeoTiledMapScene mapGeometry;
+            mapGeometry.setTileSize(tileSize);
+            mapGeometry.setScreenSize(QSize(screenWidth,screenHeight));
+            mapGeometry.setCameraData(camera);
+            mapGeometry.setVisibleTiles(ct.createTiles());
+
+            QDoubleVector2D mercatorPos(mercatorX, mercatorY);
+            QPointF point = mapGeometry.mercatorToItemPosition(mercatorPos).toPointF();
+
+            QCOMPARE(point.x(), screenX);
+            QCOMPARE(point.y(), screenY);
+        }
+
+        void mercatorToScreenPositions_data(){
+            populateScreenMercatorData();
+        }
+
+};
+
+QTEST_GUILESS_MAIN(tst_QGeoTiledMapScene)
+#include "tst_qgeotiledmapscene.moc"