expo-gaode-map-navigation 2.0.12-next.0 → 2.0.13

package/ios/ExpoGaodeMapNaviViewModule.swift

@@ -6,6 +6,7 @@
 //
 
 import ExpoModulesCore
+import UIKit
 
 public class ExpoGaodeMapNaviViewModule: Module {
   public func definition() -> ModuleDefinition {
@@ -27,7 +28,10 @@ public class ExpoGaodeMapNaviViewModule: Module {
         "onWayPointArrived",
         "onGpsStatusChanged",
         "onNavigationInfoUpdate",
-        "onGpsSignalWeak"
+        "onGpsSignalWeak",
+        "onNavigationVisualStateUpdate",
+        "onLaneInfoUpdate",
+        "onTrafficStatusesUpdate"
       )
       
       // 属性定义
@@ -42,6 +46,44 @@ public class ExpoGaodeMapNaviViewModule: Module {
       Prop("showCamera") { (view: ExpoGaodeMapNaviView, value: Bool) in
         view.showCamera = value
       }
+
+      Prop("carImage") { (view: ExpoGaodeMapNaviView, value: String?) in
+        view.carImageSource = value
+      }
+
+      Prop("carImageSize") { (view: ExpoGaodeMapNaviView, value: [String: Double]?) in
+        let width = CGFloat(value?["width"] ?? 0)
+        let height = CGFloat(value?["height"] ?? 0)
+        if width > 0, height > 0 {
+          view.carImageSize = CGSize(width: width, height: height)
+        } else {
+          view.carImageSize = nil
+        }
+      }
+
+      Prop("carCompassImage") { (view: ExpoGaodeMapNaviView, value: String?) in
+        view.carCompassImageSource = value
+      }
+
+      Prop("startPointImage") { (view: ExpoGaodeMapNaviView, value: String?) in
+        view.startPointImageSource = value
+      }
+
+      Prop("wayPointImage") { (view: ExpoGaodeMapNaviView, value: String?) in
+        view.wayPointImageSource = value
+      }
+
+      Prop("customWaypointMarkers") { (view: ExpoGaodeMapNaviView, value: [[String: Any]]?) in
+        view.customWaypointMarkerPayloads = value
+      }
+
+      Prop("endPointImage") { (view: ExpoGaodeMapNaviView, value: String?) in
+        view.endPointImageSource = value
+      }
+
+      Prop("cameraImage") { (view: ExpoGaodeMapNaviView, value: String?) in
+        view.cameraImageSource = value
+      }
       
       Prop("autoLockCar") { (view: ExpoGaodeMapNaviView, value: Bool) in
         view.autoLockCar = value
@@ -83,6 +125,18 @@ public class ExpoGaodeMapNaviViewModule: Module {
       Prop("showTrafficBar") { (view: ExpoGaodeMapNaviView, value: Bool) in
         view.showTrafficBar = value
       }
+
+      Prop("trafficBarFrame") { (view: ExpoGaodeMapNaviView, value: [String: Double]?) in
+        let x = CGFloat(value?["x"] ?? 0)
+        let y = CGFloat(value?["y"] ?? 0)
+        let width = CGFloat(value?["width"] ?? 0)
+        let height = CGFloat(value?["height"] ?? 0)
+        view.trafficBarFrame = CGRect(x: x, y: y, width: width, height: height)
+      }
+
+      Prop("trafficBarColors") { (view: ExpoGaodeMapNaviView, value: [String: Any]?) in
+        view.trafficBarColors = value
+      }
       
       Prop("showBrowseRouteButton") { (view: ExpoGaodeMapNaviView, value: Bool) in
         view.showBrowseRouteButton = value
@@ -95,6 +149,14 @@ public class ExpoGaodeMapNaviViewModule: Module {
       Prop("showTrafficButton") { (view: ExpoGaodeMapNaviView, value: Bool) in
         view.showTrafficButton = value
       }
+
+      Prop("showBackupRoute") { (view: ExpoGaodeMapNaviView, value: Bool) in
+        view.showBackupRoute = value
+      }
+
+      Prop("showEagleMap") { (view: ExpoGaodeMapNaviView, value: Bool) in
+        view.showEagleMap = value
+      }
       
       Prop("showUIElements") { (view: ExpoGaodeMapNaviView, value: Bool) in
         view.applyShowUIElements(value)
@@ -111,6 +173,34 @@ public class ExpoGaodeMapNaviViewModule: Module {
       Prop("showTrafficLights") { (view: ExpoGaodeMapNaviView, value: Bool) in
         view.showTrafficLights = value
       }
+
+      Prop("showCompassEnabled") { (view: ExpoGaodeMapNaviView, value: Bool) in
+        view.showCompassEnabled = value
+      }
+
+      Prop("showDriveCongestion") { (view: ExpoGaodeMapNaviView, value: Bool) in
+        view.showDriveCongestion = value
+      }
+
+      Prop("showTrafficLightView") { (view: ExpoGaodeMapNaviView, value: Bool) in
+        view.showTrafficLightView = value
+      }
+
+      Prop("hideNativeTopInfoLayout") { (view: ExpoGaodeMapNaviView, value: Bool) in
+        view.hideNativeTopInfoLayout = value
+      }
+
+      Prop("hideNativeLaneInfoLayout") { (view: ExpoGaodeMapNaviView, value: Bool) in
+        view.hideNativeLaneInfoLayout = value
+      }
+
+      // Android-only prop, keep a no-op mapping on iOS for cross-platform prop compatibility.
+      Prop("androidBackgroundNavigationNotificationEnabled") { (_: ExpoGaodeMapNaviView, _: Bool) in
+      }
+
+      Prop("iosLiveActivityEnabled") { (view: ExpoGaodeMapNaviView, value: Bool) in
+        view.iosLiveActivityEnabled = value
+      }
       
       Prop("mapViewModeType") { (view: ExpoGaodeMapNaviView, value: Int) in
         view.mapViewModeType = value
@@ -119,11 +209,29 @@ public class ExpoGaodeMapNaviViewModule: Module {
       Prop("lineWidth") { (view: ExpoGaodeMapNaviView, value: Double) in
         view.lineWidth = CGFloat(value)
       }
+
+      Prop("driveViewEdgePadding") { (view: ExpoGaodeMapNaviView, value: [String: Double]?) in
+        let top = CGFloat(value?["top"] ?? 0)
+        let left = CGFloat(value?["left"] ?? 0)
+        let bottom = CGFloat(value?["bottom"] ?? 0)
+        let right = CGFloat(value?["right"] ?? 0)
+        view.driveViewEdgePadding = UIEdgeInsets(top: top, left: left, bottom: bottom, right: right)
+      }
+
+      Prop("screenAnchor") { (view: ExpoGaodeMapNaviView, value: [String: Double]?) in
+        let x = CGFloat(value?["x"] ?? 0)
+        let y = CGFloat(value?["y"] ?? 0)
+        view.screenAnchor = CGPoint(x: x, y: y)
+      }
       
       // 方法定义
       AsyncFunction("startNavigation") { (view: ExpoGaodeMapNaviView, startLat: Double, startLng: Double, endLat: Double, endLng: Double, promise: Promise) in
         view.startNavigation(startLat: startLat, startLng: startLng, endLat: endLat, endLng: endLng, promise: promise)
       }
+
+      AsyncFunction("startNavigationWithIndependentPath") { (view: ExpoGaodeMapNaviView, token: Int, routeId: Int?, routeIndex: Int?, naviType: Int?, promise: Promise) in
+        view.startNavigationWithIndependentPath(token: token, routeId: routeId, routeIndex: routeIndex, naviType: naviType, promise: promise)
+      }
       
       AsyncFunction("stopNavigation") { (view: ExpoGaodeMapNaviView, promise: Promise) in
         view.stopNavigation(promise: promise)

package/ios/ExpoGaodeMapNavigation.podspec

@@ -24,9 +24,10 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'ExpoModulesCore'
-  s.dependency 'AMapNavi'
+  s.dependency 'AMapNavi','= 11.1.200'
   s.dependency 'AMapFoundation'
   s.dependency 'AMapLocation'
+  s.dependency 'AMapSearch'
   
   s.library = 'c++'
 

package/ios/ExpoGaodeMapNavigationModule.swift

@@ -21,7 +21,7 @@ public class ExpoGaodeMapNavigationModule: Module {
   private var walkRideCalculator: WalkRideRouteCalculator?
   
   // 独立路径规划管理
-  private let independentRouteManager = IndependentRouteManager()
+  private let independentRouteManager = IndependentRouteManager.shared
   private var independentRouteService: IndependentRouteService?
   
   // 官方导航组件（iOS）
@@ -309,8 +309,11 @@ public class ExpoGaodeMapNavigationModule: Module {
     AsyncFunction("calculateMotorcycleRoute") { (options: [String: Any], promise: Promise) in
       do {
         try self.ensureInitialized()
-        // 摩托车复用驾车算路
-        self.ensureDriveTruck().calculateDriveRoute(options: options, promise: promise)
+        var motorcycleOptions = options
+        if motorcycleOptions["carType"] == nil && motorcycleOptions["type"] == nil {
+          motorcycleOptions["carType"] = 11
+        }
+        self.ensureDriveTruck().calculateDriveRoute(options: motorcycleOptions, promise: promise)
       } catch {
         self.rejectInitializationError(promise, error: error)
       }
@@ -321,8 +324,7 @@ public class ExpoGaodeMapNavigationModule: Module {
     AsyncFunction("calculateEBikeRoute") { (options: [String: Any], promise: Promise) in
       do {
         try self.ensureInitialized()
-        // 电动车复用骑行算路
-        self.ensureWalkRide().calculateRideRoute(options: options, promise: promise)
+        self.ensureWalkRide().calculateResolvedEleBikeRoute(options: options, promise: promise)
       } catch {
         self.rejectInitializationError(promise, error: error)
       }

package/ios/managers/IndependentRouteManager.swift

@@ -10,8 +10,15 @@ import Foundation
 import AMapNaviKit
 
 class IndependentRouteManager {
+  static let shared = IndependentRouteManager()
+
+  private struct Entry {
+    let scene: String
+    let routeGroup: AMapNaviRouteGroup?
+    let routeIds: [Int]
+  }
   
-  private var routeGroups: [Int: AMapNaviRouteGroup] = [:]
+  private var routeGroups: [Int: Entry] = [:]
   private var nextToken: Int = 1
   private let lock = NSLock()
   
@@ -25,10 +32,18 @@ class IndependentRouteManager {
   }
   
   /// 存储路线组（使用指定 token）
-  func storeRouteGroup(token: Int, routeGroup: AMapNaviRouteGroup) {
+  func storeRouteGroup(token: Int, scene: String = "drive", routeGroup: AMapNaviRouteGroup) {
+    lock.lock()
+    defer { lock.unlock() }
+    let routeIds = routeGroup.naviRouteIDs?.map { $0.intValue } ?? []
+    routeGroups[token] = Entry(scene: scene, routeGroup: routeGroup, routeIds: routeIds)
+  }
+
+  /// 存储非驾车场景的独立路径元信息
+  func storeSceneRoutes(token: Int, scene: String, routeIds: [Int]) {
     lock.lock()
     defer { lock.unlock() }
-    routeGroups[token] = routeGroup
+    routeGroups[token] = Entry(scene: scene, routeGroup: nil, routeIds: routeIds)
   }
   
   /// 存储路线组（自动生成 token）
@@ -37,7 +52,8 @@ class IndependentRouteManager {
     defer { lock.unlock() }
     let token = nextToken
     nextToken += 1
-    routeGroups[token] = routeGroup
+    let routeIds = routeGroup.naviRouteIDs?.map { $0.intValue } ?? []
+    routeGroups[token] = Entry(scene: "drive", routeGroup: routeGroup, routeIds: routeIds)
     return token
   }
   
@@ -45,7 +61,14 @@ class IndependentRouteManager {
   func get(_ token: Int) -> AMapNaviRouteGroup? {
     lock.lock()
     defer { lock.unlock() }
-    return routeGroups[token]
+    return routeGroups[token]?.routeGroup
+  }
+
+  /// 获取路线场景
+  func scene(for token: Int) -> String? {
+    lock.lock()
+    defer { lock.unlock() }
+    return routeGroups[token]?.scene
   }
   
   /// 行前选路 - 选择指定路线
@@ -54,32 +77,45 @@ class IndependentRouteManager {
     lock.lock()
     defer { lock.unlock() }
     
-    guard let routeGroup = routeGroups[token] else { return false }
-    
-    // 优先使用 routeId
-    if let routeId = routeId {
-      routeGroup.selectNaviRoute(withRouteID: routeId)
-      return true
+    guard let entry = routeGroups[token] else { return false }
+
+    let resolvedRouteId: Int? = {
+      if let routeId {
+        return routeId
+      }
+      if let routeIndex, routeIndex >= 0, routeIndex < entry.routeIds.count {
+        return entry.routeIds[routeIndex]
+      }
+      return nil
+    }()
+
+    guard let resolvedRouteId else {
+      return false
     }
-    
-    // 使用 routeIndex
-    if let routeIndex = routeIndex, let routeIDs = routeGroup.naviRouteIDs, routeIndex < routeIDs.count {
-      let routeId = routeIDs[routeIndex].intValue
-      routeGroup.selectNaviRoute(withRouteID: routeId)
+
+    if let routeGroup = entry.routeGroup {
+      routeGroup.selectNaviRoute(withRouteID: resolvedRouteId)
       return true
     }
-    
-    return false
+
+    switch entry.scene {
+    case "walk":
+      return AMapNaviWalkManager.sharedInstance().selectNaviRoute(withRouteID: resolvedRouteId)
+    case "ride":
+      return AMapNaviRideManager.sharedInstance().selectNaviRoute(withRouteID: resolvedRouteId)
+    default:
+      return false
+    }
   }
   
   /// 启动导航
   /// 官方方法：startGPSNavi: / startEmulatorNavi:
   func start(token: Int, naviType: Int, routeId: Int?, routeIndex: Int?) -> Bool {
     lock.lock()
-    let routeGroup = routeGroups[token]
+    let entry = routeGroups[token]
     lock.unlock()
     
-    guard let routeGroup = routeGroup else { return false }
+    guard let entry = entry else { return false }
     
     // 先选择路线
     if routeId != nil || routeIndex != nil {
@@ -88,13 +124,41 @@ class IndependentRouteManager {
     
     // 启动导航
     // naviType: 0 = GPS导航, 1 = 模拟导航
-    if naviType == 1 {
-      AMapNaviDriveManager.sharedInstance().startEmulatorNavi(routeGroup)
-    } else {
-      AMapNaviDriveManager.sharedInstance().startGPSNavi(routeGroup)
+    switch entry.scene {
+    case "walk":
+      if let routeGroup = entry.routeGroup {
+        if naviType == 1 {
+          return AMapNaviWalkManager.sharedInstance().startEmulatorNavi(routeGroup)
+        } else {
+          return AMapNaviWalkManager.sharedInstance().startGPSNavi(routeGroup)
+        }
+      }
+      if naviType == 1 {
+        return AMapNaviWalkManager.sharedInstance().startEmulatorNavi()
+      } else {
+        return AMapNaviWalkManager.sharedInstance().startGPSNavi()
+      }
+    case "ride":
+      if let routeGroup = entry.routeGroup {
+        if naviType == 1 {
+          return AMapNaviRideManager.sharedInstance().startEmulatorNavi(routeGroup)
+        } else {
+          return AMapNaviRideManager.sharedInstance().startGPSNavi(routeGroup)
+        }
+      }
+      if naviType == 1 {
+        return AMapNaviRideManager.sharedInstance().startEmulatorNavi()
+      } else {
+        return AMapNaviRideManager.sharedInstance().startGPSNavi()
+      }
+    default:
+      guard let routeGroup = entry.routeGroup else { return false }
+      if naviType == 1 {
+        return AMapNaviDriveManager.sharedInstance().startEmulatorNavi(routeGroup)
+      } else {
+        return AMapNaviDriveManager.sharedInstance().startGPSNavi(routeGroup)
+      }
     }
-    
-    return true
   }
   
   /// 清除指定路线组

package/ios/map/ExpoGaodeMapModule.swift

@@ -48,12 +48,19 @@ public class ExpoGaodeMapModule: Module {
             _ = self.trySetupApiKeyFromPlist()
         }
         
-        Function("setPrivacyShow") { (hasShow: Bool, hasContainsPrivacy: Bool) in
-            GaodeMapPrivacyManager.setPrivacyShow(hasShow, hasContainsPrivacy: hasContainsPrivacy)
-        }
+        Function("setPrivacyConfig") { (config: [String: Any]) in
+            let hasShow = config["hasShow"] as? Bool ?? false
+            let hasContainsPrivacy = config["hasContainsPrivacy"] as? Bool ?? hasShow
+            let hasAgree = config["hasAgree"] as? Bool ?? false
+            let privacyVersion = config["privacyVersion"] as? String
 
-        Function("setPrivacyAgree") { (hasAgree: Bool) in
-            GaodeMapPrivacyManager.setPrivacyAgree(hasAgree)
+            GaodeMapPrivacyManager.setPrivacyConfig(
+                hasShow: hasShow,
+                hasContainsPrivacy: hasContainsPrivacy,
+                hasAgree: hasAgree,
+                privacyVersion: privacyVersion,
+                updatesPrivacyVersion: config.keys.contains("privacyVersion")
+            )
         }
 
         Function("setPrivacyVersion") { (version: String) in
@@ -76,7 +83,7 @@ public class ExpoGaodeMapModule: Module {
          */
         Function("initSDK") { (config: [String: String]) in
             guard GaodeMapPrivacyManager.isReady else {
-                throw Exception(name: "PRIVACY_NOT_AGREED", description: "隐私协议未完成确认，请先调用 setPrivacyShow/setPrivacyAgree")
+                throw Exception(name: "PRIVACY_NOT_AGREED", description: "隐私协议未完成确认，请先调用 setPrivacyConfig")
             }
             GaodeMapPrivacyManager.applyPrivacyState()
 
@@ -179,7 +186,7 @@ public class ExpoGaodeMapModule: Module {
             
             if status == .authorizedAlways || status == .authorizedWhenInUse {
                 let manager = self.getLocationManager()
-                manager.locationManager?.requestLocation(withReGeocode: manager.locationManager?.locatingWithReGeocode ?? true, completionBlock: { location, regeocode, error in
+                manager.requestSingleLocation { location, regeocode, error in
                     if let error = error {
                         promise.reject("LOCATION_ERROR", error.localizedDescription)
                         return
@@ -213,7 +220,7 @@ public class ExpoGaodeMapModule: Module {
                     }
                     
                     promise.resolve(locationData)
-                })
+                }
             } else {
                 promise.reject("LOCATION_ERROR", "location unauthorized")
             }
@@ -272,6 +279,31 @@ public class ExpoGaodeMapModule: Module {
             }
             return ClusterNative.calculateDistance(lat1: coord1.latitude, lon1: coord1.longitude, lat2: coord2.latitude, lon2: coord2.longitude)
         }
+
+        /**
+         * 根据多个坐标点计算可同时可见的推荐缩放级别
+         */
+        Function("calculateFitZoom") {
+            (points: [Any]?, viewportWidthPx: Double?, viewportHeightPx: Double?, paddingPx: Double?, minZoom: Int?, maxZoom: Int?) -> Double in
+            let coords = LatLngParser.parseLatLngList(points)
+            let safeMinZoom = minZoom ?? 3
+            let safeMaxZoom = maxZoom ?? 20
+            if coords.isEmpty {
+                return Double(safeMinZoom)
+            }
+
+            let lats = coords.map { NSNumber(value: $0.latitude) }
+            let lons = coords.map { NSNumber(value: $0.longitude) }
+            return ClusterNative.calculateFitZoom(
+                latitudes: lats,
+                longitudes: lons,
+                viewportWidthPx: viewportWidthPx ?? 390.0,
+                viewportHeightPx: viewportHeightPx ?? 844.0,
+                paddingPx: paddingPx ?? 48.0,
+                minZoom: Int32(safeMinZoom),
+                maxZoom: Int32(safeMaxZoom)
+            )
+        }
         
         /**
          * 计算多边形面积
@@ -703,8 +735,13 @@ public class ExpoGaodeMapModule: Module {
             if self.permissionManager == nil {
                 self.permissionManager = PermissionManager()
             }
-            
-            self.permissionManager?.requestPermission { granted, status in
+
+            guard let permissionManager = self.permissionManager else {
+                promise.reject("PERMISSION_MANAGER_INIT_FAILED", "权限管理器初始化失败")
+                return
+            }
+
+            permissionManager.requestPermission { _, _ in
                 // 无论结果如何,都延迟后再次检查最终状态
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                     let finalStatus = self.currentAuthorizationStatus()
@@ -731,17 +768,31 @@ public class ExpoGaodeMapModule: Module {
                 promise.reject("FOREGROUND_PERMISSION_REQUIRED", "必须先授予前台位置权限才能请求后台位置权限")
                 return
             }
-            
-            // iOS 上后台权限通过 Info.plist 配置 + 系统设置
-            // 这里返回当前状态
-            let hasBackground = status == .authorizedAlways
-            
-            promise.resolve([
-                "granted": hasBackground,
-                "backgroundLocation": hasBackground,
-                "status": self.getAuthorizationStatusString(status),
-                "message": hasBackground ? "已授予后台权限" : "需要在系统设置中手动授予'始终'权限"
-            ])
+
+            if self.permissionManager == nil {
+                self.permissionManager = PermissionManager()
+            }
+
+            guard let permissionManager = self.permissionManager else {
+                promise.reject("PERMISSION_MANAGER_INIT_FAILED", "权限管理器初始化失败")
+                return
+            }
+
+            permissionManager.requestAlwaysPermission { _, _ in
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                    let finalStatus = self.currentAuthorizationStatus()
+                    let hasBackground = finalStatus == .authorizedAlways
+
+                    promise.resolve([
+                        "granted": hasBackground,
+                        "backgroundLocation": hasBackground,
+                        "status": self.getAuthorizationStatusString(finalStatus),
+                        "message": hasBackground
+                            ? "已授予后台权限"
+                            : "后台权限未授予，请在系统设置中将定位权限改为“始终允许”"
+                    ])
+                }
+            }
         }
         
   

package/ios/map/ExpoGaodeMapOfflineModule.swift

@@ -2,6 +2,8 @@ import ExpoModulesCore
 import AMapFoundationKit
 import AMapNaviKit
 import Foundation
+import AMapNaviKit
+import UIKit
 
 /**
  * 高德地图离线地图模块 (iOS)
@@ -66,6 +68,12 @@ public class ExpoGaodeMapOfflineModule: Module {
       self.downloadingCities.removeAll()
       self.pausedCities.removeAll()
     }
+
+    AsyncFunction("openOfflineMapUI") { (promise: Promise) in
+      DispatchQueue.main.async {
+        self.openOfflineMapUI(promise: promise)
+      }
+    }
     
     // ==================== 1. 地图列表管理 ====================
     
@@ -383,6 +391,59 @@ public class ExpoGaodeMapOfflineModule: Module {
 
     return offlineMapManager
   }
+
+  private func openOfflineMapUI(promise: Promise) {
+    guard getOfflineMapManager() != nil else {
+      promise.reject("ERR_SETUP", "Setup failed")
+      return
+    }
+
+    guard let detailViewController = MAOfflineMapViewController.sharedInstance() else {
+      promise.reject("ERR_OFFLINE_MAP_UI", "Offline map UI is unavailable")
+      return
+    }
+
+    guard let presenter = currentPresenterViewController() else {
+      promise.reject("ERR_NO_VIEW_CONTROLLER", "No active view controller")
+      return
+    }
+
+    if let navigationController = presenter as? UINavigationController {
+      navigationController.pushViewController(detailViewController, animated: true)
+    } else if let navigationController = presenter.navigationController {
+      navigationController.pushViewController(detailViewController, animated: true)
+    } else {
+      let navigationController = UINavigationController(rootViewController: detailViewController)
+      presenter.present(navigationController, animated: true)
+    }
+    promise.resolve(nil)
+  }
+
+  private func currentPresenterViewController() -> UIViewController? {
+    guard let scene = UIApplication.shared.connectedScenes
+      .compactMap({ $0 as? UIWindowScene })
+      .first(where: { $0.activationState == .foregroundActive }) else {
+      return topViewController(from: UIApplication.shared.windows.first(where: { $0.isKeyWindow })?.rootViewController)
+    }
+
+    let root = scene.windows.first(where: { $0.isKeyWindow })?.rootViewController
+      ?? scene.windows.first?.rootViewController
+    return topViewController(from: root)
+  }
+
+  private func topViewController(from root: UIViewController?) -> UIViewController? {
+    guard let root else { return nil }
+    if let presented = root.presentedViewController {
+      return topViewController(from: presented)
+    }
+    if let navigationController = root as? UINavigationController {
+      return topViewController(from: navigationController.visibleViewController)
+    }
+    if let tabBarController = root as? UITabBarController {
+      return topViewController(from: tabBarController.selectedViewController)
+    }
+    return root
+  }
   
   private func ensureSetup(completion: @escaping (Bool) -> Void) {
     guard let manager = getOfflineMapManager() else {