Add waypoint handling #270
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,7 @@ open class NavigationMapView: MGLMapView { | |
| let arrowLayerStrokeIdentifier = "arrowStrokeLayer" | ||
| let arrowCasingSymbolLayerIdentifier = "arrowCasingSymbolLayer" | ||
| let arrowSymbolSourceIdentifier = "arrowSymbolSource" | ||
| let isCurrentLeg = "isCurrentLeg" | ||
|
There was a problem hiding this comment. #270 (comment) got collapsed for some reason: the name |
||
|
|
||
| let routeLineWidthAtZoomLevels: [Int: MGLStyleValue<NSNumber>] = [ | ||
| 10: MGLStyleValue(rawValue: 6), | ||
|
|
@@ -80,7 +80,7 @@ open class NavigationMapView: MGLMapView { | |
| /** | ||
| Adds or updates both the route line and the route line casing | ||
| */ | ||
| public func showRoute(_ route: Route, legIndex: Int? = nil) { | ||
| guard let style = style else { | ||
| return | ||
| } | ||
|
|
@@ -152,8 +152,8 @@ open class NavigationMapView: MGLMapView { | |
|
|
||
| let source = navigationMapDelegate?.navigationMapView?(self, shapeFor: routeProgress.remainingWaypoints) ?? shape(for: Array(routeProgress.remainingWaypoints.dropLast())) | ||
|
There was a problem hiding this comment. Let’s give this variable and |
||
|
|
||
| if let waypointSource = style.source(withIdentifier: waypointSourceIdentifier) as? MGLShapeSource { | ||
| waypointSource.shape = source | ||
| } else { | ||
| let sourceShape = MGLShapeSource(identifier: waypointSourceIdentifier, shape: source, options: nil) | ||
| style.addSource(sourceShape) | ||
|
|
@@ -204,9 +204,9 @@ open class NavigationMapView: MGLMapView { | |
| let polyline = MGLPolylineFeature(coordinates: congestionSegment.0, count: UInt(congestionSegment.0.count)) | ||
| polyline.attributes["congestion"] = String(describing: congestionSegment.1) | ||
| if let legIndex = legIndex { | ||
| polyline.attributes[isCurrentLeg] = index != legIndex | ||
| } else { | ||
| polyline.attributes[isCurrentLeg] = index != 0 | ||
| } | ||
| return polyline | ||
| } | ||
|
|
@@ -227,9 +227,9 @@ open class NavigationMapView: MGLMapView { | |
|
|
||
| let polyline = MGLPolylineFeature(coordinates: legCoordinates, count: UInt(legCoordinates.count)) | ||
| if let legIndex = legIndex { | ||
| polyline.attributes[isCurrentLeg] = index != legIndex | ||
| } else { | ||
| polyline.attributes[isCurrentLeg] = index != 0 | ||
| } | ||
| linesPerLeg.append(polyline) | ||
| } | ||
|
|
@@ -239,7 +239,7 @@ open class NavigationMapView: MGLMapView { | |
|
|
||
| func shape(for waypoints: [Waypoint]) -> MGLShape? { | ||
| var features = [MGLPointFeature]() | ||
| let letters = String.localizedStringWithFormat(NSLocalizedString("ALPHABET", bundle: .mapboxNavigation, value: "ABCDEFGHIJKLMNOPQRSTUVWXYZ", comment: "Format string for alphabet;")).components(separatedBy: "") | ||
|
There was a problem hiding this comment. Use an actual separator like a space, because some locales may have multi-character letters in the alphabet, like “IJ” in Dutch. There was a problem hiding this comment. Stray semicolon at the end of the comment. Make sure to point out that each letter should be separated by a space. |
||
|
|
||
| for (waypointIndex, waypoint) in waypoints.enumerated() { | ||
| let feature = MGLPointFeature() | ||
|
|
@@ -292,7 +292,7 @@ open class NavigationMapView: MGLMapView { | |
| line.lineOpacity = MGLStyleValue(interpolationMode: .categorical, sourceStops: [ | ||
| true: MGLStyleValue(rawValue: 0), | ||
| false: MGLStyleValue(rawValue: 1) | ||
| ], attributeName: isCurrentLeg, options: nil) | ||
|
|
||
| line.lineJoin = MGLStyleValue(rawValue: NSValue(mglLineJoin: .round)) | ||
|
|
||
|
|
@@ -320,9 +320,9 @@ open class NavigationMapView: MGLMapView { | |
| lineCasing.lineJoin = MGLStyleValue(rawValue: NSValue(mglLineJoin: .round)) | ||
|
|
||
| lineCasing.lineOpacity = MGLStyleValue(interpolationMode: .categorical, sourceStops: [ | ||
| true: MGLStyleValue(rawValue: 0.70), | ||
| false: MGLStyleValue(rawValue: 1) | ||
| ], attributeName: isCurrentLeg, options: nil) | ||
|
|
||
| return lineCasing | ||
| } | ||
|
|
||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The name
isCurrentLegimplies that it’s a Boolean. Since this string is being used as an attribute name, call itcurrentLegAttributebut give it the valueisCurrentLeg.