Merge branch '4444-out-of-bounds' into release-ios-3.2.0-android-4.0.0

This commit is contained in:
Brad Leege
2016-03-24 17:17:17 -05:00
2 changed files with 2 additions and 2 deletions

View File

@@ -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

View File

@@ -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);
}