From 77446b55e9e2bc5461fa3a8ca2e00feaeb7179f5 Mon Sep 17 00:00:00 2001 From: Mai Mai Date: Mon, 11 Nov 2024 12:28:46 +0200 Subject: [PATCH] Prepare v11.8 release (#2352) Co-authored-by: Ivan Persidsky Co-authored-by: Patrick Leonard Co-authored-by: Release SDK bot for Maps SDK team Co-authored-by: Roman Gardukevich Co-authored-by: Aleksei Sapitskii <45671572+aleksproger@users.noreply.github.com> --- .../xcshareddata/swiftpm/Package.resolved | 8 +-- .../SwiftUI Examples/SnapshotMapExample.swift | 38 ++++++++++++- CHANGELOG.md | 2 + LICENSE.md | 4 +- MapboxMaps.podspec | 6 +- Package.resolved | 8 +-- Package.swift | 4 +- .../Extensions/MapboxMap.md | 4 +- .../MapboxMaps/Foundation/CoreAliases.swift | 2 +- Sources/MapboxMaps/Foundation/MapboxMap.swift | 57 ++----------------- .../QueriedRenderedFeature+Extensions.swift | 13 ----- Sources/MapboxMaps/Info.plist | 2 +- .../Interactions/FeaturesetDescriptor.swift | 27 +++++++-- .../Interactions/FeaturesetQueryTarget.swift | 37 ------------ Sources/MapboxMaps/MapboxMaps.json | 2 +- .../Foundation/FeaturesetsTests.swift | 45 --------------- .../Foundation/Mocks/MockStyleManager.swift | 4 +- .../Style/StyleDSLIntegrationTests.swift | 6 +- .../breakage_allowlist.txt | 6 ++ scripts/release/packager/versions.json | 4 +- 20 files changed, 97 insertions(+), 182 deletions(-) delete mode 100644 Sources/MapboxMaps/Foundation/QueriedRenderedFeature+Extensions.swift delete mode 100644 Sources/MapboxMaps/Interactions/FeaturesetQueryTarget.swift diff --git a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved index 2ccf6e064b28..f579c826af49 100644 --- a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "c9bdf65d6b69256b577ffe0e8274b1e0f5c93346", - "version" : "24.8.0-rc.1" + "revision" : "2b9ec86affbf41f0e800f0c1c96be31c02e6854f", + "version" : "24.8.0" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "3aa9409d77f5929c3d0b70810d0c3b2ddd1d5d8a", - "version" : "11.8.0-rc.1" + "revision" : "c8d61110fb8b9f6452060a1df65dfc494d30afb2", + "version" : "11.8.0" } }, { diff --git a/Apps/Examples/Examples/SwiftUI Examples/SnapshotMapExample.swift b/Apps/Examples/Examples/SwiftUI Examples/SnapshotMapExample.swift index 24150b91f8c6..72703650774b 100644 --- a/Apps/Examples/Examples/SwiftUI Examples/SnapshotMapExample.swift +++ b/Apps/Examples/Examples/SwiftUI Examples/SnapshotMapExample.swift @@ -1,10 +1,17 @@ import SwiftUI import MapboxMaps -@available(iOS 13.0, *) +@available(iOS 14.0, *) struct SnapshotMapExample: View { @State var image: UIImage? + struct SnapshotterImage: Identifiable { + var id: ObjectIdentifier { ObjectIdentifier(image) } + let image: UIImage + } + @State var snapshotterImage: SnapshotterImage? + @State var snapshotter = Snapshotter(options: MapSnapshotOptions(size: CGSize(width: 512, height: 512), pixelRatio: 2.0)) + var body: some View { GeometryReader { geometry in VStack(spacing: 10) { @@ -12,6 +19,9 @@ struct SnapshotMapExample: View { Map(initialViewport: .helsinkiOverview) .mapStyle(.outdoors) .onMapIdle { _ in image = proxy.captureSnapshot() } + .onCameraChanged { event in + snapshotter.setCamera(to: CameraOptions(cameraState: event.cameraState)) + } .frame(height: geometry.size.height / 2) } @@ -19,10 +29,32 @@ struct SnapshotMapExample: View { .frame(height: geometry.size.height / 2) } } + .ignoresSafeArea() + .safeOverlay(alignment: .bottom) { + Button("Make snapshot via Snapshotter") { + snapshotter.start(overlayHandler: nil) { result in + switch result { + case .success(let image): + self.snapshotterImage = SnapshotterImage(image: image) + case .failure(let error): + print("Failure: \(error)") + } + } + } + .floating() + } + .onAppear { + snapshotter.mapStyle = .standardSatellite + } + .sheet(item: $snapshotterImage) { + Image(uiImage: $0.image) + .resizable() + .scaledToFit() + } } } -@available(iOS 13.0, *) +@available(iOS 14.0, *) struct SnapshotView: View { var snapshot: UIImage? @@ -40,7 +72,7 @@ private extension Viewport { static let helsinkiOverview = Self.overview(geometry: Polygon(center: .helsinki, radius: 10000, vertices: 30)) } -@available(iOS 13.0, *) +@available(iOS 14.0, *) struct SnapshotMapExample_Preview: PreviewProvider { static var previews: some View { SnapshotMapExample() diff --git a/CHANGELOG.md b/CHANGELOG.md index d3a8b83e6e8a..0fcd3fa88320 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ Mapbox welcomes participation and contributions from everyone. ## main +## 11.8.0 - 11 November, 2024 + * Add two separete Geofence examples in SwiftUI - `GeofencingPlayground` and `GeofencingUserLocation` ## 11.8.0-rc.1 - 23 October, 2024 diff --git a/LICENSE.md b/LICENSE.md index 64cef0407b9a..bf2e3633a4a1 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ ## License -Mapbox Maps for iOS version 11.8.0-rc.1 +Mapbox Maps for iOS version 11.8.0 Mapbox Maps iOS SDK Copyright © 2021 - 2024 Mapbox, Inc. All rights reserved. @@ -31,7 +31,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- -### MapboxCoreMaps,11.8.0-rc.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ +### MapboxCoreMaps,11.8.0,Mapbox ToS,Mapbox,https://www.mapbox.com/ ``` Mapbox Core Maps version 11.0 diff --git a/MapboxMaps.podspec b/MapboxMaps.podspec index fca49d0302f4..60c225155339 100644 --- a/MapboxMaps.podspec +++ b/MapboxMaps.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - maps_version = '11.8.0-rc.1' + maps_version = '11.8.0' m.name = 'MapboxMaps' m.version = maps_version @@ -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.8.0-rc.1' - m.dependency 'MapboxCommon', '24.8.0-rc.1' + m.dependency 'MapboxCoreMaps', '11.8.0' + m.dependency 'MapboxCommon', '24.8.0' m.dependency 'Turf', '3.0.0' end diff --git a/Package.resolved b/Package.resolved index 9ce5f8ab573a..c9780150ffc8 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "c9bdf65d6b69256b577ffe0e8274b1e0f5c93346", - "version" : "24.8.0-rc.1" + "revision" : "2b9ec86affbf41f0e800f0c1c96be31c02e6854f", + "version" : "24.8.0" } }, { @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "3aa9409d77f5929c3d0b70810d0c3b2ddd1d5d8a", - "version" : "11.8.0-rc.1" + "revision" : "c8d61110fb8b9f6452060a1df65dfc494d30afb2", + "version" : "11.8.0" } }, { diff --git a/Package.swift b/Package.swift index 79072c816275..62b117fc23cb 100644 --- a/Package.swift +++ b/Package.swift @@ -4,8 +4,8 @@ import PackageDescription import Foundation -let coreMaps = MapsDependency.coreMaps(version: "11.8.0-rc.1") -let common = MapsDependency.common(version: "24.8.0-rc.1") +let coreMaps = MapsDependency.coreMaps(version: "11.8.0") +let common = MapsDependency.common(version: "24.8.0") let mapboxMapsPath: String? = nil diff --git a/Sources/MapboxMaps/Documentation.docc/Extensions/MapboxMap.md b/Sources/MapboxMaps/Documentation.docc/Extensions/MapboxMap.md index a376bca77fbf..9d62cde39308 100644 --- a/Sources/MapboxMaps/Documentation.docc/Extensions/MapboxMap.md +++ b/Sources/MapboxMaps/Documentation.docc/Extensions/MapboxMap.md @@ -71,12 +71,10 @@ - ``MapboxMap/beginGesture()`` - ``MapboxMap/endGesture()`` -### Quering map features +### Querying map features - ``MapboxMap/queryRenderedFeatures(with:options:completion:)`` -- ``MapboxMap/queryRenderedFeatures(with:targets:completion:)`` - ``MapboxMap/querySourceFeatures(for:options:completion:)`` -- ``MapboxMap/querySourceFeatures(for:completion:)`` - ``MapboxMap/getGeoJsonClusterLeaves(forSourceId:feature:limit:offset:completion:)`` - ``MapboxMap/getGeoJsonClusterChildren(forSourceId:feature:completion:)`` - ``MapboxMap/getGeoJsonClusterExpansionZoom(forSourceId:feature:completion:)`` diff --git a/Sources/MapboxMaps/Foundation/CoreAliases.swift b/Sources/MapboxMaps/Foundation/CoreAliases.swift index 4f7ef0c5a04b..ac90f87e6143 100644 --- a/Sources/MapboxMaps/Foundation/CoreAliases.swift +++ b/Sources/MapboxMaps/Foundation/CoreAliases.swift @@ -44,4 +44,4 @@ typealias CoreInteractionHandler = MapboxCoreMaps_Private.InteractionHandler typealias CoreRenderedQueryGeometry = MapboxCoreMaps_Private.RenderedQueryGeometry typealias CoreFeaturesetFeatureId = MapboxCoreMaps_Private.FeaturesetFeatureId typealias CoreFeaturesetQueryTarget = MapboxCoreMaps_Private.FeaturesetQueryTarget -typealias CoreFeaturesetDescriptor = MapboxCoreMaps.FeaturesetDescriptor // TODO: This will be moved to _Private in Core +typealias CoreFeaturesetDescriptor = MapboxCoreMaps_Private.FeaturesetDescriptor diff --git a/Sources/MapboxMaps/Foundation/MapboxMap.swift b/Sources/MapboxMaps/Foundation/MapboxMap.swift index bae400affba6..7fb54cd98a95 100644 --- a/Sources/MapboxMaps/Foundation/MapboxMap.swift +++ b/Sources/MapboxMaps/Foundation/MapboxMap.swift @@ -1061,42 +1061,11 @@ extension MapboxMap: MapFeatureQueryable { concreteErrorType: MapError.self)) } - /// Queries the map for rendered features using featureset descriptors. - /// - /// This method allows to query both featureset from imported styles and user layers in the root style. - /// The results can be additionally filtered per-featureset. - /// - /// ```swift - /// let targets = [ - /// FeaturesetQueryTarget( - /// featureset: .layer("my-layer"), - /// filter: Exp(.eq) { - /// Exp(.get) { "type" } - /// "hotel" - /// } - /// ), - /// FeaturesetQueryTarget(featureset: .featureset("poi", importId: "basemap")) - /// ] - /// mapView.mapboxMap.queryRenderedFeatures(with: CGPoint(x: 0, y: 0), - /// targets: targets) { result in - /// // handle features in result - /// } - /// ``` - /// - /// - Important: This is a low-level method. If you need to handle basic gestures on map content, please prefer to use Interactions API (see ``MapboxMap/addInteraction(_:)``) or ``MapboxMap/queryRenderedFeatures(with:featureset:filter:completion:)``. - /// - /// - Parameters: - /// - geometry: A screen geometry to query. Can be a `CGPoint`, `CGRect`, or an array of `CGPoint`. - /// - targets: An array of targets to query with. - /// - completion: Callback called when the query completes. - @_spi(Experimental) - @_documentation(visibility: public) - @discardableResult - public func queryRenderedFeatures(with geometry: some RenderedQueryGeometryConvertible, - targets: [FeaturesetQueryTarget], - completion: @escaping (Result<[QueriedRenderedFeature], Error>) -> Void) -> Cancelable { + private func queryRenderedFeatures(with geometry: some RenderedQueryGeometryConvertible, + targets: [CoreFeaturesetQueryTarget], + completion: @escaping (Result<[QueriedRenderedFeature], Error>) -> Void) -> Cancelable { return __map.__queryRenderedFeatures(for: geometry.geometry.core, - targets: targets.map(\.core), + targets: targets, callback: coreAPIClosureAdapter(for: completion, type: NSArray.self, concreteErrorType: MapError.self)) @@ -1133,7 +1102,7 @@ extension MapboxMap: MapFeatureQueryable { queryRenderedFeatures( with: geometry, targets: [ - FeaturesetQueryTarget(featureset: featureset, filter: filter) + CoreFeaturesetQueryTarget(featureset: featureset.core, filter: filter?.asCore, id: nil) ]) { result in completion(result.map({ features in features.compactMap { @@ -1187,22 +1156,6 @@ extension MapboxMap: MapFeatureQueryable { concreteErrorType: MapError.self)) } - /// Queries the source features for a given featureset. - /// - /// - Parameters: - /// - target: A featureset query target. - /// - completion: Callback called when the query completes. - @_spi(Experimental) - @_documentation(visibility: public) - @discardableResult - public func querySourceFeatures(for target: FeaturesetQueryTarget, - completion: @escaping (Result<[QueriedSourceFeature], Error>) -> Void) -> Cancelable { - return __map.__querySourceFeatures(for: target.core, - callback: coreAPIClosureAdapter(for: completion, - type: NSArray.self, - concreteErrorType: MapError.self)) - } - /// Returns all the leaves (original points) of a cluster (given its cluster_id) from a GeoJSON source, with pagination support: limit is the number of leaves /// to return (set to Infinity for all points), and offset is the amount of points to skip (for pagination). /// diff --git a/Sources/MapboxMaps/Foundation/QueriedRenderedFeature+Extensions.swift b/Sources/MapboxMaps/Foundation/QueriedRenderedFeature+Extensions.swift deleted file mode 100644 index e73986ba0f01..000000000000 --- a/Sources/MapboxMaps/Foundation/QueriedRenderedFeature+Extensions.swift +++ /dev/null @@ -1,13 +0,0 @@ -@_implementationOnly import MapboxCoreMaps_Private - -extension QueriedRenderedFeature { - /// An array of feature query targets that correspond to this queried feature. - /// - ///- Note: Returned query targets will omit the original `filter` data. - @_spi(Experimental) - @_documentation(visibility: public) - public var queryTargets: [FeaturesetQueryTarget] { - // TODO: make refined for swift. - targets.map(FeaturesetQueryTarget.init(core:)) - } -} diff --git a/Sources/MapboxMaps/Info.plist b/Sources/MapboxMaps/Info.plist index f16b5d3a106d..3ff5bd95df5c 100644 --- a/Sources/MapboxMaps/Info.plist +++ b/Sources/MapboxMaps/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 11.8.0 CFBundleVersion - 137 + 138 diff --git a/Sources/MapboxMaps/Interactions/FeaturesetDescriptor.swift b/Sources/MapboxMaps/Interactions/FeaturesetDescriptor.swift index f0a4e4864b0f..0d2f79ac96e7 100644 --- a/Sources/MapboxMaps/Interactions/FeaturesetDescriptor.swift +++ b/Sources/MapboxMaps/Interactions/FeaturesetDescriptor.swift @@ -12,9 +12,28 @@ @_spi(Experimental) @_documentation(visibility: public) public struct FeaturesetDescriptor: Equatable { - private let featuresetId: String? - private let importId: String? - private let layerId: String? + /// An optional unique identifier for the featureset within the style. + /// This id is used to reference a specific featureset. + /// + /// * Note: If `featuresetId` is provided and valid, it takes precedence over `layerId`, + /// meaning `layerId` will not be considered even if it has a valid value. + @_documentation(visibility: public) + public let featuresetId: String? + + /// An optional import id that is required if the featureset is defined within an imported style. + /// If the featureset belongs to the current style, this field should be set to a null string. + /// + /// * Note: `importId` is only applicable when used in conjunction with `featuresetId` + /// and has no effect when used with `layerId`. + @_documentation(visibility: public) + public let importId: String? + + /// An optional unique identifier for the layer within the current style. + /// + /// * Note: If `featuresetId` is valid, `layerId` will be ignored even if it has a valid value. + /// Additionally, `importId` does not apply when using `layerId`. + @_documentation(visibility: public) + public let layerId: String? private init(featuresetId: String? = nil, importId: String? = nil, layerId: String? = nil) { self.featuresetId = featuresetId @@ -72,7 +91,7 @@ extension FeaturesetDescriptor { var core: CoreFeaturesetDescriptor { CoreFeaturesetDescriptor( - __featuresetId: featuresetId, + featuresetId: featuresetId, importId: importId, layerId: layerId ) diff --git a/Sources/MapboxMaps/Interactions/FeaturesetQueryTarget.swift b/Sources/MapboxMaps/Interactions/FeaturesetQueryTarget.swift deleted file mode 100644 index ce85eaf8dd9d..000000000000 --- a/Sources/MapboxMaps/Interactions/FeaturesetQueryTarget.swift +++ /dev/null @@ -1,37 +0,0 @@ -/// Defines the parameters for querying features from a Featureset with an optional filter and id. -@_spi(Experimental) -@_documentation(visibility: public) -public struct FeaturesetQueryTarget: Equatable { - /// A `FeaturesetDescriptor` that specifies the featureset to be included in the query. - @_documentation(visibility: public) - public var featureset: FeaturesetDescriptor - - /// An optional filter expression used to refine the query results based on conditions related to the specified featureset. - @_documentation(visibility: public) - public var filter: Exp? - - /// An optional unique identifier associated with the target. - @_documentation(visibility: public) - public let id: UInt64? - - /// Creates a target. - public init(featureset: FeaturesetDescriptor, filter: Exp? = nil, id: UInt64? = nil) { - self.featureset = featureset.converted() - self.filter = filter - self.id = id - } -} - -extension FeaturesetQueryTarget { - init(core: CoreFeaturesetQueryTarget) { - /// Core never returns the filter. - self.init( - featureset: FeaturesetDescriptor(core: core.featureset), - filter: nil, - id: core.id?.uint64Value) - } - - var core: CoreFeaturesetQueryTarget { - CoreFeaturesetQueryTarget(featureset: featureset.core, filter: filter?.asCore, id: id?.NSNumber) - } -} diff --git a/Sources/MapboxMaps/MapboxMaps.json b/Sources/MapboxMaps/MapboxMaps.json index 9bd2ce506bfa..c608aa2a2288 100644 --- a/Sources/MapboxMaps/MapboxMaps.json +++ b/Sources/MapboxMaps/MapboxMaps.json @@ -1,3 +1,3 @@ { - "version" : "11.8.0-rc.1" + "version" : "11.8.0" } diff --git a/Tests/MapboxMapsTests/Foundation/FeaturesetsTests.swift b/Tests/MapboxMapsTests/Foundation/FeaturesetsTests.swift index 4d08716fa0bd..e1cc454b6b7e 100644 --- a/Tests/MapboxMapsTests/Foundation/FeaturesetsTests.swift +++ b/Tests/MapboxMapsTests/Foundation/FeaturesetsTests.swift @@ -232,49 +232,4 @@ final class FeaturesetsTests: IntegrationTestCase { let featureset = try XCTUnwrap(mapView.mapboxMap.featuresets.first) XCTAssertEqual(FeaturesetDescriptor.standardPoi(importId: "nested"), featureset.converted()) } - - func testLowLevelQRF() { - let coord = CLLocationCoordinate2D(latitude: 0.01, longitude: 0.01) - let point = map.point(for: coord) - - let expectation = expectation(description: "Low-level QRF") - - let featuresetFilter = Exp(.eq) { - Exp(.get) { "type" } - "B" - } - let layerFilter = Exp(.eq) { - Exp(.get) { "filter" } - true - } - mapView.mapboxMap.queryRenderedFeatures( - with: point, - targets: [ - FeaturesetQueryTarget(featureset: .featureset("poi", importId: "nested"), filter: featuresetFilter, id: 1), - FeaturesetQueryTarget(featureset: .layer("circle-2"), filter: layerFilter, id: 2) - ]) { result in - switch result { - case .success(let features): - XCTAssertEqual(features.count, 2) - XCTAssertEqual(features[safe: 0]?.queryTargets.count, 1) - XCTAssertEqual(features[safe: 0]?.queryTargets.last?.id, 2) // from circle target - XCTAssertEqual(features[safe: 0]?.queryTargets.last?.featureset, .layer("circle-2")) - XCTAssertEqual(features[safe: 0]?.queryTargets.last?.filter, nil) - XCTAssertEqual(features[safe: 0]?.queriedFeature.feature.identifier, .number(2)) - XCTAssertEqual(features[safe: 0]?.queriedFeature.feature.properties?["name"]??.string, "qux") - - XCTAssertEqual(features[safe: 0]?.queryTargets.count, 1) - XCTAssertEqual(features[safe: 1]?.queryTargets.last?.id, 1) // from featureset - XCTAssertEqual(features[safe: 1]?.queryTargets.last?.featureset, .featureset("poi", importId: "nested")) - XCTAssertEqual(features[safe: 1]?.queryTargets.last?.filter, nil) - XCTAssertEqual(features[safe: 1]?.queriedFeature.feature.identifier, .number(12)) - XCTAssertEqual(features[safe: 1]?.queriedFeature.feature.properties?["class"]??.string, "poi") - XCTAssertEqual(features[safe: 1]?.queriedFeature.feature.properties?["name"]??.string, "nest2") - case .failure: - XCTFail("Shouldn't fail") - } - expectation.fulfill() - } - wait(for: [expectation], timeout: 1) - } } diff --git a/Tests/MapboxMapsTests/Foundation/Mocks/MockStyleManager.swift b/Tests/MapboxMapsTests/Foundation/Mocks/MockStyleManager.swift index 0a24112d4cb4..00c1e558b07f 100644 --- a/Tests/MapboxMapsTests/Foundation/Mocks/MockStyleManager.swift +++ b/Tests/MapboxMapsTests/Foundation/Mocks/MockStyleManager.swift @@ -3,8 +3,8 @@ import Foundation @_implementationOnly import MapboxCommon_Private class MockStyleManager: StyleManagerProtocol { - let getFeaturesetsStub = Stub(defaultReturnValue: []) - func getStyleFeaturesets() -> [FeaturesetDescriptor] { + let getFeaturesetsStub = Stub(defaultReturnValue: []) + func getStyleFeaturesets() -> [CoreFeaturesetDescriptor] { getFeaturesetsStub.call() } diff --git a/Tests/MapboxMapsTests/Integration Tests/Style/StyleDSLIntegrationTests.swift b/Tests/MapboxMapsTests/Integration Tests/Style/StyleDSLIntegrationTests.swift index 07b3ac98a904..1caf863b4f7f 100644 --- a/Tests/MapboxMapsTests/Integration Tests/Style/StyleDSLIntegrationTests.swift +++ b/Tests/MapboxMapsTests/Integration Tests/Style/StyleDSLIntegrationTests.swift @@ -767,7 +767,7 @@ internal class StyleDSLIntegrationTests: MapViewIntegrationTestCase { let expectedSpaceColorExpression = Exp(.interpolate) { Exp(.exponential) { - 1.2 + 1.2000000476837158 } Exp(.zoom) 5 @@ -788,7 +788,7 @@ internal class StyleDSLIntegrationTests: MapViewIntegrationTestCase { let expectedHorizonBlendExpression = Exp(.interpolate) { Exp(.exponential) { - 1.2 + 1.2000000476837158 } Exp(.zoom) 5 @@ -799,7 +799,7 @@ internal class StyleDSLIntegrationTests: MapViewIntegrationTestCase { let expectedStarIntensityExpression = Exp(.interpolate) { Exp(.exponential) { - 1.2 + 1.2000000476837158 } Exp(.zoom) 5 diff --git a/scripts/api-compatibility-check/breakage_allowlist.txt b/scripts/api-compatibility-check/breakage_allowlist.txt index bf1c7e30a053..38e690cbd477 100644 --- a/scripts/api-compatibility-check/breakage_allowlist.txt +++ b/scripts/api-compatibility-check/breakage_allowlist.txt @@ -1927,3 +1927,9 @@ Extension FeaturesetDescriptor is no longer open for subclassing // Docs for styleGlyphURL Var MapboxMap.styleGlyphURL is now with @_documentation + +// Remove experimental FeaturesetQueryTarget +Func MapboxMap.queryRenderedFeatures(with:targets:completion:) has been removed +Func MapboxMap.querySourceFeatures(for:completion:) has been removed +Struct FeaturesetQueryTarget has been removed +Var QueriedRenderedFeature.queryTargets has been removed diff --git a/scripts/release/packager/versions.json b/scripts/release/packager/versions.json index 0318835ffa02..d66434ccba90 100644 --- a/scripts/release/packager/versions.json +++ b/scripts/release/packager/versions.json @@ -1,5 +1,5 @@ { - "MapboxCoreMaps": "11.8.0-rc.1", - "MapboxCommon": "24.8.0-rc.1", + "MapboxCoreMaps": "11.8.0", + "MapboxCommon": "24.8.0", "Turf": "3.0.0" }