From c17e95498349db7f459cd629f2d65b9f3bfb49c6 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Tue, 9 Feb 2016 21:22:46 +0200 Subject: [PATCH] [android|ios|osx] Fix return type for pixelForLatLng --- platform/android/src/jni.cpp | 2 +- platform/ios/src/MGLMapView.mm | 2 +- platform/osx/src/MGLMapView.mm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index f8ad7b6fc..07e5d1a66 100755 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -1531,7 +1531,7 @@ jobject JNICALL nativePixelForLatLng(JNIEnv *env, jobject obj, jlong nativeMapVi return nullptr; } - mbgl::vec2 pixel = nativeMapView->getMap().pixelForLatLng(mbgl::LatLng(latitude, longitude)); + mbgl::ScreenCoordinate pixel = nativeMapView->getMap().pixelForLatLng(mbgl::LatLng(latitude, longitude)); jobject ret = env->NewObject(pointFClass, pointFConstructorId, static_cast(pixel.x), static_cast(pixel.y)); if (ret == nullptr) { diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 5fe26b35d..ccf8a7bc3 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -2177,7 +2177,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration) /// Converts a geographic coordinate to a point in the view’s coordinate system. - (CGPoint)convertLatLng:(mbgl::LatLng)latLng toPointToView:(nullable UIView *)view { - mbgl::vec2 pixel = _mbglMap->pixelForLatLng(latLng); + mbgl::ScreenCoordinate pixel = _mbglMap->pixelForLatLng(latLng); return [self convertPoint:CGPointMake(pixel.x, pixel.y) toView:view]; } diff --git a/platform/osx/src/MGLMapView.mm b/platform/osx/src/MGLMapView.mm index 94971e55b..9c903484e 100644 --- a/platform/osx/src/MGLMapView.mm +++ b/platform/osx/src/MGLMapView.mm @@ -2165,7 +2165,7 @@ public: /// Converts a geographic coordinate to a point in the view’s coordinate system. - (NSPoint)convertLatLng:(mbgl::LatLng)latLng toPointToView:(nullable NSView *)view { - mbgl::vec2 pixel = _mbglMap->pixelForLatLng(latLng); + mbgl::ScreenCoordinate pixel = _mbglMap->pixelForLatLng(latLng); // Cocoa origin is at the lower-left corner. pixel.y = NSHeight(self.bounds) - pixel.y; return [self convertPoint:NSMakePoint(pixel.x, pixel.y) toView:view];