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

package/ios/{RCTMGL/RCTMGLImageSourceManager.m → RCTMLN/RCTMLNImageSourceManager.m}

@@ -1,15 +1,15 @@
 //
-//  RCTMGLImageSourceManager.m
-//  RCTMGL
+//  RCTMLNImageSourceManager.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 11/29/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLImageSourceManager.h"
-#import "RCTMGLImageSource.h"
+#import "RCTMLNImageSourceManager.h"
+#import "RCTMLNImageSource.h"
 
-@implementation RCTMGLImageSourceManager
+@implementation RCTMLNImageSourceManager
 
 RCT_EXPORT_MODULE()
 
@@ -19,7 +19,7 @@ RCT_EXPORT_VIEW_PROPERTY(coordinates, NSArray)
 
 - (UIView*)view
 {
-    return [RCTMGLImageSource new];
+    return [RCTMLNImageSource new];
 }
 
 @end

package/ios/{RCTMGL/RCTMGLImages.h → RCTMLN/RCTMLNImages.h}

@@ -2,15 +2,15 @@
 #import <React/RCTComponent.h>
 #import <UIKit/UIKit.h>
 
-@import Mapbox;
+@import MapLibre;
 
-@class RCTMGLMapView;
+@class RCTMLNMapView;
 
-@interface RCTMGLImages : UIView
+@interface RCTMLNImages : UIView
 
 @property (nonatomic, weak) RCTBridge *bridge;
 
-@property (nonatomic, strong) RCTMGLMapView *map;
+@property (nonatomic, strong) RCTMLNMapView *map;
 
 @property (nonatomic, strong) NSDictionary<NSString *, NSString *> *images;
 @property (nonatomic, strong) NSArray<NSString *> *nativeImages;

package/ios/{RCTMGL/RCTMGLImages.m → RCTMLN/RCTMLNImages.m}

@@ -1,12 +1,12 @@
-#import "RCTMGLImages.h"
+#import "RCTMLNImages.h"
 #import <React/UIView+React.h>
-#import "RCTMGLMapView.h"
-#import "RCTMGLUtils.h"
-#import "RCTMGLEvent.h"
-#import "RCTMGLEventTypes.h"
+#import "RCTMLNMapView.h"
+#import "RCTMLNUtils.h"
+#import "RCTMLNEvent.h"
+#import "RCTMLNEventTypes.h"
 
 
-@implementation RCTMGLImages : UIView
+@implementation RCTMLNImages : UIView
 
 static UIImage * _placeHolderImage;
 
@@ -61,7 +61,7 @@ static UIImage * _placeHolderImage;
 
 - (void) sendImageMissingEvent:(NSString *)imageName {
     NSDictionary *payload = @{ @"imageKey": imageName };
-    RCTMGLEvent *event = [RCTMGLEvent makeEvent:RCT_MAPBOX_IMAGES_MISSING_IMAGE withPayload:payload];
+    RCTMLNEvent *event = [RCTMLNEvent makeEvent:RCT_MAPBOX_IMAGES_MISSING_IMAGE withPayload:payload];
     if (_onImageMissing) {
         _onImageMissing([event toJSON]);
     }
@@ -72,7 +72,7 @@ static UIImage * _placeHolderImage;
     if (!nativeImages) return;
 
     for (NSString *imageName in nativeImages) {
-        // only add native images if they are not in the style yet (similar to [RCTMGLUtils fetchImages: style:])
+        // only add native images if they are not in the style yet (similar to [RCTMLNUtils fetchImages: style:])
         if (![self.map.style imageForName:imageName]) {
             UIImage *image = [UIImage imageNamed:imageName];
             [self.map.style setImage:image forName:imageName];
@@ -94,14 +94,14 @@ static UIImage * _placeHolderImage;
     // See also: https://github.com/mapbox/mapbox-gl-native/pull/14253#issuecomment-478827792
     for (NSString *imageName in remoteImages.allKeys) {
         if (![self.map.style imageForName:imageName]) {
-            [self.map.style setImage:[RCTMGLImages placeholderImage] forName:imageName];
+            [self.map.style setImage:[RCTMLNImages placeholderImage] forName:imageName];
             [missingImages setValue:_images[imageName] forKey:imageName];
         }
     }
     
     if (missingImages.count > 0) {
         // forceUpdate to ensure the placeholder images are updated
-        [RCTMGLUtils fetchImages:_bridge style:self.map.style objects:_images forceUpdate:true callback:^{ }];
+        [RCTMLNUtils fetchImages:_bridge style:self.map.style objects:_images forceUpdate:true callback:^{ }];
     }
 }
 

package/ios/RCTMLN/RCTMLNImagesManager.h

@@ -0,0 +1,5 @@
+#import "ViewManager.h"
+
+@interface RCTMLNImagesManager : ViewManager
+
+@end

package/ios/{RCTMGL/RCTMGLImagesManager.m → RCTMLN/RCTMLNImagesManager.m}

@@ -1,7 +1,7 @@
-#import "RCTMGLImagesManager.h"
-#import "RCTMGLImages.h"
+#import "RCTMLNImagesManager.h"
+#import "RCTMLNImages.h"
 
-@implementation RCTMGLImagesManager
+@implementation RCTMLNImagesManager
 
 RCT_EXPORT_MODULE()
 
@@ -13,7 +13,7 @@ RCT_REMAP_VIEW_PROPERTY(onImageMissing, onImageMissing, RCTBubblingEventBlock)
 
 - (UIView*)view
 {
-    RCTMGLImages *images = [RCTMGLImages new];
+    RCTMLNImages *images = [RCTMLNImages new];
     images.bridge = self.bridge;
     return images;
 }

package/ios/{RCTMGL/RCTMGLLayer.h → RCTMLN/RCTMLNLayer.h}

@@ -1,6 +1,6 @@
 //
 //  BaseLayer.h
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/8/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
@@ -10,17 +10,17 @@
 #import <React/RCTBridge.h>
 
 
-@class RCTMGLMapView;
+@class RCTMLNMapView;
 
-@import Mapbox;
+@import MapLibre;
 
-@interface RCTMGLLayer<T> : UIView
+@interface RCTMLNLayer<T> : UIView
 
 @property (nonatomic, weak, nullable) RCTBridge* bridge;
 
-@property (nonatomic, strong, nullable) MGLStyleLayer *styleLayer;
-@property (nonatomic, strong, nullable) MGLStyle *style;
-@property (nonatomic, weak, nullable) RCTMGLMapView* map;
+@property (nonatomic, strong, nullable) MLNStyleLayer *styleLayer;
+@property (nonatomic, strong, nullable) MLNStyle *style;
+@property (nonatomic, weak, nullable) RCTMLNMapView* map;
 @property (nonatomic, strong, nullable) NSDictionary *reactStyle;
 @property (nonatomic, strong, nullable) NSArray *filter;
 
@@ -34,10 +34,10 @@
 @property (nonatomic, copy, nullable) NSNumber *maxZoomLevel;
 @property (nonatomic, copy, nullable) NSNumber *minZoomLevel;
 
-- (void)addToMap:(nonnull RCTMGLMapView*)map style:(nonnull MGLStyle*)style;
+- (void)addToMap:(nonnull RCTMLNMapView*)map style:(nonnull MLNStyle*)style;
 - (void)addedToMap;
-- (void)removeFromMap:(nonnull MGLStyle*)style;
-- (nullable T)makeLayer:(nonnull MGLStyle*)style;
+- (void)removeFromMap:(nonnull MLNStyle*)style;
+- (nullable T)makeLayer:(nonnull MLNStyle*)style;
 - (void)addStyles;
 - (void)insertAbove:(nonnull NSString*)layer;
 - (void)insertBelow:(nonnull NSString*)layer;
@@ -47,6 +47,6 @@
 
 - (BOOL)isAddedToMap;
 
-- (nullable MGLSource*)layerWithSourceIDInStyle:(nonnull MGLStyle*) style;
+- (nullable MLNSource*)layerWithSourceIDInStyle:(nonnull MLNStyle*) style;
 
 @end

package/ios/{RCTMGL/RCTMGLLayer.m → RCTMLN/RCTMLNLayer.m}

@@ -1,18 +1,18 @@
 //
 //  BaseLayer.m
-//  RCTMGL
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/8/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLLayer.h"
-#import "RCTMGLSource.h"
-#import "RCTMGLStyleValue.h"
-#import "RCTMGLUtils.h"
-#import "RCTMGLMapView.h"
+#import "RCTMLNLayer.h"
+#import "RCTMLNSource.h"
+#import "RCTMLNStyleValue.h"
+#import "RCTMLNUtils.h"
+#import "RCTMLNMapView.h"
 
-@implementation RCTMGLLayer
+@implementation RCTMLNLayer
 
 - (void)setMinZoomLevel:(NSNumber*)minZoomLevel
 {
@@ -71,7 +71,7 @@
     }
 }
 
-- (void)setMap:(RCTMGLMapView *)map {
+- (void)setMap:(RCTMLNMapView *)map {
     if (map == nil) {
         [self removeFromMap:_map.style];
         _map = nil;
@@ -92,7 +92,7 @@
     }
 }
 
-- (void)addToMap:(RCTMGLMapView*) map style:(MGLStyle *)style
+- (void)addToMap:(RCTMLNMapView*) map style:(MLNStyle *)style
 {
     if (style == nil) {
         return;
@@ -103,7 +103,7 @@
       RCTLogError(@"Cannot add a layer without id to the map: %@", self);
       return;
     }
-    MGLStyleLayer *existingLayer = [style layerWithIdentifier:_id];
+    MLNStyleLayer *existingLayer = [style layerWithIdentifier:_id];
     if (existingLayer != nil) {
         _styleLayer = existingLayer;
     } else {
@@ -119,16 +119,16 @@
     [self addedToMap];
 }
 
-- (nullable MGLSource*)layerWithSourceIDInStyle:(nonnull MGLStyle*) style
+- (nullable MLNSource*)layerWithSourceIDInStyle:(nonnull MLNStyle*) style
 {
-    MGLSource* result = [style sourceWithIdentifier: self.sourceID];
+    MLNSource* result = [style sourceWithIdentifier: self.sourceID];
     if (result == NULL) {
         RCTLogError(@"Cannot find layer with id: %@ referenced by layer:%@", self.sourceID, _id);
     }
     return result;
 }
 
-- (void)removeFromMap:(MGLStyle *)style
+- (void)removeFromMap:(MLNStyle *)style
 {
     if (_styleLayer != nil) {
         [style removeLayer:_styleLayer];
@@ -141,7 +141,7 @@
     return (_style != nil);
 }
 
-- (nullable MGLStyleLayer*)makeLayer:(MGLStyle*)style
+- (nullable MLNStyleLayer*)makeLayer:(MLNStyle*)style
 {
     @throw [NSException exceptionWithName:NSInternalInconsistencyException
                         reason:[NSString stringWithFormat:@"You must override %@ in a subclass", NSStringFromSelector(_cmd)]
@@ -160,7 +160,7 @@
     // override if you want
 }
 
-- (void)insertLayer: (RCTMGLMapView*) map
+- (void)insertLayer: (RCTMLNMapView*) map
 {
     if ([_style layerWithIdentifier:_id] != nil) {
         return; // prevent layer from being added twice
@@ -193,7 +193,7 @@
 
 -(void)insertAbove:(NSString*)aboveLayerIDs
 {
-    [_map waitForLayerWithID: aboveLayerIDs then:^void (MGLStyleLayer* layer) {
+    [_map waitForLayerWithID: aboveLayerIDs then:^void (MLNStyleLayer* layer) {
         if (![self _hasInitialized]) {
             return;
         }
@@ -204,7 +204,7 @@
 
 -(void)insertBelow:(NSString*)belowLayerID
 {
-    [_map waitForLayerWithID: belowLayerID then:^void (MGLStyleLayer* layer) {
+    [_map waitForLayerWithID: belowLayerID then:^void (MLNStyleLayer* layer) {
         if (![self _hasInitialized]) {
             return;
         }

package/ios/{RCTMGL/RCTMGLLight.h → RCTMLN/RCTMLNLight.h}

@@ -1,17 +1,17 @@
 //
-//  RCTMGLLight.h
-//  RCTMGL
+//  RCTMLNLight.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/26/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
-@import Mapbox;
+@import MapLibre;
 
-@interface RCTMGLLight : UIView
+@interface RCTMLNLight : UIView
 
-@property (nonatomic, strong) MGLMapView *map;
+@property (nonatomic, strong) MLNMapView *map;
 @property (nonatomic, strong) NSDictionary *reactStyle;
 
 @end

package/ios/{RCTMGL/RCTMGLLight.m → RCTMLN/RCTMLNLight.m}

@@ -1,17 +1,17 @@
 //
-//  RCTMGLLight.m
-//  RCTMGL
+//  RCTMLNLight.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/26/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLLight.h"
-#import "RCTMGLStyle.h"
+#import "RCTMLNLight.h"
+#import "RCTMLNStyle.h"
 
-@implementation RCTMGLLight
+@implementation RCTMLNLight
 {
-    MGLLight *internalLight;
+    MLNLight *internalLight;
 }
 
 - (void)setReactStyle:(NSDictionary *)reactStyle
@@ -23,7 +23,7 @@
     }
 }
 
-- (void)setMap:(MGLMapView *)map
+- (void)setMap:(MLNMapView *)map
 {
     _map = map;
     [self addStyles];
@@ -35,8 +35,8 @@
 
 - (void)addStyles
 {
-    MGLLight *light = [[MGLLight alloc] init];
-    RCTMGLStyle *style = [[RCTMGLStyle alloc] init];
+    MLNLight *light = [[MLNLight alloc] init];
+    RCTMLNStyle *style = [[RCTMLNStyle alloc] init];
     [style lightLayer:light withReactStyle:_reactStyle isValid:^{
         return [self isAddedToMap];
     }];

package/ios/{RCTMGL/RCTMGLLightManager.h → RCTMLN/RCTMLNLightManager.h}

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

package/ios/{RCTMGL/RCTMGLLightManager.m → RCTMLN/RCTMLNLightManager.m}

@@ -1,15 +1,15 @@
 //
-//  RCTMGLLightManager.m
-//  RCTMGL
+//  RCTMLNLightManager.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/26/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLLightManager.h"
-#import "RCTMGLLight.h"
+#import "RCTMLNLightManager.h"
+#import "RCTMLNLight.h"
 
-@implementation RCTMGLLightManager
+@implementation RCTMLNLightManager
 
 RCT_EXPORT_MODULE()
 
@@ -17,7 +17,7 @@ RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary);
 
 - (UIView*)view
 {
-    return [RCTMGLLight new];
+    return [RCTMLNLight new];
 }
 
 @end

package/ios/RCTMLN/RCTMLNLineLayer.h

@@ -0,0 +1,14 @@
+//
+//  RCTMLNLineLayer.h
+//  RCTMLN
+//
+//  Created by Nick Italiano on 9/18/17.
+//  Copyright © 2017 Mapbox Inc. All rights reserved.
+//
+
+#import "RCTMLNVectorLayer.h"
+@import MapLibre;
+
+@interface RCTMLNLineLayer : RCTMLNVectorLayer
+
+@end

package/ios/{RCTMGL/RCTMGLLineLayer.m → RCTMLN/RCTMLNLineLayer.m}

@@ -1,31 +1,31 @@
 //
-//  RCTMGLLineLayer.m
-//  RCTMGL
+//  RCTMLNLineLayer.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/18/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLLineLayer.h"
-#import "RCTMGLStyle.h"
+#import "RCTMLNLineLayer.h"
+#import "RCTMLNStyle.h"
 #import <React/RCTLog.h>
 
-@implementation RCTMGLLineLayer
+@implementation RCTMLNLineLayer
 
-- (MGLLineStyleLayer*)makeLayer:(MGLStyle*)style
+- (MLNLineStyleLayer*)makeLayer:(MLNStyle*)style
 {
-    MGLSource *source = [self layerWithSourceIDInStyle:style];
+    MLNSource *source = [self layerWithSourceIDInStyle:style];
     if (source == nil) { return nil; }
-    MGLLineStyleLayer *layer = [[MGLLineStyleLayer alloc] initWithIdentifier:self.id source:source];
+    MLNLineStyleLayer *layer = [[MLNLineStyleLayer 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 lineLayer:(MGLLineStyleLayer *)self.styleLayer withReactStyle:self.reactStyle isValid:^{
+    [style lineLayer:(MLNLineStyleLayer *)self.styleLayer withReactStyle:self.reactStyle isValid:^{
         return [self isAddedToMap];
     }];
 }

package/ios/{RCTMGL/RCTMGLLineLayerManager.h → RCTMLN/RCTMLNLineLayerManager.h}

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

package/ios/{RCTMGL/RCTMGLLineLayerManager.m → RCTMLN/RCTMLNLineLayerManager.m}

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

package/ios/{RCTMGL/RCTMGLLocation.h → RCTMLN/RCTMLNLocation.h}

@@ -1,6 +1,6 @@
 //
-//  RCTMGLLocation.h
-//  RCTMGL
+//  RCTMLNLocation.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 6/21/18.
 //  Copyright © 2018 Mapbox Inc. All rights reserved.
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
 
-@interface RCTMGLLocation : NSObject
+@interface RCTMLNLocation : NSObject
 
 @property (nonatomic, strong) CLLocation *location;
 @property (nonatomic, strong) CLHeading *heading;

package/ios/{RCTMGL/RCTMGLLocation.m → RCTMLN/RCTMLNLocation.m}

@@ -1,14 +1,14 @@
 //
-//  RCTMGLLocation.m
-//  RCTMGL
+//  RCTMLNLocation.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 6/21/18.
 //  Copyright © 2018 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLLocation.h"
+#import "RCTMLNLocation.h"
 
-@implementation RCTMGLLocation
+@implementation RCTMLNLocation
 
 - (NSDictionary<NSString *, id> *)toJSON
 {

package/ios/RCTMLN/RCTMLNLocationManager.h

@@ -0,0 +1,30 @@
+//
+//  RCTMLNLocationManager.h
+//  RCTMLN
+//
+//  Created by Nick Italiano on 6/21/18.
+//  Copyright © 2018 Mapbox Inc. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import "RCTMLNLocation.h"
+#import "RCTMLNLocationManagerDelegate.h"
+
+typedef void (^RCTMLNLocationBlock)(RCTMLNLocation *location);
+
+@interface RCTMLNLocationManager : NSObject
+
+@property (nonatomic, strong) id<RCTMLNLocationManagerDelegate> delegate;
+
++ (id)sharedInstance;
+
+- (void)start:(CLLocationDistance)minDisplacement;
+- (void)stop;
+- (void)setMinDisplacement:(CLLocationDistance)minDisplacement;
+- (BOOL)isEnabled;
+- (RCTMLNLocation *)getLastKnownLocation;
+- (void)addListener:(RCTMLNLocationBlock)listener;
+- (void)removeListener:(RCTMLNLocationBlock)listener;
+
+@end