refactor: remove maneuver key hashing

Author: illuminati1911

android/src/main/kotlin/com/google/maps/flutter/navigation/Convert.kt

@@ -890,17 +890,15 @@ object Convert {
     }
   }
 
-  fun convertManeuverToHash(maneuver: Int): String {
-    return MessageDigest.getInstance("SHA-256")
-      .digest("maneuver_$maneuver".toByteArray())
-      .joinToString("") { "%02x".format(it) }
+  fun convertManeuverToKey(maneuver: Int): String {
+    return "maneuver_$maneuver"
   }
 
   private fun convertNavInfoStepInfo(
     stepInfo: StepInfo,
     imageDescriptors: Map<String, ImageDescriptorDto?>,
   ): StepInfoDto {
-    val hash = convertManeuverToHash(stepInfo.maneuver)
+    val key = convertManeuverToKey(stepInfo.maneuver)
     return StepInfoDto(
       distanceFromPrevStepMeters = stepInfo.distanceFromPrevStepMeters?.toLong() ?: 0L,
       timeFromPrevStepSeconds = stepInfo.timeFromPrevStepSeconds?.toLong() ?: 0L,
@@ -924,7 +922,7 @@ object Convert {
           )
         },
       maneuver = convertManeuver(stepInfo.maneuver),
-      image = imageDescriptors[hash],
+      image = imageDescriptors[key],
     )
   }
 

android/src/main/kotlin/com/google/maps/flutter/navigation/GoogleMapsNavigationSessionManager.kt

@@ -729,7 +729,7 @@ constructor(
 
       fun getManeuverIconImageDescriptor(maneuver: Int): ImageDescriptorDto? {
         val registeredImage =
-          imageRegistry.findRegisteredImage(Convert.convertManeuverToHash(maneuver))
+          imageRegistry.findRegisteredImage(Convert.convertManeuverToKey(maneuver))
         if (registeredImage == null) return null
         return Convert.registeredImageToImageDescriptorDto(registeredImage)
       }
@@ -741,7 +741,7 @@ constructor(
           return imageDescriptor
         }
         return imageRegistry.registerManeuverIcon(
-          Convert.convertManeuverToHash(stepInfo.maneuver),
+          Convert.convertManeuverToKey(stepInfo.maneuver),
           bitmap,
           bitmap.width.toDouble() / bitmap.height.toDouble(),
           bitmap.width.toDouble(),
@@ -755,11 +755,11 @@ constructor(
         val imageDescriptors: MutableMap<String, ImageDescriptorDto?> = mutableMapOf()
 
         (navInfo.remainingSteps + navInfo.currentStep).forEach {
-          val hash = Convert.convertManeuverToHash(it.maneuver)
-          val existingImageDescriptor = imageDescriptors[hash]
+          val key = Convert.convertManeuverToKey(it.maneuver)
+          val existingImageDescriptor = imageDescriptors[key]
           if (existingImageDescriptor == null) {
             val imageDescriptor = getImageDescriptorForStepInfo(it)
-            imageDescriptors[hash] = imageDescriptor
+            imageDescriptors[key] = imageDescriptor
           }
         }
 

ios/google_navigation_flutter/Sources/google_navigation_flutter/Convert.swift

@@ -185,7 +185,7 @@ enum Convert {
   }
 
   static func convertStepInfo(_ stepInfo: GMSNavigationStepInfo,_ imageDescriptors: [String: ImageDescriptorDto?]) -> StepInfoDto {
-    let hash = convertManeuverToHash(stepInfo.maneuver)
+    let key = convertManeuverToKey(stepInfo.maneuver)
     return .init(
       distanceFromPrevStepMeters: stepInfo.distanceFromPrevStepMeters > 0
         ? Int64(stepInfo.distanceFromPrevStepMeters) : nil,
@@ -201,7 +201,7 @@ enum Convert {
       lanes: nil,
       maneuver: convertManeuver(maneuver: stepInfo.maneuver),
       stepNumber: stepInfo.stepNumber >= 0 ? Int64(stepInfo.stepNumber) : nil,
-      image: imageDescriptors[hash] ?? nil
+      image: imageDescriptors[key] ?? nil
     )
   }
 
@@ -554,10 +554,8 @@ enum Convert {
     )
   }
 
-  static func convertManeuverToHash(_ maneuver: GMSNavigationManeuver) -> String {
-    var hasher = Hasher()
-    hasher.combine("maneuver_\(maneuver.rawValue)")
-    return String(hasher.finalize())
+  static func convertManeuverToKey(_ maneuver: GMSNavigationManeuver) -> String {
+    return "maneuver_\(maneuver.rawValue)"
   }
 
   static func registeredImageToImageDescriptorDto(registeredImage: RegisteredImage?) -> ImageDescriptorDto {

ios/google_navigation_flutter/Sources/google_navigation_flutter/GoogleMapsNavigationSessionManager.swift

@@ -607,7 +607,7 @@ extension GoogleMapsNavigationSessionManager: GMSNavigatorListener {
   }
 
   func getManeuverIconImageDescriptor(maneuver: GMSNavigationManeuver) -> ImageDescriptorDto? {
-    guard let registeredImage = GoogleMapsNavigationPlugin.imageRegistry?.findRegisteredImage(imageId: Convert.convertManeuverToHash(maneuver)) else {
+    guard let registeredImage = GoogleMapsNavigationPlugin.imageRegistry?.findRegisteredImage(imageId: Convert.convertManeuverToKey(maneuver)) else {
       return nil
     }
     return Convert.registeredImageToImageDescriptorDto(registeredImage: registeredImage)
@@ -619,7 +619,7 @@ extension GoogleMapsNavigationSessionManager: GMSNavigatorListener {
       let width = Double(bitmap.size.width)
       let height = Double(bitmap.size.height)
       return try? GoogleMapsNavigationPlugin.imageRegistry?.registerManeuverIcon(
-        imageId: Convert.convertManeuverToHash(step.maneuver),
+        imageId: Convert.convertManeuverToKey(step.maneuver),
         image: bitmap,
         imagePixelRatio: height == 0 ? 0 : width / height,
         width: width,
@@ -641,11 +641,11 @@ extension GoogleMapsNavigationSessionManager: GMSNavigatorListener {
         .compactMap { $0 }
       steps
         .forEach { step in
-          let hash = Convert.convertManeuverToHash(step.maneuver)
-          let existingImageDescriptor = imageDescriptors[hash]
+          let key = Convert.convertManeuverToKey(step.maneuver)
+          let existingImageDescriptor = imageDescriptors[key]
           if (existingImageDescriptor == nil) {
             let imageDescriptor = getImageDescriptorForStepInfo(step)
-            imageDescriptors.updateValue(imageDescriptor, forKey: hash)
+            imageDescriptors.updateValue(imageDescriptor, forKey: key)
           }
         }
     }