@maplibre/maplibre-react-native 10.1.0 → 10.1.2

package/ios/MLRN/MLRNPointAnnotation.h

@@ -1,11 +1,11 @@
 #import <React/RCTComponent.h>
-#import <UIKit/UIKit.h>
 #import <React/RCTView.h>
+#import <UIKit/UIKit.h>
 #import "MLRNCallout.h"
 
 @import MapLibre;
 
-@interface MLRNPointAnnotation : MLNAnnotationView<MLNAnnotation>
+@interface MLRNPointAnnotation : MLNAnnotationView <MLNAnnotation>
 
 @property (nonatomic, weak) MLNMapView *map;
 @property (nonatomic, strong) MLRNCallout *calloutView;

package/ios/MLRN/MLRNPointAnnotation.m

@@ -1,243 +1,222 @@
 #import "MLRNPointAnnotation.h"
+#import <React/UIView+React.h>
 #import "MLRNMapTouchEvent.h"
 #import "MLRNUtils.h"
-#import <React/UIView+React.h>
 
 const float CENTER_X_OFFSET_BASE = -0.5f;
 const float CENTER_Y_OFFSET_BASE = -0.5f;
 
-@implementation MLRNPointAnnotation
-{
-    UITapGestureRecognizer *customViewTap;
+@implementation MLRNPointAnnotation {
+  UITapGestureRecognizer *customViewTap;
 }
 
-- (id)init
-{
-    if (self = [super init]) {
-        customViewTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_handleTap:)];
-    }
-    return self;
+- (id)init {
+  if (self = [super init]) {
+    customViewTap = [[UITapGestureRecognizer alloc] initWithTarget:self
+                                                            action:@selector(_handleTap:)];
+  }
+  return self;
 }
 
-- (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex
-{
-    if ([subview isKindOfClass:[MLRNCallout class]]) {
-        self.calloutView = (MLRNCallout *)subview;
-        self.calloutView.representedObject = self;
-    } else {
-        [super insertReactSubview:subview atIndex:0];
-    }
+- (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex {
+  if ([subview isKindOfClass:[MLRNCallout class]]) {
+    self.calloutView = (MLRNCallout *)subview;
+    self.calloutView.representedObject = self;
+  } else {
+    [super insertReactSubview:subview atIndex:0];
+  }
 }
 
-- (void)removeReactSubview:(UIView *)subview
-{
-    if ([subview isKindOfClass:[MLRNCallout class]]) {
-        self.calloutView = nil;
-    } else {
-        [super removeReactSubview:subview];
-    }
+- (void)removeReactSubview:(UIView *)subview {
+  if ([subview isKindOfClass:[MLRNCallout class]]) {
+    self.calloutView = nil;
+  } else {
+    [super removeReactSubview:subview];
+  }
 }
 
-- (void)reactSetFrame:(CGRect)frame
-{
-    if ([_map.annotations containsObject:self]) {
-        [_map removeAnnotation:self];
-    }
-    [super reactSetFrame:frame];
-    [self _setCenterOffset:frame];
-    [self _addAnnotation];
+- (void)reactSetFrame:(CGRect)frame {
+  if ([_map.annotations containsObject:self]) {
+    [_map removeAnnotation:self];
+  }
+  [super reactSetFrame:frame];
+  [self _setCenterOffset:frame];
+  [self _addAnnotation];
 }
 
-- (void)setAnchor:(NSDictionary<NSString *, NSNumber *> *)anchor
-{
-    _anchor = anchor;
-    [self _setCenterOffset:self.frame];
+- (void)setAnchor:(NSDictionary<NSString *, NSNumber *> *)anchor {
+  _anchor = anchor;
+  [self _setCenterOffset:self.frame];
 }
 
-- (void)setMap:(MLNMapView *)map
-{
-    if (map == nil) {
-        [_map removeAnnotation:self];
-        _map = nil;
-    } else {
-        _map = map;
-
-        // prevents annotations from flying in from the top left corner
-        // if the frame hasn't been set yet
-        if (![self _isFrameSet]) {
-            return;
-        }
+- (void)setMap:(MLNMapView *)map {
+  if (map == nil) {
+    [_map removeAnnotation:self];
+    _map = nil;
+  } else {
+    _map = map;
 
-        [self _addAnnotation];
+    // prevents annotations from flying in from the top left corner
+    // if the frame hasn't been set yet
+    if (![self _isFrameSet]) {
+      return;
     }
+
+    [self _addAnnotation];
+  }
 }
 
-- (void)setReactSelected:(BOOL)reactSelected
-{
-    _reactSelected = reactSelected;
+- (void)setReactSelected:(BOOL)reactSelected {
+  _reactSelected = reactSelected;
 
-    if (_map != nil) {
-        if (_reactSelected) {
-            [_map selectAnnotation:self animated:NO completionHandler:nil];
-        } else {
-            [_map deselectAnnotation:self animated:NO];
-        }
+  if (_map != nil) {
+    if (_reactSelected) {
+      [_map selectAnnotation:self animated:NO completionHandler:nil];
+    } else {
+      [_map deselectAnnotation:self animated:NO];
     }
+  }
 }
 
-- (void)setReactDraggable:(BOOL)reactDraggable
-{
-    _reactDraggable = reactDraggable;
-    self.draggable = _reactDraggable;
+- (void)setReactDraggable:(BOOL)reactDraggable {
+  _reactDraggable = reactDraggable;
+  self.draggable = _reactDraggable;
 }
 
-- (void)setReactCoordinate:(NSString *)reactCoordinate
-{
-    _reactCoordinate = reactCoordinate;
-    [self _updateCoordinate];
+- (void)setReactCoordinate:(NSString *)reactCoordinate {
+  _reactCoordinate = reactCoordinate;
+  [self _updateCoordinate];
 }
 
-- (NSString *)reuseIdentifier
-{
-    return _id;
+- (NSString *)reuseIdentifier {
+  return _id;
 }
 
-- (NSString *)title
-{
-    return _reactTitle;
+- (NSString *)title {
+  return _reactTitle;
 }
 
-- (NSString *)subtitle
-{
-    return _reactSnippet;
+- (NSString *)subtitle {
+  return _reactSnippet;
 }
 
-- (NSString *)toolTip
-{
-    return _reactTitle;
+- (NSString *)toolTip {
+  return _reactTitle;
 }
 
-- (MLNAnnotationView *)getAnnotationView
-{
-    if (self.reactSubviews.count == 0) {
-        // default pin view
-        return nil;
-    } else {
-        // custom view
-        self.enabled = YES;
-        const CGFloat defaultZPosition = 0.0;
-        if (self.layer.zPosition == defaultZPosition) {
-            self.layer.zPosition = [self _getZPosition];
-        }
-        [self addGestureRecognizer:customViewTap];
-        return self;
+- (MLNAnnotationView *)getAnnotationView {
+  if (self.reactSubviews.count == 0) {
+    // default pin view
+    return nil;
+  } else {
+    // custom view
+    self.enabled = YES;
+    const CGFloat defaultZPosition = 0.0;
+    if (self.layer.zPosition == defaultZPosition) {
+      self.layer.zPosition = [self _getZPosition];
     }
+    [self addGestureRecognizer:customViewTap];
+    return self;
+  }
 }
 
-- (CGFloat)_getZPosition
-{
-    double latitudeMax = 90.0;
-    return latitudeMax - self.coordinate.latitude;
+- (CGFloat)_getZPosition {
+  double latitudeMax = 90.0;
+  return latitudeMax - self.coordinate.latitude;
 }
 
-- (void)_handleTap:(UITapGestureRecognizer *)recognizer
-{
-    [_map selectAnnotation:self animated:NO completionHandler:nil];
+- (void)_handleTap:(UITapGestureRecognizer *)recognizer {
+  [_map selectAnnotation:self animated:NO completionHandler:nil];
 }
 
-- (void)_setCenterOffset:(CGRect)frame
-{
-    if (frame.size.width == 0 || frame.size.height == 0 || _anchor == nil) {
-        return;
-    }
+- (void)_setCenterOffset:(CGRect)frame {
+  if (frame.size.width == 0 || frame.size.height == 0 || _anchor == nil) {
+    return;
+  }
 
-    float x = [_anchor[@"x"] floatValue];
-    float y = [_anchor[@"y"] floatValue];
+  float x = [_anchor[@"x"] floatValue];
+  float y = [_anchor[@"y"] floatValue];
 
-    float dx = -(x * frame.size.width - (frame.size.width / 2));
-    float dy = -(y * frame.size.height - (frame.size.height / 2));
+  float dx = -(x * frame.size.width - (frame.size.width / 2));
+  float dy = -(y * frame.size.height - (frame.size.height / 2));
 
-    // special cases 0 and 1
+  // special cases 0 and 1
 
-    if (x == 0) {
-        dx = frame.size.width / 2;
-    } else if (x == 1) {
-        dx = -frame.size.width / 2;
-    }
+  if (x == 0) {
+    dx = frame.size.width / 2;
+  } else if (x == 1) {
+    dx = -frame.size.width / 2;
+  }
 
-    if (y == 0) {
-        dy = frame.size.height / 2;
-    } else if (y == 1) {
-        dy = -frame.size.height / 2;
-    }
+  if (y == 0) {
+    dy = frame.size.height / 2;
+  } else if (y == 1) {
+    dy = -frame.size.height / 2;
+  }
 
-    self.centerOffset = CGVectorMake(dx, dy);
+  self.centerOffset = CGVectorMake(dx, dy);
 }
 
+- (void)_updateCoordinate {
+  if (_reactCoordinate == nil) {
+    return;
+  }
 
-- (void)_updateCoordinate
-{
-    if (_reactCoordinate == nil) {
-        return;
-    }
-
-    MLNPointFeature *feature = (MLNPointFeature *)[MLRNUtils shapeFromGeoJSON:_reactCoordinate];
-    if (feature == nil) {
-        return;
-    }
+  MLNPointFeature *feature = (MLNPointFeature *)[MLRNUtils shapeFromGeoJSON:_reactCoordinate];
+  if (feature == nil) {
+    return;
+  }
 
-    dispatch_async(dispatch_get_main_queue(), ^{
-       self.coordinate = feature.coordinate;
-    });
+  dispatch_async(dispatch_get_main_queue(), ^{
+    self.coordinate = feature.coordinate;
+  });
 }
 
-- (void)_addAnnotation
-{
-    if ([_map.annotations containsObject:self]) {
-        return;
-    }
+- (void)_addAnnotation {
+  if ([_map.annotations containsObject:self]) {
+    return;
+  }
 
-    [_map addAnnotation:self];
-    if (_reactSelected) {
-        [_map selectAnnotation:self animated:NO completionHandler:nil];
-    }
+  [_map addAnnotation:self];
+  if (_reactSelected) {
+    [_map selectAnnotation:self animated:NO completionHandler:nil];
+  }
 }
 
-- (BOOL)_isFrameSet
-{
-    return self.frame.size.width > 0 && self.frame.size.height > 0;
+- (BOOL)_isFrameSet {
+  return self.frame.size.width > 0 && self.frame.size.height > 0;
 }
 
 - (void)setDragState:(MLNAnnotationViewDragState)dragState animated:(BOOL)animated {
-    [super setDragState:dragState animated:animated];
-    switch (dragState) {
-        case MLNAnnotationViewDragStateStarting: {
-            if (self.onDragStart != nil) {
-                MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeAnnotationTapEvent:self];
-                self.onDragStart([event toJSON]);
-            }
-            break;
-        }
-
-        case MLNAnnotationViewDragStateDragging:
-            if (self.onDrag != nil) {
-                MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeAnnotationTapEventOnDrag:self];
-                self.onDrag([event toJSON]);
-            }
-            break;
-
-        case MLNAnnotationViewDragStateEnding:
-        case MLNAnnotationViewDragStateCanceling: {
-            if (self.onDragEnd != nil) {
-                MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeAnnotationTapEvent:self];
-                self.onDragEnd([event toJSON]);
-            }
-            break;
-        }
-
-        case MLNAnnotationViewDragStateNone:
-            return;
+  [super setDragState:dragState animated:animated];
+  switch (dragState) {
+    case MLNAnnotationViewDragStateStarting: {
+      if (self.onDragStart != nil) {
+        MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeAnnotationTapEvent:self];
+        self.onDragStart([event toJSON]);
+      }
+      break;
+    }
+
+    case MLNAnnotationViewDragStateDragging:
+      if (self.onDrag != nil) {
+        MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeAnnotationTapEventOnDrag:self];
+        self.onDrag([event toJSON]);
+      }
+      break;
+
+    case MLNAnnotationViewDragStateEnding:
+    case MLNAnnotationViewDragStateCanceling: {
+      if (self.onDragEnd != nil) {
+        MLRNMapTouchEvent *event = [MLRNMapTouchEvent makeAnnotationTapEvent:self];
+        self.onDragEnd([event toJSON]);
+      }
+      break;
     }
+
+    case MLNAnnotationViewDragStateNone:
+      return;
+  }
 }
 
 @end

package/ios/MLRN/MLRNPointAnnotationManager.m

@@ -20,9 +20,8 @@ RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDragStart, onDragStart, RCTBubbli
 RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDrag, onDrag, RCTBubblingEventBlock)
 RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDragEnd, onDragEnd, RCTBubblingEventBlock)
 
-- (UIView *)view
-{
-    return [[MLRNPointAnnotation alloc] init];
+- (UIView *)view {
+  return [[MLRNPointAnnotation alloc] init];
 }
 
 @end

package/ios/MLRN/MLRNRasterLayer.m

@@ -3,20 +3,24 @@
 
 @implementation MLRNRasterLayer
 
-- (MLNStyleLayer*)makeLayer:(MLNStyle*)style
-{
-    MLNSource *source =  [style sourceWithIdentifier:self.sourceID];
-    if (source == nil) { return nil; }
-    MLNRasterStyleLayer *layer = [[MLNRasterStyleLayer alloc] initWithIdentifier:self.id source:source];
-    return layer;
+- (MLNStyleLayer *)makeLayer:(MLNStyle *)style {
+  MLNSource *source = [style sourceWithIdentifier:self.sourceID];
+  if (source == nil) {
+    return nil;
+  }
+  MLNRasterStyleLayer *layer = [[MLNRasterStyleLayer alloc] initWithIdentifier:self.id
+                                                                        source:source];
+  return layer;
 }
 
-- (void)addStyles
-{
-    MLRNStyle *style = [[MLRNStyle alloc] initWithMLNStyle:self.style];
-    style.bridge = self.bridge;
-    [style rasterLayer:(MLNRasterStyleLayer*)self.styleLayer withReactStyle:self.reactStyle isValid:^{ return [self isAddedToMap];
-    }];
+- (void)addStyles {
+  MLRNStyle *style = [[MLRNStyle alloc] initWithMLNStyle:self.style];
+  style.bridge = self.bridge;
+  [style rasterLayer:(MLNRasterStyleLayer *)self.styleLayer
+      withReactStyle:self.reactStyle
+             isValid:^{
+               return [self isAddedToMap];
+             }];
 }
 
 @end

package/ios/MLRN/MLRNRasterLayerManager.m

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

package/ios/MLRN/MLRNRasterSource.m

@@ -2,26 +2,30 @@
 
 @implementation MLRNRasterSource
 
-- (nullable MLNSource*)makeSource
-{
-    if (self.url != nil) {
-        NSURL *url = [NSURL URLWithString:self.url];
-        if (self.tileSize != nil) {
-            return [[MLNRasterTileSource alloc] initWithIdentifier:self.id configurationURL:url tileSize:[self.tileSize floatValue]];
-        }
-        return [[MLNRasterTileSource alloc] initWithIdentifier:self.id configurationURL:url];
+- (nullable MLNSource *)makeSource {
+  if (self.url != nil) {
+    NSURL *url = [NSURL URLWithString:self.url];
+    if (self.tileSize != nil) {
+      return [[MLNRasterTileSource alloc] initWithIdentifier:self.id
+                                            configurationURL:url
+                                                    tileSize:[self.tileSize floatValue]];
     }
-    return [[MLNRasterTileSource alloc] initWithIdentifier:self.id tileURLTemplates:self.tileUrlTemplates options:[self getOptions]];
+    return [[MLNRasterTileSource alloc] initWithIdentifier:self.id configurationURL:url];
+  }
+  return [[MLNRasterTileSource alloc] initWithIdentifier:self.id
+                                        tileURLTemplates:self.tileUrlTemplates
+                                                 options:[self getOptions]];
 }
 
-- (NSDictionary<MLNTileSourceOption,id> *)getOptions {
-    NSMutableDictionary<MLNTileSourceOption, id> *options = [[NSMutableDictionary alloc] initWithDictionary:[super getOptions]];
-    
-    if (self.tileSize != nil) {
-        options[MLNTileSourceOptionTileSize] = _tileSize;
-    }
-    
-    return options;
+- (NSDictionary<MLNTileSourceOption, id> *)getOptions {
+  NSMutableDictionary<MLNTileSourceOption, id> *options =
+      [[NSMutableDictionary alloc] initWithDictionary:[super getOptions]];
+
+  if (self.tileSize != nil) {
+    options[MLNTileSourceOptionTileSize] = _tileSize;
+  }
+
+  return options;
 }
 
 @end

package/ios/MLRN/MLRNRasterSourceManager.m

@@ -16,9 +16,8 @@ RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber)
 
 RCT_EXPORT_VIEW_PROPERTY(tms, BOOL)
 
-- (UIView*)view
-{
-    return [MLRNRasterSource new];
+- (UIView*)view {
+  return [MLRNRasterSource new];
 }
 
 @end

package/ios/MLRN/MLRNShapeSource.h

@@ -7,27 +7,28 @@
 
 @property (nonatomic, weak) RCTBridge *bridge;
 
-@property (nonatomic, copy) NSString *url;
-@property (nonatomic, copy) NSString *shape;
+@property (nonatomic, copy, nullable) NSString *url;
+@property (nonatomic, copy, nullable) NSString *shape;
 
-@property (nonatomic, strong) NSNumber *cluster;
-@property (nonatomic, strong) NSNumber *clusterRadius;
-@property (nonatomic, strong) NSNumber *clusterMaxZoomLevel;
-@property (nonatomic, strong) NSDictionary<NSString *, NSArray<NSExpression *> *> *clusterProperties;
+@property (nonatomic, strong, nullable) NSNumber *cluster;
+@property (nonatomic, strong, nullable) NSNumber *clusterRadius;
+@property (nonatomic, strong, nullable) NSNumber *clusterMaxZoomLevel;
+@property (nonatomic, strong, nullable)
+    NSDictionary<NSString *, NSArray<NSExpression *> *> *clusterProperties;
 
-@property (nonatomic, strong) NSNumber *maxZoomLevel;
-@property (nonatomic, strong) NSNumber *buffer;
-@property (nonatomic, strong) NSNumber *tolerance;
-@property (nonatomic, strong) NSNumber *lineMetrics;
+@property (nonatomic, strong, nullable) NSNumber *maxZoomLevel;
+@property (nonatomic, strong, nullable) NSNumber *buffer;
+@property (nonatomic, strong, nullable) NSNumber *tolerance;
+@property (nonatomic, strong, nullable) NSNumber *lineMetrics;
 
-@property (nonatomic, copy) RCTBubblingEventBlock onPress;
+@property (nonatomic, copy, nullable) RCTBubblingEventBlock onPress;
 @property (nonatomic, assign) BOOL hasPressListener;
 
-- (nonnull NSArray<id <MLNFeature>> *)featuresMatchingPredicate:(nullable NSPredicate *)predicate;
-- (nonnull NSArray<id <MLNFeature>> *)getClusterLeaves:(nonnull NSString *)featureJSON
-                                                number:(NSUInteger)number
-                                                offset:(NSUInteger)offset;
-- (nonnull NSArray<id <MLNFeature>> *)getClusterChildren:(nonnull NSString *)featureJSON;                                               
+- (nonnull NSArray<id<MLNFeature>> *)featuresMatchingPredicate:(nullable NSPredicate *)predicate;
+- (nonnull NSArray<id<MLNFeature>> *)getClusterLeaves:(nonnull NSString *)featureJSON
+                                               number:(NSUInteger)number
+                                               offset:(NSUInteger)offset;
+- (nonnull NSArray<id<MLNFeature>> *)getClusterChildren:(nonnull NSString *)featureJSON;
 
 - (double)getClusterExpansionZoom:(nonnull NSString *)featureJSON;