@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.5

package/ios/{RCTMGL-v10/RCTMGLCamera.swift → RNMBX/RNMBXCamera.swift}

@@ -15,9 +15,9 @@ enum RemovalReason {
     case ViewRemoval, StyleChange, OnDestroy, ComponentChange, Reorder
 }
 
-protocol RCTMGLMapComponent: AnyObject {
-  func addToMap(_ map: RCTMGLMapView, style: Style)
-  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool
+protocol RNMBXMapComponent: AnyObject {
+  func addToMap(_ map: RNMBXMapView, style: Style)
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool
   
   func waitForStyleLoad() -> Bool
 }
@@ -35,7 +35,7 @@ struct CameraUpdateItem {
   var mode: CameraMode
   var duration: TimeInterval?
   
-  func execute(map: RCTMGLMapView, cameraAnimator: inout BasicCameraAnimator?) {
+  func execute(map: RNMBXMapView, cameraAnimator: inout BasicCameraAnimator?) {
     logged("CameraUpdateItem.execute") {
       if let center = camera.center {
         try center.validate()
@@ -68,7 +68,7 @@ class CameraUpdateQueue {
     queue.append(stop)
   }
   
-  func execute(map: RCTMGLMapView, cameraAnimator: inout BasicCameraAnimator?) {
+  func execute(map: RNMBXMapView, cameraAnimator: inout BasicCameraAnimator?) {
     guard let stop = dequeue() else {
       return
     }
@@ -77,21 +77,21 @@ class CameraUpdateQueue {
   }
 }
 
-open class RCTMGLMapComponentBase : UIView, RCTMGLMapComponent {
-  private weak var _map: RCTMGLMapView! = nil
-  private var _mapCallbacks: [(RCTMGLMapView) -> Void] = []
+open class RNMBXMapComponentBase : UIView, RNMBXMapComponent {
+  private weak var _map: RNMBXMapView! = nil
+  private var _mapCallbacks: [(RNMBXMapView) -> Void] = []
   
-  weak var map : RCTMGLMapView? {
+  weak var map : RNMBXMapView? {
     return _map;
   }
 
   func withMapView(_ callback: @escaping (_ mapView: MapView) -> Void) {
-    withRCTMGLMapView { mapView in
+    withRNMBXMapView { mapView in
       callback(mapView.mapView)
     }
   }
 
-  func withRCTMGLMapView(_ callback: @escaping (_ map: RCTMGLMapView) -> Void) {
+  func withRNMBXMapView(_ callback: @escaping (_ map: RNMBXMapView) -> Void) {
     if let map = _map {
       callback(map)
     } else {
@@ -103,7 +103,7 @@ open class RCTMGLMapComponentBase : UIView, RCTMGLMapComponent {
     return false
   }
   
-  func addToMap(_ map: RCTMGLMapView, style: Style) {
+  func addToMap(_ map: RNMBXMapView, style: Style) {
     _mapCallbacks.forEach { callback in
         callback(map)
     }
@@ -111,14 +111,14 @@ open class RCTMGLMapComponentBase : UIView, RCTMGLMapComponent {
     _map = map
   }
   
-  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     _mapCallbacks = []
     _map = nil
     return true
   }
 }
 
-class RCTMGLCamera : RCTMGLMapComponentBase {
+class RNMBXCamera : RNMBXMapComponentBase {
   var cameraAnimator: BasicCameraAnimator?
   let cameraUpdateQueue = CameraUpdateQueue()
   
@@ -185,7 +185,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
   @objc var maxBounds: String? {
     didSet {
       if let maxBounds = maxBounds {
-        logged("RCTMGLCamera.maxBounds") {
+        logged("RNMBXCamera.maxBounds") {
           maxBoundsFeature = try JSONDecoder().decode(FeatureCollection.self, from: maxBounds.data(using: .utf8)!)
         }
       } else {
@@ -237,14 +237,14 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
   
   func _toCoordinateBounds(_ bounds: FeatureCollection) throws -> CoordinateBounds  {
     guard bounds.features.count == 2 else {
-      throw RCTMGLError.paramError("Expected two Points in FeatureColletion")
+      throw RNMBXError.paramError("Expected two Points in FeatureColletion")
     }
     let swFeature = bounds.features[0]
     let neFeature = bounds.features[1]
     
     guard case let .point(sw) = swFeature.geometry,
           case let .point(ne) = neFeature.geometry else {
-      throw RCTMGLError.paramError("Expected two Points in FeatureColletion")
+      throw RNMBXError.paramError("Expected two Points in FeatureColletion")
     }
 
     return CoordinateBounds(southwest: sw.coordinates, northeast: ne.coordinates)
@@ -255,7 +255,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
       var options = CameraBoundsOptions()
       
       if let maxBounds = self.maxBoundsFeature {
-        logged("RCTMGLCamera._updateMaxBounds._toCoordinateBounds") {
+        logged("RNMBXCamera._updateMaxBounds._toCoordinateBounds") {
           options.bounds = try self._toCoordinateBounds(maxBounds)
         }
       }
@@ -266,7 +266,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
         options.maxZoom = maxZoomLevel.CGFloat
       }
 
-      logged("RCTMGLCamera._updateMaxBounds") {
+      logged("RNMBXCamera._updateMaxBounds") {
         try map.mapboxMap.setCameraBounds(with: options)
       }
     }
@@ -276,7 +276,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
     withMapView { map in
       let userTrackingMode = UserTrackingMode(rawValue: self.followUserMode ?? UserTrackingMode.normal.rawValue)
       guard let userTrackingMode = userTrackingMode else {
-        Logger.error("RCTMGLCamera: Unexpected followUserMode \(optional: self.followUserMode)")
+        Logger.error("RNMBXCamera: Unexpected followUserMode \(optional: self.followUserMode)")
         self._disableUserTracking(map)
         return
       }
@@ -286,7 +286,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
         return
       }
 
-      if let locationModule = RCTMGLLocationModule.shared {
+      if let locationModule = RNMBXLocationModule.shared {
         var isSameProvider = false
         #if !RNMBX_11
         if let currentProvider = map.location.locationProvider as? AnyObject, let newProvider = locationModule.locationProvider as? AnyObject {
@@ -312,7 +312,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
       var followOptions = FollowPuckViewportStateOptions()
       switch userTrackingMode {
       case .none:
-        Logger.assert("RCTMGLCamera, userTrackingModes should not be none here")
+        Logger.assert("RNMBXCamera, userTrackingModes should not be none here")
       case .compass:
         followOptions.bearing = FollowPuckViewportStateBearing.heading
         trackingModeChanged = true
@@ -326,7 +326,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
       
       if let onUserTrackingModeChange = self.onUserTrackingModeChange {
         if (trackingModeChanged) {
-          let event = RCTMGLEvent(type: .onUserTrackingModeChange, payload: ["followUserMode": self.followUserMode ?? "normal", "followUserLocation": self.followUserLocation])
+          let event = RNMBXEvent(type: .onUserTrackingModeChange, payload: ["followUserMode": self.followUserMode ?? "normal", "followUserLocation": self.followUserLocation])
           onUserTrackingModeChange(event.toJSON())
         }
       }
@@ -411,7 +411,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
     var center: LocationCoordinate2D?
     if let feature: String = stop["centerCoordinate"] as? String {
       
-      let centerFeature : Turf.Feature? = logged("RCTMGLCamera.toUpdateItem.decode.cc") { try
+      let centerFeature : Turf.Feature? = logged("RNMBXCamera.toUpdateItem.decode.cc") { try
         JSONDecoder().decode(Turf.Feature.self, from: feature.data(using: .utf8)!)
       }
       
@@ -419,11 +419,11 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
       case .point(let centerPoint):
         center = centerPoint.coordinates
       default:
-        Logger.log(level: .error, message: "RCTMGLCamera.toUpdateItem: Unexpected geometry: \(String(describing: centerFeature?.geometry))")
+        Logger.log(level: .error, message: "RNMBXCamera.toUpdateItem: Unexpected geometry: \(String(describing: centerFeature?.geometry))")
         return nil
       }
     } else if let feature: String = stop["bounds"] as? String {
-      let collection : Turf.FeatureCollection? = logged("RCTMGLCamera.toUpdateItem.decode.bound") { try
+      let collection : Turf.FeatureCollection? = logged("RNMBXCamera.toUpdateItem.decode.bound") { try
         JSONDecoder().decode(Turf.FeatureCollection.self, from: feature.data(using: .utf8)!) }
       let features = collection?.features
       
@@ -432,7 +432,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
         case .point(let point):
           ne = point.coordinates
         default:
-          Logger.log(level: .error, message: "RCTMGLCamera.toUpdateItem: Unexpected geometry: \(String(describing: features?.first?.geometry))")
+          Logger.log(level: .error, message: "RNMBXCamera.toUpdateItem: Unexpected geometry: \(String(describing: features?.first?.geometry))")
           return nil
       }
       
@@ -441,7 +441,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
         case .point(let point):
           sw = point.coordinates
         default:
-          Logger.log(level: .error, message: "RCTMGLCamera.toUpdateItem: Unexpected geometry: \(String(describing: features?.last?.geometry))")
+          Logger.log(level: .error, message: "RNMBXCamera.toUpdateItem: Unexpected geometry: \(String(describing: features?.last?.geometry))")
           return nil
       }
       
@@ -529,12 +529,12 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
     _updateCamera()
   }
   
-  override func addToMap(_ map: RCTMGLMapView, style: Style) {
+  override func addToMap(_ map: RNMBXMapView, style: Style) {
     super.addToMap(map, style: style)
     map.reactCamera = self
   }
   
-  override func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
+  override func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     if (reason == .StyleChange) {
       return false
     }
@@ -546,7 +546,7 @@ class RCTMGLCamera : RCTMGLMapComponentBase {
 
 // MARK: - ViewportStatusObserver
 
-extension RCTMGLCamera : ViewportStatusObserver {
+extension RNMBXCamera : ViewportStatusObserver {
   func toDict(_ status: ViewportStatus) -> [String: Any] {
     switch (status) {
     case .idle:
@@ -626,7 +626,7 @@ extension RCTMGLCamera : ViewportStatusObserver {
       followUserLocation = toFollowUserLocation(toStatus)
 
       if let onUserTrackingModeChange = onUserTrackingModeChange {
-        let event = RCTMGLEvent(
+        let event = RNMBXEvent(
           type: .onUserTrackingModeChange,
           payload: [
             "followUserMode": toFollowUserMode(toStatus) as Any,

package/ios/{RCTMGL-v10/RCTMGLCameraManager.m → RNMBX/RNMBXCameraManager.m}

@@ -2,7 +2,7 @@
 #import <React/RCTViewManager.h>
 #import <Foundation/Foundation.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLCameraManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXCameraManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(maxBounds, NSString)
 RCT_EXPORT_VIEW_PROPERTY(animationDuration, NSNumber)

package/ios/{RCTMGL-v10/RCTMGLCalloutManager.swift → RNMBX/RNMBXCameraManager.swift}

@@ -1,14 +1,14 @@
 import Foundation
 import MapboxMaps
 
-@objc(RCTMGLCalloutManager)
-class RCTMGLCalloutManager  : RCTViewManager {
+@objc(RNMBXCameraManager)
+class RNMBXCameraManager  : RCTViewManager {
     @objc
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
     
     override func view() -> UIView! {
-        return RCTMGLCallout()
+        return RNMBXCamera()
     }
 }

package/ios/{RCTMGL-v10/RCTMGLCircleLayer.swift → RNMBX/RNMBXCircleLayer.swift}

@@ -1,7 +1,7 @@
 import MapboxMaps
 
-@objc(RCTMGLCircleLayer)
-class RCTMGLCircleLayer: RCTMGLVectorLayer {
+@objc(RNMBXCircleLayer)
+class RNMBXCircleLayer: RNMBXVectorLayer {
   
   typealias LayerType = CircleLayer
 
@@ -32,14 +32,14 @@ class RCTMGLCircleLayer: RCTMGLVectorLayer {
   override func addStyles() {
     if let style : Style = self.style,
        let reactStyle = self.reactStyle {
-      let styler =  RCTMGLStyle(style: self.style!)
+      let styler =  RNMBXStyle(style: self.style!)
       styler.bridge = self.bridge
       if var styleLayer = self.styleLayer as? LayerType {
         styler.circleLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
           oldReactStyle: oldReatStyle,
-          applyUpdater: { (updater) in logged("RCTMGLCircleLayer.updateLayer") {
+          applyUpdater: { (updater) in logged("RNMBXCircleLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},
           isValid: { return self.isAddedToMap() })

package/ios/{RCTMGL-v10/RCTMGLHeatmapLayerManager.m → RNMBX/RNMBXCircleLayerManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLHeatmapLayerManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXCircleLayerManager, RCTViewManager)
 
 // circle layer props
 RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString)

package/ios/{RCTMGL-v10/RCTMGLCircleLayerManager.swift → RNMBX/RNMBXCircleLayerManager.swift}

@@ -1,12 +1,12 @@
-@objc(RCTMGLCircleLayerManager)
-class RCTMGLCircleLayerManager: RCTViewManager {
+@objc(RNMBXCircleLayerManager)
+class RNMBXCircleLayerManager: RCTViewManager {
     @objc
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
   
     override func view() -> UIView! {
-      let layer = RCTMGLCircleLayer()
+      let layer = RNMBXCircleLayer()
       layer.bridge = self.bridge
       return layer
     }

package/ios/{RCTMGL-v10/RCTMGLEvent.swift → RNMBX/RNMBXEvent.swift}

@@ -1,11 +1,11 @@
 import Foundation
 
-protocol RCTMGLEventProtocol {
+protocol RNMBXEventProtocol {
     func toJSON() -> [String: Any?];
 }
 
 @objc
-class RCTMGLEvent : NSObject, RCTMGLEventProtocol {
+class RNMBXEvent : NSObject, RNMBXEventProtocol {
     var type: String = ""
     var payload: [String:Any?]? = nil
     func toJSON() -> [String: Any?]

package/ios/{RCTMGL-v10/RCTMGLFeatureUtils.swift → RNMBX/RNMBXFeatureUtils.swift}

@@ -1,7 +1,7 @@
 import MapboxMaps
 import MapKit
 
-class RCTMGLFeatureUtils {
+class RNMBXFeatureUtils {
   
   enum ParseError : Error {
     case fcParseError(String)

package/ios/{RCTMGL-v10/RCTMGLFillExtrusionLayerManager.m → RNMBX/RNMBXFillExtrusionLayerManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLFillExtrusionLayerManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXFillExtrusionLayerManager, RCTViewManager)
 
 // fill extrusion layer props
 RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString)

package/ios/{RCTMGL-v10/RCTMGLBackgroundLayerManager.swift → RNMBX/RNMBXFillExtrusionLayerManager.swift}

@@ -1,12 +1,12 @@
-@objc(RCTMGLBackgroundLayerManager)
-class RCTMGLBackgroundLayerManager: RCTViewManager {
+@objc(RNMBXFillExtrusionLayerManager)
+class RNMBXFillExtrusionLayerManager: RCTViewManager {
     @objc
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
   
     override func view() -> UIView! {
-      let layer = RCTMGLBackgroundLayer()
+      let layer = RNMBXFillExtrusionLayer()
       layer.bridge = self.bridge
       return layer
     }

package/ios/{RCTMGL-v10/RCTMGLFillExtrustionLayer.swift → RNMBX/RNMBXFillExtrustionLayer.swift}

@@ -1,7 +1,7 @@
 import MapboxMaps
 
-@objc(RCTMGLFillExtrusionLayer)
-class RCTMGLFillExtrusionLayer: RCTMGLVectorLayer {
+@objc(RNMBXFillExtrusionLayer)
+class RNMBXFillExtrusionLayer: RNMBXVectorLayer {
   typealias LayerType = FillExtrusionLayer
 
   override func makeLayer(style: Style) throws -> Layer {
@@ -31,14 +31,14 @@ class RCTMGLFillExtrusionLayer: RCTMGLVectorLayer {
   override func addStyles() {
     if let style : Style = self.style,
        let reactStyle = self.reactStyle {
-      let styler =  RCTMGLStyle(style: self.style!)
+      let styler =  RNMBXStyle(style: self.style!)
       styler.bridge = self.bridge
       if var styleLayer = self.styleLayer as? LayerType {
         styler.fillExtrusionLayer(
           layer: &styleLayer,
           reactStyle: reactStyle,
           oldReactStyle: oldReatStyle,
-          applyUpdater: { (updater) in logged("RCTMGLFillExtrusionLayer.updateLayer") {
+          applyUpdater: { (updater) in logged("RNMBXFillExtrusionLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout LayerType) in updater(&layer) }
           }},
           isValid: { return self.isAddedToMap() })

package/ios/{RCTMGL-v10/RCTMGLFillLayer.swift → RNMBX/RNMBXFillLayer.swift}

@@ -1,7 +1,7 @@
 import MapboxMaps
 
-@objc(RCTMGLFillLayer)
-class RCTMGLFillLayer: RCTMGLVectorLayer {
+@objc(RNMBXFillLayer)
+class RNMBXFillLayer: RNMBXVectorLayer {
   typealias LayerType = FillLayer
 
   override func makeLayer(style: Style) throws -> Layer {
@@ -32,7 +32,7 @@ class RCTMGLFillLayer: RCTMGLVectorLayer {
   override func addStyles() {
     if let style : Style = self.style,
        let reactStyle = reactStyle {
-      let styler = RCTMGLStyle(style: self.style!)
+      let styler = RNMBXStyle(style: self.style!)
       styler.bridge = self.bridge
       
       if var styleLayer = self.styleLayer as? FillLayer {
@@ -40,7 +40,7 @@ class RCTMGLFillLayer: RCTMGLVectorLayer {
           layer: &styleLayer,
           reactStyle: reactStyle,
           oldReactStyle: oldReatStyle,
-          applyUpdater: { (updater) in logged("RCTMGLFillLayer.updateLayer") {
+          applyUpdater: { (updater) in logged("RNMBXFillLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout FillLayer) in updater(&layer) }
           }},
           isValid: { return self.isAddedToMap() }

package/ios/{RCTMGL-v10/RCTMGLLineLayerManager.m → RNMBX/RNMBXFillLayerManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLLineLayerManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXFillLayerManager, RCTViewManager)
 
 // circle layer props
 RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString)

package/ios/{RCTMGL-v10/RCTMGLSkyLayerManager.swift → RNMBX/RNMBXFillLayerManager.swift}

@@ -1,12 +1,12 @@
-@objc(RCTMGLSkyLayerManager)
-class RCTMGLSkyLayerManager: RCTViewManager {
+@objc(RNMBXFillLayerManager)
+class RNMBXFillLayerManager: RCTViewManager {
     @objc
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
   
     override func view() -> UIView! {
-      let layer = RCTMGLSkyLayer()
+      let layer = RNMBXFillLayer()
       layer.bridge = self.bridge
       return layer
     }

package/ios/{RCTMGL-v10/RCTMGLHeatmapLayer.swift → RNMBX/RNMBXHeatmapLayer.swift}

@@ -1,7 +1,7 @@
 import MapboxMaps
 
-@objc(RCTMGLHeatmapLayer)
-class RCTMGLHeatmapLayer: RCTMGLVectorLayer {
+@objc(RNMBXHeatmapLayer)
+class RNMBXHeatmapLayer: RNMBXVectorLayer {
   typealias LayerType = HeatmapLayer
 
   override func makeLayer(style: Style) throws -> Layer {
@@ -31,7 +31,7 @@ class RCTMGLHeatmapLayer: RCTMGLVectorLayer {
   override func addStyles() {
     if let style : Style = self.style,
        let reactStyle = reactStyle {
-      let styler =  RCTMGLStyle(style: style)
+      let styler =  RNMBXStyle(style: style)
       styler.bridge = self.bridge
       
       if var styleLayer = self.styleLayer as? HeatmapLayer {
@@ -39,7 +39,7 @@ class RCTMGLHeatmapLayer: RCTMGLVectorLayer {
           layer: &styleLayer,
           reactStyle: reactStyle,
           oldReactStyle: oldReatStyle,
-          applyUpdater: { (updater) in logged("RCTMGLHeatmapLayer.updateLayer") {
+          applyUpdater: { (updater) in logged("RNMBXHeatmapLayer.updateLayer") {
             try style.updateLayer(withId: self.id, type: LayerType.self) { (layer: inout HeatmapLayer) in updater(&layer) }
           }},
           isValid: { return self.isAddedToMap() }

package/ios/{RCTMGL-v10/RCTMGLCircleLayerManager.m → RNMBX/RNMBXHeatmapLayerManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLCircleLayerManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXHeatmapLayerManager, RCTViewManager)
 
 // circle layer props
 RCT_EXPORT_VIEW_PROPERTY(sourceLayerID, NSString)

package/ios/{RCTMGL-v10/RCTMGLRasterLayerManager.swift → RNMBX/RNMBXHeatmapLayetManager.swift}

@@ -1,12 +1,12 @@
-@objc(RCTMGLRasterLayerManager)
-class RCTMGLRasterLayerManager: RCTViewManager {
+@objc(RNMBXHeatmapLayerManager)
+class RNMBXHeatmapLayerManager: RCTViewManager {
     @objc
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
   
     override func view() -> UIView! {
-      let layer = RCTMGLRasterLayer()
+      let layer = RNMBXHeatmapLayer()
       layer.bridge = self.bridge
       return layer
     }

package/ios/{RCTMGL-v10/RCMTGLImage.swift → RNMBX/RNMBXImage.swift}

@@ -1,6 +1,6 @@
 import MapboxMaps
 
-class RCTMGLImage : UIView {
+class RNMBXImage : UIView {
   @objc
   var name: String = "" {
     didSet {
@@ -38,7 +38,7 @@ class RCTMGLImage : UIView {
     }
   }
 
-  weak var images: RCTMGLImageSetter? = nil {
+  weak var images: RNMBXImageSetter? = nil {
     didSet {
       DispatchQueue.main.async { self.setImage() }
     }
@@ -70,7 +70,7 @@ class RCTMGLImage : UIView {
   
   func _addImageToStyle() {
     if let image = self.image, let images = images {
-      let _ = images.addImage(name: name, image: image, sdf: sdf, stretchX:stretchX, stretchY:stretchY, content:content, log: "RCTMGLImage._addImageToStyle")
+      let _ = images.addImage(name: name, image: image, sdf: sdf, stretchX:stretchX, stretchY:stretchY, content:content, log: "RNMBXImage._addImageToStyle")
     }
   }
   

package/ios/{RCTMGL-v10/RCMTGLImageManager.m → RNMBX/RNMBXImageManager.m}

@@ -18,7 +18,7 @@
 @end
 
 
-@interface RCT_EXTERN_MODULE(RCTMGLImageManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXImageManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(stretchX, NSArray<NSArray<NSNumber*>>)
 RCT_EXPORT_VIEW_PROPERTY(stretchY, NSArray<NSArray<NSNumber*>>)

package/ios/{RCTMGL-v10/RCMTGLImageManager.swift → RNMBX/RNMBXImageManager.swift}

@@ -1,13 +1,13 @@
 
-@objc(RCTMGLImageManager)
-class RCTMGLImageManager : RCTViewManager {
+@objc(RNMBXImageManager)
+class RNMBXImageManager : RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true
   }
 
   override func view() -> UIView! {
-    let layer = RCTMGLImage()
+    let layer = RNMBXImage()
     layer.bridge = self.bridge
     return layer
   }

package/ios/{RCTMGL-v10/RCTMGLImageQueue.swift → RNMBX/RNMBXImageQueue.swift}

@@ -1,4 +1,4 @@
-class RCTMGLImageQueueOperation : Operation {
+class RNMBXImageQueueOperation : Operation {
   enum State : Equatable {
     case Initial
     case Executing
@@ -63,7 +63,7 @@ class RCTMGLImageQueueOperation : Operation {
   }
   
   override func start() {
-    weak var weakSelf : RCTMGLImageQueueOperation! = self
+    weak var weakSelf : RNMBXImageQueueOperation! = self
     
     DispatchQueue.global(qos: .default).async {
       
@@ -116,21 +116,21 @@ class RCTMGLImageQueueOperation : Operation {
   }
 }
 
-class RCTMGLImageQueue {
-   static let sharedInstance: RCTMGLImageQueue = {
-        let instance = RCTMGLImageQueue()
+class RNMBXImageQueue {
+   static let sharedInstance: RNMBXImageQueue = {
+        let instance = RNMBXImageQueue()
         // setup code
         return instance
     }()
   
   var imageQueue : OperationQueue = {
     let result = OperationQueue()
-    result.name = "comp.mapbox.rctmgl.DownloadImageQueue"
+    result.name = "comp.mapbox.RNMBX.DownloadImageQueue"
     return result
   }()
   
   public func addImage(_ json : Any!, scale: Double?, bridge: RCTBridge, handler: @escaping (Error?, UIImage?) -> Void) {
-    let operation = RCTMGLImageQueueOperation()
+    let operation = RNMBXImageQueueOperation()
     operation.bridge = bridge
     operation.urlRequest = RCTConvert.nsurlRequest(json)
     operation.completionHandler = handler;

package/ios/{RCTMGL-v10/RCTMGLImageSource.swift → RNMBX/RNMBXImageSource.swift}

@@ -1,7 +1,7 @@
 import MapboxMaps
 
 @objc
-class RCTMGLImageSource : RCTMGLSource {
+class RNMBXImageSource : RNMBXSource {
   
   @objc var url: String? = nil {
     didSet {

package/ios/{RCTMGL-v10/RCTMGLImageSourceManager.m → RNMBX/RNMBXImageSourceManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLImageSourceManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXImageSourceManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(existing, BOOL)

package/ios/{RCTMGL-v10/RCTMGLImageSourceManager.swift → RNMBX/RNMBXImageSourceManager.swift}

@@ -1,11 +1,11 @@
-@objc(RCTMGLImageSourceManager)
-class RCTMGLImageSourceManager: RCTViewManager {
+@objc(RNMBXImageSourceManager)
+class RNMBXImageSourceManager: RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true
   }
 
   @objc override func view() -> UIView {
-    return RCTMGLImageSource()
+    return RNMBXImageSource()
   }
 }