From e1c05c2c86438c656f9f3f78b2971caff8b328a5 Mon Sep 17 00:00:00 2001 From: ingalls Date: Tue, 10 Dec 2024 21:37:47 -0700 Subject: [PATCH 1/2] Locked Radial --- api/web/src/components/CloudTAK/Map.vue | 4 ++++ .../CloudTAK/RadialMenu/RadialMenu.vue | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/api/web/src/components/CloudTAK/Map.vue b/api/web/src/components/CloudTAK/Map.vue index f9370fc0f..70557736f 100644 --- a/api/web/src/components/CloudTAK/Map.vue +++ b/api/web/src/components/CloudTAK/Map.vue @@ -141,6 +141,7 @@ { await cotStore.delete(String(cot.id)) await updateCOT(); + } else if (event === 'cot:lock') { + locked.value.push(mapStore.radial.cot.properties ? mapStore.radial.cot.properties.id : mapStore.radial.cot.id); + closeRadial() } else if (event === 'cot:edit') { editGeometry(mapStore.radial.cot.properties ? mapStore.radial.cot.properties.id : mapStore.radial.cot.id); closeRadial() diff --git a/api/web/src/components/CloudTAK/RadialMenu/RadialMenu.vue b/api/web/src/components/CloudTAK/RadialMenu/RadialMenu.vue index dafd9333a..10046d8d6 100644 --- a/api/web/src/components/CloudTAK/RadialMenu/RadialMenu.vue +++ b/api/web/src/components/CloudTAK/RadialMenu/RadialMenu.vue @@ -13,6 +13,23 @@ id='icons' class='d-none' > + + + + + + + Date: Wed, 11 Dec 2024 09:18:20 -0700 Subject: [PATCH 2/2] Update Checks --- api/web/src/components/CloudTAK/Map.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/api/web/src/components/CloudTAK/Map.vue b/api/web/src/components/CloudTAK/Map.vue index 70557736f..7e41938c0 100644 --- a/api/web/src/components/CloudTAK/Map.vue +++ b/api/web/src/components/CloudTAK/Map.vue @@ -568,7 +568,7 @@ const drawMode = ref('static') // Set the terra-draw mode to avoid getMo const drawModePoint = ref('u-d-p'); const pointInput = ref(false); const feat = ref() // Show the Feat Viewer sidebar -const locked = ref([]) // Lock the map view to a given CoT - The last element is the currently locked value +const locked = ref>([]) // Lock the map view to a given CoT - The last element is the currently locked value // this is an array so that things like the radial menu can temporarily lock state but remember the previous lock value when they are closed const live_loc_denied = ref(false) // User denied live location services const live_loc = ref(); @@ -615,7 +615,6 @@ watch(mapStore.radial, () => { mapStore.map.touchZoomRotate.disableRotation(); mapStore.map.dragRotate.disable(); mapStore.map.dragPan.disable(); - // @ts-expect-error Fix Types locked.value.push(mapStore.radial.cot.properties ? mapStore.radial.cot.properties.id : mapStore.radial.cot.id); } else { mapStore.map.scrollZoom.enable();