generated from liutk/owl-admin-base
wgs84 to gcj02
parent
5af75cc9d3
commit
b1955f7625
|
|
@ -76,6 +76,7 @@ class SignController extends Controller
|
||||||
if ($request->filled(['lon', 'lat'])) {
|
if ($request->filled(['lon', 'lat'])) {
|
||||||
$lon = $request->input('lon');
|
$lon = $request->input('lon');
|
||||||
$lat = $request->input('lat');
|
$lat = $request->input('lat');
|
||||||
|
// 切换坐标系
|
||||||
$locationType = $request->input('location_type', 'wgs84');
|
$locationType = $request->input('location_type', 'wgs84');
|
||||||
if ($locationType == 'wgs84') {
|
if ($locationType == 'wgs84') {
|
||||||
$res = wgs84ToGcj02($lat, $lon);
|
$res = wgs84ToGcj02($lat, $lon);
|
||||||
|
|
@ -135,9 +136,18 @@ class SignController extends Controller
|
||||||
$maxDistance = (int) AdminSettingService::make()->arrayGet('sign', 'distance');
|
$maxDistance = (int) AdminSettingService::make()->arrayGet('sign', 'distance');
|
||||||
|
|
||||||
if ($maxDistance > 0 && $type == SignType::Normal) {
|
if ($maxDistance > 0 && $type == SignType::Normal) {
|
||||||
|
$lon = $request->input('position.lon');
|
||||||
|
$lat = $request->input('position.lat');
|
||||||
|
$locationType = $request->input('position.location_type', 'wgs84');
|
||||||
|
// 切换坐标系
|
||||||
|
if ($locationType == 'wgs84') {
|
||||||
|
$res = wgs84ToGcj02($lat, $lon);
|
||||||
|
$lon = $res['lon'];
|
||||||
|
$lat = $res['lat'];
|
||||||
|
}
|
||||||
$distance = $service->haversineDistance(
|
$distance = $service->haversineDistance(
|
||||||
$request->input('position.lat'),
|
$lat,
|
||||||
$request->input('position.lon'),
|
$lon,
|
||||||
$store->lat,
|
$store->lat,
|
||||||
$store->lon,
|
$store->lon,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue