@maplibre/maplibre-react-native 10.1.0 → 10.1.1

package/ios/MLRN/MLRNSource.m

@@ -1,135 +1,129 @@
 #import "MLRNSource.h"
+#import <React/RCTLog.h>
 #import <React/UIView+React.h>
 #import "MLRNMapView.h"
-#import <React/RCTLog.h>
 
 @implementation MLRNSource
 
 double const DEFAULT_HITBOX_AREA = 44.0;
 NSString *const DEFAULT_SOURCE_ID = @"composite";
 
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    if (self = [super initWithFrame:frame]) {
-        _layers = [[NSMutableArray alloc] init];
-        _reactSubviews = [[NSMutableArray alloc] init];
-        _hitbox = @{ @"width": @(DEFAULT_HITBOX_AREA), @"height": @(DEFAULT_HITBOX_AREA) };
-    }
-    return self;
+- (instancetype)initWithFrame:(CGRect)frame {
+  if (self = [super initWithFrame:frame]) {
+    _layers = [[NSMutableArray alloc] init];
+    _reactSubviews = [[NSMutableArray alloc] init];
+    _hitbox = @{@"width" : @(DEFAULT_HITBOX_AREA), @"height" : @(DEFAULT_HITBOX_AREA)};
+  }
+  return self;
 }
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
 - (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex {
-    if ([subview isKindOfClass:[MLRNLayer class]]) {
-        MLRNLayer *layer = (MLRNLayer*)subview;
-        
-        if (_map.style != nil) {
-            [layer addToMap:_map style:_map.style];
-        }
-
-        [_layers addObject:layer];
-        [_reactSubviews insertObject:layer atIndex:atIndex];
+  if ([subview isKindOfClass:[MLRNLayer class]]) {
+    MLRNLayer *layer = (MLRNLayer *)subview;
+
+    if (_map.style != nil) {
+      [layer addToMap:_map style:_map.style];
     }
+
+    [_layers addObject:layer];
+    [_reactSubviews insertObject:layer atIndex:atIndex];
+  }
 }
 #pragma clang diagnostic pop
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
 - (void)removeReactSubview:(id<RCTComponent>)subview {
-    if ([subview isKindOfClass:[MLRNLayer class]]) {
-        MLRNLayer *layer = (MLRNLayer*)subview;
-        [layer removeFromMap:_map.style];
-        [_layers removeObject:layer];
-        [_reactSubviews removeObject:layer];
-    }
+  if ([subview isKindOfClass:[MLRNLayer class]]) {
+    MLRNLayer *layer = (MLRNLayer *)subview;
+    [layer removeFromMap:_map.style];
+    [_layers removeObject:layer];
+    [_reactSubviews removeObject:layer];
+  }
 }
 #pragma clang diagnostic pop
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
 - (NSArray<id<RCTComponent>> *)reactSubviews {
-    return _reactSubviews;
+  return _reactSubviews;
 }
 #pragma clang diagnostic pop
 
-- (void)setMap:(MLRNMapView *)map
-{
-    if (map == nil) {
-        [self removeFromMap];
-        _map = nil;
-    } else {
-        _map = map;
-        [self addToMap];
-    }
+- (void)setMap:(MLRNMapView *)map {
+  if (map == nil) {
+    [self removeFromMap];
+    _map = nil;
+  } else {
+    _map = map;
+    [self addToMap];
+  }
 }
 
-- (void)addToMap
-{
-    if (_map.style == nil) {
-        return;
-    }
-    
-    MLNSource *existingSource = [_map.style sourceWithIdentifier:_id];
-    if (existingSource != nil) {
-        _source = existingSource;
+- (void)addToMap {
+  if (_map.style == nil) {
+    return;
+  }
+
+  MLNSource *existingSource = [_map.style sourceWithIdentifier:_id];
+  if (existingSource != nil) {
+    _source = existingSource;
+  } else {
+    _source = [self makeSource];
+    if (_source != nil) {
+      [_map.style addSource:_source];
     } else {
-        _source = [self makeSource];
-        if (_source != nil) {
-            [_map.style addSource:_source];
-        } else {
-            RCTLogError(@"Could not create source with id:%@. Make sure url/shape is provided", _id);
-        }
+      RCTLogError(@"Could not create source with id:%@. Make sure url/shape is provided", _id);
     }
-    
-    if (_layers.count > 0) {
-        for (int i = 0; i < _layers.count; i++) {
-            MLRNLayer *layer = [_layers objectAtIndex:i];
-            [layer addToMap:_map style:_map.style];
-        }
-    }
-}
+  }
 
-- (void)removeFromMap
-{
-    if (_map.style == nil) {
-        return;
-    }
-    
+  if (_layers.count > 0) {
     for (int i = 0; i < _layers.count; i++) {
-        MLRNLayer *layer = [_layers objectAtIndex:i];
-        [layer removeFromMap:_map.style];
+      MLRNLayer *layer = [_layers objectAtIndex:i];
+      [layer addToMap:_map style:_map.style];
     }
-    
-    if (![MLRNSource isDefaultSource:_id]) {
-        if (_source != nil) {
-            [_map.style removeSource:_source];
-        }
+  }
+}
+
+- (void)removeFromMap {
+  if (_map.style == nil) {
+    return;
+  }
+
+  for (int i = 0; i < _layers.count; i++) {
+    MLRNLayer *layer = [_layers objectAtIndex:i];
+    [layer removeFromMap:_map.style];
+  }
+
+  if (![MLRNSource isDefaultSource:_id]) {
+    if (_source != nil) {
+      [_map.style removeSource:_source];
     }
+  }
 }
 
-- (nullable MLNSource*)makeSource
-{
-    @throw [NSException exceptionWithName:NSInternalInconsistencyException
-                        reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]
-                        userInfo:nil];
+- (nullable MLNSource *)makeSource {
+  @throw [NSException
+      exceptionWithName:NSInternalInconsistencyException
+                 reason:[NSString stringWithFormat:@"You must override %@ in a subclass",
+                                                   NSStringFromSelector(_cmd)]
+               userInfo:nil];
 }
 
-- (NSArray<NSString *> *)getLayerIDs
-{
-    NSMutableArray *layerIDs = [[NSMutableArray alloc] init];
-    
-    for (MLRNLayer *layer in _layers) {
-        [layerIDs addObject:layer.id];
-    }
-    
-    return layerIDs;
+- (NSArray<NSString *> *)getLayerIDs {
+  NSMutableArray *layerIDs = [[NSMutableArray alloc] init];
+
+  for (MLRNLayer *layer in _layers) {
+    [layerIDs addObject:layer.id];
+  }
+
+  return layerIDs;
 }
 
-+ (BOOL)isDefaultSource:(NSString *)sourceID
-{
-    return [sourceID isEqualToString:DEFAULT_SOURCE_ID];
++ (BOOL)isDefaultSource:(NSString *)sourceID {
+  return [sourceID isEqualToString:DEFAULT_SOURCE_ID];
 }
 
 @end

package/ios/MLRN/MLRNStyleValue.h

@@ -14,6 +14,6 @@
 - (NSExpression *)getSphericalPosition;
 - (BOOL)isVisible;
 
-+ (MLRNStyleValue*)make:(NSString*)expressionJSONStr;
++ (MLRNStyleValue *)make:(NSString *)expressionJSONStr;
 
 @end

package/ios/MLRN/MLRNStyleValue.m

@@ -1,159 +1,159 @@
 #import "MLRNStyleValue.h"
-#import "MLRNUtils.h"
 #import <React/RCTImageLoader.h>
+#import "MLRNUtils.h"
 
-@implementation MLRNStyleValue
-{
-    NSObject *expressionJSON;
+@implementation MLRNStyleValue {
+  NSObject *expressionJSON;
 }
 
-- (NSExpression *)mlnStyleValue
-{
-    if ([_styleType isEqualToString:@"color"] && [expressionJSON respondsToSelector:@selector(objectEnumerator)] && [[[(NSArray*)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]) {
-        UIColor *color = [MLRNUtils toColor:expressionJSON];
-        return [NSExpression expressionWithMLNJSONObject:color];
-    } else if ([_styleType isEqualToString:@"color"] && [expressionJSON isKindOfClass:[NSNumber class]]) {
-      
-        UIColor *color = [MLRNUtils toColor:expressionJSON];
-        return [NSExpression expressionWithMLNJSONObject:color];
-    } else if ([_styleType isEqualToString:@"vector"] && [expressionJSON respondsToSelector:@selector(objectEnumerator)] && [[[(NSArray*)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]) {
-        CGVector vector = [MLRNUtils toCGVector:(NSArray<NSNumber *> *)expressionJSON];
-        return [NSExpression expressionWithMLNJSONObject:[NSValue valueWithCGVector:vector]];
-    } else if ([_styleType isEqualToString:@"image"] && [expressionJSON isKindOfClass:[NSDictionary class]]) {
-        return [NSExpression expressionForConstantValue:[self getImageURI]];
-    } else if ([_styleType isEqual:@"edgeinsets"] && [expressionJSON respondsToSelector:@selector(objectEnumerator)] && [[[(NSArray*)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]){
-        UIEdgeInsets edgeInsets = [MLRNUtils toUIEdgeInsets:(NSArray<NSNumber *> *)expressionJSON];
-        return [NSExpression expressionWithMLNJSONObject:[NSValue valueWithUIEdgeInsets:edgeInsets]];
-    } else if ([_styleType isEqualToString:@"enum"] && [expressionJSON isKindOfClass:[NSNumber class]]) {
-        // ensure we pass through values as NSUInteger when mapping to an MLN enum
-        NSUInteger uintValue = [(NSNumber*)expressionJSON unsignedIntegerValue];
-        id rawValue = [NSValue value:&uintValue withObjCType:@encode(NSUInteger)];
-        return [NSExpression expressionWithMLNJSONObject:rawValue];
-    } else if ([expressionJSON respondsToSelector:@selector(objectEnumerator)] && [[[(NSArray*)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]) {
-        return [NSExpression expressionForConstantValue:expressionJSON];
-    } else {
-        return [NSExpression expressionWithMLNJSONObject:expressionJSON];
-    }
+- (NSExpression *)mlnStyleValue {
+  if ([_styleType isEqualToString:@"color"] &&
+      [expressionJSON respondsToSelector:@selector(objectEnumerator)] &&
+      [[[(NSArray *)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]) {
+    UIColor *color = [MLRNUtils toColor:expressionJSON];
+    return [NSExpression expressionWithMLNJSONObject:color];
+  } else if ([_styleType isEqualToString:@"color"] &&
+             [expressionJSON isKindOfClass:[NSNumber class]]) {
+    UIColor *color = [MLRNUtils toColor:expressionJSON];
+    return [NSExpression expressionWithMLNJSONObject:color];
+  } else if ([_styleType isEqualToString:@"vector"] &&
+             [expressionJSON respondsToSelector:@selector(objectEnumerator)] &&
+             [[[(NSArray *)expressionJSON objectEnumerator] nextObject]
+                 isKindOfClass:[NSNumber class]]) {
+    CGVector vector = [MLRNUtils toCGVector:(NSArray<NSNumber *> *)expressionJSON];
+    return [NSExpression expressionWithMLNJSONObject:[NSValue valueWithCGVector:vector]];
+  } else if ([_styleType isEqualToString:@"image"] &&
+             [expressionJSON isKindOfClass:[NSDictionary class]]) {
+    return [NSExpression expressionForConstantValue:[self getImageURI]];
+  } else if ([_styleType isEqual:@"edgeinsets"] &&
+             [expressionJSON respondsToSelector:@selector(objectEnumerator)] &&
+             [[[(NSArray *)expressionJSON objectEnumerator] nextObject]
+                 isKindOfClass:[NSNumber class]]) {
+    UIEdgeInsets edgeInsets = [MLRNUtils toUIEdgeInsets:(NSArray<NSNumber *> *)expressionJSON];
+    return [NSExpression expressionWithMLNJSONObject:[NSValue valueWithUIEdgeInsets:edgeInsets]];
+  } else if ([_styleType isEqualToString:@"enum"] &&
+             [expressionJSON isKindOfClass:[NSNumber class]]) {
+    // ensure we pass through values as NSUInteger when mapping to an MLN enum
+    NSUInteger uintValue = [(NSNumber *)expressionJSON unsignedIntegerValue];
+    id rawValue = [NSValue value:&uintValue withObjCType:@encode(NSUInteger)];
+    return [NSExpression expressionWithMLNJSONObject:rawValue];
+  } else if ([expressionJSON respondsToSelector:@selector(objectEnumerator)] &&
+             [[[(NSArray *)expressionJSON objectEnumerator] nextObject]
+                 isKindOfClass:[NSNumber class]]) {
+    return [NSExpression expressionForConstantValue:expressionJSON];
+  } else {
+    return [NSExpression expressionWithMLNJSONObject:expressionJSON];
+  }
 }
 
-- (void)setStyleObject:(NSObject *)object
-{
-    expressionJSON = object;
+- (void)setStyleObject:(NSObject *)object {
+  expressionJSON = object;
 }
 
-- (NSObject *)parse:(NSDictionary *)rawStyleValue
-{
-    NSObject *object = nil;
-    NSString *type = (NSString *)rawStyleValue[@"type"];
-    
-    if ([type isEqualToString:@"string"]) {
-        object = (NSString *)rawStyleValue[@"value"];
-    } else if ([type isEqualToString:@"number"]) {
-        object = (NSNumber *)rawStyleValue[@"value"];
-    } else if ([type isEqualToString:@"boolean"]) {
-        object = rawStyleValue[@"value"];
-    } else if ([type isEqualToString:@"hashmap"]) {
-        NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
-        NSArray *values = (NSArray *)rawStyleValue[@"value"];
-        
-        for (int i = 0; i < values.count; i++) {
-            NSObject *key = [self parse:values[i][0]];
-            NSObject *value = [self parse:values[i][1]];
-            dict[[key mutableCopy]] = value;
-        }
-        
-        object = dict;
-    } else if ([type isEqualToString:@"array"]) {
-        NSMutableArray *arr = [[NSMutableArray alloc] init];
-        NSArray *values = (NSArray *)rawStyleValue[@"value"];
-        
-        for (int i = 0; i < values.count; i++) {
-            [arr addObject:[self parse:values[i]]];
-        }
-        
-        object = arr;
+- (NSObject *)parse:(NSDictionary *)rawStyleValue {
+  NSObject *object = nil;
+  NSString *type = (NSString *)rawStyleValue[@"type"];
+
+  if ([type isEqualToString:@"string"]) {
+    object = (NSString *)rawStyleValue[@"value"];
+  } else if ([type isEqualToString:@"number"]) {
+    object = (NSNumber *)rawStyleValue[@"value"];
+  } else if ([type isEqualToString:@"boolean"]) {
+    object = rawStyleValue[@"value"];
+  } else if ([type isEqualToString:@"hashmap"]) {
+    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
+    NSArray *values = (NSArray *)rawStyleValue[@"value"];
+
+    for (int i = 0; i < values.count; i++) {
+      NSObject *key = [self parse:values[i][0]];
+      NSObject *value = [self parse:values[i][1]];
+      dict[[key mutableCopy]] = value;
     }
-    
-    return object;
-}
 
+    object = dict;
+  } else if ([type isEqualToString:@"array"]) {
+    NSMutableArray *arr = [[NSMutableArray alloc] init];
+    NSArray *values = (NSArray *)rawStyleValue[@"value"];
+
+    for (int i = 0; i < values.count; i++) {
+      [arr addObject:[self parse:values[i]]];
+    }
 
+    object = arr;
+  }
 
-- (BOOL)shouldAddImage
-{
-    NSString *imageURI = [self getImageURI];
-    
-    return [imageURI containsString:@"://"];
+  return object;
 }
 
-- (NSString *)getImageURI
-{
-    if ([expressionJSON isKindOfClass:[NSDictionary class]]) {
-        return [expressionJSON valueForKey:@"uri"];
-    } else if ([expressionJSON isKindOfClass:[NSArray class]]) {
-        return nil;
-    } else {
-        return (NSString *)expressionJSON;
-    }
+- (BOOL)shouldAddImage {
+  NSString *imageURI = [self getImageURI];
+
+  return [imageURI containsString:@"://"];
 }
 
-- (double)getImageScale
-{
-    if ([expressionJSON isKindOfClass:[NSDictionary class]]) {
-        id scale = [expressionJSON valueForKey:@"scale"];
-        if ([scale isKindOfClass:[NSNumber class]]) {
-            return [scale doubleValue];
-        } else {
-            return 1.0;
-        }
+- (NSString *)getImageURI {
+  if ([expressionJSON isKindOfClass:[NSDictionary class]]) {
+    return [expressionJSON valueForKey:@"uri"];
+  } else if ([expressionJSON isKindOfClass:[NSArray class]]) {
+    return nil;
+  } else {
+    return (NSString *)expressionJSON;
+  }
+}
+
+- (double)getImageScale {
+  if ([expressionJSON isKindOfClass:[NSDictionary class]]) {
+    id scale = [expressionJSON valueForKey:@"scale"];
+    if ([scale isKindOfClass:[NSNumber class]]) {
+      return [scale doubleValue];
     } else {
-        return 1.0;
+      return 1.0;
     }
+  } else {
+    return 1.0;
+  }
 }
 
-- (MLNTransition)getTransition
-{
-    if (![expressionJSON isKindOfClass:[NSDictionary class]]) {
-        return MLNTransitionMake(0.f, 0.f);
-    }
-    
-    NSDictionary *config = (NSDictionary *)expressionJSON;
-    double duration = config[@"duration"] != nil ? [config[@"duration"] doubleValue] : 300.0;
-    double delay = config[@"delay"] != nil ? [config[@"delay"] doubleValue] : 0.0;
-
-    const double millisecondsToSeconds = 1.0/1000.0;
-    
-    return MLNTransitionMake(duration * millisecondsToSeconds, delay * millisecondsToSeconds);
+- (MLNTransition)getTransition {
+  if (![expressionJSON isKindOfClass:[NSDictionary class]]) {
+    return MLNTransitionMake(0.f, 0.f);
+  }
+
+  NSDictionary *config = (NSDictionary *)expressionJSON;
+  double duration = config[@"duration"] != nil ? [config[@"duration"] doubleValue] : 300.0;
+  double delay = config[@"delay"] != nil ? [config[@"delay"] doubleValue] : 0.0;
+
+  const double millisecondsToSeconds = 1.0 / 1000.0;
+
+  return MLNTransitionMake(duration * millisecondsToSeconds, delay * millisecondsToSeconds);
 }
 
-- (NSExpression *)getSphericalPosition
-{
-    NSArray *values = (NSArray<NSNumber *> *)expressionJSON;
-    
-    CGFloat radial = [values[0] floatValue];
-    CLLocationDistance azimuthal = [values[1] doubleValue];
-    CLLocationDistance polar = [values[2] doubleValue];
-    
-    MLNSphericalPosition pos = MLNSphericalPositionMake(radial, azimuthal, polar);
-    return [NSExpression expressionWithMLNJSONObject:@(pos)];
+- (NSExpression *)getSphericalPosition {
+  NSArray *values = (NSArray<NSNumber *> *)expressionJSON;
+
+  CGFloat radial = [values[0] floatValue];
+  CLLocationDistance azimuthal = [values[1] doubleValue];
+  CLLocationDistance polar = [values[2] doubleValue];
+
+  MLNSphericalPosition pos = MLNSphericalPositionMake(radial, azimuthal, polar);
+  return [NSExpression expressionWithMLNJSONObject:@(pos)];
 }
 
-- (BOOL)isVisible
-{
-    if ([expressionJSON isKindOfClass:[NSString class]]) {
-        NSString *visible = (NSString *)expressionJSON;
-        return [visible isEqualToString:@"visible"];
-    }
-    return YES;
+- (BOOL)isVisible {
+  if ([expressionJSON isKindOfClass:[NSString class]]) {
+    NSString *visible = (NSString *)expressionJSON;
+    return [visible isEqualToString:@"visible"];
+  }
+  return YES;
 }
 
-+ (MLRNStyleValue*)make:(NSDictionary*)rawStyleValue;
++ (MLRNStyleValue *)make:(NSDictionary *)rawStyleValue;
 {
-    MLRNStyleValue *styleValue = [[MLRNStyleValue alloc] init];
-    styleValue.styleType = (NSString *)rawStyleValue[@"styletype"];
-    NSObject *object = [styleValue parse:(NSDictionary *)rawStyleValue[@"stylevalue"]];
-    [styleValue setStyleObject:object];
-    return styleValue;
+  MLRNStyleValue *styleValue = [[MLRNStyleValue alloc] init];
+  styleValue.styleType = (NSString *)rawStyleValue[@"styletype"];
+  NSObject *object = [styleValue parse:(NSDictionary *)rawStyleValue[@"stylevalue"]];
+  [styleValue setStyleObject:object];
+  return styleValue;
 }
 
 @end

package/ios/MLRN/MLRNSymbolLayer.m

@@ -5,21 +5,25 @@
 
 @implementation MLRNSymbolLayer
 
-- (MLNSymbolStyleLayer*)makeLayer:(MLNStyle*)style
-{
-    MLNSource *source = [self layerWithSourceIDInStyle: style];
-    if (source == nil) { return nil; }
-    MLNSymbolStyleLayer *layer = [[MLNSymbolStyleLayer alloc] initWithIdentifier:self.id source:source];
-    layer.sourceLayerIdentifier = self.sourceLayerID;
-    return layer;
+- (MLNSymbolStyleLayer *)makeLayer:(MLNStyle *)style {
+  MLNSource *source = [self layerWithSourceIDInStyle:style];
+  if (source == nil) {
+    return nil;
+  }
+  MLNSymbolStyleLayer *layer = [[MLNSymbolStyleLayer 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 symbolLayer:(MLNSymbolStyleLayer*)self.styleLayer withReactStyle:self.reactStyle isValid:^{ return [self isAddedToMap];
-    }];
+- (void)addStyles {
+  MLRNStyle *style = [[MLRNStyle alloc] initWithMLNStyle:self.style];
+  style.bridge = self.bridge;
+  [style symbolLayer:(MLNSymbolStyleLayer *)self.styleLayer
+      withReactStyle:self.reactStyle
+             isValid:^{
+               return [self isAddedToMap];
+             }];
 }
 
 @end

package/ios/MLRN/MLRNSymbolLayerManager.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
-{
-    MLRNSymbolLayer *layer = [MLRNSymbolLayer new];
-    layer.bridge = self.bridge;
-    return layer;
+- (UIView *)view {
+  MLRNSymbolLayer *layer = [MLRNSymbolLayer new];
+  layer.bridge = self.bridge;
+  return layer;
 }
 
 @end

package/ios/MLRN/MLRNTileSource.h

@@ -17,6 +17,6 @@
 
 @property (nonatomic, assign) BOOL tms;
 
-- (NSDictionary<MLNTileSourceOption, id>*)getOptions;
+- (NSDictionary<MLNTileSourceOption, id> *)getOptions;
 
 @end

package/ios/MLRN/MLRNTileSource.m

@@ -7,25 +7,26 @@
 
 @implementation MLRNTileSource
 
-- (NSDictionary<MLNTileSourceOption, id>*)getOptions {
-    NSMutableDictionary<MLNTileSourceOption, id> *options = [[NSMutableDictionary alloc] init];
-    
-    if (self.maxZoomLevel != nil) {
-        options[MLNTileSourceOptionMaximumZoomLevel] = self.maxZoomLevel;
-    }
-    
-    if (self.minZoomLevel != nil) {
-        options[MLNTileSourceOptionMinimumZoomLevel] = self.minZoomLevel;
-    }
-    
-    if (self.tms) {
-        options[MLNTileSourceOptionTileCoordinateSystem] = [NSNumber numberWithUnsignedInteger:MLNTileCoordinateSystemTMS];
-    }
-    
-    if (self.attribution != nil) {
-        options[MLNTileSourceOptionAttributionHTMLString] = self.attribution;
-    }
-    
-    return options;
+- (NSDictionary<MLNTileSourceOption, id> *)getOptions {
+  NSMutableDictionary<MLNTileSourceOption, id> *options = [[NSMutableDictionary alloc] init];
+
+  if (self.maxZoomLevel != nil) {
+    options[MLNTileSourceOptionMaximumZoomLevel] = self.maxZoomLevel;
+  }
+
+  if (self.minZoomLevel != nil) {
+    options[MLNTileSourceOptionMinimumZoomLevel] = self.minZoomLevel;
+  }
+
+  if (self.tms) {
+    options[MLNTileSourceOptionTileCoordinateSystem] =
+        [NSNumber numberWithUnsignedInteger:MLNTileCoordinateSystemTMS];
+  }
+
+  if (self.attribution != nil) {
+    options[MLNTileSourceOptionAttributionHTMLString] = self.attribution;
+  }
+
+  return options;
 }
 @end

package/ios/MLRN/MLRNUserLocation.h

@@ -2,8 +2,8 @@
 //  MLRNUserLocation.h
 //  MLRN
 
-#import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
+#import <Foundation/Foundation.h>
 #import <MapLibre/MLNUserLocationAnnotationView.h>
 
 @interface MLRNUserLocation : NSObject