#868 - Updating getLatLon() calls in MapView and NativeMapView. Updat…

…ing Java to C++ bindings to support refactored names.
mapbox · Feb 13, 2015 · d510965 · d510965
1 parent 6831f8a
commit d510965
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp
@@ -722,7 +722,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
         return JNI_ERR;
     }
 
-    lonLatClass = env->FindClass("com/mapbox/mapboxgl/lib/LonLat");
+    lonLatClass = env->FindClass("com/mapbox/mapboxgl/lib/geometry/LatLng");
     if (lonLatClass == nullptr) {
         env->ExceptionDescribe();
         return JNI_ERR;
@@ -734,19 +734,19 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
         return JNI_ERR;
     }
 
-    lonLatLonId = env->GetFieldID(lonLatClass, "lon", "D");
+    lonLatLonId = env->GetFieldID(lonLatClass, "longitude", "D");
     if (lonLatLonId == nullptr) {
         env->ExceptionDescribe();
         return JNI_ERR;
     }
 
-    lonLatLatId = env->GetFieldID(lonLatClass, "lat", "D");
+    lonLatLatId = env->GetFieldID(lonLatClass, "latitude", "D");
     if (lonLatLatId == nullptr) {
         env->ExceptionDescribe();
         return JNI_ERR;
     }
 
-    lonLatZoomClass = env->FindClass("com/mapbox/mapboxgl/lib/LonLatZoom");
+    lonLatZoomClass = env->FindClass("com/mapbox/mapboxgl/lib/LatLngZoom");
     if (lonLatClass == nullptr) {
         env->ExceptionDescribe();
         return JNI_ERR;
@@ -758,13 +758,13 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
         return JNI_ERR;
     }
 
-    lonLatZoomLonId = env->GetFieldID(lonLatZoomClass, "lon", "D");
+    lonLatZoomLonId = env->GetFieldID(lonLatZoomClass, "longitude", "D");
     if (lonLatZoomLonId == nullptr) {
         env->ExceptionDescribe();
         return JNI_ERR;
     }
 
-    lonLatZoomLatId = env->GetFieldID(lonLatZoomClass, "lat", "D");
+    lonLatZoomLatId = env->GetFieldID(lonLatZoomClass, "latitude", "D");
     if (lonLatZoomLatId == nullptr) {
         env->ExceptionDescribe();
         return JNI_ERR;
@@ -892,9 +892,9 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
          reinterpret_cast<void *>(&nativeGetAccessToken)},
         {"nativeCancelTransitions", "(J)V", reinterpret_cast<void *>(&nativeCancelTransitions)},
         {"nativeMoveBy", "(JDDJ)V", reinterpret_cast<void *>(&nativeMoveBy)},
-        {"nativeSetLonLat", "(JLcom/mapbox/mapboxgl/lib/LonLat;J)V",
+        {"nativeSetLonLat", "(JLcom/mapbox/mapboxgl/lib/geometry/LatLng;J)V",
          reinterpret_cast<void *>(&nativeSetLonLat)},
-        {"nativeGetLonLat", "(J)Lcom/mapbox/mapboxgl/lib/LonLat;",
+        {"nativeGetLonLat", "(J)Lcom/mapbox/mapboxgl/lib/geometry/LatLng;",
          reinterpret_cast<void *>(&nativeGetLonLat)},
         {"nativeStartPanning", "(J)V", reinterpret_cast<void *>(&nativeStartPanning)},
         {"nativeStopPanning", "(J)V", reinterpret_cast<void *>(&nativeStopPanning)},
@@ -904,9 +904,9 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
         {"nativeGetScale", "(J)D", reinterpret_cast<void *>(&nativeGetScale)},
         {"nativeSetZoom", "(JDJ)V", reinterpret_cast<void *>(&nativeSetZoom)},
         {"nativeGetZoom", "(J)D", reinterpret_cast<void *>(&nativeGetZoom)},
-        {"nativeSetLonLatZoom", "(JLcom/mapbox/mapboxgl/lib/LonLatZoom;J)V",
+        {"nativeSetLonLatZoom", "(JLcom/mapbox/mapboxgl/lib/LatLngZoom;J)V",
          reinterpret_cast<void *>(&nativeSetLonLatZoom)},
-        {"nativeGetLonLatZoom", "(J)Lcom/mapbox/mapboxgl/lib/LonLatZoom;",
+        {"nativeGetLonLatZoom", "(J)Lcom/mapbox/mapboxgl/lib/LatLngZoom;",
          reinterpret_cast<void *>(&nativeGetLonLatZoom)},
         {"nativeResetZoom", "(J)V", reinterpret_cast<void *>(&nativeResetZoom)},
         {"nativeStartPanning", "(J)V", reinterpret_cast<void *>(&nativeStartScaling)},

diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
@@ -208,7 +208,7 @@ private void initialize(Context context, AttributeSet attrs) {
     //
 
     public LatLng getCenterCoordinate() {
-        return mNativeMapView.getLonLat();
+        return mNativeMapView.getLatLng();
     }
 
     public void setCenterCoordinate(LatLng centerCoordinate) {
@@ -217,7 +217,7 @@ public void setCenterCoordinate(LatLng centerCoordinate) {
 
     public void setCenterCoordinate(LatLng centerCoordinate, boolean animated) {
         long duration = animated ? ANIMATION_DURATION : 0;
-        mNativeMapView.setLonLat(centerCoordinate, duration);
+        mNativeMapView.setLatLng(centerCoordinate, duration);
     }
 
     public void setCenterCoordinate(LatLngZoom centerCoordinate) {
@@ -227,7 +227,7 @@ public void setCenterCoordinate(LatLngZoom centerCoordinate) {
     public void setCenterCoordinate(LatLngZoom centerCoordinate,
                                     boolean animated) {
         long duration = animated ? ANIMATION_DURATION : 0;
-        mNativeMapView.setLonLatZoom(centerCoordinate, duration);
+        mNativeMapView.setLatLngZoom(centerCoordinate, duration);
     }
 
     public double getDirection() {

diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java
@@ -243,15 +243,15 @@ public void moveBy(double dx, double dy, long duration) {
         nativeMoveBy(mNativeMapViewPtr, dx, dy, duration);
     }
 
-    public void setLonLat(LatLng latLng) {
-        setLonLat(latLng, 0);
+    public void setLatLng(LatLng latLng) {
+        setLatLng(latLng, 0);
     }
 
-    public void setLonLat(LatLng latLng, long duration) {
+    public void setLatLng(LatLng latLng, long duration) {
         nativeSetLonLat(mNativeMapViewPtr, latLng, duration);
     }
 
-    public LatLng getLonLat() {
+    public LatLng getLatLng() {
         return nativeGetLonLat(mNativeMapViewPtr);
     }
 
@@ -307,15 +307,15 @@ public double getZoom() {
         return nativeGetZoom(mNativeMapViewPtr);
     }
 
-    public void setLonLatZoom(LatLngZoom lonLatZoom) {
-        setLonLatZoom(lonLatZoom, 0);
+    public void setLatLngZoom(LatLngZoom lonLatZoom) {
+        setLatLngZoom(lonLatZoom, 0);
     }
 
-    public void setLonLatZoom(LatLngZoom lonLatZoom, long duration) {
+    public void setLatLngZoom(LatLngZoom lonLatZoom, long duration) {
         nativeSetLonLatZoom(mNativeMapViewPtr, lonLatZoom, duration);
     }
 
-    public LatLngZoom getLonLatZoom() {
+    public LatLngZoom getLatLngZoom() {
         return nativeGetLonLatZoom(mNativeMapViewPtr);
     }