summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2016-03-24 17:17:17 -0500
committerBrad Leege <bleege@gmail.com>2016-03-24 17:17:17 -0500
commit24216ce51ad4b660ce0964ce882f22032df763ca (patch)
tree5d469d88c8996cbfbebb46b04a3204ec32926d59 /platform
parent34cea826b9ae4d2fb9d713415c21880e195941cf (diff)
parent6a29e7e624ee6c4051aa014cd6c2c31dc574e4db (diff)
downloadqtlocation-mapboxgl-24216ce51ad4b660ce0964ce882f22032df763ca.tar.gz
Merge branch '4444-out-of-bounds' into release-ios-3.2.0-android-4.0.0
Diffstat (limited to 'platform')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java2
-rwxr-xr-xplatform/android/src/jni.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java
index f24c2ed431..d9ffe48b30 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.java
@@ -147,7 +147,7 @@ public class LatLng implements ILatLng, Parcelable {
@Override
public String toString() {
- return "LatLng [longitude=" + longitude + ", latitude=" + latitude + ", altitude=" + altitude + "]";
+ return "LatLng [latitude=" + latitude + ", longitude=" + longitude + ", altitude=" + altitude + "]";
}
@Override
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index 237fbb99da..4b75f324f3 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -1176,7 +1176,7 @@ jni::jobject* nativeLatLngForPixel(JNIEnv *env, jni::jobject* obj, jlong nativeM
jfloat x = jni::GetField<jfloat>(*env, pixel, *pointFXId);
jfloat y = jni::GetField<jfloat>(*env, pixel, *pointFYId);
- mbgl::LatLng latLng = nativeMapView->getMap().latLngForPixel(mbgl::ScreenCoordinate(x, y));
+ mbgl::LatLng latLng = nativeMapView->getMap().latLngForPixel(mbgl::ScreenCoordinate(x, y)).wrapped();
return &jni::NewObject(*env, *latLngClass, *latLngConstructorId, latLng.latitude, latLng.longitude);
}