From 64a71565792d4f2e9fd31eab6e98e972c12daa86 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 十一月 2024 20:15:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/GeodesyUtil.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/GeodesyUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/GeodesyUtil.java
index ff1cfd1..276d9f1 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/GeodesyUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/GeodesyUtil.java
@@ -36,14 +36,14 @@
double WGS72 = getDistanceMeter(source, target, Ellipsoid.WGS72);
double Clarke1858 = getDistanceMeter(source, target, Ellipsoid.Clarke1858);
double Clarke1880 = getDistanceMeter(source, target, Ellipsoid.Clarke1880);
-// System.out.println("Sphere坐标系计算结果："+Sphere + "米");
-// System.out.println("WGS84坐标系计算结果："+WGS84 + "米");
-// System.out.println("GRS80坐标系计算结果："+GRS80 + "米");
-// System.out.println("GRS67坐标系计算结果："+GRS67 + "米");
-// System.out.println("ANS坐标系计算结果："+ANS + "米");
-// System.out.println("WGS72坐标系计算结果："+WGS72 + "米");
-// System.out.println("Clarke1858坐标系计算结果："+Clarke1858 + "米");
-// System.out.println("Clarke1880坐标系计算结果："+Clarke1880 + "米");
+ System.out.println("Sphere坐标系计算结果："+Sphere + "米");
+ System.out.println("WGS84坐标系计算结果："+WGS84 + "米");
+ System.out.println("GRS80坐标系计算结果："+GRS80 + "米");
+ System.out.println("GRS67坐标系计算结果："+GRS67 + "米");
+ System.out.println("ANS坐标系计算结果："+ANS + "米");
+ System.out.println("WGS72坐标系计算结果："+WGS72 + "米");
+ System.out.println("Clarke1858坐标系计算结果："+Clarke1858 + "米");
+ System.out.println("Clarke1880坐标系计算结果："+Clarke1880 + "米");
map.put("Sphere", Sphere);
map.put("WGS84", WGS84);
map.put("GRS80", GRS80);
@@ -67,7 +67,7 @@
public static void main(String[] ages){
GeodesyUtil geodesyUtil = new GeodesyUtil();
- Map<String, Double> distance = geodesyUtil.getDistance("115.481028,39.989643", "114.465302,40.004717");
+ Map<String, Double> distance = geodesyUtil.getDistance("104.063855,30.575442", "104.679931,31.471814");
System.err.println(distance);
}
}
--
Gitblit v1.7.1