[gl-native] swift bindings for camera records (#8493)

`CameraState`, `CameraOptions`, `EdgeInsets` and `ScreenCoordinate`
swift definitions are moved from the iOS sdk to gl native. This is
needed to be able to refer to these types in maps cpp generated swift
bindings.

cc @mapbox/maps-ios
cc @mapbox/core-sdk
cc @mapbox/gl-native

GitOrigin-RevId: a7a6d3540e1ccfcef2f22e3b19fb021dc29a76ae

Author: evil159

Sources/MapboxMaps/Documentation.docc/API Catalogs/CoreMapsInternal.md

@@ -11,6 +11,8 @@ Maps rendering SDK also known as GL-Native. These are for internal use only.
 - ``Size``
 - ``StylePackError-class``
 - ``RequestErrorType``
+- ``EdgeInsets``
+- ``ScreenCoordinate``
 
 <!-- functions -->
 - ``MBMMapLoadingErrorTypeToString(_:)``

Sources/MapboxMaps/Foundation/CameraOptions.swift

@@ -1,8 +1,9 @@
 @_implementationOnly import MapboxCoreMaps_Private
 @_implementationOnly import MapboxCommon_Private
+@_spi(Internal) import MapboxCoreMaps
 
-typealias CoreCameraOptions = MapboxCoreMaps_Private.CameraOptions
-typealias CoreCameraState = MapboxCoreMaps_Private.CameraState
+typealias CoreCameraOptions = MapboxCoreMaps_Private.__CameraOptions
+typealias CoreCameraState = MapboxCoreMaps_Private.__CameraState
 typealias CoreCameraBounds = MapboxCoreMaps_Private.CameraBounds
 typealias CoreCameraBoundsOptions = MapboxCoreMaps_Private.CameraBoundsOptions
 typealias CoreMapSnapshotOptions = MapboxCoreMaps_Private.MapSnapshotOptions
@@ -15,9 +16,9 @@ typealias CoreAnnotatedFeature = MapboxCoreMaps_Private.AnnotatedFeature
 typealias CoreAnnotatedLayerFeature = MapboxCoreMaps_Private.AnnotatedLayerFeature
 typealias CoreProjection = MapboxCoreMaps_Private.Projection
 typealias CoreMap = MapboxCoreMaps_Private.Map
-typealias CoreScreenCoordinate = MapboxCoreMaps_Private.ScreenCoordinate
+typealias CoreScreenCoordinate = MapboxCoreMaps_Private.__ScreenCoordinate
 typealias CoreScreenBox = MapboxCoreMaps_Private.ScreenBox
-typealias CoreEdgeInsets = MapboxCoreMaps_Private.EdgeInsets
+typealias CoreEdgeInsets = MapboxCoreMaps_Private.__EdgeInsets
 typealias CoreTileCoverOptions = MapboxCoreMaps_Private.TileCoverOptions
 typealias CoreMapsImage = MapboxCoreMaps_Private.__Image
 typealias CoreCustomRasterSourceTileData = MapboxCoreMaps_Private.CustomRasterSourceTileData
@@ -47,3 +48,4 @@ typealias CoreFeaturesetQueryTarget = MapboxCoreMaps_Private.FeaturesetQueryTarg
 typealias CoreFeaturesetDescriptor = MapboxCoreMaps_Private.FeaturesetDescriptor
 typealias CoreColorTheme = MapboxCoreMaps_Private.ColorTheme
 typealias CoreAsyncOperationResultCallback = MapboxCoreMaps_Private.AsyncOperationResultCallback
+typealias UIEdgeInsetsCodable = MapboxCoreMaps.UIEdgeInsetsCodable

Sources/MapboxMaps/Foundation/CameraState.swift

@@ -2,6 +2,7 @@ import Foundation
 import CoreLocation
 import CoreGraphics
 import MapboxCoreMaps
+@_implementationOnly import MapboxCoreMaps_Private
 
 // MARK: - CGPoint
 extension CGPoint {

Sources/MapboxMaps/Foundation/CoreAliases.swift

@@ -573,7 +573,7 @@ public final class MapboxMap: StyleManager {
                        pitch: Double?,
                        maxZoom: Double?,
                        offset: CGPoint?) -> CameraOptions {
-        return CameraOptions(
+        return CameraOptions.Marshaller.toSwift(
             __map.cameraForCoordinateBounds(
                 for: coordinateBounds,
                 padding: padding?.toMBXEdgeInsetsValue(),
@@ -630,7 +630,7 @@ public final class MapboxMap: StyleManager {
                        padding: UIEdgeInsets?,
                        bearing: Double?,
                        pitch: Double?) -> CameraOptions {
-        return CameraOptions(
+        return CameraOptions.Marshaller.toSwift(
             __map.cameraForCoordinates(
                 for: coordinates.map { Coordinate2D(value: $0) },
                 padding: padding?.toMBXEdgeInsetsValue(),
@@ -662,10 +662,10 @@ public final class MapboxMap: StyleManager {
     public func camera(for coordinates: [CLLocationCoordinate2D],
                        camera: CameraOptions,
                        rect: CGRect) -> CameraOptions {
-        return CameraOptions(
+        return CameraOptions.Marshaller.toSwift(
             __map.cameraForCoordinates(
                 for: coordinates.map { Coordinate2D(value: $0) },
-                camera: CoreCameraOptions(camera),
+                camera: CameraOptions.Marshaller.toObjc(camera),
                 box: CoreScreenBox(rect)))
     }
 
@@ -687,7 +687,7 @@ public final class MapboxMap: StyleManager {
                        offset: CGPoint?) throws -> CameraOptions {
         let expected = __map.cameraForCoordinates(
             for: coordinates.map { Coordinate2D(value: $0) },
-            camera: CoreCameraOptions(camera),
+            camera: CameraOptions.Marshaller.toObjc(camera),
             coordinatesPadding: coordinatesPadding?.toMBXEdgeInsetsValue(),
             maxZoom: maxZoom as? NSNumber,
             offset: offset?.screenCoordinate
@@ -699,7 +699,7 @@ public final class MapboxMap: StyleManager {
         guard let options = expected.value else {
             throw MapError(coreError: "Failed to unwrap CameraOptions")
         }
-        return CameraOptions(options)
+        return CameraOptions.Marshaller.toSwift(options)
     }
 
     /// Calculates a `CameraOptions` to fit a geometry
@@ -744,7 +744,7 @@ public final class MapboxMap: StyleManager {
                        padding: UIEdgeInsets,
                        bearing: CGFloat?,
                        pitch: CGFloat?) -> CameraOptions {
-        return CameraOptions(
+        return CameraOptions.Marshaller.toSwift(
             __map.cameraForGeometry(
                 for: MapboxCommon.Geometry(geometry),
                 padding: padding.toMBXEdgeInsetsValue(),
@@ -762,7 +762,7 @@ public final class MapboxMap: StyleManager {
     /// - Returns: `CoordinateBounds` for the given `CameraOptions`
     public func coordinateBounds(for camera: CameraOptions) -> CoordinateBounds {
         return __map.coordinateBoundsForCamera(
-            forCamera: CoreCameraOptions(camera))
+            forCamera: CameraOptions.Marshaller.toObjc(camera))
     }
 
     /// Returns the unwrapped coordinate bounds to a given ``CameraOptions-swift.struct``.
@@ -774,7 +774,7 @@ public final class MapboxMap: StyleManager {
     /// - Parameter camera: The camera for which the coordinate bounds will be returned.
     /// - Returns: `CoordinateBounds` for the given ``CameraOptions-swift.struct``.
     public func coordinateBoundsUnwrapped(for camera: CameraOptions) -> CoordinateBounds {
-        return __map.coordinateBoundsForCameraUnwrapped(forCamera: CoreCameraOptions(camera))
+        return __map.coordinateBoundsForCameraUnwrapped(forCamera: CameraOptions.Marshaller.toObjc(camera))
     }
 
     /// Returns the coordinate bounds and zoom for a given `CameraOptions`.
@@ -784,7 +784,7 @@ public final class MapboxMap: StyleManager {
     /// - Parameter camera: The camera for which the `CoordinateBoundsZoom` will be returned.
     /// - Returns: `CoordinateBoundsZoom` for the given `CameraOptions`
     public func coordinateBoundsZoom(for camera: CameraOptions) -> CoordinateBoundsZoom {
-        return __map.coordinateBoundsZoomForCamera(forCamera: CoreCameraOptions(camera))
+        return __map.coordinateBoundsZoomForCamera(forCamera: CameraOptions.Marshaller.toObjc(camera))
     }
 
     /// Returns the unwrapped coordinate bounds and zoom for a given `CameraOptions`.
@@ -797,7 +797,7 @@ public final class MapboxMap: StyleManager {
     ///     be returned.
     /// - Returns: `CoordinateBoundsZoom` for the given `CameraOptions`
     public func coordinateBoundsZoomUnwrapped(for camera: CameraOptions) -> CoordinateBoundsZoom {
-        return __map.coordinateBoundsZoomForCameraUnwrapped(forCamera: CoreCameraOptions(camera))
+        return __map.coordinateBoundsZoomForCameraUnwrapped(forCamera: CameraOptions.Marshaller.toObjc(camera))
     }
 
     // MARK: - Screen coordinate conversion
@@ -897,12 +897,12 @@ public final class MapboxMap: StyleManager {
     ///
     /// - Parameter cameraOptions: New camera options
     public func setCamera(to cameraOptions: CameraOptions) {
-        __map.setCameraFor(CoreCameraOptions(cameraOptions))
+        __map.setCameraFor(CameraOptions.Marshaller.toObjc(cameraOptions) as CoreCameraOptions)
     }
 
     /// Returns the current camera state
     public var cameraState: CameraState {
-        return CameraState(__map.getCameraState())
+        CameraState.Marshaller.toSwift(__map.getCameraState())
     }
 
     /// The map's current anchor, calculated after applying padding (if it exists)
@@ -960,7 +960,7 @@ public final class MapboxMap: StyleManager {
     ///     The camera options object showing end point.
     public func dragCameraOptions(from: CGPoint, to: CGPoint) -> CameraOptions {
         let options = __map.cameraForDrag(forStart: from.screenCoordinate, end: to.screenCoordinate)
-        return CameraOptions(options)
+        return CameraOptions.Marshaller.toSwift(options)
     }
 
     /// :nodoc: