Catch-up with main.
#2995
Merged
Catch-up with main.
#2995
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…te routes during preview.
…notations. Set symbol sort order based on index of routes in the array. More comments.
… for faster calculations.
…sider ones that are within the visible map bounds.
…are onscreen. Remove an unneeded extension to MGLMapView.
…from the Example app to MapboxNavigation target.
…le in main Nav SDK. Use these extensions in Route Annotation Anotations and CPTrip. Fix new source files that were omitted from the Example-CarPlay application target.
…sually appealing.
…n MapboxDirections.
…le project. Entails also moving a number of class extensions and image resources over as well.
…ute Duration Annotations via the Style mechanism. Add more documentation.
… proper location within the project.
…ame some methods according to style guidelines. Ensure new image resources go into the proper SPM locations.
Route Duration Annotations
* refactored StatusView.swift to allow the use of multiple status banners, added new show/hide methods that allow to show/hide individual statuses, tested new implementation in StatusViewTests.swift
…ast commit (#2917) * Minor tail work to add missing documentation for CarPlay changes in last commit. * Update CHANGELOG.md Co-authored-by: Minh Nguyễn <mxn@1ec5.org> Co-authored-by: Minh Nguyễn <mxn@1ec5.org>
* Update translations * Refine changelog * Update version to 1.4.0 * Adjust project paths in localization script * Fix localization files encoding
…. Remove unnecessary Cedar dependency. (#2978)
MaximAlien
added
build
MaximAlien
changed the base branch from
release-v2.0
to
maxim/update-dependencies
|
There is a chance that #2881 wasn't merged as expected and fix for #2766 might not fully work. @azarovalex, it'd be great if you could affirm this. |
MaximAlien
commented
May 12, 2021
|
For reference, this file resolves conflicts in the files listed in the commit message for 4128beece06d483f16a5e5dfca21b3fa9e3dc414. |
1ec5
approved these changes
May 12, 2021
| @@ -42,8 +42,6 @@ open class NavigationViewController: UIViewController, NavigationStatusPresenter | |||
| } | |||
| } | |||
|
|
|||
| var didChangeAuthorizationIsFirstCalled = true | |||
|
|
|||
There was a problem hiding this comment.
The delegate method locationManagerDidChangeAuthorization(_:) is called at startup and whenever the user changes location authorization permissions. didChangeAuthorizationIsFirstCalled was to deal with the first case. Without this property, the halo view and enable precise location banner would show up when they weren't supposed to.
There was a problem hiding this comment.
Thanks for flagging that. I've tried on several tests and do not see any issues, at the same time to bring back your implementation from main we'll have to possibly bring back MBNavigationAccuracyAuthorization and maybe other APIs. I'm inclined to merge this PR as is and create another ticket in scope of which we'll perform more through testing and add fixes if needed.
# Conflicts: # .circleci/config.yml # Bench/Info.plist # BenchTests/Info.plist # CHANGELOG.md # Cartfile # Cartfile.private # Cartfile.resolved # Example/Info.plist # Example/ViewController.swift # MapboxCoreNavigation.podspec # MapboxNavigation-Documentation.podspec # MapboxNavigation.podspec # MapboxNavigation.xcodeproj/project.pbxproj # README.md # Sources/MapboxCoreNavigation/Info.plist # Sources/MapboxNavigation/Array.swift # Sources/MapboxNavigation/CarPlayManager.swift # Sources/MapboxNavigation/CarPlayMapViewController.swift # Sources/MapboxNavigation/CarPlayNavigationViewController.swift # Sources/MapboxNavigation/DayStyle.swift # Sources/MapboxNavigation/Info.plist # Sources/MapboxNavigation/MapboxMapsStyle.swift # Sources/MapboxNavigation/NavigationMapView+VanishingRouteLine.swift # Sources/MapboxNavigation/NavigationMapView.swift # Sources/MapboxNavigation/NavigationViewController.swift # Sources/MapboxNavigation/Resources/Assets.xcassets/RouteAnnotations/RouteInfoAnnotationLeftHanded.imageset/Contents.json # Sources/MapboxNavigation/Resources/Assets.xcassets/RouteAnnotations/RouteInfoAnnotationRightHanded.imageset/Contents.json # Sources/MapboxNavigation/Route.swift # Sources/TestHelper/Info.plist # Tests/CocoaPodsTest/PodInstall/Podfile.lock # Tests/MapboxCoreNavigationTests/Info.plist # Tests/MapboxNavigationTests/Info.plist # custom-navigation.md
MaximAlien
force-pushed
the
maxim/catch-up-with-main
branch
from
5c4dadd
to
b55e719
Compare
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Catch-up
release-v2.0withmain.Fixes #2850.