Merge pull request #488 from geoadmin/bug_BGDIINF_SB-2890_fix_e2e_tests

pakb · web-flow · commit 24c56e8397b0 · 2023-10-25T13:13:24.000+02:00
BGDIINF_SB-2890 : fix some e2e tests
diff --git a/src/modules/drawing/lib/__tests__/drawingUtils.spec.js b/src/modules/drawing/lib/__tests__/drawingUtils.spec.js
@@ -5,7 +5,7 @@ import {
     toLv95,
     wrapXCoordinates,
 } from '@/modules/drawing/lib/drawingUtils'
-import { WEBMERCATOR, WGS84 } from '@/utils/coordinates/coordinateSystems'
+import { LV95, WEBMERCATOR, WGS84 } from '@/utils/coordinates/coordinateSystems'
 import setupProj4 from '@/utils/setupProj4'
 import { expect } from 'chai'
 import { describe, it } from 'vitest'
@@ -16,46 +16,38 @@ setupProj4()
 describe('Unit test functions from drawingUtils.js', () => {
     describe('toLv95(coordinate, "EPSG:4326")', () => {
         it('reprojects points from EPSG:4326', () => {
-            expect(toLv95([6.57268, 46.51333], WGS84.epsg)).to.eql([
-                2533541.8057776038, 1151703.909974419,
-            ])
+            expect(LV95.isInBounds(...toLv95([6.57268, 46.51333], WGS84.epsg))).to.be.true
         })
         it('reprojects points from EPSG:3857', () => {
-            expect(toLv95([731667, 5862995], WEBMERCATOR.epsg)).to.eql([
-                2533541.530335663, 1151703.3642947723,
-            ])
+            expect(LV95.isInBounds(...toLv95([731667, 5862995], WEBMERCATOR.epsg))).to.be.true
         })
         it('reprojects lines', () => {
-            expect(
-                toLv95(
-                    [
-                        [6.57268, 46.51333],
-                        [6.7, 46.7],
-                    ],
-                    WGS84.epsg
-                )
-            ).to.eql([
-                [2533541.8057776038, 1151703.909974419],
-                [2543508.4227881124, 1172354.2517551924],
-            ])
+            const result = toLv95(
+                [
+                    [6.57268, 46.51333],
+                    [6.7, 46.7],
+                ],
+                WGS84.epsg
+            )
+            expect(result).to.be.an('Array').lengthOf(2)
+            result.forEach((coord) => {
+                expect(LV95.isInBounds(...coord)).to.be.true
+            })
         })
         it('reprojects polygons', () => {
-            expect(
-                toLv95(
-                    [
-                        [6.57268, 46.51333],
-                        [6.7, 46.7],
-                        [6.9, 46.9],
-                        [6.57268, 46.51333],
-                    ],
-                    WGS84.epsg
-                )
-            ).to.eql([
-                [2533541.8057776038, 1151703.909974419],
-                [2543508.4227881124, 1172354.2517551924],
-                [2558957.32134749, 1194462.5957064652],
-                [2533541.8057776038, 1151703.909974419],
-            ])
+            const result = toLv95(
+                [
+                    [6.57268, 46.51333],
+                    [6.7, 46.7],
+                    [6.9, 46.9],
+                    [6.57268, 46.51333],
+                ],
+                WGS84.epsg
+            )
+            expect(result).to.be.an('Array').lengthOf(4)
+            result.forEach((coord) => {
+                expect(LV95.isInBounds(...coord)).to.be.true
+            })
         })
     })
 
diff --git a/src/modules/map/components/openlayers/OpenLayersMap.vue b/src/modules/map/components/openlayers/OpenLayersMap.vue
@@ -124,7 +124,11 @@ import OpenLayersPopover from '@/modules/map/components/openlayers/OpenLayersPop
 import OpenLayersVectorLayer from '@/modules/map/components/openlayers/OpenLayersVectorLayer.vue'
 import { ClickInfo, ClickType } from '@/store/modules/map.store'
 import { CrossHairs } from '@/store/modules/position.store'
-import { LV95, WEBMERCATOR } from '@/utils/coordinates/coordinateSystems'
+import allCoordinateSystems, {
+    LV95,
+    WEBMERCATOR,
+    WGS84,
+} from '@/utils/coordinates/coordinateSystems'
 import { LV95_RESOLUTIONS } from '@/utils/coordinates/SwissCoordinateSystem.class'
 import { createGeoJSONFeature } from '@/utils/layerUtils'
 import log from '@/utils/logging'
@@ -136,6 +140,7 @@ import { defaults as getDefaultInteractions, MouseWheelZoom } from 'ol/interacti
 import DoubleClickZoomInteraction from 'ol/interaction/DoubleClickZoom'
 import DragRotateInteraction from 'ol/interaction/DragRotate'
 import 'ol/ol.css'
+import { get as getProjection } from 'ol/proj'
 import { register } from 'ol/proj/proj4'
 import proj4 from 'proj4'
 import { mapActions, mapGetters, mapState } from 'vuex'
@@ -372,6 +377,14 @@ export default {
     mounted() {
         // register any custom projection in OpenLayers
         register(proj4)
+        // setting the boundaries for projection, in the OpenLayers context, whenever bounds are defined
+        // this will help OpenLayers know when tiles shouldn't be requested because coordinates are out of bounds
+        allCoordinateSystems
+            .filter((projection) => projection.bounds && projection.epsg !== WGS84.epsg)
+            .forEach((projection) => {
+                const olProjection = getProjection(projection.epsg)
+                olProjection?.setExtent(projection.bounds.flatten)
+            })
         this.map.setTarget(this.$refs.map)
         // Setting up OL objects
         this.mercatorView = new View({
diff --git a/src/utils/setupProj4.js b/src/utils/setupProj4.js
@@ -1,7 +1,5 @@
 import { LV03, LV95, WEBMERCATOR } from '@/utils/coordinates/coordinateSystems'
 import log from '@/utils/logging'
-import { get as getProjection } from 'ol/proj'
-import { register } from 'ol/proj/proj4'
 import proj4 from 'proj4'
 
 /**
@@ -28,16 +26,6 @@ const setupProj4 = (projections = [WEBMERCATOR, LV95, LV03]) => {
                 throw err
             }
         })
-    // registering all "custom" projection with OpenLayers as well
-    register(proj4)
-    // setting the boundaries for projection, in the OpenLayers context, whenever bounds are defined
-    // this will help OpenLayers know when tiles shouldn't be requested because coordinates are out of bounds
-    projections
-        .filter((projection) => projection.bounds)
-        .forEach((projection) => {
-            const olProjection = getProjection(projection.epsg)
-            olProjection?.setExtent(projection.bounds.flatten)
-        })
 }
 
 export default setupProj4
diff --git a/tests/e2e-cypress/integration/3d/navigation.cy.js b/tests/e2e-cypress/integration/3d/navigation.cy.js
@@ -4,8 +4,12 @@ import {
     CAMERA_MIN_ZOOM_DISTANCE,
 } from '@/modules/map/components/cesium/constants'
 import { calculateResolution } from '@/modules/map/components/cesium/utils/cameraUtils'
-import { calculateWebMercatorZoom } from '@/store/modules/position.store'
+import { WGS84 } from '@/utils/coordinates/coordinateSystems'
+import setupProj4 from '@/utils/setupProj4'
 import { Cartesian3 } from 'cesium'
+import proj4 from 'proj4'
+
+setupProj4()
 
 describe('Testing 3D navigation', () => {
     context('camera limits', () => {
@@ -68,11 +72,15 @@ describe('Testing 3D navigation', () => {
                         expect(center[0]).to.eq(lon)
                         expect(center[1]).to.eq(lat)
                     })
-                    cy.readStoreValue('state.position.zoom').should((zoom) => {
+                    cy.readStoreValue('state').then((state) => {
+                        const { zoom, projection } = state.position
                         const height = viewer.camera.positionCartographic.height
                         const resolution = calculateResolution(height, viewer.canvas.clientWidth)
                         expect(zoom).to.approximately(
-                            calculateWebMercatorZoom(resolution, lat),
+                            projection.getZoomForResolutionAndCenter(
+                                resolution,
+                                proj4(WGS84.epsg, projection.epsg, [lon, lat])
+                            ),
                             0.001
                         )
                     })
diff --git a/tests/e2e-cypress/integration/3d/transitionTo3d.cy.js b/tests/e2e-cypress/integration/3d/transitionTo3d.cy.js
@@ -1,6 +1,12 @@
 /// <reference types="cypress" />
 
+import { DEFAULT_PROJECTION } from '@/config'
+import { WGS84 } from '@/utils/coordinates/coordinateSystems'
+import setupProj4 from '@/utils/setupProj4'
 import { Math as CesiumMath } from 'cesium'
+import proj4 from 'proj4'
+
+setupProj4()
 
 describe('Testing transitioning between 2D and 3D', () => {
     context('3D toggle button', () => {
@@ -90,8 +96,7 @@ describe('Testing transitioning between 2D and 3D', () => {
             const lat = 46
             const lon = 7
             cy.goToMapView({
-                lat,
-                lon,
+                center: proj4(WGS84.epsg, DEFAULT_PROJECTION.epsg, [lon, lat]),
                 z: 9,
             })
             cy.get('[data-cy="3d-button"]').click()
diff --git a/tests/e2e-cypress/integration/drawing/kml.cy.js b/tests/e2e-cypress/integration/drawing/kml.cy.js
@@ -1,13 +1,31 @@
 /// <reference types="cypress" />
 import { EditableFeatureTypes } from '@/api/features.api'
 import LayerTypes from '@/api/layers/LayerTypes.enum'
+import { DEFAULT_PROJECTION } from '@/config'
+import { WGS84 } from '@/utils/coordinates/coordinateSystems'
+import setupProj4 from '@/utils/setupProj4'
+import proj4 from 'proj4'
+
+setupProj4()
 
 const olSelector = '.ol-viewport'
 
 // Position of the marker defined in service-kml/lonelyMarker.kml
 const markerLatitude = 46.883715999352546
 const markerLongitude = 7.656108679791837
 
+function goToDrawingWithKmlLayer(layers, withHash = true) {
+    const params = {
+        center: proj4(WGS84.epsg, DEFAULT_PROJECTION.epsg, [markerLongitude, markerLatitude]).join(
+            ','
+        ),
+    }
+    if (layers) {
+        params.layers = layers
+    }
+    cy.goToDrawing(params, withHash)
+}
+
 describe('Drawing new KML', () => {
     it("Don't save new empty drawing", () => {
         cy.intercept('**/api/kml/admin**', (req) => {
@@ -67,7 +85,6 @@ describe('Drawing new KML', () => {
             ])
         )
     })
-
     it('Update the previously saved KML if anything is added to the drawing', () => {
         let kmlId = null
         cy.goToDrawing()
@@ -120,16 +137,7 @@ describe('Drawing existing KML - without adminId (copy)', () => {
     const kmlFileUrl = `https://public.geo.admin.ch/api/kml/files/${kmlFileId}`
     const kmlUrlParam = `KML|${kmlFileUrl}|Dessin`
     beforeEach(() => {
-        //open drawing mode
-        cy.goToDrawing(
-            {
-                lang: 'fr',
-                lat: markerLatitude,
-                lon: markerLongitude,
-                layers: kmlUrlParam,
-            },
-            true
-        )
+        goToDrawingWithKmlLayer(kmlUrlParam)
     })
     it("Don't save non modified drawing", () => {
         cy.intercept('**/api/kml/admin**', (req) => {
@@ -185,16 +193,8 @@ describe('Drawing existing KML - with adminId', () => {
         }).as('put-kml-not-allowed')
         const kmlUrlParam = `KML|${kmlFileUrl}|Dessin@adminId=${kmlFileAdminId}`
 
-        //open drawing mode
-        cy.goToMapViewWithDrawingIntercept(
-            {
-                lang: 'fr',
-                lat: markerLatitude,
-                lon: markerLongitude,
-                layers: kmlUrlParam,
-            },
-            true
-        )
+        goToDrawingWithKmlLayer(kmlUrlParam, true)
+
         // delete the drawing
         cy.get('[data-cy="drawing-toolbox-delete-button"]').click()
         cy.get('[data-cy="modal-confirm-button"]').click()
@@ -224,16 +224,8 @@ describe('Drawing loading KML', () => {
         const kmlFileUrl = `https://public.geo.admin.ch/api/kml/files/${kmlFileId}`
         const kmlUrlParam = `KML|${kmlFileUrl}|Dessin`
 
-        //open drawing mode
-        cy.goToDrawing(
-            {
-                lang: 'fr',
-                lat: markerLatitude,
-                lon: markerLongitude,
-                layers: kmlUrlParam,
-            },
-            true
-        )
+        goToDrawingWithKmlLayer(kmlUrlParam)
+
         cy.readStoreValue('state.features.selectedFeatures').should('have.length', 0)
         cy.readStoreValue('state.drawing.featureIds').should('have.length', 1)
         cy.readWindowValue('drawingLayer')
@@ -247,23 +239,15 @@ describe('Drawing loading KML', () => {
             .then((layer) => layer.getSource().getFeatures())
             .should('have.length', 1)
     })
-
     it('Load kml file with adminId and open drawing mode', () => {
         //load map with an injected kml layer containing a text
         const kmlFileId = 'test-fileID12345678900'
         const kmlFileAdminId = 'test-fileAdminID12345678900'
         const kmlFileUrl = `https://public.geo.admin.ch/api/kml/files/${kmlFileId}`
         const kmlUrlParam = `KML|${kmlFileUrl}|Dessin@adminId=${kmlFileAdminId}`
-        //open drawing mode
-        cy.goToMapViewWithDrawingIntercept(
-            {
-                lang: 'fr',
-                lat: markerLatitude,
-                lon: markerLongitude,
-                layers: kmlUrlParam,
-            },
-            true
-        )
+
+        goToDrawingWithKmlLayer(kmlUrlParam)
+
         cy.readStoreValue('state.features.selectedFeatures').should('have.length', 0)
         cy.readStoreValue('state.ui.showDrawingOverlay').should('be.true')
         cy.readStoreValue('state.drawing.featureIds').should('have.length', 1)
@@ -274,24 +258,12 @@ describe('Drawing loading KML', () => {
 })
 
 describe('Switching from drawing mode to normal mode', () => {
-    beforeEach(() => {
-        cy.goToDrawing(
-            {
-                lang: 'fr',
-                lat: 47.097,
-                lon: 7.743,
-                z: 9.5,
-            },
-            true
-        )
-    })
-
     /**
      * This test verifies multiple things that the kml layer is saved before it is loaded when
      * closing the drawing immediately after drawing
      */
     it('Check correct passover from drawingLayer to kmlLayer when closing drawing', () => {
-        //Open drawing mode
+        goToDrawingWithKmlLayer()
         cy.readWindowValue('drawingLayer')
             .then((layer) => layer.getSource().getFeatures())
             .should('have.length', 0)
diff --git a/tests/e2e-cypress/integration/drawing/marker-text.cy.js b/tests/e2e-cypress/integration/drawing/marker-text.cy.js
@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 
 import { EditableFeatureTypes } from '@/api/features.api'
-import { LV95 } from '@/utils/coordinates/coordinateSystems'
+import { DEFAULT_PROJECTION } from '@/config'
 import { BLACK, GREEN, LARGE, MEDIUM, RED, SMALL } from '@/utils/featureStyleUtils'
 
 const drawingStyleMarkerPopup = '[data-cy="drawing-style-marker-popup"]'
@@ -19,8 +19,8 @@ const createAPoint = (
     kind,
     x = 0,
     y = 0,
-    xx = LV95.defaultCenter[0],
-    yy = LV95.defaultCenter[1]
+    xx = DEFAULT_PROJECTION.bounds.center[0],
+    yy = DEFAULT_PROJECTION.bounds.center[1]
 ) => {
     let kmlId
     cy.clickDrawingTool(kind)
@@ -91,7 +91,9 @@ const interceptGreenIcons = () => {
 
 describe('Drawing marker/points', () => {
     beforeEach(() => {
-        cy.goToDrawing()
+        cy.goToDrawing({
+            center: DEFAULT_PROJECTION.bounds.center.join(','),
+        })
     })
     it('Re-requests all icons from an icon sets with the new color whenever the color changed', () => {
         interceptGreenIcons()
diff --git a/tests/e2e-cypress/integration/drawing/share.cy.js b/tests/e2e-cypress/integration/drawing/share.cy.js
