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

package/ios/{RCTMGL-v10/RCTMGLMapView.swift → RNMBX/RNMBXMapView.swift}

@@ -3,11 +3,11 @@ import Turf
 import MapKit
 
 class FeatureEntry {
-  let feature: RCTMGLMapComponent
+  let feature: RNMBXMapComponent
   let view: UIView
   var addedToMap: Bool = false
 
-  init(feature:RCTMGLMapComponent, view: UIView, addedToMap: Bool = false) {
+  init(feature:RNMBXMapComponent, view: UIView, addedToMap: Bool = false) {
     self.feature = feature
     self.view = view
     self.addedToMap = addedToMap
@@ -64,7 +64,7 @@ public struct MapEventType<Payload> {
 typealias MapLoadingErrorPayload = MapLoadingError
 #endif
 
-class RCTMGLCameraChanged : RCTMGLEvent, RCTEvent {
+class RNMBXCameraChanged : RNMBXEvent, RCTEvent {
   init(type: EventType, payload: [String:Any?]?, reactTag: NSNumber) {
     super.init(type: type, payload: payload)
     self.viewTag = reactTag
@@ -97,9 +97,9 @@ class RCTMGLCameraChanged : RCTMGLEvent, RCTEvent {
   }
 }
 
-@objc(MBXMapView)
-open class RCTMGLMapView : MapView {
-  var tapDelegate: IgnoreRCTMGLMakerViewGestureDelegate? = nil
+@objc(RNMBXMapView)
+open class RNMBXMapView : MapView {
+  var tapDelegate: IgnoreRNMBXMakerViewGestureDelegate? = nil
 
   var eventDispatcher: RCTEventDispatcherProtocol
 
@@ -119,11 +119,11 @@ open class RCTMGLMapView : MapView {
 
   var features: [FeatureEntry] = []
 
-  weak var reactCamera : RCTMGLCamera?
-  var images : [RCTMGLImages] = []
-  var sources : [RCTMGLInteractiveElement] = []
+  weak var reactCamera : RNMBXCamera?
+  var images : [RNMBXImages] = []
+  var sources : [RNMBXInteractiveElement] = []
   
-  var handleMapChangedEvents = Set<RCTMGLEvent.EventType>()
+  var handleMapChangedEvents = Set<RNMBXEvent.EventType>()
 
   var eventListeners : [Cancelable] = []
 
@@ -144,7 +144,7 @@ open class RCTMGLMapView : MapView {
   }()
 
   lazy var calloutAnnotationManager : MapboxMaps.PointAnnotationManager = {
-    return annotations.makePointAnnotationManager(id: "rctmgl-mapview-callouts")
+    return annotations.makePointAnnotationManager(id: "RNMBX-mapview-callouts")
   }()
   
   var mapView : MapView {
@@ -152,7 +152,7 @@ open class RCTMGLMapView : MapView {
   }
 
   func addToMap(_ subview: UIView) {
-    if let mapComponent = subview as? RCTMGLMapComponent {
+    if let mapComponent = subview as? RNMBXMapComponent {
       let style = mapView.mapboxMap.style
       var addToMap = false
       if mapComponent.waitForStyleLoad() {
@@ -172,13 +172,13 @@ open class RCTMGLMapView : MapView {
     } else {
       subview.reactSubviews()?.forEach { addToMap($0) }
     }
-    if let source = subview as? RCTMGLInteractiveElement {
+    if let source = subview as? RNMBXInteractiveElement {
       sources.append(source)
     }
   }
   
   func removeFromMap(_ subview: UIView) {
-    if let mapComponent = subview as? RCTMGLMapComponent {
+    if let mapComponent = subview as? RNMBXMapComponent {
       var entryIndex = features.firstIndex { $0.view == subview }
       if let entryIndex = entryIndex {
         var entry = features[entryIndex]
@@ -191,7 +191,7 @@ open class RCTMGLMapView : MapView {
     } else {
       subview.reactSubviews()?.forEach { removeFromMap($0) }
     }
-    if let source = subview as? RCTMGLInteractiveElement {
+    if let source = subview as? RNMBXInteractiveElement {
       sources.removeAll { $0 == source }
     }
   }
@@ -206,12 +206,12 @@ open class RCTMGLMapView : MapView {
     super.removeReactSubview(subview)
   }
 
-  public required init(frame:CGRect, eventDispatcher: RCTEventDispatcherProtocol) {
+  @objc public required init(frame:CGRect, eventDispatcher: RCTEventDispatcherProtocol) {
     #if RNMBX_11
     self.eventDispatcher = eventDispatcher
     super.init(frame: frame, mapInitOptions: MapInitOptions())
     #else
-    let resourceOptions = ResourceOptions(accessToken: MGLModule.accessToken!)
+    let resourceOptions = ResourceOptions(accessToken: RNMBXModule.accessToken!)
     self.eventDispatcher = eventDispatcher
     super.init(frame: frame, mapInitOptions: MapInitOptions(resourceOptions: resourceOptions))
     #endif
@@ -262,7 +262,7 @@ open class RCTMGLMapView : MapView {
   @objc public func setReactLocalizeLabels(_ value: NSDictionary?) {
     onMapStyleLoaded { _ in
       if let value = value {
-        logged("RCTMGLMapVIew.setReactLocalizeLabels") {
+        logged("RNMBXMapVIew.setReactLocalizeLabels") {
           let localeString = value["locale"] as! String
           let layerIds = value["layerIds"] as! [String]?
           let locale = localeString == "current" ? Locale.current : Locale(identifier: localeString)
@@ -436,7 +436,7 @@ open class RCTMGLMapView : MapView {
           if let styleURI = StyleURI(rawValue: value) {
               mapView.mapboxMap.loadStyleURI(styleURI)
           } else {
-              let event = RCTMGLEvent(type:.mapLoadingError, payload: ["error": "invalid URI: \(value)"]);
+              let event = RNMBXEvent(type:.mapLoadingError, payload: ["error": "invalid URI: \(value)"]);
               self.fireEvent(event: event, callback: self.reactOnMapChange)
           }
       } else {
@@ -450,7 +450,7 @@ open class RCTMGLMapView : MapView {
         }
       }
     }
-    let event = RCTMGLEvent(type:.willStartLoadingMap, payload: nil);
+    let event = RNMBXEvent(type:.willStartLoadingMap, payload: nil);
     self.fireEvent(event: event, callback: self.reactOnMapChange)
   }
 
@@ -484,9 +484,9 @@ open class RCTMGLMapView : MapView {
 
 // MARK: - event handlers
 
-extension RCTMGLMapView {
+extension RNMBXMapView {
   #if RNMBX_11
-  private func onEvery<T>(event: MapEventType<T>, handler: @escaping (RCTMGLMapView, T) -> Void) {
+  private func onEvery<T>(event: MapEventType<T>, handler: @escaping (RNMBXMapView, T) -> Void) {
     let signal = event.method(self.mapView.mapboxMap)
     signal.observe { [weak self] (mapEvent) in
       guard let self = self else { return }
@@ -495,7 +495,7 @@ extension RCTMGLMapView {
     }.store(in: &cancelables)
   }
   
-  private func onNext<T>(event: MapEventType<T>, handler: @escaping (RCTMGLMapView, T) -> Void) {
+  private func onNext<T>(event: MapEventType<T>, handler: @escaping (RNMBXMapView, T) -> Void) {
     let signal = event.method(self.mapView.mapboxMap)
     signal.observeNext { [weak self] (mapEvent) in
       guard let self = self else { return }
@@ -504,7 +504,7 @@ extension RCTMGLMapView {
     }.store(in: &cancelables)
   }
   #else
-  private func onEvery<Payload>(event: MapEvents.Event<Payload>, handler: @escaping  (RCTMGLMapView, MapEvent<Payload>) -> Void) {
+  private func onEvery<Payload>(event: MapEvents.Event<Payload>, handler: @escaping  (RNMBXMapView, MapEvent<Payload>) -> Void) {
     let eventListener = self.mapView.mapboxMap.onEvery(event: event) { [weak self](mapEvent) in
       guard let self = self else { return }
 
@@ -512,11 +512,11 @@ extension RCTMGLMapView {
     }
     eventListeners.append(eventListener)
     if eventListeners.count > 20 {
-      Logger.log(level:.warn, message: "RCTMGLMapView.onEvery, too much handler installed");
+      Logger.log(level:.warn, message: "RNMBXMapView.onEvery, too much handler installed");
     }
   }
 
-  private func onNext<Payload>(event: MapEvents.Event<Payload>, handler: @escaping  (RCTMGLMapView, MapEvent<Payload>) -> Void) {
+  private func onNext<Payload>(event: MapEvents.Event<Payload>, handler: @escaping  (RNMBXMapView, MapEvent<Payload>) -> Void) {
     self.mapView.mapboxMap.onNext(event: event) { [weak self](mapEvent) in
       guard let self = self else { return }
 
@@ -531,20 +531,20 @@ extension RCTMGLMapView {
     self.onEvery(event: .cameraChanged, handler: { (self, cameraEvent) in
       self.wasGestureActive = self.isGestureActive
       if self.handleMapChangedEvents.contains(.regionIsChanging) {
-        let event = RCTMGLEvent(type:.regionIsChanging, payload: self.buildRegionObject())
+        let event = RNMBXEvent(type:.regionIsChanging, payload: self.buildRegionObject())
         self.fireEvent(event: event, callback: self.reactOnMapChange)
       } else if self.handleMapChangedEvents.contains(.cameraChanged) {
-        let event = RCTMGLCameraChanged(type:.cameraChanged, payload: self.buildStateObject(), reactTag: self.reactTag)
+        let event = RNMBXCameraChanged(type:.cameraChanged, payload: self.buildStateObject(), reactTag: self.reactTag)
         self.eventDispatcher.send(event)
       }
     })
 
     self.onEvery(event: .mapIdle, handler: { (self, cameraEvent) in
       if self.handleMapChangedEvents.contains(.regionDidChange) {
-        let event = RCTMGLEvent(type:.regionDidChange, payload: self.buildRegionObject());
+        let event = RNMBXEvent(type:.regionDidChange, payload: self.buildRegionObject());
         self.fireEvent(event: event, callback: self.reactOnMapChange)
       } else if self.handleMapChangedEvents.contains(.mapIdle) {
-        let event = RCTMGLEvent(type:.mapIdle, payload: self.buildStateObject());
+        let event = RNMBXEvent(type:.mapIdle, payload: self.buildStateObject());
         self.fireEvent(event: event, callback: self.reactOnMapChange)
       }
       
@@ -552,7 +552,7 @@ extension RCTMGLMapView {
     })
   }
 
-  private func fireEvent(event: RCTMGLEvent, callback: RCTBubblingEventBlock?) {
+  private func fireEvent(event: RNMBXEvent, callback: RCTBubblingEventBlock?) {
     guard let callback = callback else {
       Logger.log(level: .error, message: "fireEvent failed: \(event) - callback is null")
       return
@@ -560,7 +560,7 @@ extension RCTMGLMapView {
     fireEvent(event: event, callback: callback)
   }
 
-  private func fireEvent(event: RCTMGLEvent, callback: @escaping RCTBubblingEventBlock) {
+  private func fireEvent(event: RNMBXEvent, callback: @escaping RCTBubblingEventBlock) {
     callback(event.toJSON())
   }
   
@@ -631,8 +631,8 @@ extension RCTMGLMapView {
       if let sourceId = eventPayload.sourceId {
         payload["sourceId"] = sourceId
       }
-      let rctmglEvent = RCTMGLEvent(type: .mapLoadingError, payload: payload);
-      self.fireEvent(event: rctmglEvent, callback: self.reactOnMapChange)
+      let RNMBXEvent = RNMBXEvent(type: .mapLoadingError, payload: payload);
+      self.fireEvent(event: RNMBXEvent, callback: self.reactOnMapChange)
 
       if let message = error.errorDescription {
         Logger.log(level: .error, message: "MapLoad error \(message)")
@@ -656,7 +656,7 @@ extension RCTMGLMapView {
     }
 
     self.onEvery(event: .renderFrameFinished, handler: { (self, event) in
-      var type = RCTMGLEvent.EventType.didFinishRendering
+      var type = RNMBXEvent.EventType.didFinishRendering
       if event.payload.renderMode == .full {
         type = .didFinishRenderingFully
       }
@@ -665,12 +665,12 @@ extension RCTMGLMapView {
         "needsRepaint": event.payload.needsRepaint,
         "placementChanged": event.payload.placementChanged
       ]
-      let event = RCTMGLEvent(type: type, payload: payload);
+      let event = RNMBXEvent(type: type, payload: payload);
       self.fireEvent(event: event, callback: self.reactOnMapChange)
     })
 
     self.onNext(event: .mapLoaded, handler: { (self, event) in
-      let event = RCTMGLEvent(type:.didFinishLoadingMap, payload: nil);
+      let event = RNMBXEvent(type:.didFinishLoadingMap, payload: nil);
       self.fireEvent(event: event, callback: self.reactOnMapChange)
     })
     
@@ -686,7 +686,7 @@ extension RCTMGLMapView {
         }
       }
 
-      let event = RCTMGLEvent(type:.didFinishLoadingStyle, payload: nil)
+      let event = RNMBXEvent(type:.didFinishLoadingStyle, payload: nil)
       self.fireEvent(event: event, callback: self.reactOnMapChange)
     })
   }
@@ -694,7 +694,7 @@ extension RCTMGLMapView {
 
 // MARK: - gestures
 
-class IgnoreRCTMGLMakerViewGestureDelegate : NSObject, UIGestureRecognizerDelegate {
+class IgnoreRNMBXMakerViewGestureDelegate : NSObject, UIGestureRecognizerDelegate {
   var originalDelegate: UIGestureRecognizerDelegate?
 
   init(originalDelegate: UIGestureRecognizerDelegate?) {
@@ -720,7 +720,7 @@ class IgnoreRCTMGLMakerViewGestureDelegate : NSObject, UIGestureRecognizerDelega
   private func isMarkerViewSubview(_ view: UIView) -> Bool {
     var current : UIView? = view
     while let act = current {
-      if (act is RCTMGLMarkerView) {
+      if (act is RNMBXMarkerView) {
         return true
       }
       current = act.superview
@@ -746,7 +746,7 @@ class IgnoreRCTMGLMakerViewGestureDelegate : NSObject, UIGestureRecognizerDelega
   }
 }
 
-extension RCTMGLMapView {
+extension RNMBXMapView {
   
   @objc public func setReactOnPress(_ value: @escaping RCTBubblingEventBlock) {
     self.reactOnPress = value
@@ -756,7 +756,7 @@ extension RCTMGLMapView {
     singleTapGestureRecognizer.removeTarget(pointAnnotationManager.manager, action: nil)
     singleTapGestureRecognizer.addTarget(self, action: #selector(doHandleTap(_:)))
 
-    self.tapDelegate = IgnoreRCTMGLMakerViewGestureDelegate(originalDelegate: singleTapGestureRecognizer.delegate)
+    self.tapDelegate = IgnoreRNMBXMakerViewGestureDelegate(originalDelegate: singleTapGestureRecognizer.delegate)
     singleTapGestureRecognizer.delegate = tapDelegate
   }
 
@@ -768,21 +768,21 @@ extension RCTMGLMapView {
   }
 }
 
-extension RCTMGLMapView: GestureManagerDelegate {
-  private func draggableSources() -> [RCTMGLInteractiveElement] {
+extension RNMBXMapView: GestureManagerDelegate {
+  private func draggableSources() -> [RNMBXInteractiveElement] {
     return sources.filter { $0.isDraggable() }
   }
-  private func touchableSources() -> [RCTMGLInteractiveElement] {
+  private func touchableSources() -> [RNMBXInteractiveElement] {
     return sources.filter { $0.isTouchable() }
   }
 
-  private func doHandleTapInSources(sources: [RCTMGLInteractiveElement], tapPoint: CGPoint, hits: [String: [QueriedRenderedFeature]], touchedSources: [RCTMGLInteractiveElement], callback: @escaping (_ hits: [String: [QueriedRenderedFeature]], _ touchedSources: [RCTMGLInteractiveElement]) -> Void) {
+  private func doHandleTapInSources(sources: [RNMBXInteractiveElement], tapPoint: CGPoint, hits: [String: [QueriedRenderedFeature]], touchedSources: [RNMBXInteractiveElement], callback: @escaping (_ hits: [String: [QueriedRenderedFeature]], _ touchedSources: [RNMBXInteractiveElement]) -> Void) {
     DispatchQueue.main.async {
       if let source = sources.first {
         let hitbox = source.hitbox;
         
-        let halfWidth = (hitbox["width"]?.doubleValue ?? RCTMGLInteractiveElement.hitboxDefault) / 2.0;
-        let halfHeight = (hitbox["height"]?.doubleValue  ?? RCTMGLInteractiveElement.hitboxDefault) / 2.0;
+        let halfWidth = (hitbox["width"]?.doubleValue ?? RNMBXInteractiveElement.hitboxDefault) / 2.0;
+        let halfHeight = (hitbox["height"]?.doubleValue  ?? RNMBXInteractiveElement.hitboxDefault) / 2.0;
 
         let top = tapPoint.y - halfHeight;
         let left = tapPoint.x - halfWidth;
@@ -817,8 +817,8 @@ extension RCTMGLMapView: GestureManagerDelegate {
     }
   }
   
-  func highestZIndex(sources: [RCTMGLInteractiveElement]) -> RCTMGLInteractiveElement? {
-    var layersToSource : [String:RCTMGLInteractiveElement] = [:]
+  func highestZIndex(sources: [RNMBXInteractiveElement]) -> RNMBXInteractiveElement? {
+    var layersToSource : [String:RNMBXInteractiveElement] = [:]
     
     sources.forEach { source in
       source.getLayerIDs().forEach { layerId in
@@ -849,8 +849,8 @@ extension RCTMGLMapView: GestureManagerDelegate {
             let features = hitFeatures.compactMap { queriedFeature in
               logged("doHandleTap.hitFeatures") { try queriedFeature.feature.toJSON() } }
             let location = self.mapboxMap.coordinate(for: tapPoint)
-            let event = RCTMGLEvent(
-              type: (source is RCTMGLVectorSource) ? .vectorSourceLayerPress : .shapeSourceLayerPress,
+            let event = RNMBXEvent(
+              type: (source is RNMBXVectorSource) ? .vectorSourceLayerPress : .shapeSourceLayerPress,
               payload: [
                 "features": features,
                 "point": [
@@ -873,7 +873,7 @@ extension RCTMGLMapView: GestureManagerDelegate {
                 "screenPointX": .number(Double(tapPoint.x)),
                 "screenPointY": .number(Double(tapPoint.y))
               ]
-              let event = RCTMGLEvent(type:.tap, payload: logged("reactOnPress") { try geojson.toJSON() })
+              let event = RNMBXEvent(type:.tap, payload: logged("reactOnPress") { try geojson.toJSON() })
               self.fireEvent(event: event, callback: reactOnPress)
             }
           }
@@ -899,7 +899,7 @@ extension RCTMGLMapView: GestureManagerDelegate {
             let features = hitFeatures.compactMap { queriedFeature in
               logged("doHandleTap.hitFeatures") { try queriedFeature.feature.toJSON() } }
             let location = self.mapboxMap.coordinate(for: position)
-            let event = RCTMGLEvent(
+            let event = RNMBXEvent(
               type: .longPress,
               payload: [
                 "features": features,
@@ -922,7 +922,7 @@ extension RCTMGLMapView: GestureManagerDelegate {
                  "screenPointX": .number(Double(position.x)),
                  "screenPointY": .number(Double(position.y))
                ]
-               let event = RCTMGLEvent(type:.longPress, payload: logged("doHandleLongPress") { try geojson.toJSON() })
+               let event = RNMBXEvent(type:.longPress, payload: logged("doHandleLongPress") { try geojson.toJSON() })
                self.fireEvent(event: event, callback: reactOnLongPress)
              }
            }
@@ -946,7 +946,7 @@ extension RCTMGLMapView: GestureManagerDelegate {
   }
 }
 
-extension RCTMGLMapView
+extension RNMBXMapView
 {
   @objc public func takeSnap(
     writeToDisk:Bool) -> URL
@@ -961,13 +961,13 @@ extension RCTMGLMapView
   }
 }
 
-extension RCTMGLMapView {
+extension RNMBXMapView {
   func queryTerrainElevation(coordinates: [NSNumber]) -> Double? {
     return self.mapboxMap.elevation(at: CLLocationCoordinate2D(latitude: coordinates[1].doubleValue, longitude: coordinates[0].doubleValue))
   }
 }
 
-extension RCTMGLMapView {
+extension RNMBXMapView {
   func onMapStyleLoaded(block: @escaping (MapboxMap) -> Void) {
     guard let mapboxMap = mapboxMap else {
       fatalError("mapboxMap is null")
@@ -981,7 +981,7 @@ extension RCTMGLMapView {
   }
 }
 
-extension RCTMGLMapView {
+extension RNMBXMapView {
   func setSourceVisibility(_ visible: Bool, sourceId: String, sourceLayerId: String?) -> Void {
     let style = self.mapboxMap.style
     
@@ -1015,7 +1015,7 @@ extension RCTMGLMapView {
 }
 
 class PointAnnotationManager : AnnotationInteractionDelegate {
-  weak var selected : RCTMGLPointAnnotation? = nil
+  weak var selected : RNMBXPointAnnotation? = nil
   private var draggedAnnotation: PointAnnotation?
   
   func annotationManager(_ manager: AnnotationManager, didDetectTappedAnnotations annotations: [Annotation]) {
@@ -1032,8 +1032,8 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
       if let pointAnnotation = annotation as? PointAnnotation,
          let userInfo = pointAnnotation.userInfo {
         
-        if let rctmglPointAnnotation = userInfo[RCTMGLPointAnnotation.key] as? WeakRef<RCTMGLPointAnnotation> {
-          if let pt = rctmglPointAnnotation.object {
+        if let RNMBXPointAnnotation = userInfo[RNMBXPointAnnotation.key] as? WeakRef<RNMBXPointAnnotation> {
+          if let pt = RNMBXPointAnnotation.object {
             let position = pt.superview?.convert(pt.layer.position, to: nil)
             let location = pt.map?.mapboxMap.coordinate(for: position!)
             var geojson = Feature(geometry: .point(Point(location!)))
@@ -1042,7 +1042,7 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
               "screenPointX": .number(Double(position!.x)),
               "screenPointY": .number(Double(position!.y))
             ]
-            let event = RCTMGLEvent(type:.tap, payload: logged("doHandleTap") { try geojson.toJSON() })
+            let event = RNMBXEvent(type:.tap, payload: logged("doHandleTap") { try geojson.toJSON() })
             if let selected = selected {
               guard let onDeselected = pt.onDeselected else {
                 return
@@ -1108,7 +1108,7 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
   weak var mapView : MapView? = nil
   
   init(annotations: AnnotationOrchestrator, mapView: MapView) {
-    manager = annotations.makePointAnnotationManager(id: "rctmgl-mapview-point-annotations")
+    manager = annotations.makePointAnnotationManager(id: "RNMBX-mapview-point-annotations")
     manager.delegate = self
     self.mapView = mapView
   }
@@ -1122,8 +1122,8 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
       if let pointAnnotation = annotation as? PointAnnotation,
          let userInfo = pointAnnotation.userInfo {
         
-        if let rctmglPointAnnotation = userInfo[RCTMGLPointAnnotation.key] as? WeakRef<RCTMGLPointAnnotation> {
-          if let pt = rctmglPointAnnotation.object {
+        if let RNMBXPointAnnotation = userInfo[RNMBXPointAnnotation.key] as? WeakRef<RNMBXPointAnnotation> {
+          if let pt = RNMBXPointAnnotation.object {
             let position = pt.superview?.convert(pt.layer.position, to: nil)
             var geojson = Feature(geometry: .point(Point(targetPoint)))
             geojson.identifier = .string(pt.id)
@@ -1131,7 +1131,7 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
               "screenPointX": .number(Double(position!.x)),
               "screenPointY": .number(Double(position!.y))
             ]
-            let event = RCTMGLEvent(type:.longPress, payload: logged("doHandleLongPress") { try geojson.toJSON() })
+            let event = RNMBXEvent(type:.longPress, payload: logged("doHandleLongPress") { try geojson.toJSON() })
             switch (dragState) {
             case .began:
               guard let onDragStart = pt.onDragStart else {
@@ -1189,7 +1189,7 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
 
                   // Find if any `queriedFeatureIds` match an annotation's `id`
                 let draggedAnnotations = self.manager.annotations.filter { queriedFeatureIds.contains($0.id) }
-                let enabledAnnotations = draggedAnnotations.filter { ($0.userInfo?[RCTMGLPointAnnotation.key] as? WeakRef<RCTMGLPointAnnotation>)?.object?.draggable ?? false }
+                let enabledAnnotations = draggedAnnotations.filter { ($0.userInfo?[RNMBXPointAnnotation.key] as? WeakRef<RNMBXPointAnnotation>)?.object?.draggable ?? false }
                   // If `tappedAnnotations` is not empty, call delegate
                   if !enabledAnnotations.isEmpty {
                     self.draggedAnnotation = enabledAnnotations.first!
@@ -1241,7 +1241,7 @@ class PointAnnotationManager : AnnotationInteractionDelegate {
     let index = manager.annotations.firstIndex { $0.id == annotation.id }
     
     guard let index = index else {
-      Logger.log(level: .warn, message: "RCTMGL - PointAnnotation.refresh: annotation not found")
+      Logger.log(level: .warn, message: "RNMBX - PointAnnotation.refresh: annotation not found")
       return
     }
     

package/ios/{RCTMGL-v10/MBXMapViewComponentView.h → RNMBX/RNMBXMapViewComponentView.h}

@@ -7,7 +7,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface MBXMapViewComponentView : RCTViewComponentView
+@interface RNMBXMapViewComponentView : RCTViewComponentView
 
 - (void)dispatchCameraChangedEvent:(NSDictionary*)event;
 

package/ios/{RCTMGL-v10/MBXMapViewComponentView.mm → RNMBX/RNMBXMapViewComponentView.mm}

@@ -1,6 +1,6 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
-#import "MBXMapViewComponentView.h"
+#import "RNMBXMapViewComponentView.h"
 
 #import <React/RCTConversions.h>
 #import <React/RCTFabricComponentsPlugins.h>
@@ -20,17 +20,17 @@
 
 using namespace facebook::react;
 
-@interface MBXMapViewComponentView () <RCTMBXMapViewViewProtocol>
+@interface RNMBXMapViewComponentView () <RCTRNMBXMapViewViewProtocol>
 @end
 
-@interface MBXMapViewEventDispatcher : NSObject<RCTEventDispatcherProtocol>
+@interface RNMBXMapViewEventDispatcher : NSObject<RCTEventDispatcherProtocol>
 @end
 
-@implementation MBXMapViewEventDispatcher {
-    MBXMapViewComponentView* _componentView;
+@implementation RNMBXMapViewEventDispatcher {
+    RNMBXMapViewComponentView* _componentView;
 }
 
-- (instancetype)initWithComponentView:(MBXMapViewComponentView*)componentView {
+- (instancetype)initWithComponentView:(RNMBXMapViewComponentView*)componentView {
     if (self = [super init]) {
         _componentView = componentView;
     }
@@ -45,18 +45,18 @@ using namespace facebook::react;
 
 @end
 
-@implementation MBXMapViewComponentView {
-    MBXMapView *_view;
-    MBXMapViewEventDispatcher *_eventDispatcher;
+@implementation RNMBXMapViewComponentView {
+    RNMBXMapView *_view;
+    RNMBXMapViewEventDispatcher *_eventDispatcher;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const MBXMapViewProps>();
+    static const auto defaultProps = std::make_shared<const RNMBXMapViewProps>();
     _props = defaultProps;
-    _eventDispatcher = [[MBXMapViewEventDispatcher alloc] initWithComponentView:self];
-      _view =  [[MBXMapView alloc] initWithFrame:frame eventDispatcher:_eventDispatcher];
+    _eventDispatcher = [[RNMBXMapViewEventDispatcher alloc] initWithComponentView:self];
+      _view =  [[RNMBXMapView alloc] initWithFrame:frame eventDispatcher:_eventDispatcher];
       
       // just need to pass something, it won't really be used on fabric, but it's used to create events (it won't impact sending them)
       _view.reactTag = @-1;
@@ -68,8 +68,8 @@ using namespace facebook::react;
           __typeof__(self) strongSelf = weakSelf;
 
           if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
-              const auto [type, json] = [MBXMapViewComponentView stringifyEventData:event];
-              std::dynamic_pointer_cast<const facebook::react::MBXMapViewEventEmitter>(strongSelf->_eventEmitter)->onPress({type, json});
+              const auto [type, json] = [RNMBXMapViewComponentView stringifyEventData:event];
+              std::dynamic_pointer_cast<const facebook::react::RNMBXMapViewEventEmitter>(strongSelf->_eventEmitter)->onPress({type, json});
             }
       }];
 
@@ -77,8 +77,8 @@ using namespace facebook::react;
           __typeof__(self) strongSelf = weakSelf;
 
           if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
-              const auto [type, json] = [MBXMapViewComponentView stringifyEventData:event];
-              std::dynamic_pointer_cast<const facebook::react::MBXMapViewEventEmitter>(strongSelf->_eventEmitter)->onLongPress({type, json});
+              const auto [type, json] = [RNMBXMapViewComponentView stringifyEventData:event];
+              std::dynamic_pointer_cast<const facebook::react::RNMBXMapViewEventEmitter>(strongSelf->_eventEmitter)->onLongPress({type, json});
             }
       }];
 
@@ -86,8 +86,8 @@ using namespace facebook::react;
           __typeof__(self) strongSelf = weakSelf;
 
           if (strongSelf != nullptr && strongSelf->_eventEmitter != nullptr) {
-              const auto [type, json] = [MBXMapViewComponentView stringifyEventData:event];
-              std::dynamic_pointer_cast<const facebook::react::MBXMapViewEventEmitter>(strongSelf->_eventEmitter)->onMapChange({type, json});
+              const auto [type, json] = [RNMBXMapViewComponentView stringifyEventData:event];
+              std::dynamic_pointer_cast<const facebook::react::RNMBXMapViewEventEmitter>(strongSelf->_eventEmitter)->onMapChange({type, json});
             }
       }];
 
@@ -98,8 +98,8 @@ using namespace facebook::react;
 }
 
 - (void)dispatchCameraChangedEvent:(NSDictionary*)event {
-    const auto [type, json] = [MBXMapViewComponentView stringifyEventData:event];
-    std::dynamic_pointer_cast<const facebook::react::MBXMapViewEventEmitter>(self->_eventEmitter)->onCameraChanged({type, json});
+    const auto [type, json] = [RNMBXMapViewComponentView stringifyEventData:event];
+    std::dynamic_pointer_cast<const facebook::react::RNMBXMapViewEventEmitter>(self->_eventEmitter)->onCameraChanged({type, json});
 }
 
 + (std::tuple<std::string, std::string>)stringifyEventData:(NSDictionary*)event {
@@ -136,7 +136,7 @@ using namespace facebook::react;
     return result;
 }
 
-- (NSDictionary*)convertLocalizeLabels:(const MBXMapViewLocalizeLabelsStruct*)labels {
+- (NSDictionary*)convertLocalizeLabels:(const RNMBXMapViewLocalizeLabelsStruct*)labels {
     NSMutableDictionary* result = [[NSMutableDictionary alloc] init];
     NSMutableArray* ids = [[NSMutableArray alloc] init];
 
@@ -157,12 +157,12 @@ using namespace facebook::react;
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
 {
-  return concreteComponentDescriptorProvider<MBXMapViewComponentDescriptor>();
+  return concreteComponentDescriptorProvider<RNMBXMapViewComponentDescriptor>();
 }
 
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps
 {
-  const auto &newProps = *std::static_pointer_cast<const MBXMapViewProps>(props);
+  const auto &newProps = *std::static_pointer_cast<const RNMBXMapViewProps>(props);
     [_view setReactAttributionEnabled:newProps.attributionEnabled];
     [_view setReactAttributionPosition:[self convertPositionToDictionary:&newProps.attributionPosition]];
 
@@ -184,7 +184,7 @@ using namespace facebook::react;
     [_view setReactRotateEnabled:newProps.rotateEnabled];
     [_view setReactPitchEnabled:newProps.pitchEnabled];
 
-    [_view setReactProjection:newProps.projection == MBXMapViewProjection::Mercator ? @"mercator" : @"globe"];
+    [_view setReactProjection:newProps.projection == RNMBXMapViewProjection::Mercator ? @"mercator" : @"globe"];
     [_view setReactStyleURL:[NSString stringWithUTF8String:newProps.styleURL.c_str()]];
 
     if (!newProps.localizeLabels.locale.empty()) {
@@ -195,9 +195,9 @@ using namespace facebook::react;
 
 @end
 
-Class<RCTComponentViewProtocol> MBXMapViewCls(void)
+Class<RCTComponentViewProtocol> RNMBXMapViewCls(void)
 {
-  return MBXMapViewComponentView.class;
+  return RNMBXMapViewComponentView.class;
 }
 
 #endif // RCT_NEW_ARCH_ENABLED

package/ios/{RCTMGL-v10/MBXMapViewManager.m → RNMBX/RNMBXMapViewManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_REMAP_MODULE(MBXMapView, MBXMapViewManager, RCTViewManager)
+@interface RCT_EXTERN_REMAP_MODULE(RNMBXMapView, RNMBXMapViewManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(onCameraChanged, RCTDirectEventBlock)