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/android | |
parent | 8eb23cbac8a6c5821dc5935e27689700216c3f1a (diff) | |
download | qtlocation-mapboxgl-092da9c956de9d623c6f22d073ebb7dcb2f5a23f.tar.gz |
[core] Remove non-Map-dependent projection methods from Map
Diffstat (limited to 'platform/android')
-rwxr-xr-x | platform/android/src/native_map_view.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp index e5edc1c30f..a5699e33c1 100755 --- a/platform/android/src/native_map_view.cpp +++ b/platform/android/src/native_map_view.cpp @@ -24,6 +24,7 @@ #include <mbgl/util/shared_thread_pool.hpp> #include <mbgl/util/logging.hpp> #include <mbgl/util/platform.hpp> +#include <mbgl/util/projection.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/style/filter.hpp> @@ -638,23 +639,23 @@ jni::jboolean NativeMapView::isFullyLoaded(JNIEnv&) { } jni::jdouble NativeMapView::getMetersPerPixelAtLatitude(JNIEnv&, jni::jdouble lat, jni::jdouble zoom) { - return map->getMetersPerPixelAtLatitude(lat, zoom); + return mbgl::Projection::getMetersPerPixelAtLatitude(lat, zoom); } jni::Object<ProjectedMeters> NativeMapView::projectedMetersForLatLng(JNIEnv& env, jni::jdouble latitude, jni::jdouble longitude) { - mbgl::ProjectedMeters projectedMeters = map->projectedMetersForLatLng(mbgl::LatLng(latitude, longitude)); + mbgl::ProjectedMeters projectedMeters = mbgl::Projection::projectedMetersForLatLng(mbgl::LatLng(latitude, longitude)); return ProjectedMeters::New(env, projectedMeters.northing(), projectedMeters.easting()); } +jni::Object<LatLng> NativeMapView::latLngForProjectedMeters(JNIEnv& env, jdouble northing, jdouble easting) { + return LatLng::New(env, mbgl::Projection::latLngForProjectedMeters(mbgl::ProjectedMeters(northing, easting))); +} + jni::Object<PointF> NativeMapView::pixelForLatLng(JNIEnv& env, jdouble latitude, jdouble longitude) { mbgl::ScreenCoordinate pixel = map->pixelForLatLng(mbgl::LatLng(latitude, longitude)); return PointF::New(env, static_cast<float>(pixel.x), static_cast<float>(pixel.y)); } -jni::Object<LatLng> NativeMapView::latLngForProjectedMeters(JNIEnv& env, jdouble northing, jdouble easting) { - return LatLng::New(env, map->latLngForProjectedMeters(mbgl::ProjectedMeters(northing, easting))); -} - jni::Object<LatLng> NativeMapView::latLngForPixel(JNIEnv& env, jfloat x, jfloat y) { return LatLng::New(env, map->latLngForPixel(mbgl::ScreenCoordinate(x, y))); } |