MapboxMaps v10.0.0, MapboxDirections v2.0.0-rc.4, MapboxNavigationNative v69.0.0 #3413

1ec5 · 2021-09-29T10:53:14Z

Upgraded the MapboxMaps dependency to mapbox/mapbox-maps-ios@312a5f9 in anticipation of the final release of v10.0.0.

This upgrade introduces two @_spi(Restricted) imports to account for mapbox/mapbox-maps-ios#708. The map SDK’s default marker image has been vendored into the MapboxNavigation asset catalog, now that mapbox/mapbox-maps-ios#707 has removed the default annotation image option from the map SDK.

Upgrade to MapboxMaps v10.0.0
Upgrade to MapboxDirections v2.0.0-rc.4
Upgrade to MapboxNavigationNative v69.0.0
Remove redundant direct dependency on Turf

Depends on mapbox/mapbox-maps-ios#741 and mapbox/mapbox-directions-swift#608. Hold until the final release of v10.0.0 is published.

/cc @mapbox/navigation-ios

1ec5 · 2021-09-29T19:58:08Z

Sources/MapboxNavigation/NavigationMapView.swift

@@ -902,7 +903,7 @@ open class NavigationMapView: UIView {
              let triangleImage = Bundle.mapboxNavigation.image(named: "triangle")?.withRenderingMode(.alwaysTemplate) else { return }

        do {
-            try mapView.mapboxMap.style.addImage(triangleImage, id: NavigationMapView.ImageIdentifier.arrowImage)
+            try mapView.mapboxMap.style.addImage(triangleImage, id: NavigationMapView.ImageIdentifier.arrowImage, stretchX: [], stretchY: [])


mapbox/mapbox-maps-ios#720 proposes giving these parameters default arguments so they can be omitted again.

1ec5 · 2021-09-29T20:36:40Z

#3409 incorporates changes needed for mapbox/mapbox-maps-ios#715.

1ec5 · 2021-10-06T03:08:40Z

As of mapbox/mapbox-maps-ios#732 mapbox/mapbox-core-maps-ios#39, the map SDK now requires MapboxCommon v20.0.0, whereas the latest MapboxNavigationNative requires v19.x. That blocks us from upgrading to a newer commit on main that incorporates mapbox/mapbox-maps-ios#741, which needs to happen in tandem with incorporating mapbox/mapbox-directions-swift#608.

1ec5 · 2021-10-06T19:50:56Z

Sources/MapboxNavigation/CarPlayMapViewController.swift

-        navigationMapView.mapView.ornaments.options.logo._visibility = .hidden
-        navigationMapView.mapView.ornaments.options.attributionButton._visibility = .hidden
+        navigationMapView.mapView.ornaments.options.logo.visibility = .hidden
+        navigationMapView.mapView.ornaments.options.attributionButton.visibility = .hidden


We’re going through some lengths to keep hiding attribution on CarPlay, even though the visibility property is now Restricted SPI, not intended for customer use. Unfortunately, we don’t really have a choice, because the map SDK only provides an attribution control that requires interactivity. We can’t hard-code the attribution in the navigation SDK, because a given style could be using an arbitrary collection of tile sets with unpredictable data sources.

mapbox/mapbox-maps-ios#745 proposes an option to add an unobtrusive textual attribution label to the corner of the map. In the meantime, the user can still access attribution through the map view on the phone screen, which would be visible beforehand or simultaneously, assuming the application configures CarPlay navigation in the usual way.

MaximAlien · 2021-10-08T20:45:31Z

Sources/MapboxCoreNavigation/BillingHandler.swift

@@ -76,7 +76,7 @@ private final class ProductionBillingService: BillingService {
    }

    func getSKUTokenIfValid(for sessionType: BillingHandler.SessionType) -> String {
-        TokenGenerator.getSKUTokenIfValid(for: tripSku(for: sessionType))
+        MapboxCommon_Private.BillingService.getSessionSKUTokenIfValid(for: tripSku(for: sessionType))


/cc @S2Ler, TokenGenerator APIs were deprecated. Replaced with BillingService.

MaximAlien · 2021-10-09T00:11:50Z

Looks like MapboxCoreNavigationTests.testOrderOfExecution(), NavigationServiceTests.testMultiLegRoute() and NavigationServiceTests.testLocationCourseShouldNotChange() have similar root cause (navigator reports incorrect status, which contains unexpected statusIndex).

MaximAlien · 2021-10-09T00:32:59Z

Tests/MapboxNavigationTests/SKUTests.swift

@@ -37,7 +37,7 @@ class SKUTests: TestCase {

    func testSKUTokensMatch() {
        BillingHandler.shared.beginBillingSession(for: .freeDrive, uuid: .init())
-        let skuToken = TokenGenerator.getSKUToken(for: .nav2SesTrip)
+        let skuToken = MapboxCommon_Private.BillingService.getUserSKUToken(for: .nav2SesTrip)


@S2Ler, did you follow Common APIs rework related to billing? Right now BillingService.getUserSKUToken returns empty skuToken, it was not the case previously.

It works for me at least in https://github.com/mapbox/mapbox-navigation-ios/tree/feature/async-updates-maps-10 branch.

S2Ler · 2021-10-11T07:19:19Z

Looks like MapboxCoreNavigationTests.testOrderOfExecution(), NavigationServiceTests.testMultiLegRoute() and NavigationServiceTests.testLocationCourseShouldNotChange() have similar root cause (navigator reports incorrect status, which contains unexpected statusIndex).

I merged this branch into my branch with fixes: https://github.com/mapbox/mapbox-navigation-ios/tree/feature/async-updates-maps-10

I see that completeRoute still fails, but other tests seem to be fine.

1ec5 · 2021-10-11T16:36:21Z

Sources/MapboxNavigation/NavigationMapView.swift

+        static let defaultFramesPerSecond = 30
+        static let pluggedInFramesPerSecond = 60


Looks like mapbox/mapbox-maps-ios#735 conditionally introduced usage of CAFrameRateRange on iOS 15. Should we follow suit?

Factored out EventLocation to begin migrating some ad-hoc event dictionaries to Codable structs.

… Directions to `v2.0.0-rc.4`.

…ith new one `BillingService.getSessionSKUTokenIfValid(for:)`.

S2Ler · 2021-10-12T12:37:35Z

⚠️ I rebased on top of main and force pushed ⚠️ @1ec5 @MaximAlien

S2Ler · 2021-10-12T13:01:13Z

I will try to fix tests

The issue seem to be with fast location replays. So the fix is to give it a bit more room.

The token was incorrectly fetched.

1ec5 · 2021-10-13T23:53:13Z

Cartfile.resolved

-github "mapbox/mapbox-directions-swift" "v2.0.0-rc.2"
-github "mapbox/mapbox-events-ios" "v1.0.4"
-github "mapbox/turf-swift" "v2.0.0-rc.1"
+github "apple/swift-argument-parser" "1.0.1"


mapbox/mapbox-directions-swift#612 tracks removing this dependency from Carthage builds.

Shall we maybe move CLI tool to a subfolder? So that our users won't need this dependency.

1ec5 added build Issues related to builds and dependency management. blocked Blocked by dependency or unclarity. labels Sep 29, 2021

1ec5 added this to the v2.0.0 (GA) milestone Sep 29, 2021

1ec5 requested a review from MaximAlien September 29, 2021 10:53

1ec5 self-assigned this Sep 29, 2021

1ec5 mentioned this pull request Sep 29, 2021

Migrate Turf GeoJSON usage to GeoJSONObject and JSONValue #3409

Merged

1ec5 commented Sep 29, 2021

View reviewed changes

1ec5 force-pushed the 1ec5-maps-v10.0.0-rc.10 branch from 71a708d to 5c8a048 Compare September 29, 2021 20:32

1ec5 changed the title ~~MapboxMaps v10.0.0-rc.10~~ MapboxMaps v10.0.0 Oct 4, 2021

1ec5 force-pushed the 1ec5-maps-v10.0.0-rc.10 branch from 1412564 to 64d43c0 Compare October 5, 2021 02:24

1ec5 added the release blocker Needs to be resolved before the release. label Oct 6, 2021

1ec5 force-pushed the 1ec5-maps-v10.0.0-rc.10 branch from 64d43c0 to 41952c1 Compare October 6, 2021 02:56

1ec5 commented Oct 6, 2021

View reviewed changes

1ec5 force-pushed the 1ec5-maps-v10.0.0-rc.10 branch from 41952c1 to ca70b83 Compare October 7, 2021 16:38

MaximAlien force-pushed the 1ec5-maps-v10.0.0-rc.10 branch from d6be8c2 to f3702ed Compare October 8, 2021 18:11

MaximAlien marked this pull request as ready for review October 8, 2021 19:40

MaximAlien removed the blocked Blocked by dependency or unclarity. label Oct 8, 2021

MaximAlien reviewed Oct 8, 2021

View reviewed changes

MaximAlien reviewed Oct 9, 2021

View reviewed changes

MaximAlien force-pushed the 1ec5-maps-v10.0.0-rc.10 branch from b2b89e1 to eee18d8 Compare October 11, 2021 15:09

1ec5 commented Oct 11, 2021

View reviewed changes

1ec5 added 5 commits October 12, 2021 15:36

Temporarily upgraded to MapboxMaps main branch

a22f00d

Upgraded MapboxMaps

96a9c5d

Updated Turf GeoJSON integration

3722a0e

Factored out EventLocation to begin migrating some ad-hoc event dictionaries to Codable structs.

MapboxMaps v10.0.0

cb5ef58

MapboxDirections main

d2bd8be

1ec5 and others added 8 commits October 12, 2021 15:36

Removed redundant Turf dependency

a3e79bd

Update changelog.

1d5820e

Update Mapbox Common to v20.0.0, Navigation Native to v69.0.0 and…

6703ff5

… Directions to `v2.0.0-rc.4`.

Update podspec files to Mapbox Maps v10.0.0.

fcd9e2f

Fix compilation issues related to feature querying.

63a767f

Stop using removed PreferredFPS API.

67c645e

Replace deprecated TokenGenerator.getSKUTokenIfValid(for:) method w…

c516ee5

…ith new one `BillingService.getSessionSKUTokenIfValid(for:)`.

Fix deprecation issues in SKUTests.

3777076

S2Ler force-pushed the 1ec5-maps-v10.0.0-rc.10 branch from eee18d8 to 3777076 Compare October 12, 2021 12:36

S2Ler added 2 commits October 12, 2021 19:05

Fix sporadically failing tests

7bd6bb5

The issue seem to be with fast location replays. So the fix is to give it a bit more room.

Fix testSKUTokensMatch test

6f15613

The token was incorrectly fetched.

1ec5 commented Oct 14, 2021

View reviewed changes

MaximAlien approved these changes Oct 14, 2021

View reviewed changes

1ec5 changed the title ~~MapboxMaps v10.0.0~~ MapboxMaps v10.0.0, MapboxDirections v2.0.0-rc.4, MapboxNavigationNative v69.0.0 Oct 14, 2021

1ec5 merged commit 028d44a into main Oct 14, 2021

1ec5 deleted the 1ec5-maps-v10.0.0-rc.10 branch October 14, 2021 00:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MapboxMaps v10.0.0, MapboxDirections v2.0.0-rc.4, MapboxNavigationNative v69.0.0 #3413

MapboxMaps v10.0.0, MapboxDirections v2.0.0-rc.4, MapboxNavigationNative v69.0.0 #3413

1ec5 commented Sep 29, 2021 •

edited by MaximAlien

Loading

1ec5 Sep 29, 2021

1ec5 commented Sep 29, 2021

1ec5 commented Oct 6, 2021

1ec5 Oct 6, 2021 •

edited

Loading

MaximAlien Oct 8, 2021

MaximAlien commented Oct 9, 2021

MaximAlien Oct 9, 2021 •

edited

Loading

S2Ler Oct 11, 2021

S2Ler commented Oct 11, 2021

1ec5 Oct 11, 2021

S2Ler commented Oct 12, 2021

S2Ler commented Oct 12, 2021

1ec5 Oct 13, 2021

S2Ler Oct 14, 2021

		static let defaultFramesPerSecond = 30
		static let pluggedInFramesPerSecond = 60

MapboxMaps v10.0.0, MapboxDirections v2.0.0-rc.4, MapboxNavigationNative v69.0.0 #3413

MapboxMaps v10.0.0, MapboxDirections v2.0.0-rc.4, MapboxNavigationNative v69.0.0 #3413

Conversation

1ec5 commented Sep 29, 2021 • edited by MaximAlien Loading

1ec5 Sep 29, 2021

Choose a reason for hiding this comment

1ec5 commented Sep 29, 2021

1ec5 commented Oct 6, 2021

1ec5 Oct 6, 2021 • edited Loading

Choose a reason for hiding this comment

MaximAlien Oct 8, 2021

Choose a reason for hiding this comment

MaximAlien commented Oct 9, 2021

MaximAlien Oct 9, 2021 • edited Loading

Choose a reason for hiding this comment

S2Ler Oct 11, 2021

Choose a reason for hiding this comment

S2Ler commented Oct 11, 2021

1ec5 Oct 11, 2021

Choose a reason for hiding this comment

S2Ler commented Oct 12, 2021

S2Ler commented Oct 12, 2021

1ec5 Oct 13, 2021

Choose a reason for hiding this comment

S2Ler Oct 14, 2021

Choose a reason for hiding this comment

1ec5 commented Sep 29, 2021 •

edited by MaximAlien

Loading

1ec5 Oct 6, 2021 •

edited

Loading

MaximAlien Oct 9, 2021 •

edited

Loading