Adopt name-and-ref phrase

Author: 1ec5

OSRMTextInstructions/OSRMTextInstructions.swift

@@ -247,7 +247,18 @@ public class OSRMInstructionFormatter: Formatter {
             let isMotorway = roadClasses?.contains(.motorway) ?? false
 
             if let name = name, let ref = ref, name != ref, !isMotorway {
-                wayName = modifyValueByKey != nil ? "\(modifyValueByKey!(.wayName, name)) (\(modifyValueByKey!(.code, ref)))" : "\(name) (\(ref))"
+                let phrases = instructions["phrase"] as! [String: String]
+                let phrase = phrases["name and ref"]!
+                wayName = phrase.replacingTokens(using: { (tokenType) -> String in
+                    switch tokenType {
+                    case .wayName:
+                        return modifyValueByKey?(.wayName, name) ?? name
+                    case .code:
+                        return modifyValueByKey?(.code, ref) ?? ref
+                    default:
+                        fatalError("Unexpected token type \(tokenType) in name-and-ref phrase")
+                    }
+                })
             } else if let ref = ref, isMotorway, let decimalRange = ref.rangeOfCharacter(from: .decimalDigits), !decimalRange.isEmpty {
                 wayName = modifyValueByKey != nil ? "\(modifyValueByKey!(.code, ref))" : ref
             } else if name == nil, let ref = ref {

OSRMTextInstructions/TokenType.swift

@@ -22,7 +22,7 @@ public enum TokenType: Int, CustomStringConvertible {
     public init?(description: String) {
         let type: TokenType
         switch description {
-        case "way_name":
+        case "way_name", "name":
             type = .wayName
         case "destination":
             type = .destination

OSRMTextInstructionsTests/OSRMTextInstructionsTests.swift

@@ -24,8 +24,7 @@ class OSRMTextInstructionsTests: XCTestCase {
         let bundle = Bundle(for: OSRMTextInstructionsTests.self)
         let url = bundle.url(forResource: "v5", withExtension: nil, subdirectory: "osrm-text-instructions/test/fixtures/")!
 
-        let v5 = OSRMTextInstructionsStrings["v5"] as! [String: Any]
-        let phrases = v5["phrase"] as! [String: String]
+        let phrases = instructions.instructions["phrase"] as! [String: String]
 
         var directoryContents: [URL] = []
         XCTAssertNoThrow(directoryContents = try FileManager.default.contentsOfDirectory(at: url, includingPropertiesForKeys: nil, options: []))