@maplibre/maplibre-react-native 9.1.0 → 10.0.0-alpha.10

package/ios/RCTMLN/RCTMLNLogging.h

@@ -0,0 +1,18 @@
+#ifndef RCTMLNLogging_h
+#define RCTMLNLogging_h
+
+#import <Foundation/Foundation.h>
+#import <React/RCTEventEmitter.h>
+
+
+@class MLNLoggingConfiguration;
+
+@interface RCTMLNLogging : RCTEventEmitter <RCTBridgeModule>
+
+@property (nonatomic, nonnull) MLNLoggingConfiguration*  loggingConfiguration;
+
+- (void)setLoggingLevel:(nonnull NSString*) logLevel;
+
+@end
+
+#endif /* RCTMLNLogging_h */

package/ios/{RCTMGL/RCTMGLLogging.m → RCTMLN/RCTMLNLogging.m}

@@ -1,15 +1,15 @@
-#import "RCTMGLLogging.h"
+#import "RCTMLNLogging.h"
 
-@import Mapbox;
+@import MapLibre;
 
-@interface RCTMGLLogging()
+@interface RCTMLNLogging()
 @property (nonatomic) BOOL hasListeners;
 @end
 
-@implementation RCTMGLLogging
+@implementation RCTMLNLogging
 
 + (id)allocWithZone:(NSZone *)zone {
-    static RCTMGLLogging *sharedInstance = nil;
+    static RCTMLNLogging *sharedInstance = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         sharedInstance = [super allocWithZone:zone];
@@ -19,10 +19,10 @@
 
 -(id)init {
     if ( self = [super init] ) {
-        self.loggingConfiguration = [MGLLoggingConfiguration sharedConfiguration];
-        [self.loggingConfiguration  setLoggingLevel:MGLLoggingLevelWarning];
+        self.loggingConfiguration = [MLNLoggingConfiguration sharedConfiguration];
+        [self.loggingConfiguration  setLoggingLevel:MLNLoggingLevelWarning];
         __weak typeof(self) weakSelf = self;
-        self.loggingConfiguration.handler = ^(MGLLoggingLevel loggingLevel, NSString *filePath, NSUInteger line, NSString *message) {
+        self.loggingConfiguration.handler = ^(MLNLoggingLevel loggingLevel, NSString *filePath, NSUInteger line, NSString *message) {
             [weakSelf sendLogWithLevel:loggingLevel filePath: filePath line: line message: message];
         };
     }
@@ -53,33 +53,33 @@ RCT_EXPORT_MODULE();
     self.hasListeners = false;
 }
 
-- (void)sendLogWithLevel:(MGLLoggingLevel)loggingLevel filePath:(NSString*)filePath line:(NSUInteger)line message:(NSString*)message
+- (void)sendLogWithLevel:(MLNLoggingLevel)loggingLevel filePath:(NSString*)filePath line:(NSUInteger)line message:(NSString*)message
 {
     if (!self.hasListeners) return;
 
     NSString* level = @"n/a";
     switch (loggingLevel) {
-    case MGLLoggingLevelInfo:
+    case MLNLoggingLevelInfo:
         level = @"info";
         break;
-    case MGLLoggingLevelError:
+    case MLNLoggingLevelError:
         level = @"error";
         break;
-#if MGL_LOGGING_ENABLE_DEBUG
-    case MGLLoggingLevelDebug:
+#if MLN_LOGGING_ENABLE_DEBUG
+    case MLNLoggingLevelDebug:
         level = @"debug";
         break;
 #endif
-    case MGLLoggingLevelWarning:
+    case MLNLoggingLevelWarning:
         level = @"warning";
         break;
-    case MGLLoggingLevelNone:
+    case MLNLoggingLevelNone:
         level = @"none";
         break;
-    case MGLLoggingLevelFault:
+    case MLNLoggingLevelFault:
         level = @"fault";
         break;
-    case MGLLoggingLevelVerbose:
+    case MLNLoggingLevelVerbose:
         level = @"verbose";
         break;
     }
@@ -104,29 +104,29 @@ RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(setLogLevel: (nonnull NSString*)logLevel)
 {
-    MGLLoggingLevel mglLogLevel = MGLLoggingLevelNone;
+    MLNLoggingLevel mlnLogLevel = MLNLoggingLevelNone;
     if ([logLevel isEqualToString:@"none"]) {
-        mglLogLevel = MGLLoggingLevelNone;
+        mlnLogLevel = MLNLoggingLevelNone;
     } else if ([logLevel isEqualToString:@"debug"]) {
-        mglLogLevel = MGLLoggingLevelInfo;
+        mlnLogLevel = MLNLoggingLevelInfo;
     } else if ([logLevel isEqualToString:@"fault"]) {
-        mglLogLevel = MGLLoggingLevelFault;
+        mlnLogLevel = MLNLoggingLevelFault;
     } else if ([logLevel isEqualToString:@"error"]) {
-        mglLogLevel = MGLLoggingLevelError;
+        mlnLogLevel = MLNLoggingLevelError;
     } else if ([logLevel isEqualToString:@"warning"]) {
-        mglLogLevel = MGLLoggingLevelWarning;
+        mlnLogLevel = MLNLoggingLevelWarning;
     } else if ([logLevel isEqualToString:@"info"]) {
-        mglLogLevel = MGLLoggingLevelInfo;
+        mlnLogLevel = MLNLoggingLevelInfo;
     } else if ([logLevel isEqualToString:@"debug"]) {
-#if MGL_LOGGING_ENABLE_DEBUG
-        mglLogLevel = MGLLoggingLevelDebug;
+#if MLN_LOGGING_ENABLE_DEBUG
+        mlnLogLevel = MLNLoggingLevelDebug;
 #else
-        mglLogLevel = MGLLoggingLevelVerbose;
+        mlnLogLevel = MLNLoggingLevelVerbose;
 #endif
     } else if ([logLevel isEqualToString:@"verbose"]) {
-        mglLogLevel = MGLLoggingLevelVerbose;
+        mlnLogLevel = MLNLoggingLevelVerbose;
     }
-    self.loggingConfiguration.loggingLevel = mglLogLevel;
+    self.loggingConfiguration.loggingLevel = mlnLogLevel;
 }
 
 @end

package/ios/{RCTMGL/RCTMGLMapTouchEvent.h → RCTMLN/RCTMLNMapTouchEvent.h}

@@ -1,25 +1,25 @@
 //
-//  RCTMGLTouchEvent.h
-//  RCTMGL
+//  RCTMLNTouchEvent.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 8/25/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
-#import "RCTMGLEvent.h"
-#import "RCTMGLPointAnnotation.h"
-@import Mapbox;
+#import "RCTMLNEvent.h"
+#import "RCTMLNPointAnnotation.h"
+@import MapLibre;
 
-@interface RCTMGLMapTouchEvent : RCTMGLEvent
+@interface RCTMLNMapTouchEvent : RCTMLNEvent
 
 @property (nonatomic, copy) NSString *id;
 @property (nonatomic, assign) CLLocationCoordinate2D coordinate;
 @property (nonatomic, assign) CGPoint screenPoint;
 
-+ (RCTMGLMapTouchEvent*)makeTapEvent:(MGLMapView*)mapView withPoint:(CGPoint)point;
-+ (RCTMGLMapTouchEvent*)makeLongPressEvent:(MGLMapView*)mapView withPoint:(CGPoint)point;
-+ (RCTMGLMapTouchEvent *)makeAnnotationTapEvent:(RCTMGLPointAnnotation *)pointAnnotation;
-+ (RCTMGLMapTouchEvent *)makeAnnotationTapEventOnDrag:(RCTMGLPointAnnotation *)pointAnnotation;
++ (RCTMLNMapTouchEvent*)makeTapEvent:(MLNMapView*)mapView withPoint:(CGPoint)point;
++ (RCTMLNMapTouchEvent*)makeLongPressEvent:(MLNMapView*)mapView withPoint:(CGPoint)point;
++ (RCTMLNMapTouchEvent *)makeAnnotationTapEvent:(RCTMLNPointAnnotation *)pointAnnotation;
++ (RCTMLNMapTouchEvent *)makeAnnotationTapEventOnDrag:(RCTMLNPointAnnotation *)pointAnnotation;
 
 @end

package/ios/{RCTMGL/RCTMGLMapTouchEvent.m → RCTMLN/RCTMLNMapTouchEvent.m}

@@ -1,21 +1,21 @@
 //
-//  RCTMGLTouchEvent.m
-//  RCTMGL
+//  RCTMLNTouchEvent.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 8/25/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLMapTouchEvent.h"
-#import "RCTMGLEventTypes.h"
-#import "RCTMGLPointAnnotation.h"
-@import Mapbox;
+#import "RCTMLNMapTouchEvent.h"
+#import "RCTMLNEventTypes.h"
+#import "RCTMLNPointAnnotation.h"
+@import MapLibre;
 
-@implementation RCTMGLMapTouchEvent
+@implementation RCTMLNMapTouchEvent
 
 - (NSDictionary*)payload
 {
-    MGLPointFeature *feature = [[MGLPointFeature alloc] init];
+    MLNPointFeature *feature = [[MLNPointFeature alloc] init];
     feature.coordinate = _coordinate;
     if (_id == nil) {
         feature.attributes = @{
@@ -32,19 +32,19 @@
     return [feature geoJSONDictionary];
 }
 
-+ (RCTMGLMapTouchEvent*)makeTapEvent:(MGLMapView*)mapView withPoint:(CGPoint)point
++ (RCTMLNMapTouchEvent*)makeTapEvent:(MLNMapView*)mapView withPoint:(CGPoint)point
 {
-    return [RCTMGLMapTouchEvent _fromPoint:point withMapView:mapView andEventType:RCT_MAPBOX_EVENT_TAP];
+    return [RCTMLNMapTouchEvent _fromPoint:point withMapView:mapView andEventType:RCT_MAPBOX_EVENT_TAP];
 }
 
-+ (RCTMGLMapTouchEvent*)makeLongPressEvent:(MGLMapView*)mapView withPoint:(CGPoint)point
++ (RCTMLNMapTouchEvent*)makeLongPressEvent:(MLNMapView*)mapView withPoint:(CGPoint)point
 {
-    return [RCTMGLMapTouchEvent _fromPoint:point withMapView:mapView andEventType:RCT_MAPBOX_EVENT_LONGPRESS];
+    return [RCTMLNMapTouchEvent _fromPoint:point withMapView:mapView andEventType:RCT_MAPBOX_EVENT_LONGPRESS];
 }
 
-+ (RCTMGLMapTouchEvent *)makeAnnotationTapEvent:(RCTMGLPointAnnotation *)pointAnnotation
++ (RCTMLNMapTouchEvent *)makeAnnotationTapEvent:(RCTMLNPointAnnotation *)pointAnnotation
 {
-    RCTMGLMapTouchEvent *event = [[RCTMGLMapTouchEvent alloc] init];
+    RCTMLNMapTouchEvent *event = [[RCTMLNMapTouchEvent alloc] init];
     event.type = RCT_MAPBOX_ANNOTATION_TAP;
     event.id = pointAnnotation.id;
     event.coordinate = pointAnnotation.coordinate;
@@ -52,9 +52,9 @@
     return event;
 }
 
-+ (RCTMGLMapTouchEvent *)makeAnnotationTapEventOnDrag:(RCTMGLPointAnnotation *)pointAnnotation
++ (RCTMLNMapTouchEvent *)makeAnnotationTapEventOnDrag:(RCTMLNPointAnnotation *)pointAnnotation
 {
-    RCTMGLMapTouchEvent *event = [[RCTMGLMapTouchEvent alloc] init];
+    RCTMLNMapTouchEvent *event = [[RCTMLNMapTouchEvent alloc] init];
     event.type = RCT_MAPBOX_ANNOTATION_TAP;
     event.id = pointAnnotation.id;
     CGPoint screenPoint = [pointAnnotation.superview convertPoint:pointAnnotation.layer.position toView:nil];
@@ -65,9 +65,9 @@
     return event;
 }
 
-+ (RCTMGLMapTouchEvent*)_fromPoint:(CGPoint)point withMapView:(MGLMapView *)mapView andEventType:(NSString*)eventType
++ (RCTMLNMapTouchEvent*)_fromPoint:(CGPoint)point withMapView:(MLNMapView *)mapView andEventType:(NSString*)eventType
 {
-    RCTMGLMapTouchEvent *event = [[RCTMGLMapTouchEvent alloc] init];
+    RCTMLNMapTouchEvent *event = [[RCTMLNMapTouchEvent alloc] init];
     event.type = eventType;
     event.coordinate = [mapView convertPoint:point toCoordinateFromView:mapView];
     event.screenPoint = point;

package/ios/{RCTMGL/RCTMGLMapView.h → RCTMLN/RCTMLNMapView.h}

@@ -1,42 +1,42 @@
 //
-//  RCTMGLMapView.h
-//  RCTMGL
+//  RCTMLNMapView.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 8/23/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
 #import <React/RCTComponent.h>
-#import "RCTMGLSource.h"
-#import "RCTMGLShapeSource.h"
-#import "RCTMGLPointAnnotation.h"
-#import "RCTMGLLight.h"
+#import "RCTMLNSource.h"
+#import "RCTMLNShapeSource.h"
+#import "RCTMLNPointAnnotation.h"
+#import "RCTMLNLight.h"
 
-@import Mapbox;
+@import MapLibre;
 
 @class CameraUpdateQueue;
-@class RCTMGLImages;
-@class RCTMGLLogging;
+@class RCTMLNImages;
+@class RCTMLNLogging;
 
-@protocol RCTMGLMapViewCamera<NSObject>
+@protocol RCTMLNMapViewCamera<NSObject>
 - (void)initialLayout;
-- (void)didChangeUserTrackingMode:(MGLUserTrackingMode)mode animated:(BOOL)animated;
+- (void)didChangeUserTrackingMode:(MLNUserTrackingMode)mode animated:(BOOL)animated;
 @end
 
-typedef void (^FoundLayerBlock) (MGLStyleLayer* __nonnull layer);
-typedef void (^StyleLoadedBlock) (MGLStyle* __nonnull style);
+typedef void (^FoundLayerBlock) (MLNStyleLayer* __nonnull layer);
+typedef void (^StyleLoadedBlock) (MLNStyle* __nonnull style);
 
-@interface RCTMGLMapView : MGLMapView<RCTInvalidating>
+@interface RCTMLNMapView : MLNMapView<RCTInvalidating>
 
-@property (nonatomic, strong, nonnull) RCTMGLLogging* logging;
+@property (nonatomic, strong, nonnull) RCTMLNLogging* logging;
 @property (nonatomic, strong) CameraUpdateQueue *cameraUpdateQueue;
-@property (nonatomic, weak) id<RCTMGLMapViewCamera> reactCamera;
+@property (nonatomic, weak) id<RCTMLNMapViewCamera> reactCamera;
 @property (nonatomic, strong) NSMutableArray<id<RCTComponent>> *reactSubviews;
-@property (nonatomic, strong) NSMutableArray<RCTMGLSource*> *sources;
-@property (nonatomic, strong) NSMutableArray<RCTMGLImages*> *images;
-@property (nonatomic, strong) NSMutableArray<RCTMGLLayer*> *layers;
-@property (nonatomic, strong) NSMutableArray<RCTMGLPointAnnotation*> *pointAnnotations;
-@property (nonatomic, strong) RCTMGLLight *light;
+@property (nonatomic, strong) NSMutableArray<RCTMLNSource*> *sources;
+@property (nonatomic, strong) NSMutableArray<RCTMLNImages*> *images;
+@property (nonatomic, strong) NSMutableArray<RCTMLNLayer*> *layers;
+@property (nonatomic, strong) NSMutableArray<RCTMLNPointAnnotation*> *pointAnnotations;
+@property (nonatomic, strong) RCTMLNLight *light;
 @property (nonatomic, copy) NSArray<NSNumber *> *reactContentInset;
 
 @property (nonatomic, strong) NSMutableDictionary<NSString*, NSMutableArray<FoundLayerBlock>*> *layerWaiters;
@@ -58,7 +58,7 @@ typedef void (^StyleLoadedBlock) (MGLStyle* __nonnull style);
 @property (nonatomic, copy) NSString *reactStyleURL;
 @property (nonatomic, assign) NSInteger reactPreferredFramesPerSecond;
 
-@property (nonatomic, assign) MGLCoordinateBounds maxBounds;
+@property (nonatomic, assign) MLNCoordinateBounds maxBounds;
 
 @property (nonatomic, assign) BOOL isUserInteraction;
 @property (nonatomic, assign) BOOL useNativeUserLocationAnnotationView;
@@ -68,21 +68,21 @@ typedef void (^StyleLoadedBlock) (MGLStyle* __nonnull style);
 @property (nonatomic, copy) RCTBubblingEventBlock onMapChange;
 
 
-- (void)layerAdded:(MGLStyleLayer*) layer;
+- (void)layerAdded:(MLNStyleLayer*) layer;
 
 - (CLLocationDistance)getMetersPerPixelAtLatitude:(double)latitude withZoom:(double)zoomLevel;
 - (CLLocationDistance)altitudeFromZoom:(double)zoomLevel;
 - (CLLocationDistance)altitudeFromZoom:(double)zoomLevel atLatitude:(CLLocationDegrees)latitude;
 - (CLLocationDistance)altitudeFromZoom:(double)zoomLevel atLatitude:(CLLocationDegrees)latitude atPitch:(CGFloat)pitch;
-- (RCTMGLPointAnnotation*)getRCTPointAnnotation:(MGLPointAnnotation*)mglAnnotation;
-- (NSArray<RCTMGLSource *> *)getAllTouchableSources;
-- (NSArray<RCTMGLSource *> *)getAllShapeSources;
-- (NSArray<RCTMGLImages *> *)getAllImages;
-- (RCTMGLSource *)getTouchableSourceWithHighestZIndex:(NSArray<RCTMGLSource *> *)touchableSources;
+- (RCTMLNPointAnnotation*)getRCTPointAnnotation:(MLNPointAnnotation*)mlnAnnotation;
+- (NSArray<RCTMLNSource *> *)getAllTouchableSources;
+- (NSArray<RCTMLNSource *> *)getAllShapeSources;
+- (NSArray<RCTMLNImages *> *)getAllImages;
+- (RCTMLNSource *)getTouchableSourceWithHighestZIndex:(NSArray<RCTMLNSource *> *)touchableSources;
 - (NSString *)takeSnap:(BOOL)writeToDisk;
-- (void)didChangeUserTrackingMode:(MGLUserTrackingMode)mode animated:(BOOL)animated;
+- (void)didChangeUserTrackingMode:(MLNUserTrackingMode)mode animated:(BOOL)animated;
 
-- (void)waitForLayerWithID:(nonnull NSString*)layerID then:(void (^ _Nonnull)(MGLStyleLayer* _Nonnull layer))foundLayer;
+- (void)waitForLayerWithID:(nonnull NSString*)layerID then:(void (^ _Nonnull)(MLNStyleLayer* _Nonnull layer))foundLayer;
 
 - (void)setSourceVisibility:(BOOL)visiblity sourceId:(nonnull NSString*)sourceId sourceLayerId:(nullable NSString*)sourceLayerId;