feat: animateCamera supports bounds and zoomLevel on both platforms

Author: farfromrefug

src/mapbox.android.ts

@@ -1754,32 +1754,39 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
     animateCamera(options: AnimateCameraOptions, nativeMap?): Promise<void> {
         return new Promise((resolve, reject) => {
             try {
-                const target = options.target;
-                if (target === undefined) {
-                    reject("Please set the 'target' parameter");
-                    return;
-                }
+                const durationMs = options.duration ? options.duration : 10000;
+                if (options.bounds) {
+                    const padding = options.padding || 0;
+                    const bounds = new com.mapbox.mapboxsdk.geometry.LatLngBounds.Builder()
+                        .include(new com.mapbox.mapboxsdk.geometry.LatLng(options.bounds.north, options.bounds.east))
+                        .include(new com.mapbox.mapboxsdk.geometry.LatLng(options.bounds.south, options.bounds.west))
+                        .build();
+                    this._mapboxMapInstance.animateCamera(com.mapbox.mapboxsdk.camera.CameraUpdateFactory.newLatLngBounds(bounds, padding), durationMs, null);
+                } else {
+                    const target = options.target;
+                    if (target === undefined) {
+                        reject("Please set the 'target' parameter");
+                        return;
+                    }
 
-                const cameraPositionBuilder = new com.mapbox.mapboxsdk.camera.CameraPosition.Builder(this._mapboxMapInstance.getCameraPosition()).target(
-                    new com.mapbox.mapboxsdk.geometry.LatLng(target.lat, target.lng)
-                );
+                    const cameraPositionBuilder = new com.mapbox.mapboxsdk.camera.CameraPosition.Builder(this._mapboxMapInstance.getCameraPosition()).target(
+                        new com.mapbox.mapboxsdk.geometry.LatLng(target.lat, target.lng)
+                    );
 
-                if (options.bearing) {
-                    cameraPositionBuilder.bearing(options.bearing);
-                }
+                    if (options.bearing) {
+                        cameraPositionBuilder.bearing(options.bearing);
+                    }
 
-                if (options.tilt) {
-                    cameraPositionBuilder.tilt(options.tilt);
-                }
+                    if (options.tilt) {
+                        cameraPositionBuilder.tilt(options.tilt);
+                    }
 
-                if (options.zoomLevel) {
-                    cameraPositionBuilder.zoom(options.zoomLevel);
+                    if (options.zoomLevel) {
+                        cameraPositionBuilder.zoom(options.zoomLevel);
+                    }
+                    this._mapboxMapInstance.animateCamera(com.mapbox.mapboxsdk.camera.CameraUpdateFactory.newCameraPosition(cameraPositionBuilder.build()), durationMs, null);
                 }
 
-                const durationMs = options.duration ? options.duration : 10000;
-
-                this._mapboxMapInstance.animateCamera(com.mapbox.mapboxsdk.camera.CameraUpdateFactory.newCameraPosition(cameraPositionBuilder.build()), durationMs, null);
-
                 setTimeout(() => {
                     resolve();
                 }, durationMs);

src/mapbox.common.ts

@@ -511,10 +511,9 @@ export interface ShowResult {
 // ------------------------------------------------------------
 
 export interface AnimateCameraOptions {
-    target: LatLng;
-    /**
-     * For Android, 0.0 - 20.0
-     */
+    target?: LatLng;
+    bounds?: Bounds;
+    padding?: number;
     zoomLevel?: number;
     /**
      * For iOS, in meters from the ground

src/mapbox.ios.ts

@@ -1634,16 +1634,31 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
             try {
                 const theMap: MGLMapView = nativeMap || this._mapboxViewInstance;
 
-                const target = options.target;
-                if (target === undefined) {
-                    reject("Please set the 'target' parameter");
-                    return;
+                let cam: MGLMapCamera;
+                if (options.bounds) {
+                    const padding = options.padding || 0;
+                    // support defined padding
+                    const insets: UIEdgeInsets = {
+                        top: padding,
+                        left: padding,
+                        bottom: padding,
+                        right: padding
+                    };
+                    const bounds: MGLCoordinateBounds = {
+                        sw: CLLocationCoordinate2DMake(options.bounds.south, options.bounds.west),
+                        ne: CLLocationCoordinate2DMake(options.bounds.north, options.bounds.east)
+                    };
+                    cam = theMap.cameraThatFitsCoordinateBoundsEdgePadding(bounds, insets);
+                } else {
+                    const target = options.target;
+                    if (target === undefined) {
+                        reject("Please set the 'target' parameter");
+                        return;
+                    }
+                    cam = theMap.camera;
+                    cam.centerCoordinate = CLLocationCoordinate2DMake(target.lat, target.lng);
                 }
 
-                const cam = theMap.camera;
-
-                cam.centerCoordinate = CLLocationCoordinate2DMake(target.lat, target.lng);
-
                 if (options.altitude) {
                     cam.altitude = options.altitude;
                 }
@@ -1655,6 +1670,9 @@ export class Mapbox extends MapboxCommon implements MapboxApi {
                 if (options.tilt) {
                     cam.pitch = options.tilt;
                 }
+                if (options.zoomLevel && options.target) {
+                    cam.altitude = MGLAltitudeForZoomLevel(options.zoomLevel, cam.pitch, options.target.lat, theMap.frame.size);
+                }
 
                 const durationMs = options.duration ? options.duration : 10000;