@maplibre/maplibre-react-native 10.1.0 → 10.1.2

package/ios/MLRN/MLRNCallout.m

@@ -1,66 +1,67 @@
 #import "MLRNCallout.h"
 #import <React/UIView+React.h>
 
-@implementation MLRNCallout
-{
-    id <MLNAnnotation> _representedObject;
-    __unused UIView *_leftAccessoryView;/* unused */
-    __unused UIView *_rightAccessoryView;/* unused */
-    __weak id <MLNCalloutViewDelegate> _delegate;
-    BOOL _dismissesAutomatically;
-    BOOL _anchoredToAnnotation;
+@implementation MLRNCallout {
+  id<MLNAnnotation> _representedObject;
+  __unused UIView *_leftAccessoryView;  /* unused */
+  __unused UIView *_rightAccessoryView; /* unused */
+  __weak id<MLNCalloutViewDelegate> _delegate;
+  BOOL _dismissesAutomatically;
+  BOOL _anchoredToAnnotation;
 }
 
 @synthesize representedObject = _representedObject;
-@synthesize leftAccessoryView = _leftAccessoryView;/* unused */
-@synthesize rightAccessoryView = _rightAccessoryView;/* unused */
+@synthesize leftAccessoryView = _leftAccessoryView;   /* unused */
+@synthesize rightAccessoryView = _rightAccessoryView; /* unused */
 @synthesize delegate = _delegate;
 @synthesize anchoredToAnnotation = _anchoredToAnnotation;
 @synthesize dismissesAutomatically = _dismissesAutomatically;
 
-- (instancetype)init
-{
-    if (self = [super init]) {
-        // prevent tap from bubbling up to it's superview
-        UITapGestureRecognizer *captureTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:nil];
-        [self addGestureRecognizer:captureTap];
-    }
-    return self;
+- (instancetype)init {
+  if (self = [super init]) {
+    // prevent tap from bubbling up to it's superview
+    UITapGestureRecognizer *captureTap = [[UITapGestureRecognizer alloc] initWithTarget:self
+                                                                                 action:nil];
+    [self addGestureRecognizer:captureTap];
+  }
+  return self;
 }
 
 // https://github.com/mapbox/mapbox-gl-native/issues/9228
 - (void)setCenter:(CGPoint)center {
-    center.y = center.y - CGRectGetMidY(self.bounds);
-    [super setCenter:center];
+  center.y = center.y - CGRectGetMidY(self.bounds);
+  [super setCenter:center];
 }
 
-- (void)presentCalloutFromRect:(CGRect)rect inView:(UIView *)view constrainedToRect:(CGRect)constrainedRect animated:(BOOL)animated;
+- (void)presentCalloutFromRect:(CGRect)rect
+                        inView:(UIView *)view
+             constrainedToRect:(CGRect)constrainedRect
+                      animated:(BOOL)animated;
 {
-    // we want to attach to our parents parent to be on the same zPosition stack, so the callout will appear over other custom views
-    [view.superview addSubview:self];
-    
-    // adjust frame
-    double centerX = rect.origin.x + (rect.size.width / 2);
-    CGPoint center = CGPointMake(centerX, rect.origin.y);
-    [self setCenter:center];
+  // we want to attach to our parents parent to be on the same zPosition stack, so the callout will
+  // appear over other custom views
+  [view.superview addSubview:self];
+
+  // adjust frame
+  double centerX = rect.origin.x + (rect.size.width / 2);
+  CGPoint center = CGPointMake(centerX, rect.origin.y);
+  [self setCenter:center];
 }
 
-- (void)dismissCalloutAnimated:(BOOL)animated
-{
-    [self removeFromSuperview];
+- (void)dismissCalloutAnimated:(BOOL)animated {
+  [self removeFromSuperview];
 }
 
 - (BOOL)dismissesAutomatically {
-    return NO;
+  return NO;
 }
 
 - (BOOL)isAnchoredToAnnotation {
-    return YES;
+  return YES;
 }
 
-- (void)update
-{
-    [self setCenter:self.center];
+- (void)update {
+  [self setCenter:self.center];
 }
 
 @end

package/ios/MLRN/MLRNCalloutManager.m

@@ -5,9 +5,8 @@
 
 RCT_EXPORT_MODULE()
 
-- (UIView *)view
-{
-    return [[MLRNCallout alloc] init];
+- (UIView *)view {
+  return [[MLRNCallout alloc] init];
 }
 
 @end

package/ios/MLRN/MLRNCamera.h

@@ -4,7 +4,7 @@
 
 @class MLRNMapView;
 
-@interface MLRNCamera : UIView<MLRNMapViewCamera>
+@interface MLRNCamera : UIView <MLRNMapViewCamera>
 
 @property (nonatomic, strong) NSDictionary<NSString *, id> *stop;
 @property (nonatomic, strong) NSDictionary<NSString *, id> *defaultStop;

package/ios/MLRN/MLRNCamera.m

@@ -1,249 +1,236 @@
 #import "MLRNCamera.h"
+#import "CameraMode.h"
 #import "CameraStop.h"
 #import "CameraUpdateQueue.h"
-#import "MLRNLocation.h"
-#import "MLRNUtils.h"
-#import "MLRNLocationManager.h"
 #import "MLRNEvent.h"
 #import "MLRNEventTypes.h"
-#import "CameraMode.h"
+#import "MLRNLocation.h"
+#import "MLRNLocationManager.h"
+#import "MLRNUtils.h"
 
-@implementation MLRNCamera
-{
-    CameraUpdateQueue *cameraUpdateQueue;
-    MLRNCamera *followCamera;
+@implementation MLRNCamera {
+  CameraUpdateQueue *cameraUpdateQueue;
+  MLRNCamera *followCamera;
 }
 
-- (instancetype)init
-{
-    if (self = [super init]) {
-        cameraUpdateQueue = [[CameraUpdateQueue alloc] init];
-    }
-    return self;
+- (instancetype)init {
+  if (self = [super init]) {
+    cameraUpdateQueue = [[CameraUpdateQueue alloc] init];
+  }
+  return self;
 }
 
 - (void)dealloc {
-    if (_map) {
-        _map.reactCamera = nil;
-    }
+  if (_map) {
+    _map.reactCamera = nil;
+  }
 }
 
 - (void)setMaxZoomLevel:(NSNumber *)maxZoomLevel {
-    _maxZoomLevel = maxZoomLevel;
-    [self _updateMinMaxZoomLevel];
+  _maxZoomLevel = maxZoomLevel;
+  [self _updateMinMaxZoomLevel];
 }
 
 - (void)setMinZoomLevel:(NSNumber *)minZoomLevel {
-    _minZoomLevel = minZoomLevel;
-    [self _updateMinMaxZoomLevel];
+  _minZoomLevel = minZoomLevel;
+  [self _updateMinMaxZoomLevel];
 }
 
 - (void)setMaxBounds:(NSString *)maxBounds {
-    _maxBounds = maxBounds;
-    [self _updateMaxBounds];
+  _maxBounds = maxBounds;
+  [self _updateMaxBounds];
 }
 
-- (void)setDefaultStop:(NSDictionary<NSString *,id> *)stop
-{
-    _defaultStop = stop;
+- (void)setDefaultStop:(NSDictionary<NSString *, id> *)stop {
+  _defaultStop = stop;
 }
 
-- (void)setStop:(NSDictionary<NSString *,id> *)stop
-{
-    _stop = stop;
-    
-    [self _updateCamera];
+- (void)setStop:(NSDictionary<NSString *, id> *)stop {
+  _stop = stop;
+
+  [self _updateCamera];
 }
 
-- (void)setMap:(MLRNMapView *)map
-{
-    if (_map != nil) {
-        _map.reactCamera = nil;
-    }
-    _map = map;
-    _map.reactCamera = self;
+- (void)setMap:(MLRNMapView *)map {
+  if (_map != nil) {
+    _map.reactCamera = nil;
+  }
+  _map = map;
+  _map.reactCamera = self;
 
-    [self _setInitialCamera];
-    [self _updateMinMaxZoomLevel];
-    [self _updateMaxBounds];
-    [self _updateCamera];
+  [self _setInitialCamera];
+  [self _updateMinMaxZoomLevel];
+  [self _updateMaxBounds];
+  [self _updateCamera];
 }
 
-- (void)setFollowUserLocation:(BOOL)followUserLocation
-{
-    _followUserLocation = followUserLocation;
-    [self _updateCameraFromTrackingMode];
+- (void)setFollowUserLocation:(BOOL)followUserLocation {
+  _followUserLocation = followUserLocation;
+  [self _updateCameraFromTrackingMode];
 }
 
-- (void)setFollowUserMode:(NSString *)followUserMode
-{
-    _followUserMode = followUserMode;
-    [self _updateCameraFromTrackingMode];
+- (void)setFollowUserMode:(NSString *)followUserMode {
+  _followUserMode = followUserMode;
+  [self _updateCameraFromTrackingMode];
 }
 
-- (void)setFollowPitch:(NSNumber *)followPitch
-{
-    _followPitch = followPitch;
-    [self _updateCameraFromTrackingMode];
+- (void)setFollowPitch:(NSNumber *)followPitch {
+  _followPitch = followPitch;
+  [self _updateCameraFromTrackingMode];
 }
 
-- (void)setFollowZoomLevel:(NSNumber *)followZoomLevel
-{
-    _followZoomLevel = followZoomLevel;
-    [self _updateCameraFromTrackingMode];
+- (void)setFollowZoomLevel:(NSNumber *)followZoomLevel {
+  _followZoomLevel = followZoomLevel;
+  [self _updateCameraFromTrackingMode];
 }
 
-- (void)setFollowHeading:(NSNumber *)followHeading
-{
-    _followHeading = followHeading;
-    [self _updateCameraFromTrackingMode];
+- (void)setFollowHeading:(NSNumber *)followHeading {
+  _followHeading = followHeading;
+  [self _updateCameraFromTrackingMode];
 }
 
-- (void)_updateCameraFromJavascript
-{
-    if (_stop == nil) {
-        return;
+- (void)_updateCameraFromJavascript {
+  if (_stop == nil) {
+    return;
+  }
+
+  if (_followUserLocation) {
+    return;
+  }
+
+  if (_map != nil && _map.userTrackingMode != MLNUserTrackingModeNone) {
+    _map.userTrackingMode = MLNUserTrackingModeNone;
+  }
+  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];
+}
+
+- (void)_setInitialCamera {
+  if (!_defaultStop) {
+    return;
+  }
+
+  CameraStop *stop = [CameraStop fromDictionary:_defaultStop];
+  stop.duration = 0;
+  stop.mode = [NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_NONE];
+  CameraUpdateItem *item = [[CameraUpdateItem alloc] init];
+  item.cameraStop = stop;
+  [item execute:_map
+      withCompletionHandler:^{
+      }];
+}
+
+- (void)_updateCamera {
+  if (_map != nil) {
     if (_followUserLocation) {
-        return;
-    }
-    
-    if (_map != nil && _map.userTrackingMode != MLNUserTrackingModeNone) {
-        _map.userTrackingMode = MLNUserTrackingModeNone;
-    }
-    if (_stop[@"stops"]) {
-        NSArray* stops = _stop[@"stops"];
-        for (NSDictionary* stop in stops) {
-            [cameraUpdateQueue enqueue:[CameraStop fromDictionary:stop]];
-        }
+      [self _updateCameraFromTrackingMode];
     } else {
-        [cameraUpdateQueue enqueue:[CameraStop fromDictionary:_stop]];
+      [self _updateCameraFromJavascript];
     }
-    [cameraUpdateQueue execute:_map];
+  }
 }
 
-- (void)_setInitialCamera
-{
-    if (! _defaultStop) {
-        return;
+- (void)_updateMinMaxZoomLevel {
+  if (_map != nil) {
+    if (_maxZoomLevel) {
+      _map.maximumZoomLevel = [_maxZoomLevel doubleValue];
     }
-
-    CameraStop* stop = [CameraStop fromDictionary:_defaultStop];
-    stop.duration = 0;
-    stop.mode = [NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_NONE];
-    CameraUpdateItem *item = [[CameraUpdateItem alloc] init];
-    item.cameraStop = stop;
-    [item execute:_map withCompletionHandler:^{ }];
-}
-
-- (void)_updateCamera
-{
-    if (_map != nil) {
-        if (_followUserLocation) {
-            [self _updateCameraFromTrackingMode];
-        } else {
-            [self _updateCameraFromJavascript];
-        }
+    if (_minZoomLevel) {
+      _map.minimumZoomLevel = [_minZoomLevel doubleValue];
     }
+  }
 }
 
-- (void)_updateMinMaxZoomLevel
-{
-    if (_map != nil) {
-        if (_maxZoomLevel) {
-            _map.maximumZoomLevel = [_maxZoomLevel doubleValue];
-        }
-        if (_minZoomLevel) {
-            _map.minimumZoomLevel = [_minZoomLevel doubleValue];
-        }
+- (void)_updateMaxBounds {
+  if (_map != nil) {
+    if (_maxBounds) {
+      _map.maxBounds = [MLRNUtils fromFeatureCollection:_maxBounds];
     }
+  }
 }
 
-- (void)_updateMaxBounds
-{
-    if (_map != nil) {
-        if (_maxBounds) {
-            _map.maxBounds = [MLRNUtils fromFeatureCollection:_maxBounds];
-        }
-    }
-}
+- (void)_updateCameraFromTrackingMode {
+  if (_map == nil) {
+    return;
+  }
+  if (!_followUserLocation) {
+    _map.userTrackingMode = MLNUserTrackingModeNone;
+    return;
+  }
 
-- (void)_updateCameraFromTrackingMode
-{
-    if (_map == nil) {
-          return;
-    }
-    if (!_followUserLocation) {
-        _map.userTrackingMode = MLNUserTrackingModeNone;
-        return;
-    }
-    
-    MLNMapCamera *camera = _map.camera;
-    if (_followPitch != nil && [_followPitch floatValue] >= 0.0) {
-        camera.pitch = [_followPitch floatValue];
-    } else if (_stop != nil && _stop[@"pitch"] != nil) {
-        camera.pitch = [_stop[@"pitch"] floatValue];
-    }
-    
-    if ([self _userTrackingMode] != MLNUserTrackingModeFollowWithCourse && [self _userTrackingMode] != MLNUserTrackingModeFollowWithHeading) {
-        if (_followHeading != nil && [_followHeading floatValue] >= 0.0) {
-            camera.heading = [_followHeading floatValue];
-        } else if (_stop != nil && _stop[@"heading"] != nil) {
-            camera.heading = [_stop[@"heading"] floatValue];
-        }
-    }
-    
-    if (_followZoomLevel != nil && [_followZoomLevel doubleValue] >= 0.0) {
-        camera.altitude = [_map altitudeFromZoom:[_followZoomLevel doubleValue]];
+  MLNMapCamera *camera = _map.camera;
+  if (_followPitch != nil && [_followPitch floatValue] >= 0.0) {
+    camera.pitch = [_followPitch floatValue];
+  } else if (_stop != nil && _stop[@"pitch"] != nil) {
+    camera.pitch = [_stop[@"pitch"] floatValue];
+  }
+
+  if ([self _userTrackingMode] != MLNUserTrackingModeFollowWithCourse &&
+      [self _userTrackingMode] != MLNUserTrackingModeFollowWithHeading) {
+    if (_followHeading != nil && [_followHeading floatValue] >= 0.0) {
+      camera.heading = [_followHeading floatValue];
+    } else if (_stop != nil && _stop[@"heading"] != nil) {
+      camera.heading = [_stop[@"heading"] floatValue];
     }
+  }
 
-    [_map setCamera:camera animated:NO];
+  if (_followZoomLevel != nil && [_followZoomLevel doubleValue] >= 0.0) {
+    camera.altitude = [_map altitudeFromZoom:[_followZoomLevel doubleValue]];
+  }
 
-    if (_map.userTrackingMode != [self _userTrackingMode]) {
-      [_map setUserTrackingMode:[self _userTrackingMode] animated:NO completionHandler:nil];
-    }
+  [_map setCamera:camera animated:NO];
+
+  if (_map.userTrackingMode != [self _userTrackingMode]) {
+    [_map setUserTrackingMode:[self _userTrackingMode] animated:NO completionHandler:nil];
+  }
 }
 
-- (NSUInteger)_userTrackingMode
-{
-    if ([_followUserMode isEqualToString:@"compass"]) {
-        return MLNUserTrackingModeFollowWithHeading;
-    } else if ([_followUserMode isEqualToString:@"course"]) {
-        return MLNUserTrackingModeFollowWithCourse;
-    } else if (_followUserLocation) {
-        return MLNUserTrackingModeFollow;
-    } else {
-        return MLNUserTrackingModeNone;
-    }
+- (NSUInteger)_userTrackingMode {
+  if ([_followUserMode isEqualToString:@"compass"]) {
+    return MLNUserTrackingModeFollowWithHeading;
+  } else if ([_followUserMode isEqualToString:@"course"]) {
+    return MLNUserTrackingModeFollowWithCourse;
+  } else if (_followUserLocation) {
+    return MLNUserTrackingModeFollow;
+  } else {
+    return MLNUserTrackingModeNone;
+  }
 }
 
-- (id)_trackingModeToString:(MLNUserTrackingMode) mode {
-    switch (mode) {
-        case MLNUserTrackingModeFollowWithHeading:
-            return @"compass";
-        case MLNUserTrackingModeFollowWithCourse:
-            return @"course";
-        case MLNUserTrackingModeFollow:
-            return @"normal";
-        case MLNUserTrackingModeNone:
-            return [NSNull null];
-    }
+- (id)_trackingModeToString:(MLNUserTrackingMode)mode {
+  switch (mode) {
+    case MLNUserTrackingModeFollowWithHeading:
+      return @"compass";
+    case MLNUserTrackingModeFollowWithCourse:
+      return @"course";
+    case MLNUserTrackingModeFollow:
+      return @"normal";
+    case MLNUserTrackingModeNone:
+      return [NSNull null];
+  }
 }
 
-- (void)initialLayout
-{
-    [self _setInitialCamera];
-    [self _updateCamera];
+- (void)initialLayout {
+  [self _setInitialCamera];
+  [self _updateCamera];
 }
 
-- (void)didChangeUserTrackingMode:(MLNUserTrackingMode)mode animated:(BOOL)animated
-{
-    NSDictionary *payload = @{ @"followUserMode": [self _trackingModeToString: mode], @"followUserLocation": @((BOOL)(mode != MLNUserTrackingModeNone)) };
-    MLRNEvent *event = [MLRNEvent makeEvent:RCT_MAPBOX_USER_TRACKING_MODE_CHANGE withPayload:payload];
-    if (_onUserTrackingModeChange) {
-        _onUserTrackingModeChange([event toJSON]);
-    }
+- (void)didChangeUserTrackingMode:(MLNUserTrackingMode)mode animated:(BOOL)animated {
+  NSDictionary *payload = @{
+    @"followUserMode" : [self _trackingModeToString:mode],
+    @"followUserLocation" : @((BOOL)(mode != MLNUserTrackingModeNone))
+  };
+  MLRNEvent *event = [MLRNEvent makeEvent:RCT_MAPBOX_USER_TRACKING_MODE_CHANGE withPayload:payload];
+  if (_onUserTrackingModeChange) {
+    _onUserTrackingModeChange([event toJSON]);
+  }
 }
 
 @end

package/ios/MLRN/MLRNCameraManager.m

@@ -28,14 +28,12 @@ RCT_EXPORT_VIEW_PROPERTY(defaultStop, NSDictionary)
 
 #pragma Methods
 
-- (BOOL)requiresMainQueueSetup
-{
-    return YES;
+- (BOOL)requiresMainQueueSetup {
+  return YES;
 }
 
-- (UIView *)view
-{
-    return [[MLRNCamera alloc] init];
+- (UIView *)view {
+  return [[MLRNCamera alloc] init];
 }
 
 @end

package/ios/MLRN/MLRNCircleLayer.m

@@ -5,22 +5,25 @@
 
 @implementation MLRNCircleLayer
 
-- (MLNCircleStyleLayer*)makeLayer:(MLNStyle*)style
-{
-    MLNSource *source = [self layerWithSourceIDInStyle:style];
-    if (source == nil) { return nil; }
-    MLNCircleStyleLayer *layer = [[MLNCircleStyleLayer alloc] initWithIdentifier:self.id source:source];
-    layer.sourceLayerIdentifier = self.sourceLayerID;
-    return layer;
+- (MLNCircleStyleLayer *)makeLayer:(MLNStyle *)style {
+  MLNSource *source = [self layerWithSourceIDInStyle:style];
+  if (source == nil) {
+    return nil;
+  }
+  MLNCircleStyleLayer *layer = [[MLNCircleStyleLayer alloc] initWithIdentifier:self.id
+                                                                        source:source];
+  layer.sourceLayerIdentifier = self.sourceLayerID;
+  return layer;
 }
 
-- (void)addStyles
-{
-    MLRNStyle *style = [[MLRNStyle alloc] initWithMLNStyle:self.style];
-    style.bridge = self.bridge;
-    [style circleLayer:(MLNCircleStyleLayer*)self.styleLayer withReactStyle:self.reactStyle isValid:^{
-        return [self isAddedToMap];
-    }];
+- (void)addStyles {
+  MLRNStyle *style = [[MLRNStyle alloc] initWithMLNStyle:self.style];
+  style.bridge = self.bridge;
+  [style circleLayer:(MLNCircleStyleLayer *)self.styleLayer
+      withReactStyle:self.reactStyle
+             isValid:^{
+               return [self isAddedToMap];
+             }];
 }
 
 @end

package/ios/MLRN/MLRNCircleLayerManager.m

@@ -21,11 +21,10 @@ RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary);
 RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber);
 RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber);
 
-- (UIView*)view
-{
-    MLRNCircleLayer *layer = [MLRNCircleLayer new];
-    layer.bridge = self.bridge;
-    return layer;
+- (UIView *)view {
+  MLRNCircleLayer *layer = [MLRNCircleLayer new];
+  layer.bridge = self.bridge;
+  return layer;
 }
 
 @end

package/ios/MLRN/MLRNCustomHeaders.h

@@ -10,11 +10,11 @@
 
 @interface MLRNCustomHeaders : NSObject
 
-@property (nonatomic, strong) NSMutableDictionary<NSString*, NSString*> *currentHeaders;
+@property (nonatomic, strong) NSMutableDictionary<NSString *, NSString *> *currentHeaders;
 
 + (id)sharedInstance;
 - (void)initHeaders;
-- (void)addHeader:(NSString*)value forHeaderName:(NSString *)header;
+- (void)addHeader:(NSString *)value forHeaderName:(NSString *)header;
 - (void)removeHeader:(NSString *)header;
 
 @end