Clean up NavigationMapViewDelegate method names #1378
Merged
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
1ec5
added
op-ex
bsudekum
approved these changes
May 3, 2018
vincethecoder
approved these changes
May 4, 2018
1ec5
force-pushed
the
1ec5-delegate-objc-1375
branch
2 times, most recently
from
fc9da6c
to
7285f03
Compare
1ec5
commented
May 9, 2018
| @@ -78,58 +78,58 @@ public protocol NavigationViewControllerDelegate { | |||
|
|
|||
| If this method is unimplemented, the navigation map view draws the route line using an `MGLLineStyleLayer`. | |||
| */ | |||
| @objc optional func navigationMapView(_ mapView: NavigationMapView, routeStyleLayerWithIdentifier identifier: String, source: MGLSource) -> MGLStyleLayer? | |||
| @objc optional func navigationViewController(_ navigationViewController: NavigationViewController, routeStyleLayerWithIdentifier identifier: String, source: MGLSource) -> MGLStyleLayer? | |||
|
|
|||
| /** | |||
| Returns an `MGLStyleLayer` that determines the appearance of the route line’s casing. | |||
|
|
|||
| If this method is unimplemented, the navigation map view draws the route line’s casing using an `MGLLineStyleLayer` whose width is greater than that of the style layer returned by `navigationMapView(_:routeStyleLayerWithIdentifier:source:)`. | |||
There was a problem hiding this comment.
This comment is outdated.
| @@ -468,36 +468,36 @@ open class NavigationViewController: UIViewController { | |||
|
|
|||
| //MARK: - RouteMapViewControllerDelegate | |||
| extension NavigationViewController: RouteMapViewControllerDelegate { | |||
| public func navigationMapView(_ mapView: NavigationMapView, routeCasingStyleLayerWithIdentifier identifier: String, source: MGLSource) -> MGLStyleLayer? { | |||
| return delegate?.navigationMapView?(mapView, routeCasingStyleLayerWithIdentifier: identifier, source: source) | |||
| public func navigationViewController(_ navigationViewController: NavigationViewController, routeCasingStyleLayerWithIdentifier identifier: String, source: MGLSource) -> MGLStyleLayer? { | |||
There was a problem hiding this comment.
These are implementations of RouteMapViewControllerDelegate methods, which haven’t been renamed.
1ec5
commented
May 9, 2018
| - `NavigationMapViewDelegate.navigationMapView(_:viewForAnnotation:)` renamed to `NavigationMapViewDelegate.navigationMapView(_:viewFor:)`. | ||
| - `NavigationViewControllerDelegate.navigationViewControllerDidCancelNavigation(_:)` to `NavigationViewControllerDelegate.navigationViewControllerDidDismiss(_:byCanceling:)` | ||
| * Renamed several `NavigationMapViewDelegate` methods ([#1364](https://github.com/mapbox/mapbox-navigation-ios/pull/1364), [#1338](https://github.com/mapbox/mapbox-navigation-ios/pull/1338), [#1318](https://github.com/mapbox/mapbox-navigation-ios/pull/1318), [#1378](https://github.com/mapbox/mapbox-navigation-ios/pull/1378)): | ||
| * `NavigationViewControllerDelegate.navigationViewControllerDidCancelNavigation(_:)` to `NavigationViewControllerDelegate.navigationViewControllerDidDismiss(_:byCanceling:)` |
There was a problem hiding this comment.
This changelog should list more renamed methods of NavigationViewControllerDelegate.
Reverted some NavigationMapViewDelegate method names to conform to Objective-C naming conventions and be more consistent.
bsudekum
force-pushed
the
1ec5-delegate-objc-1375
branch
from
9375fed
to
dbb4c93
Compare
1ec5
added
the
backwards incompatible
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.
Reverted some NavigationMapViewDelegate method names to conform to Objective-C naming conventions and be more consistent.
Relative to master:
navigationMapView(_:shapeDescribing:)navigationMapView(_:shapeFor:)-navigationMapView:shapeDescribing:-navigationMapView:shapeForRoute:navigationMapView(_:simplifiedShapeDescribing:)navigationMapView(_:simplifiedShapeFor:)-navigationMapView:simplifiedShapeDescribing:-navigationMapView:simplifiedShapeForRoute:navigationMapView(_:shapeFor:legIndex:)navigationMapView(_:shapeFor:legIndex:)-navigationMapView:shapeFor:legIndex:-navigationMapView:shapeForWaypoints:legIndex:navigationMapView(_:imageFor:)navigationMapView(_:imageFor:)-navigationMapView:imageFor:-navigationMapView:imageForAnnotation:navigationMapView(_:viewFor:)navigationMapView(_:viewFor:)-navigationMapView:viewFor:-navigationMapView:viewForAnnotation:Relative to v0.17.0-beta.1, the only changes are:
navigationMapView(_:shapeDescribing:)navigationMapView(_:shapeFor:)-navigationMapView:shapeDescribingRoute:-navigationMapView:shapeForRoute:navigationMapView(_:simplifiedShapeDescribing:)navigationMapView(_:simplifiedShapeFor:)-navigationMapView:simplifiedShapeDescribingRoute:-navigationMapView:simplifiedShapeForRoute:navigationMapView(_:shapeFor:legIndex:)navigationMapView(_:shapeFor:legIndex:)-navigationMapView:shapeDescribingWaypoints:legIndex:-navigationMapView:shapeForWaypoints:legIndex:Fixes #1375.
/cc @vincethecoder @bsudekum