Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[android] #4326 - using the camera API vs getCameraPosition #4405

Closed
wants to merge 2 commits into from
Closed

[android] #4326 - using the camera API vs getCameraPosition #4405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c20fd8
[android] #4326 - using the camera API vs getCameraPosition should re…
tobrun Mar 21, 2016
005e11f
[android] #4326 - making the code compatible with unit tests again
tobrun Mar 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,10 @@ public final void moveCamera(CameraUpdate update) {
public final void moveCamera(CameraUpdate update, MapboxMap.CancelableCallback callback) {
mCameraPosition = update.getCameraPosition(this);
mMapView.jumpTo(mCameraPosition.bearing, mCameraPosition.target, mCameraPosition.tilt, mCameraPosition.zoom);
if (mOnCameraChangeListener != null) {
mOnCameraChangeListener.onCameraChange(mCameraPosition);
}
if (callback != null) {
callback.onFinish();
}
invalidateCameraPosition();
}

/**
Expand Down Expand Up @@ -295,17 +293,15 @@ public void onCancel() {
if (callback != null) {
callback.onCancel();
}
invalidateCameraPosition();
}

@Override
public void onFinish() {
if (mOnCameraChangeListener != null) {
mOnCameraChangeListener.onCameraChange(mCameraPosition);
}

if (callback != null) {
callback.onFinish();
}
invalidateCameraPosition();
}
});
}
Expand Down Expand Up @@ -365,6 +361,7 @@ public void onCancel() {
if (callback != null) {
callback.onCancel();
}
invalidateCameraPosition();
}

@Override
Expand All @@ -376,6 +373,7 @@ public void onFinish() {
if (callback != null) {
callback.onFinish();
}
invalidateCameraPosition();
}
});
}
Expand All @@ -395,7 +393,12 @@ private long getDurationNano(long durationMs) {
*/
private void invalidateCameraPosition() {
mInvalidCameraPosition = false;
mCameraPosition = mMapView.invalidateCameraPosition();

CameraPosition cameraPosition = mMapView.invalidateCameraPosition();
if (cameraPosition != null) {
mCameraPosition = cameraPosition;
}

if (mOnCameraChangeListener != null) {
mOnCameraChangeListener.onCameraChange(mCameraPosition);
}
Expand Down