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/qgeocameratiles.cpp | |
| 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/qgeocameratiles.cpp')
| -rw-r--r-- | src/location/maps/qgeocameratiles.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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()); |