tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] #3358 - Making Core GL camera methods private. Adding moveCamera() API method. Updating CameraActivity to use only animateCamera() and moveCamera() API.

Browse Source
This commit is contained in:
Brad Leege
2015-12-20 09:19:03 -06:00
parent f3de446bd9
commit 8f532eeefa
4 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/MapView.java
View File

@@ -1521,7 +1521,7 @@ public final class MapView extends FrameLayout {
public final void animateCamera (CameraUpdate update, int durationMs, final MapView.CancelableCallback callback) {
if (update.getTarget() == null) {
Log.w(TAG, "animateCamera with null target coordinate passed in. Will immediatele return without animating camera.");
Log.w(TAG, "animateCamera with null target coordinate passed in. Will immediately return without animating camera.");
return;
}
@@ -1565,8 +1565,8 @@ public final class MapView extends FrameLayout {
if (durationMs == 0) {
// Route To `jumpTo`
Log.i(TAG, "jumpTo() called with angle = " + angle + "; target = " + update.getTarget() + "; durationNano = " + durationNano + "; Pitch = " + pitch + "; Zoom = " + update.getZoom());
jumpTo(angle, update.getTarget(), pitch, zoom);
Log.i(TAG, "easeTo() called with angle = " + angle + "; target = " + update.getTarget() + "; durationNano = " + durationNano + "; Pitch = " + pitch + "; Zoom = " + update.getZoom());
easeTo(angle, update.getTarget(), 0, pitch, zoom);
} else {
// Use `flyTo`
Log.i(TAG, "flyTo() called with angle = " + angle + "; target = " + update.getTarget() + "; durationNano = " + durationNano + "; Pitch = " + pitch + "; Zoom = " + update.getZoom());
@@ -1574,6 +1574,38 @@ public final class MapView extends FrameLayout {
}
}
/**
* Repositions the camera according to the instructions defined in the update.
* The move is instantaneous, and a subsequent getCameraPosition() will reflect the new position.
* See CameraUpdateFactory for a set of updates.
* @param update The change that should be applied to the camera.
*/
public final void moveCamera (CameraUpdate update) {
if (update.getTarget() == null) {
Log.w(TAG, "moveCamera with null target coordinate passed in. Will immediately return without moving camera.");
return;
}
mNativeMapView.cancelTransitions();
// Convert Degrees To Radians
double angle = -1;
if (update.getBearing() >= 0) {
angle = (-update.getBearing()) * MathConstants.DEG2RAD;
}
double pitch = -1;
if (update.getTilt() >= 0) {
double dp = MathUtils.clamp(update.getTilt(), MINIMUM_TILT, MAXIMUM_TILT);
pitch = dp * MathConstants.DEG2RAD;
}
double zoom = -1;
if (update.getZoom() >= 0) {
zoom = update.getZoom();
}
jumpTo(angle, update.getTarget(), pitch, zoom);
}
//
// InfoWindows
//
@@ -2411,7 +2443,7 @@ public final class MapView extends FrameLayout {
* @param zoom Zoom Level
*/
@UiThread
public void jumpTo(double bearing, LatLng center, double pitch, double zoom) {
private void jumpTo(double bearing, LatLng center, double pitch, double zoom) {
mNativeMapView.jumpTo(bearing, center, pitch, zoom);
}
@@ -2426,7 +2458,7 @@ public final class MapView extends FrameLayout {
* @param zoom Zoom Level
*/
@UiThread
public void easeTo(double bearing, LatLng center, long duration, double pitch, double zoom) {
private void easeTo(double bearing, LatLng center, long duration, double pitch, double zoom) {
mNativeMapView.easeTo(bearing, center, duration, pitch, zoom);
}
@@ -2439,7 +2471,7 @@ public final class MapView extends FrameLayout {
* @param zoom Zoom Level
*/
@UiThread
public void flyTo(double bearing, LatLng center, long duration, double pitch, double zoom) {
private void flyTo(double bearing, LatLng center, long duration, double pitch, double zoom) {
mNativeMapView.flyTo(bearing, center, duration, pitch, zoom);
}