Skip to content

Commit

Permalink
Prepare 11.6.0 rc.1 on release (#2248)
Browse files Browse the repository at this point in the history
Co-authored-by: Johann Muszynski <[email protected]>
Co-authored-by: Ivan Persidsky <[email protected]>
Co-authored-by: Roman Laitarenko <[email protected]>
Co-authored-by: Thibaud Lopez Schneider <[email protected]>
Co-authored-by: Patrick Leonard <[email protected]>
  • Loading branch information
6 people authored Aug 1, 2024
1 parent 86476e9 commit 31b2336
Show file tree
Hide file tree
Showing 71 changed files with 469 additions and 829 deletions.
8 changes: 4 additions & 4 deletions Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/mapbox-common-ios.git",
"state" : {
"revision" : "03c1b2ee8d57d1fa95af7c472c9707cb897b2376",
"version" : "24.6.0-beta.1"
"revision" : "514a8feecf75c360f5bea1a38ad1879a6a41f342",
"version" : "24.6.0-rc.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"
"revision" : "2712f17735372f2d860918386cf802cf0b7f240e",
"version" : "11.6.0-rc.1"
}
},
{
Expand Down
51 changes: 10 additions & 41 deletions Apps/Examples/Examples.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
6B040F65241ABF600D70D14D /* Custom3DPuckExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C957F9CA07061B793C2DD4A /* Custom3DPuckExample.swift */; platformFilters = (ios, ); };
7036A19FCD2CCE85BDDF4E00 /* TrackingModeExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F5E598A16FA446F583344CB /* TrackingModeExample.swift */; platformFilters = (ios, ); };
7365170E39A459EB4DFA198B /* ExamplesUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE18E37A8652B4807D2459F1 /* ExamplesUITests.swift */; platformFilters = (ios, ); };
759D42AA5FE93B6FA9DFADF5 /* LocationOverrideExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45B39AE24486FED5ED30392D /* LocationOverrideExample.swift */; };
7686448F8648BECC75A912B6 /* DashboardCarPlaySceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 913B4773A82AD6357D6AAEA1 /* DashboardCarPlaySceneDelegate.swift */; platformFilters = (ios, ); };
79843B780E7C5DC68433B745 /* SnapshotMapExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC5A8729C9AEA4711B56B5F0 /* SnapshotMapExample.swift */; };
79B889CF23A3C0A5EA7F6ADD /* ApplicationCarPlaySceneDelegage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F3F37CAE7A0B66BE429525C /* ApplicationCarPlaySceneDelegage.swift */; platformFilters = (ios, ); };
Expand Down Expand Up @@ -204,6 +205,7 @@
3FC5980DD30479F30127BA71 /* NavigationSimulator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationSimulator.swift; sourceTree = "<group>"; };
450C8D5E4B84428FE51BCA97 /* route.geojson */ = {isa = PBXFileReference; path = route.geojson; sourceTree = "<group>"; };
455C0B9F01316D0FF38ED62B /* CLLocationCoordinate2D+Random.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CLLocationCoordinate2D+Random.swift"; sourceTree = "<group>"; };
45B39AE24486FED5ED30392D /* LocationOverrideExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationOverrideExample.swift; sourceTree = "<group>"; };
46CE3D9C2873C0767DD76D85 /* ClusteringExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClusteringExample.swift; sourceTree = "<group>"; };
4D5DB9BD5E97D3C0080EC5D3 /* CustomPointAnnotationExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomPointAnnotationExample.swift; sourceTree = "<group>"; };
4DCBE814694CF08A9C2E4A42 /* AddOneMarkerSymbolExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddOneMarkerSymbolExample.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -382,6 +384,7 @@
C61CC711054A032EE0446036 /* DynamicStylingExample.swift */,
A6B06A1D70F479D8DC5C375A /* FeaturesQueryExample.swift */,
62DA0608D44DEF6C4A82777C /* LocateMeExample.swift */,
45B39AE24486FED5ED30392D /* LocationOverrideExample.swift */,
6CD7ADCCB774239AA0090C46 /* RasterParticleExample.swift */,
AC5A8729C9AEA4711B56B5F0 /* SnapshotMapExample.swift */,
640198169EEDFC7CBEFCFCCF /* StandardStyleImportExample.swift */,
Expand Down Expand Up @@ -700,7 +703,6 @@
packageReferences = (
B50D5CC28BF0DFBA55456D89 /* XCRemoteSwiftPackageReference "Fingertips" */,
);
productRefGroup = 3FDBCEEB7C4C53F0545FC427 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
Expand Down Expand Up @@ -860,6 +862,7 @@
1B97702805C5EC4703A6CAA9 /* LineAnnotationExample.swift in Sources */,
48040990713D3220E7055434 /* LiveDataExample.swift in Sources */,
E121F023995CCF2F3A65BC2A /* LocateMeExample.swift in Sources */,
759D42AA5FE93B6FA9DFADF5 /* LocationOverrideExample.swift in Sources */,
AE51E276DCD8CF89AB339224 /* LongTapAnimationExample.swift in Sources */,
03EEF25ABD58ADD9631AB509 /* MapEventsExample.swift in Sources */,
3FD83483E0AE57790504CB0C /* MapRecorderExample.swift in Sources */,
Expand Down Expand Up @@ -954,12 +957,7 @@
APPLICATION_EXTENSION_API_ONLY = NO;
BUNDLE_LOADER = "$(TEST_HOST)";
GENERATE_INFOPLIST_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
"$(PROJECT_DIR)/../lib",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/../lib";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxTests;
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
Expand Down Expand Up @@ -1067,18 +1065,9 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = NO;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "Apple Development: Created via API";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = GJZR2MEM28;
GENERATE_INFOPLIST_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
"$(PROJECT_DIR)/../lib",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/../lib";
PRODUCT_BUNDLE_IDENTIFIER = mapbox.ExamplesUITests;
PROVISIONING_PROFILE_SPECIFIER = "match Development mapbox.ExamplesUITests.xctrunner";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
SUPPORTS_MACCATALYST = NO;
Expand All @@ -1095,10 +1084,8 @@
APPLICATION_EXTENSION_API_ONLY = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development: Created via API";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = GJZR2MEM28;
INFOPLIST_FILE = Examples/Info.plist;
INFOPLIST_PREFIX_HEADER = "$(DERIVED_FILE_DIR)/InfoPlist.Prefix.h";
INFOPLIST_PREPROCESS = YES;
Expand All @@ -1109,7 +1096,6 @@
MAPBOXMAPS_PATH = ../../;
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.examples;
PROVISIONING_PROFILE_SPECIFIER = "match Development com.mapbox.examples";
SDKROOT = auto;
SKIP_INSTALL = NO;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
Expand Down Expand Up @@ -1212,10 +1198,8 @@
APPLICATION_EXTENSION_API_ONLY = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development: Created via API";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = GJZR2MEM28;
INFOPLIST_FILE = Examples/Info.plist;
INFOPLIST_PREFIX_HEADER = "$(DERIVED_FILE_DIR)/InfoPlist.Prefix.h";
INFOPLIST_PREPROCESS = YES;
Expand All @@ -1226,7 +1210,6 @@
MAPBOXMAPS_PATH = ../../;
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.examples;
PROVISIONING_PROFILE_SPECIFIER = "match Development com.mapbox.examples";
SDKROOT = auto;
SKIP_INSTALL = NO;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
Expand All @@ -1244,12 +1227,7 @@
APPLICATION_EXTENSION_API_ONLY = NO;
BUNDLE_LOADER = "$(TEST_HOST)";
GENERATE_INFOPLIST_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
"$(PROJECT_DIR)/../lib",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/../lib";
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxTests;
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
Expand All @@ -1266,18 +1244,9 @@
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = NO;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "Apple Development: Created via API";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = GJZR2MEM28;
GENERATE_INFOPLIST_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@loader_path/Frameworks",
"$(PROJECT_DIR)/../lib",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(PROJECT_DIR)/../lib";
PRODUCT_BUNDLE_IDENTIFIER = mapbox.ExamplesUITests;
PROVISIONING_PROFILE_SPECIFIER = "match Development mapbox.ExamplesUITests.xctrunner";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
SUPPORTS_MACCATALYST = NO;
Expand Down
2 changes: 1 addition & 1 deletion Apps/Examples/Examples/All Examples/CameraForExample.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import UIKit
@_spi(Experimental) import MapboxMaps
import MapboxMaps

@available(iOS 13.0, *)
final class CameraForExample: UIViewController, ExampleProtocol {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import UIKit
@_spi(Experimental) import MapboxMaps
import MapboxMaps

final class Lights3DExample: UIViewController, ExampleProtocol {
private var mapView: MapView!
Expand Down
2 changes: 1 addition & 1 deletion Apps/Examples/Examples/All Examples/LayerSlotExample.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import UIKit
@_spi(Experimental) import MapboxMaps
import MapboxMaps

final class LayerSlotExample: UIViewController, ExampleProtocol {
private var mapView: MapView!
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import UIKit
@_spi(Experimental) import MapboxMaps
import MapboxMaps

/// This example shows how to use a slot from the Standard style and use another custom slot added at runtime
/// to split the former into two parts.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import UIKit
@_spi(Experimental) import MapboxMaps
import MapboxMaps

final class SnapshotterExample: UIViewController, ExampleProtocol {
private var cancelables = Set<AnyCancelable>()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
import UIKit
@_spi(Experimental) import MapboxMaps
import MapboxMaps
import CoreLocation

final class SpinningGlobeExample: UIViewController, GestureManagerDelegate, ExampleProtocol {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import UIKit
@_spi(Experimental) import MapboxMaps
import MapboxMaps

final class StandardStyleExample: UIViewController, ExampleProtocol {
private var mapView: MapView!
Expand Down
2 changes: 1 addition & 1 deletion Apps/Examples/Examples/Models/Examples.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Foundation
@_spi(Experimental) import MapboxMaps
import MapboxMaps

// To add a new example, create a new `Example` struct
// and place it within the array for the category it belongs to below. Make sure
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import SwiftUI
import MapboxMaps

/// The example demonstrates how to override the default location provider using SwiftUI and Combine.
@available(iOS 14.0, *)
struct LocationOverrideExample: View {
private class LocationProvider {
@Published var location = Location(coordinate: .zero)
@Published var heading = Heading(direction: 0, accuracy: 0)
}

@State private var provider = LocationProvider()

var body: some View {
MapReader { proxy in
Map {
/// The location indicator puck position and heading is controlled by the location provider.
Puck2D(bearing: .heading)
}
.onMapTapGesture { context in
/// As a demonstration, override location with the last tap coordinate.
let direction = provider.location.coordinate.direction(to: context.coordinate)
provider.location = Location(coordinate: context.coordinate)
provider.heading = Heading(direction: direction, accuracy: 0)
}
.onAppear {
/// Override the location and Heading provider with Combine publishers.
proxy.location?.override(
locationProvider: provider.$location.map {[$0]}.eraseToSignal(),
headingProvider: provider.$heading.eraseToSignal())
}
}
.ignoresSafeArea()
.safeOverlay(alignment: .bottom) {
Text("Tap on map to move the puck")
.floating()
.padding(.bottom, 30)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@ import SwiftUI
@available(iOS 14.0, *)
struct RasterParticleExample: View {
@State var mapStyle = MapStyle.dark
@State var rasterParticleCount: Double = 1024
@State var rasterParticleFadeOpacityFactor = 0.98
@State var rasterParticleCount: Double = 2048
@State var rasterParticleFadeOpacityFactor = 0.8
@State var resetRateFactor = 0.4
@State var speedFactor = 0.4

var body: some View {
Map(initialViewport: .camera(zoom: 1)) {
/// That account will only be used for single examples like this so there won't be any value in it getting abused.
RasterArraySource(id: "wind-mrt-source")
.url("https://api.mapbox.com/v4/rasterarrayexamples.gfs-winds.json?access_token=pk.eyJ1IjoicmFzdGVyYXJyYXlleGFtcGxlcyIsImEiOiJjbHd1d3Yxamswa2xlMmxvbTZxNjhyOGF3In0.5n1Lkr1c4_GHEGX7wOSw-Q")
.url("mapbox://rasterarrayexamples.gfs-winds")

RasterParticleLayer(id: "layer_particles", source: "wind-mrt-source")
.sourceLayer("10winds")
Expand All @@ -32,7 +31,7 @@ struct RasterParticleExample: View {
}
.safeOverlay(alignment: .bottom) {
VStack(alignment: .center) {
SliderSettingView(title: "Particle Count", value: $rasterParticleCount, range: 1...1024, step: 1)
SliderSettingView(title: "Particle Count", value: $rasterParticleCount, range: 1...4096, step: 1)
SliderSettingView(title: "Opacity Factor", value: $rasterParticleFadeOpacityFactor, range: 0...1, step: 0.01)
SliderSettingView(title: "Reset Rate", value: $resetRateFactor, range: 0...1, step: 0.01)
SliderSettingView(title: "Speed Factor", value: $speedFactor, range: 0...1, step: 0.01)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,23 @@ import MapboxMaps
@available(iOS 14.0, *)
struct StandardStyleImportExample: View {
@State private var lightPreset: StandardLightPreset? = .night
@State private var theme: StandardTheme? = .default
@State private var showLabels = true
@State private var priceAlertMessage: String?
@State private var panelHeight: CGFloat = 0
@State private var showRealEstate = false
@State private var show3DObjects = true

var body: some View {
Map(initialViewport: .camera(center: .init(latitude: 40.72, longitude: -73.99), zoom: 11, pitch: 45)) {
StyleImport(style: .standard(
theme: theme,
lightPreset: lightPreset,
showPointOfInterestLabels: showLabels,
showTransitLabels: showLabels,
showPlaceLabels: showLabels,
showRoadLabels: showLabels)
showRoadLabels: showLabels,
show3dObjects: show3DObjects)
)

if showRealEstate {
Expand All @@ -35,6 +39,14 @@ struct StandardStyleImportExample: View {
@ViewBuilder
var settingsPanel: some View {
VStack(alignment: .leading) {
HStack {
Text("Theme")
Picker("Theme", selection: $theme) {
Text("Default").tag(Optional(StandardTheme.default))
Text("Faded").tag(Optional(StandardTheme.faded))
Text("Monochrome").tag(Optional(StandardTheme.monochrome))
}.pickerStyle(.segmented)
}
HStack {
Text("Light")
Picker("Light preset", selection: $lightPreset) {
Expand All @@ -47,6 +59,7 @@ struct StandardStyleImportExample: View {
}
Toggle("Labels", isOn: $showLabels)
Toggle("Show Real Estate", isOn: $showRealEstate)
Toggle("Show 3D Objects", isOn: $show3DObjects)
}
.padding(10)
.floating(RoundedRectangle(cornerRadius: 10))
Expand Down
Loading

0 comments on commit 31b2336

Please sign in to comment.