@defra/interactive-map 0.0.47-alpha → 0.0.48-alpha

package/plugins/draw/src/adapters/openlayers/snap/snapEngine.js

@@ -25,7 +25,14 @@ const buildTileBoundaryState = (layer, map) => {
 const getClipContext = (state, coord) => {
   if (!state) { return null }
   const { tileGrid, viewProj, sourceProj, zoom } = state
-  const toSource = (c) => c ? projTransform(c, viewProj, sourceProj) : null
+  // Same-code projections need no reprojection — skipping the call also avoids depending
+  // on ol/proj's registry having a transform for the pair, which can be missing when the
+  // draw plugin and the map provider ship as separate bundles each with their own ol/proj4.
+  const codeOf = (projection) => (typeof projection === 'string' ? projection : projection.getCode())
+  const toSource = (coordinate) => {
+    if (!coordinate) { return null }
+    return codeOf(sourceProj) === codeOf(viewProj) ? coordinate : projTransform(coordinate, viewProj, sourceProj)
+  }
   const anchor = toSource(coord)
   const tileCoord = tileGrid.getTileCoordForCoordAndZ(anchor, zoom)
   const extent = tileGrid.getTileCoordExtent(tileCoord)

package/plugins/draw/src/adapters/openlayers/snap/snapEngine.test.js

@@ -1,6 +1,7 @@
 import VectorLayer from 'ol/layer/Vector.js'
 import VectorTileLayer from 'ol/layer/VectorTile.js'
 import VectorSource from 'ol/source/Vector.js'
+import { Projection, addProjection, addCoordinateTransforms } from 'ol/proj.js'
 import { createSnapEngine } from './snapEngine.js'
 import { polygonFeature } from '../__helpers__/harness.js'
 
@@ -177,6 +178,22 @@ describe('vector-tile layers', () => {
     map.layers.unshift(new VectorLayer({})) // a non-tile layer sits in the stack
     expect(engine.query([600, 2005], 12)).toEqual({ type: 'edge', coord: [600, 2000] })
   })
+
+  test('reprojects the query coordinate when the tile source has a genuinely different projection', () => {
+    // Real ol/proj Projection objects (not the bare code strings the other tests use), with
+    // different codes and an identity transform between them, so toSource actually calls
+    // transform() instead of short-circuiting, while leaving the mocked tileGrid's numbers valid.
+    const viewProj = new Projection({ code: 'x-test-view', units: 'm' })
+    const sourceProj = new Projection({ code: 'x-test-source', units: 'm' })
+    addProjection(viewProj)
+    addProjection(sourceProj)
+    addCoordinateTransforms(viewProj, sourceProj, (c) => c, (c) => c)
+
+    const { engine, map } = setupVT({ features: [renderFeature('LineString', [500, 2000, 1500, 2000])] })
+    map.getView = () => ({ getResolution: () => 1, getProjection: () => viewProj })
+    map.layers[0].getSource().getProjection = () => sourceProj
+    expect(engine.query([600, 2005], 12)).toEqual({ type: 'edge', coord: [600, 2000] })
+  })
 })
 
 describe('invisible shared fill boundaries', () => {