@maplibre/maplibre-react-native 10.1.0 → 10.1.1

package/ios/MLRN/MLRNCustomHeaders.m

@@ -5,94 +5,94 @@
 
 #import <objc/runtime.h>
 
-#import "MLRNCustomHeaders.h"
-#import <MapLibre/MapLibre.h>
 #import <MapLibre/MLNNetworkConfiguration.h>
+#import <MapLibre/MapLibre.h>
+#import "MLRNCustomHeaders.h"
 
 @implementation NSMutableURLRequest (CustomHeaders)
 
-    +(NSMutableURLRequest*) __swizzle_requestWithURL:(NSURL*)url {
-        if([url.scheme isEqualToString:@"ws"]) {
-            return [NSMutableURLRequest __swizzle_requestWithURL:url];
-        }
-
-        NSArray<NSString*>* stack = [NSThread callStackSymbols];
-        if ([stack count] < 2) {
-            return [NSMutableURLRequest __swizzle_requestWithURL:url];
-        }
-
-        if ([stack[1] containsString:@"MapLibre"] == NO) {
-            return [NSMutableURLRequest __swizzle_requestWithURL:url];
-        }
-
-        NSMutableURLRequest *req = [NSMutableURLRequest __swizzle_requestWithURL:url];
-        NSDictionary<NSString*, NSString*> *currentHeaders = [[[MLRNCustomHeaders sharedInstance] currentHeaders] copy];
-        if(currentHeaders != nil && [currentHeaders count]>0) {
-            for (NSString* headerName in currentHeaders) {
-                id headerValue = currentHeaders[headerName];
-                [req setValue:headerValue forHTTPHeaderField:headerName];
-            }
-        }
-        return req;
++ (NSMutableURLRequest *)__swizzle_requestWithURL:(NSURL *)url {
+  if ([url.scheme isEqualToString:@"ws"]) {
+    return [NSMutableURLRequest __swizzle_requestWithURL:url];
+  }
+
+  NSArray<NSString *> *stack = [NSThread callStackSymbols];
+  if ([stack count] < 2) {
+    return [NSMutableURLRequest __swizzle_requestWithURL:url];
+  }
+
+  if ([stack[1] containsString:@"MapLibre"] == NO) {
+    return [NSMutableURLRequest __swizzle_requestWithURL:url];
+  }
+
+  NSMutableURLRequest *req = [NSMutableURLRequest __swizzle_requestWithURL:url];
+  NSDictionary<NSString *, NSString *> *currentHeaders =
+      [[[MLRNCustomHeaders sharedInstance] currentHeaders] copy];
+  if (currentHeaders != nil && [currentHeaders count] > 0) {
+    for (NSString *headerName in currentHeaders) {
+      id headerValue = currentHeaders[headerName];
+      [req setValue:headerValue forHTTPHeaderField:headerName];
     }
+  }
+  return req;
+}
 
 @end
 
 @implementation MLRNCustomHeaders {
-    NSMutableDictionary<NSString*, NSString*> *_currentHeaders;
-    BOOL areHeadersAdded;
+  NSMutableDictionary<NSString *, NSString *> *_currentHeaders;
+  BOOL areHeadersAdded;
 }
 
-+ (id)sharedInstance
-{
-    static MLRNCustomHeaders *customHeaders;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{ customHeaders = [[self alloc] init]; });
-    return customHeaders;
++ (id)sharedInstance {
+  static MLRNCustomHeaders *customHeaders;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    customHeaders = [[self alloc] init];
+  });
+  return customHeaders;
 }
 
 // This replaces the [NSMutableURLRequest requestWithURL:] with custom implementation which
 // adds runtime headers copied from [MLRNCustomHeaders _currentHeaders]
--(void)initHeaders
-{
-    if (!areHeadersAdded) {
-        areHeadersAdded = YES;
-        NSLog(@"Replace method [NSMutableURLRequest requestWithURL]");
-        static dispatch_once_t onceToken;
-        dispatch_once(&onceToken, ^{
-            Class targetClass = [NSMutableURLRequest class];
-            Method oldMethod = class_getClassMethod(targetClass, @selector(requestWithURL:));
-            Method newMethod = class_getClassMethod(targetClass, @selector(__swizzle_requestWithURL:));
-            method_exchangeImplementations(oldMethod, newMethod);
-        });
-    }
+- (void)initHeaders {
+  if (!areHeadersAdded) {
+    areHeadersAdded = YES;
+    NSLog(@"Replace method [NSMutableURLRequest requestWithURL]");
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+      Class targetClass = [NSMutableURLRequest class];
+      Method oldMethod = class_getClassMethod(targetClass, @selector(requestWithURL:));
+      Method newMethod = class_getClassMethod(targetClass, @selector(__swizzle_requestWithURL:));
+      method_exchangeImplementations(oldMethod, newMethod);
+    });
+  }
 }
 
-- (instancetype)init
-{
-    if (self = [super init]) {
-        _currentHeaders = [[NSMutableDictionary alloc] init];
-        areHeadersAdded = NO;
-    }
-    return self;
+- (instancetype)init {
+  if (self = [super init]) {
+    _currentHeaders = [[NSMutableDictionary alloc] init];
+    areHeadersAdded = NO;
+  }
+  return self;
 }
 
 - (void)addHeader:(NSString *)value forHeaderName:(NSString *)headerName {
+  if (!areHeadersAdded) {
+    areHeadersAdded = YES;
+  }
 
-    if(!areHeadersAdded) {
-        areHeadersAdded = YES;
-    }
-
-    [_currentHeaders setObject:value forKey:headerName];
-    [[[MLNNetworkConfiguration sharedManager] sessionConfiguration] setHTTPAdditionalHeaders:_currentHeaders];
+  [_currentHeaders setObject:value forKey:headerName];
+  [[[MLNNetworkConfiguration sharedManager] sessionConfiguration]
+      setHTTPAdditionalHeaders:_currentHeaders];
 }
 
 - (void)removeHeader:(NSString *)header {
-    if(!areHeadersAdded) {
-        return;
-    }
+  if (!areHeadersAdded) {
+    return;
+  }
 
-    [_currentHeaders removeObjectForKey:header];
+  [_currentHeaders removeObjectForKey:header];
 }
 
 @end

package/ios/MLRN/MLRNEvent.h

@@ -1,13 +1,13 @@
 #import <Foundation/Foundation.h>
 #import "MLRNEventProtocol.h"
 
-@interface MLRNEvent : NSObject<MLRNEventProtocol>
+@interface MLRNEvent : NSObject <MLRNEventProtocol>
 
 @property (nonatomic, copy) NSString *type;
 @property (nonatomic, strong) NSDictionary *payload;
 @property (nonatomic, readonly) NSTimeInterval timestamp;
 
-+ (MLRNEvent*)makeEvent:(NSString*)eventType;
-+ (MLRNEvent*)makeEvent:(NSString*)eventType withPayload:(NSDictionary*)payload;
++ (MLRNEvent *)makeEvent:(NSString *)eventType;
++ (MLRNEvent *)makeEvent:(NSString *)eventType withPayload:(NSDictionary *)payload;
 
 @end

package/ios/MLRN/MLRNEvent.m

@@ -2,38 +2,33 @@
 
 @implementation MLRNEvent
 
-- (instancetype)init
-{
-    if (self = [super init]) {
-        _timestamp = [[NSDate date] timeIntervalSince1970];
-    }
-    return self;
+- (instancetype)init {
+  if (self = [super init]) {
+    _timestamp = [[NSDate date] timeIntervalSince1970];
+  }
+  return self;
 }
 
-- (NSDictionary*)payload
-{
-    if (_payload == nil) {
-        return @{};
-    }
-    return _payload;
+- (NSDictionary *)payload {
+  if (_payload == nil) {
+    return @{};
+  }
+  return _payload;
 }
 
-- (NSDictionary*)toJSON
-{
-    return @{ @"type": self.type, @"payload": self.payload };
+- (NSDictionary *)toJSON {
+  return @{@"type" : self.type, @"payload" : self.payload};
 }
 
-+ (MLRNEvent*)makeEvent:(NSString*)type
-{
-    return [MLRNEvent makeEvent:type withPayload:@{}];
++ (MLRNEvent *)makeEvent:(NSString *)type {
+  return [MLRNEvent makeEvent:type withPayload:@{}];
 }
 
-+ (MLRNEvent*)makeEvent:(NSString*)type withPayload:(NSDictionary*)payload
-{
-    MLRNEvent *event = [[MLRNEvent alloc] init];
-    event.type = type;
-    event.payload = payload;
-    return event;
++ (MLRNEvent *)makeEvent:(NSString *)type withPayload:(NSDictionary *)payload {
+  MLRNEvent *event = [[MLRNEvent alloc] init];
+  event.type = type;
+  event.payload = payload;
+  return event;
 }
 
 @end

package/ios/MLRN/MLRNEventProtocol.h

@@ -3,6 +3,6 @@
 @property (nonatomic, copy) NSString *type;
 @property (nonatomic, strong) NSDictionary *payload;
 
-- (NSDictionary*)toJSON;
+- (NSDictionary *)toJSON;
 
 @end

package/ios/MLRN/MLRNFillExtrusionLayer.m

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

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

package/ios/MLRN/MLRNFillLayer.m

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

package/ios/MLRN/MLRNFillLayerManager.m

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

package/ios/MLRN/MLRNHeatmapLayer.m

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

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

package/ios/MLRN/MLRNImageQueue.h

@@ -6,6 +6,9 @@
 + (instancetype)sharedInstance;
 
 - (void)cancelAllOperations;
-- (void)addImage:(NSString *)imageURL scale:(double)scale bridge:(RCTBridge *)bridge completionHandler:(RCTImageLoaderCompletionBlock)handler;
+- (void)addImage:(NSString *)imageURL
+                scale:(double)scale
+               bridge:(RCTBridge *)bridge
+    completionHandler:(RCTImageLoaderCompletionBlock)handler;
 
 @end

package/ios/MLRN/MLRNImageQueue.m

@@ -2,48 +2,45 @@
 #import "MLRNImageQueueOperation.h"
 #import "MLRNUtils.h"
 
-@implementation MLRNImageQueue
-{
-    NSOperationQueue *imageQueue;
+@implementation MLRNImageQueue {
+  NSOperationQueue *imageQueue;
 }
 
-- (id)init
-{
-    if (self = [super init]) {
-        imageQueue = [[NSOperationQueue alloc] init];
-        imageQueue.name = @"org.maplibre.reactnative.DownloadImageQueue";
-    }
-    return self;
+- (id)init {
+  if (self = [super init]) {
+    imageQueue = [[NSOperationQueue alloc] init];
+    imageQueue.name = @"org.maplibre.reactnative.DownloadImageQueue";
+  }
+  return self;
 }
 
-- (void)dealloc
-{
-    [self cancelAllOperations];
+- (void)dealloc {
+  [self cancelAllOperations];
 }
 
-+ (instancetype)sharedInstance
-{
-    static MLRNImageQueue *sharedInstance = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sharedInstance = [[MLRNImageQueue alloc] init];
-    });
-    return sharedInstance;
++ (instancetype)sharedInstance {
+  static MLRNImageQueue *sharedInstance = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    sharedInstance = [[MLRNImageQueue alloc] init];
+  });
+  return sharedInstance;
 }
 
-- (void)cancelAllOperations
-{
-    [imageQueue cancelAllOperations];
+- (void)cancelAllOperations {
+  [imageQueue cancelAllOperations];
 }
 
-- (void)addImage:(NSString *)imageURL scale:(double)scale bridge:(RCTBridge *)bridge completionHandler:(RCTImageLoaderCompletionBlock)handler
-{
-    MLRNImageQueueOperation *operation = [[MLRNImageQueueOperation alloc] init];
-    operation.bridge = bridge;
-    operation.urlRequest = [RCTConvert NSURLRequest:imageURL];
-    operation.completionHandler = handler;
-    operation.scale = scale;
-    [imageQueue addOperation:operation];
+- (void)addImage:(NSString *)imageURL
+                scale:(double)scale
+               bridge:(RCTBridge *)bridge
+    completionHandler:(RCTImageLoaderCompletionBlock)handler {
+  MLRNImageQueueOperation *operation = [[MLRNImageQueueOperation alloc] init];
+  operation.bridge = bridge;
+  operation.urlRequest = [RCTConvert NSURLRequest:imageURL];
+  operation.completionHandler = handler;
+  operation.scale = scale;
+  [imageQueue addOperation:operation];
 }
 
 @end

package/ios/MLRN/MLRNImageQueueOperation.h

@@ -5,6 +5,6 @@
 @property (nonatomic, weak) RCTBridge *bridge;
 @property (nonatomic, copy) RCTImageLoaderCompletionBlock completionHandler;
 @property (nonatomic, copy) NSURLRequest *urlRequest;
-@property (nonatomic)       double scale;
+@property (nonatomic) double scale;
 
 @end