diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2016-12-02 16:02:31 +0100 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-01-16 16:18:20 +0000 |
commit | 5504a4c00ec01fdbc95a862c9bc63a680095daee (patch) | |
tree | 5afa841903c4a55e2162a4ebfdb72f75df274944 /src/location/maps | |
parent | 8879bcdc41eb56aaf164d6b1e0d01b7aeceec460 (diff) | |
download | qtlocation-5504a4c00ec01fdbc95a862c9bc63a680095daee.tar.gz |
Rename QGeoProjection to QWebMercator
QGeoProjection is currently a class containing only static methods for
WebMercator conversion/interpolation.
This patch renames it to QWebMercator, effectively freeing the
QGeoProjection name for a real projection class
Change-Id: I15b71d04f7d1d21a1d26f46687ed33aa277f6deb
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/maps')
-rw-r--r-- | src/location/maps/qgeocameradata.cpp | 3 | ||||
-rw-r--r-- | src/location/maps/qgeocameradata_p.h | 2 | ||||
-rw-r--r-- | src/location/maps/qgeocameratiles.cpp | 4 | ||||
-rw-r--r-- | src/location/maps/qgeotiledmap.cpp | 8 | ||||
-rw-r--r-- | src/location/maps/qgeotiledmapscene.cpp | 7 |
5 files changed, 12 insertions, 12 deletions
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(); |