summaryrefslogtreecommitdiff
path: root/android/java
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-02-12 18:45:30 -0800
committerBrad Leege <bleege@gmail.com>2015-02-12 18:45:30 -0800
commitd5109659b145e0c962e4031ecf488c3e4b8dff2c (patch)
treef2ef4e065c7e6fd5424fb1368486cc143f49926c /android/java
parent6831f8a4cd6c4502468e077a608fd58005275511 (diff)
downloadqtlocation-mapboxgl-d5109659b145e0c962e4031ecf488c3e4b8dff2c.tar.gz
#868 - Updating getLatLon() calls in MapView and NativeMapView. Updating Java to C++ bindings to support refactored names.
Diffstat (limited to 'android/java')
-rw-r--r--android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java6
-rw-r--r--android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java16
2 files changed, 11 insertions, 11 deletions
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
index 961309fb35..217c58c963 100644
--- 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 @@ public class MapView extends SurfaceView {
//
public LatLng getCenterCoordinate() {
- return mNativeMapView.getLonLat();
+ return mNativeMapView.getLatLng();
}
public void setCenterCoordinate(LatLng centerCoordinate) {
@@ -217,7 +217,7 @@ public class MapView extends SurfaceView {
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 class MapView extends SurfaceView {
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
index eeaa5203f4..17a95fa324 100644
--- 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 @@ class NativeMapView {
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 @@ class NativeMapView {
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);
}