Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use lock for move camera #179

Closed
wants to merge 4 commits into from
Closed
Changes from all commits
Commits
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
49 changes: 35 additions & 14 deletions lib/src/platform/android/map_state.dart
Original file line number Diff line number Diff line change
Expand Up @@ -221,29 +221,50 @@ final class MapLibreMapStateAndroid extends MapLibreMapStateNative {
});
}

Completer<void>? _moveCameraLock;
Position? _moveCameraCenter;
double? _moveCameraZoom;
double? _moveCameraBearing;
double? _moveCameraPitch;

@override
Future<void> moveCamera({
Position? center,
double? zoom,
double? bearing,
double? pitch,
}) async {
// always use the newest camera positioning
_moveCameraCenter = center;
_moveCameraZoom = zoom;
_moveCameraBearing = bearing;
_moveCameraPitch = pitch;
// only allow one pending call
if (_moveCameraLock != null) return;
_moveCameraLock = Completer();
final jniMap = _jniMapLibreMap;
final cameraPositionBuilder = jni.CameraPosition_Builder();
if (center != null) cameraPositionBuilder.target(center.toLatLng());
if (zoom != null) cameraPositionBuilder.zoom(zoom);
if (pitch != null) cameraPositionBuilder.tilt(pitch);
if (bearing != null) cameraPositionBuilder.bearing(bearing);

final cameraPosition = cameraPositionBuilder.build();
cameraPositionBuilder.release();
final cameraUpdate =
jni.CameraUpdateFactory.newCameraPosition(cameraPosition);
await runOnPlatformThread(() {
final completer = Completer<void>();
final cameraPositionBuilder = jni.CameraPosition_Builder();
if (_moveCameraCenter case final Position center) {
cameraPositionBuilder.target(center.toLatLng());
}
if (_moveCameraZoom case final double zoom) {
cameraPositionBuilder.zoom(zoom);
}
if (_moveCameraPitch case final double pitch) {
cameraPositionBuilder.tilt(pitch);
}
if (_moveCameraBearing case final double bearing) {
cameraPositionBuilder.bearing(bearing);
}

final cameraPosition = cameraPositionBuilder.build();
cameraPositionBuilder.release();
final cameraUpdate =
jni.CameraUpdateFactory.newCameraPosition(cameraPosition);

jniMap.moveCamera(cameraUpdate);
// TODO: jni causes sometimes a deadlock, complete immediately for now
completer.complete();
/*jniMap.moveCamera$1(
cameraUpdate,
jni.MapLibreMap_CancelableCallback.implement(
Expand All @@ -256,9 +277,9 @@ final class MapLibreMapStateAndroid extends MapLibreMapStateNative {
),
),
);*/
return completer.future;
cameraUpdate.release();
});
cameraUpdate.release();
_moveCameraLock?.complete();
}

@override
Expand Down
Loading