From 8e79b5c74f4c0f52cff9f18991cde9cfc16d270f Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Mon, 01 Jul 2024 14:57:05 +0800
Subject: [PATCH] fix: /subscribeTopic /unsubscribeTopic 注释
---
src/utils/cesium/use-map-draw.ts | 64 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/src/utils/cesium/use-map-draw.ts b/src/utils/cesium/use-map-draw.ts
index ecfb633..4c2b631 100644
--- a/src/utils/cesium/use-map-draw.ts
+++ b/src/utils/cesium/use-map-draw.ts
@@ -5,7 +5,7 @@
import { ref } from 'vue'
import { cesiumOperation } from '/@/hooks/use-cesium-tsa'
import { XMLToJSON } from './kmz'
-import _ from 'lodash'
+import _, { includes } from 'lodash'
const { addPolyline, getEntityById, removeAllDataSource, removeAllPoint } = cesiumOperation()
const getResource = (name: string) => {
@@ -51,12 +51,12 @@
icon: getResource('waylinetool/camera-off.png'),
},
{
- key: 'time',
+ key: 'multipleTiming',
name: '开始等时间隔拍照',
icon: getResource('waylinetool/shoot1.png'),
},
{
- key: 'distance',
+ key: 'multipleDistance',
name: '开始等距间隔拍照',
icon: getResource('waylinetool/shoot2.png'),
},
@@ -91,7 +91,7 @@
key: 'panoShot',
name: '全景拍摄',
icon: getResource('waylinetool/panoramicview.png'),
- }
+ },
]
const waylinePointsEvent = ref<tragetPoint[]>([])
@@ -315,30 +315,60 @@
}
const kmlJson = XMLToJSON(kmlRes).Document
const points = Array.isArray(kmlJson.Folder?.Placemark) ? kmlJson.Folder.Placemark : [kmlJson.Folder.Placemark]
- let takePhotoNum = 0
points?.forEach((point: { actionGroup: any }, index: number) => {
if (point !== undefined) {
if (Reflect.has(point, 'actionGroup')) {
- const action = point.actionGroup.action
- if (Array.isArray(action)) {
- action.forEach((item) => {
- const { actionActuatorFunc } = item
- actionActuatorFunc?.['#text'] === 'takePhoto' && takePhotoNum++
- const actionObj: eventParmas | any = actionList.find((event) => actionActuatorFunc['#text'] === event.key)
- waylinePointsEvent.value[index].eventList?.push(actionObj)
+ if (Array.isArray(point.actionGroup)) {
+ const actionGroups = point.actionGroup
+ actionGroups.forEach((actionGroup) => {
+ const action = actionGroup.action
+ const actionTrigger = actionGroup.actionTrigger
+ pointActionShow(action, actionTrigger, index)
})
} else {
- action?.actionActuatorFunc['#text'] === 'takePhoto' && takePhotoNum++
- const actionObj: eventParmas | any = actionList.find(
- (item) => action?.actionActuatorFunc['#text'] === item.key,
- )
- waylinePointsEvent.value[index].eventList?.push(actionObj)
+ const action = point.actionGroup.action
+ const actionTrigger = point.actionGroup.actionTrigger
+ pointActionShow(action, actionTrigger, index)
}
}
}
})
waylineDetails[3].value = takePhotoNum
}
+
+ let takePhotoNum = 0
+ const pointActionShow = (
+ action: { forEach: (arg0: (item: any) => void) => void; actionActuatorFunc: { [x: string]: string } },
+ actionTrigger: { actionTriggerType: { [x: string]: string } },
+ index: number,
+ ) => {
+ if (Array.isArray(action)) {
+ action.forEach((item) => {
+ const { actionActuatorFunc } = item
+ actionActuatorFunc?.['#text'] === 'takePhoto' && takePhotoNum++
+ const actionObj: eventParmas | any = actionList.find((event) => {
+ if (actionTrigger?.actionTriggerType['#text'] === event.key) {
+ return actionTrigger?.actionTriggerType['#text'] === event.key
+ } else {
+ return actionActuatorFunc['#text'] === event.key
+ }
+ })
+ waylinePointsEvent.value[index].eventList?.push(actionObj)
+ })
+ } else {
+ action?.actionActuatorFunc['#text'] === 'takePhoto' && takePhotoNum++
+ const actionObj: eventParmas | any = actionList.find((item) => {
+ const actionTriggerType = actionTrigger.actionTriggerType['#text']
+ if (['multipleDistance', 'multipleTiming'].includes(actionTriggerType)) {
+ return actionTriggerType === item.key
+ } else {
+ return action?.actionActuatorFunc['#text'] === item.key
+ }
+ })
+ waylinePointsEvent.value[index].eventList?.push(actionObj)
+ }
+ }
+
const clearWaylineData = () => {
kmlEntities.value = []
waylinePointsEvent.value = []
--
Gitblit v1.9.3