expo-gaode-map 1.0.2 → 1.0.4

package/README.md

@@ -580,3 +580,4 @@ MIT
 - 📝 提交 [GitHub Issue](https://github.com/TomWq/expo-gaode-map/issues)
 - 💬 参与 [Discussions](https://github.com/TomWq/expo-gaode-map/discussions)
 - ⭐ 给项目点个 Star 支持一下
+- 💬 加入 QQ 群：952241387 

package/android/src/main/java/expo/modules/gaodemap/ExpoGaodeMapModule.kt

@@ -1,6 +1,6 @@
 package expo.modules.gaodemap
 
-import android.util.Log
+
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.gaodemap.modules.SDKInitializer
@@ -17,9 +17,7 @@ import expo.modules.gaodemap.overlays.*
  * - 地图视图和覆盖物注册
  */
 class ExpoGaodeMapModule : Module() {
-  companion object {
-    private const val TAG = "ExpoGaodeMapModule"
-  }
+
   
   /** 定位管理器实例 */
   private var locationManager: LocationManager? = null
@@ -181,6 +179,62 @@ class ExpoGaodeMapModule : Module() {
       getLocationManager().setHttpTimeOut(httpTimeOut)
     }
 
+    /**
+     * 设置定位精度 (iOS 专用,Android 空实现)
+     * @param accuracy 精度级别
+     */
+    Function("setDesiredAccuracy") { _: Int ->
+      // Android 不支持此配置
+    }
+
+    /**
+     * 设置定位超时时间 (iOS 专用,Android 空实现)
+     * @param timeout 超时时间(秒)
+     */
+    Function("setLocationTimeout") { _: Int ->
+      // Android 不支持此配置
+    }
+
+    /**
+     * 设置逆地理超时时间 (iOS 专用,Android 空实现)
+     * @param timeout 超时时间(秒)
+     */
+    Function("setReGeocodeTimeout") { _: Int ->
+      // Android 不支持此配置
+    }
+
+    /**
+     * 设置距离过滤器 (iOS 专用,Android 空实现)
+     * @param distance 最小距离变化(米)
+     */
+    Function("setDistanceFilter") { _: Double ->
+      // Android 不支持此配置
+    }
+
+    /**
+     * 设置是否自动暂停定位更新 (iOS 专用,Android 空实现)
+     * @param pauses 是否自动暂停
+     */
+    Function("setPausesLocationUpdatesAutomatically") { _: Boolean ->
+      // Android 不支持此配置
+    }
+
+    /**
+     * 设置是否允许后台定位 (iOS 专用,Android 空实现)
+     * @param allows 是否允许后台定位
+     */
+    Function("setAllowsBackgroundLocationUpdates") { _: Boolean ->
+      // Android 不支持此配置
+    }
+
+    /**
+     * 设置定位协议 (未实现)
+     * @param protocol 协议类型
+     */
+    Function("setLocationProtocol") { _: Int ->
+      // 未实现
+    }
+
     // ==================== 权限管理 ====================
     
     /**
@@ -271,7 +325,7 @@ class ExpoGaodeMapModule : Module() {
     View(ExpoGaodeMapView::class) {
       
       // 事件
-      Events("onMapPress", "onMapLongPress", "onLoad")
+      Events("onMapPress", "onMapLongPress", "onLoad", "onMarkerPress", "onMarkerDragStart", "onMarkerDrag", "onMarkerDragEnd", "onCirclePress", "onPolygonPress", "onPolylinePress")
 
       // 地图类型
       Prop<Int>("mapType") { view, type ->
@@ -416,6 +470,22 @@ class ExpoGaodeMapModule : Module() {
       Prop<Boolean>("draggable") { view: MarkerView, draggable ->
         view.setDraggable(draggable)
       }
+      
+      Prop<Float>("opacity") { view: MarkerView, opacity ->
+        view.setOpacity(opacity)
+      }
+      
+      Prop<Boolean>("flat") { view: MarkerView, flat ->
+        view.setFlat(flat)
+      }
+      
+      Prop<Float>("zIndex") { view: MarkerView, zIndex ->
+        view.setZIndex(zIndex)
+      }
+      
+      Prop<Map<String, Float>>("anchor") { view: MarkerView, anchor ->
+        view.setAnchor(anchor)
+      }
     }
     
     // Circle - 圆形
@@ -462,6 +532,18 @@ class ExpoGaodeMapModule : Module() {
       Prop<String?>("texture") { view: PolylineView, texture ->
         view.setTexture(texture)
       }
+      
+      Prop<Boolean>("dotted") { view: PolylineView, dotted ->
+        view.setDotted(dotted)
+      }
+      
+      Prop<Boolean>("geodesic") { view: PolylineView, geodesic ->
+        view.setGeodesic(geodesic)
+      }
+      
+      Prop<Float>("zIndex") { view: PolylineView, zIndex ->
+        view.setZIndex(zIndex)
+      }
     }
     
     // Polygon - 多边形

package/android/src/main/java/expo/modules/gaodemap/ExpoGaodeMapView.kt

@@ -6,6 +6,7 @@ import android.view.View
 import com.amap.api.maps.AMap
 import com.amap.api.maps.MapView
 import com.amap.api.maps.MapsInitializer
+import com.amap.api.maps.model.LatLng
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.viewevent.EventDispatcher
 import expo.modules.kotlin.views.ExpoView
@@ -45,6 +46,13 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
   private val onMapPress by EventDispatcher()
   private val onMapLongPress by EventDispatcher()
   private val onLoad by EventDispatcher()
+  private val onMarkerPress by EventDispatcher()
+  private val onMarkerDragStart by EventDispatcher()
+  private val onMarkerDrag by EventDispatcher()
+  private val onMarkerDragEnd by EventDispatcher()
+  private val onCirclePress by EventDispatcher()
+  private val onPolygonPress by EventDispatcher()
+  private val onPolylinePress by EventDispatcher()
   
   // 高德地图视图
   private lateinit var mapView: MapView
@@ -73,7 +81,57 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
       // 初始化管理器
       cameraManager = CameraManager(aMap)
       uiManager = UIManager(aMap, context)
-      overlayManager = OverlayManager(aMap)
+      overlayManager = OverlayManager(aMap, context).apply {
+        onMarkerPress = { id, lat, lng ->
+          this@ExpoGaodeMapView.onMarkerPress(mapOf(
+            "markerId" to id,
+            "latitude" to lat,
+            "longitude" to lng
+          ))
+        }
+        onMarkerDragStart = { id, lat, lng ->
+          this@ExpoGaodeMapView.onMarkerDragStart(mapOf(
+            "markerId" to id,
+            "latitude" to lat,
+            "longitude" to lng
+          ))
+        }
+        onMarkerDrag = { id, lat, lng ->
+          this@ExpoGaodeMapView.onMarkerDrag(mapOf(
+            "markerId" to id,
+            "latitude" to lat,
+            "longitude" to lng
+          ))
+        }
+        onMarkerDragEnd = { id, lat, lng ->
+          this@ExpoGaodeMapView.onMarkerDragEnd(mapOf(
+            "markerId" to id,
+            "latitude" to lat,
+            "longitude" to lng
+          ))
+        }
+        onCirclePress = { id, lat, lng ->
+          this@ExpoGaodeMapView.onCirclePress(mapOf(
+            "circleId" to id,
+            "latitude" to lat,
+            "longitude" to lng
+          ))
+        }
+        onPolygonPress = { id, lat, lng ->
+          this@ExpoGaodeMapView.onPolygonPress(mapOf(
+            "polygonId" to id,
+            "latitude" to lat,
+            "longitude" to lng
+          ))
+        }
+        onPolylinePress = { id, lat, lng ->
+          this@ExpoGaodeMapView.onPolylinePress(mapOf(
+            "polylineId" to id,
+            "latitude" to lat,
+            "longitude" to lng
+          ))
+        }
+      }
       
       // 添加地图视图到布局
       addView(mapView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
@@ -108,6 +166,43 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
    */
   private fun setupMapListeners() {
     aMap.setOnMapClickListener { latLng ->
+      // 检查声明式 PolylineView
+      if (checkDeclarativePolylinePress(latLng)) {
+        return@setOnMapClickListener
+      }
+      
+      // 检查声明式 PolygonView
+      if (checkDeclarativePolygonPress(latLng)) {
+        return@setOnMapClickListener
+      }
+      
+      // 检查声明式 CircleView
+      if (checkDeclarativeCirclePress(latLng)) {
+        return@setOnMapClickListener
+      }
+      
+      // 检查命令式圆形
+      val circleId = overlayManager.checkCirclePress(latLng)
+      if (circleId != null) {
+        overlayManager.onCirclePress?.invoke(circleId, latLng.latitude, latLng.longitude)
+        return@setOnMapClickListener
+      }
+      
+      // 检查命令式多边形
+      val polygonId = overlayManager.checkPolygonPress(latLng)
+      if (polygonId != null) {
+        overlayManager.onPolygonPress?.invoke(polygonId, latLng.latitude, latLng.longitude)
+        return@setOnMapClickListener
+      }
+      
+      // 检查命令式折线
+      val polylineId = overlayManager.checkPolylinePress(latLng)
+      if (polylineId != null) {
+        overlayManager.onPolylinePress?.invoke(polylineId, latLng.latitude, latLng.longitude)
+        return@setOnMapClickListener
+      }
+      
+      // 如果都没点击,触发地图点击事件
       onMapPress(mapOf(
         "latitude" to latLng.latitude,
         "longitude" to latLng.longitude
@@ -400,6 +495,42 @@ class ExpoGaodeMapView(context: Context, appContext: AppContext) : ExpoView(cont
     }
   }
   
+  private fun checkDeclarativePolylinePress(latLng: LatLng): Boolean {
+    for (i in 0 until childCount) {
+      val child = getChildAt(i)
+      if (child is PolylineView) {
+        if (child.checkPress(latLng)) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+  
+  private fun checkDeclarativePolygonPress(latLng: LatLng): Boolean {
+    for (i in 0 until childCount) {
+      val child = getChildAt(i)
+      if (child is PolygonView) {
+        if (child.checkPress(latLng)) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+  
+  private fun checkDeclarativeCirclePress(latLng: LatLng): Boolean {
+    for (i in 0 until childCount) {
+      val child = getChildAt(i)
+      if (child is CircleView) {
+        if (child.checkPress(latLng)) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+  
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     super.onLayout(changed, left, top, right, bottom)
   }

package/android/src/main/java/expo/modules/gaodemap/managers/OverlayManager.kt

@@ -1,6 +1,8 @@
 package expo.modules.gaodemap.managers
 
+import android.content.Context
 import android.util.Log
+import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import com.amap.api.maps.AMap
 import com.amap.api.maps.model.LatLng
@@ -12,7 +14,7 @@ import java.net.URL
  * 覆盖物管理器
  * 负责地图上所有覆盖物的添加、删除、更新
  */
-class OverlayManager(private val aMap: AMap) {
+class OverlayManager(private val aMap: AMap, private val context: Context) {
   
   companion object {
     private const val TAG = "OverlayManager"
@@ -24,6 +26,29 @@ class OverlayManager(private val aMap: AMap) {
   private val polylines = mutableMapOf<String, com.amap.api.maps.model.Polyline>()
   private val polygons = mutableMapOf<String, com.amap.api.maps.model.Polygon>()
   
+  // Marker ID 映射
+  private val markerIdMap = mutableMapOf<com.amap.api.maps.model.Marker, String>()
+  
+  // Circle ID 映射
+  private val circleIdMap = mutableMapOf<com.amap.api.maps.model.Circle, String>()
+  
+  // Polygon ID 映射
+  private val polygonIdMap = mutableMapOf<com.amap.api.maps.model.Polygon, String>()
+  
+  // Polyline ID 映射
+  private val polylineIdMap = mutableMapOf<com.amap.api.maps.model.Polyline, String>()
+  
+  // 事件回调
+  var onMarkerPress: ((String, Double, Double) -> Unit)? = null
+  var onMarkerDragStart: ((String, Double, Double) -> Unit)? = null
+  var onMarkerDrag: ((String, Double, Double) -> Unit)? = null
+  var onMarkerDragEnd: ((String, Double, Double) -> Unit)? = null
+  var onCirclePress: ((String, Double, Double) -> Unit)? = null
+  var onPolygonPress: ((String, Double, Double) -> Unit)? = null
+  var onPolylinePress: ((String, Double, Double) -> Unit)? = null
+  
+  private val mainHandler = android.os.Handler(android.os.Looper.getMainLooper())
+  
   // ==================== 圆形覆盖物 ====================
   
   fun addCircle(id: String, props: Map<String, Any>) {
@@ -49,11 +74,13 @@ class OverlayManager(private val aMap: AMap) {
       
       val circle = aMap.addCircle(options)
       circles[id] = circle
+      circleIdMap[circle] = id
     }
   }
   
   fun removeCircle(id: String) {
     circles[id]?.let { circle ->
+      circleIdMap.remove(circle)
       circle.remove()
       circles.remove(id)
     }
@@ -84,11 +111,22 @@ class OverlayManager(private val aMap: AMap) {
   // ==================== 标记点 ====================
   
   fun addMarker(id: String, props: Map<String, Any>) {
+    Log.d(TAG, "addMarker 调用 - ID: $id")
+    Log.d(TAG, "addMarker props: $props")
     
     @Suppress("UNCHECKED_CAST")
     val position = props["position"] as? Map<String, Double>
     val title = props["title"] as? String
+    val snippet = props["snippet"] as? String
     val draggable = props["draggable"] as? Boolean ?: false
+    val icon = props["icon"]
+    // 将 RN 的点(points)转换为 Android 的 dp
+    val iconWidth = dpToPx((props["iconWidth"] as? Number)?.toFloat() ?: 40f)
+    val iconHeight = dpToPx((props["iconHeight"] as? Number)?.toFloat() ?: 40f)
+    val opacity = (props["opacity"] as? Number)?.toFloat() ?: 1.0f
+    val flat = props["flat"] as? Boolean ?: false
+    val zIndex = (props["zIndex"] as? Number)?.toFloat() ?: 0f
+    val anchor = props["anchor"] as? Map<String, Double>
     
     if (position != null) {
       val lat = position["latitude"] ?: 0.0
@@ -98,21 +136,115 @@ class OverlayManager(private val aMap: AMap) {
       val options = com.amap.api.maps.model.MarkerOptions()
         .position(latLng)
         .draggable(draggable)
+        .setFlat(flat)
+        .zIndex(zIndex)
       
       title?.let { options.title(it) }
+      snippet?.let { options.snippet(it) }
+      
+      anchor?.let {
+        val x = (it["x"] as? Number)?.toFloat() ?: 0.5f
+        val y = (it["y"] as? Number)?.toFloat() ?: 1.0f
+        options.anchor(x, y)
+      }
       
       val marker = aMap.addMarker(options)
+      marker?.alpha = opacity
+      
+      markers[id] = marker
+      marker?.let { markerIdMap[it] = id }
       
-      if (!title.isNullOrEmpty()) {
-        marker?.showInfoWindow()
+      // 加载自定义图标
+      icon?.let {
+        val uri = when (it) {
+          is String -> it
+          is Map<*, *> -> it["uri"] as? String
+          else -> null
+        }
+        uri?.let { iconUri ->
+          loadMarkerIcon(iconUri, iconWidth, iconHeight) { bitmap ->
+            mainHandler.post {
+              marker?.setIcon(BitmapDescriptorFactory.fromBitmap(bitmap))
+            }
+          }
+        }
       }
       
-      markers[id] = marker
+      // 设置事件监听器（只设置一次）
+      setupMarkerListeners()
     }
   }
   
+  private fun setupMarkerListeners() {
+    aMap.setOnMarkerClickListener { marker ->
+      markerIdMap[marker]?.let { id ->
+        onMarkerPress?.invoke(id, marker.position.latitude, marker.position.longitude)
+      }
+      false // 返回 false 允许显示 InfoWindow
+    }
+    
+    aMap.setOnMarkerDragListener(object : AMap.OnMarkerDragListener {
+      override fun onMarkerDragStart(marker: com.amap.api.maps.model.Marker?) {
+        marker?.let { m ->
+          markerIdMap[m]?.let { id ->
+            onMarkerDragStart?.invoke(id, m.position.latitude, m.position.longitude)
+          }
+        }
+      }
+      
+      override fun onMarkerDrag(marker: com.amap.api.maps.model.Marker?) {
+        marker?.let { m ->
+          markerIdMap[m]?.let { id ->
+            onMarkerDrag?.invoke(id, m.position.latitude, m.position.longitude)
+          }
+        }
+      }
+      
+      override fun onMarkerDragEnd(marker: com.amap.api.maps.model.Marker?) {
+        marker?.let { m ->
+          markerIdMap[m]?.let { id ->
+            onMarkerDragEnd?.invoke(id, m.position.latitude, m.position.longitude)
+          }
+        }
+      }
+    })
+  }
+  
+  private fun loadMarkerIcon(uri: String, width: Int, height: Int, callback: (Bitmap) -> Unit) {
+    Thread {
+      try {
+        Log.d(TAG, "开始加载图标: $uri")
+        val bitmap = when {
+          uri.startsWith("http://") || uri.startsWith("https://") -> {
+            Log.d(TAG, "加载网络图片")
+            BitmapFactory.decodeStream(URL(uri).openStream())
+          }
+          uri.startsWith("file://") -> {
+            Log.d(TAG, "加载本地文件")
+            BitmapFactory.decodeFile(uri.substring(7))
+          }
+          else -> {
+            Log.d(TAG, "未知 URI 格式")
+            null
+          }
+        }
+        
+        if (bitmap == null) {
+          Log.e(TAG, "图标加载失败: bitmap 为 null")
+        } else {
+          Log.d(TAG, "图标加载成功: ${bitmap.width}x${bitmap.height}")
+          val resized = Bitmap.createScaledBitmap(bitmap, width, height, true)
+          callback(resized)
+        }
+      } catch (e: Exception) {
+        Log.e(TAG, "图标加载异常: ${e.message}", e)
+      }
+    }.start()
+  }
+  
   fun removeMarker(id: String) {
     markers[id]?.let { marker ->
+      markerIdMap.remove(marker)
       marker.remove()
       markers.remove(id)
     }
@@ -123,7 +255,15 @@ class OverlayManager(private val aMap: AMap) {
       @Suppress("UNCHECKED_CAST")
       val position = props["position"] as? Map<String, Double>
       val title = props["title"] as? String
+      val snippet = props["snippet"] as? String
       val draggable = props["draggable"] as? Boolean
+      val icon = props["icon"]
+      val iconWidth = dpToPx((props["iconWidth"] as? Number)?.toFloat() ?: 40f)
+      val iconHeight = dpToPx((props["iconHeight"] as? Number)?.toFloat() ?: 40f)
+      val opacity = props["opacity"] as? Number
+      val flat = props["flat"] as? Boolean
+      val zIndex = props["zIndex"] as? Number
+      val anchor = props["anchor"] as? Map<String, Double>
       
       position?.let {
         val lat = it["latitude"] ?: 0.0
@@ -132,7 +272,32 @@ class OverlayManager(private val aMap: AMap) {
       }
       
       title?.let { marker.title = it }
+      snippet?.let { marker.snippet = it }
       draggable?.let { marker.isDraggable = it }
+      opacity?.let { marker.alpha = it.toFloat() }
+      flat?.let { marker.isFlat = it }
+      zIndex?.let { marker.zIndex = it.toFloat() }
+      
+      anchor?.let {
+        val x = (it["x"] as? Number)?.toFloat() ?: 0.5f
+        val y = (it["y"] as? Number)?.toFloat() ?: 1.0f
+        marker.setAnchor(x, y)
+      }
+      
+      icon?.let {
+        val uri = when (it) {
+          is String -> it
+          is Map<*, *> -> it["uri"] as? String
+          else -> null
+        }
+        uri?.let { iconUri ->
+          loadMarkerIcon(iconUri, iconWidth, iconHeight) { bitmap ->
+            mainHandler.post {
+              marker.setIcon(BitmapDescriptorFactory.fromBitmap(bitmap))
+            }
+          }
+        }
+      }
     }
   }
   
@@ -142,12 +307,12 @@ class OverlayManager(private val aMap: AMap) {
     
     @Suppress("UNCHECKED_CAST")
     val points = props["points"] as? List<Map<String, Double>>
-    val width = (props["strokeWidth"] as? Number)?.toFloat() ?: 10f
+    val width = (props["width"] as? Number)?.toFloat() ?: (props["strokeWidth"] as? Number)?.toFloat() ?: 10f
     val texture = props["texture"] as? String
     val color = if (!texture.isNullOrEmpty()) {
       android.graphics.Color.TRANSPARENT
     } else {
-      ColorParser.parseColor(props["strokeColor"])
+      ColorParser.parseColor(props["color"] ?: props["strokeColor"])
     }
     
     if (points != null && points.size >= 2) {
@@ -188,11 +353,13 @@ class OverlayManager(private val aMap: AMap) {
       }
       
       polylines[id] = polyline
+      polylineIdMap[polyline] = id
     }
   }
   
   fun removePolyline(id: String) {
     polylines[id]?.let { polyline ->
+      polylineIdMap.remove(polyline)
       polyline.remove()
       polylines.remove(id)
     }
@@ -247,12 +414,14 @@ class OverlayManager(private val aMap: AMap) {
       
       val polygon = aMap.addPolygon(options)
       polygons[id] = polygon
+      polygonIdMap[polygon] = id
       Log.d(TAG, "✅ 多边形创建成功")
     }
   }
   
   fun removePolygon(id: String) {
     polygons[id]?.let { polygon ->
+      polygonIdMap.remove(polygon)
       polygon.remove()
       polygons.remove(id)
     }
@@ -287,9 +456,94 @@ class OverlayManager(private val aMap: AMap) {
   /**
    * 清理所有覆盖物
    */
+  /**
+   * 检查点击位置是否在某个圆形内
+   */
+  fun checkCirclePress(latLng: LatLng): String? {
+    for ((circle, id) in circleIdMap) {
+      if (circle.contains(latLng)) {
+        return id
+      }
+    }
+    return null
+  }
+  
+  /**
+   * 检查点击位置是否在某个多边形内
+   */
+  fun checkPolygonPress(latLng: LatLng): String? {
+    for ((polygon, id) in polygonIdMap) {
+      if (polygon.contains(latLng)) {
+        return id
+      }
+    }
+    return null
+  }
+  
+  /**
+   * 检查点击位置是否在某条折线附近
+   */
+  fun checkPolylinePress(latLng: LatLng): String? {
+    val threshold = 20.0 // 20米容差
+    for ((polyline, id) in polylineIdMap) {
+      val points = polyline.points
+      if (points.size < 2) continue
+      
+      for (i in 0 until points.size - 1) {
+        val distance = distanceToSegment(latLng, points[i], points[i + 1])
+        if (distance <= threshold) {
+          return id
+        }
+      }
+    }
+    return null
+  }
+  
+  /**
+   * 计算点到线段的距离(米)
+   */
+  private fun distanceToSegment(point: LatLng, start: LatLng, end: LatLng): Double {
+    val p = android.location.Location("").apply {
+      latitude = point.latitude
+      longitude = point.longitude
+    }
+    val a = android.location.Location("").apply {
+      latitude = start.latitude
+      longitude = start.longitude
+    }
+    val b = android.location.Location("").apply {
+      latitude = end.latitude
+      longitude = end.longitude
+    }
+    
+    val ab = a.distanceTo(b).toDouble()
+    if (ab == 0.0) return a.distanceTo(p).toDouble()
+    
+    val ap = a.distanceTo(p).toDouble()
+    val bp = b.distanceTo(p).toDouble()
+    
+    val t = maxOf(0.0, minOf(1.0,
+      ((point.latitude - start.latitude) * (end.latitude - start.latitude) +
+       (point.longitude - start.longitude) * (end.longitude - start.longitude)) / (ab * ab)
+    ))
+    
+    val projection = LatLng(
+      start.latitude + t * (end.latitude - start.latitude),
+      start.longitude + t * (end.longitude - start.longitude)
+    )
+    
+    val proj = android.location.Location("").apply {
+      latitude = projection.latitude
+      longitude = projection.longitude
+    }
+    
+    return p.distanceTo(proj).toDouble()
+  }
+  
   fun clear() {
     circles.values.forEach { it.remove() }
     circles.clear()
+    circleIdMap.clear()
     
     markers.values.forEach { it.remove() }
     markers.clear()
@@ -299,5 +553,16 @@ class OverlayManager(private val aMap: AMap) {
     
     polygons.values.forEach { it.remove() }
     polygons.clear()
+    polygonIdMap.clear()
+    
+    polylineIdMap.clear()
+  }
+  
+  /**
+   * 将 dp 转换为 px
+   */
+  private fun dpToPx(dp: Float): Int {
+    val density = context.resources.displayMetrics.density
+    return (dp * density + 0.5f).toInt()
   }
 }