Limit interpret-as=address to numbers in road names (#552)

mapbox · Aug 29, 2017 · c61e31b · c61e31b
1 parent 0237c8e
commit c61e31b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/MapboxCoreNavigation/RouteStepFormatter.swift b/MapboxCoreNavigation/RouteStepFormatter.swift
@@ -23,15 +23,12 @@ public class RouteStepFormatter: Formatter {
 
         let modifyValueByKey = { (key: OSRMTextInstructions.TokenType, value: String) -> String in
             switch key {
-            case .code:
-                let refComponents = value.addingXMLEscapes.components(separatedBy: .whitespaces)
-                guard var firstRefComponent = refComponents.first else { return value.asSSMLAddress }
+            case .wayName, .destination, .rotaryName, .code:
+                let stringComponents = value.addingXMLEscapes.components(separatedBy: .whitespaces)
 
-                firstRefComponent = firstRefComponent.isUppercased ? firstRefComponent.asSSMLCharacters : firstRefComponent.asSSMLAddress
-
-                return "\(firstRefComponent) \(refComponents.suffix(from: 1).joined(separator: " ").asSSMLAddress)"
-            case .wayName, .destination, .rotaryName:
-                return value.asSSMLAddress
+                return stringComponents.map {
+                    $0.containsDecimalDigit ? $0.asSSMLAddress : $0
+                }.joined(separator: " ")
             default:
                 return value
             }

diff --git a/MapboxCoreNavigation/String.swift b/MapboxCoreNavigation/String.swift
@@ -52,4 +52,8 @@ extension String {
     var isUppercased: Bool {
         return self == uppercased() && self != lowercased()
     }
+
+    var containsDecimalDigit: Bool {
+        return self.rangeOfCharacter(from: CharacterSet.decimalDigits) != nil
+    }
 }