Merge pull request #2562 from mapbox/ps/maps-ios-integration

Import Maps iOS

GitOrigin-RevId: 518efcb3c18b608073da226a3d1d1a4938ac2447

Author: persidskiy

CHANGELOG.md

@@ -4,20 +4,6 @@ Mapbox welcomes participation and contributions from everyone.
 
 ## main
 
-## 11.11.0 - 26 March, 2025
-
-* Update CoreMaps to 11.11.0 and Common to 24.11.0
-* `top-image`, `bearing-image`, and `shadow-image` properties on `LocationIndicatorLayer` are now paint properties instead of layout properties.
-
-## 11.11.0-rc.1 – 12 March, 2025
-
-* Expose experimental API for setting ColorTheme on style imports.
-* Expose use-theme properties for all annotation types and Puck3D layer. 
-* Update CoreMaps to 11.11.0-rc.2.
-* Update Common to 24.11.0-rc.2.
-
-## 11.11.0-beta.1 – 03 March, 2025
-
 * Reduce MapboxMaps binary size by removing debug symbols. Complete dSYM files are still available in the XCFramework.
 * Support panning and pinch gestures on trackpads.
 

Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  maps_version = '11.11.0'
+  maps_version = '11.10.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.11.0'
-  m.dependency 'MapboxCommon', '24.11.0'
+  m.dependency 'MapboxCoreMaps', '11.10.2'
+  m.dependency 'MapboxCommon', '24.10.0'
   m.dependency 'Turf', '4.0.0'
 
 end

LICENSE.md

@@ -4,9 +4,9 @@
 import PackageDescription
 import Foundation
 
-let coreMaps = MapsDependency.coreMaps(version: "11.11.0")
+let coreMaps = MapsDependency.coreMaps(version: "11.10.2")
 
-let common = MapsDependency.common(version: "24.11.0")
+let common = MapsDependency.common(version: "24.10.0")
 
 let mapboxMapsPath: String? = nil
 

MapboxMaps.podspec

@@ -126,6 +126,16 @@ final class HeatmapLayerGlobeExample: UIViewController, ExampleProtocol {
 
     func createCircleLayer() {
 
+        var circleLayerSource = GeoJSONSource(id: self.earthquakeSourceId)
+        circleLayerSource.data = .url(self.earthquakeURL)
+        circleLayerSource.generateId = true
+
+        do {
+            try mapView.mapboxMap.addSource(circleLayerSource)
+        } catch {
+            print("Ran into an error adding a source: \(error)")
+        }
+
         // Add circle layer
         var circleLayer = CircleLayer(id: self.circleLayerId, source: self.earthquakeSourceId)
 
@@ -134,27 +144,30 @@ final class HeatmapLayerGlobeExample: UIViewController, ExampleProtocol {
             Exp(.interpolate) {
                 Exp(.linear)
                 Exp(.zoom)
-                7
+                Exp(.literal) {
+                    7
+                }
                 Exp(.interpolate) {
                     Exp(.linear)
-                    Exp(.get) { "mag" }
+                    Exp(.get) {"mag"}
                     1
                     1
                     6
                     4
                 }
-                16
+                Exp(.literal) {
+                    16
+                }
                 Exp(.interpolate) {
                     Exp(.linear)
-                    Exp(.get) { "mag" }
+                    Exp(.get) {"mag"}
                     1
                     5
                     6
                     50
                 }
             }
         )
-
         circleLayer.circleRadiusTransition = StyleTransition(duration: 0.5, delay: 0)
         circleLayer.circleStrokeColor = .constant(StyleColor(.black))
         circleLayer.circleStrokeWidth = .constant(1)
@@ -166,7 +179,7 @@ final class HeatmapLayerGlobeExample: UIViewController, ExampleProtocol {
                 Exp(.get) { "mag" }
                 1
                 "rgba(33.0, 102.0, 172.0, 0.0)"
-                2
+                1
                 "rgb(102.0, 169.0, 207.0)"
                 3
                 "rgb(209.0, 229.0, 240.0)"

Package.resolved

@@ -17,7 +17,6 @@ struct StandardStyleImportExample: View {
                 /// This enables the greater encapsulation and allows to reload the basemap without reloading of the fragment.
                 let importId = "real-estate-fragment"
                 StyleImport(id: importId, uri: StyleURI(url: styleURL)!)
-                    .colorTheme(ColorTheme(uiimage: monochromeTheme))
 
                 /// The contents of the imported style are private, meaning all the implementation details such as layers and sources are not accessible at runtime.
                 /// However the style defines a "hotels-price" featureset that represents a portion of features available for interaction.
@@ -152,7 +151,6 @@ private extension FeaturesetFeature {
 }
 
 private let styleURL = Bundle.main.url(forResource: "fragment-realestate-NY", withExtension: "json")!
-private let monochromeTheme = UIImage(named: "monochrome_lut")!
 
 struct StandardStyleImportExample_Previews: PreviewProvider {
     static var previews: some View {

Package.swift

@@ -91,8 +91,8 @@ public final class AnnotationOrchestrator {
     ///  - id: Optional string identifier for this manager.
     ///  - layerPosition: Optionally set the `LayerPosition` of the layer managed.
     ///  - clusterOptions: Optionally set the `ClusterOptions` to cluster the Point Annotations
-    ///  - onClusterTap: Closure that will be executed after the tap gesture will be processed on the map.
-    ///  - onClusterLongPress: Closure that will be executed after the long press gesture processsed.
+    ///  - onClusterTap: Closure that will be executed after the long press gesture processsed.
+    ///  - onClusterLongPress: Closure that will be executed after the tap gesture will be processed on the map
     /// - Returns: An instance of `PointAnnotationManager`
     public func makePointAnnotationManager(
         id: String = String(UUID().uuidString.prefix(5)),