From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 17 十二月 2024 11:41:00 +0800
Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象
---
src/main/kotlin/cn/flightfeather/supervision/business/location/CoordinateUtil.kt | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/location/CoordinateUtil.kt b/src/main/kotlin/cn/flightfeather/supervision/business/location/CoordinateUtil.kt
index a2678ce..e145035 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/business/location/CoordinateUtil.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/business/location/CoordinateUtil.kt
@@ -1,8 +1,6 @@
package cn.flightfeather.supervision.business.location
-import kotlin.math.PI
-import kotlin.math.cos
-import kotlin.math.sin
+import kotlin.math.*
object CoordinateUtil {
@@ -32,4 +30,17 @@
fun disToLng(distance: Double): Double {
return distance * 0.00001
}
+
+ fun calculateDistance(lon1: Double, lat1: Double, lon2: Double, lat2: Double): Double {
+ val R = 6371; // 鍦扮悆骞冲潎鍗婂緞锛屽崟浣嶅叕閲�
+ val dLat = (lat2 - lat1) * Math.PI / 180;
+ val dLon = (lon2 - lon1) * Math.PI / 180;
+ val a = sin(dLat / 2) * sin(dLat / 2) +
+ cos(lat1 * Math.PI / 180) * cos(lat2 * Math.PI / 180) *
+ sin(dLon / 2) * sin(dLon / 2);
+ val c = 2 * atan2(sqrt(a), sqrt(1 - a));
+ val distance = R * c;
+ return distance;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3