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/imports | |
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/imports')
4 files changed, 10 insertions, 10 deletions
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(); |