Added default attributes argument

Added an argument that takes a dictionary of default attributes, to match the method in Formatter.

Author: 1ec5

OSRMTextInstructions/OSRMTextInstructions.swift

@@ -250,14 +250,15 @@ public class OSRMInstructionFormatter: Formatter {
     /**
      Creates an instruction as an attributed string given a step and options.
 
-     - parameter step: The step to format.
+     - parameter obj: The step to format.
+     - parameter attrs: The default attributes to use for the returned attributed string.
      - parameter legIndex: Current leg index the user is currently on.
      - parameter numberOfLegs: Total number of `RouteLeg` for the given `Route`.
      - parameter roadClasses: Option set representing the classes of road for the `RouteStep`.
      - parameter modifyValueByKey: Allows for mutating the instruction at given parts of the instruction.
      - returns: An instruction as an `NSAttributedString`.
      */
-    public func attributedString(for obj: Any?, legIndex: Int?, numberOfLegs: Int?, roadClasses: RoadClasses? = RoadClasses([]), modifyValueByKey: ((TokenType, NSAttributedString) -> NSAttributedString)?) -> NSAttributedString? {
+    public func attributedString(for obj: Any?, withDefaultAttributes attrs: [String : Any]? = nil, legIndex: Int?, numberOfLegs: Int?, roadClasses: RoadClasses? = RoadClasses([]), modifyValueByKey: ((TokenType, NSAttributedString) -> NSAttributedString)?) -> NSAttributedString? {
         guard let step = obj as? RouteStep else {
             return nil
         }
@@ -286,7 +287,7 @@ public class OSRMInstructionFormatter: Formatter {
             let instructionsByModifier = instructions[type.description] as! [String: InstructionsByModifier]
             let defaultInstructions = instructionsByModifier["default"]!
 
-            wayName = NSAttributedString(string: step.exitNames?.first ?? "")
+            wayName = NSAttributedString(string: step.exitNames?.first ?? "", attributes: attrs)
             if let _rotaryName = step.names?.first, let _ = step.exitIndex, let obj = defaultInstructions["name_exit"] {
                 instructionObject = obj
                 rotaryName = _rotaryName
@@ -315,9 +316,9 @@ public class OSRMInstructionFormatter: Formatter {
             let isMotorway = roadClasses?.contains(.motorway) ?? false
 
             if let name = name, let ref = ref, name != ref, !isMotorway {
-                let attributedName = NSAttributedString(string: name)
-                let attributedRef = NSAttributedString(string: ref)
-                let phrase = NSAttributedString(string: self.phrase(named: .nameWithCode))
+                let attributedName = NSAttributedString(string: name, attributes: attrs)
+                let attributedRef = NSAttributedString(string: ref, attributes: attrs)
+                let phrase = NSAttributedString(string: self.phrase(named: .nameWithCode), attributes: attrs)
                 wayName = phrase.replacingTokens(using: { (tokenType) -> NSAttributedString in
                     switch tokenType {
                     case .wayName:
@@ -329,21 +330,21 @@ public class OSRMInstructionFormatter: Formatter {
                     }
                 })
             } else if let ref = ref, isMotorway, let decimalRange = ref.rangeOfCharacter(from: .decimalDigits), !decimalRange.isEmpty {
-                let attributedRef = NSAttributedString(string: ref)
+                let attributedRef = NSAttributedString(string: ref, attributes: attrs)
                 if let modifyValueByKey = modifyValueByKey {
                     wayName = modifyValueByKey(.code, attributedRef)
                 } else {
                     wayName = attributedRef
                 }
             } else if name == nil, let ref = ref {
-                let attributedRef = NSAttributedString(string: ref)
+                let attributedRef = NSAttributedString(string: ref, attributes: attrs)
                 if let modifyValueByKey = modifyValueByKey {
                     wayName = modifyValueByKey(.code, attributedRef)
                 } else {
                     wayName = attributedRef
                 }
             } else if let name = name {
-                let attributedName = NSAttributedString(string: name)
+                let attributedName = NSAttributedString(string: name, attributes: attrs)
                 if let modifyValueByKey = modifyValueByKey {
                     wayName = modifyValueByKey(.wayName, attributedName)
                 } else {
@@ -406,7 +407,7 @@ public class OSRMInstructionFormatter: Formatter {
         if step.finalHeading != nil { bearing = Int(step.finalHeading! as Double) }
 
         // Replace tokens
-        let result = NSAttributedString(string: instruction).replacingTokens { (tokenType) -> NSAttributedString in
+        let result = NSAttributedString(string: instruction, attributes: attrs).replacingTokens { (tokenType) -> NSAttributedString in
             var replacement: String
             switch tokenType {
             case .code: replacement = step.codes?.first ?? ""
@@ -425,7 +426,7 @@ public class OSRMInstructionFormatter: Formatter {
             if tokenType == .wayName {
                 return wayName // already modified above
             } else {
-                let attributedReplacement = NSAttributedString(string: replacement)
+                let attributedReplacement = NSAttributedString(string: replacement, attributes: attrs)
                 return modifyValueByKey?(tokenType, attributedReplacement) ?? attributedReplacement
             }
         }