Improve performance of Wayname calculation #2635
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
…repeated recalculation of sliced current step line shape.
1ec5
reviewed
Sep 16, 2020
| @@ -706,7 +714,6 @@ extension RouteMapViewController: NavigationViewDelegate { | |||
| guard line.pointCount > 0 else { continue } | |||
| let featureCoordinates = Array(UnsafeBufferPointer(start: line.coordinates, count: Int(line.pointCount))) | |||
| let featurePolyline = LineString(featureCoordinates) | |||
| let slicedLine = stepShape.sliced(from: closestCoordinate)! | |||
There was a problem hiding this comment.
Thanks, moving the slicing out of the loop should have a measurable impact on areas where there are lots of overlapping lines.
…the predicate filter for walking or cycling profiles.
1ec5
approved these changes
Sep 21, 2020
| @@ -684,6 +684,15 @@ extension RouteMapViewController: NavigationViewDelegate { | |||
| streetLabelLayer.lineOpacity = NSExpression(forConstantValue: 1) | |||
| streetLabelLayer.lineWidth = NSExpression(forConstantValue: 20) | |||
| streetLabelLayer.lineColor = NSExpression(forConstantValue: UIColor.white) | |||
|
|
|||
| if ![DirectionsProfileIdentifier.walking, DirectionsProfileIdentifier.cycling].contains( router.routeProgress.routeOptions.profileIdentifier) { | |||
There was a problem hiding this comment.
Btw, I think it’s possible to shorten this line based on the type of profileIdentifier:
Suggested change
| if ![DirectionsProfileIdentifier.walking, DirectionsProfileIdentifier.cycling].contains( router.routeProgress.routeOptions.profileIdentifier) { | |
| if ![.walking, .cycling].contains(router.routeProgress.routeOptions.profileIdentifier) { |
Comment on lines
690
to
693
| let roadPredicates = ["motorway", "motorway_link", "trunk", "trunk_link", "primary", "primary_link", "secondary", "secondary_link", "tertiary", "tertiary_link", "street", "street_limited", "roundabout", "mini_roundabout"].compactMap { roadClass -> NSPredicate? in | ||
| return NSPredicate(format: "%K == %@", "class", roadClass) | ||
| } | ||
| let compoundPredicate = NSCompoundPredicate(orPredicateWithSubpredicates: roadPredicates) |
There was a problem hiding this comment.
Something along these lines should work and would probably perform slightly better:
Suggested change
| let roadPredicates = ["motorway", "motorway_link", "trunk", "trunk_link", "primary", "primary_link", "secondary", "secondary_link", "tertiary", "tertiary_link", "street", "street_limited", "roundabout", "mini_roundabout"].compactMap { roadClass -> NSPredicate? in | |
| return NSPredicate(format: "%K == %@", "class", roadClass) | |
| } | |
| let compoundPredicate = NSCompoundPredicate(orPredicateWithSubpredicates: roadPredicates) | |
| let roadPredicates = ["motorway", "motorway_link", "trunk", "trunk_link", "primary", "primary_link", "secondary", "secondary_link", "tertiary", "tertiary_link", "street", "street_limited", "roundabout", "mini_roundabout"] | |
| let compoundPredicate = NSPredicate(format: "class IN %@", roadPredicates) |
There was a problem hiding this comment.
I'll adopt these changes. Worth getting the best performance.
|
|
||
| if ![DirectionsProfileIdentifier.walking, DirectionsProfileIdentifier.cycling].contains( router.routeProgress.routeOptions.profileIdentifier) { | ||
| // filter out to road classes valid for motor transport | ||
| let roadPredicates = ["motorway", "motorway_link", "trunk", "trunk_link", "primary", "primary_link", "secondary", "secondary_link", "tertiary", "tertiary_link", "street", "street_limited", "roundabout", "mini_roundabout"].compactMap { roadClass -> NSPredicate? in |
There was a problem hiding this comment.
I’m not sure about mini_roundabout being necessary, since it’s tagged as a node in OpenStreetMap and would thus be a point feature in the Streets source. We’re only querying for polyline features.
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.
Add a predicate filter for the road label MGLLineStyleLayer. Prevent the repeated recalculation of sliced current step line shape.
Fixes #2259.