From e6e213ab22cb09c260410b3ea2d91da8510cbba5 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 09 Apr 2025 10:09:49 +0800
Subject: [PATCH] feat: 飞行逻辑调整
---
src/views/Home/useMapAggregation/useMapAggregation.js | 105 +++++++++++++++++++++++-----------------------------
1 files changed, 46 insertions(+), 59 deletions(-)
diff --git a/src/views/Home/useMapAggregation/useMapAggregation.js b/src/views/Home/useMapAggregation/useMapAggregation.js
index 7cf680d..7d92182 100644
--- a/src/views/Home/useMapAggregation/useMapAggregation.js
+++ b/src/views/Home/useMapAggregation/useMapAggregation.js
@@ -49,35 +49,25 @@
// 确定缩放比例
- const determineScaling = (currentState) => {
+ const determineScaling = () => {
// console.log('确定缩放比例');
- return () => {
- if (!viewer) return
- let height = viewer.camera.positionCartographic.height
- // 根据高度展示对应的 gJson
- for (let [index, item] of scalingJudgment.entries()) {
- if (!item.show) return
- if (height > item.value[0] && height <= item.value[1]) {
- if (active === item.name) return
- active = item.name
- removeEntities()
- removeLabel()
- renderOutline(item)
- if (!item.gJson && !item.splashedList?.length) return
- item.gJson ? aggregation(item, currentState.flyTo) : splashed(item)
-
- currentState.flyTo && currentState.stopFlyTo && (currentState.flyTo = false)
- break
- }
+ if (!viewer) return
+ let height = viewer.camera.positionCartographic.height
+ // 根据高度展示对应的 gJson
+ for (let [index, item] of scalingJudgment.entries()) {
+ if (!item.show) return
+ if (height > item.value[0] && height <= item.value[1]) {
+ if (active === item.name) return
+ active = item.name
+ removeEntities()
+ removeLabel()
+ renderOutline(item)
+ if (!item.gJson && !item.splashedList?.length) return
+ item.gJson ? aggregation(item) : splashed(item)
+ break
}
}
}
-
- let currentState = {
- flyTo: true,
- stopFlyTo: false
- }
- const handlerDetermineScaling = () => determineScaling(currentState)()
// 转换为目录结构, 返回数组,
function convertToHierarchy (code) {
@@ -223,16 +213,16 @@
}
+ let needFly = true
watch(
selectedAreaCode,
async (newValue, oldValue) => {
+ needFly = true
if (!viewer) return
- currentState.flyTo = true
-
- viewer.scene.postRender.removeEventListener(handlerDetermineScaling)
+ viewer.scene.postRender.removeEventListener(determineScaling)
initMapData(newValue).then(() => {
- viewer.scene.postRender.addEventListener(handlerDetermineScaling)
+ viewer.scene.postRender.addEventListener(determineScaling)
})
},
{ deep: true }
@@ -272,32 +262,32 @@
// 渲染轮廓
const renderOutline = item => {
item.outline &&
- Cesium.GeoJsonDataSource.load(item.outline).then(dataSource => {
- viewer.dataSources.add(dataSource)
- const entities = dataSource.entities.values
- entities.forEach(entity => {
- // 隐藏多边形填充
- entity.polygon.material = Cesium.Color.TRANSPARENT
- entity.polygon.outline = false // 关闭原生轮廓
- // 创建独立折线作为轮廓
- const positions = entity.polygon.hierarchy.getValue().positions
- viewer.entities.add({
- polyline: {
- positions: positions,
- width: 5, // 直接设置宽度
- material: new Cesium.PolylineGlowMaterialProperty({
- glowPower: 0.5,
- color: Cesium.Color.AQUA,
- }),
- clampToGround: true, // 贴地显示
- },
- })
+ Cesium.GeoJsonDataSource.load(item.outline).then(dataSource => {
+ viewer.dataSources.add(dataSource)
+ const entities = dataSource.entities.values
+ entities.forEach(entity => {
+ // 隐藏多边形填充
+ entity.polygon.material = Cesium.Color.TRANSPARENT
+ entity.polygon.outline = false // 关闭原生轮廓
+ // 创建独立折线作为轮廓
+ const positions = entity.polygon.hierarchy.getValue().positions
+ viewer.entities.add({
+ polyline: {
+ positions: positions,
+ width: 5, // 直接设置宽度
+ material: new Cesium.PolylineGlowMaterialProperty({
+ glowPower: 0.5,
+ color: Cesium.Color.AQUA,
+ }),
+ clampToGround: true, // 贴地显示
+ },
})
})
+ })
}
// 聚合机巢
- const aggregation = (item, flyTo) => {
+ const aggregation = (item) => {
if (!item.gJson) return
const featuresList = item.gJson.features.map(item1 => {
// const {lng,lat} = getCenterPoint(item1.geometry.coordinates[0][0])
@@ -378,7 +368,7 @@
entity.polygon.outline = false // 显示边框
})
- flyTo && viewer.flyTo(dataSource, {
+ needFly && viewer.flyTo(dataSource, {
offset: new Cesium.HeadingPitchRange(
0, // heading: 0 (朝向不变)
Cesium.Math.toRadians(-60), // pitch: -90° (垂直向下)
@@ -386,6 +376,7 @@
),
duration: 0.5,
})
+ needFly = false
})
}
@@ -431,6 +422,7 @@
case 'deviceAggregation':
viewer.scene.postRender.addEventListener(labelBoxRender)
break
+ // todo 待对接
case 'device':
store.commit('setSingleUavHome', { id: '123' })
break
@@ -469,13 +461,11 @@
// 移除所有监听事件，变量置空
const removeAll = () => {
- currentState.flyTo = false
-
if (!viewer) return
removeEntities()
removeLabel()
// viewer.camera.moveEnd.removeEventListener(determineScaling);
- viewer.scene.postRender.removeEventListener(handlerDetermineScaling)
+ viewer.scene.postRender.removeEventListener(determineScaling)
handler?.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
handler?.destroy()
viewer = null
@@ -485,13 +475,10 @@
currentEntity = null
}
const init = () => {
- currentState.flyTo = true
- currentState.stopFlyTo = true
-
viewer = window.$viewer
- viewer.scene.postRender.removeEventListener(handlerDetermineScaling)
+ viewer.scene.postRender.removeEventListener(determineScaling)
initMapData(selectedAreaCode.value || userAreaCode.value).then(() => {
- viewer.scene.postRender.addEventListener(handlerDetermineScaling)
+ viewer.scene.postRender.addEventListener(determineScaling)
})
handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas)
handler.setInputAction(singleMachineEvent, Cesium.ScreenSpaceEventType.LEFT_CLICK)
--
Gitblit v1.9.3