Merge pull request #1139 from geoadmin/bug-PB-1221-kml-extent-false-p…

…ositive

PB-1221 : partially out of bound KML was ignored entirely

src/utils/__tests__/extentUtils.spec.js

@@ -7,6 +7,13 @@ import { getExtentIntersectionWithCurrentProjection } from '@/utils/extentUtils'
 
 describe('Test extent utils', () => {
     describe('reproject and cut extent within projection bounds', () => {
+        function expectExtentIs(toBeTested, expected, acceptableDelta = 0.5) {
+            expect(toBeTested).to.be.an('Array').lengthOf(4)
+            expected.forEach((value, index) => {
+                expect(toBeTested[index]).to.be.approximately(value, acceptableDelta)
+            })
+        }
+
         it('handles well wrong inputs and returns null', () => {
             expect(getExtentIntersectionWithCurrentProjection()).to.be.null
             expect(getExtentIntersectionWithCurrentProjection(null, null, null)).to.be.null
@@ -18,7 +25,7 @@ describe('Test extent utils', () => {
             const singleCoordinate = [8.2, 47.5]
             const singleCoordinateInLV95 = reprojectAndRound(WGS84, LV95, singleCoordinate)
             const extent = [singleCoordinate, singleCoordinate].flat()
-            expect(getExtentIntersectionWithCurrentProjection(extent, WGS84, LV95)).to.deep.equal([
+            expectExtentIs(getExtentIntersectionWithCurrentProjection(extent, WGS84, LV95), [
                 ...singleCoordinateInLV95,
                 ...singleCoordinateInLV95,
             ])
@@ -33,15 +40,21 @@ describe('Test extent utils', () => {
             expect(getExtentIntersectionWithCurrentProjection(extent, WGS84, LV95)).to.be.null
         })
         it('reproject and cut an extent that is greater than LV95 extent on all sides', () => {
-            const projectedExtent = getExtentIntersectionWithCurrentProjection(
-                [-2.4, 35, 21.3, 51.7],
-                WGS84,
-                LV95
+            expectExtentIs(
+                getExtentIntersectionWithCurrentProjection([-2.4, 35, 21.3, 51.7], WGS84, LV95),
+                [...LV95.bounds.bottomLeft, ...LV95.bounds.topRight]
+            )
+        })
+        it('reproject and cut an extent that is partially bigger than LV95 bounds', () => {
+            expectExtentIs(
+                getExtentIntersectionWithCurrentProjection(
+                    // extent of file linked to PB-1221
+                    [-122.08, -33.85, 151.21, 51.5],
+                    WGS84,
+                    LV95
+                ),
+                [...LV95.bounds.bottomLeft, ...LV95.bounds.topRight]
             )
-            expect(projectedExtent).to.deep.equal([
-                ...LV95.bounds.bottomLeft,
-                ...LV95.bounds.topRight,
-            ])
         })
         it('only gives back the portion of an extent that is within LV95 bounds', () => {
             const singleCoordinateInsideLV95 = [7.54, 48.12]
@@ -51,9 +64,10 @@ describe('Test extent utils', () => {
                 singleCoordinateInsideLV95
             )
             const overlappingExtent = [0, 0, ...singleCoordinateInsideLV95]
-            expect(
-                getExtentIntersectionWithCurrentProjection(overlappingExtent, WGS84, LV95)
-            ).to.deep.equal([...LV95.bounds.bottomLeft, ...singleCoordinateInLV95])
+            expectExtentIs(
+                getExtentIntersectionWithCurrentProjection(overlappingExtent, WGS84, LV95),
+                [...LV95.bounds.bottomLeft, ...singleCoordinateInLV95]
+            )
         })
     })
 })

src/utils/extentUtils.js

@@ -84,26 +84,35 @@ export function getExtentIntersectionWithCurrentProjection(
     ) {
         return null
     }
-    let extentInCurrentProjection = flattenExtent(extent)
+    let currentProjectionAsExtentProjection = currentProjection.bounds.flatten
     if (extentProjection.epsg !== currentProjection.epsg) {
-        extentInCurrentProjection = projExtent(
-            extentProjection,
+        // we used to reproject the extent here, but there's problem arising if current projection is LV95 and
+        // the extent is going a little bit out of Switzerland.
+        // As LV95 is quite location-locked, the further we get, the bigger the mathematical errors start growing.
+        // So to counteract that, we transform the current projection bounds in the extent projection to do the comparison.
+        currentProjectionAsExtentProjection = projExtent(
             currentProjection,
-            extentInCurrentProjection
+            extentProjection,
+            currentProjectionAsExtentProjection
         )
     }
-    extentInCurrentProjection = getExtentIntersection(
-        extentInCurrentProjection,
-        currentProjection.bounds.flatten
+    let finalExtent = getExtentIntersection(
+        flattenExtent(extent),
+        currentProjectionAsExtentProjection
     )
     if (
-        !extentInCurrentProjection ||
+        !finalExtent ||
         // OL now populates the extent with Infinity when nothing is in common, instead returning a null value
-        extentInCurrentProjection.every((value) => Math.abs(value) === Infinity)
+        finalExtent.every((value) => Math.abs(value) === Infinity)
     ) {
         return null
     }
-    return flattenExtent(extentInCurrentProjection)
+    if (extentProjection.epsg !== currentProjection.epsg) {
+        // if we transformed the current projection extent above, we now need to output the correct proj
+        finalExtent = projExtent(extentProjection, currentProjection, finalExtent)
+    }
+
+    return flattenExtent(finalExtent)
 }
 
 /**

tests/cypress/tests-e2e/importToolFile.cy.js

@@ -224,7 +224,7 @@ describe('The Import File Tool', () => {
         )
         const expectedLayerId = 'external-kml-file.kml'
         const expectedOnlineLayerId = 'https://example.com/second-valid-kml-file.kml'
-        const acceptedDelta = 0.1
+        const acceptedDelta = 0.2
         const checkLocation = (expected, result) => {
             expect(result).to.be.an('Array')
             expect(result.length).to.eq(2)
@@ -821,7 +821,7 @@ describe('The Import File Tool', () => {
         cy.closeMenuIfMobile()
 
         cy.get('[data-cy="window-close"]').click()
-        cy.get('[data-cy="ol-map"]').click(150, 250)
+        cy.get('[data-cy="ol-map"]').click(170, 250)
 
         cy.log('Check that the error is displayed in the profile popup')
         cy.get('[data-cy="show-profile"]').click()