expo-gaode-map 2.2.37 → 2.2.39-next.0

package/ios/ExpoGaodeMapView.swift

@@ -28,6 +28,12 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     var showsScale: Bool = true
     /// 是否启用缩放手势
     var isZoomEnabled: Bool = true
+    /// 缩放手势锚点：gesture 跟随手势中心点；center 固定地图中心点
+    var zoomGestureAnchor: String = "gesture" {
+        didSet {
+            applyZoomGestureSettings()
+        }
+    }
     /// 是否启用滚动手势
     var isScrollEnabled: Bool = true
     /// 是否启用旋转手势
@@ -113,9 +119,15 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     private var pendingCameraMoveData: [String: Any]?
     private var cameraMoveDispatchWorkItem: DispatchWorkItem?
     private var lastCameraMoveDispatchTime: CFTimeInterval = 0
+    /// iOS 缩放惯性/连续 setZoom 可能多次触发 regionDidChange，合并后再派发 idle。
+    private var pendingCameraIdleData: [String: Any]?
+    private var cameraIdleDispatchWorkItem: DispatchWorkItem?
+    private let cameraIdleDebounceMs = 160
     
     /// 缩放手势识别器（用于模拟惯性）
     private var pinchGesture: UIPinchGestureRecognizer!
+    private var centerAnchoredPinchStartZoom: CGFloat?
+    private var centerAnchoredZoomCoordinate: CLLocationCoordinate2D?
     
     // 惯性动画相关属性
     private var displayLink: CADisplayLink?
@@ -361,12 +373,11 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         uiManager.setMapType(1)
         uiManager.setShowsScale(showsScale)
         uiManager.setShowsCompass(showsCompass)
-        uiManager.setZoomEnabled(isZoomEnabled)
+        applyZoomGestureSettings()
         uiManager.setScrollEnabled(isScrollEnabled)
         uiManager.setRotateEnabled(isRotateEnabled)
         uiManager.setTiltEnabled(isTiltEnabled)
         uiManager.setShowsUserLocation(showsUserLocation, followUser: followUserLocation)
-        updatePinchGestureState()
     }
     
     /**
@@ -390,7 +401,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         
         uiManager.setShowsScale(showsScale)
         uiManager.setShowsCompass(showsCompass)
-        uiManager.setZoomEnabled(isZoomEnabled)
+        applyZoomGestureSettings()
         uiManager.setScrollEnabled(isScrollEnabled)
         uiManager.setRotateEnabled(isRotateEnabled)
         uiManager.setTiltEnabled(isTiltEnabled)
@@ -398,13 +409,12 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         uiManager.setShowsTraffic(showsTraffic)
         uiManager.setShowsBuildings(showsBuildings)
         uiManager.setShowsIndoorMap(showsIndoorMap)
-        updatePinchGestureState()
         mapView.distanceFilter = distanceFilter
         mapView.headingFilter = headingFilter
         if let customMapStyleData {
             uiManager.setCustomMapStyle(customMapStyleData)
         }
-        
+
         // 更新苹果地图样式
         updateAppleMapStyle()
         
@@ -439,6 +449,13 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
     // MARK: - 手势处理
     
     @objc func handlePinch(_ gesture: UIPinchGestureRecognizer) {
+        guard isZoomEnabled else { return }
+
+        if zoomGestureAnchor == "center" {
+            handleCenterAnchoredPinch(gesture)
+            return
+        }
+
         if gesture.state == .began {
             // 手势开始，立即停止之前的惯性动画，避免冲突
             stopInertiaAnimation()
@@ -455,6 +472,44 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
             }
         }
     }
+
+    private func handleCenterAnchoredPinch(_ gesture: UIPinchGestureRecognizer) {
+        switch gesture.state {
+        case .began:
+            stopInertiaAnimation()
+            centerAnchoredPinchStartZoom = mapView.zoomLevel
+            centerAnchoredZoomCoordinate = mapView.centerCoordinate
+        case .changed:
+            let startZoom = centerAnchoredPinchStartZoom ?? mapView.zoomLevel
+            let center = centerAnchoredZoomCoordinate ?? mapView.centerCoordinate
+            let zoomDelta = log2(Double(max(gesture.scale, 0.0001)))
+            applyCenterAnchoredZoom(CGFloat(Double(startZoom) + zoomDelta), center: center)
+        case .ended, .cancelled, .failed:
+            centerAnchoredPinchStartZoom = nil
+            let velocity = gesture.velocity
+            if abs(velocity) > 0.1 {
+                zoomVelocity = Double(velocity) * 0.02
+                if centerAnchoredZoomCoordinate == nil {
+                    centerAnchoredZoomCoordinate = mapView.centerCoordinate
+                }
+                startInertiaAnimation()
+            } else {
+                centerAnchoredZoomCoordinate = nil
+            }
+        default:
+            break
+        }
+    }
+
+    private func applyCenterAnchoredZoom(_ zoom: CGFloat, center: CLLocationCoordinate2D) {
+        let validZoom = max(mapView.minZoomLevel, min(mapView.maxZoomLevel, zoom))
+        let status = MAMapStatus()
+        status.centerCoordinate = center
+        status.zoomLevel = validZoom
+        status.rotationDegree = mapView.rotationDegree
+        status.cameraDegree = mapView.cameraDegree
+        mapView.setMapStatus(status, animated: false, duration: 0)
+    }
     
     private func startInertiaAnimation() {
         stopInertiaAnimation()
@@ -476,12 +531,21 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
             // 碰到边界，停止动画
             newZoom = max(mapView.minZoomLevel, min(mapView.maxZoomLevel, newZoom))
             stopInertiaAnimation()
-            mapView.setZoomLevel(newZoom, animated: false)
+            if zoomGestureAnchor == "center" {
+                applyCenterAnchoredZoom(newZoom, center: centerAnchoredZoomCoordinate ?? mapView.centerCoordinate)
+                centerAnchoredZoomCoordinate = nil
+            } else {
+                mapView.setZoomLevel(newZoom, animated: false)
+            }
             return
         }
         
         // 更新地图缩放级别（animated: false 以保证逐帧控制的流畅性）
-        mapView.setZoomLevel(newZoom, animated: false)
+        if zoomGestureAnchor == "center" {
+            applyCenterAnchoredZoom(newZoom, center: centerAnchoredZoomCoordinate ?? mapView.centerCoordinate)
+        } else {
+            mapView.setZoomLevel(newZoom, animated: false)
+        }
         
         // 减速（应用摩擦力）
         zoomVelocity *= friction
@@ -489,6 +553,7 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         // 停止条件
         if abs(zoomVelocity) < velocityThreshold {
             stopInertiaAnimation()
+            centerAnchoredZoomCoordinate = nil
         }
     }
     
@@ -806,6 +871,9 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         pendingCameraMoveData = nil
         cameraMoveDispatchWorkItem?.cancel()
         cameraMoveDispatchWorkItem = nil
+        pendingCameraIdleData = nil
+        cameraIdleDispatchWorkItem?.cancel()
+        cameraIdleDispatchWorkItem = nil
         if let privacyObserver {
             NotificationCenter.default.removeObserver(privacyObserver)
         }
@@ -879,13 +947,20 @@ class ExpoGaodeMapView: ExpoView, MAMapViewDelegate, UIGestureRecognizerDelegate
         pinchGesture.delegate = self
         resolvedMapView.addGestureRecognizer(pinchGesture)
         self.pinchGesture = pinchGesture
-        updatePinchGestureState()
+        applyZoomGestureSettings()
     }
 
-    private func updatePinchGestureState() {
+    private func applyZoomGestureSettings() {
+        uiManager?.setZoomEnabled(isZoomEnabled && zoomGestureAnchor != "center")
         pinchGesture?.isEnabled = isZoomEnabled
+        if zoomGestureAnchor != "center" {
+            centerAnchoredPinchStartZoom = nil
+            centerAnchoredZoomCoordinate = nil
+        }
         if !isZoomEnabled {
             stopInertiaAnimation()
+            centerAnchoredPinchStartZoom = nil
+            centerAnchoredZoomCoordinate = nil
         }
     }
 }
@@ -958,7 +1033,7 @@ extension ExpoGaodeMapView {
      */
     public func mapView(_ mapView: MAMapView, regionDidChangeAnimated animated: Bool) {
         flushPendingCameraMoveEvent()
-        onCameraIdle(buildCameraEventData(for: mapView))
+        scheduleCameraIdleEvent(buildCameraEventData(for: mapView))
 
         // 这里的 overlayViews 是 [UIView] 类型，可能包含 ClusterView
         for view in overlayViews {
@@ -1038,6 +1113,27 @@ extension ExpoGaodeMapView {
         lastCameraMoveDispatchTime = timestamp
         onCameraMove(eventData)
     }
+
+    private func scheduleCameraIdleEvent(_ eventData: [String: Any]) {
+        pendingCameraIdleData = eventData
+        cameraIdleDispatchWorkItem?.cancel()
+
+        let workItem = DispatchWorkItem { [weak self] in
+            guard let self = self, let latestEventData = self.pendingCameraIdleData else {
+                return
+            }
+
+            self.pendingCameraIdleData = nil
+            self.cameraIdleDispatchWorkItem = nil
+            self.onCameraIdle(latestEventData)
+        }
+
+        cameraIdleDispatchWorkItem = workItem
+        DispatchQueue.main.asyncAfter(
+            deadline: .now() + Double(cameraIdleDebounceMs) / 1000.0,
+            execute: workItem
+        )
+    }
     
     /**
      * 地图单击事件

package/ios/ExpoGaodeMapViewModule.swift

@@ -43,6 +43,11 @@ public class ExpoGaodeMapViewModule: Module {
             Prop("zoomGesturesEnabled") { (view: ExpoGaodeMapView, enabled: Bool) in
                 view.isZoomEnabled = enabled
             }
+
+            // 缩放手势锚点：gesture 使用手势焦点，center 固定地图中心点
+            Prop("zoomGestureAnchor") { (view: ExpoGaodeMapView, anchor: String?) in
+                view.zoomGestureAnchor = anchor == "center" ? "center" : "gesture"
+            }
             
             Prop("scrollGesturesEnabled") { (view: ExpoGaodeMapView, enabled: Bool) in
                 view.isScrollEnabled = enabled

package/ios/overlays/MarkerView.swift

@@ -77,6 +77,8 @@ class MarkerView: ExpoView {
     private var pendingSubviewRefreshTask: DispatchWorkItem?
     /// 最近一次应用到 annotationView 的 children 结构签名
     private var lastRenderedChildrenSignature: String?
+    /// 最近一次成功渲染的 children 图片，用于缓存未命中时避免闪烁
+    private var lastRenderedChildrenImage: UIImage?
     /// 上次设置的地图引用（防止重复调用）
     private weak var lastSetMapView: MAMapView?
     
@@ -156,7 +158,11 @@ class MarkerView: ExpoView {
     func setCacheKey(_ key: String?) {
         guard cacheKey != key else { return }
         self.cacheKey = key
-        refreshAnnotationAppearance(invalidateChildrenCache: !subviews.isEmpty)
+        if !subviews.isEmpty {
+            scheduleChildrenImageRefresh()
+        } else {
+            refreshAnnotationAppearance()
+        }
     }
     
     /**
@@ -233,9 +239,8 @@ class MarkerView: ExpoView {
             let size = resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 60))
             let key = childrenCacheKey(for: size)
             if let cached = IconBitmapCache.shared.image(forKey: key) {
-                annotationView?.image = cached
                 if let annotationView = annotationView {
-                    applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                    applyChildrenImage(cached, to: annotationView, signature: childrenRenderSignature())
                 }
                 return annotationView
             }
@@ -244,9 +249,8 @@ class MarkerView: ExpoView {
             DispatchQueue.main.async { [weak self, weak annotationView] in
                 guard let self = self, let annotationView = annotationView else { return }
                 guard self.isAnnotationView(annotationView, boundTo: annotation) else { return }
-                if let generated = self.createImageFromSubviews() {
-                    annotationView.image = generated
-                    self.applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                if let generated = self.createImageFromSubviews(size: size) {
+                    self.applyChildrenImage(generated, to: annotationView, signature: self.childrenRenderSignature())
                 }
             }
             return annotationView
@@ -307,9 +311,7 @@ class MarkerView: ExpoView {
         
         // 🔑 如果有 children，使用自定义视图
         if self.subviews.count > 0 {
-            let reuseToken = cacheKey?.replacingOccurrences(of: "|", with: "_")
-                ?? String(ObjectIdentifier(self).hashValue)
-            let reuseId = "custom_marker_children_\(reuseToken)" + (growAnimation ? "_grow" : "")
+            let reuseId = "custom_marker_children_\(ObjectIdentifier(self).hashValue)" + (growAnimation ? "_grow" : "")
             var annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseId)
             if annotationView == nil {
                 if growAnimation {
@@ -331,37 +333,44 @@ class MarkerView: ExpoView {
             // 生成 cacheKey 或 fallback 到 identifier
             let size = resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 40))
             let key = childrenCacheKey(for: size)
+            let signature = childrenRenderSignature()
 
             // 1) 如果缓存命中，直接同步返回图像（fast path）
             if let cached = IconBitmapCache.shared.image(forKey: key) {
-                annotationView?.image = cached
                 if let annotationView = annotationView {
-                    applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                    applyChildrenImage(cached, to: annotationView, signature: signature)
                 }
                 return annotationView
             }
 
-            // 2) 缓存未命中：返回占位（透明），并异步在主线程生成图像然后回填
-            UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
-            let transparentImage = UIGraphicsGetImageFromCurrentImageContext()
-            UIGraphicsEndImageContext()
-            annotationView?.image = transparentImage
+            // 2) 缓存未命中：先尝试同步渲染，失败时保留旧图，避免点击切态闪烁。
+            if let generated = createImageFromSubviews(size: size) {
+                if let annotationView = annotationView {
+                    applyChildrenImage(generated, to: annotationView, signature: signature)
+                }
+                return annotationView
+            }
 
-            // 🔑 修复:延长延迟时间,给 React Native Image 更多加载时间
+            if annotationView?.image == nil, let previousImage = lastRenderedChildrenImage {
+                annotationView?.image = previousImage
+                if let annotationView = annotationView {
+                    applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                }
+            }
+
+            // 图片内容可能尚未就绪，保留旧图并延迟重试，避免透明闪烁。
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self, weak annotationView] in
                 guard let self = self, let annotationView = annotationView else { return }
                 guard self.isAnnotationView(annotationView, boundTo: annotation) else { return }
                 // 再次检查缓存（避免重复渲染）
                 if let cached = IconBitmapCache.shared.image(forKey: key) {
-                    annotationView.image = cached
-                    self.applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                    self.applyChildrenImage(cached, to: annotationView, signature: signature)
                     return
                 }
                 
                 // 调用你的原生渲染逻辑（保留空白检测、多次 layout）
-                if let generated = self.createImageFromSubviews() {
-                    annotationView.image = generated
-                    self.applyCenterOffset(to: annotationView, defaultOffset: .zero)
+                if let generated = self.createImageFromSubviews(size: size) {
+                    self.applyChildrenImage(generated, to: annotationView, signature: signature)
                 } else if self.hasPendingImageContent() {
                     self.scheduleSubviewRefresh(allowFallbackToDefault: false)
                 }
@@ -499,8 +508,8 @@ class MarkerView: ExpoView {
     /**
      * 将子视图转换为图片
      */
-    private func createImageFromSubviews() -> UIImage? {
-        let size = resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 60))
+    private func createImageFromSubviews(size explicitSize: CGSize? = nil) -> UIImage? {
+        let size = explicitSize ?? resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 60))
         let key = childrenCacheKey(for: size)
 
         if let cachedImage = IconBitmapCache.shared.image(forKey: key) {
@@ -549,6 +558,70 @@ class MarkerView: ExpoView {
         return image
     }
 
+    private func applyChildrenImage(_ image: UIImage, to annotationView: MAAnnotationView, signature: String? = nil) {
+        annotationView.image = image
+        applyCenterOffset(to: annotationView, defaultOffset: .zero)
+        annotationView.canShowCallout = false
+        annotationView.isDraggable = draggable
+        lastRenderedChildrenImage = image
+        if let resolvedSignature = signature {
+            lastRenderedChildrenSignature = resolvedSignature
+        }
+    }
+
+    private func refreshChildrenImageInPlace(invalidateChildrenCache: Bool = false) {
+        guard !isRemoving else { return }
+
+        let refresh = { [weak self] in
+            guard let self = self, !self.isRemoving, !self.subviews.isEmpty else { return }
+
+            if invalidateChildrenCache {
+                self.lastRenderedChildrenSignature = nil
+                self.invalidateCurrentChildrenCache()
+            }
+
+            guard let targetView = self.annotationView ?? self.animatedAnnotationView else {
+                self.refreshAnnotationAppearance(invalidateChildrenCache: invalidateChildrenCache)
+                return
+            }
+
+            let size = self.resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 40))
+            let key = self.childrenCacheKey(for: size)
+            let signature = self.childrenRenderSignature()
+
+            if let cached = IconBitmapCache.shared.image(forKey: key) {
+                self.applyChildrenImage(cached, to: targetView, signature: signature)
+                return
+            }
+
+            if let generated = self.createImageFromSubviews(size: size) {
+                self.applyChildrenImage(generated, to: targetView, signature: signature)
+                return
+            }
+
+            if self.hasPendingImageContent() {
+                self.scheduleSubviewRefresh(allowFallbackToDefault: false)
+            }
+        }
+
+        if Thread.isMainThread {
+            refresh()
+        } else {
+            DispatchQueue.main.async(execute: refresh)
+        }
+    }
+
+    private func scheduleChildrenImageRefresh(invalidateChildrenCache: Bool = false) {
+        pendingSubviewRefreshTask?.cancel()
+
+        let task = DispatchWorkItem { [weak self] in
+            self?.refreshChildrenImageInPlace(invalidateChildrenCache: invalidateChildrenCache)
+        }
+
+        pendingSubviewRefreshTask = task
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.02, execute: task)
+    }
+
     private func iconCacheKey(for iconUri: String) -> String {
         let baseKey = cacheKey ?? "icon|\(iconUri)"
         return "\(baseKey)|\(Int(iconWidth.rounded()))x\(Int(iconHeight.rounded()))"
@@ -769,6 +842,8 @@ class MarkerView: ExpoView {
         animatedAnnotationView?.annotation = nil
         annotationView = nil
         animatedAnnotationView = nil
+        lastRenderedChildrenImage = nil
+        lastRenderedChildrenSignature = nil
         isAnimating = false
         lastSetMapView = nil
         self.mapView = nil
@@ -850,12 +925,9 @@ class MarkerView: ExpoView {
             return
         }
 
-        if let image = createImageFromSubviews() {
-            annotationView.image = image
-            applyCenterOffset(to: annotationView, defaultOffset: .zero)
-            annotationView.canShowCallout = false
-            annotationView.isDraggable = draggable
-            lastRenderedChildrenSignature = signature
+        let size = resolvedContentSubviewSize(defaultSize: CGSize(width: 200, height: 40))
+        if let image = createImageFromSubviews(size: size) {
+            applyChildrenImage(image, to: annotationView, signature: signature)
         }
     }
 
@@ -1023,7 +1095,7 @@ class MarkerView: ExpoView {
         guard contentWidth != width else { return }
         contentWidth = width
         if !subviews.isEmpty {
-            refreshAnnotationAppearance(invalidateChildrenCache: true)
+            scheduleChildrenImageRefresh(invalidateChildrenCache: true)
         }
     }
 
@@ -1031,7 +1103,7 @@ class MarkerView: ExpoView {
         guard contentHeight != height else { return }
         contentHeight = height
         if !subviews.isEmpty {
-            refreshAnnotationAppearance(invalidateChildrenCache: true)
+            scheduleChildrenImageRefresh(invalidateChildrenCache: true)
         }
     }
     

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-gaode-map",
-  "version": "2.2.37",
-  "description": "A full-featured React Native AMap (Gaode Map) library for Expo, including map display, location, overlays, offline maps, and geometry utilities.",
+  "version": "2.2.39-next.0",
+  "description": "Expo Modules AMap (Gaode Map) stack for Expo/React Native: Config Plugin, New Architecture support, maps, location, search, offline maps, and react-native-amap3d migration guidance.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [
@@ -18,7 +18,7 @@
     "build": "expo-module build && yarn build:plugin",
     "build:plugin": "tsc --project plugin/tsconfig.json",
     "clean": "expo-module clean && rm -rf plugin/build",
-    "lint": "expo-module lint",
+    "lint": "eslint \"src/**/*.{ts,tsx}\"",
     "test": "npx jest --no-watchman --config jest.config.js --runInBand",
     "prepare": "expo-module prepare && yarn build:plugin",
     "postinstall": "node scripts/check-expo-modules.js",
@@ -38,9 +38,13 @@
     "expo-map",
     "react-native-amap",
     "react-native-amap3d",
+    "react-native-amap3d-alternative",
     "react-native-gaode-map",
     "rn-amap",
     "rn-gaode-map",
+    "expo-gaode",
+    "eas-build",
+    "fabric",
     "gaode-map",
     "gaode",
     "amap",
@@ -71,13 +75,15 @@
     "@babel/runtime": "^7.25.7",
     "@testing-library/react-native": "^13.3.3",
     "@types/jest": "^29.5.14",
+    "@types/node": "^22.18.0",
     "@types/react": "~19.2.10",
-    "expo": "^55.0.8",
-    "expo-module-scripts": "^55.0.2",
+    "eslint": "^9.25.1",
+    "expo": "^57.0.1",
+    "expo-module-scripts": "^56.0.3",
     "jest": "~29.7.0",
-    "jest-expo": "~55.0.11",
-    "react-native": "0.83.2",
-    "typescript": "^5.9.3"
+    "jest-expo": "~57.0.0",
+    "react-native": "0.86.0",
+    "typescript": "^6.0.3"
   },
   "peerDependencies": {
     "expo": "*",

package/plugin/build/withGaodeMap.js

@@ -146,8 +146,9 @@ const withGaodeMapAndroidManifest = (config, props) => {
             else {
                 // 更新现有的 API Key
                 const apiKeyIndex = mainApplication['meta-data'].findIndex((item) => item.$?.['android:name'] === 'com.amap.api.v2.apikey');
-                if (apiKeyIndex !== -1) {
-                    mainApplication['meta-data'][apiKeyIndex].$ = {
+                const apiKeyMetaData = mainApplication['meta-data'][apiKeyIndex];
+                if (apiKeyMetaData) {
+                    apiKeyMetaData.$ = {
                         'android:name': 'com.amap.api.v2.apikey',
                         'android:value': props.androidKey,
                     };

package/shared/cpp/ClusterEngine.cpp

@@ -1,4 +1,5 @@
 #include "ClusterEngine.hpp"
+#include "GeometryEngine.hpp"
 #include "QuadTree.hpp"
 #include <cmath>
 #include <algorithm>
@@ -11,19 +12,8 @@ static inline double cluster_toRadians(double degrees) {
     return degrees * 0.017453292519943295;
 }
 
-static double haversineMeters(const ClusterPoint& a, const ClusterPoint& b) {
-    const double lat1 = cluster_toRadians(a.lat);
-    const double lat2 = cluster_toRadians(b.lat);
-    const double dLat = lat2 - lat1;
-    const double dLon = cluster_toRadians(b.lon - a.lon);
-
-    const double sinHalfLat = std::sin(dLat * 0.5);
-    const double sinHalfLon = std::sin(dLon * 0.5);
-
-    const double h = sinHalfLat * sinHalfLat + std::cos(lat1) * std::cos(lat2) * sinHalfLon * sinHalfLon;
-    const double c = 2.0 * std::atan2(std::sqrt(h), std::sqrt(1.0 - h));
-
-    return 6371000.0 * c;
+static double clusterDistanceMeters(const ClusterPoint& a, const ClusterPoint& b) {
+    return calculateDistance(a.lat, a.lon, b.lat, b.lon);
 }
 
 std::vector<ClusterOutput> clusterPoints(const std::vector<ClusterPoint>& points, double radiusMeters) {
@@ -95,7 +85,7 @@ std::vector<ClusterOutput> clusterPoints(const std::vector<ClusterPoint>& points
             if (globalVisited[neighbor.index]) continue;
             
             // Precise check
-            if (haversineMeters(p, neighbor) <= radiusMeters) {
+            if (clusterDistanceMeters(p, neighbor) <= radiusMeters) {
                 cluster.indices.push_back(neighbor.index);
                 globalVisited[neighbor.index] = true;
             }

package/shared/cpp/ClusterEngine.hpp

@@ -1,20 +1,9 @@
 #pragma once
 
-#include <vector>
+#include "ClusterTypes.hpp"
 
 namespace gaodemap {
 
-struct ClusterPoint {
-    double lat;
-    double lon;
-    int index;
-};
-
-struct ClusterOutput {
-    int centerIndex;
-    std::vector<int> indices;
-};
-
 std::vector<ClusterOutput> clusterPoints(const std::vector<ClusterPoint>& points, double radiusMeters);
 
 }

package/shared/cpp/ClusterTypes.hpp

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <vector>
+
+namespace gaodemap {
+
+struct ClusterPoint {
+    double lat;
+    double lon;
+    int index;
+};
+
+struct ClusterOutput {
+    int centerIndex;
+    std::vector<int> indices;
+};
+
+}

package/shared/cpp/ColorParser.cpp

@@ -1,5 +1,6 @@
 #include "ColorParser.hpp"
 #include <algorithm>
+#include <cctype>
 #include <sstream>
 #include <vector>
 #include <map>
@@ -109,13 +110,29 @@ static const std::map<std::string, uint32_t> NAMED_COLORS = {
     {"transparent", 0x00000000}
 };
 
+static bool isSpace(unsigned char ch) {
+    return std::isspace(ch) != 0;
+}
+
+static char toLower(unsigned char ch) {
+    return static_cast<char>(std::tolower(ch));
+}
+
+static bool isHexDigit(unsigned char ch) {
+    return std::isxdigit(ch) != 0;
+}
+
 uint32_t parseColor(const std::string& colorString) {
     std::string str = colorString;
     // Remove whitespace
-    str.erase(std::remove_if(str.begin(), str.end(), ::isspace), str.end());
+    str.erase(std::remove_if(str.begin(), str.end(), [](unsigned char ch) {
+        return isSpace(ch);
+    }), str.end());
     // Lowercase for named colors check
     std::string lowerStr = str;
-    std::transform(lowerStr.begin(), lowerStr.end(), lowerStr.begin(), ::tolower);
+    std::transform(lowerStr.begin(), lowerStr.end(), lowerStr.begin(), [](unsigned char ch) {
+        return toLower(ch);
+    });
 
     if (NAMED_COLORS.count(lowerStr)) {
         return NAMED_COLORS.at(lowerStr);
@@ -125,7 +142,9 @@ uint32_t parseColor(const std::string& colorString) {
         return parseRgba(str); // pass original str with potential spaces if needed, but we removed them
     }
 
-    if (lowerStr.find("#") == 0 || std::all_of(lowerStr.begin(), lowerStr.end(), ::isxdigit)) {
+    if (lowerStr.find("#") == 0 || std::all_of(lowerStr.begin(), lowerStr.end(), [](unsigned char ch) {
+        return isHexDigit(ch);
+    })) {
         return parseHex(str);
     }