@maplibre/maplibre-react-native 10.0.0-alpha.2 → 10.0.0-alpha.21

package/ios/{RCTMGL/MGLOfflineModule.m → RCTMLN/MLNOfflineModule.m}

@@ -1,17 +1,17 @@
 //
-//  MGLOfflineModule.m
-//  RCTMGL
+//  MLNOfflineModule.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 10/25/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "MGLOfflineModule.h"
-#import "RCTMGLUtils.h"
-#import "RCTMGLEvent.h"
-#import "RCTMGLEventTypes.h"
+#import "MLNOfflineModule.h"
+#import "RCTMLNUtils.h"
+#import "RCTMLNEvent.h"
+#import "RCTMLNEventTypes.h"
 
-@implementation MGLOfflineModule
+@implementation MLNOfflineModule
 {
     NSUInteger lastPackState;
     double lastPackTimestamp;
@@ -48,20 +48,20 @@ NSString *const RCT_MAPBOX_OFFLINE_CALLBACK_ERROR = @"MapboOfflineRegionError";
         packRequestQueue = [NSMutableArray new];
         eventThrottle = 300;
         lastPackState = -1;
-        
+
         NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
-        [defaultCenter addObserver:self selector:@selector(offlinePackProgressDidChange:) name:MGLOfflinePackProgressChangedNotification object:nil];
-        [defaultCenter addObserver:self selector:@selector(offlinePackDidReceiveError:) name:MGLOfflinePackErrorNotification object:nil];
-        [defaultCenter addObserver:self selector:@selector(offlinePackDidReceiveMaxAllowedMapboxTiles:) name:MGLOfflinePackMaximumMapboxTilesReachedNotification object:nil];
-        
-        [[MGLOfflineStorage sharedOfflineStorage] addObserver:self forKeyPath:@"packs" options:NSKeyValueObservingOptionInitial context:NULL];
+        [defaultCenter addObserver:self selector:@selector(offlinePackProgressDidChange:) name:MLNOfflinePackProgressChangedNotification object:nil];
+        [defaultCenter addObserver:self selector:@selector(offlinePackDidReceiveError:) name:MLNOfflinePackErrorNotification object:nil];
+        [defaultCenter addObserver:self selector:@selector(offlinePackDidReceiveMaxAllowedMapboxTiles:) name:MLNOfflinePackMaximumMapboxTilesReachedNotification object:nil];
+
+        [[MLNOfflineStorage sharedOfflineStorage] addObserver:self forKeyPath:@"packs" options:NSKeyValueObservingOptionInitial context:NULL];
     }
     return self;
 }
 
 - (void)dealloc
 {
-    [[MGLOfflineStorage sharedOfflineStorage] removeObserver:self forKeyPath:@"packs"];
+    [[MLNOfflineStorage sharedOfflineStorage] removeObserver:self forKeyPath:@"packs"];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
@@ -72,15 +72,21 @@ NSString *const RCT_MAPBOX_OFFLINE_CALLBACK_ERROR = @"MapboOfflineRegionError";
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
 {
+    if ([keyPath isEqualToString:@"state"] && [object isKindOfClass:[MLNOfflinePack class]]) {
+        MLNOfflinePack* pack = (MLNOfflinePack*)object;
+        [self observerStateForPack:pack context:context];
+        return;
+    }
+
     if (packRequestQueue.count == 0) {
         return;
     }
-    
-    NSArray<MGLOfflinePack *> *packs = [[MGLOfflineStorage sharedOfflineStorage] packs];
+
+    NSArray<MLNOfflinePack *> *packs = [[MLNOfflineStorage sharedOfflineStorage] packs];
     if (packs == nil) {
         return;
     }
-    
+
     while (packRequestQueue.count > 0) {
         RCTPromiseResolveBlock resolve = [packRequestQueue objectAtIndex:0];
         resolve([self _convertPacksToJson:packs]);
@@ -93,17 +99,17 @@ RCT_EXPORT_METHOD(createPack:(NSDictionary *)options
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSString *styleURL = options[@"styleURL"];
-    MGLCoordinateBounds bounds = [RCTMGLUtils fromFeatureCollection:options[@"bounds"]];
-    
-    id<MGLOfflineRegion> offlineRegion = [[MGLTilePyramidOfflineRegion alloc] initWithStyleURL:[NSURL URLWithString:styleURL]
+    MLNCoordinateBounds bounds = [RCTMLNUtils fromFeatureCollection:options[@"bounds"]];
+
+    id<MLNOfflineRegion> offlineRegion = [[MLNTilePyramidOfflineRegion alloc] initWithStyleURL:[NSURL URLWithString:styleURL]
                                                                               bounds:bounds
                                                                               fromZoomLevel:[options[@"minZoom"] doubleValue]
                                                                               toZoomLevel:[options[@"maxZoom"] doubleValue]];
     NSData *context = [self _archiveMetadata:options[@"metadata"]];
-    
-    [[MGLOfflineStorage sharedOfflineStorage] addPackForRegion:offlineRegion
+
+    [[MLNOfflineStorage sharedOfflineStorage] addPackForRegion:offlineRegion
                                               withContext:context
-                                              completionHandler:^(MGLOfflinePack *pack, NSError *error) {
+                                              completionHandler:^(MLNOfflinePack *pack, NSError *error) {
                                                  if (error != nil) {
                                                      reject(@"createPack", error.description, error);
                                                      return;
@@ -129,8 +135,8 @@ RCT_EXPORT_METHOD(mergeOfflineRegions:(NSString *)path
             return reject(@"asset_does_not_exist", [NSString stringWithFormat:@"The given assetName, %@, can't be found in the app's bundle.", path], nil);
         }
     }
-    
-    [[MGLOfflineStorage sharedOfflineStorage] addContentsOfFile:absolutePath withCompletionHandler:^(NSURL *fileURL, NSArray<MGLOfflinePack *> *packs, NSError *error) {
+
+    [[MLNOfflineStorage sharedOfflineStorage] addContentsOfFile:absolutePath withCompletionHandler:^(NSURL *fileURL, NSArray<MLNOfflinePack *> *packs, NSError *error) {
         if (error != nil) {
             reject(@"mergeOfflineRegions", error.description, error);
             return;
@@ -142,8 +148,8 @@ RCT_EXPORT_METHOD(mergeOfflineRegions:(NSString *)path
 RCT_EXPORT_METHOD(getPacks:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
-        NSArray<MGLOfflinePack *> *packs = [[MGLOfflineStorage sharedOfflineStorage] packs];
-        
+        NSArray<MLNOfflinePack *> *packs = [[MLNOfflineStorage sharedOfflineStorage] packs];
+
         if (packs == nil) {
             // packs have not loaded yet
             [self->packRequestQueue addObject:resolve];
@@ -156,7 +162,7 @@ RCT_EXPORT_METHOD(getPacks:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseR
 
 RCT_EXPORT_METHOD(invalidateAmbientCache:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [[MGLOfflineStorage sharedOfflineStorage] invalidateAmbientCacheWithCompletionHandler:^(NSError *error) {
+    [[MLNOfflineStorage sharedOfflineStorage] invalidateAmbientCacheWithCompletionHandler:^(NSError *error) {
         if (error != nil) {
             reject(@"invalidateAmbientCache", error.description, error);
             return;
@@ -167,7 +173,7 @@ RCT_EXPORT_METHOD(invalidateAmbientCache:(RCTPromiseResolveBlock)resolve rejecte
 
 RCT_EXPORT_METHOD(clearAmbientCache:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [[MGLOfflineStorage sharedOfflineStorage] clearAmbientCacheWithCompletionHandler:^(NSError *error) {
+    [[MLNOfflineStorage sharedOfflineStorage] clearAmbientCacheWithCompletionHandler:^(NSError *error) {
         if (error != nil) {
             reject(@"clearAmbientCache", error.description, error);
             return;
@@ -180,54 +186,69 @@ RCT_EXPORT_METHOD(setMaximumAmbientCacheSize:(NSUInteger)cacheSize
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [[MGLOfflineStorage sharedOfflineStorage] setMaximumAmbientCacheSize:cacheSize withCompletionHandler:^(NSError *error) {
+    [[MLNOfflineStorage sharedOfflineStorage] setMaximumAmbientCacheSize:cacheSize withCompletionHandler:^(NSError *error) {
         if (error != nil) {
             reject(@"setMaximumAmbientCacheSize", error.description, error);
             return;
         }
         resolve(nil);
     }];
-    
+
 }
 
 RCT_EXPORT_METHOD(resetDatabase:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [[MGLOfflineStorage sharedOfflineStorage] resetDatabaseWithCompletionHandler:^(NSError *error) {
+    [[MLNOfflineStorage sharedOfflineStorage] resetDatabaseWithCompletionHandler:^(NSError *error) {
         if (error != nil) {
             reject(@"resetDatabase", error.description, error);
             return;
         }
         resolve(nil);
     }];
-    
+
 }
 
 RCT_EXPORT_METHOD(getPackStatus:(NSString *)name
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    MGLOfflinePack *pack = [self _getPackFromName:name];
-    
+    MLNOfflinePack *pack = [self _getPackFromName:name];
+
     if (pack == nil) {
         resolve(nil);
         NSLog(@"getPackStatus - Unknown offline region");
         return;
     }
-    
-    resolve([self _makeRegionStatusPayload:name pack:pack]);
+
+    if (pack.state == MLNOfflinePackStateUnknown) {
+        [pack addObserver:self forKeyPath:@"state" options:NSKeyValueObservingOptionNew context:(__bridge_retained void*)resolve];
+        [pack requestProgress];
+    } else {
+        resolve([self _makeRegionStatusPayload:name pack:pack]);
+    }
+}
+
+-(void)observerStateForPack:(MLNOfflinePack*)pack context:(nullable void*) context {
+    RCTPromiseResolveBlock resolve = (__bridge_transfer RCTPromiseResolveBlock)context;
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSDictionary* metadata = [self _unarchiveMetadata:pack];
+        NSString* name = metadata[@"name"];
+        resolve([self _makeRegionStatusPayload:name pack:pack]);
+    });
+    [pack removeObserver:self forKeyPath:@"state" context:context];
 }
 
 RCT_EXPORT_METHOD(invalidatePack:(NSString *)name
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    MGLOfflinePack *pack = [self _getPackFromName:name];
+    MLNOfflinePack *pack = [self _getPackFromName:name];
 
     if (pack == nil) {
         resolve(nil);
         return;
     }
-    [[MGLOfflineStorage sharedOfflineStorage] invalidatePack:pack  withCompletionHandler:^(NSError *error) {
+    [[MLNOfflineStorage sharedOfflineStorage] invalidatePack:pack  withCompletionHandler:^(NSError *error) {
         if (error != nil) {
             reject(@"invalidatePack", error.description, error);
             return;
@@ -240,18 +261,18 @@ RCT_EXPORT_METHOD(deletePack:(NSString *)name
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    MGLOfflinePack *pack = [self _getPackFromName:name];
-    
+    MLNOfflinePack *pack = [self _getPackFromName:name];
+
     if (pack == nil) {
         resolve(nil);
         return;
     }
-    if (pack.state == MGLOfflinePackStateInvalid) {
-        NSError *error = [NSError errorWithDomain:MGLErrorDomain code:1 userInfo:@{NSLocalizedDescriptionKey: NSLocalizedString(@"Pack has already been deleted", nil)}];
+    if (pack.state == MLNOfflinePackStateInvalid) {
+        NSError *error = [NSError errorWithDomain:MLNErrorDomain code:1 userInfo:@{NSLocalizedDescriptionKey: NSLocalizedString(@"Pack has already been deleted", nil)}];
         reject(@"deletePack", error.description, error);
         return;
     }
-    [[MGLOfflineStorage sharedOfflineStorage] removePack:pack withCompletionHandler:^(NSError *error) {
+    [[MLNOfflineStorage sharedOfflineStorage] removePack:pack withCompletionHandler:^(NSError *error) {
         if (error != nil) {
             reject(@"deletePack", error.description, error);
             return;
@@ -264,18 +285,18 @@ RCT_EXPORT_METHOD(pausePackDownload:(NSString *)name
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    MGLOfflinePack *pack = [self _getPackFromName:name];
-    
+    MLNOfflinePack *pack = [self _getPackFromName:name];
+
     if (pack == nil) {
         reject(@"pausePackDownload", @"Unknown offline region", nil);
         return;
     }
-    
-    if (pack.state == MGLOfflinePackStateInactive || pack.state == MGLOfflinePackStateComplete) {
+
+    if (pack.state == MLNOfflinePackStateInactive || pack.state == MLNOfflinePackStateComplete) {
         resolve(nil);
         return;
     }
-    
+
     [pack suspend];
     resolve(nil);
 }
@@ -284,25 +305,25 @@ RCT_EXPORT_METHOD(resumePackDownload:(NSString *)name
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    MGLOfflinePack *pack = [self _getPackFromName:name];
-    
+    MLNOfflinePack *pack = [self _getPackFromName:name];
+
     if (pack == nil) {
         reject(@"resumePack", @"Unknown offline region", nil);
         return;
     }
-    
-    if (pack.state == MGLOfflinePackStateActive || pack.state == MGLOfflinePackStateComplete) {
+
+    if (pack.state == MLNOfflinePackStateActive || pack.state == MLNOfflinePackStateComplete) {
         resolve(nil);
         return;
     }
-    
+
     [pack resume];
     resolve(nil);
 }
 
 RCT_EXPORT_METHOD(setTileCountLimit:(nonnull NSNumber *)limit)
 {
-    [[MGLOfflineStorage sharedOfflineStorage] setMaximumAllowedMapboxTiles:[limit intValue]];
+    [[MLNOfflineStorage sharedOfflineStorage] setMaximumAllowedMapboxTiles:[limit intValue]];
 }
 
 RCT_EXPORT_METHOD(setProgressEventThrottle:(nonnull NSNumber *)throttleValue)
@@ -312,34 +333,34 @@ RCT_EXPORT_METHOD(setProgressEventThrottle:(nonnull NSNumber *)throttleValue)
 
 - (void)offlinePackProgressDidChange:(NSNotification *)notification
 {
-    MGLOfflinePack *pack = notification.object;
-  
-    if (pack.state == MGLOfflinePackStateInvalid) {
+    MLNOfflinePack *pack = notification.object;
+
+    if (pack.state == MLNOfflinePackStateInvalid) {
         return; // Avoid invalid offline pack exception
     }
-  
+
     if ([self _shouldSendProgressEvent:[self _getCurrentTimestamp] pack:pack]) {
         NSDictionary *metadata = [self _unarchiveMetadata:pack];
-        RCTMGLEvent *event = [self _makeProgressEvent:metadata[@"name"] pack:pack];
+        RCTMLNEvent *event = [self _makeProgressEvent:metadata[@"name"] pack:pack];
         [self _sendEvent:RCT_MAPBOX_OFFLINE_CALLBACK_PROGRESS event:event];
         lastPackTimestamp = [self _getCurrentTimestamp];
     }
-    
+
     lastPackState = pack.state;
 }
 
 - (void)offlinePackDidReceiveError:(NSNotification *)notification
 {
-    MGLOfflinePack *pack = notification.object;
-    if (pack.state == MGLOfflinePackStateInvalid) {
+    MLNOfflinePack *pack = notification.object;
+    if (pack.state == MLNOfflinePackStateInvalid) {
         return; // Avoid invalid offline pack exception
     }
     NSDictionary *metadata = [self _unarchiveMetadata:pack];
-    
+
     NSString *name = metadata[@"name"];
     if (name != nil) {
-        NSError *error = notification.userInfo[MGLOfflinePackUserInfoKeyError];
-        RCTMGLEvent *event = [self _makeErrorEvent:name
+        NSError *error = notification.userInfo[MLNOfflinePackUserInfoKeyError];
+        RCTMLNEvent *event = [self _makeErrorEvent:name
                                    type:RCT_MAPBOX_OFFLINE_ERROR
                                    message:error.description];
         [self _sendEvent:RCT_MAPBOX_OFFLINE_CALLBACK_ERROR event:event];
@@ -348,12 +369,12 @@ RCT_EXPORT_METHOD(setProgressEventThrottle:(nonnull NSNumber *)throttleValue)
 
 - (void)offlinePackDidReceiveMaxAllowedMapboxTiles:(NSNotification *)notification
 {
-    MGLOfflinePack *pack = notification.object;
+    MLNOfflinePack *pack = notification.object;
     NSDictionary *metadata = [self _unarchiveMetadata:pack];
-    
+
     NSString *name = metadata[@"name"];
     if (name != nil) {
-        RCTMGLEvent *event = [self _makeErrorEvent:name
+        RCTMLNEvent *event = [self _makeErrorEvent:name
                                    type:RCT_MAPBOX_OFFLINE_ERROR
                                    message:@"Mapbox tile limit exceeded"];
         [self _sendEvent:RCT_MAPBOX_OFFLINE_CALLBACK_ERROR event:event];
@@ -370,7 +391,7 @@ RCT_EXPORT_METHOD(setProgressEventThrottle:(nonnull NSNumber *)throttleValue)
     return [NSKeyedArchiver archivedDataWithRootObject:metadata];
 }
 
-- (NSDictionary *)_unarchiveMetadata:(MGLOfflinePack *)pack
+- (NSDictionary *)_unarchiveMetadata:(MLNOfflinePack *)pack
 {
     id data = [NSKeyedUnarchiver unarchiveObjectWithData:pack.context];
     // Version v5 store data as NSDictionary while v6 store data as JSON string.
@@ -386,17 +407,17 @@ RCT_EXPORT_METHOD(setProgressEventThrottle:(nonnull NSNumber *)throttleValue)
     if ([data isKindOfClass:[NSDictionary class]]) {
         return data;
     }
-    
+
     if (data == nil) {
         return @{};
     }
-    
+
     return [NSJSONSerialization JSONObjectWithData:[data dataUsingEncoding:NSUTF8StringEncoding]
                                 options:NSJSONReadingMutableContainers
                                 error:nil];
 }
 
-- (NSDictionary *)_makeRegionStatusPayload:(NSString *)name pack:(MGLOfflinePack *)pack
+- (NSDictionary *)_makeRegionStatusPayload:(NSString *)name pack:(MLNOfflinePack *)pack
 {
     uint64_t completedResources = pack.progress.countOfResourcesCompleted;
     uint64_t expectedResources = pack.progress.countOfResourcesExpected;
@@ -406,7 +427,7 @@ RCT_EXPORT_METHOD(setProgressEventThrottle:(nonnull NSNumber *)throttleValue)
     if(expectedResources == 0) {
         progressPercentage = 0;
     }
-    
+
     return @{
       @"state": @(pack.state),
       @"name": name,
@@ -419,45 +440,45 @@ RCT_EXPORT_METHOD(setProgressEventThrottle:(nonnull NSNumber *)throttleValue)
     };
 }
 
-- (RCTMGLEvent *)_makeProgressEvent:(NSString *)name pack:(MGLOfflinePack *)pack
+- (RCTMLNEvent *)_makeProgressEvent:(NSString *)name pack:(MLNOfflinePack *)pack
 {
-    return [RCTMGLEvent makeEvent:RCT_MAPBOX_OFFLINE_PROGRESS withPayload:[self _makeRegionStatusPayload:name pack:pack]];
+    return [RCTMLNEvent makeEvent:RCT_MAPBOX_OFFLINE_PROGRESS withPayload:[self _makeRegionStatusPayload:name pack:pack]];
 }
 
-- (RCTMGLEvent *)_makeErrorEvent:(NSString *)name type:(NSString *)type message:(NSString *)message
+- (RCTMLNEvent *)_makeErrorEvent:(NSString *)name type:(NSString *)type message:(NSString *)message
 {
     NSDictionary *payload = @{ @"name": name, @"message": message };
-    return [RCTMGLEvent makeEvent:type withPayload:payload];
+    return [RCTMLNEvent makeEvent:type withPayload:payload];
 }
 
-- (NSArray<NSDictionary *> *)_convertPacksToJson:(NSArray<MGLOfflinePack *> *)packs
+- (NSArray<NSDictionary *> *)_convertPacksToJson:(NSArray<MLNOfflinePack *> *)packs
 {
     NSMutableArray<NSDictionary *> *jsonPacks = [NSMutableArray new];
-    
+
     if (packs == nil) {
         return jsonPacks;
     }
-    
-    for (MGLOfflinePack *pack in packs) {
+
+    for (MLNOfflinePack *pack in packs) {
         [jsonPacks addObject:[self _convertPackToDict:pack]];
     }
-    
+
     return jsonPacks;
 }
 
-- (NSDictionary *)_convertPackToDict:(MGLOfflinePack *)pack
+- (NSDictionary *)_convertPackToDict:(MLNOfflinePack *)pack
 {
     // format bounds
-    MGLTilePyramidOfflineRegion *region = (MGLTilePyramidOfflineRegion *)pack.region;
+    MLNTilePyramidOfflineRegion *region = (MLNTilePyramidOfflineRegion *)pack.region;
     if (region == nil) {
         return nil;
     }
-    
+
     NSArray *jsonBounds = @[
       @[@(region.bounds.ne.longitude), @(region.bounds.ne.latitude)],
       @[@(region.bounds.sw.longitude), @(region.bounds.sw.latitude)]
     ];
-    
+
     // format metadata
     NSDictionary *metadata = [self _unarchiveMetadata:pack];
     NSData *jsonMetadata = [NSJSONSerialization dataWithJSONObject:metadata
@@ -469,26 +490,26 @@ RCT_EXPORT_METHOD(setProgressEventThrottle:(nonnull NSNumber *)throttleValue)
     };
 }
 
-- (MGLOfflinePack *)_getPackFromName:(NSString *)name
+- (MLNOfflinePack *)_getPackFromName:(NSString *)name
 {
-    NSArray<MGLOfflinePack *> *packs = [[MGLOfflineStorage sharedOfflineStorage] packs];
-    
+    NSArray<MLNOfflinePack *> *packs = [[MLNOfflineStorage sharedOfflineStorage] packs];
+
     if (packs == nil) {
         return nil;
     }
-    
-    for (MGLOfflinePack *pack in packs) {
+
+    for (MLNOfflinePack *pack in packs) {
         NSDictionary *metadata = [self _unarchiveMetadata:pack];
-        
+
         if ([name isEqualToString:metadata[@"name"]]) {
             return pack;
         }
     }
-    
+
     return nil;
 }
 
-- (void)_sendEvent:(NSString *)eventName event:(RCTMGLEvent *)event
+- (void)_sendEvent:(NSString *)eventName event:(RCTMLNEvent *)event
 {
     if (!hasListeners) {
         return;
@@ -496,20 +517,20 @@ RCT_EXPORT_METHOD(setProgressEventThrottle:(nonnull NSNumber *)throttleValue)
     [self sendEventWithName:eventName body:[event toJSON]];
 }
 
-- (BOOL)_shouldSendProgressEvent:(double)currentTimestamp pack:(MGLOfflinePack *)currentPack
+- (BOOL)_shouldSendProgressEvent:(double)currentTimestamp pack:(MLNOfflinePack *)currentPack
 {
     if (lastPackState == -1) {
         return YES;
     }
-    
+
     if (lastPackState != currentPack.state) {
         return YES;
     }
-    
+
     if (currentTimestamp - lastPackTimestamp > eventThrottle) {
         return YES;
     }
-    
+
     return NO;
 }
 

package/ios/{RCTMGL/MGLSnapshotModule.h → RCTMLN/MLNSnapshotModule.h}

@@ -1,6 +1,6 @@
 //
-//  MGLSnapshotModule.h
-//  RCTMGL
+//  MLNSnapshotModule.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 12/1/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
@@ -8,6 +8,6 @@
 
 #import <React/RCTBridgeModule.h>
 
-@interface MGLSnapshotModule : NSObject<RCTBridgeModule>
+@interface MLNSnapshotModule : NSObject<RCTBridgeModule>
 
 @end

package/ios/{RCTMGL/MGLSnapshotModule.m → RCTMLN/MLNSnapshotModule.m}

@@ -1,17 +1,17 @@
 //
-//  MGLSnapshotModule.m
-//  RCTMGL
+//  MLNSnapshotModule.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 12/1/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "MGLSnapshotModule.h"
-#import "RCTMGLUtils.h"
+#import "MLNSnapshotModule.h"
+#import "RCTMLNUtils.h"
 #import "RNMBImageUtils.h"
-@import Mapbox;
+@import MapLibre;
 
-@implementation MGLSnapshotModule
+@implementation MLNSnapshotModule
 
 RCT_EXPORT_MODULE()
 
@@ -25,10 +25,10 @@ RCT_EXPORT_METHOD(takeSnap:(NSDictionary *)jsOptions
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
-        MGLMapSnapshotOptions *options = [self _getOptions:jsOptions];
-        __block MGLMapSnapshotter *snapshotter = [[MGLMapSnapshotter alloc] initWithOptions:options];
+        MLNMapSnapshotOptions *options = [self _getOptions:jsOptions];
+        __block MLNMapSnapshotter *snapshotter = [[MLNMapSnapshotter alloc] initWithOptions:options];
 
-        [snapshotter startWithCompletionHandler:^(MGLMapSnapshot * _Nullable snapshot, NSError * _Nullable err) {         
+        [snapshotter startWithCompletionHandler:^(MLNMapSnapshot * _Nullable snapshot, NSError * _Nullable err) {         
             if (err != nil) {
                 reject(@"takeSnap", @"Could not create snapshot", err);
                 snapshotter = nil;
@@ -48,22 +48,22 @@ RCT_EXPORT_METHOD(takeSnap:(NSDictionary *)jsOptions
     });
 }
 
-- (MGLMapSnapshotOptions *)_getOptions:(NSDictionary *)jsOptions
+- (MLNMapSnapshotOptions *)_getOptions:(NSDictionary *)jsOptions
 {
-    MGLMapCamera *camera = [[MGLMapCamera alloc] init];
+    MLNMapCamera *camera = [[MLNMapCamera alloc] init];
     
     camera.pitch = [jsOptions[@"pitch"] doubleValue];
     camera.heading = [jsOptions[@"heading"] doubleValue];
     
     if (jsOptions[@"centerCoordinate"] != nil) {
-        camera.centerCoordinate = [RCTMGLUtils fromFeature:jsOptions[@"centerCoordinate"]];
+        camera.centerCoordinate = [RCTMLNUtils fromFeature:jsOptions[@"centerCoordinate"]];
     }
     
     NSNumber *width = jsOptions[@"width"];
     NSNumber *height = jsOptions[@"height"];
     CGSize size = CGSizeMake([width doubleValue], [height doubleValue]);
     
-    MGLMapSnapshotOptions *options = [[MGLMapSnapshotOptions alloc] initWithStyleURL:[NSURL URLWithString:jsOptions[@"styleURL"]]
+    MLNMapSnapshotOptions *options = [[MLNMapSnapshotOptions alloc] initWithStyleURL:[NSURL URLWithString:jsOptions[@"styleURL"]]
                                                                    camera:camera
                                                                    size:size];
     if (jsOptions[@"zoomLevel"] != nil) {
@@ -71,7 +71,7 @@ RCT_EXPORT_METHOD(takeSnap:(NSDictionary *)jsOptions
     }
     
     if (jsOptions[@"bounds"] != nil) {
-        options.coordinateBounds = [RCTMGLUtils fromFeatureCollection:jsOptions[@"bounds"]];
+        options.coordinateBounds = [RCTMLNUtils fromFeatureCollection:jsOptions[@"bounds"]];
     }
 
     return options;

package/ios/{RCTMGL/MGLUserLocationHeadingArrowLayer.h → RCTMLN/MLNUserLocationHeadingArrowLayer.h}

@@ -1,10 +1,10 @@
 #import <QuartzCore/QuartzCore.h>
-#import "MGLUserLocationHeadingIndicator.h"
-@import Mapbox;
+#import "MLNUserLocationHeadingIndicator.h"
+@import MapLibre;
 
-@interface MGLUserLocationHeadingArrowLayer : CAShapeLayer <MGLUserLocationHeadingIndicator>
+@interface MLNUserLocationHeadingArrowLayer : CAShapeLayer <MLNUserLocationHeadingIndicator>
 
-- (instancetype)initWithUserLocationAnnotationView:(MGLUserLocationAnnotationView *)userLocationView;
+- (instancetype)initWithUserLocationAnnotationView:(MLNUserLocationAnnotationView *)userLocationView;
 - (void)updateHeadingAccuracy:(CLLocationDirection)accuracy;
 - (void)updateTintColor:(CGColorRef)color;
 

package/ios/{RCTMGL/MGLUserLocationHeadingArrowLayer.m → RCTMLN/MLNUserLocationHeadingArrowLayer.m}

@@ -1,13 +1,13 @@
-#import "MGLUserLocationHeadingArrowLayer.h"
-#import "MGLFaux3DUserLocationAnnotationView.h"
+#import "MLNUserLocationHeadingArrowLayer.h"
+#import "MLNFaux3DUserLocationAnnotationView.h"
 
-const CGFloat MGLUserLocationHeadingArrowSize = 6;
+const CGFloat MLNUserLocationHeadingArrowSize = 6;
 
-@implementation MGLUserLocationHeadingArrowLayer
+@implementation MLNUserLocationHeadingArrowLayer
 
-- (instancetype)initWithUserLocationAnnotationView:(MGLUserLocationAnnotationView *)userLocationView
+- (instancetype)initWithUserLocationAnnotationView:(MLNUserLocationAnnotationView *)userLocationView
 {
-    CGFloat size = userLocationView.bounds.size.width + MGLUserLocationHeadingArrowSize;
+    CGFloat size = userLocationView.bounds.size.width + MLNUserLocationHeadingArrowSize;
     
     self = [super init];
     self.bounds = CGRectMake(0, 0, size, size);
@@ -37,7 +37,7 @@ const CGFloat MGLUserLocationHeadingArrowSize = 6;
 
 - (CGPathRef)arrowPath {
     CGFloat center = roundf(CGRectGetMidX(self.bounds));
-    CGFloat size = MGLUserLocationHeadingArrowSize;
+    CGFloat size = MLNUserLocationHeadingArrowSize;
     
     CGPoint top =       CGPointMake(center,         0);
     CGPoint left =      CGPointMake(center - size,  size);

package/ios/RCTMLN/MLNUserLocationHeadingBeamLayer.h

@@ -0,0 +1,11 @@
+#import <QuartzCore/QuartzCore.h>
+#import "MLNUserLocationHeadingIndicator.h"
+@import MapLibre;
+
+@interface MLNUserLocationHeadingBeamLayer : CALayer <MLNUserLocationHeadingIndicator>
+
+- (MLNUserLocationHeadingBeamLayer *)initWithUserLocationAnnotationView:(MLNUserLocationAnnotationView *)userLocationView;
+- (void)updateHeadingAccuracy:(CLLocationDirection)accuracy;
+- (void)updateTintColor:(CGColorRef)color;
+
+@end