From 0366feb2fe536a27435685e152c34c75af68b712 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期二, 21 十月 2025 21:54:05 +0800
Subject: [PATCH] 2025.10.21 修改高德地图地理逆编码结果，让地理位置信息更加详细
---
src/main/kotlin/com/flightfeather/uav/common/net/AMapService.kt | 15 ++++++++++-----
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt | 6 ++++++
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt
index a236efd..f2f469a 100644
--- a/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt
+++ b/src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt
@@ -41,8 +41,12 @@
var streetNumber:String? = null
// 澶勪簬璇ラ棬鐗屽彿鐨勬柟鍚�
var direction:String? = null
+ // 澶勪簬璇ラ棬鐗屽彿鐨勬柟鍚戣窛绂�
+ var distance: String? = null
// 鎵�澶勬渶杩戜氦鍙夎矾鍙ｇ殑鏂瑰悜鍜岃窛绂�
var roadinter:String? = null
+ // 鎵�澶勬渶杩戜氦鍙夎矾鍙ｇ殑璺濈
+ var distance2: String? = null
// 姹℃煋鑼冨洿鎵囧舰鍖哄煙(缁忕含搴﹀杈瑰舰)
var polygon: List<Pair<Double, Double>>? = null
@@ -96,7 +100,9 @@
this.street = address.street
this.streetNumber = address.streetNumber
this.direction = address.direction
+ this.distance = address.distance
this.roadinter = address.roadinter
+ this.distance2 = address.distance2
Thread.sleep(100)
} catch (e: Exception) {
e.printStackTrace()
diff --git a/src/main/kotlin/com/flightfeather/uav/common/net/AMapService.kt b/src/main/kotlin/com/flightfeather/uav/common/net/AMapService.kt
index a5deec6..7c134be 100644
--- a/src/main/kotlin/com/flightfeather/uav/common/net/AMapService.kt
+++ b/src/main/kotlin/com/flightfeather/uav/common/net/AMapService.kt
@@ -40,8 +40,12 @@
val streetNumber: String,
// 澶勪簬璇ラ棬鐗屽彿鐨勬柟鍚�
val direction:String,
- // 鎵�澶勬渶杩戜氦鍙夎矾鍙ｇ殑鏂瑰悜鍜岃窛绂�
- val roadinter: String,
+ // 澶勪簬璇ラ棬鐗屽彿鐨勬柟鍚戣窛绂�
+ val distance:String,
+ // 鎵�澶勬渶杩戜氦鍙夎矾鍙ｇ殑鏂瑰悜
+ val roadinter: String?,
+ // 鎵�澶勬渶杩戜氦鍙夎矾鍙ｇ殑璺濈
+ val distance2: String?,
)
data class AMapDirection(
@@ -126,9 +130,10 @@
getJsonString(streetNumber["street"]),
getJsonString(streetNumber["number"]),
getJsonString(streetNumber["direction"]),
-// + streetNumber["distance"].asDouble.toInt() + "绫�",
- if(roadinter == null) "" else getJsonString(roadinter.get("first_name")) +"鍜�" + getJsonString(roadinter.get("second_name")) + "浜ゅ弶鍙�"
- + getJsonString(roadinter.get("direction")) + getJsonString(roadinter.get("distance")) + "绫�",
+ getJsonString(streetNumber["distance"]),
+ if(roadinter == null) null else getJsonString(roadinter.get("first_name")) +"鍜�" + getJsonString(roadinter.get("second_name")) + "浜ゅ弶鍙�"
+ + getJsonString(roadinter.get("direction")),
+ if(roadinter == null) null else getJsonString(roadinter["distance"])
)
} catch (e: Exception) {
val regeocode = obj["regeocode"].asJsonObject
--
Gitblit v1.9.3