From aa75a9d46ee325f0a92e42f733aabb1f92103aeb Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 28 三月 2025 17:44:29 +0800
Subject: [PATCH] 走航融合模块完成
---
src/utils/map/sector.js | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/utils/map/sector.js b/src/utils/map/sector.js
index de4a8b5..25ae2d5 100644
--- a/src/utils/map/sector.js
+++ b/src/utils/map/sector.js
@@ -109,7 +109,7 @@
function drawSectorMesh(sDeg, eDeg, lnglat, distance, distance2) {
if (distance == 0 || distance2 == 0) {
- return;
+ return false;
}
// eslint-disable-next-line no-undef
var sector = new AMap.Object3D.Mesh();
@@ -167,6 +167,7 @@
}
object3Dlayer.add(sector);
_sector = sector;
+ return true;
}
function drawTextMaker(list, list2, distance, distance2) {
@@ -240,6 +241,7 @@
object3Dlayer.remove(_sector);
}
},
+ sectorParams: sectorParams,
/**
* 缁樺埗鎵囧舰
* @param {FactorDatas} fDatas
@@ -247,13 +249,14 @@
* @returns 鏁版嵁鍧愭爣鐐瑰拰鎵囧舰鏈�澶у崐寰�
*/
drawSector(fDatas, i) {
- if (_sector != undefined) {
- this.clearSector();
- }
+ this.clearSector();
const { sDeg, eDeg, lnglat, distance, distance2, list, list2 } =
sectorParams(fDatas, i);
- drawSectorMesh(sDeg, eDeg, lnglat, distance, distance2);
- drawElasticMarker(list, list2, distance, distance2);
+ if (drawSectorMesh(sDeg, eDeg, lnglat, distance, distance2)) {
+ // 褰撻閫熷ぇ浜�0缁樺埗浜嗘墖褰㈡椂锛屾墠缁樺埗瀵瑰簲鐨勮窛绂荤瓑鏂囨湰鏍囪
+ // drawElasticMarker(list, list2, distance, distance2);
+ drawTextMaker(list, list2, distance, distance2);
+ }
return { p: lnglat, r: distance };
},
@@ -266,7 +269,8 @@
this.clearSectorMesh();
const { sDeg, eDeg, lnglat, distance, distance2, list, list2 } =
sectorParams(fDatas, i);
- drawSectorMesh(sDeg, eDeg, lnglat, distance, distance2);
- drawTextMaker(list, list2, distance, distance2);
+ if (drawSectorMesh(sDeg, eDeg, lnglat, distance, distance2)) {
+ drawTextMaker(list, list2, distance, distance2);
+ }
}
};
--
Gitblit v1.9.3