diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-14 12:37:23 -0700 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-04-18 14:43:31 +0300 |
| commit | 092da9c956de9d623c6f22d073ebb7dcb2f5a23f (patch) | |
| tree | 81f59b8f687a3d3ed68ba5b601ad7accb45bd453 /platform/qt | |
| parent | 8eb23cbac8a6c5821dc5935e27689700216c3f1a (diff) | |
| download | qtlocation-mapboxgl-092da9c956de9d623c6f22d073ebb7dcb2f5a23f.tar.gz | |
[core] Remove non-Map-dependent projection methods from Map
Diffstat (limited to 'platform/qt')
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 143af2ed16..fa4f56373c 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -21,6 +21,7 @@ #include <mbgl/util/constants.hpp> #include <mbgl/util/geo.hpp> #include <mbgl/util/geometry.hpp> +#include <mbgl/util/projection.hpp> #include <mbgl/util/run_loop.hpp> #include <mbgl/util/shared_thread_pool.hpp> #include <mbgl/util/traits.hpp> @@ -1121,7 +1122,7 @@ void QMapboxGL::addAnnotationIcon(const QString &name, const QImage &icon) */ double QMapboxGL::metersPerPixelAtLatitude(double latitude, double zoom) const { - return d_ptr->mapObj->getMetersPerPixelAtLatitude(latitude, zoom); + return mbgl::Projection::getMetersPerPixelAtLatitude(latitude, zoom); } /*! @@ -1129,7 +1130,7 @@ double QMapboxGL::metersPerPixelAtLatitude(double latitude, double zoom) const */ QMapbox::ProjectedMeters QMapboxGL::projectedMetersForCoordinate(const QMapbox::Coordinate &coordinate_) const { - auto projectedMeters = d_ptr->mapObj->projectedMetersForLatLng(mbgl::LatLng { coordinate_.first, coordinate_.second }); + auto projectedMeters = mbgl::Projection::projectedMetersForLatLng(mbgl::LatLng { coordinate_.first, coordinate_.second }); return QMapbox::ProjectedMeters(projectedMeters.northing(), projectedMeters.easting()); } @@ -1138,7 +1139,7 @@ QMapbox::ProjectedMeters QMapboxGL::projectedMetersForCoordinate(const QMapbox:: */ QMapbox::Coordinate QMapboxGL::coordinateForProjectedMeters(const QMapbox::ProjectedMeters &projectedMeters) const { - auto latLng = d_ptr->mapObj->latLngForProjectedMeters(mbgl::ProjectedMeters { projectedMeters.first, projectedMeters.second }); + auto latLng = mbgl::Projection::latLngForProjectedMeters(mbgl::ProjectedMeters { projectedMeters.first, projectedMeters.second }); return QMapbox::Coordinate(latLng.latitude(), latLng.longitude()); } |