[iOS][Maps] MBXImage instead of __MBXImage (#12742)

GitOrigin-RevId: 5ed75762416aac809f072cfc051d5dd9e730fbd3

Author: ArtemStepuk

LICENSE.md

@@ -20,7 +20,7 @@ typealias CoreScreenCoordinate = MapboxCoreMaps_Private.__ScreenCoordinate
 typealias CoreScreenBox = MapboxCoreMaps_Private.ScreenBox
 typealias CoreEdgeInsets = MapboxCoreMaps_Private.__EdgeInsets
 typealias CoreTileCoverOptions = MapboxCoreMaps_Private.TileCoverOptions
-typealias CoreMapsImage = MapboxCoreMaps_Private.__MBXImage
+typealias CoreMapsImage = MapboxCoreMaps.MBXImage
 typealias CoreCustomRasterSourceTileData = MapboxCoreMaps_Private.CustomRasterSourceTileData
 typealias CoreStyleManager = MapboxCoreMaps_Private.StyleManager
 typealias CoreGeoJSONSourceData = MapboxCoreMaps_Private.GeoJSONSourceData

Sources/MapboxMaps/Foundation/CoreAliases.swift

@@ -142,7 +142,7 @@ public class Snapshotter: StyleManager {
                 coordinateForPoint: coordinateForPoint
             )
             guard let mbmImage = mbmImage,
-                let uiImage = UIImage(mbmImage: mbmImage, scale: scale) else {
+                  let uiImage = UIImage(mbmImage: MBXImage.Marshaller.toSwift(mbmImage), scale: scale) else {
                 completion(.failure(.snapshotFailed(reason: "Could not convert internal Image type to UIImage.")))
                 return
             }

Sources/MapboxMaps/Snapshot/Snapshotter.swift

@@ -89,7 +89,7 @@ extension ColorTheme {
         if let base64 {
             return .fromStylePropertyValue(StylePropertyValue.Marshaller.toObjc(base64))
         } else if let uiimage, let coreImage = CoreMapsImage(uiImage: uiimage) {
-            return .fromImage(coreImage)
+            return .fromImage(MBXImage.Marshaller.toObjc(coreImage))
         } else {
             return nil
         }

Sources/MapboxMaps/Style/ColorTheme.swift

@@ -1,15 +1,20 @@
-@_spi(Internal) import MapboxCoreMaps
+@_implementationOnly import MapboxCoreMaps_Private
+@_spi(Marshalling) @_spi(Internal) import MapboxCoreMaps
 import UIKit
 
 extension CustomRasterSourceTileData {
     /// Raster content of the tile. If an empty image is provided then the tile gets removed from the map.
-    public var image: UIImage? { __image.flatMap { UIImage(mbmImage: $0) } }
+    public var image: UIImage? { __image.flatMap { UIImage(mbmImage: MBXImage.Marshaller.toSwift($0)) } }
 
     /// Creates a raster source tile data.
     /// - Parameters:
     ///    - tileId: Cannonical tile id.
     ///    - image: Raster content of the tile.
     public convenience init(tileId: CanonicalTileID, image: UIImage?) {
-        self.init(tileId: tileId, image: image.flatMap { CoreMapsImage(uiImage: $0) })
+        self.init(tileId: tileId,
+                  image: image
+            .flatMap { CoreMapsImage(uiImage: $0) }
+            .flatMap { (image: CoreMapsImage) -> MapboxCoreMaps_Private.__MBXImage in MBXImage.Marshaller.toObjc(image) }
+        )
     }
 }

Sources/MapboxMaps/Style/CustomSources/CustomRasterSourceTileData+Extensions.swift

@@ -1,5 +1,7 @@
 import Foundation
 @_implementationOnly import MapboxCommon_Private
+@_implementationOnly import MapboxCoreMaps_Private
+@_spi(Marshalling) import MapboxCoreMaps
 
 struct RuntimeStylingCallbacks {
     typealias Action = () -> Void
@@ -231,6 +233,33 @@ internal protocol StyleManagerProtocol {
 // MARK: Conformance
 
 extension CoreStyleManager: StyleManagerProtocol {
+    func getStyleImage(forImageId imageId: String) -> CoreMapsImage? {
+        let image: MapboxCoreMaps_Private.__MBXImage? = getStyleImage(forImageId: imageId)
+        return image.flatMap { MBXImage.Marshaller.toSwift($0) }
+    }
+
+    func updateStyleImageSourceImage(forSourceId sourceId: String, image: CoreMapsImage) -> Expected<NSNull, NSString> {
+        let image: MapboxCoreMaps_Private.__MBXImage = MBXImage.Marshaller.toObjc(image)
+        return updateStyleImageSourceImage(
+            forSourceId: sourceId,
+            image: image
+        )
+    }
+
+    // swiftlint:disable:next function_parameter_count
+    func addStyleImage(forImageId imageId: String, scale: Float, image: CoreMapsImage, sdf: Bool, stretchX: [ImageStretches], stretchY: [ImageStretches], content: ImageContent?) -> Expected<NSNull, NSString> {
+        let image: MapboxCoreMaps_Private.__MBXImage = MBXImage.Marshaller.toObjc(image)
+        return addStyleImage(
+            forImageId: imageId,
+            scale: scale,
+            image: image,
+            sdf: sdf,
+            stretchX: stretchX,
+            stretchY: stretchY,
+            content: content
+        )
+    }
+
     func setStyleURI(_ uri: String, callbacks: RuntimeStylingCallbacks) {
         load(style: uri, isJson: false, callbacks: callbacks)
     }