@rnmapbox/maps 10.1.0-rc.6 → 10.1.0

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXHeatmapLayerManagerInterface.java

@@ -13,16 +13,15 @@ import android.view.View;
 import com.facebook.react.bridge.Dynamic;
 
 public interface RNMBXHeatmapLayerManagerInterface<T extends View> {
+  void setId(T view, Dynamic value);
   void setSourceID(T view, Dynamic value);
   void setExisting(T view, Dynamic value);
   void setFilter(T view, Dynamic value);
   void setAboveLayerID(T view, Dynamic value);
   void setBelowLayerID(T view, Dynamic value);
   void setLayerIndex(T view, Dynamic value);
+  void setReactStyle(T view, Dynamic value);
   void setMaxZoomLevel(T view, Dynamic value);
   void setMinZoomLevel(T view, Dynamic value);
   void setSourceLayerID(T view, Dynamic value);
-  void setSlot(T view, Dynamic value);
-  void setId(T view, Dynamic value);
-  void setReactStyle(T view, Dynamic value);
 }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLineLayerManagerDelegate.java

@@ -22,6 +22,9 @@ public class RNMBXLineLayerManagerDelegate<T extends View, U extends BaseViewMan
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
       case "sourceID":
         mViewManager.setSourceID(view, new DynamicFromObject(value));
         break;
@@ -40,6 +43,9 @@ public class RNMBXLineLayerManagerDelegate<T extends View, U extends BaseViewMan
       case "layerIndex":
         mViewManager.setLayerIndex(view, new DynamicFromObject(value));
         break;
+      case "reactStyle":
+        mViewManager.setReactStyle(view, new DynamicFromObject(value));
+        break;
       case "maxZoomLevel":
         mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
         break;
@@ -49,15 +55,6 @@ public class RNMBXLineLayerManagerDelegate<T extends View, U extends BaseViewMan
       case "sourceLayerID":
         mViewManager.setSourceLayerID(view, new DynamicFromObject(value));
         break;
-      case "slot":
-        mViewManager.setSlot(view, new DynamicFromObject(value));
-        break;
-      case "id":
-        mViewManager.setId(view, new DynamicFromObject(value));
-        break;
-      case "reactStyle":
-        mViewManager.setReactStyle(view, new DynamicFromObject(value));
-        break;
       default:
         super.setProperty(view, propName, value);
     }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLineLayerManagerInterface.java

@@ -13,16 +13,15 @@ import android.view.View;
 import com.facebook.react.bridge.Dynamic;
 
 public interface RNMBXLineLayerManagerInterface<T extends View> {
+  void setId(T view, Dynamic value);
   void setSourceID(T view, Dynamic value);
   void setExisting(T view, Dynamic value);
   void setFilter(T view, Dynamic value);
   void setAboveLayerID(T view, Dynamic value);
   void setBelowLayerID(T view, Dynamic value);
   void setLayerIndex(T view, Dynamic value);
+  void setReactStyle(T view, Dynamic value);
   void setMaxZoomLevel(T view, Dynamic value);
   void setMinZoomLevel(T view, Dynamic value);
   void setSourceLayerID(T view, Dynamic value);
-  void setSlot(T view, Dynamic value);
-  void setId(T view, Dynamic value);
-  void setReactStyle(T view, Dynamic value);
 }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerDelegate.java

@@ -67,9 +67,6 @@ public class RNMBXMapViewManagerDelegate<T extends View, U extends BaseViewManag
       case "pitchEnabled":
         mViewManager.setPitchEnabled(view, new DynamicFromObject(value));
         break;
-      case "deselectAnnotationOnTap":
-        mViewManager.setDeselectAnnotationOnTap(view, new DynamicFromObject(value));
-        break;
       case "requestDisallowInterceptTouchEvent":
         mViewManager.setRequestDisallowInterceptTouchEvent(view, new DynamicFromObject(value));
         break;

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerInterface.java

@@ -28,7 +28,6 @@ public interface RNMBXMapViewManagerInterface<T extends View> {
   void setScrollEnabled(T view, Dynamic value);
   void setRotateEnabled(T view, Dynamic value);
   void setPitchEnabled(T view, Dynamic value);
-  void setDeselectAnnotationOnTap(T view, Dynamic value);
   void setRequestDisallowInterceptTouchEvent(T view, Dynamic value);
   void setProjection(T view, Dynamic value);
   void setLocalizeLabels(T view, Dynamic value);

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerDelegate.java

@@ -31,9 +31,6 @@ public class RNMBXMarkerViewManagerDelegate<T extends View, U extends BaseViewMa
       case "allowOverlap":
         mViewManager.setAllowOverlap(view, new DynamicFromObject(value));
         break;
-      case "allowOverlapWithPuck":
-        mViewManager.setAllowOverlapWithPuck(view, new DynamicFromObject(value));
-        break;
       case "isSelected":
         mViewManager.setIsSelected(view, new DynamicFromObject(value));
         break;

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerInterface.java

@@ -16,6 +16,5 @@ public interface RNMBXMarkerViewManagerInterface<T extends View> {
   void setCoordinate(T view, Dynamic value);
   void setAnchor(T view, Dynamic value);
   void setAllowOverlap(T view, Dynamic value);
-  void setAllowOverlapWithPuck(T view, Dynamic value);
   void setIsSelected(T view, Dynamic value);
 }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerDelegate.java

@@ -25,29 +25,8 @@ public class RNMBXNativeUserLocationManagerDelegate<T extends View, U extends Ba
       case "androidRenderMode":
         mViewManager.setAndroidRenderMode(view, new DynamicFromObject(value));
         break;
-      case "puckBearing":
-        mViewManager.setPuckBearing(view, new DynamicFromObject(value));
-        break;
-      case "puckBearingEnabled":
-        mViewManager.setPuckBearingEnabled(view, new DynamicFromObject(value));
-        break;
-      case "bearingImage":
-        mViewManager.setBearingImage(view, new DynamicFromObject(value));
-        break;
-      case "shadowImage":
-        mViewManager.setShadowImage(view, new DynamicFromObject(value));
-        break;
-      case "topImage":
-        mViewManager.setTopImage(view, new DynamicFromObject(value));
-        break;
-      case "scale":
-        mViewManager.setScale(view, new DynamicFromObject(value));
-        break;
-      case "visible":
-        mViewManager.setVisible(view, value == null ? false : (boolean) value);
-        break;
-      case "pulsing":
-        mViewManager.setPulsing(view, new DynamicFromObject(value));
+      case "iosShowsUserHeadingIndicator":
+        mViewManager.setIosShowsUserHeadingIndicator(view, new DynamicFromObject(value));
         break;
       default:
         super.setProperty(view, propName, value);

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerInterface.java

@@ -14,12 +14,5 @@ import com.facebook.react.bridge.Dynamic;
 
 public interface RNMBXNativeUserLocationManagerInterface<T extends View> {
   void setAndroidRenderMode(T view, Dynamic value);
-  void setPuckBearing(T view, Dynamic value);
-  void setPuckBearingEnabled(T view, Dynamic value);
-  void setBearingImage(T view, Dynamic value);
-  void setShadowImage(T view, Dynamic value);
-  void setTopImage(T view, Dynamic value);
-  void setScale(T view, Dynamic value);
-  void setVisible(T view, boolean value);
-  void setPulsing(T view, Dynamic value);
+  void setIosShowsUserHeadingIndicator(T view, Dynamic value);
 }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterLayerManagerDelegate.java

@@ -22,6 +22,9 @@ public class RNMBXRasterLayerManagerDelegate<T extends View, U extends BaseViewM
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
       case "sourceID":
         mViewManager.setSourceID(view, new DynamicFromObject(value));
         break;
@@ -40,6 +43,9 @@ public class RNMBXRasterLayerManagerDelegate<T extends View, U extends BaseViewM
       case "layerIndex":
         mViewManager.setLayerIndex(view, new DynamicFromObject(value));
         break;
+      case "reactStyle":
+        mViewManager.setReactStyle(view, new DynamicFromObject(value));
+        break;
       case "maxZoomLevel":
         mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
         break;
@@ -49,15 +55,6 @@ public class RNMBXRasterLayerManagerDelegate<T extends View, U extends BaseViewM
       case "sourceLayerID":
         mViewManager.setSourceLayerID(view, new DynamicFromObject(value));
         break;
-      case "slot":
-        mViewManager.setSlot(view, new DynamicFromObject(value));
-        break;
-      case "id":
-        mViewManager.setId(view, new DynamicFromObject(value));
-        break;
-      case "reactStyle":
-        mViewManager.setReactStyle(view, new DynamicFromObject(value));
-        break;
       default:
         super.setProperty(view, propName, value);
     }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterLayerManagerInterface.java

@@ -13,16 +13,15 @@ import android.view.View;
 import com.facebook.react.bridge.Dynamic;
 
 public interface RNMBXRasterLayerManagerInterface<T extends View> {
+  void setId(T view, Dynamic value);
   void setSourceID(T view, Dynamic value);
   void setExisting(T view, Dynamic value);
   void setFilter(T view, Dynamic value);
   void setAboveLayerID(T view, Dynamic value);
   void setBelowLayerID(T view, Dynamic value);
   void setLayerIndex(T view, Dynamic value);
+  void setReactStyle(T view, Dynamic value);
   void setMaxZoomLevel(T view, Dynamic value);
   void setMinZoomLevel(T view, Dynamic value);
   void setSourceLayerID(T view, Dynamic value);
-  void setSlot(T view, Dynamic value);
-  void setId(T view, Dynamic value);
-  void setReactStyle(T view, Dynamic value);
 }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSymbolLayerManagerDelegate.java

@@ -22,6 +22,9 @@ public class RNMBXSymbolLayerManagerDelegate<T extends View, U extends BaseViewM
   @Override
   public void setProperty(T view, String propName, @Nullable Object value) {
     switch (propName) {
+      case "id":
+        mViewManager.setId(view, new DynamicFromObject(value));
+        break;
       case "sourceID":
         mViewManager.setSourceID(view, new DynamicFromObject(value));
         break;
@@ -40,6 +43,9 @@ public class RNMBXSymbolLayerManagerDelegate<T extends View, U extends BaseViewM
       case "layerIndex":
         mViewManager.setLayerIndex(view, new DynamicFromObject(value));
         break;
+      case "reactStyle":
+        mViewManager.setReactStyle(view, new DynamicFromObject(value));
+        break;
       case "maxZoomLevel":
         mViewManager.setMaxZoomLevel(view, new DynamicFromObject(value));
         break;
@@ -49,15 +55,6 @@ public class RNMBXSymbolLayerManagerDelegate<T extends View, U extends BaseViewM
       case "sourceLayerID":
         mViewManager.setSourceLayerID(view, new DynamicFromObject(value));
         break;
-      case "slot":
-        mViewManager.setSlot(view, new DynamicFromObject(value));
-        break;
-      case "id":
-        mViewManager.setId(view, new DynamicFromObject(value));
-        break;
-      case "reactStyle":
-        mViewManager.setReactStyle(view, new DynamicFromObject(value));
-        break;
       default:
         super.setProperty(view, propName, value);
     }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSymbolLayerManagerInterface.java

@@ -13,16 +13,15 @@ import android.view.View;
 import com.facebook.react.bridge.Dynamic;
 
 public interface RNMBXSymbolLayerManagerInterface<T extends View> {
+  void setId(T view, Dynamic value);
   void setSourceID(T view, Dynamic value);
   void setExisting(T view, Dynamic value);
   void setFilter(T view, Dynamic value);
   void setAboveLayerID(T view, Dynamic value);
   void setBelowLayerID(T view, Dynamic value);
   void setLayerIndex(T view, Dynamic value);
+  void setReactStyle(T view, Dynamic value);
   void setMaxZoomLevel(T view, Dynamic value);
   void setMinZoomLevel(T view, Dynamic value);
   void setSourceLayerID(T view, Dynamic value);
-  void setSlot(T view, Dynamic value);
-  void setId(T view, Dynamic value);
-  void setReactStyle(T view, Dynamic value);
 }

package/ios/RNMBX/CommonLayerProperties.H

@@ -10,6 +10,4 @@ RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary);
 RCT_EXPORT_VIEW_PROPERTY(maxZoomLevel, NSNumber);
 RCT_EXPORT_VIEW_PROPERTY(minZoomLevel, NSNumber);
 
-RCT_EXPORT_VIEW_PROPERTY(slot, NSString);
-
 

package/ios/RNMBX/CustomHttpHeaders.swift

@@ -46,16 +46,23 @@ class CustomHttpHeaders : HttpServiceInterceptorInterface {
     return request
   }
 
-  #if !RNMBX_11
   func onDownload(forDownload download: DownloadOptions) -> DownloadOptions {
     customHeaders.forEach {(key,value) in
       download.request.headers[key] = value
     }
     return download
   }
-  #endif
 
   func onResponse(for response: HttpResponse) -> HttpResponse {
     return response
   }
+  
+  #if RNMBX_11
+  func onUpload(forUpload upload: UploadOptions) -> UploadOptions {
+    customHeaders.forEach {(key,value) in
+      upload.headers[key] = value
+    }
+    return upload
+  }
+  #endif
 }

package/ios/RNMBX/RNMBXCamera.swift

@@ -42,11 +42,11 @@ struct CameraUpdateItem {
       }
       switch mode {
         case .flight:
-        map.mapView.camera.fly(to: camera, duration: duration)
+          map.camera.fly(to: camera, duration: duration)
         case .ease:
-        map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
+          map.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
         case .linear:
-        map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .linear, completion: nil)
+          map.camera.ease(to: camera, duration: duration ?? 0, curve: .linear, completion: nil)
         default:
           map.mapboxMap.setCamera(to: camera)
       }
@@ -524,7 +524,7 @@ open class RNMBXCamera : RNMBXMapComponentBase {
       return false
     }
 
-    map.mapView.viewport.removeStatusObserver(self)
+    map.viewport.removeStatusObserver(self)
     return super.removeFromMap(map, reason:reason)
   }
 }

package/ios/RNMBX/RNMBXEvent.swift

@@ -38,8 +38,6 @@ class RNMBXEvent : NSObject, RNMBXEventProtocol {
       case onUserTrackingModeChange
       case vectorSourceLayerPress
       case shapeSourceLayerPress
-      case annotationSelected = "annotationselected"
-      case annotationDeselected = "annotationdeselected"
     }
     
     init(type: EventType, payload: [String:Any?]?) {

package/ios/RNMBX/RNMBXImageModule.mm

@@ -25,7 +25,7 @@ RCT_EXPORT_MODULE();
   return RCTGetUIManagerQueue();
 }
 
-- (void)withImage:(nonnull NSNumber*)viewRef block:(void (^)(RNMBXImage *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
+- (void)withImage:(NSNumber*)viewRef block:(void (^)(RNMBXImage *))block reject:(RCTPromiseRejectBlock)reject methodName:(NSString *)methodName
 {
 #ifdef RCT_NEW_ARCH_ENABLED
     [self.viewRegistry_DEPRECATED addUIBlock:^(RCTViewRegistry *viewRegistry) {
@@ -46,7 +46,7 @@ RCT_EXPORT_MODULE();
 }
 
 
-RCT_EXPORT_METHOD(refresh:(nonnull NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(refresh:(NSNumber*)viewRef resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
     [self withImage:viewRef block:^(RNMBXImage *view) {
         // TODO: implement refresh on iOS

package/ios/RNMBX/RNMBXImages.swift

@@ -22,8 +22,6 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   
   weak var style: Style? = nil
 
-  var imageManager: ImageManager? = nil
-
   @objc
   public var onImageMissing: RCTBubblingEventBlock? = nil
   
@@ -48,18 +46,9 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   typealias NativeImageInfo = (name:String, sdf: Bool, stretchX:[(from:Float, to:Float)], stretchY:[(from:Float, to:Float)], content: (left:Float,top:Float,right:Float,bottom:Float)? );
   var nativeImageInfos: [NativeImageInfo] = []
   
-  @objc public func addImageView(_ image: RNMBXImage) {
-    imageViews.append(image)
-  }
-
-  @objc public func removeImageView(_ image: RNMBXImage) {
-    imageViews.removeAll { $0 == image }
-    image.images = nil
-  }
-
   @objc open override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
     if let image = subview as? RNMBXImage {
-      addImageView(image)
+      imageViews.insert(image, at: atIndex)
     } else {
       Logger.log(level:.warn, message: "RNMBXImages children can only be RNMBXImage, got \(optional: subview)")
     }
@@ -68,7 +57,8 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   
   @objc open override func removeReactSubview(_ subview: UIView!) {
     if let image = subview as? RNMBXImage {
-      removeImageView(image)
+      imageViews.removeAll { $0 == image }
+      image.images = nil
     }
     super.removeReactSubview(subview)
   }
@@ -81,7 +71,6 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   
   func addToMap(_ map: RNMBXMapView, style: Style) {
     self.style = style
-    imageManager = map.imageManager
     map.images.append(self)
     
     self.addNativeImages(style: style, nativeImages: nativeImageInfos)
@@ -91,7 +80,6 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   
   func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     self.style = nil
-    imageManager = nil
     // v10todo
     return true
   }
@@ -128,7 +116,7 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
         if !sameImage(oldValue: oldImages[name], newValue: images[name]) {
           missingImages[name] = images[name]
         } else {
-          if !hasImage(style: style, name: name) {
+          if hasImage(style: style, name: name) {
             logged("RNMBXImages.addImagePlaceholder") {
               try style.addImage(placeholderImage, id: name, stretchX: [], stretchY: [])
               missingImages[name] = images[name]
@@ -139,10 +127,7 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
     }
     
     if missingImages.count > 0 {
-      RNMBXUtils.fetchImages(bridge, style: style, objects: missingImages, forceUpdate: true) { name, image in
-        self.loadedImages.insert(name)
-        self.imageManager?.resolve(name: name, image: image)
-      }
+      RNMBXUtils.fetchImages(bridge, style: style, objects: missingImages, forceUpdate: true, loaded: { name in self.loadedImages.insert(name) } ,callback: { })
     }
   }
   
@@ -258,7 +243,7 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
   func addNativeImages(style: Style, nativeImages: [NativeImageInfo]) {
     for imageInfo in nativeImages {
       let imageName = imageInfo.name
-      if  !hasImage(style: style, name: imageName) {
+      if  hasImage(style: style, name:imageName) {
         if let image = UIImage(named: imageName) {
           logged("RNMBXImage.addNativeImage: \(imageName)") {
             try style.addImage(image, id: imageName, sdf: imageInfo.sdf,
@@ -267,7 +252,6 @@ open class RNMBXImages : UIView, RNMBXMapComponent {
                                content: RNMBXImages.convert(content: imageInfo.content, scale: image.scale)
             )
           }
-          imageManager?.resolve(name: imageName, image: image)
         } else {
           Logger.log(level:.error, message: "Cannot find nativeImage named \(imageName)")
         }

package/ios/RNMBX/RNMBXImagesComponentView.mm

@@ -3,8 +3,6 @@
 #import "RNMBXImagesComponentView.h"
 #import "RNMBXFabricHelpers.h"
 
-#include "RNMBXImageComponentView.h"
-
 #import <React/RCTBridge+Private.h>
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
@@ -70,7 +68,7 @@ using namespace facebook::react;
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-    const auto &newProps = static_cast<const RNMBXImagesProps &>(*props);
+  const auto &newProps = static_cast<const RNMBXImagesProps &>(*props);
     id images = RNMBXConvertFollyDynamicToId(newProps.images);
     if (images != nil) {
         _view.images = images;
@@ -83,22 +81,6 @@ using namespace facebook::react;
   [super updateProps:props oldProps:oldProps];
 }
 
-- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
-{
-    if ([childComponentView isKindOfClass:[RNMBXImageComponentView class]] && ((RNMBXImageComponentView *)childComponentView).contentView) {
-        [_view addImageView:((RNMBXImageComponentView *)childComponentView).contentView];
-    }
-    [super mountChildComponentView:childComponentView index:index];
-}
-
-- (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
-{
-    if ([childComponentView isKindOfClass:[RCTViewComponentView class]] && ((RCTViewComponentView *)childComponentView).contentView) {
-        [_view removeImageView:((RCTViewComponentView *)childComponentView).contentView];
-    }
-    [super unmountChildComponentView:childComponentView index:index];
-}
-
 @end
 
 Class<RCTComponentViewProtocol> RNMBXImagesCls(void)

package/ios/RNMBX/RNMBXInteractiveElement.swift

@@ -18,7 +18,7 @@ public class RNMBXInteractiveElement : UIView, RNMBXMapComponent {
   @objc public var id: String! = nil {
     willSet {
       if id != nil && newValue != id {
-        Logger.log(level:.warn, message: "Changing id from: \(optional: id) to \(optional: newValue), changing of id is not supported")
+        Logger.log(level:.warn, message: "Changing id from: \(optional: id) to \(optional: newValue), changing of id is supported")
         if let map = map { removeFromMap(map, reason: .ComponentChange) }
       }
     }

package/ios/RNMBX/RNMBXLayer.swift

@@ -96,12 +96,6 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     }
   }
   
-  @objc public var slot: String? = nil {
-    didSet {
-      optionsChanged()
-    }
-  }
-  
   @objc weak var map: RNMBXMapView? = nil
 
   deinit {
@@ -258,21 +252,6 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     removeFromMap(style)
   }
   
-  #if RNMBX_11
-  func _toSlot(_ slot: String) -> Slot? {
-    switch slot {
-    case "top":
-      return Slot.top;
-    case "bottom":
-      return Slot.bottom;
-    case "middle":
-      return Slot.middle;
-    default:
-      return Slot(rawValue: slot);
-    }
-  }
-  #endif
-  
   func setBaseOptions<T: Layer>(_ layer: inout T) {
     if let minZoom = minZoomLevel {
       layer.minZoom = minZoom.doubleValue
@@ -281,12 +260,6 @@ public class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
     if let maxZoom = maxZoomLevel {
       layer.maxZoom = maxZoom.doubleValue
     }
-    
-    #if RNMBX_11
-    if let slot = slot {
-      layer.slot = _toSlot(slot)
-    }
-    #endif
   }
   
   func setOptions(_ layer: inout Layer) {

package/ios/RNMBX/RNMBXLocationModule.swift

@@ -457,9 +457,14 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
 
   static weak var shared : RNMBXLocationModule? = nil
 
+  var locationProviderRNMBX : LocationProviderRNMBX
   var hasListener = false
   
-  var locationProvider : LocationProvider
+  var locationProvider : LocationProvider {
+    get {
+      return locationProviderRNMBX
+    }
+  }
   
   var locationEventThrottle : (
     waitBetweenEvents: Double?,
@@ -470,11 +475,9 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
   )
 
   override init() {
-    locationProvider = LocationProviderRNMBX()
+    locationProviderRNMBX = LocationProviderRNMBX()
     super.init()
-    if let locationProvider = locationProvider as? LocationProviderRNMBX {
-      locationProvider.delegate = self
-    }
+    locationProviderRNMBX.delegate = self
     RNMBXLocationModule.shared = self
   }
   
@@ -494,20 +497,12 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
   }
   
   @objc func start(_ minDisplacement: CLLocationDistance) {
-    if minDisplacement >= 0.0 {
-      if let locationProvider = locationProvider as? LocationProviderRNMBX {
-        locationProvider.setDistanceFilter(minDisplacement)
-      }
-    }
-    if let locationProvider = locationProvider as? LocationProviderRNMBX {
-      locationProvider.start()
-    }
+    if minDisplacement >= 0.0 { locationProviderRNMBX.setDistanceFilter(minDisplacement) }
+    locationProviderRNMBX.start()
   }
   
   @objc func stop() {
-    if let locationProvider = locationProvider as? LocationProviderRNMBX {
-      locationProvider.stop()
-    }
+    locationProviderRNMBX.stop()
   }
   
   @objc func getLastKnownLocation() -> RNMBXLocation? {
@@ -515,21 +510,15 @@ class RNMBXLocationModule: RCTEventEmitter, LocationProviderRNMBXDelegate {
   }
   
   @objc func setMinDisplacement(_ minDisplacement: CLLocationDistance) {
-    if let locationProvider = locationProvider as? LocationProviderRNMBX {
-      locationProvider.setDistanceFilter(minDisplacement)
-    }
+    locationProviderRNMBX.setDistanceFilter(minDisplacement)
   }
   
   @objc func setRequestsAlwaysUse(_ requestsAlwaysUse: Bool) {
-    if let locationProvider = locationProvider as? LocationProviderRNMBX {
-      locationProvider.setRequestsAlwaysUse(requestsAlwaysUse)
-    }
+    locationProviderRNMBX.setRequestsAlwaysUse(requestsAlwaysUse);
   }
 
   @objc func simulateHeading(_ changesPerSecond: NSNumber, increment: NSNumber) {
-    if let locationProvider = locationProvider as? LocationProviderRNMBX {
-      locationProvider.simulateHeading(changesPerSecond: changesPerSecond.intValue, increment: increment.doubleValue)
-    }
+    locationProviderRNMBX.simulateHeading(changesPerSecond: changesPerSecond.intValue, increment: increment.doubleValue)
   }
 
   @objc