Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-28 06f455915bb9d11caa8829942f9007809ee9ae3d

 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);
    }
}