|
@@ -1,5 +1,7 @@
|
|
package com.fdkankan.geo;
|
|
package com.fdkankan.geo;
|
|
|
|
|
|
|
|
+import cn.hutool.extra.spring.SpringUtil;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* @author Xiewj
|
|
* @author Xiewj
|
|
* @date 2024/12/31
|
|
* @date 2024/12/31
|
|
@@ -51,8 +53,7 @@ public class MapTool {
|
|
* @return Double[lon,lat]
|
|
* @return Double[lon,lat]
|
|
*/
|
|
*/
|
|
public static Double[] WGS84ToGCJ02(Double wgs_lon,Double wgs_lat){
|
|
public static Double[] WGS84ToGCJ02(Double wgs_lon,Double wgs_lat){
|
|
- GeoQueryUtil queryUtil=new GeoQueryUtil();
|
|
|
|
- queryUtil.init();
|
|
|
|
|
|
+ GeoQueryUtil queryUtil = SpringUtil.getBean(GeoQueryUtil.class);
|
|
if (!queryUtil.queryPoint(wgs_lon, wgs_lat)) {
|
|
if (!queryUtil.queryPoint(wgs_lon, wgs_lat)) {
|
|
return new Double[]{wgs_lon,wgs_lat};
|
|
return new Double[]{wgs_lon,wgs_lat};
|
|
}
|
|
}
|
|
@@ -77,8 +78,7 @@ public class MapTool {
|
|
* @return Double[lon,lat]
|
|
* @return Double[lon,lat]
|
|
*/
|
|
*/
|
|
public static Double[] GCJ02ToWGS84(Double gcj_lon,Double gcj_lat){
|
|
public static Double[] GCJ02ToWGS84(Double gcj_lon,Double gcj_lat){
|
|
- GeoQueryUtil queryUtil=new GeoQueryUtil();
|
|
|
|
- queryUtil.init();
|
|
|
|
|
|
+ GeoQueryUtil queryUtil = SpringUtil.getBean(GeoQueryUtil.class);
|
|
if (!queryUtil.queryPoint(gcj_lon, gcj_lat)) {
|
|
if (!queryUtil.queryPoint(gcj_lon, gcj_lat)) {
|
|
return new Double[]{gcj_lon,gcj_lat};
|
|
return new Double[]{gcj_lon,gcj_lat};
|
|
}
|
|
}
|