@rnmapbox/maps 10.0.7-rc.0 → 10.0.7-rc.1

package/ios/RCTMGL-v10/RCMTGLImage.swift

@@ -2,21 +2,41 @@ import MapboxMaps
 
 class RCTMGLImage : UIView {
   @objc
-  var name: String = ""
+  var name: String = "" {
+    didSet {
+      _addImageToStyle()
+    }
+  }
 
   var image: UIImage? = nil
   
   @objc
-  var sdf: Bool = false
+  var sdf: Bool = false {
+    didSet {
+      _addImageToStyle()
+    }
+  }
 
   @objc
-  var stretchX: [[NSNumber]] = []
+  var stretchX: [[NSNumber]] = [] {
+    didSet {
+      _addImageToStyle()
+    }
+  }
 
   @objc
-  var stretchY: [[NSNumber]] = []
+  var stretchY: [[NSNumber]] = [] {
+    didSet {
+      _addImageToStyle()
+    }
+  }
 
   @objc
-  var content: [NSNumber]? = nil
+  var content: [NSNumber]? = nil {
+    didSet {
+      _addImageToStyle()
+    }
+  }
 
   weak var images: RCTMGLImageSetter? = nil {
     didSet {
@@ -48,12 +68,17 @@ class RCTMGLImage : UIView {
   
   // MARK: - view shnapshot
   
-  func changeImage(_ image: UIImage, name: String) {
-    if let images = images {
-      let _ = images.addImage(name: name, image: image, sdf: sdf, stretchX:stretchX, stretchY:stretchY, content:content, log: "RCTMGLImage.addImage")
+  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")
     }
   }
   
+  func changeImage(_ image: UIImage, name: String) {
+    self.image = image
+    _addImageToStyle()
+  }
+  
   func setImage() {
     if let image = _createViewSnapshot() {
       changeImage(image, name: name)

package/ios/RCTMGL-v10/RCTMGLImages.swift

@@ -118,29 +118,34 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
     }
   }
   
-  static func convert(stretch: [[NSNumber]], scale: Float = 1.0) -> [(from: Float, to: Float)] {
+  static func convert(stretch: [[NSNumber]], scale: CGFloat = 1.0) -> [(from: Float, to: Float)] {
     return stretch.map{ pair in
-      return (from: pair[0].floatValue * scale, to: pair[1].floatValue * scale)
+      return (from: pair[0].floatValue * Float(scale), to: pair[1].floatValue * Float(scale))
     }
   }
   
-  static func convert(stretch: [(from: Float, to: Float)]) -> [ImageStretches] {
-    return stretch.map { v in ImageStretches(first: v.from, second: v.to) }
+  static func convert(stretch: [(from: Float, to: Float)], scale: CGFloat = 1.0) -> [ImageStretches] {
+    return stretch.map { v in ImageStretches(first: v.from * Float(scale), second: v.to * Float(scale)) }
   }
   
-  static func convert(stretch: [[NSNumber]], scale: Float = 1.0) -> [ImageStretches] {
+  static func convert(stretch: [[NSNumber]], scale: CGFloat = 1.0) -> [ImageStretches] {
     return convert(stretch: convert(stretch: stretch, scale: scale))
   }
+  
+  static func convert(stretch: [[NSNumber]], scale: Float = 1.0) -> [ImageStretches] {
+    return convert(stretch: stretch, scale: CGFloat(scale))
+  }
+
 
-  static func convert(content: (left:Float, top:Float, right:Float, bottom:Float)?) -> ImageContent? {
+  static func convert(content: (left:Float, top:Float, right:Float, bottom:Float)?, scale: CGFloat) -> ImageContent? {
     guard let content = content else {
       return nil
     }
     
-    return ImageContent(left:content.left, top:content.top, right:content.right, bottom:content.bottom)
+    return ImageContent(left:content.left*Float(scale), top:content.top*Float(scale), right:content.right*Float(scale), bottom:content.bottom*Float(scale))
   }
 
-  static func convert(content: [NSNumber]?, scale: Float = 1.0) -> (left:Float,top:Float,right:Float,bottom:Float)? {
+  static func convert(content: [NSNumber]?, scale: CGFloat = 1.0) -> (left:Float,top:Float,right:Float,bottom:Float)? {
     guard let content = content else {
       return nil
     }
@@ -149,15 +154,15 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
       return nil
     }
     return (
-      left: content[0].floatValue*scale,
-      top: content[1].floatValue*scale,
-      right: content[2].floatValue*scale,
-      bottom: content[3].floatValue*scale
+      left: content[0].floatValue*Float(scale),
+      top: content[1].floatValue*Float(scale),
+      right: content[2].floatValue*Float(scale),
+      bottom: content[3].floatValue*Float(scale)
     )
   }
   
-  static func convert(content: [NSNumber]?, scale: Float = 1.0) -> ImageContent? {
-    return convert(content: convert(content: content, scale: scale))
+  static func convert(content: [NSNumber]?, scale: CGFloat = 1.0) -> ImageContent? {
+    return convert(content: convert(content: content, scale: scale), scale: 1.0)
   }
   
   func decodeImage(_ imageNameOrInfo: Any) -> NativeImageInfo? {
@@ -202,9 +207,9 @@ class RCTMGLImages : UIView, RCTMGLMapComponent {
         if let image = UIImage(named: imageName) {
           logged("RCTMGLImage.addNativeImage: \(imageName)") {
             try style.addImage(image, id: imageName, sdf: imageInfo.sdf,
-                               stretchX: RCTMGLImages.convert(stretch: imageInfo.stretchX),
-                               stretchY: RCTMGLImages.convert(stretch: imageInfo.stretchY),
-                               content: RCTMGLImages.convert(content: imageInfo.content)
+                               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)
             )
           }
         } else {
@@ -230,9 +235,9 @@ extension RCTMGLImages : RCTMGLImageSetter {
          try style.addImage(image,
                             id:name,
                             sdf: sdf ?? false,
-                            stretchX: RCTMGLImages.convert(stretch: stretchX),
-                            stretchY: RCTMGLImages.convert(stretch: stretchY),
-                            content: RCTMGLImages.convert(content: content)
+                            stretchX: RCTMGLImages.convert(stretch: stretchX, scale: image.scale),
+                            stretchY: RCTMGLImages.convert(stretch: stretchY, scale: image.scale),
+                            content: RCTMGLImages.convert(content: content, scale: image.scale)
          )
          return true
        } else {

package/ios/RCTMGL-v10/RCTMGLUtils.swift

@@ -33,10 +33,10 @@ class RCTMGLUtils {
           let scale = (image["scale"] as? NSNumber)?.floatValue ?? 1.0
           let sdf = (image["sdf"] as? NSNumber)?.boolValue ?? false
           let imageStretchX = image["stretchX"] as? [[NSNumber]]
-          let stretchX: [ImageStretches] = imageStretchX != nil ? RCTMGLImages.convert(stretch: imageStretchX!, scale: scale) : []
+          let stretchX: [ImageStretches] = imageStretchX != nil ? RCTMGLImages.convert(stretch: imageStretchX!, scale: CGFloat(scale)) : []
           let imageStretchY = image["stretchY"] as? [[NSNumber]]
-          let stretchY: [ImageStretches] = imageStretchY != nil ? RCTMGLImages.convert(stretch: imageStretchY!, scale: scale) : []
-          let content: ImageContent? = RCTMGLImages.convert(content: image["content"] as? [NSNumber], scale: scale)
+          let stretchY: [ImageStretches] = imageStretchY != nil ? RCTMGLImages.convert(stretch: imageStretchY!, scale: CGFloat(scale)) : []
+          let content: ImageContent? = RCTMGLImages.convert(content: image["content"] as? [NSNumber], scale: CGFloat(scale))
           
           RCTMGLImageQueue.sharedInstance.addImage(objects[imageName], scale: Double(scale), bridge:bridge) {
             (error,image) in

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rnmapbox/maps",
   "description": "A Mapbox react native module for creating custom maps",
-  "version": "10.0.7-rc.0",
+  "version": "10.0.7-rc.1",
   "publishConfig": {
     "access": "public"
   },

package/rnmapbox-maps.podspec

@@ -92,11 +92,11 @@ end
 case $RNMapboxMapsImpl
 when 'mapbox'
   rnMapboxMapsTargetsToChangeToDynamic = ['MapboxMobileEvents', 'Turf', 'MapboxMaps', 'MapboxCoreMaps', 'MapboxCommon']
-  MapboxImplVersion = $RNMapboxMapsVersion || rnMapboxMapsDefaultMapboxVersion
+  $MapboxImplVersion = $RNMapboxMapsVersion || rnMapboxMapsDefaultMapboxVersion
 when 'mapbox-gl'
   puts 'WARNING: mapbox-gl in @rnmapbox/maps is deprecated. Set $RNMapboxMapsImpl=mapbox in your Podfile. See https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-Maplibre#ios'
   rnMapboxMapsTargetsToChangeToDynamic = ['MapboxMobileEvents']
-  MapboxImplVersion = $RNMapboxMapsVersion || rnMapboxMapsDefaultMapboxGLVersion
+  $MapboxImplVersion = $RNMapboxMapsVersion || rnMapboxMapsDefaultMapboxGLVersion
 when 'maplibre'
   puts 'WARNING: maplibre in @rnmapbox/maps is deprecated. Set $RNMapboxMapsImpl=mapbox in your Podfile. See https://github.com/rnmapbox/maps/wiki/Deprecated-RNMapboxImpl-MapboxGL#ios'
   rnMapboxMapsTargetsToChangeToDynamic = ['MapboxMobileEvents']
@@ -239,11 +239,11 @@ Pod::Spec.new do |s|
   unless $RNMapboxMapsSwiftPackageManager
     case $RNMapboxMapsImpl
     when 'mapbox'
-      s.dependency 'MapboxMaps', MapboxImplVersion
+      s.dependency 'MapboxMaps', $MapboxImplVersion
       s.dependency 'Turf'
       s.swift_version = '5.0'
     when 'mapbox-gl'
-      s.dependency 'Mapbox-iOS-SDK', MapboxImplVersion
+      s.dependency 'Mapbox-iOS-SDK', $MapboxImplVersion
     when 'maplibre'
       fail "internal error: maplibre requires $RNMapboxMapsSwiftPackageManager"
     else