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

package/ios/{RCTMGL-v10/RCTMGLImages.swift → RNMBX/RNMBXImages.swift}

@@ -1,6 +1,6 @@
 import MapboxMaps
 
-protocol RCTMGLImageSetter : AnyObject {
+protocol RNMBXImageSetter : AnyObject {
   func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], content: [NSNumber]?, log: String) -> Bool
 }
 
@@ -16,7 +16,7 @@ func hasImage(style: Style, name: String) -> Bool {
 typealias StyleImageMissingPayload = StyleImageMissing
 #endif
 
-class RCTMGLImages : UIView, RCTMGLMapComponent {
+class RNMBXImages : UIView, RNMBXMapComponent {
   
   weak var bridge : RCTBridge! = nil
   
@@ -34,7 +34,7 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     
   var loadedImages : Set<String> = []
   
-  var imageViews: [RCTMGLImage] = []
+  var imageViews: [RNMBXImage] = []
 
   @objc
   var nativeImages: [Any] = [] {
@@ -47,29 +47,29 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
   var nativeImageInfos: [NativeImageInfo] = []
   
   @objc open override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
-    if let image = subview as? RCTMGLImage {
+    if let image = subview as? RNMBXImage {
       imageViews.insert(image, at: atIndex)
     } else {
-      Logger.log(level:.warn, message: "RCTMGLImages children can only be RCTMGLImage, got \(optional: subview)")
+      Logger.log(level:.warn, message: "RNMBXImages children can only be RNMBXImage, got \(optional: subview)")
     }
     super.insertReactSubview(subview, at: atIndex)
   }
   
   @objc open override func removeReactSubview(_ subview: UIView!) {
-    if let image = subview as? RCTMGLImage {
+    if let image = subview as? RNMBXImage {
       imageViews.removeAll { $0 == image }
       image.images = nil
     }
     super.removeReactSubview(subview)
   }
   
-  // MARK: - RCTMGLMapComponent
+  // MARK: - RNMBXMapComponent
 
   func waitForStyleLoad() -> Bool {
     return false
   }
   
-  func addToMap(_ map: RCTMGLMapView, style: Style) {
+  func addToMap(_ map: RNMBXMapView, style: Style) {
     self.style = style
     map.images.append(self)
     
@@ -78,7 +78,7 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     self.addImageViews(style: style, imageViews: imageViews)
   }
   
-  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     self.style = nil
     // v10todo
     return true
@@ -117,7 +117,7 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
           missingImages[name] = images[name]
         } else {
           if !hasImage(style: style, name: name) {
-            logged("RCTMGLImages.addImagePlaceholder") {
+            logged("RNMBXImages.addImagePlaceholder") {
               try? style.addImage(placeholderImage, id: name, stretchX: [], stretchY: [])
               missingImages[name] = images[name]
             }
@@ -127,11 +127,11 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     }
     
     if missingImages.count > 0 {
-      RCTMGLUtils.fetchImages(bridge, style: style, objects: missingImages, forceUpdate: true, loaded: { name in self.loadedImages.insert(name) } ,callback: { })
+      RNMBXUtils.fetchImages(bridge, style: style, objects: missingImages, forceUpdate: true, loaded: { name in self.loadedImages.insert(name) } ,callback: { })
     }
   }
   
-  private func addImageViews(style: Style, imageViews: [RCTMGLImage]) {
+  private func addImageViews(style: Style, imageViews: [RNMBXImage]) {
     imageViews.forEach { imageView in
       imageView.images = self
     }
@@ -152,7 +152,7 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
   
   public func sendImageMissingEvent(imageName: String, payload: StyleImageMissingPayload) {
     let payload = ["imageKey":imageName]
-    let event = RCTMGLEvent(type: .imageMissing, payload: payload)
+    let event = RNMBXEvent(type: .imageMissing, payload: payload)
     if let onImageMissing = onImageMissing {
       onImageMissing(event.toJSON())
     }
@@ -221,21 +221,21 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
       }
       
       if let stretchXV = imageInfo["stretchX"] as? [[NSNumber]] {
-        stretchX = RCTMGLImages.convert(stretch: stretchXV)
+        stretchX = RNMBXImages.convert(stretch: stretchXV)
       }
       
       if let stretchYV = imageInfo["stretchY"] as? [[NSNumber]] {
-        stretchY = RCTMGLImages.convert(stretch: stretchYV)
+        stretchY = RNMBXImages.convert(stretch: stretchYV)
       }
       
       var content : (left:Float, top:Float, right:Float, bottom:Float)? = nil
       if let contentV = imageInfo["content"] as? [NSNumber] {
-        content = RCTMGLImages.convert(content: contentV)
+        content = RNMBXImages.convert(content: contentV)
       }
       
       return (name: name, sdf: sdf, stretchX: stretchX, stretchY: stretchY, content: content)
     } else {
-      Logger.log(level: .warn, message: "RCTMGLImage.nativeImage, unexpected image: \(imageNameOrInfo)")
+      Logger.log(level: .warn, message: "RNMBXImage.nativeImage, unexpected image: \(imageNameOrInfo)")
       return nil
     }
   }
@@ -245,11 +245,11 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
       let imageName = imageInfo.name
       if !hasImage(style: style, name: imageInfo.name) {
         if let image = UIImage(named: imageName) {
-          logged("RCTMGLImage.addNativeImage: \(imageName)") {
+          logged("RNMBXImage.addNativeImage: \(imageName)") {
             try style.addImage(image, id: imageName, sdf: imageInfo.sdf,
-                               stretchX: RCTMGLImages.convert(stretch: imageInfo.stretchX, scale: image.scale),
-                               stretchY: RCTMGLImages.convert(stretch: imageInfo.stretchY, scale: image.scale),
-                               content: RCTMGLImages.convert(content: imageInfo.content, scale: image.scale)
+                               stretchX: RNMBXImages.convert(stretch: imageInfo.stretchX, scale: image.scale),
+                               stretchY: RNMBXImages.convert(stretch: imageInfo.stretchY, scale: image.scale),
+                               content: RNMBXImages.convert(content: imageInfo.content, scale: image.scale)
             )
           }
         } else {
@@ -267,7 +267,7 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
   }()
 }
 
-extension RCTMGLImages : RCTMGLImageSetter {
+extension RNMBXImages : RNMBXImageSetter {
   func addImage(name: String, image: UIImage, sdf: Bool?, stretchX: [[NSNumber]], stretchY: [[NSNumber]], content: [NSNumber]?, log: String) -> Bool
   {
      return logged("\(log).addImage") {
@@ -275,9 +275,9 @@ extension RCTMGLImages : RCTMGLImageSetter {
          try style.addImage(image,
                             id:name,
                             sdf: sdf ?? false,
-                            stretchX: RCTMGLImages.convert(stretch: stretchX, scale: image.scale),
-                            stretchY: RCTMGLImages.convert(stretch: stretchY, scale: image.scale),
-                            content: RCTMGLImages.convert(content: content, scale: image.scale)
+                            stretchX: RNMBXImages.convert(stretch: stretchX, scale: image.scale),
+                            stretchY: RNMBXImages.convert(stretch: stretchY, scale: image.scale),
+                            content: RNMBXImages.convert(content: content, scale: image.scale)
          )
          return true
        } else {

package/ios/{RCTMGL-v10/RCTMGLImagesManager.m → RNMBX/RNMBXImagesManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLImagesManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXImagesManager, RCTViewManager)
 
 RCT_EXPORT_VIEW_PROPERTY(id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(images, NSDictionary)

package/ios/{RCTMGL-v10/RCTMGLImagesManager.swift → RNMBX/RNMBXImagesManager.swift}

@@ -1,13 +1,13 @@
 
-@objc(RCTMGLImagesManager)
-class RCTMGLImagesManager : RCTViewManager {
+@objc(RNMBXImagesManager)
+class RNMBXImagesManager : RCTViewManager {
   @objc
   override static func requiresMainQueueSetup() -> Bool {
     return true
   }
 
   override func view() -> UIView! {
-    let layer = RCTMGLImages()
+    let layer = RNMBXImages()
     layer.bridge = self.bridge
     return layer
   }

package/ios/{RCTMGL-v10/RCTMGLInteractiveElement.swift → RNMBX/RNMBXInteractiveElement.swift}

@@ -1,8 +1,8 @@
 import MapboxMaps
 
 @objc
-class RCTMGLInteractiveElement : UIView, RCTMGLMapComponent {
-  weak var map : RCTMGLMapView? = nil
+class RNMBXInteractiveElement : UIView, RNMBXMapComponent {
+  weak var map : RNMBXMapView? = nil
 
   static let hitboxDefault = 44.0
 
@@ -45,15 +45,15 @@ class RCTMGLInteractiveElement : UIView, RCTMGLMapComponent {
     return hasPressListener
   }
   
-  // MARK: - RCTMGLMapComponent
-  func addToMap(_ map: RCTMGLMapView, style: Style) {
+  // MARK: - RNMBXMapComponent
+  func addToMap(_ map: RNMBXMapView, style: Style) {
     if (self.id == nil) {
       Logger.log(level: .error, message: "id is required on \(self) but not specified")
     }
     self.map = map
   }
 
-  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     self.map = nil
     return true
   }

package/ios/{RCTMGL-v10/RCTMGLLayer.swift → RNMBX/RNMBXLayer.swift}

@@ -1,8 +1,8 @@
 @_spi(Experimental) import MapboxMaps
 
-protocol RCTMGLSourceConsumer : class {
-  func addToMap(_ map: RCTMGLMapView, style: Style)
-  func removeFromMap(_ map: RCTMGLMapView, style: Style)
+protocol RNMBXSourceConsumer : class {
+  func addToMap(_ map: RNMBXMapView, style: Style)
+  func removeFromMap(_ map: RNMBXMapView, style: Style)
 }
 
 func styleLayerExists(_ style: Style, id: String) -> Bool {
@@ -13,8 +13,8 @@ func styleLayerExists(_ style: Style, id: String) -> Bool {
   #endif
 }
 
-@objc(RCTMGLLayer)
-class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
+@objc(RNMBXLayer)
+class RNMBXLayer : UIView, RNMBXMapComponent, RNMBXSourceConsumer {
   weak var bridge : RCTBridge? = nil
 
   var waitingForID: String? = nil
@@ -96,11 +96,11 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     }
   }
   
-  @objc weak var map: RCTMGLMapView? = nil
+  @objc weak var map: RNMBXMapView? = nil
 
   deinit {
     if let waitingForID = waitingForID {
-      Logger.log(level:.warn, message: "RCTMGLLayer.removeFromMap - unmetPositionDependency: layer: \(optional: id) was waiting for layer: \(optional: waitingForID) but it hasn't added to map")
+      Logger.log(level:.warn, message: "RNMBXLayer.removeFromMap - unmetPositionDependency: layer: \(optional: id) was waiting for layer: \(optional: waitingForID) but it hasn't added to map")
       self.waitingForID = nil
     }
   }
@@ -110,7 +110,7 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
   /// wearther we inserted the layer or we're referring to an existing layer
   var existingLayer = false
 
-  // MARK: - RCTMGLMapComponent
+  // MARK: - RNMBXMapComponent
   func waitForStyleLoad() -> Bool {
     return true
   }
@@ -183,7 +183,7 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     }
   }
   
-  func inserLayer(_ map: RCTMGLMapView) {
+  func inserLayer(_ map: RNMBXMapView) {
     if self.style == nil {
       print("inserLayer but style is nil")
     }
@@ -194,7 +194,7 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     }
   }
 
-  func updateLayer(_ map: RCTMGLMapView) {
+  func updateLayer(_ map: RNMBXMapView) {
     if let style = style, let _ = styleLayer {
       loggedApply(style: style)
     }
@@ -214,7 +214,7 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     
   }
   
-  func addToMap(_ map: RCTMGLMapView, style: Style) {
+  func addToMap(_ map: RNMBXMapView, style: Style) {
     self.map = map
     self.style = style
     guard let id = id else {
@@ -248,7 +248,7 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     addedToMap()
   }
   
-  func removeFromMap(_ map: RCTMGLMapView, style: Style) {
+  func removeFromMap(_ map: RNMBXMapView, style: Style) {
     removeFromMap(style)
   }
   
@@ -294,20 +294,20 @@ class RCTMGLLayer : UIView, RCTMGLMapComponent, RCTMGLSourceConsumer {
     }
   }
 
-  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool {
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool {
     removeFromMap(map.mapboxMap.style)
     return true
   }
   
   private func removeFromMap(_ style: Style) {
     if let waitingForID = waitingForID {
-      Logger.log(level:.warn, message: "RCTMGLLayer.removeFromMap - unmetPositionDependency: layer: \(optional: id) was waiting for layer: \(optional: waitingForID) but it hasn't added to map")
+      Logger.log(level:.warn, message: "RNMBXLayer.removeFromMap - unmetPositionDependency: layer: \(optional: id) was waiting for layer: \(optional: waitingForID) but it hasn't added to map")
     }
 
     do {
       try style.removeLayer(withId: self.id)
     } catch {
-      Logger.log(level: .error, message: "RCTMGLLayer.removeFromMap: removing layer failed for layer \(optional: id): \(error.localizedDescription)")
+      Logger.log(level: .error, message: "RNMBXLayer.removeFromMap: removing layer failed for layer \(optional: id): \(error.localizedDescription)")
     }
   }
   

package/ios/{RCTMGL-v10/RCTMGLLight.swift → RNMBX/RNMBXLight.swift}

@@ -4,8 +4,8 @@
 typealias Light = FlatLight
 #endif
 
-@objc(RCTMGLLight)
-class RCTMGLLight: UIView, RCTMGLMapComponent {
+@objc(RNMBXLight)
+class RNMBXLight: UIView, RNMBXMapComponent {
   weak var bridge : RCTBridge! = nil
   weak var map: MapboxMap! = nil
   var oldReactStyle: [String:Any]?
@@ -21,7 +21,7 @@ class RCTMGLLight: UIView, RCTMGLMapComponent {
   }
   
   func apply(light: Light) {
-    logged("RCTMGLLight.apply") {
+    logged("RNMBXLight.apply") {
 #if RNMBX_11
       try self.map.setLights(light)
 #else
@@ -34,7 +34,7 @@ class RCTMGLLight: UIView, RCTMGLMapComponent {
 
   func addStyles() {
     var light = Light()
-    let style = RCTMGLStyle(style: map.style)
+    let style = RNMBXStyle(style: map.style)
     style.lightLayer(layer: &light, reactStyle: reactStyle, oldReactStyle: oldReactStyle, applyUpdater: { (updater) in
       updater(&light)
       self.apply(light: light)
@@ -49,20 +49,20 @@ class RCTMGLLight: UIView, RCTMGLMapComponent {
     return map != nil
   }
   
-  // MARK: - RCTMGLMapComponent
+  // MARK: - RNMBXMapComponent
 
   func waitForStyleLoad() -> Bool {
     return true
   }
 
-  func addToMap(_ map: RCTMGLMapView, style: Style) {
+  func addToMap(_ map: RNMBXMapView, style: Style) {
     self.map = map.mapboxMap
     if (reactStyle != nil) {
       addStyles()
     }
   }
   
-  func removeFromMap(_ map: RCTMGLMapView, reason: RemovalReason) -> Bool  {
+  func removeFromMap(_ map: RNMBXMapView, reason: RemovalReason) -> Bool  {
     self.map = nil
     return true
   }

package/ios/{RCTMGL-v10/RCTMGLLightManager.m → RNMBX/RNMBXLightManager.m}

@@ -1,7 +1,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 
-@interface RCT_EXTERN_MODULE(RCTMGLLightManager, RCTViewManager)
+@interface RCT_EXTERN_MODULE(RNMBXLightManager, RCTViewManager)
 
 // light props
 RCT_EXPORT_VIEW_PROPERTY(reactStyle, NSDictionary);

package/ios/{RCTMGL-v10/RCTMGLLightManager.swift → RNMBX/RNMBXLightManager.swift}

@@ -1,12 +1,12 @@
-@objc(RCTMGLLightManager)
-class RCTMGLLightManager: RCTViewManager {
+@objc(RNMBXLightManager)
+class RNMBXLightManager: RCTViewManager {
     @objc
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
   
     override func view() -> UIView! {
-      let light = RCTMGLLight()
+      let light = RNMBXLight()
       light.bridge = self.bridge
       return light
     }

package/ios/{RCTMGL-v10/RCTMGLLineLayer.swift → RNMBX/RNMBXLineLayer.swift}

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

package/ios/{RCTMGL-v10/RCTMGLFillLayerManager.m → RNMBX/RNMBXLineLayerManager.m}

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

package/ios/{RCTMGL-v10/RCTMGLFillLayerManager.swift → RNMBX/RNMBXLineLayerManager.swift}

@@ -1,12 +1,12 @@
-@objc(RCTMGLFillLayerManager)
-class RCTMGLFillLayerManager: RCTViewManager {
+@objc(RNMBXLineLayerManager)
+class RNMBXLineLayerManager: RCTViewManager {
     @objc
     override static func requiresMainQueueSetup() -> Bool {
         return true
     }
   
     override func view() -> UIView! {
-      let layer = RCTMGLFillLayer()
+      let layer = RNMBXLineLayer()
       layer.bridge = self.bridge
       return layer
     }

package/ios/{RCTMGL-v10/RCTMGLLocationModule.m → RNMBX/RNMBXLocationModule.m}

@@ -1,9 +1,9 @@
 #import "React/RCTBridgeModule.h"
 #import <React/RCTEventEmitter.h>
 
-@class RCTMGLLocation;
+@class RNMBXLocation;
 
-@interface RCT_EXTERN_MODULE(RCTMGLLocationModule, RCTEventEmitter)
+@interface RCT_EXTERN_MODULE(RNMBXLocationModule, RCTEventEmitter)
 
 RCT_EXTERN_METHOD(start:(CLLocationDistance)minDisplacement)
 RCT_EXTERN_METHOD(stop)