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

package/ios/{RCTMGL/RCTMGLStyleValue.h → RCTMLN/RCTMLNStyleValue.h}

@@ -1,27 +1,27 @@
 //
-//  RCTMGLStyleValue.h
-//  RCTMGL
+//  RCTMLNStyleValue.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/11/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
-@import Mapbox;
+@import MapLibre;
 
-@interface RCTMGLStyleValue : NSObject
+@interface RCTMLNStyleValue : NSObject
 
 @property (nonatomic, strong) NSString *styleType;
 @property (nonatomic, strong) NSDictionary *rawStyleValue;
-@property (nonatomic, readonly) NSExpression *mglStyleValue;
+@property (nonatomic, readonly) NSExpression *mlnStyleValue;
 
 - (BOOL)shouldAddImage;
 - (NSString *)getImageURI;
 - (double)getImageScale;
-- (MGLTransition)getTransition;
+- (MLNTransition)getTransition;
 - (NSExpression *)getSphericalPosition;
 - (BOOL)isVisible;
 
-+ (RCTMGLStyleValue*)make:(NSString*)expressionJSONStr;
++ (RCTMLNStyleValue*)make:(NSString*)expressionJSONStr;
 
 @end

package/ios/{RCTMGL/RCTMGLStyleValue.m → RCTMLN/RCTMLNStyleValue.m}

@@ -1,46 +1,46 @@
 //
-//  RCTMGLStyleValue.m
-//  RCTMGL
+//  RCTMLNStyleValue.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/11/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLStyleValue.h"
-#import "RCTMGLUtils.h"
+#import "RCTMLNStyleValue.h"
+#import "RCTMLNUtils.h"
 #import <React/RCTImageLoader.h>
 
-@implementation RCTMGLStyleValue
+@implementation RCTMLNStyleValue
 {
     NSObject *expressionJSON;
 }
 
-- (NSExpression *)mglStyleValue
+- (NSExpression *)mlnStyleValue
 {
     if ([_styleType isEqualToString:@"color"] && [expressionJSON respondsToSelector:@selector(objectEnumerator)] && [[[(NSArray*)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]) {
-        UIColor *color = [RCTMGLUtils toColor:expressionJSON];
-        return [NSExpression expressionWithMGLJSONObject:color];
+        UIColor *color = [RCTMLNUtils toColor:expressionJSON];
+        return [NSExpression expressionWithMLNJSONObject:color];
     } else if ([_styleType isEqualToString:@"color"] && [expressionJSON isKindOfClass:[NSNumber class]]) {
       
-        UIColor *color = [RCTMGLUtils toColor:expressionJSON];
-        return [NSExpression expressionWithMGLJSONObject:color];
+        UIColor *color = [RCTMLNUtils toColor:expressionJSON];
+        return [NSExpression expressionWithMLNJSONObject:color];
     } else if ([_styleType isEqualToString:@"vector"] && [expressionJSON respondsToSelector:@selector(objectEnumerator)] && [[[(NSArray*)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]) {
-        CGVector vector = [RCTMGLUtils toCGVector:(NSArray<NSNumber *> *)expressionJSON];
-        return [NSExpression expressionWithMGLJSONObject:[NSValue valueWithCGVector:vector]];
+        CGVector vector = [RCTMLNUtils 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 = [RCTMGLUtils toUIEdgeInsets:(NSArray<NSNumber *> *)expressionJSON];
-        return [NSExpression expressionWithMGLJSONObject:[NSValue valueWithUIEdgeInsets:edgeInsets]];
+        UIEdgeInsets edgeInsets = [RCTMLNUtils 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 MGL enum
+        // 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 expressionWithMGLJSONObject:rawValue];
+        return [NSExpression expressionWithMLNJSONObject:rawValue];
     } else if ([expressionJSON respondsToSelector:@selector(objectEnumerator)] && [[[(NSArray*)expressionJSON objectEnumerator] nextObject] isKindOfClass:[NSNumber class]]) {
         return [NSExpression expressionForConstantValue:expressionJSON];
     } else {
-        return [NSExpression expressionWithMGLJSONObject:expressionJSON];
+        return [NSExpression expressionWithMLNJSONObject:expressionJSON];
     }
 }
 
@@ -119,10 +119,10 @@
     }
 }
 
-- (MGLTransition)getTransition
+- (MLNTransition)getTransition
 {
     if (![expressionJSON isKindOfClass:[NSDictionary class]]) {
-        return MGLTransitionMake(0.f, 0.f);
+        return MLNTransitionMake(0.f, 0.f);
     }
     
     NSDictionary *config = (NSDictionary *)expressionJSON;
@@ -131,7 +131,7 @@
 
     const double millisecondsToSeconds = 1.0/1000.0;
     
-    return MGLTransitionMake(duration * millisecondsToSeconds, delay * millisecondsToSeconds);
+    return MLNTransitionMake(duration * millisecondsToSeconds, delay * millisecondsToSeconds);
 }
 
 - (NSExpression *)getSphericalPosition
@@ -142,8 +142,8 @@
     CLLocationDistance azimuthal = [values[1] doubleValue];
     CLLocationDistance polar = [values[2] doubleValue];
     
-    MGLSphericalPosition pos = MGLSphericalPositionMake(radial, azimuthal, polar);
-    return [NSExpression expressionWithMGLJSONObject:@(pos)];
+    MLNSphericalPosition pos = MLNSphericalPositionMake(radial, azimuthal, polar);
+    return [NSExpression expressionWithMLNJSONObject:@(pos)];
 }
 
 - (BOOL)isVisible
@@ -155,9 +155,9 @@
     return YES;
 }
 
-+ (RCTMGLStyleValue*)make:(NSDictionary*)rawStyleValue;
++ (RCTMLNStyleValue*)make:(NSDictionary*)rawStyleValue;
 {
-    RCTMGLStyleValue *styleValue = [[RCTMGLStyleValue alloc] init];
+    RCTMLNStyleValue *styleValue = [[RCTMLNStyleValue alloc] init];
     styleValue.styleType = (NSString *)rawStyleValue[@"styletype"];
     NSObject *object = [styleValue parse:(NSDictionary *)rawStyleValue[@"stylevalue"]];
     [styleValue setStyleObject:object];

package/ios/{RCTMGL/RCTMGLSymbolLayer.h → RCTMLN/RCTMLNSymbolLayer.h}

@@ -1,15 +1,15 @@
 //
-//  RCTMGLSymbolLayer.h
-//  RCTMGL
+//  RCTMLNSymbolLayer.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/19/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
 #import <React/RCTComponent.h>
-#import "RCTMGLVectorLayer.h"
+#import "RCTMLNVectorLayer.h"
 
-@interface RCTMGLSymbolLayer : RCTMGLVectorLayer<RCTInvalidating>
+@interface RCTMLNSymbolLayer : RCTMLNVectorLayer<RCTInvalidating>
 
 @property (nonatomic, strong) NSMutableArray<id<RCTComponent>> *reactSubviews;
 

package/ios/{RCTMGL/RCTMGLSymbolLayer.m → RCTMLN/RCTMLNSymbolLayer.m}

@@ -1,17 +1,17 @@
 //
-//  RCTMGLSymbolLayer.m
-//  RCTMGL
+//  RCTMLNSymbolLayer.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/19/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLSymbolLayer.h"
-#import "RCTMGLStyle.h"
+#import "RCTMLNSymbolLayer.h"
+#import "RCTMLNStyle.h"
 #import <React/UIView+React.h>
 #import <React/RCTLog.h>
 
-@implementation RCTMGLSymbolLayer
+@implementation RCTMLNSymbolLayer
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
@@ -55,7 +55,7 @@
     
     if (self.style != nil) {
         UIImage *image;
-        MGLSymbolStyleLayer *layer = (MGLSymbolStyleLayer *) self.styleLayer;
+        MLNSymbolStyleLayer *layer = (MLNSymbolStyleLayer *) self.styleLayer;
         
         if (_snapshot == YES) {
             image = [self _createViewSnapshot];
@@ -82,26 +82,26 @@
         if (image != nil) {
             [self.style setImage:image forName:self.id];
             
-            MGLSymbolStyleLayer *layer = (MGLSymbolStyleLayer *)self.styleLayer;
+            MLNSymbolStyleLayer *layer = (MLNSymbolStyleLayer *)self.styleLayer;
             layer.iconImageName = [NSExpression expressionForConstantValue:self.id];
         }
     }
 }
 
-- (MGLSymbolStyleLayer*)makeLayer:(MGLStyle*)style
+- (MLNSymbolStyleLayer*)makeLayer:(MLNStyle*)style
 {
-    MGLSource *source = [self layerWithSourceIDInStyle: style];
+    MLNSource *source = [self layerWithSourceIDInStyle: style];
     if (source == nil) { return nil; }
-    MGLSymbolStyleLayer *layer = [[MGLSymbolStyleLayer alloc] initWithIdentifier:self.id source:source];
+    MLNSymbolStyleLayer *layer = [[MLNSymbolStyleLayer alloc] initWithIdentifier:self.id source:source];
     layer.sourceLayerIdentifier = self.sourceLayerID;
     return layer;
 }
 
 - (void)addStyles
 {
-    RCTMGLStyle *style = [[RCTMGLStyle alloc] initWithMGLStyle:self.style];
+    RCTMLNStyle *style = [[RCTMLNStyle alloc] initWithMLNStyle:self.style];
     style.bridge = self.bridge;
-    [style symbolLayer:(MGLSymbolStyleLayer*)self.styleLayer withReactStyle:self.reactStyle isValid:^{ return [self isAddedToMap];
+    [style symbolLayer:(MLNSymbolStyleLayer*)self.styleLayer withReactStyle:self.reactStyle isValid:^{ return [self isAddedToMap];
     }];
 }
 

package/ios/{RCTMGL/RCTMGLSymbolLayerManager.h → RCTMLN/RCTMLNSymbolLayerManager.h}

@@ -1,6 +1,6 @@
 //
-//  RCTMGLSymbolLayerManager.h
-//  RCTMGL
+//  RCTMLNSymbolLayerManager.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/19/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
@@ -8,6 +8,6 @@
 
 #import "ViewManager.h"
 
-@interface RCTMGLSymbolLayerManager : ViewManager
+@interface RCTMLNSymbolLayerManager : ViewManager
 
 @end

package/ios/{RCTMGL/RCTMGLSymbolLayerManager.m → RCTMLN/RCTMLNSymbolLayerManager.m}

@@ -1,15 +1,15 @@
 //
-//  RCTMGLSymbolLayerManager.m
-//  RCTMGL
+//  RCTMLNSymbolLayerManager.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/19/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLSymbolLayerManager.h"
-#import "RCTMGLSymbolLayer.h"
+#import "RCTMLNSymbolLayerManager.h"
+#import "RCTMLNSymbolLayer.h"
 
-@implementation RCTMGLSymbolLayerManager
+@implementation RCTMLNSymbolLayerManager
 
 RCT_EXPORT_MODULE()
 
@@ -32,7 +32,7 @@ RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber);
 
 - (UIView*)view
 {
-    RCTMGLSymbolLayer *layer = [RCTMGLSymbolLayer new];
+    RCTMLNSymbolLayer *layer = [RCTMLNSymbolLayer new];
     layer.bridge = self.bridge;
     return layer;
 }

package/ios/{RCTMGL/RCTMGLTileSource.h → RCTMLN/RCTMLNTileSource.h}

@@ -1,12 +1,12 @@
 //
-//  RCTMGLTileSource.h
-//  RCTMGL
+//  RCTMLNTileSource.h
+//  RCTMLN
 //
 
-#import "RCTMGLSource.h"
-@import Mapbox;
+#import "RCTMLNSource.h"
+@import MapLibre;
 
-@interface RCTMGLTileSource : RCTMGLSource
+@interface RCTMLNTileSource : RCTMLNSource
 
 @property (nonatomic, copy) NSString *url;
 @property (nonatomic, strong) NSArray<NSString *> *tileUrlTemplates;
@@ -17,6 +17,6 @@
 
 @property (nonatomic, assign) BOOL tms;
 
-- (NSDictionary<MGLTileSourceOption, id>*)getOptions;
+- (NSDictionary<MLNTileSourceOption, id>*)getOptions;
 
 @end

package/ios/RCTMLN/RCTMLNTileSource.m

@@ -0,0 +1,31 @@
+//
+//  BaseSource.m
+//  RCTMLN
+//
+
+#import "RCTMLNTileSource.h"
+
+@implementation RCTMLNTileSource
+
+- (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/RCTMLN/RCTMLNUserLocation.h

@@ -0,0 +1,15 @@
+//
+//  RCTMLNUserLocation.h
+//  RCTMLN
+
+#import <Foundation/Foundation.h>
+#import <CoreLocation/CoreLocation.h>
+#import <MapLibre/MLNUserLocationAnnotationView.h>
+
+@interface RCTMLNUserLocation : NSObject
+
++ (id)sharedInstance;
+
+- (MLNUserLocationAnnotationView*)hiddenUserAnnotation;
+
+@end

package/ios/{RCTMGL/RCTMGLUserLocation.m → RCTMLN/RCTMLNUserLocation.m}

@@ -1,12 +1,12 @@
 //
-//  RCTMGLUserLocation.m
-//  RCTMGL
+//  RCTMLNUserLocation.m
+//  RCTMLN
 //
 
-#import "RCTMGLUserLocation.h"
-#import <Mapbox/MGLUserLocationAnnotationView.h>
+#import "RCTMLNUserLocation.h"
+#import <MapLibre/MLNUserLocationAnnotationView.h>
 
-@interface HiddenUserLocationAnnotationView : MGLUserLocationAnnotationView
+@interface HiddenUserLocationAnnotationView : MLNUserLocationAnnotationView
 
 @end
 
@@ -20,17 +20,17 @@
 @end
 
 
-@implementation RCTMGLUserLocation : NSObject
+@implementation RCTMLNUserLocation : NSObject
 
 + (id)sharedInstance
 {
-    static RCTMGLUserLocation *userLocation = nil;
+    static RCTMLNUserLocation *userLocation = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{ userLocation = [[self alloc] init]; });
     return userLocation;
 }
 
-- (MGLUserLocationAnnotationView*)hiddenUserAnnotation
+- (MLNUserLocationAnnotationView*)hiddenUserAnnotation
 {
     return [[HiddenUserLocationAnnotationView alloc] init];
 }

package/ios/{RCTMGL/RCTMGLUtils.h → RCTMLN/RCTMLNUtils.h}

@@ -1,6 +1,6 @@
 //
 //  RCTConvert+Mapbox.h
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 8/23/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
@@ -11,19 +11,19 @@
 #import <React/RCTConvert.h>
 #import <React/RCTImageLoader.h>
 
-@import Mapbox;
+@import MapLibre;
 
-@interface RCTMGLUtils: NSObject
+@interface RCTMLNUtils: NSObject
 
 + (CLLocationCoordinate2D)fromFeature:(NSString*)json;
-+ (MGLShape*)shapeFromGeoJSON:(NSString*)json;
-+ (MGLCoordinateBounds)fromFeatureCollection:(NSString*)json;
-+ (NSArray<NSNumber *> *)fromCoordinateBounds:(MGLCoordinateBounds)bounds;
++ (MLNShape*)shapeFromGeoJSON:(NSString*)json;
++ (MLNCoordinateBounds)fromFeatureCollection:(NSString*)json;
++ (NSArray<NSNumber *> *)fromCoordinateBounds:(MLNCoordinateBounds)bounds;
 + (NSTimeInterval)fromMS:(NSNumber*)number;
 + (NSNumber*)clamp:(NSNumber*)value min:(NSNumber*)min max:(NSNumber*)max;
 + (UIColor*)toColor:(id)value;
 + (void)fetchImage:(RCTBridge*)bridge url:(NSString*)url scale:(double)scale callback:(RCTImageLoaderCompletionBlock)callback;
-+ (void)fetchImages:(RCTBridge *)bridge style:(MGLStyle *)style objects:(NSDictionary<NSString *, NSString *>*)objects forceUpdate:(BOOL)forceUpdate callback:(void (^)(void))callback;
++ (void)fetchImages:(RCTBridge *)bridge style:(MLNStyle *)style objects:(NSDictionary<NSString *, NSString *>*)objects forceUpdate:(BOOL)forceUpdate callback:(void (^)(void))callback;
 + (CGVector)toCGVector:(NSArray<NSNumber*>*)arr;
 + (UIEdgeInsets)toUIEdgeInsets:(NSArray<NSNumber *> *)arr;
 + (NSURL*)styleURLFromStyleJSON:(NSString *)styleJSON;

package/ios/{RCTMGL/RCTMGLUtils.m → RCTMLN/RCTMLNUtils.m}

@@ -1,24 +1,24 @@
 //
 //  RCTConvert+Mapbox.m
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 8/23/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLUtils.h"
-#import "RCTMGLImageQueue.h"
+#import "RCTMLNUtils.h"
+#import "RCTMLNImageQueue.h"
 
-@import Mapbox;
+@import MapLibre;
 
-@implementation RCTMGLUtils
+@implementation RCTMLNUtils
 
 static double const MS_TO_S = 0.001;
 
 + (CLLocationCoordinate2D)fromFeature:(NSString*)jsonStr
 {
     NSData* data = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
-    MGLPointFeature *feature = (MGLPointFeature*)[MGLShape shapeWithData:data encoding:NSUTF8StringEncoding error:nil];
+    MLNPointFeature *feature = (MLNPointFeature*)[MLNShape shapeWithData:data encoding:NSUTF8StringEncoding error:nil];
     return feature.coordinate;
 }
 
@@ -27,11 +27,11 @@ static double const MS_TO_S = 0.001;
     return UIEdgeInsetsMake([arr[0] floatValue], [arr[1] floatValue], [arr[2] floatValue], [arr[3] floatValue]);
 }
 
-+ (MGLShape*)shapeFromGeoJSON:(NSString*)jsonStr
++ (MLNShape*)shapeFromGeoJSON:(NSString*)jsonStr
 {
     NSData* data = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
     NSError* error = nil;
-    MGLShape* result = [MGLShape shapeWithData:data encoding:NSUTF8StringEncoding error:&error];
+    MLNShape* result = [MLNShape shapeWithData:data encoding:NSUTF8StringEncoding error:&error];
     if (error != nil) {
       RCTLogWarn(@"Failed to convert data to shape error:%@ src:%@", error, jsonStr);
     }
@@ -47,18 +47,18 @@ static double const MS_TO_S = 0.001;
     return [NSString stringWithFormat:@"%lu", (unsigned long)hash];
 }
 
-+ (MGLCoordinateBounds)fromFeatureCollection:(NSString*)jsonStr
++ (MLNCoordinateBounds)fromFeatureCollection:(NSString*)jsonStr
 {
     NSData* data = [jsonStr dataUsingEncoding:NSUTF8StringEncoding];
-    MGLShapeCollectionFeature *featureCollection = (MGLShapeCollectionFeature*)[MGLShapeCollectionFeature shapeWithData:data encoding:NSUTF8StringEncoding error:nil];
+    MLNShapeCollectionFeature *featureCollection = (MLNShapeCollectionFeature*)[MLNShapeCollectionFeature shapeWithData:data encoding:NSUTF8StringEncoding error:nil];
     
     CLLocationCoordinate2D ne = featureCollection.shapes[0].coordinate;
     CLLocationCoordinate2D sw = featureCollection.shapes[1].coordinate;
     
-    return MGLCoordinateBoundsMake(sw, ne);
+    return MLNCoordinateBoundsMake(sw, ne);
 }
 
-+ (NSArray<NSNumber *> *)fromCoordinateBounds:(MGLCoordinateBounds)bounds
++ (NSArray<NSNumber *> *)fromCoordinateBounds:(MLNCoordinateBounds)bounds
 {
     return @[
         @[@(bounds.ne.longitude), @(bounds.ne.latitude)],
@@ -90,10 +90,10 @@ static double const MS_TO_S = 0.001;
 
 + (void)fetchImage:(RCTBridge*)bridge url:(NSString *)url scale:(double)scale callback:(RCTImageLoaderCompletionBlock)callback
 {
-    [RCTMGLImageQueue.sharedInstance addImage:url scale:scale bridge:bridge completionHandler:callback];
+    [RCTMLNImageQueue.sharedInstance addImage:url scale:scale bridge:bridge completionHandler:callback];
 }
 
-+ (void)fetchImages:(RCTBridge *)bridge style:(MGLStyle *)style objects:(NSDictionary<NSString *, id>*)objects forceUpdate:(BOOL)forceUpdate callback:(void (^)(void))callback
++ (void)fetchImages:(RCTBridge *)bridge style:(MLNStyle *)style objects:(NSDictionary<NSString *, id>*)objects forceUpdate:(BOOL)forceUpdate callback:(void (^)(void))callback
 {
     if (objects == nil) {
         callback();
@@ -107,7 +107,7 @@ static double const MS_TO_S = 0.001;
     }
     
     __block NSUInteger imagesLeftToLoad = imageNames.count;
-    __weak MGLStyle *weakStyle = style;
+    __weak MLNStyle *weakStyle = style;
     
     void (^imageLoadedBlock)(void) = ^{
         imagesLeftToLoad--;
@@ -124,7 +124,7 @@ static double const MS_TO_S = 0.001;
             NSDictionary* image = objects[imageName];
             BOOL hasScale = [image isKindOfClass:[NSDictionary class]] && ([image objectForKey:@"scale"] != nil);
             double scale = hasScale ? [[image objectForKey:@"scale"] doubleValue] : 1.0;
-            [RCTMGLImageQueue.sharedInstance addImage:objects[imageName] scale:scale bridge:bridge completionHandler:^(NSError *error, UIImage *image) {
+            [RCTMLNImageQueue.sharedInstance addImage:objects[imageName] scale:scale bridge:bridge completionHandler:^(NSError *error, UIImage *image) {
               if (!image) {
                 RCTLogWarn(@"Failed to fetch image: %@ error:%@", imageName, error);
               }
@@ -145,7 +145,7 @@ static double const MS_TO_S = 0.001;
 {
     static NSString *styleJsonTempDirectory;
     if (!styleJsonTempDirectory) {
-        styleJsonTempDirectory = [NSTemporaryDirectory() stringByAppendingPathComponent:@"RCTMGLStyleJSON"];
+        styleJsonTempDirectory = [NSTemporaryDirectory() stringByAppendingPathComponent:@"RCTMLNStyleJSON"];
     }
     return styleJsonTempDirectory;
 }
@@ -159,7 +159,7 @@ static double const MS_TO_S = 0.001;
 + (void)cleanCustomStyleJSONCacheIfNeeded
 {
     NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSString *styleJsonTempDirectory = [RCTMGLUtils getStyleJsonTempDirectory];
+    NSString *styleJsonTempDirectory = [RCTMLNUtils getStyleJsonTempDirectory];
     
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
@@ -175,10 +175,10 @@ static double const MS_TO_S = 0.001;
  */
 + (NSURL*)styleURLFromStyleJSON:(NSString *)styleJSON
 {
-    [RCTMGLUtils cleanCustomStyleJSONCacheIfNeeded];
+    [RCTMLNUtils cleanCustomStyleJSONCacheIfNeeded];
     
     NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSString *styleJsonTempDirectory = [RCTMGLUtils getStyleJsonTempDirectory];
+    NSString *styleJsonTempDirectory = [RCTMLNUtils getStyleJsonTempDirectory];
     
     // attempt to create the temporary directory
     if (![fileManager fileExistsAtPath:styleJsonTempDirectory]) {

package/ios/{RCTMGL/RCTMGLVectorLayer.h → RCTMLN/RCTMLNVectorLayer.h}

@@ -1,14 +1,14 @@
 //
-//  RCTMGLCircleLayer.h
-//  RCTMGL
+//  RCTMLNCircleLayer.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/18/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLLayer.h"
+#import "RCTMLNLayer.h"
 
-@interface RCTMGLVectorLayer : RCTMGLLayer
+@interface RCTMLNVectorLayer : RCTMLNLayer
 
 @property (nonatomic, copy) NSString *sourceLayerID;
 

package/ios/{RCTMGL/RCTMGLVectorLayer.m → RCTMLN/RCTMLNVectorLayer.m}

@@ -1,17 +1,17 @@
 //
-//  RCTMGLCircleLayer.m
-//  RCTMGL
+//  RCTMLNCircleLayer.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/18/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLVectorLayer.h"
-#import "RCTMGLStyle.h"
+#import "RCTMLNVectorLayer.h"
+#import "RCTMLNStyle.h"
 #import "FilterParser.h"
 #import <React/RCTLog.h>
 
-@implementation RCTMGLVectorLayer
+@implementation RCTMLNVectorLayer
 
 
 - (NSPredicate*)buildFilters
@@ -22,7 +22,7 @@
 - (void)updateFilter:(NSPredicate *)predicate
 {
     @try {
-        ((MGLVectorStyleLayer *) self.styleLayer).predicate = predicate;
+        ((MLNVectorStyleLayer *) self.styleLayer).predicate = predicate;
     }
     @catch (NSException* exception) {
         RCTLogError(@"Invalid predicate: %@ on layer %@ - %@ reason: %@", predicate, self, exception.name, exception.reason);
@@ -34,7 +34,7 @@
     _sourceLayerID = sourceLayerID;
     
     if (self.styleLayer != nil) {
-        ((MGLVectorStyleLayer*) self.styleLayer).sourceLayerIdentifier = _sourceLayerID;
+        ((MLNVectorStyleLayer*) self.styleLayer).sourceLayerIdentifier = _sourceLayerID;
     }
 }
 

package/ios/{RCTMGL/RCTMGLVectorSource.h → RCTMLN/RCTMLNVectorSource.h}

@@ -1,16 +1,16 @@
 //
-//  RCTMGLVectorSource.h
-//  RCTMGL
+//  RCTMLNVectorSource.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/8/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLTileSource.h"
-@import Mapbox;
+#import "RCTMLNTileSource.h"
+@import MapLibre;
 
-@interface RCTMGLVectorSource : RCTMGLTileSource
+@interface RCTMLNVectorSource : RCTMLNTileSource
 
-- (nonnull NSArray<id <MGLFeature>> *)featuresInSourceLayersWithIdentifiers:(nonnull NSSet<NSString *> *)sourceLayerIdentifiers predicate:(nullable NSPredicate *)predicate;
+- (nonnull NSArray<id <MLNFeature>> *)featuresInSourceLayersWithIdentifiers:(nonnull NSSet<NSString *> *)sourceLayerIdentifiers predicate:(nullable NSPredicate *)predicate;
 
 @end