fix camera with stops and add type defination

rnmapbox · Apr 7, 2020 · e443e71 · e443e71
1 parent 25092df
commit e443e71
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -413,6 +413,23 @@ export interface CameraProps extends CameraSettings, ViewProps {
   ) => void;
 }
 
+export interface CameraStopSettings {
+  centerCoordinate?: GeoJSON.Position;
+  heading?: number;
+  pitch?: number;
+  bounds?: {
+    ne: GeoJSON.Position;
+    sw: GeoJSON.Position;
+    paddingLeft?: number;
+    paddingRight?: number;
+    paddingTop?: number;
+    paddingBottom?: number;
+  };
+  zoomLevel?: number;
+  animationDuration?: number;
+  animationMode?: 'flyTo' | 'easeTo' | 'moveTo';
+}
+
 export interface CameraSettings {
   centerCoordinate?: GeoJSON.Position;
   heading?: number;
@@ -427,6 +444,7 @@ export interface CameraSettings {
   };
   zoomLevel?: number;
   animationDuration?: number;
+  stops?: CameraStopSettings[];
 }
 
 export interface UserLocationProps {

diff --git a/ios/RCTMGL/RCTMGLCamera.m b/ios/RCTMGL/RCTMGLCamera.m
@@ -120,8 +120,14 @@ - (void)_updateCameraFromJavascript
     if (_map != nil && _map.userTrackingMode != MGLUserTrackingModeNone) {
         _map.userTrackingMode = MGLUserTrackingModeNone;
     }
-
-    [cameraUpdateQueue enqueue:[CameraStop fromDictionary:_stop]];
+    if (_stop[@"stops"]) {
+        NSArray* stops = _stop[@"stops"];
+        for (NSDictionary* stop in stops) {
+            [cameraUpdateQueue enqueue:[CameraStop fromDictionary:stop]];
+        }
+    } else {
+        [cameraUpdateQueue enqueue:[CameraStop fromDictionary:_stop]];
+    }
     [cameraUpdateQueue execute:_map];
 }