@maplibre/maplibre-react-native 10.1.0 → 10.1.1

package/ios/MLRN/MLRNLocationManager.m

@@ -1,172 +1,157 @@
-#import <CoreLocation/CoreLocation.h>
 #import "MLRNLocationManager.h"
+#import <CoreLocation/CoreLocation.h>
 
-@interface MLRNLocationManager()<CLLocationManagerDelegate>
+@interface MLRNLocationManager () <CLLocationManagerDelegate>
 @end
 
-@implementation MLRNLocationManager
-{
-    CLLocationManager *locationManager;
-    CLLocation *lastKnownLocation;
-    CLHeading *lastKnownHeading;
-    CLLocationDistance displacement;
-    NSMutableArray<MLRNLocationBlock> *listeners;
-    BOOL isListening;
-}
-
-+ (id)sharedInstance
-{
-    static MLRNLocationManager *manager = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{ manager = [[self alloc] init]; });
-    return manager;
-}
-
-- (instancetype)init
-{
-    if (self = [super init]) {
-        [self _setupLocationManager];
-        listeners = [[NSMutableArray alloc] init];
-        displacement = 0.0;
-    }
-    return self;
+@implementation MLRNLocationManager {
+  CLLocationManager *locationManager;
+  CLLocation *lastKnownLocation;
+  CLHeading *lastKnownHeading;
+  CLLocationDistance displacement;
+  NSMutableArray<MLRNLocationBlock> *listeners;
+  BOOL isListening;
+}
+
++ (id)sharedInstance {
+  static MLRNLocationManager *manager = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    manager = [[self alloc] init];
+  });
+  return manager;
 }
 
-- (void)dealloc
-{
-    locationManager.delegate = nil;
-    [self stop];
+- (instancetype)init {
+  if (self = [super init]) {
+    [self _setupLocationManager];
+    listeners = [[NSMutableArray alloc] init];
+    displacement = 0.0;
+  }
+  return self;
 }
 
-- (void)start:(CLLocationDistance)minDisplacement
-{
+- (void)dealloc {
+  locationManager.delegate = nil;
+  [self stop];
+}
 
-    displacement = minDisplacement;
+- (void)start:(CLLocationDistance)minDisplacement {
+  displacement = minDisplacement;
 
-    if ([self isEnabled]) {
-        return;
-    }
+  if ([self isEnabled]) {
+    return;
+  }
 
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self->locationManager requestWhenInUseAuthorization];
-        [self->locationManager startUpdatingLocation];
-        [self->locationManager startUpdatingHeading];
-        [self->locationManager setDistanceFilter:(minDisplacement)];
-        self->isListening = YES;
-    });
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self->locationManager requestWhenInUseAuthorization];
+    [self->locationManager startUpdatingLocation];
+    [self->locationManager startUpdatingHeading];
+    [self->locationManager setDistanceFilter:(minDisplacement)];
+    self->isListening = YES;
+  });
 }
 
-- (void)setMinDisplacement:(CLLocationDistance)minDisplacement
-{
-
-    displacement = minDisplacement;
+- (void)setMinDisplacement:(CLLocationDistance)minDisplacement {
+  displacement = minDisplacement;
 
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self->locationManager setDistanceFilter:(minDisplacement)];
-    });
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self->locationManager setDistanceFilter:(minDisplacement)];
+  });
 }
 
-- (void)stop
-{
-    if (![self isEnabled]) {
-        return;
-    }
+- (void)stop {
+  if (![self isEnabled]) {
+    return;
+  }
 
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self->locationManager stopUpdatingLocation];
-        [self->locationManager stopUpdatingHeading];
-        self->isListening = NO;
-    });
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self->locationManager stopUpdatingLocation];
+    [self->locationManager stopUpdatingHeading];
+    self->isListening = NO;
+  });
 }
 
-- (BOOL)isEnabled
-{
-    return isListening;
+- (BOOL)isEnabled {
+  return isListening;
 }
 
-- (MLRNLocation *)getLastKnownLocation
-{
-    CLLocation* newLastLocation = locationManager.location;
-    if (newLastLocation) {
-      lastKnownLocation = newLastLocation;
-    }
-    MLRNLocation *location = [self _convertToMapboxLocation:lastKnownLocation];
-    return location;
+- (MLRNLocation *)getLastKnownLocation {
+  CLLocation *newLastLocation = locationManager.location;
+  if (newLastLocation) {
+    lastKnownLocation = newLastLocation;
+  }
+  MLRNLocation *location = [self _convertToMapboxLocation:lastKnownLocation];
+  return location;
 }
 
-- (void)addListener:(MLRNLocationBlock)listener
-{
-    if (![listeners containsObject:listener]) {
-        [listeners addObject:listener];
-    }
+- (void)addListener:(MLRNLocationBlock)listener {
+  if (![listeners containsObject:listener]) {
+    [listeners addObject:listener];
+  }
 }
 
-- (void)removeListener:(MLRNLocationBlock)listener
-{
-    NSUInteger indexOf = [listeners indexOfObject:listener];
+- (void)removeListener:(MLRNLocationBlock)listener {
+  NSUInteger indexOf = [listeners indexOfObject:listener];
 
-    if (indexOf == NSNotFound) {
-        return;
-    }
+  if (indexOf == NSNotFound) {
+    return;
+  }
 
-    [listeners removeObjectAtIndex:indexOf];
+  [listeners removeObjectAtIndex:indexOf];
 }
 
-- (void)locationManager:(CLLocationManager *)manager didUpdateHeading:(CLHeading *)heading
-{
-    lastKnownHeading = heading;
+- (void)locationManager:(CLLocationManager *)manager didUpdateHeading:(CLHeading *)heading {
+  lastKnownHeading = heading;
 
-    if (displacement > 0) {
-      return;
-    }
+  if (displacement > 0) {
+    return;
+  }
 
-    [self _updateDelegate];
+  [self _updateDelegate];
 }
 
-- (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray<CLLocation *> *)locations
-{
-    lastKnownLocation = [locations lastObject];
-    [self _updateDelegate];
+- (void)locationManager:(CLLocationManager *)manager
+     didUpdateLocations:(NSArray<CLLocation *> *)locations {
+  lastKnownLocation = [locations lastObject];
+  [self _updateDelegate];
 }
 
-- (void)_setupLocationManager
-{
-    __weak MLRNLocationManager *weakSelf = self;
+- (void)_setupLocationManager {
+  __weak MLRNLocationManager *weakSelf = self;
 
-    dispatch_async(dispatch_get_main_queue(), ^{
-        self->locationManager = [[CLLocationManager alloc] init];
-        self->locationManager.delegate = weakSelf;
-    });
+  dispatch_async(dispatch_get_main_queue(), ^{
+    self->locationManager = [[CLLocationManager alloc] init];
+    self->locationManager.delegate = weakSelf;
+  });
 }
 
-- (void)_updateDelegate
-{
-    if (_delegate == nil) {
-        return;
-    }
+- (void)_updateDelegate {
+  if (_delegate == nil) {
+    return;
+  }
 
-    MLRNLocation *userLocation = [self _convertToMapboxLocation:lastKnownLocation];
+  MLRNLocation *userLocation = [self _convertToMapboxLocation:lastKnownLocation];
 
-    if (listeners.count > 0) {
-        for (int i = 0; i < listeners.count; i++) {
-            MLRNLocationBlock listener = listeners[i];
-            listener(userLocation);
-        }
+  if (listeners.count > 0) {
+    for (int i = 0; i < listeners.count; i++) {
+      MLRNLocationBlock listener = listeners[i];
+      listener(userLocation);
     }
+  }
 
-    [_delegate locationManager:self didUpdateLocation:userLocation];
+  [_delegate locationManager:self didUpdateLocation:userLocation];
 }
 
-- (MLRNLocation *)_convertToMapboxLocation:(CLLocation *)location
-{
-    if (location == nil) {
-        return nil;
-    }
+- (MLRNLocation *)_convertToMapboxLocation:(CLLocation *)location {
+  if (location == nil) {
+    return nil;
+  }
 
-    MLRNLocation *userLocation = [[MLRNLocation alloc] init];
-    userLocation.location = location;
-    userLocation.heading = lastKnownHeading;
-    return userLocation;
+  MLRNLocation *userLocation = [[MLRNLocation alloc] init];
+  userLocation.location = location;
+  userLocation.heading = lastKnownHeading;
+  return userLocation;
 }
 
 @end

package/ios/MLRN/MLRNLocationManagerDelegate.h

@@ -4,9 +4,9 @@
 
 @class MLRNLocationManager;
 
-@protocol MLRNLocationManagerDelegate<NSObject>
+@protocol MLRNLocationManagerDelegate <NSObject>
 
-- (void)locationManager:(MLRNLocationManager *)locationManager didUpdateLocation:(MLRNLocation *)location;
+- (void)locationManager:(MLRNLocationManager *)locationManager
+      didUpdateLocation:(MLRNLocation *)location;
 
 @end
-

package/ios/MLRN/MLRNLocationModule.h

@@ -2,6 +2,6 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 
-@interface MLRNLocationModule : RCTEventEmitter<RCTBridgeModule>
+@interface MLRNLocationModule : RCTEventEmitter <RCTBridgeModule>
 
 @end

package/ios/MLRN/MLRNLocationModule.m

@@ -1,91 +1,76 @@
 #import <CoreLocation/CoreLocation.h>
 
+#import "MLRNEventTypes.h"
 #import "MLRNLocation.h"
-#import "MLRNLocationModule.h"
 #import "MLRNLocationManager.h"
 #import "MLRNLocationManagerDelegate.h"
-#import "MLRNEventTypes.h"
+#import "MLRNLocationModule.h"
 
-@interface MLRNLocationModule() <MLRNLocationManagerDelegate>
+@interface MLRNLocationModule () <MLRNLocationManagerDelegate>
 @end
 
-@implementation MLRNLocationModule
-{
-    MLRNLocationManager *locationManager;
-    BOOL hasListeners;
+@implementation MLRNLocationModule {
+  MLRNLocationManager *locationManager;
+  BOOL hasListeners;
 }
 
 RCT_EXPORT_MODULE();
 
-+ (BOOL)requiresMainQueueSetup
-{
-    return NO;
++ (BOOL)requiresMainQueueSetup {
+  return NO;
 }
 
-- (instancetype)init
-{
-    if (self = [super init]) {
-        locationManager = [[MLRNLocationManager alloc] init];
-        locationManager.delegate = self;
-    }
-    return self;
+- (instancetype)init {
+  if (self = [super init]) {
+    locationManager = [[MLRNLocationManager alloc] init];
+    locationManager.delegate = self;
+  }
+  return self;
 }
 
-- (void)startObserving
-{
-    [super startObserving];
-    hasListeners = YES;
+- (void)startObserving {
+  [super startObserving];
+  hasListeners = YES;
 }
 
-- (void)stopObserving
-{
-    [super stopObserving];
-    hasListeners = NO;
+- (void)stopObserving {
+  [super stopObserving];
+  hasListeners = NO;
 }
 
-- (NSArray<NSString *> *)supportedEvents
-{
-    return @[RCT_MAPBOX_USER_LOCATION_UPDATE];
+- (NSArray<NSString *> *)supportedEvents {
+  return @[ RCT_MAPBOX_USER_LOCATION_UPDATE ];
 }
 
-RCT_EXPORT_METHOD(start:(CLLocationDistance)minDisplacement)
-{
+RCT_EXPORT_METHOD(start : (CLLocationDistance)minDisplacement) {
   [locationManager start:minDisplacement];
 }
 
-RCT_EXPORT_METHOD(pause)
-{
-    [locationManager stop];
-}
+RCT_EXPORT_METHOD(pause) { [locationManager stop]; }
 
-RCT_EXPORT_METHOD(stop)
-{
-    [locationManager stop];
-}
+RCT_EXPORT_METHOD(stop) { [locationManager stop]; }
 
-RCT_EXPORT_METHOD(setMinDisplacement:(CLLocationDistance)minDisplacement)
-{
-    [locationManager setMinDisplacement:minDisplacement];
+RCT_EXPORT_METHOD(setMinDisplacement : (CLLocationDistance)minDisplacement) {
+  [locationManager setMinDisplacement:minDisplacement];
 }
 
-RCT_EXPORT_METHOD(getLastKnownLocation:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
-    MLRNLocation *lastKnownLocation = [locationManager getLastKnownLocation];
-    resolve(lastKnownLocation);
+RCT_EXPORT_METHOD(getLastKnownLocation : (RCTPromiseResolveBlock)
+                      resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  MLRNLocation *lastKnownLocation = [locationManager getLastKnownLocation];
+  resolve(lastKnownLocation);
 }
 
-- (void)locationManager:(MLRNLocationManager *)locationManager didUpdateLocation:(MLRNLocation *)location
-{
-    if (!hasListeners) {
-        return;
-    }
+- (void)locationManager:(MLRNLocationManager *)locationManager
+      didUpdateLocation:(MLRNLocation *)location {
+  if (!hasListeners) {
+    return;
+  }
 
-    if (self.bridge == nil) {
-        return;
-    }
+  if (self.bridge == nil) {
+    return;
+  }
 
-    [self sendEventWithName:RCT_MAPBOX_USER_LOCATION_UPDATE body:[location toJSON]];
+  [self sendEventWithName:RCT_MAPBOX_USER_LOCATION_UPDATE body:[location toJSON]];
 }
 
 @end
-

package/ios/MLRN/MLRNLogging.h

@@ -4,14 +4,11 @@
 #import <Foundation/Foundation.h>
 #import <React/RCTEventEmitter.h>
 
-
 @class MLNLoggingConfiguration;
 
 @interface MLRNLogging : RCTEventEmitter <RCTBridgeModule>
 
-@property (nonatomic, nonnull) MLNLoggingConfiguration*  loggingConfiguration;
-
-- (void)setLoggingLevel:(nonnull NSString*) logLevel;
+@property (nonatomic, nonnull) MLNLoggingConfiguration* loggingConfiguration;
 
 @end
 

package/ios/MLRN/MLRNLogging.m

@@ -2,131 +2,126 @@
 
 @import MapLibre;
 
-@interface MLRNLogging()
+@interface MLRNLogging ()
 @property (nonatomic) BOOL hasListeners;
 @end
 
 @implementation MLRNLogging
 
 + (id)allocWithZone:(NSZone *)zone {
-    static MLRNLogging *sharedInstance = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sharedInstance = [super allocWithZone:zone];
-    });
-    return sharedInstance;
+  static MLRNLogging *sharedInstance = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    sharedInstance = [super allocWithZone:zone];
+  });
+  return sharedInstance;
 }
 
--(id)init {
-    if ( self = [super init] ) {
-        self.loggingConfiguration = [MLNLoggingConfiguration sharedConfiguration];
-        [self.loggingConfiguration  setLoggingLevel:MLNLoggingLevelWarning];
-        __weak typeof(self) weakSelf = self;
-        self.loggingConfiguration.handler = ^(MLNLoggingLevel loggingLevel, NSString *filePath, NSUInteger line, NSString *message) {
-            [weakSelf sendLogWithLevel:loggingLevel filePath: filePath line: line message: message];
+- (id)init {
+  if (self = [super init]) {
+    self.loggingConfiguration = [MLNLoggingConfiguration sharedConfiguration];
+    [self.loggingConfiguration setLoggingLevel:MLNLoggingLevelWarning];
+    __weak typeof(self) weakSelf = self;
+    self.loggingConfiguration.handler =
+        ^(MLNLoggingLevel loggingLevel, NSString *filePath, NSUInteger line, NSString *message) {
+          [weakSelf sendLogWithLevel:loggingLevel filePath:filePath line:line message:message];
         };
-    }
-    return self;
+  }
+  return self;
 }
 
 RCT_EXPORT_MODULE();
 
-+ (BOOL)requiresMainQueueSetup
-{
-    return YES;
++ (BOOL)requiresMainQueueSetup {
+  return YES;
 }
 
-- (NSArray<NSString *> *)supportedEvents
-{
-  return @[@"LogEvent"];
+- (NSArray<NSString *> *)supportedEvents {
+  return @[ @"LogEvent" ];
 }
 
-- (void)startObserving
-{
-    [super startObserving];
-    self.hasListeners = true;
+- (void)startObserving {
+  [super startObserving];
+  self.hasListeners = true;
 }
 
-- (void)stopObserving
-{
-    [super stopObserving];
-    self.hasListeners = false;
+- (void)stopObserving {
+  [super stopObserving];
+  self.hasListeners = false;
 }
 
-- (void)sendLogWithLevel:(MLNLoggingLevel)loggingLevel filePath:(NSString*)filePath line:(NSUInteger)line message:(NSString*)message
-{
-    if (!self.hasListeners) return;
+- (void)sendLogWithLevel:(MLNLoggingLevel)loggingLevel
+                filePath:(NSString *)filePath
+                    line:(NSUInteger)line
+                 message:(NSString *)message {
+  if (!self.hasListeners) return;
 
-    NSString* level = @"n/a";
-    switch (loggingLevel) {
+  NSString *level = @"n/a";
+  switch (loggingLevel) {
     case MLNLoggingLevelInfo:
-        level = @"info";
-        break;
+      level = @"info";
+      break;
     case MLNLoggingLevelError:
-        level = @"error";
-        break;
+      level = @"error";
+      break;
 #if MLN_LOGGING_ENABLE_DEBUG
     case MLNLoggingLevelDebug:
-        level = @"debug";
-        break;
+      level = @"debug";
+      break;
 #endif
     case MLNLoggingLevelWarning:
-        level = @"warning";
-        break;
+      level = @"warning";
+      break;
     case MLNLoggingLevelNone:
-        level = @"none";
-        break;
+      level = @"none";
+      break;
     case MLNLoggingLevelFault:
-        level = @"fault";
-        break;
+      level = @"fault";
+      break;
     case MLNLoggingLevelVerbose:
-        level = @"verbose";
-        break;
-    }
-
-    NSString* type = nil;
-    if ([message hasPrefix:@"Failed to load glyph range"]) {
-        type = @"missing_font";
-    }
-
-    NSMutableDictionary* body = [@{
-        @"level": level,
-        @"message": message,
-        @"filePath": filePath,
-        @"line": @(line)
-    } mutableCopy];
-
-    if (type != nil) {
-        body[@"type"] = type;
-    }
-    [self sendEventWithName:@"LogEvent" body:body];
+      level = @"verbose";
+      break;
+  }
+
+  NSString *type = nil;
+  if ([message hasPrefix:@"Failed to load glyph range"]) {
+    type = @"missing_font";
+  }
+
+  NSMutableDictionary *body =
+      [@{@"level" : level, @"message" : message, @"filePath" : filePath, @"line" : @(line)}
+          mutableCopy];
+
+  if (type != nil) {
+    body[@"type"] = type;
+  }
+  [self sendEventWithName:@"LogEvent" body:body];
 }
 
-RCT_EXPORT_METHOD(setLogLevel: (nonnull NSString*)logLevel)
-{
-    MLNLoggingLevel mlnLogLevel = MLNLoggingLevelNone;
-    if ([logLevel isEqualToString:@"none"]) {
-        mlnLogLevel = MLNLoggingLevelNone;
-    } else if ([logLevel isEqualToString:@"debug"]) {
-        mlnLogLevel = MLNLoggingLevelInfo;
-    } else if ([logLevel isEqualToString:@"fault"]) {
-        mlnLogLevel = MLNLoggingLevelFault;
-    } else if ([logLevel isEqualToString:@"error"]) {
-        mlnLogLevel = MLNLoggingLevelError;
-    } else if ([logLevel isEqualToString:@"warning"]) {
-        mlnLogLevel = MLNLoggingLevelWarning;
-    } else if ([logLevel isEqualToString:@"info"]) {
-        mlnLogLevel = MLNLoggingLevelInfo;
-    } else if ([logLevel isEqualToString:@"debug"]) {
+RCT_EXPORT_METHOD(setLogLevel : (nonnull NSString *)logLevel) {
+  MLNLoggingLevel mlnLogLevel = MLNLoggingLevelNone;
+  if ([logLevel isEqualToString:@"none"]) {
+    mlnLogLevel = MLNLoggingLevelNone;
+  } else if ([logLevel isEqualToString:@"debug"]) {
+    mlnLogLevel = MLNLoggingLevelInfo;
+  } else if ([logLevel isEqualToString:@"fault"]) {
+    mlnLogLevel = MLNLoggingLevelFault;
+  } else if ([logLevel isEqualToString:@"error"]) {
+    mlnLogLevel = MLNLoggingLevelError;
+  } else if ([logLevel isEqualToString:@"warning"]) {
+    mlnLogLevel = MLNLoggingLevelWarning;
+  } else if ([logLevel isEqualToString:@"info"]) {
+    mlnLogLevel = MLNLoggingLevelInfo;
+  } else if ([logLevel isEqualToString:@"debug"]) {
 #if MLN_LOGGING_ENABLE_DEBUG
-        mlnLogLevel = MLNLoggingLevelDebug;
+    mlnLogLevel = MLNLoggingLevelDebug;
 #else
-        mlnLogLevel = MLNLoggingLevelVerbose;
+    mlnLogLevel = MLNLoggingLevelVerbose;
 #endif
-    } else if ([logLevel isEqualToString:@"verbose"]) {
-        mlnLogLevel = MLNLoggingLevelVerbose;
-    }
-    self.loggingConfiguration.loggingLevel = mlnLogLevel;
+  } else if ([logLevel isEqualToString:@"verbose"]) {
+    mlnLogLevel = MLNLoggingLevelVerbose;
+  }
+  self.loggingConfiguration.loggingLevel = mlnLogLevel;
 }
 
 @end