高清地图+无人机实时信息显示异常问题修复
This commit is contained in:
@@ -4,6 +4,7 @@ import 'dart:convert';
|
||||
import 'dart:math';
|
||||
import 'dart:math' as math;
|
||||
import 'dart:typed_data';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/rendering.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
@@ -48,6 +49,7 @@ import 'package:maibu_satabot_v2/features/home/presentation/widgets/common/trace
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/CenterLocation.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/HeadingPointer.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/dji_tile_layer.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/geoserver_suzhou_layer.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/obsToast.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/startpoint_area.dart';
|
||||
import 'package:image/image.dart' as _image; // 注意命名空间冲突,使用 as img
|
||||
@@ -490,18 +492,15 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
}
|
||||
|
||||
// 2. 关键:同步机器人模式坐标(保存时边框不丢失)
|
||||
// ⚠️ 地图已切换为 WGS84,不再需要坐标转换
|
||||
if (_currentRobotMode == RobotMode.point && _robotModeWgsPoints.isEmpty) {
|
||||
_robotModeWgsPoints = _markedPoints.map((p) {
|
||||
return gcj02ToWgs84(p.latitude, p.longitude);
|
||||
}).toList();
|
||||
_robotModeWgsPoints = List.from(_markedPoints); // 直接使用 WGS84 坐标
|
||||
}
|
||||
// 兜底:Robot模式下_robotModeWgsPoints缓存未写入时,从_markedPoints恢复
|
||||
if (_currentRobotMode == RobotMode.robot &&
|
||||
_robotModeWgsPoints.isEmpty &&
|
||||
_markedPoints.isNotEmpty) {
|
||||
_robotModeWgsPoints = _markedPoints.map((p) {
|
||||
return gcj02ToWgs84(p.latitude, p.longitude);
|
||||
}).toList();
|
||||
_robotModeWgsPoints = List.from(_markedPoints); // 直接使用 WGS84 坐标
|
||||
}
|
||||
|
||||
if (mounted) {
|
||||
@@ -931,7 +930,8 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
.toList();
|
||||
}
|
||||
return _markedPoints.map((point) {
|
||||
final wgs84 = gcj02ToWgs84(point.latitude, point.longitude);
|
||||
// ⚠️ 地图已切换为 WGS84,直接使用原始坐标
|
||||
final wgs84 = LatLng(point.latitude, point.longitude);
|
||||
return {'lng': wgs84.longitude, 'lat': wgs84.latitude};
|
||||
}).toList();
|
||||
}
|
||||
@@ -944,14 +944,8 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
'outer': _currentWorkMode == WorkMode.custom
|
||||
? [] // 自定义模式 outer 为空
|
||||
: _markedPointsToWgs(), // 弓字模式 outer 为打点坐标
|
||||
// 🔥 对齐 Web 端:弓字模式 path=API返回,自定义模式 path=打点
|
||||
// 旧逻辑:自定义模式 path 为空数组
|
||||
'path': _currentWorkMode == WorkMode.custom
|
||||
? _markedPointsToWgs() // 自定义模式 path 为打点坐标
|
||||
: typedPathList // 弓字模式 path 为 API 返回的路径
|
||||
.map((point) => {'lng': point.longitude, 'lat': point.latitude})
|
||||
.toList(),
|
||||
|
||||
// 🔥 统一使用用户手动打点的边界点,不再上传算法清扫轨迹点
|
||||
'path': _markedPointsToWgs(),
|
||||
'planModel': _currentWorkMode == WorkMode.bow ? 0 : 2, // 作业模式值
|
||||
};
|
||||
|
||||
@@ -1425,10 +1419,8 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
// 保存当前障碍物组(Robot模式下直接用WGS84坐标)
|
||||
if (_currentRobotMode == RobotMode.robot &&
|
||||
_robotModeObsWgsPoints.isNotEmpty) {
|
||||
final gcjPoints = _robotModeObsWgsPoints
|
||||
.map((wgs) => wgs84ToGcj02(wgs.latitude, wgs.longitude))
|
||||
.toList();
|
||||
_obstacleHoles.add(gcjPoints);
|
||||
// ⚠️ 地图已切换为 WGS84,直接使用原始坐标
|
||||
_obstacleHoles.add(List.from(_robotModeObsWgsPoints));
|
||||
_obstacleWgsHoles.add(List.from(_robotModeObsWgsPoints));
|
||||
} else {
|
||||
_obstacleHoles.add(List.from(_currentObstaclePoints));
|
||||
@@ -1751,14 +1743,16 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
double? lat = safeToDouble(item['lat']);
|
||||
double? lon = safeToDouble(item['lng'] ?? item['lon']);
|
||||
if (lat != null && lon != null) {
|
||||
newPathPoints.add(convertWGS84ToGCJ02(lat, lon));
|
||||
// ⚠️ 地图已切换为 WGS84,直接使用原始坐标
|
||||
newPathPoints.add(LatLng(lat, lon));
|
||||
}
|
||||
}
|
||||
for (var item in outerList) {
|
||||
double? lng = safeToDouble(item['lng'] ?? item['lon']);
|
||||
double? lat = safeToDouble(item['lat']);
|
||||
if (lng != null && lat != null) {
|
||||
newOuterPoints.add(convertWGS84ToGCJ02(lat, lng));
|
||||
// ⚠️ 地图已切换为 WGS84,直接使用原始坐标
|
||||
newOuterPoints.add(LatLng(lat, lng));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1871,26 +1865,28 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
) {
|
||||
_onDeviceData(lng, lat, obfFlag, headingStatus, controlMode);
|
||||
|
||||
final gcjPoint = wgs84ToGcj02(lat, lng);
|
||||
// ⚠️ 地图已切换为 WGS84,直接使用原始坐标
|
||||
final currentPoint = LatLng(lat, lng);
|
||||
|
||||
//final initCenter = bd09ToGcj02(
|
||||
// '120.81992468426961', // 经度
|
||||
// '32.04532826114155',
|
||||
//);
|
||||
|
||||
// 🔥 修复1:初始化坐标改为直接使用有效GCJ02坐标,避免BD09转换风险
|
||||
// 🔥 修复1:初始化坐标改为直接使用有效WGS84坐标
|
||||
final initCenter = _getDefaultValidCenter();
|
||||
_currentWgsLatLng = LatLng(lat, lng);
|
||||
|
||||
_traceManager.upsert(_currentWgsLatLng as PlotPoint, TPAction.UPDATE);
|
||||
tracePoint = _traceManager.getTracePoint();
|
||||
gctracePoint = batchWgs84ToGcj02(tracePoint!);
|
||||
// ⚠️ 地图已切换为 WGS84,直接使用原始轨迹点
|
||||
gctracePoint = List.from(tracePoint!);
|
||||
// _logger.log("[当前轨迹模式][转换后gctracePoint]: ${gctracePoint!.length}");
|
||||
// _logger.log("[当前轨迹模式]:${_traceManager.getMode()}"); // 这里必须加 ()
|
||||
|
||||
//_currentLatLng = gcjPoint; // ✅ 状态变量在setState内更新
|
||||
if (_isValidLatLng(gcjPoint.latitude, gcjPoint.longitude)) {
|
||||
_currentLatLng = gcjPoint;
|
||||
//_currentLatLng = currentPoint; // ✅ 状态变量在setState内更新
|
||||
if (_isValidLatLng(currentPoint.latitude, currentPoint.longitude)) {
|
||||
_currentLatLng = currentPoint;
|
||||
} else {
|
||||
_currentLatLng = null;
|
||||
}
|
||||
@@ -1909,24 +1905,20 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
onTap: (_, __) {}, // 空实现,禁用地图点击响应
|
||||
),
|
||||
children: [
|
||||
/// 高德瓦片(GCJ-02)
|
||||
/// ESRI World Imagery(WGS84 坐标系,全球高清卫星图)
|
||||
/// 替代高德地图(GCJ02),统一坐标系,无需坐标转换
|
||||
TileLayer(
|
||||
//urlTemplate:
|
||||
// "https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=2&style=7&key=bbb1f0f20eed6bf679eddf2625630aba",
|
||||
urlTemplate:
|
||||
'https://webrd02.is.autonavi.com/appmaptile'
|
||||
'?style=8&x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1'
|
||||
'&key=bbb1f0f20eed6bf679eddf2625630aba',
|
||||
// 🔥 修复:适配高DPI(替代pixelRatio)
|
||||
// tileSize: 512, // 高清瓦片尺寸(默认256,改为512适配scale=2)
|
||||
tileProvider: NetworkTileProvider(
|
||||
// 自定义瓦片请求头(可选,提升兼容性)
|
||||
headers: {
|
||||
'Referer': 'https://www.amap.com', // 高德要求的Referer
|
||||
},
|
||||
),
|
||||
maxZoom: 18,
|
||||
urlTemplate: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||
userAgentPackageName: 'com.example.app',
|
||||
minZoom: 0,
|
||||
maxZoom: 19,
|
||||
),
|
||||
|
||||
/// GeoServer 苏州无人机高清影像叠加层(WGS84 基准,无偏移)
|
||||
/// 实际地块很小(约 250m,中心 31.0833/120.8404),需 zoom >= 16 才能看到
|
||||
/// 当前 WMS 兜底(原生 EPSG:4326);公司补配 GWC EPSG:3857 后切 WMTS
|
||||
/// 切换位置:geoserver_suzhou_layer.dart 的 kUseWmtsTile 开关
|
||||
GeoSuzhouOverlay(),
|
||||
//if (isDjMapShow) DJITileLayer(stationName: _currentStation.name, mapController: _mapController),
|
||||
|
||||
// 绘制path折线(Line模式)
|
||||
@@ -2512,8 +2504,87 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
return;
|
||||
}
|
||||
|
||||
// 🔥 步骤3: 任务确认成功,更新UI状态
|
||||
debugPrint('🎯 [开始作业] 步骤3: 任务就绪, currentTaskId=${taskCubit.state.currentTaskId}');
|
||||
// 🔥 新增:步骤2.5 - 调用 getTaskPath 接口获取完整路径数据
|
||||
debugPrint('📍 [开始作业] 步骤2.5: 调用 getTaskPath 接口获取路径数据');
|
||||
final currentTaskId = taskCubit.state.currentTaskId;
|
||||
bool pathFetchSuccess = false;
|
||||
List<LatLng>? fetchedPathPoints;
|
||||
|
||||
try {
|
||||
final dio = sl<Dio>();
|
||||
final response = await dio.get(
|
||||
'http://1.95.137.212:8081/iot/taskPath/getTaskPath',
|
||||
queryParameters: {
|
||||
'taskId': currentTaskId,
|
||||
},
|
||||
);
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final data = response.data as Map<String, dynamic>;
|
||||
final code = data['code'];
|
||||
final codeValue = code is int ? code : int.tryParse(code?.toString() ?? '');
|
||||
|
||||
if (codeValue == 200) {
|
||||
final pathData = data['data'];
|
||||
debugPrint('✅ [开始作业] getTaskPath 接口调用成功, data类型: ${pathData.runtimeType}');
|
||||
|
||||
if (pathData != null && pathData is Map<String, dynamic>) {
|
||||
final pathList = pathData['path'];
|
||||
if (pathList != null && pathList is List && pathList.isNotEmpty) {
|
||||
debugPrint('✅ [开始作业] 获取到路径点数: ${pathList.length}');
|
||||
|
||||
// 将路径点渲染到地图上
|
||||
fetchedPathPoints = pathList.map((point) {
|
||||
final lat = (point['lat'] as num?)?.toDouble() ?? 0.0;
|
||||
final lng = (point['lng'] ?? point['lon'] as num?)?.toDouble() ?? 0.0;
|
||||
return LatLng(lat, lng);
|
||||
}).toList();
|
||||
|
||||
// 渲染路径到地图
|
||||
setState(() {
|
||||
gcjPathPoints = fetchedPathPoints!;
|
||||
typedPathList = fetchedPathPoints!.map((latLng) {
|
||||
return work_area_model.DeviceAddPathPointModel(
|
||||
latitude: latLng.latitude,
|
||||
longitude: latLng.longitude,
|
||||
);
|
||||
}).toList();
|
||||
});
|
||||
|
||||
pathFetchSuccess = true;
|
||||
debugPrint('✅ [开始作业] 路径已渲染到地图');
|
||||
} else {
|
||||
debugPrint('⚠️ [开始作业] 路径数据为空');
|
||||
}
|
||||
} else {
|
||||
debugPrint('⚠️ [开始作业] 路径数据结构格式错误');
|
||||
}
|
||||
} else {
|
||||
debugPrint('❌ [开始作业] getTaskPath 接口返回业务失败: $code');
|
||||
}
|
||||
} else {
|
||||
debugPrint('❌ [开始作业] getTaskPath 接口HTTP失败: ${response.statusCode}');
|
||||
}
|
||||
} catch (e) {
|
||||
debugPrint('❌ [开始作业] getTaskPath 接口调用异常: $e');
|
||||
}
|
||||
|
||||
// 🔥 判断路径获取结果
|
||||
if (!pathFetchSuccess) {
|
||||
debugPrint('❌ [开始作业] 路径数据获取失败或为空,关闭loading,弹出提示,终止作业启动');
|
||||
setState(() {
|
||||
isStopWork = false;
|
||||
isStartWork = false;
|
||||
_workStatus = WorkStatus.idle;
|
||||
});
|
||||
_showPageToast(
|
||||
message: '获取路径数据失败,无法启动作业',
|
||||
type: ToastType.error,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
debugPrint('🎯 [开始作业] 步骤4: 任务就绪, currentTaskId=${taskCubit.state.currentTaskId}');
|
||||
setState(() {
|
||||
isStopWork = false;
|
||||
isStartWork = true;
|
||||
@@ -2521,8 +2592,8 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
});
|
||||
context.read<DevicesCubit>().updateAppState(AppState.routePlanning);
|
||||
|
||||
// 🔥 步骤4: 刷新任务池(保护 taskId 不被覆盖)
|
||||
debugPrint('🔄 [开始作业] 步骤4: 刷新任务池');
|
||||
// 🔥 步骤5: 刷新任务池(保护 taskId 不被覆盖)
|
||||
debugPrint('🔄 [开始作业] 步骤5: 刷新任务池');
|
||||
final _confirmedTaskId = taskCubit.state.currentTaskId;
|
||||
await taskCubit.fetchAndFilterTask(deviceId);
|
||||
if (_confirmedTaskId != null && taskCubit.state.currentTaskId == null) {
|
||||
@@ -2530,8 +2601,8 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
debugPrint('🛡️ [开始作业] taskId 被刷新覆盖,已还原: $_confirmedTaskId');
|
||||
}
|
||||
|
||||
// 🔥 步骤5: 启动MQTT到达点监听
|
||||
debugPrint('📡 [开始作业] 步骤5: 启动MQTT监听, deviceId: $deviceId, taskId: $_confirmedTaskId');
|
||||
// 🔥 步骤6: 启动MQTT到达点监听
|
||||
debugPrint('📡 [开始作业] 步骤6: 启动MQTT监听, deviceId: $deviceId, taskId: $_confirmedTaskId');
|
||||
try {
|
||||
await context.read<DevicesCubit>().startListeningMqttArrive(deviceId: deviceId, taskId: _confirmedTaskId!);
|
||||
debugPrint('✅ [开始作业] MQTT到达点监听已启动');
|
||||
@@ -2539,8 +2610,8 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
debugPrint('⚠️ [开始作业] MQTT监听启动失败: $e (非致命,继续)');
|
||||
}
|
||||
|
||||
// 🔥 步骤6: 持久化状态
|
||||
debugPrint('💾 [开始作业] 步骤6: 持久化状态, taskId=${taskCubit.state.currentTaskId}');
|
||||
// 🔥 步骤7: 持久化状态
|
||||
debugPrint('💾 [开始作业] 步骤7: 持久化状态, taskId=${taskCubit.state.currentTaskId}');
|
||||
_showPageToast(message: "作业已开始", type: ToastType.success);
|
||||
_saveDataToLocal();
|
||||
|
||||
@@ -3511,18 +3582,12 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
firstPointWgs = _robotModeWgsPoints.first;
|
||||
} else if (_currentRobotMode == RobotMode.point &&
|
||||
_markedPoints.isNotEmpty) {
|
||||
LatLng firstPointGcj = _markedPoints.first;
|
||||
firstPointWgs = gcj02ToWgs84(
|
||||
firstPointGcj.latitude,
|
||||
firstPointGcj.longitude,
|
||||
);
|
||||
// ⚠️ 地图已切换为 WGS84,直接使用原始坐标
|
||||
firstPointWgs = _markedPoints.first;
|
||||
} else if (_markedPoints.isNotEmpty) {
|
||||
// 兜底:_robotModeWgsPoints 为空但_markedPoints有数据(新缓存key未写入等场景)
|
||||
LatLng firstPointGcj = _markedPoints.first;
|
||||
firstPointWgs = gcj02ToWgs84(
|
||||
firstPointGcj.latitude,
|
||||
firstPointGcj.longitude,
|
||||
);
|
||||
// ⚠️ 地图已切换为 WGS84,直接使用原始坐标
|
||||
firstPointWgs = _markedPoints.first;
|
||||
} else {
|
||||
if (showTips) {
|
||||
_showPageToast(message: '参考点坐标为空,请先添加作业区域打点!', type: ToastType.error);
|
||||
@@ -3546,20 +3611,19 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
);
|
||||
}).toList();
|
||||
} else if (_markedPoints.isNotEmpty) {
|
||||
// robot模式但_robotModeWgsPoints为空时,兜底用_markedPoints转换
|
||||
// robot模式但_robotModeWgsPoints为空时,用_markedPoints(已是WGS84)
|
||||
outerPositions = _markedPoints.map((latLng) {
|
||||
final wgs84Point = gcj02ToWgs84(latLng.latitude, latLng.longitude);
|
||||
return work_area_model.Position(
|
||||
lat: wgs84Point.latitude,
|
||||
lon: wgs84Point.longitude,
|
||||
lat: latLng.latitude,
|
||||
lon: latLng.longitude,
|
||||
);
|
||||
}).toList();
|
||||
}
|
||||
gcjOuterPoints = outerPositions.map((point) {
|
||||
double wgs84Lat = point.lat;
|
||||
double wgs84Lon = point.lon;
|
||||
final gcjPoint = wgs84ToGcj02(wgs84Lat, wgs84Lon);
|
||||
return LatLng(gcjPoint.latitude, gcjPoint.longitude);
|
||||
// ⚠️ 地图已切换为 WGS84,直接使用原始坐标
|
||||
return LatLng(wgs84Lat, wgs84Lon);
|
||||
}).toList();
|
||||
|
||||
final outerBoundary = work_area_model.OuterBoundary(
|
||||
@@ -3588,13 +3652,10 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
for (var holePoints in _obstacleHoles) {
|
||||
List<work_area_model.Position> innerPositionList = [];
|
||||
innerPositionList = holePoints.map((latLng) {
|
||||
final wgs84Point = gcj02ToWgs84(
|
||||
latLng.latitude,
|
||||
latLng.longitude,
|
||||
);
|
||||
// ⚠️ 地图已切换为 WGS84,直接使用原始坐标
|
||||
return work_area_model.Position(
|
||||
lat: wgs84Point.latitude,
|
||||
lon: wgs84Point.longitude,
|
||||
lat: latLng.latitude,
|
||||
lon: latLng.longitude,
|
||||
);
|
||||
}).toList();
|
||||
positionList.add(innerPositionList);
|
||||
@@ -3625,6 +3686,8 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
);
|
||||
}
|
||||
|
||||
// 🔥 已废弃:不再调用旧的路径生成API,path只传用户手动打点的边界点
|
||||
/*
|
||||
await context.read<DevicesCubit>().generatePath(
|
||||
reference: referencePoint,
|
||||
heading: heading,
|
||||
@@ -3671,6 +3734,7 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
moveMapToPointsCenter(gcjPathPoints);
|
||||
}
|
||||
}
|
||||
*/
|
||||
} catch (e) {
|
||||
debugPrint('路径生成异常:$e');
|
||||
if (showTips) {
|
||||
@@ -3950,6 +4014,39 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
),
|
||||
),
|
||||
|
||||
/// 悬浮"回到苏州"按钮:一键跳转到 GeoServer 苏州地块(zoom 18 才能看清 250m 地块)
|
||||
Positioned(
|
||||
top: 60,
|
||||
left: 10,
|
||||
child: GestureDetector(
|
||||
onTap: () => _mapController.move(kSuzhouCenter, 18),
|
||||
child: Container(
|
||||
width: 40,
|
||||
height: 40,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white.withOpacity(0.8),
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black12,
|
||||
blurRadius: 3,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
],
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: const Text(
|
||||
'苏',
|
||||
style: TextStyle(
|
||||
color: Colors.black87,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
/// 核心:地图正中心固定定位标
|
||||
if (_currentRobotMode == RobotMode.point)
|
||||
Positioned(
|
||||
@@ -4428,12 +4525,14 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
}
|
||||
}
|
||||
|
||||
// 转换单个WGS84坐标到GCJ02
|
||||
LatLng convertWGS84ToGCJ02(double lat, double lon) {
|
||||
return wgs84ToGcj02(lat, lon);
|
||||
}
|
||||
// ⚠️ 以下函数已注释 - 地图已切换为 ESRI WGS84,不再需要 GCJ02 转换
|
||||
// 后续确认无误后可删除
|
||||
// ⚠️ convertWGS84ToGCJ02 函数已删除 - 地图已切换为 ESRI WGS84,不再需要 GCJ02 转换
|
||||
// 以下坐标转换函数保留但注释,后续确认无误后可删除
|
||||
|
||||
/// =======================================================
|
||||
// ⚠️ 坐标转换函数已注释 - 地图已切换为 ESRI WGS84,不再需要 GCJ02 转换
|
||||
// 以下函数保留但注释,后续确认无误后可删除
|
||||
/*
|
||||
/// 坐标转换:WGS84 -> GCJ02(国内高德/腾讯通用)
|
||||
/// =======================================================
|
||||
const double _pi = 3.1415926535897932384626;
|
||||
@@ -4560,8 +4659,9 @@ double _transformLon(double x, double y) {
|
||||
(150.0 * sin(x / 12.0 * _pi) + 300.0 * sin(x / 30.0 * _pi)) * 2.0 / 3.0;
|
||||
return ret;
|
||||
}
|
||||
*/
|
||||
|
||||
/// 计算两个经纬度点之间的地面距离(单位:米,GCJ02/WGS84通用)
|
||||
/// 计算两个经纬度点之间的地面距离(单位:米,GCJ02/WGS84 通用)
|
||||
String _calculateLatLngDistance(LatLng point1, LatLng point2) {
|
||||
const double earthRadius = 6371000; // 地球半径(米)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user