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

[android] Fix the crash when CameraPosition padding is set. #15699

Merged
pengdev merged 2 commits into from
Sep 23, 2019
Merged

[android] Fix the crash when CameraPosition padding is set. #15699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f2a7ec
[android] Add test branch, navigate to Map Snapshotter activity to re…
pengdev Sep 20, 2019
38e5a2c
[android] Fix the crash when camera position padding is set.
pengdev Sep 23, 2019
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
1 change: 1 addition & 0 deletions .../src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ private void startSnapShot(final int row, final int column) {
.bearing(randomInRange(0, 360))
.tilt(randomInRange(0, 60))
.zoom(randomInRange(0, 20))
.padding(1, 1, 1, 1)
.build()
);
}
Expand Down
21 changes: 11 additions & 10 deletions platform/android/src/map/camera_position.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,20 @@ mbgl::CameraOptions CameraPosition::getCameraOptions(jni::JNIEnv& env, const jni
static auto tilt = javaClass.GetField<jni::jdouble>(env, "tilt");
static auto zoom = javaClass.GetField<jni::jdouble>(env, "zoom");
static auto paddingField = javaClass.GetField<jni::Array<jni::jdouble>>(env, "padding");
static auto padding = position.Get(env, paddingField);

auto padding = position.Get(env, paddingField);
auto center = LatLng::getLatLng(env, position.Get(env, target));

return mbgl::CameraOptions {
center,
padding ? EdgeInsets {padding.Get(env, 1) * pixelRatio, padding.Get(env, 0) * pixelRatio,
padding.Get(env, 3) * pixelRatio, padding.Get(env, 2) * pixelRatio} : (EdgeInsets) {},
{},
position.Get(env, zoom),
position.Get(env, bearing),
position.Get(env, tilt)
};
return mbgl::CameraOptions{center,
padding && padding.Length(env) == 4 ? EdgeInsets{padding.Get(env, 1) * pixelRatio,
padding.Get(env, 0) * pixelRatio,
padding.Get(env, 3) * pixelRatio,
padding.Get(env, 2) * pixelRatio}
: (EdgeInsets){},
{},
position.Get(env, zoom),
position.Get(env, bearing),
position.Get(env, tilt)};
}

void CameraPosition::registerNative(jni::JNIEnv &env) {
Expand Down