WIP

Author: ismailsunni

packages/viewer/src/store/modules/geolocation/actions/setGeolocationActive.ts

@@ -5,7 +5,7 @@ import type { ActionDispatcher } from '@/store/types'
 
 import handleGeolocationError from '@/store/modules/geolocation/utils/handleGeolocationError'
 import handleNewGeolocationPosition from '@/store/modules/geolocation/utils/handleNewGeolocationPosition'
-import setCenterIfInBounds from '@/store/modules/geolocation/utils/setCenterIfInBounds'
+import setCenterIfInBounds, { resetFirstTime } from '@/store/modules/geolocation/utils/setCenterIfInBounds'
 
 interface GeolocationActivationOptions {
     /**
@@ -35,6 +35,7 @@ export default function setGeolocationActive(
     optionsOrDispatcher: GeolocationActivationOptions | ActionDispatcher,
     dispatcherOrNothing?: ActionDispatcher
 ): void {
+    console.log('[setGeolocationActive] Called with active:', active)
     this.active = active
 
     const dispatcher = dispatcherOrNothing ?? (optionsOrDispatcher as ActionDispatcher)
@@ -44,11 +45,13 @@ export default function setGeolocationActive(
         this.errorCount = 0 // reset the error counter when starting the geolocation
 
         const { usePreviousPosition = true } = options
-
+        console.log('[setGeolocationActive] usePreviousPosition:', usePreviousPosition)
+        console.log('[setGeolocationActive] this.position:', this.position)
         if (usePreviousPosition && this.position) {
             // if we have a previous position, use it first to be more reactive but set
             // bad accuracy as we don't know how exact it is.
-            if (this.tracking) {
+            console.log('[setGeolocationActive] tracking is', this.tracking)
+            if (this.tracking === false) {
                 // only center if tracking (e.g., in 3D mode we don't center)
                 setCenterIfInBounds.call(this, this.position, dispatcher)
             }
@@ -60,6 +63,7 @@ export default function setGeolocationActive(
         }
         navigator.geolocation.getCurrentPosition(
             (position) => {
+                console.log('[setGeolocationActive] Current position:', position)
                 log.debug({
                     title: 'Geolocation store / setGeolocationActive',
                     titleColor: LogPreDefinedColor.Amber,

packages/viewer/src/store/modules/geolocation/actions/setGeolocationTracking.ts

@@ -1,7 +1,7 @@
 import type { GeolocationStore } from '@/store/modules/geolocation/types/geolocation'
 import type { ActionDispatcher } from '@/store/types'
 
-import setCenterIfInBounds from '@/store/modules/geolocation/utils/setCenterIfInBounds'
+import setCenterIfInBounds, { resetFirstTime } from '@/store/modules/geolocation/utils/setCenterIfInBounds'
 
 export default function setGeolocationTracking(
     this: GeolocationStore,
@@ -12,6 +12,9 @@ export default function setGeolocationTracking(
 
     // If tracking has been re-enabled by clicking on the geolocation button, we re-center the map.
     if (this.tracking && this.position) {
+        // Reset firstTime so that re-enabling tracking will zoom to location
+        console.log('[setGeolocationTracking] Resetting firstTime and calling setCenterIfInBounds')
+        resetFirstTime()
         setCenterIfInBounds.call(this, this.position, dispatcher)
     }
 }

packages/viewer/src/store/modules/geolocation/utils/setCenterIfInBounds.ts

@@ -19,22 +19,34 @@ import useUIStore from '@/store/modules/ui'
  */
 let firstTime: boolean = true
 
+/**
+ * Resets the firstTime flag. This should be called when geolocation is deactivated
+ * so that the next activation will zoom to the user's location.
+ */
+export function resetFirstTime(): void {
+    firstTime = true
+}
+
 export default function setCenterIfInBounds(
     this: GeolocationStore,
     center: SingleCoordinate,
     dispatcher: ActionDispatcher
 ): void {
+    console.log('[setCenterIfInBounds] Called with center:', center)
+
     const cesiumStore = useCesiumStore()
     const positionStore = usePositionStore()
     const uiStore = useUIStore()
 
     const lv95BoundsInCurrentProjection = LV95.getBoundsAs(positionStore.projection)
 
     if (lv95BoundsInCurrentProjection?.isInBounds(center)) {
+        console.log('[setCenterIfInBounds] Position in bounds, firstTime:', firstTime, 'center equals:', isEqual(positionStore.center, center))
         if (!isEqual(positionStore.center, center)) {
             positionStore.setCenter(center, dispatcher)
 
             if (firstTime) {
+                console.log('[setCenterIfInBounds] First time - setting zoom to', positionStore.projection.get1_25000ZoomLevel())
                 firstTime = false
                 if (cesiumStore.active && positionStore.camera) {
                     positionStore.setCameraPosition(
@@ -51,7 +63,11 @@ export default function setCenterIfInBounds(
                     )
                 }
                 positionStore.setZoom(positionStore.projection.get1_25000ZoomLevel(), dispatcher)
+            } else {
+                console.log('[setCenterIfInBounds] Not first time - skipping zoom')
             }
+        } else {
+            console.log('[setCenterIfInBounds] Center already equals position - skipping')
         }
     } else {
         log.warn({