@maplibre/maplibre-react-native 10.1.0 → 10.1.2

package/ios/MLRN/MLRNModule.h

@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
 #import <React/RCTBridgeModule.h>
 
-@interface MLRNModule : NSObject<RCTBridgeModule>
+@interface MLRNModule : NSObject <RCTBridgeModule>
 @end

package/ios/MLRN/MLRNModule.m

@@ -1,130 +1,136 @@
 #import "MLRNModule.h"
+#import "CameraMode.h"
+#import "MLRNCustomHeaders.h"
 #import "MLRNEventTypes.h"
 #import "MLRNOfflineModule.h"
-#import "CameraMode.h"
 #import "MLRNSource.h"
-#import "MLRNCustomHeaders.h"
 @import MapLibre;
 
 @implementation MLRNModule
 
 RCT_EXPORT_MODULE();
 
-+ (BOOL)requiresMainQueueSetup
-{
-    return YES;
++ (BOOL)requiresMainQueueSetup {
+  return YES;
 }
 
-- (NSDictionary<NSString *, id> *)constantsToExport
-{
-    // style urls
-    NSMutableDictionary *styleURLS = [[NSMutableDictionary alloc] init];
-    [styleURLS setObject:[[MLNStyle defaultStyleURL] absoluteString] forKey:@"Default"];
-
-    // event types
-    NSMutableDictionary *eventTypes = [[NSMutableDictionary alloc] init];
-    [eventTypes setObject:RCT_MAPBOX_EVENT_TAP forKey:@"MapClick"];
-    [eventTypes setObject:RCT_MAPBOX_EVENT_LONGPRESS forKey:@"MapLongClick"];
-    [eventTypes setObject:RCT_MAPBOX_REGION_WILL_CHANGE_EVENT forKey:@"RegionWillChange"];
-    [eventTypes setObject:RCT_MAPBOX_REGION_IS_CHANGING forKey:@"RegionIsChanging"];
-    [eventTypes setObject:RCT_MAPBOX_REGION_DID_CHANGE forKey:@"RegionDidChange"];
-    [eventTypes setObject:RCT_MAPBOX_WILL_START_LOADING_MAP forKey:@"WillStartLoadingMap"];
-    [eventTypes setObject:RCT_MAPBOX_DID_FINISH_LOADING_MAP forKey:@"DidFinishLoadingMap"];
-    [eventTypes setObject:RCT_MAPBOX_DID_FAIL_LOADING_MAP forKey:@"DidFailLoadingMap"];
-    [eventTypes setObject:RCT_MAPBOX_WILL_START_RENDERING_FRAME forKey:@"WillStartRenderingFrame"];
-    [eventTypes setObject:RCT_MAPBOX_DID_FINSIH_RENDERING_FRAME forKey:@"DidFinishRenderingFrame"];
-    [eventTypes setObject:RCT_MAPBOX_DID_FINISH_RENDERING_FRAME_FULLY forKey:@"DidFinishRenderingFrameFully"];
-    [eventTypes setObject:RCT_MAPBOX_WILL_START_RENDERING_MAP forKey:@"WillStartRenderingMap"];
-    [eventTypes setObject:RCT_MAPBOX_DID_FINISH_RENDERING_MAP forKey:@"DidFinishRenderingMap"];
-    [eventTypes setObject:RCT_MAPBOX_DID_FINISH_RENDERING_MAP_FULLY forKey:@"DidFinishRenderingMapFully"];
-    [eventTypes setObject:RCT_MAPBOX_DID_FINISH_LOADING_STYLE forKey:@"DidFinishLoadingStyle"];
-
-    // location module events
-    NSMutableDictionary *locationModuleEvents = [[NSMutableDictionary alloc] init];
-    [locationModuleEvents setObject:RCT_MAPBOX_USER_LOCATION_UPDATE forKey:@"Update"];
-
-    // user tracking modes
-    NSMutableDictionary *userTrackingModes = [[NSMutableDictionary alloc] init];
-    [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeNone] forKey:@"None"];
-    [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeFollow] forKey:@"Follow"];
-    [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeFollowWithHeading] forKey:@"FollowWithHeading"];
-    [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeFollowWithCourse] forKey:@"FollowWithCourse"];
-
-    // user location vertical alignment
-    NSMutableDictionary *userLocationVerticalAlignment = [[NSMutableDictionary alloc] init];
-    [userLocationVerticalAlignment setObject:[NSNumber numberWithInt:MLNAnnotationVerticalAlignmentTop] forKey:@"Top"];
-    [userLocationVerticalAlignment setObject:[NSNumber numberWithInt:MLNAnnotationVerticalAlignmentCenter] forKey:@"Center"];
-    [userLocationVerticalAlignment setObject:[NSNumber numberWithInt:MLNAnnotationVerticalAlignmentBottom] forKey:@"Bottom"];
-
-    // camera modes
-    NSMutableDictionary *cameraModes = [[NSMutableDictionary alloc] init];
-    [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_FLIGHT] forKey:@"Flight"];
-    [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_EASE] forKey:@"Ease"];
-    [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_LINEAR] forKey:@"Linear"];
-    [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_NONE] forKey:@"None"];
-
-    // style sources
-    NSMutableDictionary *styleSourceConsts = [[NSMutableDictionary alloc] init];
-    [styleSourceConsts setObject:DEFAULT_SOURCE_ID forKey:@"DefaultSourceID"];
-
-    // offline module callback names
-    NSMutableDictionary *offlineModuleCallbackNames = [[NSMutableDictionary alloc] init];
-    [offlineModuleCallbackNames setObject:RCT_MAPBOX_OFFLINE_CALLBACK_ERROR forKey:@"Error"];
-    [offlineModuleCallbackNames setObject:RCT_MAPBOX_OFFLINE_CALLBACK_PROGRESS forKey:@"Progress"];
-
-    NSMutableDictionary *offlinePackDownloadState = [[NSMutableDictionary alloc] init];
-    [offlinePackDownloadState setObject:@(MLNOfflinePackStateInactive) forKey:@"Inactive"];
-    [offlinePackDownloadState setObject:@(MLNOfflinePackStateActive) forKey:@"Active"];
-    [offlinePackDownloadState setObject:@(MLNOfflinePackStateComplete) forKey:@"Complete"];
-
-    return @{
-         @"StyleURL": styleURLS,
-         @"EventTypes": eventTypes,
-         @"UserTrackingModes": userTrackingModes,
-         @"UserLocationVerticalAlignment": userLocationVerticalAlignment,
-         @"CameraModes": cameraModes,
-         @"StyleSource": styleSourceConsts,
-         @"OfflineCallbackName": offlineModuleCallbackNames,
-         @"OfflinePackDownloadState": offlinePackDownloadState,
-         @"LocationCallbackName": locationModuleEvents
-    };
+- (NSDictionary<NSString *, id> *)constantsToExport {
+  // style urls
+  NSMutableDictionary *styleURLS = [[NSMutableDictionary alloc] init];
+  [styleURLS setObject:[[MLNStyle defaultStyleURL] absoluteString] forKey:@"Default"];
+
+  // event types
+  NSMutableDictionary *eventTypes = [[NSMutableDictionary alloc] init];
+  [eventTypes setObject:RCT_MAPBOX_EVENT_TAP forKey:@"MapClick"];
+  [eventTypes setObject:RCT_MAPBOX_EVENT_LONGPRESS forKey:@"MapLongClick"];
+  [eventTypes setObject:RCT_MAPBOX_REGION_WILL_CHANGE_EVENT forKey:@"RegionWillChange"];
+  [eventTypes setObject:RCT_MAPBOX_REGION_IS_CHANGING forKey:@"RegionIsChanging"];
+  [eventTypes setObject:RCT_MAPBOX_REGION_DID_CHANGE forKey:@"RegionDidChange"];
+  [eventTypes setObject:RCT_MAPBOX_WILL_START_LOADING_MAP forKey:@"WillStartLoadingMap"];
+  [eventTypes setObject:RCT_MAPBOX_DID_FINISH_LOADING_MAP forKey:@"DidFinishLoadingMap"];
+  [eventTypes setObject:RCT_MAPBOX_DID_FAIL_LOADING_MAP forKey:@"DidFailLoadingMap"];
+  [eventTypes setObject:RCT_MAPBOX_WILL_START_RENDERING_FRAME forKey:@"WillStartRenderingFrame"];
+  [eventTypes setObject:RCT_MAPBOX_DID_FINSIH_RENDERING_FRAME forKey:@"DidFinishRenderingFrame"];
+  [eventTypes setObject:RCT_MAPBOX_DID_FINISH_RENDERING_FRAME_FULLY
+                 forKey:@"DidFinishRenderingFrameFully"];
+  [eventTypes setObject:RCT_MAPBOX_WILL_START_RENDERING_MAP forKey:@"WillStartRenderingMap"];
+  [eventTypes setObject:RCT_MAPBOX_DID_FINISH_RENDERING_MAP forKey:@"DidFinishRenderingMap"];
+  [eventTypes setObject:RCT_MAPBOX_DID_FINISH_RENDERING_MAP_FULLY
+                 forKey:@"DidFinishRenderingMapFully"];
+  [eventTypes setObject:RCT_MAPBOX_DID_FINISH_LOADING_STYLE forKey:@"DidFinishLoadingStyle"];
+
+  // location module events
+  NSMutableDictionary *locationModuleEvents = [[NSMutableDictionary alloc] init];
+  [locationModuleEvents setObject:RCT_MAPBOX_USER_LOCATION_UPDATE forKey:@"Update"];
+
+  // user tracking modes
+  NSMutableDictionary *userTrackingModes = [[NSMutableDictionary alloc] init];
+  [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeNone] forKey:@"None"];
+  [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeFollow] forKey:@"Follow"];
+  [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeFollowWithHeading]
+                        forKey:@"FollowWithHeading"];
+  [userTrackingModes setObject:[NSNumber numberWithInt:MLNUserTrackingModeFollowWithCourse]
+                        forKey:@"FollowWithCourse"];
+
+  // user location vertical alignment
+  NSMutableDictionary *userLocationVerticalAlignment = [[NSMutableDictionary alloc] init];
+  [userLocationVerticalAlignment
+      setObject:[NSNumber numberWithInt:MLNAnnotationVerticalAlignmentTop]
+         forKey:@"Top"];
+  [userLocationVerticalAlignment
+      setObject:[NSNumber numberWithInt:MLNAnnotationVerticalAlignmentCenter]
+         forKey:@"Center"];
+  [userLocationVerticalAlignment
+      setObject:[NSNumber numberWithInt:MLNAnnotationVerticalAlignmentBottom]
+         forKey:@"Bottom"];
+
+  // camera modes
+  NSMutableDictionary *cameraModes = [[NSMutableDictionary alloc] init];
+  [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_FLIGHT] forKey:@"Flight"];
+  [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_EASE] forKey:@"Ease"];
+  [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_LINEAR] forKey:@"Linear"];
+  [cameraModes setObject:[NSNumber numberWithInt:RCT_MAPBOX_CAMERA_MODE_NONE] forKey:@"None"];
+
+  // style sources
+  NSMutableDictionary *styleSourceConsts = [[NSMutableDictionary alloc] init];
+  [styleSourceConsts setObject:DEFAULT_SOURCE_ID forKey:@"DefaultSourceID"];
+
+  // offline module callback names
+  NSMutableDictionary *offlineModuleCallbackNames = [[NSMutableDictionary alloc] init];
+  [offlineModuleCallbackNames setObject:RCT_MAPBOX_OFFLINE_CALLBACK_ERROR forKey:@"Error"];
+  [offlineModuleCallbackNames setObject:RCT_MAPBOX_OFFLINE_CALLBACK_PROGRESS forKey:@"Progress"];
+
+  NSMutableDictionary *offlinePackDownloadState = [[NSMutableDictionary alloc] init];
+  [offlinePackDownloadState setObject:@(MLNOfflinePackStateInactive) forKey:@"Inactive"];
+  [offlinePackDownloadState setObject:@(MLNOfflinePackStateActive) forKey:@"Active"];
+  [offlinePackDownloadState setObject:@(MLNOfflinePackStateComplete) forKey:@"Complete"];
+
+  return @{
+    @"StyleURL" : styleURLS,
+    @"EventTypes" : eventTypes,
+    @"UserTrackingModes" : userTrackingModes,
+    @"UserLocationVerticalAlignment" : userLocationVerticalAlignment,
+    @"CameraModes" : cameraModes,
+    @"StyleSource" : styleSourceConsts,
+    @"OfflineCallbackName" : offlineModuleCallbackNames,
+    @"OfflinePackDownloadState" : offlinePackDownloadState,
+    @"LocationCallbackName" : locationModuleEvents
+  };
 }
 
 /**
-* @deprecated This will be removed in the next major version.
-* @see https://github.com/maplibre/maplibre-react-native/issues/25#issuecomment-1382382044
-*/
-RCT_EXPORT_METHOD(setAccessToken:(NSString *)accessToken)
-{
-    if (accessToken.length > 0) {
-      [MLNSettings setApiKey:accessToken];
-    }
+ * @deprecated This will be removed in the next major version.
+ * @see https://github.com/maplibre/maplibre-react-native/issues/25#issuecomment-1382382044
+ */
+RCT_EXPORT_METHOD(setAccessToken : (NSString *)accessToken) {
+  if (accessToken.length > 0) {
+    [MLNSettings setApiKey:accessToken];
+  }
 }
 
-RCT_EXPORT_METHOD(addCustomHeader:(NSString *)headerName forHeaderValue:(NSString *) headerValue)
-{
-    [MLRNCustomHeaders.sharedInstance addHeader:headerValue forHeaderName:headerName];
+RCT_EXPORT_METHOD(addCustomHeader : (NSString *)headerName forHeaderValue : (NSString *)
+                      headerValue) {
+  [MLRNCustomHeaders.sharedInstance addHeader:headerValue forHeaderName:headerName];
 }
 
-RCT_EXPORT_METHOD(removeCustomHeader:(NSString *)headerName)
-{
-    [MLRNCustomHeaders.sharedInstance removeHeader:headerName];
+RCT_EXPORT_METHOD(removeCustomHeader : (NSString *)headerName) {
+  [MLRNCustomHeaders.sharedInstance removeHeader:headerName];
 }
 
 /**
-* @deprecated This will be removed in the next major version.
-* @see https://github.com/maplibre/maplibre-react-native/issues/25#issuecomment-1382382044
-*/
-RCT_EXPORT_METHOD(getAccessToken:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-{
-    NSString* accessToken = MLNSettings.apiKey;
-
-    if (accessToken != nil) {
-        resolve(accessToken);
-        return;
-    }
-
-    reject(@"missing_access_token", @"No access token has been set", nil);
+ * @deprecated This will be removed in the next major version.
+ * @see https://github.com/maplibre/maplibre-react-native/issues/25#issuecomment-1382382044
+ */
+RCT_EXPORT_METHOD(getAccessToken : (RCTPromiseResolveBlock)
+                      resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  NSString *accessToken = MLNSettings.apiKey;
+
+  if (accessToken != nil) {
+    resolve(accessToken);
+    return;
+  }
+
+  reject(@"missing_access_token", @"No access token has been set", nil);
 }
 
 @end

package/ios/MLRN/MLRNNativeUserLocation.m

@@ -1,41 +1,38 @@
 #import "MLRNNativeUserLocation.h"
+#import "CameraMode.h"
 #import "CameraStop.h"
 #import "CameraUpdateQueue.h"
-#import "MLRNLocation.h"
-#import "MLRNUtils.h"
-#import "MLRNLocationManager.h"
 #import "MLRNEvent.h"
 #import "MLRNEventTypes.h"
-#import "CameraMode.h"
+#import "MLRNLocation.h"
+#import "MLRNLocationManager.h"
+#import "MLRNUtils.h"
 
-@implementation MLRNNativeUserLocation
-{
-    
+@implementation MLRNNativeUserLocation {
 }
 
-- (void)setMap:(MLRNMapView *)map
-{
-    if (map == nil && _map) {
-        _map.useNativeUserLocationAnnotationView = NO;
-        _map.showsUserLocation = NO;
-        _map.showsUserHeadingIndicator = NO;
-    } else if (map) {
-        map.useNativeUserLocationAnnotationView = YES;
-        // Toggle off/on showsUserLocation in order for Mapbox to invalidate the
-        // current (hidden) user location annotation view. See also: HiddenUserLocationAnnotationView
-        map.showsUserLocation = NO;
-        map.showsUserLocation = YES;
-        map.showsUserHeadingIndicator = self.iosShowsUserHeadingIndicator;
-    }
-    
-    _map = map;
+- (void)setMap:(MLRNMapView *)map {
+  if (map == nil && _map) {
+    _map.useNativeUserLocationAnnotationView = NO;
+    _map.showsUserLocation = NO;
+    _map.showsUserHeadingIndicator = NO;
+  } else if (map) {
+    map.useNativeUserLocationAnnotationView = YES;
+    // Toggle off/on showsUserLocation in order for Mapbox to invalidate the
+    // current (hidden) user location annotation view. See also: HiddenUserLocationAnnotationView
+    map.showsUserLocation = NO;
+    map.showsUserLocation = YES;
+    map.showsUserHeadingIndicator = self.iosShowsUserHeadingIndicator;
+  }
+
+  _map = map;
 }
 
 - (void)setIosShowsUserHeadingIndicator:(BOOL)iosShowsUserHeadingIndicator {
-    _iosShowsUserHeadingIndicator = iosShowsUserHeadingIndicator;
-    if (_map) {
-        _map.showsUserHeadingIndicator = iosShowsUserHeadingIndicator;
-    }
+  _iosShowsUserHeadingIndicator = iosShowsUserHeadingIndicator;
+  if (_map) {
+    _map.showsUserHeadingIndicator = iosShowsUserHeadingIndicator;
+  }
 }
 
 @end

package/ios/MLRN/MLRNNativeUserLocationManager.m

@@ -6,20 +6,16 @@
 RCT_EXPORT_MODULE(MLRNNativeUserLocation)
 RCT_EXPORT_VIEW_PROPERTY(iosShowsUserHeadingIndicator, BOOL)
 
-
 #pragma - View Properties
 
-
 #pragma Methods
 
-- (BOOL)requiresMainQueueSetup
-{
-    return YES;
+- (BOOL)requiresMainQueueSetup {
+  return YES;
 }
 
-- (UIView *)view
-{
-    return [[MLRNNativeUserLocation alloc] init];
+- (UIView *)view {
+  return [[MLRNNativeUserLocation alloc] init];
 }
 
 @end

package/ios/MLRN/MLRNOfflineModule.h

@@ -3,7 +3,7 @@
 
 @import MapLibre;
 
-@interface MLRNOfflineModule : RCTEventEmitter<RCTBridgeModule>
+@interface MLRNOfflineModule : RCTEventEmitter <RCTBridgeModule>
 
 extern NSString *const RCT_MAPBOX_OFFLINE_CALLBACK_PROGRESS;
 extern NSString *const RCT_MAPBOX_OFFLINE_CALLBACK_ERROR;