@rnmapbox/maps 10.0.0-beta.41 → 10.0.0-beta.42

package/index.d.ts

@@ -32,14 +32,14 @@ import {
   CameraBoundsWithPadding as _CameraBoundsWithPadding,
   CameraStops as _CameraStops,
   CameraAnimationMode as _CameraAnimationMode,
+  type UserTrackingMode as _UserTrackingMode,
+  type UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
 } from './javascript/components/Camera';
 import { MarkerView as _MarkerView } from './javascript/components/MarkerView';
 import { PointAnnotation as _PointAnnotation } from './javascript/components/PointAnnotation';
 import { Atmosphere as _Atmosphere } from './javascript/components/Atmosphere';
 import type {
   MapboxGLEvent as _MapboxGLEvent,
-  UserTrackingMode as _UserTrackingMode,
-  UserTrackingModeChangeCallback as _UserTrackingModeChangeCallback,
   AnimatedPoint as _AnimatedPoint,
   AnimatedShape as _AnimatedShape,
 } from './javascript/types/index';
@@ -482,11 +482,6 @@ declare namespace MapboxGL {
   /**
    * Constants
    */
-  enum UserTrackingModes {
-    Follow = 'normal',
-    FollowWithHeading = 'compass',
-    FollowWithCourse = 'course',
-  }
 
   enum InterpolationMode {
     Exponential = 0,

package/ios/RCTMGL-v10/RCTMGLCamera.swift

@@ -13,6 +13,10 @@ enum CameraMode: String, CaseIterable {
   case flight, ease, linear, none
 }
 
+enum UserTrackingMode: String {
+  case none,compass, course, normal
+}
+
 struct CameraUpdateItem {
   var camera: CameraOptions
   var mode: CameraMode
@@ -133,7 +137,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
       _updateCameraFromTrackingMode()
     }
   }
-  @objc var followUserMode: NSString? {
+  @objc var followUserMode: String? {
     didSet {
       _updateCameraFromTrackingMode()
     }
@@ -192,11 +196,22 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
     }
   }
   
+  func _disableUsetTracking(_ map: MapView) {
+    map.viewport.idle()
+    map.location.removeLocationConsumer(consumer: self)
+  }
+
   func _updateCameraFromTrackingMode() {
     withMapView { map in
-      guard self.followUserLocation else {
-        map.viewport.idle()
-        map.location.removeLocationConsumer(consumer: self)
+      let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? "none")
+      guard let userTrackingMode = userTrackingMode else {
+        Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
+        self._disableUsetTracking(map)
+        return
+      }
+
+      guard self.followUserLocation && userTrackingMode != .none else {
+        self._disableUsetTracking(map)
         return
       }
 
@@ -207,17 +222,20 @@ class RCTMGLCamera : RCTMGLMapComponentBase, LocationConsumer {
       map.location.addLocationConsumer(newConsumer: self)
       var trackingModeChanged = false
       var followOptions = FollowPuckViewportStateOptions()
-      if (self.followUserMode == "compass") {
+      switch userTrackingMode {
+      case .none:
+        Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
+      case .compass:
         map.location.options.puckBearingEnabled = true
         map.location.options.puckBearingSource = PuckBearingSource.heading
         followOptions.bearing = FollowPuckViewportStateBearing.heading
         trackingModeChanged = true
-      } else if (self.followUserMode == "course") {
+      case .course:
         map.location.options.puckBearingEnabled = true
         map.location.options.puckBearingSource = PuckBearingSource.course
         followOptions.bearing = FollowPuckViewportStateBearing.course
         trackingModeChanged = true
-      } else if (self.followUserMode == "normal") {
+      case .normal:
         map.location.options.puckBearingEnabled = false
         followOptions.bearing = nil
         trackingModeChanged = true

package/ios/RCTMGL-v10/RCTMGLImages.swift

@@ -69,7 +69,7 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     return false
   }
   
-  public func sendImageMissingEvent(imageName: String, event: Event) {
+  public func sendImageMissingEvent(imageName: String, payload: StyleImageMissingPayload) {
     let payload = ["imageKey":imageName]
     let event = RCTMGLEvent(type: .imageMissing, payload: payload)
     if let onImageMissing = onImageMissing {
@@ -97,101 +97,3 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
   }()
 
 }
-/*
-#import "RCTMGLImages.h"
-#import "UIView+React.h"
-#import "RCTMGLMapView.h"
-#import "RCTMGLUtils.h"
-#import "RCTMGLEvent.h"
-#import "RCTMGLEventTypes.h"
-
-
-@implementation RCTMGLImages : UIView
-
-static UIImage * _placeHolderImage;
-
-- (void)addToMap
-{
-    if (self.map.style == nil) {
-        return;
-    }
-    [self _addNativeImages:_nativeImages];
-    [self _addRemoteImages:_images];
-}
-
-- (void)removeFromMap
-{
-    if (self.map.style == nil) {
-        return;
-    }
-    
-    [self _removeImages];
-}
-
-- (void)_removeImages
-{
-    if ([self _hasImages]) {
-        NSArray<NSString *> *imageNames = _images.allKeys;
-        
-        for (NSString *imageName in imageNames) {
-            [self.map.style removeImageForName:imageName];
-        }
-    }
-    
-    if ([self _hasNativeImages]) {
-        for (NSString *imageName in _nativeImages) {
-            [self.map.style removeImageForName:imageName];
-        }
-    }
-}
-
-- (void)_addNativeImages:(NSArray<NSString *>*)nativeImages
-{
-    if (!nativeImages) return;
-
-    for (NSString *imageName in nativeImages) {
-        // only add native images if they are not in the style yet (similar to [RCTMGLUtils fetchImages: style:])
-        if (![self.map.style imageForName:imageName]) {
-            UIImage *image = [UIImage imageNamed:imageName];
-            [self.map.style setImage:image forName:imageName];
-        }
-    }
-}
-
-- (void)_addRemoteImages:(NSDictionary<NSString *, NSString *>*)remoteImages
-{
-    if (!remoteImages) return;
-    NSDictionary<NSString *, NSString *> *missingImages = [NSMutableDictionary new];
-    
-    // Add image placeholder for images that are not yet available in the style. This way
-    // we can load the images asynchronously and add the ShapeSource to the map without delay.
-    // The same is required when this ShapeSource is updated with new/added images and the
-    // data references them. In which case addMissingImageToStyle will take care of loading
-    // them in a similar way.
-    //
-    // See also: https://github.com/mapbox/mapbox-gl-native/pull/14253#issuecomment-478827792
-    for (NSString *imageName in remoteImages.allKeys) {
-        if (![self.map.style imageForName:imageName]) {
-            [self.map.style setImage:[RCTMGLImages placeholderImage] forName:imageName];
-            [missingImages setValue:_images[imageName] forKey:imageName];
-        }
-    }
-    
-    if (missingImages.count > 0) {
-        // forceUpdate to ensure the placeholder images are updated
-        [RCTMGLUtils fetchImages:_bridge style:self.map.style objects:_images forceUpdate:true callback:^{ }];
-    }
-}
-
-- (BOOL)_hasImages
-{
-    return _images != nil && _images.count > 0;
-}
-
-- (BOOL)_hasNativeImages
-{
-    return _nativeImages != nil && _nativeImages.count > 0;
-}
-
-@end
-*/

package/ios/RCTMGL-v10/RCTMGLLogging.swift

@@ -63,6 +63,14 @@ class Logger {
   static func log(level: LogLevel, message: String, error: Error) {
     sharedInstance.log(level: level, message: "\(message) - error: \(error.localizedDescription) \(error)")
   }
+
+  static func error(_ message: String) {
+    log(level: .error, message: message)
+  }
+
+  static func assert(_ message: String) {
+    log(level: .error, message: "Assertion failure: \(message)")
+  }
 }
 
 func logged<T>(_ msg: String, info: (() -> String)? = nil, level: Logger.LogLevel = .error, rejecter: RCTPromiseRejectBlock? = nil, fn : () throws -> T) -> T? {

package/ios/RCTMGL-v10/RCTMGLMapView.swift

@@ -22,8 +22,8 @@ open class RCTMGLMapView : MapView {
   var onStyleLoadedComponents: [RCTMGLMapComponent] = []
   
   private var isPendingInitialLayout = true
+  private var wasGestureActive = false
   private var isGestureActive = false
-  private var isAnimatingFromGesture = false
 
   var layerWaiters : [String:[(String) -> Void]] = [:]
   
@@ -274,8 +274,9 @@ open class RCTMGLMapView : MapView {
 extension RCTMGLMapView {
   @objc func setReactOnMapChange(_ value: @escaping RCTBubblingEventBlock) {
     self.reactOnMapChange = value
-    
-    self.mapView.mapboxMap.onEvery(.cameraChanged, handler: { cameraEvent in
+
+    self.mapView.mapboxMap.onEvery(event: .cameraChanged, handler: { cameraEvent in
+      self.wasGestureActive = self.isGestureActive
       if self.handleMapChangedEvents.contains(.regionIsChanging) {
         let event = RCTMGLEvent(type:.regionIsChanging, payload: self.buildRegionObject());
         self.fireEvent(event: event, callback: self.reactOnMapChange)
@@ -285,7 +286,7 @@ extension RCTMGLMapView {
       }
     })
 
-    self.mapView.mapboxMap.onEvery(.mapIdle, handler: { cameraEvent in
+    self.mapView.mapboxMap.onEvery(event: .mapIdle, handler: { cameraEvent in
       if self.handleMapChangedEvents.contains(.regionDidChange) {
         let event = RCTMGLEvent(type:.regionDidChange, payload: self.buildRegionObject());
         self.fireEvent(event: event, callback: self.reactOnMapChange)
@@ -293,6 +294,8 @@ extension RCTMGLMapView {
         let event = RCTMGLEvent(type:.mapIdle, payload: self.buildStateObject());
         self.fireEvent(event: event, callback: self.reactOnMapChange)
       }
+      
+      self.wasGestureActive = false
     })
   }
 
@@ -324,8 +327,7 @@ extension RCTMGLMapView {
         "pitch": Double(mapView.cameraState.pitch),
       ],
       "gestures": [
-        "isGestureActive": isGestureActive,
-        "isAnimatingFromGesture": isAnimatingFromGesture
+        "isGestureActive": wasGestureActive
       ]
     ]
   }
@@ -347,8 +349,7 @@ extension RCTMGLMapView {
       "bearing": .number(mapView.cameraState.bearing),
       "pitch": .number(mapView.cameraState.pitch),
       "visibleBounds": .array(boundsArray),
-      "isUserInteraction": .boolean(isGestureActive),
-      "isAnimatingFromUserInteraction": .boolean(isAnimatingFromGesture),
+      "isUserInteraction": .boolean(wasGestureActive),
     ]
     return logged("buildRegionObject", errorResult: { ["error":["toJSON":$0.localizedDescription]] }) {
       try result.toJSON()
@@ -356,50 +357,48 @@ extension RCTMGLMapView {
   }
   
   public func setupEvents() {
-    self.mapboxMap.onEvery(.mapLoadingError, handler: {(event) in
-      if let data = event.data as? [String:Any], let message = data["message"] {
+    self.mapboxMap.onEvery(event: .mapLoadingError, handler: {(event) in
+      if let message = event.payload.error.errorDescription {
         Logger.log(level: .error, message: "MapLoad error \(message)")
       } else {
         Logger.log(level: .error, message: "MapLoad error \(event)")
       }
     })
     
-    self.mapboxMap.onEvery(.styleImageMissing) { (event) in
-      if let data = event.data as? [String:Any] {
-        if let imageName = data["id"] as? String {
-
-          self.images.forEach {
-            if $0.addMissingImageToStyle(style: self.mapboxMap.style, imageName: imageName) {
-              return
-            }
-          }
-          
-          self.images.forEach {
-            $0.sendImageMissingEvent(imageName: imageName, event: event)
-          }
+    self.mapboxMap.onEvery(event: .styleImageMissing) { (event) in
+      let imageName = event.payload.id
+      
+      self.images.forEach {
+        if $0.addMissingImageToStyle(style: self.mapboxMap.style, imageName: imageName) {
+          return
         }
       }
+
+      self.images.forEach {
+        $0.sendImageMissingEvent(imageName: imageName, payload: event.payload)
+      }
     }
 
-    self.mapboxMap.onEvery(.renderFrameFinished, handler: { (event) in
+    self.mapboxMap.onEvery(event: .renderFrameFinished, handler: { (event) in
       var type = RCTMGLEvent.EventType.didFinishRendering
-      var payload : [String:Any]? = nil
-      if let data = event.data as? [String:Any] {
-        if let renderMode = data["render-mode"], let renderMode = renderMode as? String, renderMode == "full" {
-          type = .didFinishRenderingFully
-        }
-        payload = data
+      if event.payload.renderMode == .full {
+        type = .didFinishRenderingFully
       }
+      let payload : [String:Any] = [
+        "renderMode": event.payload.renderMode.rawValue,
+        "needsRepaint": event.payload.needsRepaint,
+        "placementChanged": event.payload.placementChanged
+      ]
       let event = RCTMGLEvent(type: type, payload: payload);
       self.fireEvent(event: event, callback: self.reactOnMapChange)
     })
 
-    self.mapboxMap.onNext(.mapLoaded, handler: { (event) in
+    self.mapboxMap.onNext(event: .mapLoaded, handler: { (event) in
       let event = RCTMGLEvent(type:.didFinishLoadingMap, payload: nil);
       self.fireEvent(event: event, callback: self.reactOnMapChange)
     })
     
-    self.mapboxMap.onEvery(.styleLoaded, handler: { (event) in
+    self.mapboxMap.onEvery(event: .styleLoaded, handler: { (event) in
       self.onStyleLoadedComponents.forEach { (component) in
         component.addToMap(self, style: self.mapboxMap.style)
       }
@@ -589,21 +588,19 @@ extension RCTMGLMapView: GestureManagerDelegate {
       }
     }
   }
-  
+
   public func gestureManager(_ gestureManager: GestureManager, didBegin gestureType: GestureType) {
     isGestureActive = true
   }
   
   public func gestureManager(_ gestureManager: GestureManager, didEnd gestureType: GestureType, willAnimate: Bool) {
-    isGestureActive = false
-    if willAnimate {
-      isAnimatingFromGesture = true
+    if !willAnimate {
+      isGestureActive = false;
     }
   }
   
   public func gestureManager(_ gestureManager: GestureManager, didEndAnimatingFor gestureType: GestureType) {
-    isGestureActive = false
-    isAnimatingFromGesture = false
+    isGestureActive = false;
   }
 }
 
@@ -922,4 +919,3 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
     }
   }
 }
-

package/ios/RCTMGL-v10/RCTMGLSingletonLayer.swift

@@ -15,8 +15,14 @@ class RCTMGLSingletonLayer : UIView {
     }
   }
 
+  /// apply style updates to our copy and copy the changes to the map style
   func addStylesAndUpdate() {
     addStyles()
+    update()
+  }
+  
+  /// apply the changes made to our copy to the map style
+  func update() {
     if let style = style,
       let map = map {
       self.update(map, style)
@@ -38,4 +44,4 @@ class RCTMGLSingletonLayer : UIView {
   func apply(style: Style) throws {
     fatalError("Subclasses should overrride")
   }
-}
+}

package/ios/RCTMGL-v10/RCTMGLStyle.swift

@@ -801,6 +801,29 @@ func atmosphereLayer(layer: inout Atmosphere, reactStyle:Dictionary<String, Any>
   }
 }
 
+func terrainLayer(layer: inout Terrain, reactStyle:Dictionary<String, Any>, applyUpdater: @escaping  ((inout Terrain)->Void)->Void, isValid: @escaping () -> Bool)
+{
+  guard self._hasReactStyle(reactStyle) else {
+    Logger.log(level:.error, message: "Invalid style: \(reactStyle)")
+    return
+  }
+
+  let styleProps = reactStyle.keys
+  for prop in styleProps {
+    if (prop == "__MAPBOX_STYLESHEET__") {
+      continue;
+    }
+
+    let styleValue = RCTMGLStyleValue.make(reactStyle[prop])
+
+    if (prop == "exaggeration") {
+      self.setExaggeration(&layer, styleValue:styleValue);
+    } else {
+      Logger.log(level:.error, message: "Unexpected property \(prop) for layer: terrain")
+    }
+  }
+}
+
 
 
 
@@ -2501,6 +2524,17 @@ func setStarIntensityTransition(_ layer: inout Atmosphere, styleValue: RCTMGLSty
 
 
 
+func setExaggeration(_ layer: inout Terrain, styleValue: RCTMGLStyleValue)
+{
+      
+        
+          layer.exaggeration = styleValue.mglStyleValueNumber();
+        
+      
+}
+
+
+
 func _hasReactStyle(_ reactStyle: Dictionary<String, Any>) -> Bool
 {
   return reactStyle != nil && reactStyle.keys.count > 0;

package/ios/RCTMGL-v10/RCTMGLTerrain.swift

@@ -1,49 +1,16 @@
 import MapboxMaps
 
 @objc
-class RCTMGLTerrain : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
-  weak var map : RCTMGLMapView!
-  var style : Style! = nil
-  
-  var bridge : RCTBridge? = nil
+class RCTMGLTerrain : RCTMGLSingletonLayer, RCTMGLMapComponent, RCTMGLSourceConsumer {
   var terrain : Terrain? = nil
   
-  @objc var sourceID: String? = nil
-  
-  @objc var exaggeration : Any? = nil
-  
-  func waitForStyleLoad() -> Bool {
-    return true
-  }
-
   func makeTerrain() -> Terrain {
-    print("=> sourceID \(sourceID)")
     guard let sourceID = sourceID else {
       Logger.log(level: .error, message: "Terrain should have a sourceID")
       return Terrain(sourceId: "n/a")
     }
-    var terrain = Terrain(sourceId: sourceID)
-    if let exaggeration = exaggeration {
-      do {
-        terrain.exaggeration = try toValue(exaggeration)
-      } catch {
-        Logger.log(level: .error, message: "Faied to parse exaggeration value: \(exaggeration) \(error)")
-      }
-    }
-    
-    return terrain
-  }
-  
-  func toValue(_ value: Any) throws -> Value<Double>? {
-    if let value = value as? NSNumber {
-      return .constant(value.doubleValue)
-    } else if let value = value as? [Any] {
-      let data = try JSONSerialization.data(withJSONObject: value, options: .prettyPrinted)
-      let decodedExpression = try JSONDecoder().decode(Expression.self, from: data)
-      return .expression(decodedExpression)
-    } else {
-      throw RCTMGLError.parseError("failed to parse value")
-    }
+
+    return Terrain(sourceId: sourceID)
   }
   
   func addToMap(_ map: RCTMGLMapView, style: Style) {
@@ -52,32 +19,7 @@ class RCTMGLTerrain : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     
     let terrain = self.makeTerrain()
     self.terrain = terrain
-    map.onMapStyleLoaded { _ in
-      if let mapboxMap = map.mapboxMap {
-        let style = mapboxMap.style
-        logged("RCTMGLTerrain.addToMap") {
-          try style.setTerrain(terrain)
-        }
-      }
-    }
-  }
-  
-  func addToMap(_ map: RCTMGLMapView) {
-    self.map = map
-  
-    guard let mapboxMap = map.mapboxMap else {
-      return
-    }
-    
-    mapboxMap.onNext(.styleLoaded) {_ in
-      let style = mapboxMap.style
- 
-      do {
-        try style.setTerrain(self.makeTerrain())
-      } catch {
-        Logger.log(level: .error, message: "setTerrain failed: \(error)")
-      }
-    }
+    addStylesAndUpdate()
   }
   
   func removeFromMap(_ map: RCTMGLMapView) {
@@ -91,7 +33,58 @@ class RCTMGLTerrain : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     removeFromMap(map, style: style)
   }
   
+  func waitForStyleLoad() -> Bool {
+    return true
+  }
+  
   func removeFromMap(_ map: RCTMGLMapView, style: Style) {
-    style.removeTerrain()
+    logged("RCTMGLTerrain.removeFromMap") {
+      style.removeTerrain()
+    }
+  }
+
+  @objc var sourceID: String? = nil {
+    didSet {
+      guard let sourceID = sourceID else {
+        Logger.log(level: .error, message: "RCTMGLTerrain cannot set source to nil")
+        return
+      }
+      
+      terrain?.source = sourceID
+      self.update()
+    }
+  }
+  
+  override func addStylesAndUpdate() {
+    guard terrain != nil else {
+      return
+    }
+
+    super.addStylesAndUpdate()
+  }
+  
+  override func addStyles() {
+    if let style : Style = self.style {
+      let styler = RCTMGLStyle(style: style)
+      styler.bridge = self.bridge
+      
+      if var terrain = terrain {
+        styler.terrainLayer(
+          layer: &terrain,
+          reactStyle: reactStyle ?? [:],
+          applyUpdater: { (updater) in fatalError("Terrain: TODO - implement apply updater")},
+          isValid: { fatalError("Terrain: TODO - no isValid") }
+        )
+        self.terrain = terrain
+      } else {
+        fatalError("[xxx] terrain is nil \(optional: self.terrain)")
+      }
+    }
+  }
+  
+  override func apply(style : Style) throws {
+    if let terrain = terrain {
+      try style.setTerrain(terrain)
+    }
   }
 }

package/ios/RCTMGL-v10/RCTMGLTerrainManager.m

@@ -10,7 +10,6 @@
 
 RCT_EXPORT_VIEW_PROPERTY(sourceID, NSString);
 
-RCT_CUSTOM_VIEW_PROPERTY(exaggeration, NSObject, RCTMGLTerrain) {
-  view.exaggeration = json;
-}
+RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary);
+
 @end

package/javascript/components/Camera.tsx

@@ -9,11 +9,27 @@ import React, {
 import { NativeModules, requireNativeComponent } from 'react-native';
 import { Position } from '@turf/helpers';
 
-import { UserTrackingModeChangeCallback, UserTrackingMode } from '../types';
+import { MapboxGLEvent } from '../types';
 import { makeLatLngBounds, makePoint } from '../utils/geoUtils';
 
 const NativeModule = NativeModules.MGLModule;
 
+export const enum UserTrackingMode {
+  Follow = 'normal',
+  FollowWithHeading = 'compass',
+  FollowWithCourse = 'course',
+}
+
+export type UserTrackingModeChangeCallback = (
+  event: MapboxGLEvent<
+    'usertrackingmodechange',
+    {
+      followUserLocation: boolean;
+      followUserMode: UserTrackingMode | null;
+    }
+  >,
+) => void;
+
 /**
  * Converts the provided React Native animation mode into the corresponding native enum value.
  */

package/javascript/components/MapView.js

@@ -215,22 +215,12 @@ class MapView extends NativeBridgeComponent(React.Component) {
     onRegionDidChange: PropTypes.func,
 
     /**
-     * iOS, v10 only, experimental.
-     *
-     * Called when the currently displayed map area changes.
-     * Replaces onRegionIsChanging, so can't set both
-     *
-     * @param {MapState} region - A payload containing the map center, bounds, and other properties.
+     * iOS, v10 only, deprecated will be removed in next version - please use onRegionIsChanging.
      */
     onCameraChanged: PropTypes.func,
 
     /**
-     * iOS, v10 only, experimental
-     *
-     * Called when the currently displayed map area stops changing.
-     * Replaces onRegionDidChange, so can't set both
-     *
-     * @param {MapState} region - A payload containing the map center, bounds, and other properties.
+     * iOS, v10 only, deprecated will be removed in next version - please use onRegionDidChange
      */
     onMapIdle: PropTypes.func,
 
@@ -393,6 +383,9 @@ class MapView extends NativeBridgeComponent(React.Component) {
       addIfHasHandler('DidFinishLoadingStyle');
 
       if (addIfHasHandler('MapIdle')) {
+        console.warn(
+          'onMapIdle is deprecated and will be removed in next beta - please use onRegionDidChange',
+        );
         if (props.onRegionDidChange) {
           console.warn(
             'rnmapbox/maps: only one of  MapView.onRegionDidChange or onMapIdle is supported',
@@ -400,6 +393,9 @@ class MapView extends NativeBridgeComponent(React.Component) {
         }
       }
       if (addIfHasHandler('CameraChanged')) {
+        console.warn(
+          'onCameraChanged is deprecated and will be removed in next beta - please use onRegionWillChange',
+        );
         if (props.onRegionWillChange) {
           console.warn(
             'rnmapbox/maps: only one of MapView.onRegionWillChange or onCameraChanged is supported',