PB-387: Add out of bound warning for geolocation in 3d

geoadmin · Jun 25, 2024 · afc8c27 · afc8c27
1 parent b920e1d
commit afc8c27
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/store/modules/position.store.js b/src/store/modules/position.store.js
@@ -217,7 +217,7 @@ const actions = {
             return
         }
         if (Array.isArray(center)) {
-            if (LV95.isInBounds(center[0], center[1])) {
+            if (state.projection.epsg != LV95.epsg || LV95.isInBounds(center[0], center[1])) {
                 commit('setCenter', {
                     x: center[0],
                     y: center[1],
@@ -227,7 +227,7 @@ const actions = {
                 log.debug('center received is out of bounds, ignoring')
             }
         } else {
-            if (LV95.isInBounds(center.x, center.y)) {
+            if (state.projection.epsg != LV95.epsg || LV95.isInBounds(center.x, center.y)) {
                 const { x, y } = center
                 commit('setCenter', { x, y, dispatcher })
             } else {

diff --git a/src/store/plugins/geolocation-management.plugin.js b/src/store/plugins/geolocation-management.plugin.js
@@ -2,7 +2,7 @@ import proj4 from 'proj4'
 
 import { IS_TESTING_WITH_CYPRESS } from '@/config'
 import { STANDARD_ZOOM_LEVEL_1_25000_MAP } from '@/utils/coordinates/CoordinateSystem.class'
-import { LV95, WGS84 } from '@/utils/coordinates/coordinateSystems'
+import { LV95, WEBMERCATOR, WGS84 } from '@/utils/coordinates/coordinateSystems'
 import CustomCoordinateSystem from '@/utils/coordinates/CustomCoordinateSystem.class.js'
 import log from '@/utils/logging'
 
@@ -14,7 +14,11 @@ let geolocationWatcher = null
 let firstTimeActivatingGeolocation = true
 
 function setCenterIfInBounds(store, center) {
-    if (LV95.isInBounds(center[0], center[1])) {
+    if (
+        store.state.cesium.active
+            ? LV95.getBoundsAs(WEBMERCATOR).isInBounds(center[0], center[1])
+            : LV95.isInBounds(center[0], center[1])
+    ) {
         store.dispatch('setCenter', {
             center: center,
             ...dispatcher,