@maplibre/maplibre-react-native 11.0.0-alpha.7 → 11.0.0-alpha.9

package/ios/MLRNEventTypes.m

@@ -2,40 +2,20 @@
 
 @implementation MLRNEventTypes
 
-NSString *const RCT_MAPBOX_EVENT_TAP = @"press";
-NSString *const RCT_MAPBOX_EVENT_LONGPRESS = @"longpress";
+NSString *const RCT_MLRN_PRESS = @"Press";
+NSString *const RCT_MLRN_LONG_PRESS = @"LongPress";
 
-NSString *const RCT_MAPBOX_USER_TRACKING_MODE_CHANGE = @"usertrackingmodechange";
+NSString *const RCT_MLRN_ANNOTATION_TAP = @"AnnotationTap";
 
-NSString *const RCT_MAPBOX_REGION_WILL_CHANGE_EVENT = @"regionwillchange";
-NSString *const RCT_MAPBOX_REGION_IS_CHANGING = @"regionischanging";
-NSString *const RCT_MAPBOX_REGION_DID_CHANGE = @"regiondidchange";
+NSString *const RCT_MLRN_OFFLINE_PROGRESS = @"OfflineProgress";
+NSString *const RCT_MLRN_OFFLINE_ERROR = @"OfflineError";
+NSString *const RCT_MLRN_OFFLINE_TILE_LIMIT = @"OfflineTileLimit";
 
-NSString *const RCT_MAPBOX_WILL_START_LOADING_MAP = @"willstartloadingmap";
-NSString *const RCT_MAPBOX_DID_FINISH_LOADING_MAP = @"didfinishloadingmap";
-NSString *const RCT_MAPBOX_DID_FAIL_LOADING_MAP = @"didfailoadingmap";
+NSString *const RCT_MLRN_SHAPE_SOURCE_LAYER_PRESS = @"ShapeSourceLayerPress";
+NSString *const RCT_MLRN_VECTOR_SOURCE_LAYER_PRESS = @"VectorSourceLayerPress";
 
-NSString *const RCT_MAPBOX_WILL_START_RENDERING_FRAME = @"willstartrenderingframe";
-NSString *const RCT_MAPBOX_DID_FINSIH_RENDERING_FRAME = @"didfinishrenderingframe";
-NSString *const RCT_MAPBOX_DID_FINISH_RENDERING_FRAME_FULLY = @"didfinishrenderingframefully";
+NSString *const RCT_MLRN_MISSING_IMAGE = @"MissingImage";
 
-NSString *const RCT_MAPBOX_WILL_START_RENDERING_MAP = @"willstartrenderingmap";
-NSString *const RCT_MAPBOX_DID_FINISH_RENDERING_MAP = @"didfinishrenderingmap";
-NSString *const RCT_MAPBOX_DID_FINISH_RENDERING_MAP_FULLY = @"didfinishrenderingmapfully";
-
-NSString *const RCT_MAPBOX_DID_FINISH_LOADING_STYLE = @"didfinishloadingstyle";
-
-NSString *const RCT_MAPBOX_ANNOTATION_TAP = @"annotationtap";
-
-NSString *const RCT_MAPBOX_OFFLINE_PROGRESS = @"offlinestatus";
-NSString *const RCT_MAPBOX_OFFLINE_ERROR = @"offlineerror";
-NSString *const RCT_MAPBOX_OFFLINE_TILE_LIMIT = @"offlinetilelimit";
-
-NSString *const RCT_MAPBOX_SHAPE_SOURCE_LAYER_PRESS = @"shapesourcelayerpress";
-NSString *const RCT_MAPBOX_VECTOR_SOURCE_LAYER_PRESS = @"vectorsourcelayerpress";
-
-NSString *const RCT_MAPBOX_IMAGES_MISSING_IMAGE = @"imagesmissingimage";
-
-NSString *const RCT_MAPBOX_USER_LOCATION_UPDATE = @"MapboxUserLocationUpdate";
+NSString *const RCT_MLRN_USER_LOCATION_UPDATE = @"UserLocationUpdate";
 
 @end

package/ios/MLRNImages.h

@@ -2,7 +2,7 @@
 #import <React/RCTComponent.h>
 #import <UIKit/UIKit.h>
 
-@import MapLibre;
+#import <MapLibre/MapLibre.h>
 
 @class MLRNMapView;
 

package/ios/MLRNImages.m

@@ -57,7 +57,7 @@ static UIImage *_placeHolderImage;
 
 - (void)sendImageMissingEvent:(NSString *)imageName {
   NSDictionary *payload = @{@"imageKey" : imageName};
-  MLRNEvent *event = [MLRNEvent makeEvent:RCT_MAPBOX_IMAGES_MISSING_IMAGE withPayload:payload];
+  MLRNEvent *event = [MLRNEvent makeEvent:RCT_MLRN_MISSING_IMAGE withPayload:payload];
   if (_onImageMissing) {
     _onImageMissing([event toJSON]);
   }

package/ios/MLRNLayer.h

@@ -3,7 +3,7 @@
 
 @class MLRNMapView;
 
-@import MapLibre;
+#import <MapLibre/MapLibre.h>
 
 @interface MLRNLayer<T> : UIView
 

package/ios/MLRNLayer.m

@@ -173,7 +173,7 @@
 }
 
 - (void)insertAbove:(NSString *)aboveLayerIDs {
-  [_map waitForLayerWithID:aboveLayerIDs
+  [_map waitForLayerWithId:aboveLayerIDs
                       then:^void(MLNStyleLayer *layer) {
                         if (![self _hasInitialized]) {
                           return;
@@ -184,7 +184,7 @@
 }
 
 - (void)insertBelow:(NSString *)belowLayerID {
-  [_map waitForLayerWithID:belowLayerID
+  [_map waitForLayerWithId:belowLayerID
                       then:^void(MLNStyleLayer *layer) {
                         if (![self _hasInitialized]) {
                           return;

package/ios/MLRNLight.h

@@ -1,5 +1,6 @@
 #import <UIKit/UIKit.h>
-@import MapLibre;
+
+#import <MapLibre/MapLibre.h>
 
 @interface MLRNLight : UIView
 

package/ios/MLRNLocationModule.m

@@ -39,7 +39,7 @@ RCT_EXPORT_MODULE();
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-  return @[ RCT_MAPBOX_USER_LOCATION_UPDATE ];
+  return @[ RCT_MLRN_USER_LOCATION_UPDATE ];
 }
 
 RCT_EXPORT_METHOD(start : (CLLocationDistance)minDisplacement) {
@@ -70,7 +70,7 @@ RCT_EXPORT_METHOD(getLastKnownLocation : (RCTPromiseResolveBlock)
     return;
   }
 
-  [self sendEventWithName:RCT_MAPBOX_USER_LOCATION_UPDATE body:[location toJSON]];
+  [self sendEventWithName:RCT_MLRN_USER_LOCATION_UPDATE body:[location toJSON]];
 }
 
 @end

package/ios/MLRNMapTouchEvent.h

@@ -1,7 +1,8 @@
 #import <Foundation/Foundation.h>
 #import "MLRNEvent.h"
 #import "MLRNPointAnnotation.h"
-@import MapLibre;
+
+#import <MapLibre/MapLibre.h>
 
 @interface MLRNMapTouchEvent : MLRNEvent
 

package/ios/MLRNMapTouchEvent.m

@@ -10,32 +10,34 @@
   feature.coordinate = _coordinate;
   if (_id == nil) {
     feature.attributes = @{
-      @"screenPointX" : [NSNumber numberWithDouble:_screenPoint.x],
-      @"screenPointY" : [NSNumber numberWithDouble:_screenPoint.y]
+      @"longitude" : [NSNumber numberWithDouble:_coordinate.longitude],
+      @"latitude" : [NSNumber numberWithDouble:_coordinate.latitude],
+      @"locationX" : [NSNumber numberWithDouble:_screenPoint.x],
+      @"locationY" : [NSNumber numberWithDouble:_screenPoint.y]
     };
   } else {
     feature.attributes = @{
       @"id" : _id,
-      @"screenPointX" : [NSNumber numberWithDouble:_screenPoint.x],
-      @"screenPointY" : [NSNumber numberWithDouble:_screenPoint.y]
+      @"longitude" : [NSNumber numberWithDouble:_coordinate.longitude],
+      @"latitude" : [NSNumber numberWithDouble:_coordinate.latitude],
+      @"locationX" : [NSNumber numberWithDouble:_screenPoint.x],
+      @"locationY" : [NSNumber numberWithDouble:_screenPoint.y]
     };
   }
   return [feature geoJSONDictionary];
 }
 
 + (MLRNMapTouchEvent *)makeTapEvent:(MLNMapView *)mapView withPoint:(CGPoint)point {
-  return [MLRNMapTouchEvent _fromPoint:point withMapView:mapView andEventType:RCT_MAPBOX_EVENT_TAP];
+  return [MLRNMapTouchEvent _fromPoint:point withMapView:mapView andEventType:RCT_MLRN_PRESS];
 }
 
 + (MLRNMapTouchEvent *)makeLongPressEvent:(MLNMapView *)mapView withPoint:(CGPoint)point {
-  return [MLRNMapTouchEvent _fromPoint:point
-                           withMapView:mapView
-                          andEventType:RCT_MAPBOX_EVENT_LONGPRESS];
+  return [MLRNMapTouchEvent _fromPoint:point withMapView:mapView andEventType:RCT_MLRN_LONG_PRESS];
 }
 
 + (MLRNMapTouchEvent *)makeAnnotationTapEvent:(MLRNPointAnnotation *)pointAnnotation {
   MLRNMapTouchEvent *event = [[MLRNMapTouchEvent alloc] init];
-  event.type = RCT_MAPBOX_ANNOTATION_TAP;
+  event.type = RCT_MLRN_ANNOTATION_TAP;
   event.id = pointAnnotation.id;
   event.coordinate = pointAnnotation.coordinate;
   event.screenPoint = [pointAnnotation.superview convertPoint:pointAnnotation.frame.origin
@@ -45,7 +47,7 @@
 
 + (MLRNMapTouchEvent *)makeAnnotationTapEventOnDrag:(MLRNPointAnnotation *)pointAnnotation {
   MLRNMapTouchEvent *event = [[MLRNMapTouchEvent alloc] init];
-  event.type = RCT_MAPBOX_ANNOTATION_TAP;
+  event.type = RCT_MLRN_ANNOTATION_TAP;
   event.id = pointAnnotation.id;
   CGPoint screenPoint = [pointAnnotation.superview convertPoint:pointAnnotation.layer.position
                                                          toView:nil];

package/ios/MLRNModule.m

@@ -1,5 +1,4 @@
 #import "MLRNModule.h"
-#import "CameraMode.h"
 #import "MLRNCustomHeaders.h"
 #import "MLRNEventTypes.h"
 #import "MLRNOfflineModule.h"
@@ -21,55 +20,12 @@ RCT_EXPORT_MODULE();
 
   // event types
   NSMutableDictionary *eventTypes = [[NSMutableDictionary alloc] init];
-  [eventTypes setObject:RCT_MAPBOX_EVENT_TAP forKey:@"MapClick"];
-  [eventTypes setObject:RCT_MAPBOX_EVENT_LONGPRESS forKey:@"MapLongClick"];
-  [eventTypes setObject:RCT_MAPBOX_REGION_WILL_CHANGE_EVENT forKey:@"RegionWillChange"];
-  [eventTypes setObject:RCT_MAPBOX_REGION_IS_CHANGING forKey:@"RegionIsChanging"];
-  [eventTypes setObject:RCT_MAPBOX_REGION_DID_CHANGE forKey:@"RegionDidChange"];
-  [eventTypes setObject:RCT_MAPBOX_WILL_START_LOADING_MAP forKey:@"WillStartLoadingMap"];
-  [eventTypes setObject:RCT_MAPBOX_DID_FINISH_LOADING_MAP forKey:@"DidFinishLoadingMap"];
-  [eventTypes setObject:RCT_MAPBOX_DID_FAIL_LOADING_MAP forKey:@"DidFailLoadingMap"];
-  [eventTypes setObject:RCT_MAPBOX_WILL_START_RENDERING_FRAME forKey:@"WillStartRenderingFrame"];
-  [eventTypes setObject:RCT_MAPBOX_DID_FINSIH_RENDERING_FRAME forKey:@"DidFinishRenderingFrame"];
-  [eventTypes setObject:RCT_MAPBOX_DID_FINISH_RENDERING_FRAME_FULLY
-                 forKey:@"DidFinishRenderingFrameFully"];
-  [eventTypes setObject:RCT_MAPBOX_WILL_START_RENDERING_MAP forKey:@"WillStartRenderingMap"];
-  [eventTypes setObject:RCT_MAPBOX_DID_FINISH_RENDERING_MAP forKey:@"DidFinishRenderingMap"];
-  [eventTypes setObject:RCT_MAPBOX_DID_FINISH_RENDERING_MAP_FULLY
-                 forKey:@"DidFinishRenderingMapFully"];
-  [eventTypes setObject:RCT_MAPBOX_DID_FINISH_LOADING_STYLE forKey:@"DidFinishLoadingStyle"];
+  [eventTypes setObject:RCT_MLRN_PRESS forKey:@"Press"];
+  [eventTypes setObject:RCT_MLRN_LONG_PRESS forKey:@"LongPress"];
 
   // location module events
   NSMutableDictionary *locationModuleEvents = [[NSMutableDictionary alloc] init];
-  [locationModuleEvents setObject:RCT_MAPBOX_USER_LOCATION_UPDATE forKey:@"Update"];
-
-  // user tracking modes
-  NSMutableDictionary *userTrackingModes = [[NSMutableDictionary alloc] init];
-  [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeNone] forKey:@"None"];
-  [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeFollow] forKey:@"Follow"];
-  [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeFollowWithHeading]
-                        forKey:@"FollowWithHeading"];
-  [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeFollowWithCourse]
-                        forKey:@"FollowWithCourse"];
-
-  // user location vertical alignment
-  NSMutableDictionary *userLocationVerticalAlignment = [[NSMutableDictionary alloc] init];
-  [userLocationVerticalAlignment
-      setObject:[NSNumber numberWithInt:MLNAnnotationVerticalAlignmentTop]
-         forKey:@"Top"];
-  [userLocationVerticalAlignment
-      setObject:[NSNumber numberWithInt:MLNAnnotationVerticalAlignmentCenter]
-         forKey:@"Center"];
-  [userLocationVerticalAlignment
-      setObject:[NSNumber numberWithInt:MLNAnnotationVerticalAlignmentBottom]
-         forKey:@"Bottom"];
-
-  // camera modes
-  NSMutableDictionary *cameraModes = [[NSMutableDictionary alloc] init];
-  [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_FLIGHT] forKey:@"Flight"];
-  [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_EASE] forKey:@"Ease"];
-  [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_LINEAR] forKey:@"Linear"];
-  [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_NONE] forKey:@"None"];
+  [locationModuleEvents setObject:RCT_MLRN_USER_LOCATION_UPDATE forKey:@"Update"];
 
   // style sources
   NSMutableDictionary *styleSourceConsts = [[NSMutableDictionary alloc] init];
@@ -77,8 +33,8 @@ RCT_EXPORT_MODULE();
 
   // offline module callback names
   NSMutableDictionary *offlineModuleCallbackNames = [[NSMutableDictionary alloc] init];
-  [offlineModuleCallbackNames setObject:RCT_MAPBOX_OFFLINE_CALLBACK_ERROR forKey:@"Error"];
-  [offlineModuleCallbackNames setObject:RCT_MAPBOX_OFFLINE_CALLBACK_PROGRESS forKey:@"Progress"];
+  [offlineModuleCallbackNames setObject:RCT_MLRN_OFFLINE_CALLBACK_ERROR forKey:@"Error"];
+  [offlineModuleCallbackNames setObject:RCT_MLRN_OFFLINE_CALLBACK_PROGRESS forKey:@"Progress"];
 
   NSMutableDictionary *offlinePackDownloadState = [[NSMutableDictionary alloc] init];
   [offlinePackDownloadState setObject:@(MLNOfflinePackStateInactive) forKey:@"Inactive"];
@@ -88,9 +44,6 @@ RCT_EXPORT_MODULE();
   return @{
     @"StyleURL" : styleURLS,
     @"EventTypes" : eventTypes,
-    @"UserTrackingModes" : userTrackingModes,
-    @"UserLocationVerticalAlignment" : userLocationVerticalAlignment,
-    @"CameraModes" : cameraModes,
     @"StyleSource" : styleSourceConsts,
     @"OfflineCallbackName" : offlineModuleCallbackNames,
     @"OfflinePackDownloadState" : offlinePackDownloadState,

package/ios/MLRNNativeUserLocation.m

@@ -1,5 +1,4 @@
 #import "MLRNNativeUserLocation.h"
-#import "CameraMode.h"
 #import "CameraStop.h"
 #import "CameraUpdateQueue.h"
 #import "MLRNEvent.h"

package/ios/MLRNOfflineModule.h

@@ -5,7 +5,7 @@
 
 @interface MLRNOfflineModule : RCTEventEmitter <RCTBridgeModule>
 
-extern NSString *const RCT_MAPBOX_OFFLINE_CALLBACK_PROGRESS;
-extern NSString *const RCT_MAPBOX_OFFLINE_CALLBACK_ERROR;
+extern NSString *const RCT_MLRN_OFFLINE_CALLBACK_PROGRESS;
+extern NSString *const RCT_MLRN_OFFLINE_CALLBACK_ERROR;
 
 @end

package/ios/MLRNOfflineModule.m

@@ -27,8 +27,8 @@ RCT_EXPORT_MODULE()
   hasListeners = NO;
 }
 
-NSString *const RCT_MAPBOX_OFFLINE_CALLBACK_PROGRESS = @"MapboxOfflineRegionProgress";
-NSString *const RCT_MAPBOX_OFFLINE_CALLBACK_ERROR = @"MapboOfflineRegionError";
+NSString *const RCT_MLRN_OFFLINE_CALLBACK_PROGRESS = @"OfflineRegionProgress";
+NSString *const RCT_MLRN_OFFLINE_CALLBACK_ERROR = @"OfflineRegionError";
 
 - (instancetype)init {
   if (self = [super init]) {
@@ -64,7 +64,7 @@ NSString *const RCT_MAPBOX_OFFLINE_CALLBACK_ERROR = @"MapboOfflineRegionError";
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-  return @[ RCT_MAPBOX_OFFLINE_CALLBACK_PROGRESS, RCT_MAPBOX_OFFLINE_CALLBACK_ERROR ];
+  return @[ RCT_MLRN_OFFLINE_CALLBACK_PROGRESS, RCT_MLRN_OFFLINE_CALLBACK_ERROR ];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath
@@ -343,7 +343,7 @@ RCT_EXPORT_METHOD(setProgressEventThrottle : (nonnull NSNumber *)throttleValue)
   if ([self _shouldSendProgressEvent:[self _getCurrentTimestamp] pack:pack]) {
     NSDictionary *metadata = [self _unarchiveMetadata:pack];
     MLRNEvent *event = [self _makeProgressEvent:metadata[@"name"] pack:pack];
-    [self _sendEvent:RCT_MAPBOX_OFFLINE_CALLBACK_PROGRESS event:event];
+    [self _sendEvent:RCT_MLRN_OFFLINE_CALLBACK_PROGRESS event:event];
     lastPackTimestamp = [self _getCurrentTimestamp];
   }
 
@@ -361,9 +361,9 @@ RCT_EXPORT_METHOD(setProgressEventThrottle : (nonnull NSNumber *)throttleValue)
   if (name != nil) {
     NSError *error = notification.userInfo[MLNOfflinePackUserInfoKeyError];
     MLRNEvent *event = [self _makeErrorEvent:name
-                                        type:RCT_MAPBOX_OFFLINE_ERROR
+                                        type:RCT_MLRN_OFFLINE_ERROR
                                      message:error.description];
-    [self _sendEvent:RCT_MAPBOX_OFFLINE_CALLBACK_ERROR event:event];
+    [self _sendEvent:RCT_MLRN_OFFLINE_CALLBACK_ERROR event:event];
   }
 }
 
@@ -374,9 +374,9 @@ RCT_EXPORT_METHOD(setProgressEventThrottle : (nonnull NSNumber *)throttleValue)
   NSString *name = metadata[@"name"];
   if (name != nil) {
     MLRNEvent *event = [self _makeErrorEvent:name
-                                        type:RCT_MAPBOX_OFFLINE_ERROR
+                                        type:RCT_MLRN_OFFLINE_ERROR
                                      message:@"Mapbox tile limit exceeded"];
-    [self _sendEvent:RCT_MAPBOX_OFFLINE_CALLBACK_ERROR event:event];
+    [self _sendEvent:RCT_MLRN_OFFLINE_CALLBACK_ERROR event:event];
   }
 }
 
@@ -436,7 +436,7 @@ RCT_EXPORT_METHOD(setProgressEventThrottle : (nonnull NSNumber *)throttleValue)
 }
 
 - (MLRNEvent *)_makeProgressEvent:(NSString *)name pack:(MLNOfflinePack *)pack {
-  return [MLRNEvent makeEvent:RCT_MAPBOX_OFFLINE_PROGRESS
+  return [MLRNEvent makeEvent:RCT_MLRN_OFFLINE_PROGRESS
                   withPayload:[self _makeRegionStatusPayload:name pack:pack]];
 }
 

package/ios/MLRNPointAnnotation.h

@@ -3,7 +3,7 @@
 #import <UIKit/UIKit.h>
 #import "MLRNCallout.h"
 
-@import MapLibre;
+#import <MapLibre/MapLibre.h>
 
 @interface MLRNPointAnnotation : MLNAnnotationView <MLNAnnotation>
 

package/ios/MLRNShapeSource.h

@@ -1,7 +1,7 @@
 #import <React/RCTBridge.h>
 #import "MLRNSource.h"
 
-@import MapLibre;
+#import <MapLibre/MapLibre.h>
 
 @interface MLRNShapeSource : MLRNSource
 

package/ios/MLRNSource.h

@@ -1,7 +1,9 @@
 #import <React/RCTComponent.h>
 #import <UIKit/UIKit.h>
+
 #import "MLRNLayer.h"
-@import MapLibre;
+
+#import <MapLibre/MapLibre.h>
 
 @interface MLRNSource : UIView
 

package/ios/MLRNStyle.m

@@ -18,7 +18,7 @@
 - (void)fillLayer:(MLNFillStyleLayer *)layer withReactStyle:(NSDictionary *)reactStyle isValid:(BOOL (^)(void)) isValid
 {
   if (![self _hasReactStyle:reactStyle]) {
-    // TODO throw exception
+        
     return;
   }
 
@@ -70,7 +70,7 @@
     } else if ([prop isEqualToString:@"fillPatternTransition"]) {
       [self setFillPatternTransition:layer withReactStyleValue:styleValue];
     } else {
-      // TODO throw exception
+    
     }
   }
 }
@@ -78,7 +78,7 @@
 - (void)lineLayer:(MLNLineStyleLayer *)layer withReactStyle:(NSDictionary *)reactStyle isValid:(BOOL (^)(void)) isValid
 {
   if (![self _hasReactStyle:reactStyle]) {
-    // TODO throw exception
+        
     return;
   }
 
@@ -154,7 +154,7 @@
     } else if ([prop isEqualToString:@"lineGradient"]) {
       [self setLineGradient:layer withReactStyleValue:styleValue];
     } else {
-      // TODO throw exception
+    
     }
   }
 }
@@ -162,7 +162,7 @@
 - (void)symbolLayer:(MLNSymbolStyleLayer *)layer withReactStyle:(NSDictionary *)reactStyle isValid:(BOOL (^)(void)) isValid
 {
   if (![self _hasReactStyle:reactStyle]) {
-    // TODO throw exception
+        
     return;
   }
 
@@ -322,7 +322,7 @@
     } else if ([prop isEqualToString:@"textTranslateAnchor"]) {
       [self setTextTranslateAnchor:layer withReactStyleValue:styleValue];
     } else {
-      // TODO throw exception
+    
     }
   }
 }
@@ -330,7 +330,7 @@
 - (void)circleLayer:(MLNCircleStyleLayer *)layer withReactStyle:(NSDictionary *)reactStyle isValid:(BOOL (^)(void)) isValid
 {
   if (![self _hasReactStyle:reactStyle]) {
-    // TODO throw exception
+        
     return;
   }
 
@@ -381,7 +381,7 @@
     } else if ([prop isEqualToString:@"circleStrokeOpacityTransition"]) {
       [self setCircleStrokeOpacityTransition:layer withReactStyleValue:styleValue];
     } else {
-      // TODO throw exception
+    
     }
   }
 }
@@ -389,7 +389,7 @@
 - (void)heatmapLayer:(MLNHeatmapStyleLayer *)layer withReactStyle:(NSDictionary *)reactStyle isValid:(BOOL (^)(void)) isValid
 {
   if (![self _hasReactStyle:reactStyle]) {
-    // TODO throw exception
+        
     return;
   }
 
@@ -416,7 +416,7 @@
     } else if ([prop isEqualToString:@"heatmapOpacityTransition"]) {
       [self setHeatmapOpacityTransition:layer withReactStyleValue:styleValue];
     } else {
-      // TODO throw exception
+    
     }
   }
 }
@@ -424,7 +424,7 @@
 - (void)fillExtrusionLayer:(MLNFillExtrusionStyleLayer *)layer withReactStyle:(NSDictionary *)reactStyle isValid:(BOOL (^)(void)) isValid
 {
   if (![self _hasReactStyle:reactStyle]) {
-    // TODO throw exception
+        
     return;
   }
 
@@ -478,7 +478,7 @@
     } else if ([prop isEqualToString:@"fillExtrusionVerticalGradient"]) {
       [self setFillExtrusionVerticalGradient:layer withReactStyleValue:styleValue];
     } else {
-      // TODO throw exception
+    
     }
   }
 }
@@ -486,7 +486,7 @@
 - (void)rasterLayer:(MLNRasterStyleLayer *)layer withReactStyle:(NSDictionary *)reactStyle isValid:(BOOL (^)(void)) isValid
 {
   if (![self _hasReactStyle:reactStyle]) {
-    // TODO throw exception
+        
     return;
   }
 
@@ -525,7 +525,7 @@
     } else if ([prop isEqualToString:@"rasterFadeDuration"]) {
       [self setRasterFadeDuration:layer withReactStyleValue:styleValue];
     } else {
-      // TODO throw exception
+    
     }
   }
 }
@@ -533,7 +533,7 @@
 - (void)hillshadeLayer:(MLNHillshadeStyleLayer *)layer withReactStyle:(NSDictionary *)reactStyle isValid:(BOOL (^)(void)) isValid
 {
   if (![self _hasReactStyle:reactStyle]) {
-    // TODO throw exception
+        
     return;
   }
 
@@ -564,7 +564,7 @@
     } else if ([prop isEqualToString:@"hillshadeAccentColorTransition"]) {
       [self setHillshadeAccentColorTransition:layer withReactStyleValue:styleValue];
     } else {
-      // TODO throw exception
+    
     }
   }
 }
@@ -572,7 +572,7 @@
 - (void)backgroundLayer:(MLNBackgroundStyleLayer *)layer withReactStyle:(NSDictionary *)reactStyle isValid:(BOOL (^)(void)) isValid
 {
   if (![self _hasReactStyle:reactStyle]) {
-    // TODO throw exception
+        
     return;
   }
 
@@ -610,7 +610,7 @@
     } else if ([prop isEqualToString:@"backgroundOpacityTransition"]) {
       [self setBackgroundOpacityTransition:layer withReactStyleValue:styleValue];
     } else {
-      // TODO throw exception
+    
     }
   }
 }
@@ -618,7 +618,7 @@
 - (void)lightLayer:(MLNLight *)layer withReactStyle:(NSDictionary *)reactStyle isValid:(BOOL (^)(void)) isValid
 {
   if (![self _hasReactStyle:reactStyle]) {
-    // TODO throw exception
+        
     return;
   }
 
@@ -641,7 +641,7 @@
     } else if ([prop isEqualToString:@"intensityTransition"]) {
       [self setIntensityTransition:layer withReactStyleValue:styleValue];
     } else {
-      // TODO throw exception
+    
     }
   }
 }

package/ios/MLRNUtils.h

@@ -1,30 +1,45 @@
-#import <MapKit/MapKit.h>
+#import <MapLibre/MapLibre.h>
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
 #import <React/RCTImageLoader.h>
-#import <MapLibre/MapLibre.h>
 
 @interface MLRNUtils : NSObject
 
 + (CLLocationCoordinate2D)fromFeature:(NSString *)json;
+
++ (CLLocationCoordinate2D)fromLongitude:(NSNumber *)longitude latitude:(NSNumber *)latitude;
+
++ (NSArray<NSDictionary *> *)featuresToJSON:(NSArray<id<MLNFeature>> *)features;
+
 + (MLNShape *)shapeFromGeoJSON:(NSString *)json;
+
 + (MLNCoordinateBounds)fromFeatureCollection:(NSString *)json;
+
++ (MLNCoordinateBounds)fromReactBounds:(NSArray<NSNumber *> *)bounds;
+
 + (NSArray<NSNumber *> *)fromCoordinateBounds:(MLNCoordinateBounds)bounds;
+
 + (NSTimeInterval)fromMS:(NSNumber *)number;
 + (NSNumber *)clamp:(NSNumber *)value min:(NSNumber *)min max:(NSNumber *)max;
+
 + (UIColor *)toColor:(id)value;
+
 + (void)fetchImage:(RCTBridge *)bridge
                url:(NSString *)url
              scale:(double)scale
                sdf:(Boolean)sdf
           callback:(RCTImageLoaderCompletionBlock)callback;
+
 + (void)fetchImages:(RCTBridge *)bridge
               style:(MLNStyle *)style
             objects:(NSDictionary<NSString *, NSString *> *)objects
         forceUpdate:(BOOL)forceUpdate
            callback:(void (^)(void))callback;
+
 + (CGVector)toCGVector:(NSArray<NSNumber *> *)arr;
+
 + (UIEdgeInsets)toUIEdgeInsets:(NSArray<NSNumber *> *)arr;
+
 + (NSURL *)styleURLFromStyleJSON:(NSString *)styleJSON;
 
 @end

package/ios/MLRNUtils.m

@@ -15,6 +15,18 @@ static double const MS_TO_S = 0.001;
   return feature.coordinate;
 }
 
++ (CLLocationCoordinate2D)fromLongitude:(NSNumber *)longitude latitude:(NSNumber *)latitude {
+  return CLLocationCoordinate2DMake([latitude doubleValue], [longitude doubleValue]);
+}
+
++ (NSArray<NSDictionary *> *)featuresToJSON:(NSArray<id<MLNFeature>> *)features {
+  NSMutableArray<NSDictionary *> *json = [[NSMutableArray alloc] init];
+  for (id<MLNFeature> feature in features) {
+    [json addObject:feature.geoJSONDictionary];
+  }
+  return json;
+}
+
 + (UIEdgeInsets)toUIEdgeInsets:(NSArray<NSNumber *> *)arr {
   return UIEdgeInsetsMake([arr[0] floatValue], [arr[1] floatValue], [arr[2] floatValue],
                           [arr[3] floatValue]);
@@ -51,10 +63,21 @@ static double const MS_TO_S = 0.001;
   return MLNCoordinateBoundsMake(sw, ne);
 }
 
++ (MLNCoordinateBounds)fromReactBounds:(NSArray<NSNumber *> *)bounds {
+  CLLocationCoordinate2D sw =
+      CLLocationCoordinate2DMake([bounds[1] doubleValue], [bounds[0] doubleValue]);
+  CLLocationCoordinate2D ne =
+      CLLocationCoordinate2DMake([bounds[3] doubleValue], [bounds[2] doubleValue]);
+
+  return MLNCoordinateBoundsMake(sw, ne);
+}
+
 + (NSArray<NSNumber *> *)fromCoordinateBounds:(MLNCoordinateBounds)bounds {
   return @[
-    @[ @(bounds.ne.longitude), @(bounds.ne.latitude) ],
-    @[ @(bounds.sw.longitude), @(bounds.sw.latitude) ]
+    @(bounds.sw.longitude),
+    @(bounds.sw.latitude),
+    @(bounds.ne.longitude),
+    @(bounds.ne.latitude),
   ];
 }
 

package/ios/components/camera/CameraEasing.h

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+
+typedef NS_ENUM(NSInteger, MLRNCameraEasing) {
+  MLRNCameraEasingNone = 0,
+  MLRNCameraEasingLinear = 1,
+  MLRNCameraEasingEase = 2,
+  MLRNCameraEasingFly = 3,
+};