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

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

@@ -1,21 +1,21 @@
 //
-//  RCTMGLMapView.m
-//  RCTMGL
+//  RCTMLNMapView.m
+//  RCTMLN
 //
 //  Created by Nick Italiano on 8/23/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
-#import "RCTMGLMapView.h"
+#import "RCTMLNMapView.h"
 #import "CameraUpdateQueue.h"
-#import "RCTMGLUtils.h"
+#import "RCTMLNUtils.h"
 #import "RNMBImageUtils.h"
-#import "RCTMGLImages.h"
+#import "RCTMLNImages.h"
 #import <React/UIView+React.h>
-#import "RCTMGLNativeUserLocation.h"
-#import "RCTMGLLogging.h"
+#import "RCTMLNNativeUserLocation.h"
+#import "RCTMLNLogging.h"
 
-@implementation RCTMGLMapView
+@implementation RCTMLNMapView
 {
     BOOL _pendingInitialLayout;
 }
@@ -38,7 +38,7 @@ static double const M2PI = M_PI * 2;
         _reactSubviews = [[NSMutableArray alloc] init];
         _layerWaiters = [[NSMutableDictionary alloc] init];
         _styleWaiters = [[NSMutableArray alloc] init];
-        _logging = [[RCTMGLLogging alloc] init];
+        _logging = [[RCTMLNLogging alloc] init];
     }
     return self;
 }
@@ -63,7 +63,7 @@ static double const M2PI = M_PI * 2;
     }
 }
 
-- (void)layerAdded:(MGLStyleLayer*) layer
+- (void)layerAdded:(MLNStyleLayer*) layer
 {
     NSString* layerID = layer.identifier;
     NSMutableArray* waiters = [_layerWaiters valueForKey:layerID];
@@ -75,9 +75,9 @@ static double const M2PI = M_PI * 2;
     }
 }
 
-- (void)waitForLayerWithID:(nonnull NSString*)layerID then:(void (^)(MGLStyleLayer* layer))foundLayer {
+- (void)waitForLayerWithID:(nonnull NSString*)layerID then:(void (^)(MLNStyleLayer* layer))foundLayer {
     if (self.style) {
-        MGLStyleLayer* layer = [self.style layerWithIdentifier:layerID];
+        MLNStyleLayer* layer = [self.style layerWithIdentifier:layerID];
         if (layer) {
             foundLayer(layer);
         } else {
@@ -97,7 +97,7 @@ static double const M2PI = M_PI * 2;
     }
 }
 
-- (void)getStyle:(void (^)(MGLStyle* style))onStyleLoaded {
+- (void)getStyle:(void (^)(MLNStyle* style))onStyleLoaded {
     if (self.style) {
         onStyleLoaded(self.style);
     } else {
@@ -116,30 +116,30 @@ static double const M2PI = M_PI * 2;
 
 - (void) addToMap:(id<RCTComponent>)subview
 {
-    if ([subview isKindOfClass:[RCTMGLSource class]]) {
-        RCTMGLSource *source = (RCTMGLSource*)subview;
+    if ([subview isKindOfClass:[RCTMLNSource class]]) {
+        RCTMLNSource *source = (RCTMLNSource*)subview;
         source.map = self;
-        [_sources addObject:(RCTMGLSource*)subview];
-    } else if ([subview isKindOfClass:[RCTMGLLight class]]) {
-        RCTMGLLight *light = (RCTMGLLight*)subview;
+        [_sources addObject:(RCTMLNSource*)subview];
+    } else if ([subview isKindOfClass:[RCTMLNLight class]]) {
+        RCTMLNLight *light = (RCTMLNLight*)subview;
         _light = light;
         _light.map = self;
-    } else if ([subview isKindOfClass:[RCTMGLNativeUserLocation class]]) {
-        RCTMGLNativeUserLocation *nativeUserLocation = (RCTMGLNativeUserLocation*)subview;
+    } else if ([subview isKindOfClass:[RCTMLNNativeUserLocation class]]) {
+        RCTMLNNativeUserLocation *nativeUserLocation = (RCTMLNNativeUserLocation*)subview;
         nativeUserLocation.map = self;
-    }  else if ([subview isKindOfClass:[RCTMGLPointAnnotation class]]) {
-        RCTMGLPointAnnotation *pointAnnotation = (RCTMGLPointAnnotation *)subview;
+    }  else if ([subview isKindOfClass:[RCTMLNPointAnnotation class]]) {
+        RCTMLNPointAnnotation *pointAnnotation = (RCTMLNPointAnnotation *)subview;
         pointAnnotation.map = self;
         [_pointAnnotations addObject:pointAnnotation];
-    } else if ([subview isKindOfClass:[RCTMGLCamera class]]) {
-        RCTMGLCamera *camera = (RCTMGLCamera *)subview;
+    } else if ([subview isKindOfClass:[RCTMLNCamera class]]) {
+        RCTMLNCamera *camera = (RCTMLNCamera *)subview;
         camera.map = self;
-    } else if ([subview isKindOfClass:[RCTMGLImages class]]) {
-        RCTMGLImages *images = (RCTMGLImages*)subview;
+    } else if ([subview isKindOfClass:[RCTMLNImages class]]) {
+        RCTMLNImages *images = (RCTMLNImages*)subview;
         images.map = self;
         [_images addObject:images];
-    } else if ([subview isKindOfClass:[RCTMGLLayer class]]) {
-        RCTMGLLayer *layer = (RCTMGLLayer*)subview;
+    } else if ([subview isKindOfClass:[RCTMLNLayer class]]) {
+        RCTMLNLayer *layer = (RCTMLNLayer*)subview;
         layer.map = self;
         [_layers addObject:layer];
     } else {
@@ -153,30 +153,30 @@ static double const M2PI = M_PI * 2;
 
 - (void) removeFromMap:(id<RCTComponent>)subview
 {
-    if ([subview isKindOfClass:[RCTMGLSource class]]) {
-        RCTMGLSource *source = (RCTMGLSource*)subview;
+    if ([subview isKindOfClass:[RCTMLNSource class]]) {
+        RCTMLNSource *source = (RCTMLNSource*)subview;
         source.map = nil;
         [_sources removeObject:source];
-    } else if ([subview isKindOfClass:[RCTMGLPointAnnotation class]]) {
-        RCTMGLPointAnnotation *pointAnnotation = (RCTMGLPointAnnotation *)subview;
+    } else if ([subview isKindOfClass:[RCTMLNPointAnnotation class]]) {
+        RCTMLNPointAnnotation *pointAnnotation = (RCTMLNPointAnnotation *)subview;
         pointAnnotation.map = nil;
         [_pointAnnotations removeObject:pointAnnotation];
-    } else if ([subview isKindOfClass:[RCTMGLCamera class]]) {
-        RCTMGLCamera *camera = (RCTMGLCamera *)subview;
+    } else if ([subview isKindOfClass:[RCTMLNCamera class]]) {
+        RCTMLNCamera *camera = (RCTMLNCamera *)subview;
         camera.map = nil;
-    } else if ([subview isKindOfClass:[RCTMGLImages class]]) {
-        RCTMGLImages *images = (RCTMGLImages*)subview;
+    } else if ([subview isKindOfClass:[RCTMLNImages class]]) {
+        RCTMLNImages *images = (RCTMLNImages*)subview;
         images.map = nil;
         [_images removeObject:images];
-    } else if ([subview isKindOfClass:[RCTMGLLayer class]]) {
-        RCTMGLLayer *layer = (RCTMGLLayer*)subview;
+    } else if ([subview isKindOfClass:[RCTMLNLayer class]]) {
+        RCTMLNLayer *layer = (RCTMLNLayer*)subview;
         layer.map = nil;
         [_layers removeObject:layer];
-    } else if ([subview isKindOfClass:[RCTMGLNativeUserLocation class]]) {
-        RCTMGLNativeUserLocation *nativeUserLocation = (RCTMGLNativeUserLocation *)subview;
+    } else if ([subview isKindOfClass:[RCTMLNNativeUserLocation class]]) {
+        RCTMLNNativeUserLocation *nativeUserLocation = (RCTMLNNativeUserLocation *)subview;
         nativeUserLocation.map = nil;
-    } else if ([subview isKindOfClass:[RCTMGLLight class]]) {
-        RCTMGLLight *light = (RCTMGLLight*)subview;
+    } else if ([subview isKindOfClass:[RCTMLNLight class]]) {
+        RCTMLNLight *light = (RCTMLNLight*)subview;
         light.map = nil;
     }  else {
         NSArray<id<RCTComponent>> *childSubViews = [subview reactSubviews];
@@ -193,16 +193,16 @@ static double const M2PI = M_PI * 2;
 
 - (void)setSourceVisibility:(BOOL)visible sourceId:(NSString *)sourceId sourceLayerId:(NSString *)sourceLayerId {
     __weak typeof(self) weakSelf = self;
-    [self getStyle:^(MGLStyle *style) {
+    [self getStyle:^(MLNStyle *style) {
         __strong typeof(self) strongSelf = weakSelf;
-        for (MGLStyleLayer *layer in strongSelf.style.layers) {
-            if ([layer isKindOfClass:[MGLForegroundStyleLayer class]]) {
-                MGLForegroundStyleLayer *foregroundLayer = (MGLForegroundStyleLayer*)layer;
+        for (MLNStyleLayer *layer in strongSelf.style.layers) {
+            if ([layer isKindOfClass:[MLNForegroundStyleLayer class]]) {
+                MLNForegroundStyleLayer *foregroundLayer = (MLNForegroundStyleLayer*)layer;
                 if (![foregroundLayer.sourceIdentifier isEqualToString:sourceId]) continue;
                 if (sourceLayerId == nil || sourceLayerId.length == 0) {
                     layer.visible = visible;
-                } else if ([layer isKindOfClass:[MGLVectorStyleLayer class]]) {
-                    MGLVectorStyleLayer *vectorLayer = (MGLVectorStyleLayer*)layer;
+                } else if ([layer isKindOfClass:[MLNVectorStyleLayer class]]) {
+                    MLNVectorStyleLayer *vectorLayer = (MLNVectorStyleLayer*)layer;
                     if ([vectorLayer.sourceLayerIdentifier isEqualToString:sourceLayerId]) {
                         layer.visible = visible;
                     }
@@ -276,20 +276,20 @@ static double const M2PI = M_PI * 2;
     NSNumber *top    = [position valueForKey:@"top"];
     NSNumber *bottom = [position valueForKey:@"bottom"];
     if (left != nil && top != nil) {
-        [self setAttributionButtonPosition:MGLOrnamentPositionTopLeft];
+        [self setAttributionButtonPosition:MLNOrnamentPositionTopLeft];
         [self setAttributionButtonMargins:CGPointMake([left floatValue], [top floatValue])];
     } else if (right != nil && top != nil) {
-        [self setAttributionButtonPosition:MGLOrnamentPositionTopRight];
+        [self setAttributionButtonPosition:MLNOrnamentPositionTopRight];
         [self setAttributionButtonMargins:CGPointMake([right floatValue], [top floatValue])];
     } else if (bottom != nil && right != nil) {
-        [self setAttributionButtonPosition:MGLOrnamentPositionBottomRight];
+        [self setAttributionButtonPosition:MLNOrnamentPositionBottomRight];
         [self setAttributionButtonMargins:CGPointMake([right floatValue], [bottom floatValue])];
     } else if (bottom != nil && left != nil) {
-        [self setAttributionButtonPosition:MGLOrnamentPositionBottomLeft];
+        [self setAttributionButtonPosition:MLNOrnamentPositionBottomLeft];
         [self setAttributionButtonMargins:CGPointMake([left floatValue], [bottom floatValue])];
     } else {
-        [self setAttributionButtonPosition:MGLOrnamentPositionBottomRight];
-        // same as MGLOrnamentDefaultPositionOffset in MGLMapView.mm
+        [self setAttributionButtonPosition:MLNOrnamentPositionBottomRight];
+        // same as MLNOrnamentDefaultPositionOffset in MLNMapView.mm
         [self setAttributionButtonMargins:CGPointMake(8, 8)];
     }
     
@@ -308,19 +308,19 @@ static double const M2PI = M_PI * 2;
     NSNumber *top    = [logoPosition valueForKey:@"top"];
     NSNumber *bottom = [logoPosition valueForKey:@"bottom"];
     if (left != nil && top != nil) {
-        [self setLogoViewPosition:MGLOrnamentPositionTopLeft];
+        [self setLogoViewPosition:MLNOrnamentPositionTopLeft];
         [self setLogoViewMargins:CGPointMake([left floatValue], [top floatValue])];
     } else if (right != nil && top != nil) {
-        [self setLogoViewPosition:MGLOrnamentPositionTopRight];
+        [self setLogoViewPosition:MLNOrnamentPositionTopRight];
         [self setLogoViewMargins:CGPointMake([right floatValue], [top floatValue])];
     } else if (bottom != nil && right != nil) {
-        [self setLogoViewPosition:MGLOrnamentPositionBottomRight];
+        [self setLogoViewPosition:MLNOrnamentPositionBottomRight];
         [self setLogoViewMargins:CGPointMake([right floatValue], [bottom floatValue])];
     } else if (bottom != nil && left != nil) {
-        [self setLogoViewPosition:MGLOrnamentPositionBottomLeft];
+        [self setLogoViewPosition:MLNOrnamentPositionBottomLeft];
         [self setLogoViewMargins:CGPointMake([left floatValue], [bottom floatValue])];
     } else {
-        [self setLogoViewPosition:MGLOrnamentPositionBottomRight];
+        [self setLogoViewPosition:MLNOrnamentPositionBottomRight];
         [self setLogoViewMargins:CGPointMake(8, 8)];
     }
 
@@ -408,11 +408,11 @@ static double const M2PI = M_PI * 2;
 
 - (CLLocationDistance)getMetersPerPixelAtLatitude:(double)latitude withZoom:(double)zoomLevel
 {
-    double constrainedZoom = [[RCTMGLUtils clamp:[NSNumber numberWithDouble:zoomLevel]
+    double constrainedZoom = [[RCTMLNUtils clamp:[NSNumber numberWithDouble:zoomLevel]
                                              min:[NSNumber numberWithDouble:self.minimumZoomLevel]
                                              max:[NSNumber numberWithDouble:self.maximumZoomLevel]] doubleValue];
     
-    double constrainedLatitude = [[RCTMGLUtils clamp:[NSNumber numberWithDouble:latitude]
+    double constrainedLatitude = [[RCTMLNUtils clamp:[NSNumber numberWithDouble:latitude]
                                                  min:[NSNumber numberWithDouble:-LAT_MAX]
                                                  max:[NSNumber numberWithDouble:LAT_MAX]] doubleValue];
     
@@ -432,25 +432,25 @@ static double const M2PI = M_PI * 2;
 
 - (CLLocationDistance)altitudeFromZoom:(double)zoomLevel atLatitude:(CLLocationDegrees)latitude atPitch:(CGFloat)pitch
 {
-    return MGLAltitudeForZoomLevel(zoomLevel, pitch, latitude, self.frame.size);
+    return MLNAltitudeForZoomLevel(zoomLevel, pitch, latitude, self.frame.size);
 }
 
-- (RCTMGLPointAnnotation*)getRCTPointAnnotation:(MGLPointAnnotation *)mglAnnotation
+- (RCTMLNPointAnnotation*)getRCTPointAnnotation:(MLNPointAnnotation *)mlnAnnotation
 {
     for (int i = 0; i < _pointAnnotations.count; i++) {
-        RCTMGLPointAnnotation *rctAnnotation = _pointAnnotations[i];
-        if (rctAnnotation.annotation == mglAnnotation) {
+        RCTMLNPointAnnotation *rctAnnotation = _pointAnnotations[i];
+        if (rctAnnotation.annotation == mlnAnnotation) {
             return rctAnnotation;
         }
     }
     return nil;
 }
 
-- (NSArray<RCTMGLSource *> *)getAllTouchableSources
+- (NSArray<RCTMLNSource *> *)getAllTouchableSources
 {
-    NSMutableArray<RCTMGLSource *> *touchableSources = [[NSMutableArray alloc] init];
+    NSMutableArray<RCTMLNSource *> *touchableSources = [[NSMutableArray alloc] init];
     
-    for (RCTMGLSource *source in _sources) {
+    for (RCTMLNSource *source in _sources) {
         if (source.hasPressListener) {
             [touchableSources addObject:source];
         }
@@ -459,24 +459,24 @@ static double const M2PI = M_PI * 2;
     return touchableSources;
 }
 
-- (NSArray<RCTMGLImages*>*)getAllImages
+- (NSArray<RCTMLNImages*>*)getAllImages
 {
     return [_images copy];
 }
 
-- (NSArray<RCTMGLShapeSource *> *)getAllShapeSources
+- (NSArray<RCTMLNShapeSource *> *)getAllShapeSources
 {
-    NSMutableArray<RCTMGLSource *> *shapeSources = [[NSMutableArray alloc] init];
+    NSMutableArray<RCTMLNSource *> *shapeSources = [[NSMutableArray alloc] init];
     
-    for (RCTMGLSource *source in _sources) {
-        if ([source isKindOfClass:[RCTMGLShapeSource class]]) {
+    for (RCTMLNSource *source in _sources) {
+        if ([source isKindOfClass:[RCTMLNShapeSource class]]) {
             [shapeSources addObject:source];
         }
     }
     
     return shapeSources;
 }
-- (RCTMGLSource *)getTouchableSourceWithHighestZIndex:(NSArray<RCTMGLSource *> *)touchableSources
+- (RCTMLNSource *)getTouchableSourceWithHighestZIndex:(NSArray<RCTMLNSource *> *)touchableSources
 {
     if (touchableSources == nil || touchableSources.count == 0) {
         return nil;
@@ -486,8 +486,8 @@ static double const M2PI = M_PI * 2;
         return touchableSources[0];
     }
     
-    NSMutableDictionary<NSString *, RCTMGLSource *> *layerToSoureDict = [[NSMutableDictionary alloc] init];
-    for (RCTMGLSource *touchableSource in touchableSources) {
+    NSMutableDictionary<NSString *, RCTMLNSource *> *layerToSoureDict = [[NSMutableDictionary alloc] init];
+    for (RCTMLNSource *touchableSource in touchableSources) {
         NSArray<NSString *> *layerIDs = [touchableSource getLayerIDs];
         
         for (NSString *layerID in layerIDs) {
@@ -495,11 +495,11 @@ static double const M2PI = M_PI * 2;
         }
     }
     
-    NSArray<MGLStyleLayer *> *layers = self.style.layers;
+    NSArray<MLNStyleLayer *> *layers = self.style.layers;
     for (int i = (int)layers.count - 1; i >= 0; i--) {
-        MGLStyleLayer *layer = layers[i];
+        MLNStyleLayer *layer = layers[i];
         
-        RCTMGLSource *source = layerToSoureDict[layer.identifier];
+        RCTMLNSource *source = layerToSoureDict[layer.identifier];
         if (source != nil) {
             return source;
         }
@@ -514,7 +514,7 @@ static double const M2PI = M_PI * 2;
     if (url) {
         return url;
     } else if (RCTJSONParse(styleURL, nil)) {
-        return [RCTMGLUtils styleURLFromStyleJSON:styleURL];
+        return [RCTMLNUtils styleURLFromStyleJSON:styleURL];
     }
     return url;
 }
@@ -524,12 +524,12 @@ static double const M2PI = M_PI * 2;
     if (self.style == nil || _sources.count == 0) {
         return;
     }
-    for (RCTMGLSource *source in _sources) {
+    for (RCTMLNSource *source in _sources) {
         source.map = nil;
     }
 }
 
-- (void)didChangeUserTrackingMode:(MGLUserTrackingMode)mode animated:(BOOL)animated {
+- (void)didChangeUserTrackingMode:(MLNUserTrackingMode)mode animated:(BOOL)animated {
     [_reactCamera didChangeUserTrackingMode:mode animated:animated];
 }
 

package/ios/{RCTMGL/RCTMGLMapViewManager.h → RCTMLN/RCTMLNMapViewManager.h}

@@ -1,15 +1,15 @@
 //
-//  RCTMGLMapViewManager.h
-//  RCTMGL
+//  RCTMLNMapViewManager.h
+//  RCTMLN
 //
 //  Created by Nick Italiano on 8/23/17.
 //  Copyright © 2017 Mapbox Inc. All rights reserved.
 //
 
 #import "ViewManager.h"
-@import Mapbox;
+@import MapLibre;
 
-@interface RCTMGLMapViewManager : ViewManager
+@interface RCTMLNMapViewManager : ViewManager
 
 - (void)didTapMap:(UITapGestureRecognizer *)recognizer;
 - (void)didLongPressMap:(UILongPressGestureRecognizer *)recognizer;