diff --git a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved index 3d5733efe5bc..538c239a6214 100644 --- a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -9,6 +9,24 @@ "version" : "0.6.0" } }, + { + "identity" : "mapbox-common-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-common-ios.git", + "state" : { + "revision" : "03c1b2ee8d57d1fa95af7c472c9707cb897b2376", + "version" : "24.6.0-beta.1" + } + }, + { + "identity" : "mapbox-core-maps-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", + "state" : { + "revision" : "86992e7b2604282fc10680e524a2a67a4586df05", + "version" : "11.6.0-beta.1" + } + }, { "identity" : "turf-swift", "kind" : "remoteSourceControl", diff --git a/CHANGELOG.md b/CHANGELOG.md index bb1bcde6d918..46f6721f30df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,21 @@ Mapbox welcomes participation and contributions from everyone. ## main +## 11.6.0-beta.1 - 19 July, 2024 + ⚠️⚠️⚠️ Known Issues ⚠️⚠️⚠️ -* `ClipLayer` property `clipLayerTypes` is not updated in runtime expected fix will land in 11.6.0-rc.1 +* `ClipLayer` property `clipLayerTypes` is not updated in runtime. The fix is expected to land in 11.6.0-rc.1. + +### Features ✨ and improvements 🏁 * SwiftUI API marked as stable -* Introduce new `ViewAnnotation.allowZElevate` and `MapViewAnnotation.allowZElevate` property that allows View annotation to be elevated when positioned on top of buildings. +* Expose experimental `ClipLayer` to remove 3D data (fill extrusions, landmarks, trees) and symbols. +* `CustomRasterSource` API updated, now `CustomRasterSourceOptions` accepts protocol `CustomRasterSourceClient`, enabling direct rendering into `CustomRasterSource` tiles. To achieve behavior similar to previous releases one may construct instance of `CustomRasterSourceClient` as shown below: +```swift +CustomRasterSourceOptions(tileStatusChangedFunction: { tileID, status in }) // Before +CustomRasterSourceOptions(clientCallback: CustomRasterSourceClient.fromCustomRasterSourceTileStatusChangedCallback { tileID, status in }) // Now +``` +* Introduce new `ViewAnnotation.allowZElevate` and `MapViewAnnotation.allowZElevate` properties. When set to true, the annotation will be positioned on the rooftops of buildings, including both fill extrusions and models. * Deprecate `MapView.presentsWithTransaction` and `Map.presentsWithTransaction` in favor of `MapView.presentationTransactionMode` and `Map.presentationTransactionMode`. The new default `PresentationTransactionMode.automatic` updates the `presentsWithTransaction` automatically when need to optimize performance. If you used the `MapView.presentsWithTransaction` with View Annotations, now you can safely remove this option: ```swift Map { @@ -23,13 +33,13 @@ In case you need to preserve the old default behavior use `presentationTransacti mapView.presentationTransactionMode = .async // UIKit Map().presentationTransactionMode(.async) // SwiftUI ``` -* `CustomRasterSource` API updated, now `CustomRasterSourceOptions` accepts protocol `CustomRasterSourceClient`. To achieve behaviour similar to previous releases one may construct instance of `CustomRasterSourceClient` as shown below: -```swift -CustomRasterSourceOptions(tileStatusChangedFunction: { tileID, status in }) // Before -CustomRasterSourceOptions(clientCallback: CustomRasterSourceClient.fromCustomRasterSourceTileStatusChangedCallback { tileID, status in }) // Now -``` + * MapboxMaps XCFramework structure now properly constructed for `maccatalyst` platform and code signing issues was eliminated. -* Introduce new `ClipLayer` that allow to hide 3D models or symbols in the defined area + +### Bug fixes 🐞 + +* Improved `line-pattern` precision +* Fixed `CustomRasterSource` rendering when camera shows anti-meridian or multiple world copies. ## 11.5.1 - 5 July, 2024 diff --git a/LICENSE.md b/LICENSE.md index 33eabc2cecd4..5119e0fdca92 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ ## License -Mapbox Maps for iOS version 11.5.1 +Mapbox Maps for iOS version 11.6.0-beta.1 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.5.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ +### MapboxCoreMaps,11.6.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ ``` Mapbox Core Maps version 10.0 @@ -597,6 +597,41 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- +### fmt,7.1.3,MIT,Victor Zverovich,https://fmt.dev/latest/index.html + +``` +Copyright (c) 2012 - present, Victor Zverovich + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +--- Optional exception to the license --- + +As an exception, if, as a result of your compiling your source code, portions +of this Software are embedded into a machine-executable object form of such +source code, you may redistribute such embedded portions in such object form +without including the above copyright and permission notices. + +``` + +--- + ### basis_universal,dev,Apache-2.0,Binomial LLC,https://github.com/BinomialLLC/basis_universal ``` diff --git a/MapboxMaps.podspec b/MapboxMaps.podspec index c866bd948111..2511c2ec163d 100644 --- a/MapboxMaps.podspec +++ b/MapboxMaps.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - maps_version = '11.5.1' + maps_version = '11.6.0-beta.1' 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.6.0-SNAPSHOT.0718T0640Z.528a42e' - m.dependency 'MapboxCommon', '24.6.0-SNAPSHOT.0711T1125Z.e5357ad' + m.dependency 'MapboxCoreMaps', '11.6.0-beta.1' + m.dependency 'MapboxCommon', '24.6.0-beta.1' m.dependency 'Turf', '2.8.0' end diff --git a/Package.resolved b/Package.resolved index dfb5107db257..50989884d690 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,23 @@ { "pins" : [ + { + "identity" : "mapbox-common-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-common-ios.git", + "state" : { + "revision" : "03c1b2ee8d57d1fa95af7c472c9707cb897b2376", + "version" : "24.6.0-beta.1" + } + }, + { + "identity" : "mapbox-core-maps-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", + "state" : { + "revision" : "86992e7b2604282fc10680e524a2a67a4586df05", + "version" : "11.6.0-beta.1" + } + }, { "identity" : "turf-swift", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index 5137090eb5fd..9041be139b66 100644 --- a/Package.swift +++ b/Package.swift @@ -4,8 +4,8 @@ import PackageDescription import Foundation -let coreMaps = MapsDependency.coreMaps(version: "11.6.0-SNAPSHOT.0718T0640Z.528a42e", checksum: "e69069ec2e32939e0ee201974acc5ab61564ae5a11215426ff55f4db13217679") -let common = MapsDependency.common(version: "24.6.0-SNAPSHOT.0711T1125Z.e5357ad", checksum: "ebbcfde89ee797a53296250c70a6b3336ce0c9c35a688d5b5287e720edbb3fff") +let coreMaps = MapsDependency.coreMaps(version: "11.6.0-beta.1") +let common = MapsDependency.common(version: "24.6.0-beta.1") let mapboxMapsPath: String? = nil diff --git a/Sources/MapboxMaps/Documentation.docc/API Catalogs/CoreMapsInternal.md b/Sources/MapboxMaps/Documentation.docc/API Catalogs/CoreMapsInternal.md index e7be3ab74e7b..bc2dfa56e23f 100644 --- a/Sources/MapboxMaps/Documentation.docc/API Catalogs/CoreMapsInternal.md +++ b/Sources/MapboxMaps/Documentation.docc/API Catalogs/CoreMapsInternal.md @@ -18,7 +18,6 @@ Maps rendering SDK also known as GL-Native. These are for internal use only. - ``MBMSourceDataLoadedTypeToString(_:)`` - ``MBMStyleDataLoadedTypeToString(_:)`` - ``MBMTileStoreUsageModeToString(_:)`` -- ``MBXTileStoreAmbientCacheTypeToString(_:)`` - ``CameraChangedCallback`` @@ -39,4 +38,3 @@ Maps rendering SDK also known as GL-Native. These are for internal use only. - ``TransitionOptions-class`` -- ``TileStoreAmbientCacheType`` diff --git a/Sources/MapboxMaps/Info.plist b/Sources/MapboxMaps/Info.plist index 0f87472516b3..234611eb5299 100644 --- a/Sources/MapboxMaps/Info.plist +++ b/Sources/MapboxMaps/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 11.5.1 + 11.6.0 CFBundleVersion - 129 + 130 diff --git a/Sources/MapboxMaps/MapboxMaps.json b/Sources/MapboxMaps/MapboxMaps.json index 276a38e8a0f9..f2856d8a1ef7 100644 --- a/Sources/MapboxMaps/MapboxMaps.json +++ b/Sources/MapboxMaps/MapboxMaps.json @@ -1,3 +1,3 @@ { - "version" : "11.5.1" + "version" : "11.6.0-beta.1" } diff --git a/scripts/release/packager/versions.json b/scripts/release/packager/versions.json index 1429a32c3927..1705b727df65 100644 --- a/scripts/release/packager/versions.json +++ b/scripts/release/packager/versions.json @@ -1,5 +1,5 @@ { - "MapboxCoreMaps": "11.6.0-SNAPSHOT.0718T0640Z.528a42e", - "MapboxCommon": "24.6.0-SNAPSHOT.0711T1125Z.e5357ad", + "MapboxCoreMaps": "11.6.0-beta.1", + "MapboxCommon": "24.6.0-beta.1", "Turf": "2.8.0" }