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

package/ios/RCTMLN/RCTMLNNativeUserLocationManager.m

@@ -0,0 +1,25 @@
+#import "RCTMLNNativeUserLocationManager.h"
+#import "RCTMLNNativeUserLocation.h"
+
+@implementation RCTMLNNativeUserLocationManager
+
+RCT_EXPORT_MODULE(RCTMLNNativeUserLocation)
+RCT_EXPORT_VIEW_PROPERTY(iosShowsUserHeadingIndicator, BOOL)
+
+
+#pragma - View Properties
+
+
+#pragma Methods
+
+- (BOOL)requiresMainQueueSetup
+{
+    return YES;
+}
+
+- (UIView *)view
+{
+    return [[RCTMLNNativeUserLocation alloc] init];
+}
+
+@end

package/ios/{RCTMGL/RCTMGLPointAnnotation.h → RCTMLN/RCTMLNPointAnnotation.h}

@@ -1,6 +1,6 @@
 //
-//  RCTMGLPointAnnotation.h
-//  RCTMGL
+//  RCTMLNPointAnnotation.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 10/12/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
@@ -9,14 +9,14 @@
 #import <React/RCTComponent.h>
 #import <UIKit/UIKit.h>
 #import <React/RCTView.h>
-#import "RCTMGLCallout.h"
+#import "RCTMLNCallout.h"
 
-@import Mapbox;
+@import MapLibre;
 
-@interface RCTMGLPointAnnotation : MGLAnnotationView<MGLAnnotation>
+@interface RCTMLNPointAnnotation : MLNAnnotationView<MLNAnnotation>
 
-@property (nonatomic, weak) MGLMapView *map;
-@property (nonatomic, strong) RCTMGLCallout *calloutView;
+@property (nonatomic, weak) MLNMapView *map;
+@property (nonatomic, strong) RCTMLNCallout *calloutView;
 
 @property (nonatomic, copy) NSString *id;
 @property (nonatomic, copy) NSString *reactTitle;
@@ -36,6 +36,6 @@
 @property (nonatomic, assign) BOOL reactSelected;
 @property (nonatomic, assign) BOOL reactDraggable;
 
-- (MGLAnnotationView *)getAnnotationView;
+- (MLNAnnotationView *)getAnnotationView;
 
 @end

package/ios/{RCTMGL/RCTMGLPointAnnotation.m → RCTMLN/RCTMLNPointAnnotation.m}

@@ -1,20 +1,20 @@
 //
-//  RCTMGLPointAnnotation.m
-//  RCTMGL
+//  RCTMLNPointAnnotation.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 10/12/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLPointAnnotation.h"
-#import "RCTMGLMapTouchEvent.h"
-#import "RCTMGLUtils.h"
+#import "RCTMLNPointAnnotation.h"
+#import "RCTMLNMapTouchEvent.h"
+#import "RCTMLNUtils.h"
 #import <React/UIView+React.h>
 
 const float CENTER_X_OFFSET_BASE = -0.5f;
 const float CENTER_Y_OFFSET_BASE = -0.5f;
 
-@implementation RCTMGLPointAnnotation
+@implementation RCTMLNPointAnnotation
 {
     UITapGestureRecognizer *customViewTap;
 }
@@ -29,8 +29,8 @@ const float CENTER_Y_OFFSET_BASE = -0.5f;
 
 - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex
 {
-    if ([subview isKindOfClass:[RCTMGLCallout class]]) {
-        self.calloutView = (RCTMGLCallout *)subview;
+    if ([subview isKindOfClass:[RCTMLNCallout class]]) {
+        self.calloutView = (RCTMLNCallout *)subview;
         self.calloutView.representedObject = self;
     } else {
         [super insertReactSubview:subview atIndex:0];
@@ -39,7 +39,7 @@ const float CENTER_Y_OFFSET_BASE = -0.5f;
 
 - (void)removeReactSubview:(UIView *)subview
 {
-    if ([subview isKindOfClass:[RCTMGLCallout class]]) {
+    if ([subview isKindOfClass:[RCTMLNCallout class]]) {
         self.calloutView = nil;
     } else {
         [super removeReactSubview:subview];
@@ -62,7 +62,7 @@ const float CENTER_Y_OFFSET_BASE = -0.5f;
     [self _setCenterOffset:self.frame];
 }
 
-- (void)setMap:(MGLMapView *)map
+- (void)setMap:(MLNMapView *)map
 {
     if (map == nil) {
         [_map removeAnnotation:self];
@@ -125,7 +125,7 @@ const float CENTER_Y_OFFSET_BASE = -0.5f;
     return _reactTitle;
 }
 
-- (MGLAnnotationView *)getAnnotationView
+- (MLNAnnotationView *)getAnnotationView
 {
     if (self.reactSubviews.count == 0) {
         // default pin view
@@ -189,7 +189,7 @@ const float CENTER_Y_OFFSET_BASE = -0.5f;
         return;
     }
 
-    MGLPointFeature *feature = (MGLPointFeature *)[RCTMGLUtils shapeFromGeoJSON:_reactCoordinate];
+    MLNPointFeature *feature = (MLNPointFeature *)[RCTMLNUtils shapeFromGeoJSON:_reactCoordinate];
     if (feature == nil) {
         return;
     }
@@ -216,34 +216,34 @@ const float CENTER_Y_OFFSET_BASE = -0.5f;
     return self.frame.size.width > 0 && self.frame.size.height > 0;
 }
 
-- (void)setDragState:(MGLAnnotationViewDragState)dragState animated:(BOOL)animated {
+- (void)setDragState:(MLNAnnotationViewDragState)dragState animated:(BOOL)animated {
     [super setDragState:dragState animated:animated];
     switch (dragState) {
-        case MGLAnnotationViewDragStateStarting: {
+        case MLNAnnotationViewDragStateStarting: {
             if (self.onDragStart != nil) {
-                RCTMGLMapTouchEvent *event = [RCTMGLMapTouchEvent makeAnnotationTapEvent:self];
+                RCTMLNMapTouchEvent *event = [RCTMLNMapTouchEvent makeAnnotationTapEvent:self];
                 self.onDragStart([event toJSON]);
             }
             break;
         }
 
-        case MGLAnnotationViewDragStateDragging:
+        case MLNAnnotationViewDragStateDragging:
             if (self.onDrag != nil) {
-                RCTMGLMapTouchEvent *event = [RCTMGLMapTouchEvent makeAnnotationTapEventOnDrag:self];
+                RCTMLNMapTouchEvent *event = [RCTMLNMapTouchEvent makeAnnotationTapEventOnDrag:self];
                 self.onDrag([event toJSON]);
             }
             break;
 
-        case MGLAnnotationViewDragStateEnding:
-        case MGLAnnotationViewDragStateCanceling: {
+        case MLNAnnotationViewDragStateEnding:
+        case MLNAnnotationViewDragStateCanceling: {
             if (self.onDragEnd != nil) {
-                RCTMGLMapTouchEvent *event = [RCTMGLMapTouchEvent makeAnnotationTapEvent:self];
+                RCTMLNMapTouchEvent *event = [RCTMLNMapTouchEvent makeAnnotationTapEvent:self];
                 self.onDragEnd([event toJSON]);
             }
             break;
         }
 
-        case MGLAnnotationViewDragStateNone:
+        case MLNAnnotationViewDragStateNone:
             return;
     }
 }

package/ios/{RCTMGL/RCTMGLPointAnnotationManager.h → RCTMLN/RCTMLNPointAnnotationManager.h}

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

package/ios/{RCTMGL/RCTMGLPointAnnotationManager.m → RCTMLN/RCTMLNPointAnnotationManager.m}

@@ -1,15 +1,15 @@
 //
-//  RCTMGLPointAnnotationManager.m
-//  RCTMGL
+//  RCTMLNPointAnnotationManager.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 10/12/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLPointAnnotationManager.h"
-#import "RCTMGLPointAnnotation.h"
+#import "RCTMLNPointAnnotationManager.h"
+#import "RCTMLNPointAnnotation.h"
 
-@implementation RCTMGLPointAnnotationManager
+@implementation RCTMLNPointAnnotationManager
 
 RCT_EXPORT_MODULE()
 
@@ -30,7 +30,7 @@ RCT_REMAP_VIEW_PROPERTY(onMapboxPointAnnotationDragEnd, onDragEnd, RCTBubblingEv
 
 - (UIView *)view
 {
-    return [[RCTMGLPointAnnotation alloc] init];
+    return [[RCTMLNPointAnnotation alloc] init];
 }
 
 @end

package/ios/RCTMLN/RCTMLNRasterLayer.h

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

package/ios/RCTMLN/RCTMLNRasterLayer.m

@@ -0,0 +1,30 @@
+//
+//  RCTMLNRasterLayer.m
+//  RCTMLN
+//
+//  Created by Nick Italiano on 9/25/17.
+//  Copyright © 2017 Mapbox Inc. All rights reserved.
+//
+
+#import "RCTMLNRasterLayer.h"
+#import "RCTMLNStyle.h"
+
+@implementation RCTMLNRasterLayer
+
+- (MLNStyleLayer*)makeLayer:(MLNStyle*)style
+{
+    MLNSource *source =  [style sourceWithIdentifier:self.sourceID];
+    if (source == nil) { return nil; }
+    MLNRasterStyleLayer *layer = [[MLNRasterStyleLayer alloc] initWithIdentifier:self.id source:source];
+    return layer;
+}
+
+- (void)addStyles
+{
+    RCTMLNStyle *style = [[RCTMLNStyle alloc] initWithMLNStyle:self.style];
+    style.bridge = self.bridge;
+    [style rasterLayer:(MLNRasterStyleLayer*)self.styleLayer withReactStyle:self.reactStyle isValid:^{ return [self isAddedToMap];
+    }];
+}
+
+@end

package/ios/{RCTMGL/RCTMGLRasterLayerManager.h → RCTMLN/RCTMLNRasterLayerManager.h}

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

package/ios/{RCTMGL/RCTMGLRasterLayerManager.m → RCTMLN/RCTMLNRasterLayerManager.m}

@@ -1,15 +1,15 @@
 //
-//  RCTMGLRasterLayerManager.m
-//  RCTMGL
+//  RCTMLNRasterLayerManager.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/25/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLRasterLayerManager.h"
-#import "RCTMGLRasterLayer.h"
+#import "RCTMLNRasterLayerManager.h"
+#import "RCTMLNRasterLayer.h"
 
-@implementation RCTMGLRasterLayerManager
+@implementation RCTMLNRasterLayerManager
 
 RCT_EXPORT_MODULE()
 
@@ -27,7 +27,7 @@ RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber);
 
 - (UIView*)view
 {
-    RCTMGLRasterLayer *layer = [[RCTMGLRasterLayer alloc] init];
+    RCTMLNRasterLayer *layer = [[RCTMLNRasterLayer alloc] init];
     layer.bridge = self.bridge;
     return layer;
 }

package/ios/{RCTMGL/RCTMGLRasterSource.h → RCTMLN/RCTMLNRasterSource.h}

@@ -1,15 +1,15 @@
 //
-//  RCTMGLRasterSource.h
-//  RCTMGL
+//  RCTMLNRasterSource.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/25/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLTileSource.h"
-@import Mapbox;
+#import "RCTMLNTileSource.h"
+@import MapLibre;
 
-@interface RCTMGLRasterSource : RCTMGLTileSource
+@interface RCTMLNRasterSource : RCTMLNTileSource
 
 @property (nonatomic, strong) NSNumber *tileSize;
 

package/ios/{RCTMGL/RCTMGLRasterSource.m → RCTMLN/RCTMLNRasterSource.m}

@@ -1,32 +1,32 @@
 //
-//  RCTMGLRasterSource.m
-//  RCTMGL
+//  RCTMLNRasterSource.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/25/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLRasterSource.h"
+#import "RCTMLNRasterSource.h"
 
-@implementation RCTMGLRasterSource
+@implementation RCTMLNRasterSource
 
-- (nullable MGLSource*)makeSource
+- (nullable MLNSource*)makeSource
 {
     if (self.url != nil) {
         NSURL *url = [NSURL URLWithString:self.url];
         if (self.tileSize != nil) {
-            return [[MGLRasterTileSource alloc] initWithIdentifier:self.id configurationURL:url tileSize:[self.tileSize floatValue]];
+            return [[MLNRasterTileSource alloc] initWithIdentifier:self.id configurationURL:url tileSize:[self.tileSize floatValue]];
         }
-        return [[MGLRasterTileSource alloc] initWithIdentifier:self.id configurationURL:url];
+        return [[MLNRasterTileSource alloc] initWithIdentifier:self.id configurationURL:url];
     }
-    return [[MGLRasterTileSource alloc] initWithIdentifier:self.id tileURLTemplates:self.tileUrlTemplates options:[self getOptions]];
+    return [[MLNRasterTileSource alloc] initWithIdentifier:self.id tileURLTemplates:self.tileUrlTemplates options:[self getOptions]];
 }
 
-- (NSDictionary<MGLTileSourceOption,id> *)getOptions {
-    NSMutableDictionary<MGLTileSourceOption, id> *options = [[NSMutableDictionary alloc] initWithDictionary:[super getOptions]];
+- (NSDictionary<MLNTileSourceOption,id> *)getOptions {
+    NSMutableDictionary<MLNTileSourceOption, id> *options = [[NSMutableDictionary alloc] initWithDictionary:[super getOptions]];
     
     if (self.tileSize != nil) {
-        options[MGLTileSourceOptionTileSize] = _tileSize;
+        options[MLNTileSourceOptionTileSize] = _tileSize;
     }
     
     return options;

package/ios/{RCTMGL/RCTMGLRasterSourceManager.h → RCTMLN/RCTMLNRasterSourceManager.h}

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

package/ios/{RCTMGL/RCTMGLRasterSourceManager.m → RCTMLN/RCTMLNRasterSourceManager.m}

@@ -1,15 +1,15 @@
 //
-//  RCTMGLRasterSourceManager.m
-//  RCTMGL
+//  RCTMLNRasterSourceManager.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/25/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLRasterSourceManager.h"
-#import "RCTMGLRasterSource.h"
+#import "RCTMLNRasterSourceManager.h"
+#import "RCTMLNRasterSource.h"
 
-@implementation RCTMGLRasterSourceManager
+@implementation RCTMLNRasterSourceManager
 
 RCT_EXPORT_MODULE()
 
@@ -26,7 +26,7 @@ RCT_EXPORT_VIEW_PROPERTY(tms, BOOL)
 
 - (UIView*)view
 {
-    return [RCTMGLRasterSource new];
+    return [RCTMLNRasterSource new];
 }
 
 @end

package/ios/{RCTMGL/RCTMGLShapeSource.h → RCTMLN/RCTMLNShapeSource.h}

@@ -1,17 +1,17 @@
 //
-//  RCTMGLShapeSource.h
-//  RCTMGL
+//  RCTMLNShapeSource.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 9/19/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
 #import <React/RCTBridge.h>
-#import "RCTMGLSource.h"
+#import "RCTMLNSource.h"
 
-@import Mapbox;
+@import MapLibre;
 
-@interface RCTMGLShapeSource : RCTMGLSource
+@interface RCTMLNShapeSource : RCTMLNSource
 
 @property (nonatomic, weak) RCTBridge *bridge;
 
@@ -31,21 +31,21 @@
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @property (nonatomic, assign) BOOL hasPressListener;
 
-- (nonnull NSArray<id <MGLFeature>> *)featuresMatchingPredicate:(nullable NSPredicate *)predicate;
-- (nonnull NSArray<id <MGLFeature>> *)getClusterLeaves:(nonnull NSString *)featureJSON
+- (nonnull NSArray<id <MLNFeature>> *)featuresMatchingPredicate:(nullable NSPredicate *)predicate;
+- (nonnull NSArray<id <MLNFeature>> *)getClusterLeaves:(nonnull NSString *)featureJSON
                                                 number:(NSUInteger)number
                                                 offset:(NSUInteger)offset;
-- (nonnull NSArray<id <MGLFeature>> *)getClusterChildren:(nonnull NSString *)featureJSON;                                               
+- (nonnull NSArray<id <MLNFeature>> *)getClusterChildren:(nonnull NSString *)featureJSON;                                               
 
 - (double)getClusterExpansionZoom:(nonnull NSString *)featureJSON;
 
 // Deprecated. Will be removed in 9+ ver.
-- (nonnull NSArray<id <MGLFeature>> *)getClusterLeavesById:(nonnull NSNumber *)clusterId
+- (nonnull NSArray<id <MLNFeature>> *)getClusterLeavesById:(nonnull NSNumber *)clusterId
                                                 number:(NSUInteger)number    
                                                 offset:(NSUInteger)offset;
 
 // Deprecated. Will be removed in 9+ ver.                                                
-- (nonnull NSArray<id <MGLFeature>> *)getClusterChildrenById:(nonnull NSNumber *)clusterId;     
+- (nonnull NSArray<id <MLNFeature>> *)getClusterChildrenById:(nonnull NSNumber *)clusterId;     
                                           
 // Deprecated. Will be removed in 9+ ver.
 - (double)getClusterExpansionZoomById:(nonnull NSNumber *)clusterId;