[gl-native][maps-ios] Move Swift bindings for LayerPosition and Image (#2700)

evil159 · actions-user · persidskiy · commit 29ee078a3c9f · 2025-03-27T16:29:58.000+02:00
Co-authored-by: Changelog autocreator bot &lt;actions@github.com&gt;
GitOrigin-RevId: 9cb7b16cfdb4c19dd4ec3720c0025518e67c98be
diff --git a/MapboxMaps.podspec b/MapboxMaps.podspec
@@ -21,8 +21,8 @@ Pod::Spec.new do |m|
   m.source_files = 'Sources/MapboxMaps/**/*.{swift,h}'
   m.resource_bundles = { 'MapboxMapsResources' => ['Sources/**/*.{xcassets,strings}', 'Sources/MapboxMaps/MapboxMaps.json', 'Sources/MapboxMaps/PrivacyInfo.xcprivacy'] }
 
-  m.dependency 'MapboxCoreMaps', '11.11.0-beta.1'
-  m.dependency 'MapboxCommon', '24.11.0-beta.1'
+  m.dependency 'MapboxCoreMaps', '11.11.0-SNAPSHOT-03-20--06-47.git-443decb'
+  m.dependency 'MapboxCommon', '24.11.0-SNAPSHOT-03-20--06-47.git-443decb'
   m.dependency 'Turf', '4.0.0'
 
 end
diff --git a/Package.swift b/Package.swift
@@ -4,9 +4,9 @@
 import PackageDescription
 import Foundation
 
-let coreMaps = MapsDependency.coreMaps(version: "11.11.0-beta.1")
+let coreMaps = MapsDependency.coreMaps(version: "11.11.0-SNAPSHOT-03-20--06-47.git-443decb", checksum: "81d1f50eef76fac7218a7cd232b7a2ac98db65d142ede5de3c7d9504c6da9d07")
 
-let common = MapsDependency.common(version: "24.11.0-beta.1")
+let common = MapsDependency.common(version: "24.11.0-SNAPSHOT-03-20--06-47.git-443decb", checksum: "bfeb77f0472423b68844da907b2a70958856230d56864ce5f7f953b2abdd402e")
 
 let mapboxMapsPath: String? = nil
 
diff --git a/Sources/MapboxMaps/ContentBuilders/MapStyleContent/MapStyleMountedComponents.swift b/Sources/MapboxMaps/ContentBuilders/MapStyleContent/MapStyleMountedComponents.swift
@@ -1,4 +1,5 @@
 import os.log
+@_spi(Marshalling) import MapboxCoreMaps
 
 struct MountedLayer<L>: MapContentMountedComponent where L: Layer, L: Equatable {
     var layer: L
@@ -13,18 +14,19 @@ struct MountedLayer<L>: MapContentMountedComponent where L: Layer, L: Equatable
         let styleManager = context.style.styleManager
         let properties = try layer.allStyleProperties()
         let position = customPosition ?? context.resolveLayerPosition()
+        let corePosition: CoreLayerPosition = LayerPosition.Marshaller.toObjc(position)
         os_log(.debug, log: .contentDSL, "layer %s insert %s", layer.id, position.asString())
 
         if let customLayer = layer as? CustomLayer {
             try handleExpected {
-                styleManager.addStyleCustomLayer(forLayerId: customLayer.id, layerHost: customLayer.renderer, layerPosition: position.corePosition)
+                styleManager.addStyleCustomLayer(forLayerId: customLayer.id, layerHost: customLayer.renderer, layerPosition: corePosition)
             }
             try handleExpected {
                 styleManager.setStyleLayerPropertiesForLayerId(layer.id, properties: properties)
             }
         } else {
             try handleExpected {
-                styleManager.addStyleLayer(forProperties: properties, layerPosition: position.corePosition)
+                styleManager.addStyleLayer(forProperties: properties, layerPosition: corePosition)
             }
         }
     }
@@ -66,7 +68,7 @@ struct MountedLayer<L>: MapContentMountedComponent where L: Layer, L: Equatable
         let position = customPosition ?? context.resolveLayerPosition()
         os_log(.debug, log: .contentDSL, "layer %s move to %s", layer.id, position.asString())
         try handleExpected {
-            styleManager.moveStyleLayer(forLayerId: layer.id, layerPosition: position.corePosition)
+            styleManager.moveStyleLayer(forLayerId: layer.id, layerPosition: LayerPosition.Marshaller.toObjc(position))
         }
 
         return true
diff --git a/Sources/MapboxMaps/Documentation.docc/API Catalogs/Style.md b/Sources/MapboxMaps/Documentation.docc/API Catalogs/Style.md
@@ -30,6 +30,7 @@
 - ``Snow``
 - ``ColorTheme``
 - ``ColorUseTheme``
+- ``Image``
 
 ### Declarative Map Styling
 
diff --git a/Sources/MapboxMaps/Foundation/CoreAliases.swift b/Sources/MapboxMaps/Foundation/CoreAliases.swift
@@ -8,7 +8,7 @@ typealias CoreCameraBoundsOptions = MapboxCoreMaps_Private.CameraBoundsOptions
 typealias CoreMapSnapshotOptions = MapboxCoreMaps_Private.MapSnapshotOptions
 typealias CoreMapSnapshot = MapboxCoreMaps_Private.MapSnapshot
 typealias CoreViewAnnotationOptions = MapboxCoreMaps_Private.ViewAnnotationOptions
-typealias CoreLayerPosition = MapboxCoreMaps_Private.LayerPosition
+typealias CoreLayerPosition = MapboxCoreMaps_Private.__LayerPosition
 typealias CoreImportPosition = MapboxCoreMaps_Private.ImportPosition
 typealias CoreTracing = MapboxCoreMaps_Private.Tracing
 typealias CoreAnnotatedFeature = MapboxCoreMaps_Private.AnnotatedFeature
@@ -19,7 +19,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.Image
+typealias CoreMapsImage = MapboxCoreMaps_Private.__Image
 typealias CoreCustomRasterSourceTileData = MapboxCoreMaps_Private.CustomRasterSourceTileData
 typealias CoreStyleManager = MapboxCoreMaps_Private.StyleManager
 typealias CoreGeoJSONSourceData = MapboxCoreMaps_Private.GeoJSONSourceData
diff --git a/Sources/MapboxMaps/Foundation/Extensions/Core/LayerPosition.swift b/Sources/MapboxMaps/Foundation/Extensions/Core/LayerPosition.swift
diff --git a/Sources/MapboxMaps/Style/StyleManager.swift b/Sources/MapboxMaps/Style/StyleManager.swift
@@ -1,6 +1,7 @@
 // swiftlint:disable file_length
 @_implementationOnly import MapboxCommon_Private
 import UIKit
+@_spi(Marshalling) import MapboxCoreMaps
 
 protocol StyleProtocol: AnyObject {
     var isStyleLoaded: Bool { get }
@@ -641,7 +642,10 @@ public class StyleManager {
     ///     An error describing why the operation was unsuccessful.
     public func addLayer(with properties: [String: Any], layerPosition: LayerPosition?) throws {
         try handleExpected {
-            return styleManager.addStyleLayer(forProperties: properties, layerPosition: layerPosition?.corePosition)
+            return styleManager.addStyleLayer(
+                forProperties: properties,
+                layerPosition: layerPosition.map(LayerPosition.Marshaller.toObjc)
+            )
         }
     }
 
@@ -655,7 +659,7 @@ public class StyleManager {
     ///     `StyleError` on failure, or `NSError` with a _domain of "com.mapbox.bindgen"
     public func moveLayer(withId id: String, to position: LayerPosition) throws {
         try handleExpected {
-            styleManager.moveStyleLayer(forLayerId: id, layerPosition: position.corePosition)
+            styleManager.moveStyleLayer(forLayerId: id, layerPosition: LayerPosition.Marshaller.toObjc(position))
         }
     }
 
@@ -671,7 +675,10 @@ public class StyleManager {
     ///     An error describing why the operation was unsuccessful
     public func addPersistentLayer(with properties: [String: Any], layerPosition: LayerPosition?) throws {
         try handleExpected {
-            return styleManager.addPersistentStyleLayer(forProperties: properties, layerPosition: layerPosition?.corePosition)
+            return styleManager.addPersistentStyleLayer(
+                forProperties: properties,
+                layerPosition: layerPosition.map(LayerPosition.Marshaller.toObjc)
+            )
         }
     }
 
@@ -698,7 +705,11 @@ public class StyleManager {
     ///     An error describing why the operation was unsuccessful.
     public func addPersistentCustomLayer(withId id: String, layerHost: CustomLayerHost, layerPosition: LayerPosition?) throws {
         try handleExpected {
-            return styleManager.addPersistentStyleCustomLayer(forLayerId: id, layerHost: layerHost, layerPosition: layerPosition?.corePosition)
+            return styleManager.addPersistentStyleCustomLayer(
+                forLayerId: id,
+                layerHost: layerHost,
+                layerPosition: layerPosition.map(LayerPosition.Marshaller.toObjc)
+            )
         }
     }
 
@@ -718,7 +729,11 @@ public class StyleManager {
     ///     An error describing why the operation was unsuccessful.
     public func addCustomLayer(withId id: String, layerHost: CustomLayerHost, layerPosition: LayerPosition?) throws {
         try handleExpected {
-            return styleManager.addStyleCustomLayer(forLayerId: id, layerHost: layerHost, layerPosition: layerPosition?.corePosition)
+            return styleManager.addStyleCustomLayer(
+                forLayerId: id,
+                layerHost: layerHost,
+                layerPosition: layerPosition.map(LayerPosition.Marshaller.toObjc)
+            )
         }
     }
 
diff --git a/scripts/api-compatibility-check/breakage_allowlist.txt b/scripts/api-compatibility-check/breakage_allowlist.txt
@@ -2086,3 +2086,6 @@ Var PolygonAnnotation.fillZOffset is now with @_documentation
 Var PolygonAnnotation.fillZOffset is now with @_spi
 Var PolylineAnnotation.lineZOffset is now with @_documentation
 Var PolylineAnnotation.lineZOffset is now with @_spi
+
+# LayerPosition moved to GL Native
+Enum LayerPosition has been removed
diff --git a/scripts/release/packager/versions.json b/scripts/release/packager/versions.json
@@ -1,5 +1,5 @@
 {
-    "MapboxCoreMaps": "11.11.0-beta.1",
-    "MapboxCommon": "24.11.0-beta.1",
+    "MapboxCoreMaps": "11.11.0-SNAPSHOT-03-20--06-47.git-443decb",
+    "MapboxCommon": "24.11.0-SNAPSHOT-03-20--06-47.git-443decb",
     "Turf": "4.0.0"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import os.log`
	`2`	`+@_spi(Marshalling) import MapboxCoreMaps`
`2`	`3`
`3`	`4`	`struct MountedLayer<L>: MapContentMountedComponent where L: Layer, L: Equatable {`
`4`	`5`	`var layer: L`
`@@ -13,18 +14,19 @@ struct MountedLayer<L>: MapContentMountedComponent where L: Layer, L: Equatable`
`13`	`14`	`let styleManager = context.style.styleManager`
`14`	`15`	`let properties = try layer.allStyleProperties()`
`15`	`16`	`let position = customPosition ?? context.resolveLayerPosition()`
	`17`	`+ let corePosition: CoreLayerPosition = LayerPosition.Marshaller.toObjc(position)`
`16`	`18`	`os_log(.debug, log: .contentDSL, "layer %s insert %s", layer.id, position.asString())`
`17`	`19`
`18`	`20`	`if let customLayer = layer as? CustomLayer {`
`19`	`21`	`try handleExpected {`
`20`		`- styleManager.addStyleCustomLayer(forLayerId: customLayer.id, layerHost: customLayer.renderer, layerPosition: position.corePosition)`
	`22`	`+ styleManager.addStyleCustomLayer(forLayerId: customLayer.id, layerHost: customLayer.renderer, layerPosition: corePosition)`
`21`	`23`	`}`
`22`	`24`	`try handleExpected {`
`23`	`25`	`styleManager.setStyleLayerPropertiesForLayerId(layer.id, properties: properties)`
`24`	`26`	`}`
`25`	`27`	`} else {`
`26`	`28`	`try handleExpected {`
`27`		`- styleManager.addStyleLayer(forProperties: properties, layerPosition: position.corePosition)`
	`29`	`+ styleManager.addStyleLayer(forProperties: properties, layerPosition: corePosition)`
`28`	`30`	`}`
`29`	`31`	`}`
`30`	`32`	`}`
`@@ -66,7 +68,7 @@ struct MountedLayer<L>: MapContentMountedComponent where L: Layer, L: Equatable`
`66`	`68`	`let position = customPosition ?? context.resolveLayerPosition()`
`67`	`69`	`os_log(.debug, log: .contentDSL, "layer %s move to %s", layer.id, position.asString())`
`68`	`70`	`try handleExpected {`
`69`		`- styleManager.moveStyleLayer(forLayerId: layer.id, layerPosition: position.corePosition)`
	`71`	`+ styleManager.moveStyleLayer(forLayerId: layer.id, layerPosition: LayerPosition.Marshaller.toObjc(position))`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`return true`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "MapboxCoreMaps": "11.11.0-beta.1",`
`3`		`- "MapboxCommon": "24.11.0-beta.1",`
	`2`	`+ "MapboxCoreMaps": "11.11.0-SNAPSHOT-03-20--06-47.git-443decb",`
	`3`	`+ "MapboxCommon": "24.11.0-SNAPSHOT-03-20--06-47.git-443decb",`
`4`	`4`	`"Turf": "4.0.0"`
`5`	`5`	`}`