PB-114: Moved wrapXCoordinates util

Author: ltshb

src/modules/drawing/components/useDrawingModeInteraction.composable.js

@@ -7,9 +7,9 @@ import { computed, inject, nextTick, onBeforeUnmount, onMounted, ref } from 'vue
 import { useStore } from 'vuex'
 
 import { EditableFeature } from '@/api/features.api'
-import { wrapXCoordinates } from '@/modules/drawing/lib/drawingUtils'
 import { editingFeatureStyleFunction } from '@/modules/drawing/lib/style'
 import useSaveKmlOnChange from '@/modules/drawing/useKmlDataManagement.composable'
+import { wrapXCoordinates } from '@/utils/coordinates/coordinateUtils'
 import { featureStyleFunction } from '@/utils/featureStyleUtils'
 import { GeodesicGeometries } from '@/utils/geodesicManager'
 import log from '@/utils/logging'

src/modules/drawing/lib/__tests__/drawingUtils.spec.js

@@ -1,27 +1,4 @@
-import { wrapX } from 'ol/coordinate'
 import { LineString, Polygon } from 'ol/geom'
-import { get as getProjection } from 'ol/proj'
-
-/**
- * Wraps the provided coordinates in the world extents (i.e. the coordinate range that if equivalent
- * to the wgs84 [-180, 180))
- *
- * @param {Array} coordinates The coordinates (or array of coordinates) to wrap
- * @param {CoordinateSystem} projection Projection of the coordinates
- * @param {boolean} inPlace If false, the original coordinates remain untouched and only a copy is
- *   modified
- * @returns If "inPlace", then the same reference as "coords", else a reference to the modified copy
- */
-export function wrapXCoordinates(coordinates, projection, inPlace = false) {
-    let wrappedCoords = coordinates
-    if (!inPlace) {
-        wrappedCoords = wrappedCoords.slice()
-    }
-    if (Array.isArray(wrappedCoords[0])) {
-        return wrappedCoords.map((c) => wrapXCoordinates(c, projection, inPlace))
-    }
-    return wrapX(wrappedCoords, getProjection(projection.epsg))
-}
 
 /**
  * Checks if point is at target within tolerance.

src/modules/drawing/lib/drawingUtils.js

@@ -9,6 +9,7 @@ import {
     reprojectUnknownSrsCoordsToWGS84,
     toLv95,
 } from '@/utils/coordinates/coordinateUtils'
+import { wrapXCoordinates } from '@/utils/coordinates/coordinateUtils'
 
 describe('Unit test functions from coordinateUtils.js', () => {
     describe('reprojectUnknownSrsCoordsToWGS84(x,y)', () => {
@@ -141,4 +142,35 @@ describe('Unit test functions from coordinateUtils.js', () => {
             })
         })
     })
+
+    describe('wrapXCoordinates()', () => {
+        it('Wrap in place', () => {
+            const original = [
+                [300, 300],
+                [360, 360],
+            ]
+            const ref2Original = wrapXCoordinates(original, WGS84, true)
+            expect(ref2Original).to.deep.equal([
+                [-60, 300],
+                [0, 360],
+            ])
+            expect(ref2Original).to.deep.equal(original)
+        })
+        it('Wrap not in place', () => {
+            const original = [
+                [300, 300],
+                [360, 360],
+            ]
+            const ref2Original = wrapXCoordinates(original, WGS84, false)
+            expect(ref2Original).to.deep.equal([
+                [-60, 300],
+                [0, 360],
+            ])
+            expect(ref2Original).to.not.deep.equal(original)
+            expect(original).to.deep.equal([
+                [300, 300],
+                [360, 360],
+            ])
+        })
+    })
 })

src/utils/coordinates/__test__/coordinateUtils.spec.js

@@ -1,3 +1,5 @@
+import { wrapX } from 'ol/coordinate'
+import { get as getProjection } from 'ol/proj'
 import proj4 from 'proj4'
 
 import log from '../logging'
@@ -127,10 +129,38 @@ export class OutOfBoundsError extends Error {
     }
 }
 
+/**
+ * Convert recursively input coordinates into LV95
+ *
+ * @param {[]} input Coordinate of a point, multipoint or polygon
+ * @param {String} epsg EPSG code of the coordinates
+ * @returns {[]} Reprojected coordinates
+ */
 export function toLv95(input, epsg) {
     if (Array.isArray(input[0])) {
         return input.map((si) => toLv95(si, epsg))
     } else {
         return proj4(epsg, LV95.epsg, [input[0], input[1]])
     }
 }
+
+/**
+ * Wraps the provided coordinates in the world extents (i.e. the coordinate range that if equivalent
+ * to the wgs84 [-180, 180))
+ *
+ * @param {Array} coordinates The coordinates (or array of coordinates) to wrap
+ * @param {CoordinateSystem} projection Projection of the coordinates
+ * @param {boolean} inPlace If false, the original coordinates remain untouched and only a copy is
+ *   modified
+ * @returns If "inPlace", then the same reference as "coords", else a reference to the modified copy
+ */
+export function wrapXCoordinates(coordinates, projection, inPlace = false) {
+    let wrappedCoords = coordinates
+    if (!inPlace) {
+        wrappedCoords = wrappedCoords.slice()
+    }
+    if (Array.isArray(wrappedCoords[0])) {
+        return wrappedCoords.map((c) => wrapXCoordinates(c, projection, inPlace))
+    }
+    return wrapX(wrappedCoords, getProjection(projection.epsg))
+}