summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-12-02 15:29:20 -0600
committerBrad Leege <bleege@gmail.com>2015-12-03 16:57:43 -0600
commit6ffcb7b6f68c6b896b84eabb229072f113f468fe (patch)
tree21b803381175f372fcd1982a3ab90129f455d7b1 /android
parent8c55bc4a0f38f0f0129b58cb0732f6f26363970a (diff)
downloadqtlocation-mapboxgl-6ffcb7b6f68c6b896b84eabb229072f113f468fe.tar.gz
[android] #2805 - Adding processing of target, zoom, and bearing in animateCamera. Setting default location of TiltActivity to DC for more obvious change.
Diffstat (limited to 'android')
-rw-r--r--android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java16
-rw-r--r--android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java7
-rw-r--r--android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java3
3 files changed, 25 insertions, 1 deletions
diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java
index d69f82b806..33f551550b 100644
--- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraUpdate.java
@@ -37,4 +37,20 @@ public final class CameraUpdate {
this.tilt = tilt;
this.zoom = zoom;
}
+
+ public float getBearing() {
+ return bearing;
+ }
+
+ public LatLng getTarget() {
+ return target;
+ }
+
+ public float getTilt() {
+ return tilt;
+ }
+
+ public float getZoom() {
+ return zoom;
+ }
}
diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
index 79863c5a37..49568d1a54 100644
--- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
@@ -1115,6 +1115,13 @@ public final class MapView extends FrameLayout {
@UiThread
public final void animateCamera (CameraUpdate update) {
+ LatLngZoom llz = new LatLngZoom(update.getTarget(), update.getZoom());
+ setCenterCoordinate(llz);
+
+ setBearing(update.getBearing());
+
+ // TODO - Set tilt
+
}
//
diff --git a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java
index 88d48f1c85..9b566a9500 100644
--- a/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java
+++ b/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/TiltActivity.java
@@ -31,13 +31,14 @@ public class TiltActivity extends AppCompatActivity {
}
// Target
+ LatLng dc = new LatLng(38.90252, -77.02291);
LatLng nyc = new LatLng(40.73581, -73.99155);
// Set up the map
mMapView = (MapView) findViewById(R.id.tiltMapView);
mMapView.setAccessToken(ApiAccess.getToken(this));
mMapView.setStyleUrl(Style.MAPBOX_STREETS);
- mMapView.setCenterCoordinate(nyc);
+ mMapView.setCenterCoordinate(dc);
mMapView.setZoomLevel(11);
mMapView.onCreate(savedInstanceState);