Skip to content

Commit 4cf5b80

Browse files
committed
widgets: map: integrate poi map arrows component
Signed-off-by: Arturo Manzoli <arturomanzoli@gmail.com>
1 parent 5facc84 commit 4cf5b80

File tree

1 file changed

+23
-2
lines changed

1 file changed

+23
-2
lines changed

src/components/widgets/Map.vue

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,18 @@
120120
/>
121121
</template>
122122
</v-tooltip>
123+
<PoiMapArrows
124+
:map-ready="mapReady"
125+
:show-poi-arrows="widget.options.showPoiArrows"
126+
:show-home-arrow="widget.options.showHomeArrow"
127+
:show-vehicle-arrow="widget.options.showVehicleArrow"
128+
:vehicle-position="vehiclePosition"
129+
:home="home"
130+
:map-center="mapCenter"
131+
:zoom="zoom"
132+
:widget="widget"
133+
:target-follower="targetFollower"
134+
/>
123135
</div>
124136
</div>
125137

@@ -223,7 +235,9 @@ import genericVehicleMarkerImage from '@/assets/generic-vehicle-marker.png'
223235
import GlobalOriginDialog from '@/components/GlobalOriginDialog.vue'
224236
import MissionChecklist from '@/components/MissionChecklist.vue'
225237
import PoiManager from '@/components/poi/PoiManager.vue'
238+
import PoiMapArrows from '@/components/poi/PoiMapArrows.vue'
226239
import { useInteractionDialog } from '@/composables/interactionDialog'
240+
import { setMapLayer } from '@/composables/map/useMapLayer'
227241
import { openSnackbar } from '@/composables/snackbar'
228242
import { MavType } from '@/libs/connection/m2r/messages/mavlink2rest-enum'
229243
import { datalogger, DatalogVariable } from '@/libs/sensors-logging'
@@ -260,8 +274,9 @@ const router = useRouter()
260274
261275
// Declare the general variables
262276
const map = shallowRef<Map | undefined>()
263-
const zoom = ref(missionStore.userLastMapZoom ?? missionStore.defaultMapZoom)
264-
const mapCenter = ref<WaypointCoordinates>(missionStore.userLastMapCenter ?? missionStore.defaultMapCenter)
277+
278+
const zoom = ref(missionStore.defaultMapZoom)
279+
const mapCenter = ref<WaypointCoordinates>(missionStore.defaultMapCenter)
265280
const home = ref()
266281
const mapId = computed(() => `map-${widget.value.hash}`)
267282
const showButtons = computed(() => isMouseOver.value || downloadMenuOpen.value)
@@ -608,6 +623,9 @@ onMounted(async () => {
608623
attributionControl: false,
609624
}).setView(mapCenter.value as LatLngTuple, zoom.value) as Map
610625
626+
// Set map layer in composable for child components
627+
setMapLayer(map.value)
628+
611629
// Listen for base layer changes to save user preference
612630
map.value.on('baselayerchange', (event: LayersControlEvent) => {
613631
const name = event.name
@@ -895,6 +913,9 @@ onBeforeUnmount(() => {
895913
896914
mapBase.value?.removeEventListener('touchstart', onTouchStart)
897915
mapBase.value?.removeEventListener('touchend', onTouchEnd)
916+
917+
// Clear map layer from composable
918+
setMapLayer(undefined)
898919
})
899920
900921
// Pan when variables change

0 commit comments

Comments
 (0)