diff options
20 files changed, 62 insertions, 59 deletions
diff --git a/examples/location/planespotter/main.cpp b/examples/location/planespotter/main.cpp index c71a6999..76b706c9 100644 --- a/examples/location/planespotter/main.cpp +++ b/examples/location/planespotter/main.cpp @@ -47,7 +47,7 @@ #include <QDebug> #include <QEasingCurve> #include <QGeoCoordinate> -#include <QtPositioning/private/qgeoprojection_p.h> +#include <QtPositioning/private/qwebmercator_p.h> #define ANIMATION_DURATION 4000 @@ -162,7 +162,7 @@ private: progress = ((qreal)startTime.msecsTo(current) / ANIMATION_DURATION); } - setPosition(QGeoProjection::coordinateInterpolation( + setPosition(QWebMercator::coordinateInterpolation( fromCoordinate, toCoordinate, easingCurve.valueForProgress(progress))); if (!timer.isActive()) diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/imports/location/qdeclarativecirclemapitem.cpp index c440664c..077ba385 100644 --- a/src/imports/location/qdeclarativecirclemapitem.cpp +++ b/src/imports/location/qdeclarativecirclemapitem.cpp @@ -37,7 +37,7 @@ #include "qdeclarativecirclemapitem_p.h" #include "qdeclarativepolygonmapitem_p.h" #include "qgeocameracapabilities_p.h" -#include "qgeoprojection_p.h" +#include "qwebmercator_p.h" #include <cmath> diff --git a/src/imports/location/qquickgeomapgesturearea.cpp b/src/imports/location/qquickgeomapgesturearea.cpp index 3d881ae2..fe5a04dd 100644 --- a/src/imports/location/qquickgeomapgesturearea.cpp +++ b/src/imports/location/qquickgeomapgesturearea.cpp @@ -46,7 +46,7 @@ #include <QtQuick/QQuickWindow> #include <QPropertyAnimation> #include <QDebug> -#include <QtPositioning/private/qgeoprojection_p.h> +#include <QtPositioning/private/qwebmercator_p.h> #include "math.h" #include "qgeomap_p.h" #include "qdoublevector2d_p.h" diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp index b7914e5d..31627c39 100644 --- a/src/imports/positioning/positioning.cpp +++ b/src/imports/positioning/positioning.cpp @@ -40,7 +40,7 @@ #include <QtPositioning/private/qdeclarativegeoaddress_p.h> #include <QtPositioning/private/qdeclarativegeolocation_p.h> -#include <QtPositioning/private/qgeoprojection_p.h> +#include <QtPositioning/private/qwebmercator_p.h> #include "qdeclarativepositionsource_p.h" #include "qdeclarativeposition_p.h" diff --git a/src/imports/positioning/qquickgeocoordinateanimation.cpp b/src/imports/positioning/qquickgeocoordinateanimation.cpp index c386074a..41c1be1e 100644 --- a/src/imports/positioning/qquickgeocoordinateanimation.cpp +++ b/src/imports/positioning/qquickgeocoordinateanimation.cpp @@ -41,7 +41,7 @@ #include "qquickgeocoordinateanimation_p_p.h" #include <QtQuick/private/qquickanimation_p_p.h> #include <QtPositioning/private/qdoublevector2d_p.h> -#include <QtPositioning/private/qgeoprojection_p.h> +#include <QtPositioning/private/qwebmercator_p.h> #include <QtPositioning/private/qgeocoordinate_p.h> QT_BEGIN_NAMESPACE @@ -80,7 +80,7 @@ QVariant q_coordinateInterpolator(const QGeoCoordinate &from, const QGeoCoordina } } - QGeoCoordinate result = QGeoProjection::coordinateInterpolation(from, to, progress); + QGeoCoordinate result = QWebMercator::coordinateInterpolation(from, to, progress); return QVariant::fromValue(result); } @@ -117,7 +117,7 @@ QVariant q_coordinateShortestInterpolator(const QGeoCoordinate &from, const QGeo double y = fromY + (toY - fromY) * progress; - QGeoCoordinate result = QGeoProjection::mercatorToCoord(QDoubleVector2D(x, y)); + QGeoCoordinate result = QWebMercator::mercatorToCoord(QDoubleVector2D(x, y)); result.setAltitude(from.altitude() + (to.altitude() - from.altitude()) * progress); return QVariant::fromValue(result); } @@ -146,7 +146,7 @@ QVariant q_coordinateWestInterpolator(const QGeoCoordinate &from, const QGeoCoor while (x > 1.0) x -= 1.0; - QGeoCoordinate result = QGeoProjection::mercatorToCoord(QDoubleVector2D(x, y)); + QGeoCoordinate result = QWebMercator::mercatorToCoord(QDoubleVector2D(x, y)); result.setAltitude(from.altitude() + (to.altitude() - from.altitude()) * progress); return QVariant::fromValue(result); @@ -176,7 +176,7 @@ QVariant q_coordinateEastInterpolator(const QGeoCoordinate &from, const QGeoCoor while (x < 0.0) x += 1.0; - QGeoCoordinate result = QGeoProjection::mercatorToCoord(QDoubleVector2D(x, y)); + QGeoCoordinate result = QWebMercator::mercatorToCoord(QDoubleVector2D(x, y)); result.setAltitude(from.altitude() + (to.altitude() - from.altitude()) * progress); return QVariant::fromValue(result); @@ -209,7 +209,7 @@ QGeoCoordinate QQuickGeoCoordinateAnimation::from() const void QQuickGeoCoordinateAnimation::setFrom(const QGeoCoordinate &f) { QGeoMercatorCoordinatePrivate *mercator = new QGeoMercatorCoordinatePrivate(); - QDoubleVector2D fromVector = QGeoProjection::coordToMercator(f); + QDoubleVector2D fromVector = QWebMercator::coordToMercator(f); mercator->lat = f.latitude(); mercator->lng = f.longitude(); mercator->alt = f.altitude(); @@ -232,7 +232,7 @@ QGeoCoordinate QQuickGeoCoordinateAnimation::to() const void QQuickGeoCoordinateAnimation::setTo(const QGeoCoordinate &t) { QGeoMercatorCoordinatePrivate *mercator = new QGeoMercatorCoordinatePrivate(); - QDoubleVector2D toVector = QGeoProjection::coordToMercator(t); + QDoubleVector2D toVector = QWebMercator::coordToMercator(t); mercator->lat = t.latitude(); mercator->lng = t.longitude(); mercator->alt = t.altitude(); diff --git a/src/location/maps/qgeocameradata.cpp b/src/location/maps/qgeocameradata.cpp index 23586082..909145fe 100644 --- a/src/location/maps/qgeocameradata.cpp +++ b/src/location/maps/qgeocameradata.cpp @@ -35,6 +35,7 @@ ****************************************************************************/ #include "qgeocameradata_p.h" #include <QtPositioning/private/qgeocoordinate_p.h> +#include <QtPositioning/private/qwebmercator_p.h> #include <QtCore/QVariant> #include <QtCore/QVariantAnimation> @@ -112,7 +113,7 @@ QVariant cameraInterpolator(const QGeoCameraData &start, } } else { - QGeoCoordinate coordinateResult = QGeoProjection::coordinateInterpolation(from, to, progress); + QGeoCoordinate coordinateResult = QWebMercator::coordinateInterpolation(from, to, progress); result.setCenter(coordinateResult); } diff --git a/src/location/maps/qgeocameradata_p.h b/src/location/maps/qgeocameradata_p.h index a1434fd8..e311bb0c 100644 --- a/src/location/maps/qgeocameradata_p.h +++ b/src/location/maps/qgeocameradata_p.h @@ -50,8 +50,6 @@ #include "qlocationglobal.h" #include "qgeocoordinate.h" -#include <QtPositioning/private/qgeoprojection_p.h> - #include <QMetaType> #include <QSharedDataPointer> diff --git a/src/location/maps/qgeocameratiles.cpp b/src/location/maps/qgeocameratiles.cpp index f3a36adf..0eaa4668 100644 --- a/src/location/maps/qgeocameratiles.cpp +++ b/src/location/maps/qgeocameratiles.cpp @@ -38,7 +38,7 @@ #include "qgeotilespec_p.h" #include "qgeomaptype_p.h" -#include <QtPositioning/private/qgeoprojection_p.h> +#include <QtPositioning/private/qwebmercator_p.h> #include <QtPositioning/private/qdoublevector2d_p.h> #include <QtPositioning/private/qdoublevector3d_p.h> #include <QVector> @@ -274,7 +274,7 @@ void QGeoCameraTilesPrivate::updateGeometry() Frustum QGeoCameraTilesPrivate::createFrustum(double fieldOfViewGradient) const { - QDoubleVector3D center = m_sideLength * QGeoProjection::coordToMercator(m_camera.center()); + QDoubleVector3D center = m_sideLength * QWebMercator::coordToMercator(m_camera.center()); center.setZ(0.0); double f = qMin(m_screenSize.width(), m_screenSize.height()); diff --git a/src/location/maps/qgeotiledmap.cpp b/src/location/maps/qgeotiledmap.cpp index bccbb396..f2c1d4d3 100644 --- a/src/location/maps/qgeotiledmap.cpp +++ b/src/location/maps/qgeotiledmap.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qgeotiledmap_p.h" #include "qgeotiledmap_p_p.h" - +#include <QtPositioning/private/qwebmercator_p.h> #include "qgeotiledmappingmanagerengine_p.h" #include "qabstractgeotilecache_p.h" #include "qgeotilespec_p.h" @@ -176,7 +176,7 @@ double QGeoTiledMap::maximumCenterLatitudeAtZoom(double zoomLevel) const // Use the window height divided by 2 as the topmost allowed center, with respect to the map size in pixels double mercatorTopmost = (clampedWindowHeight * 0.5) / mapEdgeSize ; - QGeoCoordinate topMost = QGeoProjection::mercatorToCoord(QDoubleVector2D(0.0,mercatorTopmost)); + QGeoCoordinate topMost = QWebMercator::mercatorToCoord(QDoubleVector2D(0.0,mercatorTopmost)); return topMost.latitude(); } @@ -473,12 +473,12 @@ QSGNode *QGeoTiledMapPrivate::updateSceneGraph(QSGNode *oldNode, QQuickWindow *w QGeoCoordinate QGeoTiledMapPrivate::itemPositionToCoordinate(const QDoubleVector2D &pos) const { - return QGeoProjection::mercatorToCoord(m_mapScene->itemPositionToMercator(pos)); + return QWebMercator::mercatorToCoord(m_mapScene->itemPositionToMercator(pos)); } QDoubleVector2D QGeoTiledMapPrivate::coordinateToItemPosition(const QGeoCoordinate &coordinate) const { - return m_mapScene->mercatorToItemPosition(QGeoProjection::coordToMercator(coordinate)); + return m_mapScene->mercatorToItemPosition(QWebMercator::coordToMercator(coordinate)); } QT_END_NAMESPACE diff --git a/src/location/maps/qgeotiledmapscene.cpp b/src/location/maps/qgeotiledmapscene.cpp index ef00da8e..5f9a52b0 100644 --- a/src/location/maps/qgeotiledmapscene.cpp +++ b/src/location/maps/qgeotiledmapscene.cpp @@ -39,6 +39,7 @@ #include "qabstractgeotilecache_p.h" #include "qgeotilespec_p.h" #include <QtPositioning/private/qdoublevector3d_p.h> +#include <QtPositioning/private/qwebmercator_p.h> #include <QtCore/private/qobject_p.h> #include <QtQuick/QSGImageNode> #include <QtQuick/QQuickWindow> @@ -282,12 +283,12 @@ QDoubleVector2D QGeoTiledMapScenePrivate::mercatorToItemPosition(const QDoubleVe QDoubleVector2D QGeoTiledMapScenePrivate::geoToMapProjection(const QGeoCoordinate &coordinate) const { - return QGeoProjection::coordToMercator(coordinate); + return QWebMercator::coordToMercator(coordinate); } QGeoCoordinate QGeoTiledMapScenePrivate::mapProjectionToGeo(const QDoubleVector2D &projection) const { - return QGeoProjection::mercatorToCoord(projection); + return QWebMercator::mercatorToCoord(projection); } //wraps around center @@ -516,7 +517,7 @@ void QGeoTiledMapScenePrivate::setupCamera() double edge = m_scaleFactor * m_tileSize; // first calculate the camera center in map space in the range of 0 <-> sideLength (2^z) - QDoubleVector2D camCenterMercator = QGeoProjection::coordToMercator(m_cameraData.center()); + QDoubleVector2D camCenterMercator = QWebMercator::coordToMercator(m_cameraData.center()); QDoubleVector3D center = m_sideLength * camCenterMercator; m_cameraCenterXMercator = camCenterMercator.x(); m_cameraCenterYMercator = camCenterMercator.y(); diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp index 6548aa2b..3a9ac277 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp @@ -34,6 +34,7 @@ ** ****************************************************************************/ +#include <QtPositioning/private/qwebmercator_p.h> #include "qgeocameracapabilities_p.h" #include "qgeotiledmappingmanagerengine_nokia.h" #include "qgeotiledmap_nokia.h" @@ -378,10 +379,10 @@ QString QGeoTiledMappingManagerEngineNokia::evaluateCopyrightsText(const QGeoMap pt.setX(viewX0 / divFactor); pt.setY(viewY0 / divFactor); - viewport.setTopLeft(QGeoProjection::mercatorToCoord(pt)); + viewport.setTopLeft(QWebMercator::mercatorToCoord(pt)); pt.setX(viewX1 / divFactor); pt.setY(viewY1 / divFactor); - viewport.setBottomRight(QGeoProjection::mercatorToCoord(pt)); + viewport.setBottomRight(QWebMercator::mercatorToCoord(pt)); } // TODO: the following invalidation detection algorithm may be improved later. diff --git a/src/positioning/positioning.pro b/src/positioning/positioning.pro index a311e5e1..b5c6ee46 100644 --- a/src/positioning/positioning.pro +++ b/src/positioning/positioning.pro @@ -49,7 +49,7 @@ PRIVATE_HEADERS += \ qdeclarativegeolocation_p.h \ qdoublevector2d_p.h \ qdoublevector3d_p.h \ - qgeoprojection_p.h \ + qwebmercator_p.h \ qpositioningglobal_p.h \ qlocationdata_simulator_p.h \ qgeopath_p.h @@ -74,9 +74,9 @@ SOURCES += \ qdeclarativegeolocation.cpp \ qdoublevector2d.cpp \ qdoublevector3d.cpp \ - qgeoprojection.cpp \ + qgeopath.cpp \ qlocationdata_simulator.cpp \ - qgeopath.cpp + qwebmercator.cpp HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS diff --git a/src/positioning/qgeopath.cpp b/src/positioning/qgeopath.cpp index 523a79fb..a8e77e10 100644 --- a/src/positioning/qgeopath.cpp +++ b/src/positioning/qgeopath.cpp @@ -43,7 +43,7 @@ #include "qgeocoordinate.h" #include "qnumeric.h" #include "qlocationutils_p.h" -#include "qgeoprojection_p.h" +#include "qwebmercator_p.h" #include "qdoublevector2d_p.h" #include "qdoublevector3d_p.h" @@ -438,21 +438,21 @@ bool QGeoPathPrivate::contains(const QGeoCoordinate &coordinate) const else if (m_path.size() == 1) return (m_path[0].distanceTo(coordinate) <= lineRadius); - double leftBoundMercator = QGeoProjection::coordToMercator(m_bbox.topLeft()).x(); + double leftBoundMercator = QWebMercator::coordToMercator(m_bbox.topLeft()).x(); - QDoubleVector2D p = QGeoProjection::coordToMercator(coordinate); + QDoubleVector2D p = QWebMercator::coordToMercator(coordinate); if (p.x() < leftBoundMercator) p.setX(p.x() + leftBoundMercator); // unwrap X QDoubleVector2D a; QDoubleVector2D b; if (m_path.size()) { - a = QGeoProjection::coordToMercator(m_path[0]); + a = QWebMercator::coordToMercator(m_path[0]); if (a.x() < leftBoundMercator) a.setX(a.x() + leftBoundMercator); // unwrap X } for (int i = 1; i < m_path.size(); i++) { - b = QGeoProjection::coordToMercator(m_path[i]); + b = QWebMercator::coordToMercator(m_path[i]); if (b.x() < leftBoundMercator) b.setX(b.x() + leftBoundMercator); // unwrap X if (b == a) @@ -471,7 +471,7 @@ bool QGeoPathPrivate::contains(const QGeoCoordinate &coordinate) const if (candidate.x() > 1.0) candidate.setX(candidate.x() - leftBoundMercator); // wrap X - QGeoCoordinate closest = QGeoProjection::mercatorToCoord(candidate); + QGeoCoordinate closest = QWebMercator::mercatorToCoord(candidate); double distanceMeters = coordinate.distanceTo(closest); if (distanceMeters <= lineRadius) diff --git a/src/positioning/qgeorectangle.cpp b/src/positioning/qgeorectangle.cpp index 1453a6a8..337b4c76 100644 --- a/src/positioning/qgeorectangle.cpp +++ b/src/positioning/qgeorectangle.cpp @@ -40,7 +40,7 @@ #include "qgeorectangle.h" #include "qgeorectangle_p.h" -#include "qgeoprojection_p.h" +#include "qwebmercator_p.h" #include "qdoublevector2d_p.h" #include "qgeocoordinate.h" #include "qnumeric.h" diff --git a/src/positioning/qlocationutils_p.h b/src/positioning/qlocationutils_p.h index 32addb63..552ec33f 100644 --- a/src/positioning/qlocationutils_p.h +++ b/src/positioning/qlocationutils_p.h @@ -53,6 +53,10 @@ #include <QtCore/QtGlobal> #include <math.h> +#ifndef M_PI +#define M_PI 3.14159265358979323846264338327950288 +#endif + #ifndef M_1_180 #define M_1_180 0.0055555555555555555555555555555555555555556 #endif diff --git a/src/positioning/qgeoprojection.cpp b/src/positioning/qwebmercator.cpp index 507f0805..d22258a7 100644 --- a/src/positioning/qgeoprojection.cpp +++ b/src/positioning/qwebmercator.cpp @@ -36,7 +36,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qgeoprojection_p.h" +#include "qwebmercator_p.h" #include "qgeocoordinate.h" @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE -QDoubleVector2D QGeoProjection::coordToMercator(const QGeoCoordinate &coord) +QDoubleVector2D QWebMercator::coordToMercator(const QGeoCoordinate &coord) { const double pi = M_PI; @@ -62,13 +62,13 @@ QDoubleVector2D QGeoProjection::coordToMercator(const QGeoCoordinate &coord) return QDoubleVector2D(lon, lat); } -double QGeoProjection::realmod(const double a, const double b) +double QWebMercator::realmod(const double a, const double b) { quint64 div = static_cast<quint64>(a / b); return a - static_cast<double>(div) * b; } -QGeoCoordinate QGeoProjection::mercatorToCoord(const QDoubleVector2D &mercator) +QGeoCoordinate QWebMercator::mercatorToCoord(const QDoubleVector2D &mercator) { const double pi = M_PI; @@ -101,10 +101,10 @@ QGeoCoordinate QGeoProjection::mercatorToCoord(const QDoubleVector2D &mercator) return QGeoCoordinate(lat, lng, 0.0); } -QGeoCoordinate QGeoProjection::coordinateInterpolation(const QGeoCoordinate &from, const QGeoCoordinate &to, qreal progress) +QGeoCoordinate QWebMercator::coordinateInterpolation(const QGeoCoordinate &from, const QGeoCoordinate &to, qreal progress) { - QDoubleVector2D s = QGeoProjection::coordToMercator(from); - QDoubleVector2D e = QGeoProjection::coordToMercator(to); + QDoubleVector2D s = QWebMercator::coordToMercator(from); + QDoubleVector2D e = QWebMercator::coordToMercator(to); double x = s.x(); @@ -128,7 +128,7 @@ QGeoCoordinate QGeoProjection::coordinateInterpolation(const QGeoCoordinate &fro double y = (1.0 - progress) * s.y() + progress * e.y(); - QGeoCoordinate result = QGeoProjection::mercatorToCoord(QDoubleVector2D(x, y)); + QGeoCoordinate result = QWebMercator::mercatorToCoord(QDoubleVector2D(x, y)); result.setAltitude((1.0 - progress) * from.altitude() + progress * to.altitude()); return result; diff --git a/src/positioning/qgeoprojection_p.h b/src/positioning/qwebmercator_p.h index b80678b7..8c324710 100644 --- a/src/positioning/qgeoprojection_p.h +++ b/src/positioning/qwebmercator_p.h @@ -36,8 +36,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef QGEOPROJECTION_P_H -#define QGEOPROJECTION_P_H +#ifndef QWEBMERCATOR_P_H +#define QWEBMERCATOR_P_H // // W A R N I N G @@ -50,20 +50,17 @@ // We mean it. // -#ifndef M_PI -#define M_PI (3.14159265358979323846) -#endif - #include <qglobal.h> #include <QtCore/qvariant.h> -#include "qpositioningglobal.h" +#include <math.h> +#include "qpositioningglobal_p.h" QT_BEGIN_NAMESPACE class QGeoCoordinate; class QDoubleVector2D; -class Q_POSITIONING_EXPORT QGeoProjection +class Q_POSITIONING_PRIVATE_EXPORT QWebMercator { public: static QDoubleVector2D coordToMercator(const QGeoCoordinate &coord); @@ -76,4 +73,4 @@ private: QT_END_NAMESPACE -#endif // QGEOPROJECTION_P_H +#endif // QWEBMERCATOR_P_H diff --git a/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp b/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp index 8d9cec3a..7a3ab513 100644 --- a/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp +++ b/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp @@ -33,7 +33,7 @@ #include "qgeocameradata_p.h" #include "qgeomaptype_p.h" -#include <QtPositioning/private/qgeoprojection_p.h> +#include <QtPositioning/private/qwebmercator_p.h> #include <QtPositioning/private/qdoublevector2d_p.h> #include <QtTest/QtTest> #include <QtCore/QList> @@ -226,7 +226,7 @@ void tst_QGeoCameraTiles::tilesPositions() QGeoCameraData camera; camera.setZoomLevel(zoom); - camera.setCenter(QGeoProjection::mercatorToCoord(QDoubleVector2D(mercatorX, mercatorY))); + camera.setCenter(QWebMercator::mercatorToCoord(QDoubleVector2D(mercatorX, mercatorY))); QGeoCameraTiles ct; ct.setTileSize(16); diff --git a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp index cc2672b2..e4ecfae9 100644 --- a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp +++ b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp @@ -37,6 +37,7 @@ #include <QtCore/QString> #include <QtTest/QtTest> #include <QtTest/QSignalSpy> +#include <QtPositioning/private/qwebmercator_p.h> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/private/qgeotiledmap_p.h> #include <QtLocation/private/qgeomappingmanager_p.h> @@ -126,7 +127,7 @@ void tst_QGeoTiledMap::fetchTiles() m_map->setPrefetchStyle(style); QGeoCameraData camera; - camera.setCenter(QGeoProjection::mercatorToCoord(QDoubleVector2D( 0.5 , 0.5 ))); + camera.setCenter(QWebMercator::mercatorToCoord(QDoubleVector2D( 0.5 , 0.5 ))); //prev_visible camera.setZoomLevel(zoomLevel-1); diff --git a/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp index c304c905..0935c3f7 100644 --- a/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp +++ b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp @@ -34,7 +34,7 @@ #include "qgeocameradata_p.h" #include "qabstractgeotilecache_p.h" -#include <QtPositioning/private/qgeoprojection_p.h> +#include <QtPositioning/private/qwebmercator_p.h> #include <QtPositioning/private/qdoublevector2d_p.h> #include <qtest.h> @@ -303,7 +303,7 @@ class tst_QGeoTiledMapScene : public QObject QGeoCameraData camera; camera.setZoomLevel(zoom); - QGeoCoordinate centerCoordinate = QGeoProjection::mercatorToCoord(QDoubleVector2D(cameraCenterX, cameraCenterY)); + QGeoCoordinate centerCoordinate = QWebMercator::mercatorToCoord(QDoubleVector2D(cameraCenterX, cameraCenterY)); camera.setCenter(centerCoordinate); QGeoCameraTiles ct; @@ -344,7 +344,7 @@ class tst_QGeoTiledMapScene : public QObject QGeoCameraData camera; camera.setZoomLevel(zoom); - QGeoCoordinate coord = QGeoProjection::mercatorToCoord(QDoubleVector2D(cameraCenterX, cameraCenterY)); + QGeoCoordinate coord = QWebMercator::mercatorToCoord(QDoubleVector2D(cameraCenterX, cameraCenterY)); camera.setCenter(coord); QGeoCameraTiles ct; |