From e923f06d572c9a0e3b1eb2c54471af02c9d95bcf Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期四, 18 十二月 2025 10:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/kotlin/com/flightfeather/uav/biz/sourcetrace/model/PollutedArea.kt | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 8beb120..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
@@ -35,8 +35,18 @@
var township:String? = null
// 鏍煎紡鍖栧湴鍧�
var address: String? = null
- // 浜ゅ弶璺淇℃伅
+ // 鎵�鍦ㄩ亾璺悕绉�
+ var street:String? = null
+ // 鎵�鍦ㄩ亾璺笂鐨勬渶杩戦棬鐗屽彿
+ 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
@@ -85,10 +95,15 @@
if (config.isSearchAddress) {
try {
val address = AMapService.reGeo(MapUtil.wgs84ToGcj02(pair))
- this.township = address.province+address.district+address.township
- this.address = address.address + address.streetNumber
+ this.township = address.province + address.district + address.township
+ this.address = address.address
+ this.street = address.street
+ this.streetNumber = address.streetNumber
+ this.direction = address.direction
+ this.distance = address.distance
this.roadinter = address.roadinter
-// Thread.sleep(100)
+ this.distance2 = address.distance2
+ Thread.sleep(100)
} catch (e: Exception) {
e.printStackTrace()
}
--
Gitblit v1.9.3