@maplibre/maplibre-react-native 10.1.0 → 10.1.2

package/ios/MLRN/MLRNLayer.h

@@ -1,6 +1,5 @@
-#import <UIKit/UIKit.h>
 #import <React/RCTBridge.h>
-
+#import <UIKit/UIKit.h>
 
 @class MLRNMapView;
 
@@ -8,11 +7,11 @@
 
 @interface MLRNLayer<T> : UIView
 
-@property (nonatomic, weak, nullable) RCTBridge* bridge;
+@property (nonatomic, weak, nullable) RCTBridge *bridge;
 
 @property (nonatomic, strong, nullable) MLNStyleLayer *styleLayer;
 @property (nonatomic, strong, nullable) MLNStyle *style;
-@property (nonatomic, weak, nullable) MLRNMapView* map;
+@property (nonatomic, weak, nullable) MLRNMapView *map;
 @property (nonatomic, strong, nullable) NSDictionary *reactStyle;
 @property (nonatomic, strong, nullable) NSArray *filter;
 
@@ -26,19 +25,18 @@
 @property (nonatomic, copy, nullable) NSNumber *maxZoomLevel;
 @property (nonatomic, copy, nullable) NSNumber *minZoomLevel;
 
-- (void)addToMap:(nonnull MLRNMapView*)map style:(nonnull MLNStyle*)style;
+- (void)addToMap:(nonnull MLRNMapView *)map style:(nonnull MLNStyle *)style;
 - (void)addedToMap;
-- (void)removeFromMap:(nonnull MLNStyle*)style;
-- (nullable T)makeLayer:(nonnull MLNStyle*)style;
+- (void)removeFromMap:(nonnull MLNStyle *)style;
+- (nullable T)makeLayer:(nonnull MLNStyle *)style;
 - (void)addStyles;
-- (void)insertAbove:(nonnull NSString*)layer;
-- (void)insertBelow:(nonnull NSString*)layer;
+- (void)insertAbove:(nonnull NSString *)layer;
+- (void)insertBelow:(nonnull NSString *)layer;
 - (void)insertAtIndex:(NSUInteger)index;
-- (void)insertLayer;
 - (void)setZoomBounds;
 
 - (BOOL)isAddedToMap;
 
-- (nullable MLNSource*)layerWithSourceIDInStyle:(nonnull MLNStyle*) style;
+- (nullable MLNSource *)layerWithSourceIDInStyle:(nonnull MLNStyle *)style;
 
 @end

package/ios/MLRN/MLRNLayer.m

@@ -1,228 +1,216 @@
 #import "MLRNLayer.h"
+#import "MLRNMapView.h"
 #import "MLRNSource.h"
 #import "MLRNStyleValue.h"
 #import "MLRNUtils.h"
-#import "MLRNMapView.h"
 
 @implementation MLRNLayer
 
-- (void)setMinZoomLevel:(NSNumber*)minZoomLevel
-{
-    _minZoomLevel = minZoomLevel;
-    
-    if (_styleLayer != nil) {
-        _styleLayer.minimumZoomLevel = [_minZoomLevel doubleValue];
-    }
-}
+- (void)setMinZoomLevel:(NSNumber *)minZoomLevel {
+  _minZoomLevel = minZoomLevel;
 
-- (void)setMaxZoomLevel:(NSNumber*)maxZoomLevel
-{
-    _maxZoomLevel = maxZoomLevel;
-    
-    if (_styleLayer != nil) {
-        _styleLayer.maximumZoomLevel = [_maxZoomLevel doubleValue];
-    }
+  if (_styleLayer != nil) {
+    _styleLayer.minimumZoomLevel = [_minZoomLevel doubleValue];
+  }
 }
 
-- (void)setAboveLayerID:(NSString *)aboveLayerID
-{
-    if (_aboveLayerID != nil && _aboveLayerID == aboveLayerID) {
-        return;
-    }
-    
-    _aboveLayerID = aboveLayerID;
-    if (_styleLayer != nil) {
-        [self removeFromMap:_style];
-        [self insertAbove:aboveLayerID];
-    }
-}
+- (void)setMaxZoomLevel:(NSNumber *)maxZoomLevel {
+  _maxZoomLevel = maxZoomLevel;
 
-- (void)setBelowLayerID:(NSString *)belowLayerID
-{
-    if (_belowLayerID != nil && _belowLayerID == belowLayerID) {
-        return;
-    }
-    
-    _belowLayerID = belowLayerID;
-    if (_styleLayer != nil) {
-        [self removeFromMap:_style];
-        [self insertBelow:_belowLayerID];
-    }
+  if (_styleLayer != nil) {
+    _styleLayer.maximumZoomLevel = [_maxZoomLevel doubleValue];
+  }
 }
 
-- (void)setLayerIndex:(NSNumber *)layerIndex
-{
-    if (_layerIndex != nil && _layerIndex == layerIndex) {
-        return;
-    }
-    
-    _layerIndex = layerIndex;
-    if (_styleLayer != nil) {
-        [self removeFromMap:_style];
-        [self insertAtIndex:_layerIndex.unsignedIntegerValue];
-    }
+- (void)setAboveLayerID:(NSString *)aboveLayerID {
+  if (_aboveLayerID != nil && _aboveLayerID == aboveLayerID) {
+    return;
+  }
+
+  _aboveLayerID = aboveLayerID;
+  if (_styleLayer != nil) {
+    [self removeFromMap:_style];
+    [self insertAbove:aboveLayerID];
+  }
 }
 
-- (void)setMap:(MLRNMapView *)map {
-    if (map == nil) {
-        [self removeFromMap:_map.style];
-        _map = nil;
-    } else {
-        _map = map;
-        [self addToMap:map style:map.style];
-    }
+- (void)setBelowLayerID:(NSString *)belowLayerID {
+  if (_belowLayerID != nil && _belowLayerID == belowLayerID) {
+    return;
+  }
+
+  _belowLayerID = belowLayerID;
+  if (_styleLayer != nil) {
+    [self removeFromMap:_style];
+    [self insertBelow:_belowLayerID];
+  }
 }
 
--(void)setReactStyle:(NSDictionary *)reactStyle
-{
-    _reactStyle = reactStyle;
-    
-    if (_styleLayer != nil) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-           [self addStyles];
-        });
-    }
+- (void)setLayerIndex:(NSNumber *)layerIndex {
+  if (_layerIndex != nil && _layerIndex == layerIndex) {
+    return;
+  }
+
+  _layerIndex = layerIndex;
+  if (_styleLayer != nil) {
+    [self removeFromMap:_style];
+    [self insertAtIndex:_layerIndex.unsignedIntegerValue];
+  }
 }
 
-- (void)addToMap:(MLRNMapView*) map style:(MLNStyle *)style
-{
-    if (style == nil) {
-        return;
-    }
+- (void)setMap:(MLRNMapView *)map {
+  if (map == nil) {
+    [self removeFromMap:_map.style];
+    _map = nil;
+  } else {
     _map = map;
-    _style = style;
-    if (_id == nil) {
-      RCTLogError(@"Cannot add a layer without id to the map: %@", self);
+    [self addToMap:map style:map.style];
+  }
+}
+
+- (void)setReactStyle:(NSDictionary *)reactStyle {
+  _reactStyle = reactStyle;
+
+  if (_styleLayer != nil) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      [self addStyles];
+    });
+  }
+}
+
+- (void)addToMap:(MLRNMapView *)map style:(MLNStyle *)style {
+  if (style == nil) {
+    return;
+  }
+  _map = map;
+  _style = style;
+  if (_id == nil) {
+    RCTLogError(@"Cannot add a layer without id to the map: %@", self);
+    return;
+  }
+  MLNStyleLayer *existingLayer = [style layerWithIdentifier:_id];
+  if (existingLayer != nil) {
+    _styleLayer = existingLayer;
+  } else {
+    _styleLayer = [self makeLayer:style];
+    if (_styleLayer == nil) {
+      RCTLogError(@"Failed to make layer: %@", _id);
       return;
     }
-    MLNStyleLayer *existingLayer = [style layerWithIdentifier:_id];
-    if (existingLayer != nil) {
-        _styleLayer = existingLayer;
-    } else {
-        _styleLayer = [self makeLayer:style];
-        if (_styleLayer == nil) {
-            RCTLogError(@"Failed to make layer: %@", _id);
-            return;
-        }
-        [self insertLayer: map];
-    }
-    
-    [self addStyles];
-    [self addedToMap];
+    [self insertLayer:map];
+  }
+
+  [self addStyles];
+  [self addedToMap];
 }
 
-- (nullable MLNSource*)layerWithSourceIDInStyle:(nonnull MLNStyle*) style
-{
-    MLNSource* result = [style sourceWithIdentifier: self.sourceID];
-    if (result == NULL) {
-        RCTLogError(@"Cannot find layer with id: %@ referenced by layer:%@", self.sourceID, _id);
-    }
-    return result;
+- (nullable MLNSource *)layerWithSourceIDInStyle:(nonnull MLNStyle *)style {
+  MLNSource *result = [style sourceWithIdentifier:self.sourceID];
+  if (result == NULL) {
+    RCTLogError(@"Cannot find layer with id: %@ referenced by layer:%@", self.sourceID, _id);
+  }
+  return result;
 }
 
-- (void)removeFromMap:(MLNStyle *)style
-{
-    if (_styleLayer != nil) {
-        [style removeLayer:_styleLayer];
-    }
-    _style = nil;
+- (void)removeFromMap:(MLNStyle *)style {
+  if (_styleLayer != nil) {
+    [style removeLayer:_styleLayer];
+  }
+  _style = nil;
 }
 
-- (BOOL)isAddedToMap
-{
-    return (_style != nil);
+- (BOOL)isAddedToMap {
+  return (_style != nil);
 }
 
-- (nullable MLNStyleLayer*)makeLayer:(MLNStyle*)style
-{
-    @throw [NSException exceptionWithName:NSInternalInconsistencyException
-                        reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]
-                        userInfo:nil];
+- (nullable MLNStyleLayer *)makeLayer:(MLNStyle *)style {
+  @throw [NSException
+      exceptionWithName:NSInternalInconsistencyException
+                 reason:[NSString stringWithFormat:@"You must override %@ in a subclass",
+                                                   NSStringFromSelector(_cmd)]
+               userInfo:nil];
 }
 
-- (void)addStyles
-{
-    @throw [NSException exceptionWithName:NSInternalInconsistencyException
-                                   reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]
-                                 userInfo:nil];
+- (void)addStyles {
+  @throw [NSException
+      exceptionWithName:NSInternalInconsistencyException
+                 reason:[NSString stringWithFormat:@"You must override %@ in a subclass",
+                                                   NSStringFromSelector(_cmd)]
+               userInfo:nil];
 }
 
-- (void)addedToMap
-{
-    // override if you want
+- (void)addedToMap {
+  // override if you want
 }
 
-- (void)insertLayer: (MLRNMapView*) map
-{
-    if ([_style layerWithIdentifier:_id] != nil) {
-        return; // prevent layer from being added twice
-    }
+- (void)insertLayer:(MLRNMapView *)map {
+  if ([_style layerWithIdentifier:_id] != nil) {
+    return;  // prevent layer from being added twice
+  }
 
-    if (_aboveLayerID != nil) {
-        [self insertAbove:_aboveLayerID];
-    } else if (_belowLayerID != nil) {
-        [self insertBelow:_belowLayerID];
-    } else if (_layerIndex != nil) {
-        [self insertAtIndex:_layerIndex.unsignedIntegerValue];
-    } else {
-        [_style addLayer:_styleLayer];
-        [_map layerAdded:_styleLayer];
-    }
-    
-    [self setZoomBounds];
+  if (_aboveLayerID != nil) {
+    [self insertAbove:_aboveLayerID];
+  } else if (_belowLayerID != nil) {
+    [self insertBelow:_belowLayerID];
+  } else if (_layerIndex != nil) {
+    [self insertAtIndex:_layerIndex.unsignedIntegerValue];
+  } else {
+    [_style addLayer:_styleLayer];
+    [_map layerAdded:_styleLayer];
+  }
+
+  [self setZoomBounds];
 }
 
-- (void)setZoomBounds
-{
-    if (_maxZoomLevel != nil) {
-        _styleLayer.maximumZoomLevel = [_maxZoomLevel doubleValue];
-    }
-    
-    if (_minZoomLevel != nil) {
-        _styleLayer.minimumZoomLevel = [_minZoomLevel doubleValue];
-    }
+- (void)setZoomBounds {
+  if (_maxZoomLevel != nil) {
+    _styleLayer.maximumZoomLevel = [_maxZoomLevel doubleValue];
+  }
+
+  if (_minZoomLevel != nil) {
+    _styleLayer.minimumZoomLevel = [_minZoomLevel doubleValue];
+  }
 }
 
--(void)insertAbove:(NSString*)aboveLayerIDs
-{
-    [_map waitForLayerWithID: aboveLayerIDs then:^void (MLNStyleLayer* layer) {
-        if (![self _hasInitialized]) {
-            return;
-        }
-        [self->_style insertLayer:self->_styleLayer aboveLayer:layer];
-        [self->_map layerAdded:self->_styleLayer];
-    }];
-}
-
--(void)insertBelow:(NSString*)belowLayerID
-{
-    [_map waitForLayerWithID: belowLayerID then:^void (MLNStyleLayer* layer) {
-        if (![self _hasInitialized]) {
-            return;
-        }
-        
-        [self->_style insertLayer:self->_styleLayer belowLayer:layer];
-        [self->_map layerAdded:self->_styleLayer];
-    }];
-}
-
--(void)insertAtIndex:(NSUInteger)index
-{
-    if (![self _hasInitialized]) {
-        return;
-    }
-    NSArray *layers = _style.layers;
-    if (index >= layers.count) {
-        RCTLogWarn(@"Layer index is greater than number of layers on map. Layer inserted at end of layer stack.");
-        index = layers.count - 1;
-    }
-    [_style insertLayer:self->_styleLayer atIndex:index];
-    [_map layerAdded:self->_styleLayer];
+- (void)insertAbove:(NSString *)aboveLayerIDs {
+  [_map waitForLayerWithID:aboveLayerIDs
+                      then:^void(MLNStyleLayer *layer) {
+                        if (![self _hasInitialized]) {
+                          return;
+                        }
+                        [self->_style insertLayer:self->_styleLayer aboveLayer:layer];
+                        [self->_map layerAdded:self->_styleLayer];
+                      }];
+}
+
+- (void)insertBelow:(NSString *)belowLayerID {
+  [_map waitForLayerWithID:belowLayerID
+                      then:^void(MLNStyleLayer *layer) {
+                        if (![self _hasInitialized]) {
+                          return;
+                        }
+
+                        [self->_style insertLayer:self->_styleLayer belowLayer:layer];
+                        [self->_map layerAdded:self->_styleLayer];
+                      }];
+}
+
+- (void)insertAtIndex:(NSUInteger)index {
+  if (![self _hasInitialized]) {
+    return;
+  }
+  NSArray *layers = _style.layers;
+  if (index >= layers.count) {
+    RCTLogWarn(@"Layer index is greater than number of layers on map. Layer inserted at end of "
+               @"layer stack.");
+    index = layers.count - 1;
+  }
+  [_style insertLayer:self->_styleLayer atIndex:index];
+  [_map layerAdded:self->_styleLayer];
 }
 
-- (BOOL)_hasInitialized
-{
-    return _style != nil && _styleLayer != nil;
+- (BOOL)_hasInitialized {
+  return _style != nil && _styleLayer != nil;
 }
 
 @end

package/ios/MLRN/MLRNLight.m

@@ -1,38 +1,36 @@
 #import "MLRNLight.h"
 #import "MLRNStyle.h"
 
-@implementation MLRNLight
-{
-    MLNLight *internalLight;
+@implementation MLRNLight {
+  MLNLight *internalLight;
 }
 
-- (void)setReactStyle:(NSDictionary *)reactStyle
-{
-    _reactStyle = reactStyle;
-    
-    if (_map != nil) {
-        [self addStyles];
-    }
-}
+- (void)setReactStyle:(NSDictionary *)reactStyle {
+  _reactStyle = reactStyle;
 
-- (void)setMap:(MLNMapView *)map
-{
-    _map = map;
+  if (_map != nil) {
     [self addStyles];
+  }
+}
+
+- (void)setMap:(MLNMapView *)map {
+  _map = map;
+  [self addStyles];
 }
 
 - (BOOL)isAddedToMap {
-    return _map != NULL;
+  return _map != NULL;
 }
 
-- (void)addStyles
-{
-    MLNLight *light = [[MLNLight alloc] init];
-    MLRNStyle *style = [[MLRNStyle alloc] init];
-    [style lightLayer:light withReactStyle:_reactStyle isValid:^{
-        return [self isAddedToMap];
-    }];
-    _map.style.light = light;
+- (void)addStyles {
+  MLNLight *light = [[MLNLight alloc] init];
+  MLRNStyle *style = [[MLRNStyle alloc] init];
+  [style lightLayer:light
+      withReactStyle:_reactStyle
+             isValid:^{
+               return [self isAddedToMap];
+             }];
+  _map.style.light = light;
 }
 
 @end

package/ios/MLRN/MLRNLightManager.m

@@ -7,9 +7,8 @@ RCT_EXPORT_MODULE()
 
 RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary);
 
-- (UIView*)view
-{
-    return [MLRNLight new];
+- (UIView*)view {
+  return [MLRNLight new];
 }
 
 @end

package/ios/MLRN/MLRNLineLayer.m

@@ -1,25 +1,27 @@
 #import "MLRNLineLayer.h"
-#import "MLRNStyle.h"
 #import <React/RCTLog.h>
+#import "MLRNStyle.h"
 
 @implementation MLRNLineLayer
 
-- (MLNLineStyleLayer*)makeLayer:(MLNStyle*)style
-{
-    MLNSource *source = [self layerWithSourceIDInStyle:style];
-    if (source == nil) { return nil; }
-    MLNLineStyleLayer *layer = [[MLNLineStyleLayer alloc] initWithIdentifier:self.id source:source];
-    layer.sourceLayerIdentifier = self.sourceLayerID;
-    return layer;
+- (MLNLineStyleLayer *)makeLayer:(MLNStyle *)style {
+  MLNSource *source = [self layerWithSourceIDInStyle:style];
+  if (source == nil) {
+    return nil;
+  }
+  MLNLineStyleLayer *layer = [[MLNLineStyleLayer 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 lineLayer:(MLNLineStyleLayer *)self.styleLayer withReactStyle:self.reactStyle isValid:^{
-        return [self isAddedToMap];
-    }];
+- (void)addStyles {
+  MLRNStyle *style = [[MLRNStyle alloc] initWithMLNStyle:self.style];
+  style.bridge = self.bridge;
+  [style lineLayer:(MLNLineStyleLayer *)self.styleLayer
+      withReactStyle:self.reactStyle
+             isValid:^{
+               return [self isAddedToMap];
+             }];
 }
 
 @end

package/ios/MLRN/MLRNLineLayerManager.m

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

package/ios/MLRN/MLRNLocation.h

@@ -1,5 +1,5 @@
-#import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
+#import <Foundation/Foundation.h>
 
 @interface MLRNLocation : NSObject
 

package/ios/MLRN/MLRNLocation.m

@@ -2,23 +2,22 @@
 
 @implementation MLRNLocation
 
-- (NSDictionary<NSString *, id> *)toJSON
-{
-    NSMutableDictionary<NSString *, id> *json = [[NSMutableDictionary alloc] init];
-    
-    NSMutableDictionary<NSString *, NSNumber *> *coords = [[NSMutableDictionary alloc] init];
-    coords[@"longitude"] = @(_location.coordinate.longitude);
-    coords[@"latitude"] = @(_location.coordinate.latitude);
-    coords[@"altitude"] = @(_location.altitude);
-    coords[@"accuracy"] = @(_location.horizontalAccuracy);
-    coords[@"heading"] = @(_heading.trueHeading);
-    coords[@"course"] = @(_location.course);
-    coords[@"speed"] = @(_location.speed);
-    
-    json[@"coords"] = coords;
-    json[@"timestamp"] = @([_location.timestamp timeIntervalSince1970]);
-    
-    return json;
+- (NSDictionary<NSString *, id> *)toJSON {
+  NSMutableDictionary<NSString *, id> *json = [[NSMutableDictionary alloc] init];
+
+  NSMutableDictionary<NSString *, NSNumber *> *coords = [[NSMutableDictionary alloc] init];
+  coords[@"longitude"] = @(_location.coordinate.longitude);
+  coords[@"latitude"] = @(_location.coordinate.latitude);
+  coords[@"altitude"] = @(_location.altitude);
+  coords[@"accuracy"] = @(_location.horizontalAccuracy);
+  coords[@"heading"] = @(_heading.trueHeading);
+  coords[@"course"] = @(_location.course);
+  coords[@"speed"] = @(_location.speed);
+
+  json[@"coords"] = coords;
+  json[@"timestamp"] = @([_location.timestamp timeIntervalSince1970]);
+
+  return json;
 }
 
 @end