expo-gaode-map-navigation 2.0.5 → 2.0.6

package/ios/map/overlays/ClusterView.swift

@@ -1,77 +1,74 @@
+import Foundation
 import ExpoModulesCore
 import AMapNaviKit
 
 class ClusterView: ExpoView {
-    // 属性
     var points: [[String: Any]] = [] {
         didSet {
             parsePoints()
             updateClusters()
         }
     }
-    var radius: Int = 100 // 聚合范围 (screen points)
+    var radius: Int = 100
     var minClusterSize: Int = 1
     var clusterBuckets: [[String: Any]]?
-    
-    // 样式属性
+
     private var clusterBackgroundColor: UIColor = .systemBlue
     private var clusterBorderColor: UIColor = .white
     private var clusterBorderWidth: CGFloat = 2.0
     private var clusterTextColor: UIColor = .white
     private var clusterTextSize: CGFloat = 14.0
     private var clusterSize: CGSize = CGSize(width: 40, height: 40)
-    
+
     let onClusterPress = EventDispatcher()
-    
+
     private weak var mapView: MAMapView?
-    // private var quadTree = CoordinateQuadTree() // Removed: using C++ ClusterNative
     private var currentAnnotations: [MAAnnotation] = []
     private let quadTreeQueue = DispatchQueue(label: "com.expo.gaode.quadtree")
     private var isInvalidated = false
-    
-    // 缓存坐标数据以加速 C++ 调用
+    private let imageCache = NSCache<NSString, UIImage>()
+    private var baseIconImage: UIImage?
+    private var iconIdentifier: String?
+
     private var latitudes: [Double] = []
     private var longitudes: [Double] = []
-    
+
     required init(appContext: AppContext? = nil) {
         super.init(appContext: appContext)
     }
-    
+
     private func parsePoints() {
         var lats: [Double] = []
         var lons: [Double] = []
-        
+
         for point in points {
             if let coord = LatLngParser.parseLatLng(point) {
                 lats.append(coord.latitude)
                 lons.append(coord.longitude)
             } else {
-                // 保持索引一致，无效点填 0
                 lats.append(0)
                 lons.append(0)
             }
         }
-        
-        self.latitudes = lats
-        self.longitudes = lons
+
+        latitudes = lats
+        longitudes = lons
     }
-    
-    // MARK: - Setters for Expo Module
-    
+
     func setPoints(_ points: [[String: Any]]) {
         self.points = points
     }
-    
+
     func setRadius(_ radius: Int) {
         self.radius = radius
         updateClusters()
     }
-    
+
     func setMinClusterSize(_ size: Int) {
         self.minClusterSize = size
         updateClusters()
     }
-    
+
     func setMap(_ map: MAMapView) {
         self.mapView = map
         updateClusters()
@@ -79,116 +76,120 @@ class ClusterView: ExpoView {
 
     func setClusterStyle(_ style: [String: Any]) {
         if let color = ColorParser.parseColor(style["backgroundColor"]) {
-            self.clusterBackgroundColor = color
+            clusterBackgroundColor = color
         }
         if let borderColor = ColorParser.parseColor(style["borderColor"]) {
-            self.clusterBorderColor = borderColor
+            clusterBorderColor = borderColor
         }
         if let borderWidth = style["borderWidth"] as? Double {
-            self.clusterBorderWidth = CGFloat(borderWidth)
+            clusterBorderWidth = CGFloat(borderWidth)
         }
-        
-        // 尺寸设置
+
         if let width = style["width"] as? Double {
-            self.clusterSize.width = CGFloat(width)
-            // 如果只设置了宽度，默认高度等于宽度（正圆）
+            clusterSize.width = CGFloat(width)
             if style["height"] == nil {
-                self.clusterSize.height = CGFloat(width)
+                clusterSize.height = CGFloat(width)
             }
         }
-        
+
         if let height = style["height"] as? Double {
-            self.clusterSize.height = CGFloat(height)
-            // 如果只设置了高度，默认宽度等于高度
+            clusterSize.height = CGFloat(height)
             if style["width"] == nil {
-                self.clusterSize.width = CGFloat(height)
+                clusterSize.width = CGFloat(height)
             }
         }
-        
+
+        clearImageCache()
         updateClusters()
     }
-    
+
+    func setIcon(_ icon: String?) {
+        iconIdentifier = icon
+        baseIconImage = nil
+        clearImageCache()
+
+        guard let icon, !icon.isEmpty else {
+            updateClusters()
+            return
+        }
+
+        loadIcon(from: icon)
+    }
+
     func setClusterTextStyle(_ style: [String: Any]) {
         if let color = ColorParser.parseColor(style["color"]) {
-            self.clusterTextColor = color
+            clusterTextColor = color
         }
         if let fontSize = style["fontSize"] as? Double {
-            self.clusterTextSize = CGFloat(fontSize)
+            clusterTextSize = CGFloat(fontSize)
         }
+        clearImageCache()
         updateClusters()
     }
 
     func setClusterBuckets(_ buckets: [[String: Any]]) {
-        self.clusterBuckets = buckets
+        clusterBuckets = buckets
+        clearImageCache()
         updateClusters()
     }
 
     func mapRegionDidChange() {
         updateClusters()
     }
-    
-    // MARK: - Update Logic
-    
+
     private var updateTimer: Timer?
-    private let throttleInterval: TimeInterval = 0.3 // 300ms 节流
+    private let throttleInterval: TimeInterval = 0.3
 
     func updateClusters() {
         if isInvalidated { return }
-        
-        // 节流逻辑：取消上一次的 Timer，重新计时
+
         updateTimer?.invalidate()
         updateTimer = Timer.scheduledTimer(withTimeInterval: throttleInterval, repeats: false) { [weak self] _ in
             self?.performUpdate()
         }
     }
-    
+
     private func performUpdate() {
         if isInvalidated { return }
         guard let mapView = mapView else { return }
-        
-        // 确保地图已布局
         if mapView.bounds.size.width == 0 { return }
-        
+
         let visibleRect = mapView.visibleMapRect
         let zoomScale = visibleRect.size.width / Double(mapView.bounds.size.width)
-        
-        // 计算当前缩放级别下的物理半径（米）
-        // MAMapView 单位投影：1 map point ≈ 1 meter (at equator)
-        // 实际上需要根据纬度计算 metersPerMapPoint
         let centerLat = mapView.centerCoordinate.latitude
         let metersPerMapPoint = MAMetersPerMapPointAtLatitude(centerLat)
         let mapPointsPerScreenPoint = zoomScale
         let metersPerScreenPoint = metersPerMapPoint * mapPointsPerScreenPoint
-        let radiusMeters = Double(self.radius) * metersPerScreenPoint
-        
-        // 在后台串行队列计算聚合
+        let radiusMeters = Double(radius) * metersPerScreenPoint
+
         quadTreeQueue.async { [weak self] in
-            guard let self = self else { return }
-            
-            // 转换为 NSNumber 数组以传递给 Obj-C++
+            guard let self else { return }
+
             let latNums = self.latitudes.map { NSNumber(value: $0) }
             let lonNums = self.longitudes.map { NSNumber(value: $0) }
-            
-            // 调用 C++ 聚类算法
-            let clusterData = ClusterNative.clusterPoints(latitudes: latNums, longitudes: lonNums, radiusMeters: radiusMeters)
-            
+            let clusterData = ClusterNative.clusterPoints(
+                latitudes: latNums,
+                longitudes: lonNums,
+                radiusMeters: radiusMeters
+            )
+
             var annotations: [ClusterAnnotation] = []
-            
+
             if clusterData.count > 0 {
                 let clusterCount = clusterData[0].intValue
                 var offset = 1
-                
+
                 for _ in 0..<clusterCount {
                     if offset >= clusterData.count { break }
-                    
+
                     let centerIndex = clusterData[offset].intValue
                     offset += 1
-                    
+
                     let count = clusterData[offset].intValue
                     offset += 1
-                    
+
                     var pois: [[String: Any]] = []
-                    
+
                     for _ in 0..<count {
                         if offset < clusterData.count {
                             let idx = clusterData[offset].intValue
@@ -198,111 +199,97 @@ class ClusterView: ExpoView {
                             offset += 1
                         }
                     }
-                    
+
                     if centerIndex >= 0 && centerIndex < self.points.count {
                         let centerPoint = self.points[centerIndex]
                         if let lat = centerPoint["latitude"] as? Double,
                            let lon = centerPoint["longitude"] as? Double {
-                             let coordinate = CLLocationCoordinate2D(latitude: lat, longitude: lon)
-                             // 只有当聚类点数量 >= minClusterSize 时才显示聚类
-                             // 但通常 ClusterView 负责显示所有点（聚合或非聚合）
-                             // 这里如果 count == 1，也是一个 ClusterAnnotation，只是显示样式可能不同
-                             let annotation = ClusterAnnotation(coordinate: coordinate, count: count, pois: pois)
-                             annotations.append(annotation)
+                            let coordinate = CLLocationCoordinate2D(latitude: lat, longitude: lon)
+                            annotations.append(
+                                ClusterAnnotation(coordinate: coordinate, count: count, pois: pois)
+                            )
                         }
                     }
                 }
             }
-            
+
             DispatchQueue.main.async {
                 if self.isInvalidated { return }
                 self.updateMapViewAnnotations(with: annotations as [MAAnnotation])
             }
         }
     }
-    
+
     private func updateMapViewAnnotations(with newAnnotations: [MAAnnotation]) {
         guard let mapView = mapView else { return }
-        
-        // Diff 算法：找出新增、移除和保留的标注
-        // 注意：ClusterAnnotation 需要实现 isEqual 和 hash
-        
+
         let before = Set(currentAnnotations.compactMap { $0 as? ClusterAnnotation })
         let after = Set(newAnnotations.compactMap { $0 as? ClusterAnnotation })
-        
-        // intersection 返回 before 中的元素（如果相等），这正是我们需要保留的已经在地图上的实例
+
         let toKeep = before.intersection(after)
         let toAdd = after.subtracting(toKeep)
         let toRemove = before.subtracting(toKeep)
-        
-        // 只有当有变化时才操作
+
         if !toRemove.isEmpty {
             mapView.removeAnnotations(Array(toRemove))
         }
-        
+
         if !toAdd.isEmpty {
             mapView.addAnnotations(Array(toAdd))
         }
-        
-        // 更新 currentAnnotations
-        // 关键：必须保留已经在地图上的实例 (toKeep)，加上新增的实例 (toAdd)
-        // 这样可以保证 currentAnnotations 中的对象始终与地图上的对象一致，避免 KVO 崩溃
+
         var nextAnnotations: [MAAnnotation] = []
         nextAnnotations.append(contentsOf: Array(toKeep) as [MAAnnotation])
         nextAnnotations.append(contentsOf: Array(toAdd) as [MAAnnotation])
-        
         currentAnnotations = nextAnnotations
     }
-    
-    // MARK: - View Provider
-    
+
     func viewForAnnotation(_ annotation: MAAnnotation) -> MAAnnotationView? {
         guard let clusterAnnotation = annotation as? ClusterAnnotation else { return nil }
-        
+
         let reuseIdentifier = "ClusterAnnotation"
         var annotationView = mapView?.dequeueReusableAnnotationView(withIdentifier: reuseIdentifier)
-        
+
         if annotationView == nil {
             annotationView = MAAnnotationView(annotation: annotation, reuseIdentifier: reuseIdentifier)
         }
-        
+
         annotationView?.annotation = annotation
         annotationView?.canShowCallout = false
-        
-        // 生成图标
         annotationView?.image = image(for: clusterAnnotation.count)
         annotationView?.centerOffset = CGPoint(x: 0, y: 0)
         annotationView?.zIndex = 100
-        
+
         return annotationView
     }
-    
+
     private func image(for count: Int) -> UIImage? {
-        let size = self.clusterSize
+        let cacheKey = clusterImageCacheKey(for: count)
+        if let cachedImage = imageCache.object(forKey: cacheKey as NSString) {
+            return cachedImage
+        }
+
+        let size = clusterSize
         let renderer = UIGraphicsImageRenderer(size: size)
-        
-        return renderer.image { context in
+
+        let renderedImage = renderer.image { _ in
             let rect = CGRect(origin: .zero, size: size)
-            
-            // 基础样式
-            var bgColor = self.clusterBackgroundColor
-            var borderColor = self.clusterBorderColor
-            var borderWidth = self.clusterBorderWidth
-            
-            // 应用分级样式
-            if let buckets = self.clusterBuckets {
+
+            var bgColor = clusterBackgroundColor
+            var borderColor = clusterBorderColor
+            var borderWidth = clusterBorderWidth
+
+            if let buckets = clusterBuckets {
                 var bestBucket: [String: Any]?
                 var maxMinPoints = -1
-                
+
                 for bucket in buckets {
-                    if let minPoints = bucket["minPoints"] as? Int, minPoints <= count {
-                        if minPoints > maxMinPoints {
-                            maxMinPoints = minPoints
-                            bestBucket = bucket
-                        }
+                    if let minPoints = bucket["minPoints"] as? Int, minPoints <= count, minPoints > maxMinPoints {
+                        maxMinPoints = minPoints
+                        bestBucket = bucket
                     }
                 }
-                
+
                 if let bucket = bestBucket {
                     if let c = ColorParser.parseColor(bucket["backgroundColor"]) {
                         bgColor = c
@@ -315,43 +302,117 @@ class ClusterView: ExpoView {
                     }
                 }
             }
-            
-            bgColor.setFill()
-            UIBezierPath(ovalIn: rect).fill()
-            
-            // 绘制边框
-            if borderWidth > 0 {
-                borderColor.setStroke()
-                let path = UIBezierPath(ovalIn: rect.insetBy(dx: borderWidth / 2, dy: borderWidth / 2))
-                path.lineWidth = borderWidth
-                path.stroke()
+
+            if let baseIconImage {
+                baseIconImage.draw(in: rect)
+                if borderWidth > 0 {
+                    borderColor.setStroke()
+                    let path = UIBezierPath(ovalIn: rect.insetBy(dx: borderWidth / 2, dy: borderWidth / 2))
+                    path.lineWidth = borderWidth
+                    path.stroke()
+                }
+            } else {
+                bgColor.setFill()
+                UIBezierPath(ovalIn: rect).fill()
+
+                if borderWidth > 0 {
+                    borderColor.setStroke()
+                    let path = UIBezierPath(ovalIn: rect.insetBy(dx: borderWidth / 2, dy: borderWidth / 2))
+                    path.lineWidth = borderWidth
+                    path.stroke()
+                }
             }
-            
-            // 绘制文字
+
             let text = "\(count)"
             let attributes: [NSAttributedString.Key: Any] = [
-                .font: UIFont.boldSystemFont(ofSize: self.clusterTextSize),
-                .foregroundColor: self.clusterTextColor
+                .font: UIFont.boldSystemFont(ofSize: clusterTextSize),
+                .foregroundColor: clusterTextColor
             ]
             let textSize = text.size(withAttributes: attributes)
-            let textRect = CGRect(x: (size.width - textSize.width) / 2,
-                                  y: (size.height - textSize.height) / 2,
-                                  width: textSize.width,
-                                  height: textSize.height)
+            let textRect = CGRect(
+                x: (size.width - textSize.width) / 2,
+                y: (size.height - textSize.height) / 2,
+                width: textSize.width,
+                height: textSize.height
+            )
             text.draw(in: textRect, withAttributes: attributes)
         }
+
+        imageCache.setObject(renderedImage, forKey: cacheKey as NSString)
+        return renderedImage
+    }
+
+    private func clusterImageCacheKey(for count: Int) -> String {
+        let bucketKey: String
+        if let buckets = clusterBuckets {
+            let minPoints = buckets
+                .compactMap { $0["minPoints"] as? Int }
+                .filter { $0 <= count }
+                .max() ?? 0
+            bucketKey = "bucket:\(minPoints)"
+        } else {
+            bucketKey = "bucket:none"
+        }
+
+        return [
+            "count:\(count)",
+            bucketKey,
+            "size:\(Int(clusterSize.width.rounded()))x\(Int(clusterSize.height.rounded()))",
+            "bg:\(clusterBackgroundColor.description)",
+            "border:\(clusterBorderColor.description)",
+            "borderWidth:\(clusterBorderWidth)",
+            "textColor:\(clusterTextColor.description)",
+            "textSize:\(clusterTextSize)",
+            "icon:\(iconIdentifier ?? "none")"
+        ].joined(separator: "|")
+    }
+
+    private func clearImageCache() {
+        imageCache.removeAllObjects()
+    }
+
+    private func loadIcon(from icon: String) {
+        let requestedIcon = icon
+
+        DispatchQueue.global().async { [weak self] in
+            guard let self else { return }
+
+            let image: UIImage? = {
+                if requestedIcon.hasPrefix("http://") || requestedIcon.hasPrefix("https://") {
+                    guard let url = URL(string: requestedIcon),
+                          let data = try? Data(contentsOf: url) else {
+                        return nil
+                    }
+                    return UIImage(data: data)
+                }
+
+                if requestedIcon.hasPrefix("file://") {
+                    let path = String(requestedIcon.dropFirst(7))
+                    return UIImage(contentsOfFile: path)
+                }
+
+                return UIImage(named: requestedIcon) ?? UIImage(contentsOfFile: requestedIcon)
+            }()
+
+            guard let image else { return }
+
+            DispatchQueue.main.async { [weak self] in
+                guard let self, self.iconIdentifier == requestedIcon else { return }
+                self.baseIconImage = image
+                self.clearImageCache()
+                self.updateClusters()
+            }
+        }
     }
-    
-    // MARK: - Event Handling
-    
+
     func containsAnnotation(_ annotation: MAAnnotation) -> Bool {
         guard let clusterAnnotation = annotation as? ClusterAnnotation else { return false }
         return currentAnnotations.contains { $0.isEqual(clusterAnnotation) }
     }
-    
+
     func handleAnnotationTap(_ annotation: MAAnnotation) {
         guard let clusterAnnotation = annotation as? ClusterAnnotation else { return }
-        
+
         onClusterPress([
             "count": clusterAnnotation.count,
             "latitude": clusterAnnotation.coordinate.latitude,
@@ -359,12 +420,11 @@ class ClusterView: ExpoView {
             "pois": clusterAnnotation.pois
         ])
     }
-    
-    // MARK: - Lifecycle
-    
+
     override func removeFromSuperview() {
         isInvalidated = true
-        updateTimer?.invalidate() // 清理定时器
+        updateTimer?.invalidate()
+        clearImageCache()
         super.removeFromSuperview()
         mapView?.removeAnnotations(currentAnnotations)
     }

package/ios/map/overlays/ClusterViewModule.swift

@@ -22,6 +22,10 @@ public class ClusterViewModule: Module {
             Prop("clusterStyle") { (view: ClusterView, style: [String: Any]) in
                 view.setClusterStyle(style)
             }
+
+            Prop("icon") { (view: ClusterView, icon: String?) in
+                view.setIcon(icon)
+            }
             
             Prop("clusterTextStyle") { (view: ClusterView, style: [String: Any]) in
                 view.setClusterTextStyle(style)
@@ -32,4 +36,4 @@ public class ClusterViewModule: Module {
             }
         }
     }
-}
+}