remove yellow pointer when streetview is active

Geoportail-Luxembourg · Nov 27, 2024 · d0ba270 · d0ba270
1 parent faacee2
commit d0ba270
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/src/composables/map/location-info.composable.ts b/src/composables/map/location-info.composable.ts
@@ -24,7 +24,7 @@ export default function useLocationInfo() {
   let holdTimeoutId: number | undefined = undefined
   let startPixel: Coordinate | null = null
   const { infoOpen } = storeToRefs(useAppStore())
-  const { locationInfo, ignoreLeftClick } = storeToRefs(useInfoStore())
+  const { locationInfo, hidePointer } = storeToRefs(useInfoStore())
 
   const infoFeatureLayer = new VectorLayer({
     source: new VectorSource({
@@ -37,9 +37,20 @@ export default function useLocationInfo() {
   setInfoStyle(infoFeatureLayer)
   map.addLayer(infoFeatureLayer)
 
+  watch(hidePointer, doHide => {
+    if (doHide) {
+      infoFeatureLayer.getSource()?.clear()
+    } else {
+      if (locationInfo.value) {
+        const feature = new Feature(new Point(locationInfo.value))
+        infoFeatureLayer.getSource()?.addFeature(feature)
+      }
+    }
+  })
+
   watch(locationInfo, location => {
     infoFeatureLayer.getSource()?.clear()
-    if (location) {
+    if (location && !hidePointer.value) {
       infoOpen.value = true
       const feature = new Feature(new Point(location))
       infoFeatureLayer.getSource()?.addFeature(feature)
@@ -77,7 +88,7 @@ export default function useLocationInfo() {
       (event as MapBrowserEvent<PointerEvent>).originalEvent.button === 0
     ) {
       // if left mouse click
-      if (!ignoreLeftClick.value) {
+      if (!hidePointer.value) {
         locationInfo.value = undefined
       }
     }

diff --git a/src/composables/map/street-view.composable.ts b/src/composables/map/street-view.composable.ts
@@ -27,7 +27,7 @@ export default function useStreeView() {
   const { infoOpen } = storeToRefs(useAppStore())
   const {
     locationInfo,
-    ignoreLeftClick,
+    hidePointer,
     isStreetviewActive,
     noDataAtLocation,
     panoPositionChanging,
@@ -176,13 +176,13 @@ export default function useStreeView() {
       svf.directions.forEach((f: SvDirectionFeature) =>
         svFeatureLayer.getSource()?.addFeature(f)
       )
-      ignoreLeftClick.value = true
+      hidePointer.value = true
       map.addInteraction(selectFeature)
       map.on('pointermove', handleHover)
     } else {
       map.un('pointermove', handleHover)
       map.removeInteraction(selectFeature)
-      ignoreLeftClick.value = false
+      hidePointer.value = false
     }
   })
 

diff --git a/src/stores/info.store.ts b/src/stores/info.store.ts
@@ -5,15 +5,15 @@ import { Coordinate } from 'ol/coordinate'
 
 export const useInfoStore = defineStore('info', () => {
   const locationInfo: Ref<Coordinate | undefined> = ref(undefined)
-  const ignoreLeftClick: Ref<boolean> = ref(false)
+  const hidePointer: Ref<boolean> = ref(false)
   const isStreetviewActive: Ref<boolean> = ref(false)
   const noDataAtLocation = ref(true)
   const panoPositionChanging: Ref<boolean> = ref(false)
   const svFeature: Ref<SvFeature | undefined> = ref(undefined)
 
   return {
     locationInfo,
-    ignoreLeftClick,
+    hidePointer,
     isStreetviewActive,
     noDataAtLocation,
     panoPositionChanging,