Fixed issue where component was not being stored and looked up by sam…

…e cache key.

MapboxNavigation/InstructionPresenter.swift

@@ -222,12 +222,13 @@ class InstructionPresenter {
         let attachment = ExitAttachment()
         guard let cacheKey = component.cacheKey else { return nil }
 
-        if let image = imageRepository.cachedImageForKey(cacheKey) {
+        let key = [cacheKey, additionalKey].joined(separator: "-")
+        if let image = imageRepository.cachedImageForKey(key) {
             attachment.image = image
         } else {
             let view = ExitView(pointSize: dataSource.font.pointSize, side: side, text: text)
             guard let image = takeSnapshot(on: view) else { return nil }
-            imageRepository.storeImage(image, forKey: [cacheKey, additionalKey].joined(separator: "-"), toDisk: false)
+            imageRepository.storeImage(image, forKey: key, toDisk: false)
             attachment.image = image
         }
 

MapboxNavigationTests/InstructionsBannerViewIntegrationTests.swift

@@ -270,6 +270,9 @@ class InstructionsBannerViewIntegrationTests: XCTestCase {
         let presenter = InstructionPresenter(exitInstruction, dataSource: label, downloadCompletion: nil)
         let attributed = presenter.attributedText()
 
+        let key = cacheKeyForExitLabel(dataSource: label, cacheKey: exitCodeAttribute.cacheKey!)!
+        XCTAssertNotNil(imageRepository.cachedImageForKey(key), "Expected cached image")
+
         let spaceRange = NSMakeRange(1, 1)
         let space = attributed.attributedSubstring(from: spaceRange)
         //Do we have spacing between the attachment and the road name?
@@ -282,6 +285,13 @@ class InstructionsBannerViewIntegrationTests: XCTestCase {
         let roadName = attributed.attributedSubstring(from: roadNameRange)
         XCTAssert(roadName.string == "Main Street", "Banner not populating road name correctly")
     }
+
+    private func cacheKeyForExitLabel(side: ExitSide = .right, dataSource: InstructionPresenter.DataSource, cacheKey: String) -> String? {
+        let proxy = ExitView.appearance()
+        let criticalProperties: [AnyHashable?] = [side, dataSource.font.pointSize, proxy.backgroundColor, proxy.foregroundColor, proxy.borderWidth, proxy.cornerRadius]
+        let additionalKey = String(describing: criticalProperties.reduce(0, { $0 ^ ($1?.hashValue ?? 0)}))
+        return [cacheKey, additionalKey].joined(separator: "-")
+    }
 
     private func simulateDownloadingShieldForComponent(_ component: VisualInstructionComponent) {
         let operation: ImageDownloadOperationSpy = ImageDownloadOperationSpy.operationForURL(component.imageURL!)!