lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:20:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复CoordinateUtil坐标转换参数错误

Browse Source
This commit is contained in:
Looly 2022-12-27 21:40:59 +08:00
parent 200c098b29
commit 582f9e7a8c
3 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -31,6 +31,7 @@
* 【core 】 修复IndexedComparator导致的数据错乱问题（ExcelWriter使用部分别名导致字段丢失）（issue#I66Z6B@Gitee）
* 【crypto】 修复sm2构造方法NullPointerException（pr#2820@Github）
* 【core 】 修复ConverterRegistry中无效加载导致的问题（issue#2812@Github）
* 【core 】 修复CoordinateUtil坐标转换参数错误（pr#895@Gitee）
-------------------------------------------------------------------------------------------------------------

24
hutool-core/src/main/java/cn/hutool/core/util/CoordinateUtil.java
View File

@ -135,19 +135,6 @@ public class CoordinateUtil {
//----------------------------------------------------------------------------------- Private methods begin
/**
* 转换坐标公共核心
*
* @param lng 经度坐标
* @param lat 纬度坐标
* @return 返回结果
*/
private static double transCore(double lng, double lat) {
double ret = (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
return ret;
}
/**
* WGS84 与 火星坐标系 (GCJ-02)转换的偏移算法（非精确）
*
@ -162,7 +149,7 @@ public class CoordinateUtil {
double magic = Math.sin(lat / 180.0 * PI);
magic = 1 - CORRECTION_PARAM * magic * magic;
double sqrtMagic = Math.sqrt(magic);
final double sqrtMagic = Math.sqrt(magic);
dlng = (dlng * 180.0) / (RADIUS / sqrtMagic * Math.cos(lat / 180.0 * PI) * PI);
dlat = (dlat * 180.0) / ((RADIUS * (1 - CORRECTION_PARAM)) / (magic * sqrtMagic) * PI);
@ -184,7 +171,8 @@ public class CoordinateUtil {
*/
private static double transLng(double lng, double lat) {
double ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
ret += transCore(lng, lat);
ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0;
ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0;
return ret;
}
@ -197,8 +185,10 @@ public class CoordinateUtil {
* @return ret 计算完成后的
*/
private static double transLat(double lng, double lat) {
double ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
ret += transCore(lng, lat);
double ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat
+ 0.2 * Math.sqrt(Math.abs(lng));
ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0;
return ret;
}

29
hutool-core/src/test/java/cn/hutool/core/util/CoordinateUtilTest.java
View File

@ -12,30 +12,38 @@ import org.junit.Test;
public class CoordinateUtilTest {
@Test
public void wgs84ToGcj02Test(){
public void wgs84ToGcj02Test() {
final CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToGcj02(116.404, 39.915);
Assert.assertEquals(116.41033392216508D, coordinate.getLng(), 0);
Assert.assertEquals(116.41024449916938D, coordinate.getLng(), 0);
Assert.assertEquals(39.91640428150164D, coordinate.getLat(), 0);
}
@Test
public void gcj02ToWgs84Test(){
public void gcj02ToWgs84Test() {
final CoordinateUtil.Coordinate coordinate = CoordinateUtil.gcj02ToWgs84(116.404, 39.915);
Assert.assertEquals(116.39766607783491D, coordinate.getLng(), 0);
Assert.assertEquals(116.39775550083061D, coordinate.getLng(), 0);
Assert.assertEquals(39.91359571849836D, coordinate.getLat(), 0);
}
@Test
public void wgs84toBd09Test(){
public void wgs84toBd09Test() {
final CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToBd09(116.404, 39.915);
Assert.assertEquals(116.41671695444782D, coordinate.getLng(), 0);
Assert.assertEquals(39.922698713521726D, coordinate.getLat(), 0);
Assert.assertEquals(116.41662724378733D, coordinate.getLng(), 0);
Assert.assertEquals(39.922699552216216D, coordinate.getLat(), 0);
}
@Test
public void bd09toWgs84Test(){
public void wgs84toBd09Test2() {
// https://tool.lu/coordinate/
final CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToBd09(122.99395597D, 44.99804071D);
Assert.assertEquals(123.00636516028885D, coordinate.getLng(), 0);
Assert.assertEquals(45.0063690918959D, coordinate.getLat(), 0);
}
@Test
public void bd09toWgs84Test() {
final CoordinateUtil.Coordinate coordinate = CoordinateUtil.bd09toWgs84(116.404, 39.915);
Assert.assertEquals(116.39129143419822D, coordinate.getLng(), 0);
Assert.assertEquals(116.3913836995125D, coordinate.getLng(), 0);
Assert.assertEquals(39.907253214522164D, coordinate.getLat(), 0);
}
@ -47,10 +55,9 @@ public class CoordinateUtilTest {
}
@Test
public void bd09toGcj02Test(){
public void bd09toGcj02Test() {
final CoordinateUtil.Coordinate coordinate = CoordinateUtil.bd09ToGcj02(116.404, 39.915);
Assert.assertEquals(116.39762729119315D, coordinate.getLng(), 0);
Assert.assertEquals(39.90865673957631D, coordinate.getLat(), 0);
}
}