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

package/ios/MLRN/MLRNModule.m

@@ -19,10 +19,6 @@ RCT_EXPORT_MODULE();
 {
     // style urls
     NSMutableDictionary *styleURLS = [[NSMutableDictionary alloc] init];
-
-    for (MLNDefaultStyle* style in [MLNStyle predefinedStyles]) {
-      [styleURLS setObject:[style.url absoluteString] forKey:style.name];
-    }
     [styleURLS setObject:[[MLNStyle defaultStyleURL] absoluteString] forKey:@"Default"];
 
     // event types
@@ -71,120 +67,6 @@ RCT_EXPORT_MODULE();
     NSMutableDictionary *styleSourceConsts = [[NSMutableDictionary alloc] init];
     [styleSourceConsts setObject:DEFAULT_SOURCE_ID forKey:@"DefaultSourceID"];
 
-    // line layer constants
-    NSMutableDictionary *lineJoin = [[NSMutableDictionary alloc] init];
-    [lineJoin setObject:@(MLNLineJoinBevel) forKey:@"Bevel"];
-    [lineJoin setObject:@(MLNLineJoinRound) forKey:@"Round"];
-    [lineJoin setObject:@(MLNLineJoinMiter) forKey:@"Miter"];
-
-    NSMutableDictionary *lineCap = [[NSMutableDictionary alloc] init];
-    [lineCap setObject:@(MLNLineCapButt) forKey:@"Butt"];
-    [lineCap setObject:@(MLNLineCapRound) forKey:@"Round"];
-    [lineCap setObject:@(MLNLineCapSquare) forKey:@"Square"];
-
-    NSMutableDictionary *lineTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [lineTranslateAnchor setObject:@(MLNLineTranslationAnchorMap) forKey:@"Map"];
-    [lineTranslateAnchor setObject:@(MLNLineTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // circle layer constants
-    NSMutableDictionary *circlePitchScale = [[NSMutableDictionary alloc] init];
-    [circlePitchScale setObject:@(MLNCircleScaleAlignmentMap) forKey:@"Map"];
-    [circlePitchScale setObject:@(MLNCircleScaleAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *circlePitchAlignment = [[NSMutableDictionary alloc] init];
-    [circlePitchAlignment setObject:@(MLNCirclePitchAlignmentMap) forKey:@"Map"];
-    [circlePitchAlignment setObject:@(MLNCirclePitchAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *circleTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [circleTranslateAnchor setObject:@(MLNCircleTranslationAnchorMap) forKey:@"Map"];
-    [circleTranslateAnchor setObject:@(MLNCircleTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // fill extrusion layer constants
-    NSMutableDictionary *fillExtrusionTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [fillExtrusionTranslateAnchor setObject:@(MLNFillExtrusionTranslationAnchorMap) forKey:@"Map"];
-    [fillExtrusionTranslateAnchor setObject:@(MLNFillExtrusionTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // fill layer constants
-    NSMutableDictionary *fillTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [fillTranslateAnchor setObject:@(MLNFillTranslationAnchorMap) forKey:@"Map"];
-    [fillTranslateAnchor setObject:@(MLNFillTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // symbol layer constants
-    NSMutableDictionary *iconRotationAlignment = [[NSMutableDictionary alloc] init];
-    [iconRotationAlignment setObject:@(MLNIconRotationAlignmentAuto) forKey:@"Auto"];
-    [iconRotationAlignment setObject:@(MLNIconRotationAlignmentMap) forKey:@"Map"];
-    [iconRotationAlignment setObject:@(MLNIconRotationAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *iconTextFit = [[NSMutableDictionary alloc] init];
-    [iconTextFit setObject:@(MLNIconTextFitNone) forKey:@"None"];
-    [iconTextFit setObject:@(MLNIconTextFitWidth) forKey:@"Width"];
-    [iconTextFit setObject:@(MLNIconTextFitHeight) forKey:@"Height"];
-    [iconTextFit setObject:@(MLNIconTextFitBoth) forKey:@"Both"];
-
-    NSMutableDictionary *iconAnchor = [[NSMutableDictionary alloc] init];
-    [iconAnchor setObject:@(MLNIconAnchorCenter) forKey:@"Center"];
-    [iconAnchor setObject:@(MLNIconAnchorTop) forKey:@"Top"];
-    [iconAnchor setObject:@(MLNIconAnchorBottom) forKey:@"Bottom"];
-    [iconAnchor setObject:@(MLNIconAnchorLeft) forKey:@"Left"];
-    [iconAnchor setObject:@(MLNIconAnchorRight) forKey:@"Right"];
-    [iconAnchor setObject:@(MLNIconAnchorTopLeft) forKey:@"TopLeft"];
-    [iconAnchor setObject:@(MLNIconAnchorTopRight) forKey:@"TopRight"];
-    [iconAnchor setObject:@(MLNIconAnchorBottomLeft) forKey:@"BottomLeft"];
-    [iconAnchor setObject:@(MLNIconAnchorBottomRight) forKey:@"BottomRight"];
-
-    NSMutableDictionary *iconTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [iconTranslateAnchor setObject:@(MLNIconTranslationAnchorMap) forKey:@"Map"];
-    [iconTranslateAnchor setObject:@(MLNIconTranslationAnchorViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *iconPitchAlignment = [[NSMutableDictionary alloc] init];
-    [iconPitchAlignment setObject:@(MLNIconPitchAlignmentAuto) forKey:@"Auto"];
-    [iconPitchAlignment setObject:@(MLNIconPitchAlignmentMap) forKey:@"Map"];
-    [iconPitchAlignment setObject:@(MLNIconPitchAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *symbolPlacement = [[NSMutableDictionary alloc] init];
-    [symbolPlacement setObject:@(MLNSymbolPlacementLine) forKey:@"Line"];
-    [symbolPlacement setObject:@(MLNSymbolPlacementPoint) forKey:@"Point"];
-
-    NSMutableDictionary *textAnchor = [[NSMutableDictionary alloc] init];
-    [textAnchor setObject:@(MLNTextAnchorCenter) forKey:@"Center"];
-    [textAnchor setObject:@(MLNTextAnchorLeft) forKey:@"Left"];
-    [textAnchor setObject:@(MLNTextAnchorRight) forKey:@"Right"];
-    [textAnchor setObject:@(MLNTextAnchorTop) forKey:@"Top"];
-    [textAnchor setObject:@(MLNTextAnchorBottom) forKey:@"Bottom"];
-    [textAnchor setObject:@(MLNTextAnchorTopLeft) forKey:@"TopLeft"];
-    [textAnchor setObject:@(MLNTextAnchorTopRight) forKey:@"TopRight"];
-    [textAnchor setObject:@(MLNTextAnchorBottomLeft) forKey:@"BottomLeft"];
-    [textAnchor setObject:@(MLNTextAnchorBottomRight) forKey:@"BottomRight"];
-
-    NSMutableDictionary *textJustify = [[NSMutableDictionary alloc] init];
-    [textJustify setObject:@(MLNTextJustificationCenter) forKey:@"Center"];
-    [textJustify setObject:@(MLNTextJustificationLeft) forKey:@"Left"];
-    [textJustify setObject:@(MLNTextJustificationRight) forKey:@"Right"];
-
-    NSMutableDictionary *textPitchAlignment = [[NSMutableDictionary alloc] init];
-    [textPitchAlignment setObject:@(MLNTextPitchAlignmentAuto) forKey:@"Auto"];
-    [textPitchAlignment setObject:@(MLNTextPitchAlignmentMap) forKey:@"Map"];
-    [textPitchAlignment setObject:@(MLNTextPitchAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *textRotationAlignment = [[NSMutableDictionary alloc] init];
-    [textRotationAlignment setObject:@(MLNTextRotationAlignmentAuto) forKey:@"Auto"];
-    [textRotationAlignment setObject:@(MLNTextRotationAlignmentMap) forKey:@"Map"];
-    [textRotationAlignment setObject:@(MLNTextRotationAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *textTransform = [[NSMutableDictionary alloc] init];
-    [textTransform setObject:@(MLNTextTransformNone) forKey:@"None"];
-    [textTransform setObject:@(MLNTextTransformLowercase) forKey:@"Lowercase"];
-    [textTransform setObject:@(MLNTextTransformUppercase) forKey:@"Uppercase"];
-
-    NSMutableDictionary *textTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [textTranslateAnchor setObject:@(MLNTextTranslationAnchorMap) forKey:@"Map"];
-    [textTranslateAnchor setObject:@(MLNTextTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // light constants
-    NSMutableDictionary *lightAnchor = [[NSMutableDictionary alloc] init];
-    [lightAnchor setObject:@(MLNLightAnchorMap) forKey:@"Map"];
-    [lightAnchor setObject:@(MLNLightAnchorViewport) forKey:@"Viewport"];
-
     // offline module callback names
     NSMutableDictionary *offlineModuleCallbackNames = [[NSMutableDictionary alloc] init];
     [offlineModuleCallbackNames setObject:RCT_MAPBOX_OFFLINE_CALLBACK_ERROR forKey:@"Error"];
@@ -202,33 +84,16 @@ RCT_EXPORT_MODULE();
          @"UserLocationVerticalAlignment": userLocationVerticalAlignment,
          @"CameraModes": cameraModes,
          @"StyleSource": styleSourceConsts,
-         @"LineJoin": lineJoin,
-         @"LineCap": lineCap,
-         @"LineTranslateAnchor": lineTranslateAnchor,
-         @"CirclePitchScale": circlePitchScale,
-         @"CircleTranslateAnchor": circleTranslateAnchor,
-         @"CirclePitchAlignment": circlePitchAlignment,
-         @"FillExtrusionTranslateAnchor": fillExtrusionTranslateAnchor,
-         @"FillTranslateAnchor": fillTranslateAnchor,
-         @"IconRotationAlignment": iconRotationAlignment,
-         @"IconTextFit": iconTextFit,
-         @"IconTranslateAnchor": iconTranslateAnchor,
-         @"IconAnchor": iconAnchor,
-         @"IconPitchAlignment": iconPitchAlignment,
-         @"SymbolPlacement": symbolPlacement,
-         @"TextAnchor": textAnchor,
-         @"TextJustify": textJustify,
-         @"TextPitchAlignment": textPitchAlignment,
-         @"TextRotationAlignment": textRotationAlignment,
-         @"TextTransform": textTransform,
-         @"TextTranslateAnchor": textTranslateAnchor,
-         @"LightAnchor": lightAnchor,
          @"OfflineCallbackName": offlineModuleCallbackNames,
          @"OfflinePackDownloadState": offlinePackDownloadState,
          @"LocationCallbackName": locationModuleEvents
     };
 }
 
+/**
+* @deprecated This will be removed in the next major version.
+* @see https://github.com/maplibre/maplibre-react-native/issues/25#issuecomment-1382382044
+*/
 RCT_EXPORT_METHOD(setAccessToken:(NSString *)accessToken)
 {
     if (accessToken.length > 0) {
@@ -246,6 +111,10 @@ RCT_EXPORT_METHOD(removeCustomHeader:(NSString *)headerName)
     [MLRNCustomHeaders.sharedInstance removeHeader:headerName];
 }
 
+/**
+* @deprecated This will be removed in the next major version.
+* @see https://github.com/maplibre/maplibre-react-native/issues/25#issuecomment-1382382044
+*/
 RCT_EXPORT_METHOD(getAccessToken:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSString* accessToken = MLNSettings.apiKey;

package/ios/MLRN/MLRNRasterLayer.h

@@ -1,5 +1,4 @@
 #import "MLRNLayer.h"
-@import MapLibre;
 
 @interface MLRNRasterLayer : MLRNLayer
 

package/ios/MLRN/MLRNShapeSource.h

@@ -31,15 +31,4 @@
 
 - (double)getClusterExpansionZoom:(nonnull NSString *)featureJSON;
 
-// Deprecated. Will be removed in 9+ ver.
-- (nonnull NSArray<id <MLNFeature>> *)getClusterLeavesById:(nonnull NSNumber *)clusterId
-                                                number:(NSUInteger)number    
-                                                offset:(NSUInteger)offset;
-
-// Deprecated. Will be removed in 9+ ver.                                                
-- (nonnull NSArray<id <MLNFeature>> *)getClusterChildrenById:(nonnull NSNumber *)clusterId;     
-                                          
-// Deprecated. Will be removed in 9+ ver.
-- (double)getClusterExpansionZoomById:(nonnull NSNumber *)clusterId;
-
 @end

package/ios/MLRN/MLRNShapeSource.m

@@ -145,42 +145,4 @@ static UIImage * _placeHolderImage;
     return [shapeSource childrenOfCluster:cluster];
 }
 
-
-// Deprecated. Will be removed in 9+ ver.
-- (double)getClusterExpansionZoomById:(nonnull NSNumber *)clusterId
-{
-    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
-    NSArray<id<MLNFeature>> *features = [shapeSource featuresMatchingPredicate: [NSPredicate predicateWithFormat:@"%K = %i", @"cluster_id", clusterId.intValue]];
-    if (features.count == 0) {
-        return -1;
-    }
-    return [shapeSource zoomLevelForExpandingCluster:(MLNPointFeatureCluster *)features[0]];
-}
-
-// Deprecated. Will be removed in 9+ ver.
-- (nonnull NSArray<id <MLNFeature>> *)getClusterLeavesById:(nonnull NSNumber *)clusterId
-    number:(NSUInteger)number
-    offset:(NSUInteger)offset
-{
-    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
-    
-    NSPredicate* predicate = [NSPredicate predicateWithFormat:@"cluster_id == %@", clusterId];
-    NSArray<id<MLNFeature>> *features = [shapeSource featuresMatchingPredicate:predicate];
-    
-    MLNPointFeatureCluster * cluster = (MLNPointFeatureCluster *)features[0];
-    return [shapeSource leavesOfCluster:cluster offset:offset limit:number];
-}
-
-// Deprecated. Will be removed in 9+ ver.
-- (nonnull NSArray<id <MLNFeature>> *)getClusterChildrenById:(nonnull NSNumber *)clusterId
-{
-    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
-    
-    NSPredicate* predicate = [NSPredicate predicateWithFormat:@"cluster_id == %@", clusterId];
-    NSArray<id<MLNFeature>> *features = [shapeSource featuresMatchingPredicate:predicate];
-    
-    MLNPointFeatureCluster * cluster = (MLNPointFeatureCluster *)features[0];
-    return [shapeSource childrenOfCluster:cluster];
-}
-
 @end

package/ios/MLRN/MLRNShapeSourceManager.m

@@ -128,72 +128,4 @@ RCT_EXPORT_METHOD(getClusterChildren:(nonnull NSNumber*)reactTag
     }];
 }
 
-// Deprecated. Will be removed in 9+ ver.
-RCT_EXPORT_METHOD(getClusterExpansionZoomById:(nonnull NSNumber*)reactTag
-                                clusterId:(nonnull NSNumber*)clusterId
-                                 resolver:(RCTPromiseResolveBlock)resolve
-                                 rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        MLRNShapeSource* shapeSource = (MLRNShapeSource *)viewRegistry[reactTag];
-
-        if (![shapeSource isKindOfClass:[MLRNShapeSource class]]) {
-            RCTLogError(@"Invalid react tag, could not find MLRNMapView");
-            return;
-        }
-
-        double zoom = [shapeSource getClusterExpansionZoomById:clusterId];
-        if (zoom == -1) {
-          reject(@"zoom_error", [NSString stringWithFormat:@"Could not get zoom for cluster id %@", clusterId], nil);
-          return;
-        }
-        resolve(@{@"data":@(zoom)});
-    }];
-}
-
-// Deprecated. Will be removed in 9+ ver.
-RCT_EXPORT_METHOD(getClusterLeavesById:(nonnull NSNumber*)reactTag
-                  clusterId:(nonnull NSNumber *)clusterId
-                  number:(NSUInteger) number
-                  offset:(NSUInteger) offset
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        MLRNShapeSource* shapeSource = (MLRNShapeSource *)viewRegistry[reactTag];
-
-        NSArray<id<MLNFeature>> *shapes = [shapeSource getClusterLeavesById:clusterId number:number offset:offset];
-
-        NSMutableArray<NSDictionary*> *features = [[NSMutableArray alloc] initWithCapacity:shapes.count];
-        for (int i = 0; i < shapes.count; i++) {
-            [features addObject:shapes[i].geoJSONDictionary];
-        }
-
-        resolve(@{
-                  @"data": @{ @"type": @"FeatureCollection", @"features": features }
-                  });
-    }];
-}
-// Deprecated. Will be removed in 9+ ver.
-RCT_EXPORT_METHOD(getClusterChildrenById:(nonnull NSNumber*)reactTag
-                  clusterId:(nonnull NSNumber *)clusterId                  
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        MLRNShapeSource* shapeSource = (MLRNShapeSource *)viewRegistry[reactTag];
-
-        NSArray<id<MLNFeature>> *shapes = [shapeSource getClusterChildrenById: clusterId];
-
-        NSMutableArray<NSDictionary*> *features = [[NSMutableArray alloc] initWithCapacity:shapes.count];
-        for (int i = 0; i < shapes.count; i++) {
-            [features addObject:shapes[i].geoJSONDictionary];
-        }
-
-        resolve(@{
-                  @"data": @{ @"type": @"FeatureCollection", @"features": features }
-                  });
-    }];
-}
-
 @end

package/ios/MLRN/MLRNStyle.m

@@ -24,10 +24,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"fillSortKey"]) {
@@ -88,10 +84,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"lineCap"]) {
@@ -176,10 +168,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"symbolPlacement"]) {
@@ -348,10 +336,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"circleSortKey"]) {
@@ -411,10 +395,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"visibility"]) {
@@ -450,10 +430,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"visibility"]) {
@@ -516,10 +492,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"visibility"]) {
@@ -567,10 +539,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"visibility"]) {
@@ -610,10 +578,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"visibility"]) {
@@ -660,10 +624,6 @@
 
   NSArray<NSString*> *styleProps = [reactStyle allKeys];
   for (NSString *prop in styleProps) {
-    if ([prop isEqualToString:@"__MAPBOX_STYLESHEET__"]) {
-      continue;
-    }
-
     MLRNStyleValue *styleValue = [MLRNStyleValue make:reactStyle[prop]];
 
     if ([prop isEqualToString:@"anchor"]) {

package/ios/MLRN/MLRNSymbolLayer.h

@@ -1,11 +1,5 @@
-#import <React/RCTComponent.h>
 #import "MLRNVectorLayer.h"
 
-@interface MLRNSymbolLayer : MLRNVectorLayer<RCTInvalidating>
-
-@property (nonatomic, strong) NSMutableArray<id<RCTComponent>> *reactSubviews;
-
-@property (nonatomic, assign) BOOL snapshot;
-@property (nonatomic, copy) NSString *sourceLayerID;
+@interface MLRNSymbolLayer : MLRNVectorLayer
 
 @end

package/ios/MLRN/MLRNSymbolLayer.m

@@ -1,85 +1,10 @@
 #import "MLRNSymbolLayer.h"
 #import "MLRNStyle.h"
-#import <React/UIView+React.h>
+
 #import <React/RCTLog.h>
 
 @implementation MLRNSymbolLayer
 
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    if (self = [super initWithFrame:frame]) {
-        _reactSubviews = [[NSMutableArray alloc] init];
-    }
-    return self;
-}
-
-- (void)invalidate
-{
-    if (_snapshot == YES && self.style != nil) {
-        [self.style removeImageForName:self.id];
-    }
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
-- (void)insertReactSubview:(id<RCTComponent>)subview atIndex:(NSInteger)atIndex {
-    [_reactSubviews insertObject:(UIView *)subview atIndex:(NSUInteger) atIndex];
-}
-#pragma clang diagnostic pop
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
-- (void)removeReactSubview:(id<RCTComponent>)subview {
-    [_reactSubviews removeObject:(UIView *)subview];
-}
-#pragma clang diagnostic pop
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
-- (NSArray<id<RCTComponent>> *)reactSubviews {
-    return nil;
-}
-#pragma clang diagnostic pop
-
-- (void)setSnapshot:(BOOL)snapshot
-{
-    _snapshot = snapshot;
-    
-    if (self.style != nil) {
-        UIImage *image;
-        MLNSymbolStyleLayer *layer = (MLNSymbolStyleLayer *) self.styleLayer;
-        
-        if (_snapshot == YES) {
-            image = [self _createViewSnapshot];
-            [self.style setImage:image forName:self.id];
-            layer.iconImageName = [NSExpression expressionWithFormat:self.id];
-        } else {
-            image = [self.style imageForName:self.id];
-            
-            if (image != nil) {
-                [self.style removeImageForName:self.id];
-                layer.iconImageName = nil;
-            }
-        }
-    }
-}
-
-- (void)addedToMap
-{
-    [super addedToMap];
-    
-    if (_snapshot == YES) {
-        UIImage *image = [self _createViewSnapshot];
-        
-        if (image != nil) {
-            [self.style setImage:image forName:self.id];
-            
-            MLNSymbolStyleLayer *layer = (MLNSymbolStyleLayer *)self.styleLayer;
-            layer.iconImageName = [NSExpression expressionForConstantValue:self.id];
-        }
-    }
-}
-
 - (MLNSymbolStyleLayer*)makeLayer:(MLNStyle*)style
 {
     MLNSource *source = [self layerWithSourceIDInStyle: style];
@@ -97,17 +22,4 @@
     }];
 }
 
-- (UIImage *)_createViewSnapshot
-{
-    if (_reactSubviews.count == 0) {
-        return nil;
-    }
-    UIView *view = (UIView *)_reactSubviews[0];
-    UIGraphicsBeginImageContextWithOptions(view.bounds.size, NO, 0.f);
-    [view drawViewHierarchyInRect:view.bounds afterScreenUpdates:YES];
-    UIImage *snapshot = UIGraphicsGetImageFromCurrentImageContext();
-    UIGraphicsEndImageContext();
-    return snapshot;
-}
-
 @end

package/ios/MLRN/MLRNSymbolLayerManager.m

@@ -12,7 +12,6 @@ RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString);
 RCT_EXPORT_VIEW_PROPERTY(id, NSString);
 RCT_EXPORT_VIEW_PROPERTY(sourceID, NSString);
 RCT_EXPORT_VIEW_PROPERTY(filter, NSArray);
-RCT_EXPORT_VIEW_PROPERTY(snapshot, BOOL);
 
 RCT_EXPORT_VIEW_PROPERTY(aboveLayerID, NSString);
 RCT_EXPORT_VIEW_PROPERTY(belowLayerID, NSString);

package/lib/commonjs/MLRNModule.js

@@ -3,25 +3,27 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setConnected = exports.setAccessToken = exports.getAccessToken = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = exports.LineJoin = exports.CameraModes = void 0;
+exports.setConnected = exports.setAccessToken = exports.removeCustomHeader = exports.getAccessToken = exports.addCustomHeader = exports.StyleURL = exports.StyleSource = exports.OfflinePackDownloadState = exports.CameraModes = void 0;
 var _reactNative = require("react-native");
 const MLRNModule = Object.create(_reactNative.NativeModules.MLRNModule);
 const {
   CameraModes,
-  StyleURL,
   OfflinePackDownloadState,
-  LineJoin,
   StyleSource,
+  StyleURL,
   setAccessToken,
   getAccessToken,
+  addCustomHeader,
+  removeCustomHeader,
   setConnected
 } = MLRNModule;
 exports.setConnected = setConnected;
+exports.removeCustomHeader = removeCustomHeader;
+exports.addCustomHeader = addCustomHeader;
 exports.getAccessToken = getAccessToken;
 exports.setAccessToken = setAccessToken;
+exports.StyleURL = StyleURL;
 exports.StyleSource = StyleSource;
-exports.LineJoin = LineJoin;
 exports.OfflinePackDownloadState = OfflinePackDownloadState;
-exports.StyleURL = StyleURL;
 exports.CameraModes = CameraModes;
 //# sourceMappingURL=MLRNModule.js.map

package/lib/commonjs/MLRNModule.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","MLRNModule","Object","create","NativeModules","CameraModes","StyleURL","OfflinePackDownloadState","LineJoin","StyleSource","setAccessToken","getAccessToken","setConnected","exports"],"sourceRoot":"../../src","sources":["MLRNModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAkCA,MAAMC,UAAuB,GAAGC,MAAM,CAACC,MAAM,CAACC,0BAAa,CAACH,UAAU,CAAC;AAEhE,MAAM;EACXI,WAAW;EACXC,QAAQ;EACRC,wBAAwB;EACxBC,QAAQ;EACRC,WAAW;EACXC,cAAc;EACdC,cAAc;EACdC;AACF,CAAC,GAAGX,UAAU;AAACY,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAAAC,OAAA,CAAAF,cAAA,GAAAA,cAAA;AAAAE,OAAA,CAAAH,cAAA,GAAAA,cAAA;AAAAG,OAAA,CAAAJ,WAAA,GAAAA,WAAA;AAAAI,OAAA,CAAAL,QAAA,GAAAA,QAAA;AAAAK,OAAA,CAAAN,wBAAA,GAAAA,wBAAA;AAAAM,OAAA,CAAAP,QAAA,GAAAA,QAAA;AAAAO,OAAA,CAAAR,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","MLRNModule","Object","create","NativeModules","CameraModes","OfflinePackDownloadState","StyleSource","StyleURL","setAccessToken","getAccessToken","addCustomHeader","removeCustomHeader","setConnected","exports"],"sourceRoot":"../../src","sources":["MLRNModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AA4CA,MAAMC,UAAuB,GAAGC,MAAM,CAACC,MAAM,CAACC,0BAAa,CAACH,UAAU,CAAC;AAEhE,MAAM;EACXI,WAAW;EACXC,wBAAwB;EACxBC,WAAW;EACXC,QAAQ;EAERC,cAAc;EACdC,cAAc;EAEdC,eAAe;EACfC,kBAAkB;EAElBC;AACF,CAAC,GAAGZ,UAAU;AAACa,OAAA,CAAAD,YAAA,GAAAA,YAAA;AAAAC,OAAA,CAAAF,kBAAA,GAAAA,kBAAA;AAAAE,OAAA,CAAAH,eAAA,GAAAA,eAAA;AAAAG,OAAA,CAAAJ,cAAA,GAAAA,cAAA;AAAAI,OAAA,CAAAL,cAAA,GAAAA,cAAA;AAAAK,OAAA,CAAAN,QAAA,GAAAA,QAAA;AAAAM,OAAA,CAAAP,WAAA,GAAAA,WAAA;AAAAO,OAAA,CAAAR,wBAAA,GAAAA,wBAAA;AAAAQ,OAAA,CAAAT,WAAA,GAAAA,WAAA","ignoreList":[]}