Expose refs in modifier function #33
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
approved these changes
Aug 17, 2017
| @@ -276,6 +276,7 @@ public class OSRMInstructionFormatter: Formatter { | |||
| if let tokenType = TokenType(description: token! as String) { | |||
| var replacement: String | |||
| switch tokenType { | |||
| case .code: replacement = step.codes?.first ?? "" | |||
There was a problem hiding this comment.
Note that instructions coming from the .json never contain {code}. We’re inventing TokenType.code for the purpose of those format strings above that combine the way name and ref together into the wayName string, handled on the line below.
OSRMTextInstructions/TokenType.swift
Outdated
| @@ -60,6 +63,8 @@ public enum TokenType: Int, CustomStringConvertible { | |||
| return "direction" | |||
| case .wayPoint: | |||
| return "nth" | |||
| case .code: | |||
| return "code" | |||
There was a problem hiding this comment.
If we ever introduce the concept of a code into the JavaScript version of this library, the JavaScript code (and all the affected translated strings) would likely say {ref}, not {code}.
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.
This exposes the first ref to the modifier callback function.
/cc @1ec5