@defra/interactive-map 0.0.45-alpha → 0.0.46-fmp-1

package/plugins/draw/src/adapters/openlayers/core/OLDrawManager.js

@@ -49,6 +49,11 @@ export class OLDrawManager {
       zIndex: 100
     })
     this._layer.set('layerId', 'draw')
+    // Tagged rather than left to `instanceof VectorLayer` on the reading side — a UMD
+    // consumer loads the provider and this plugin as independently-bundled scripts, each
+    // with its own copy of ol, so a class reference from one bundle never matches an
+    // instance from another.
+    this._layer.set('layerType', 'vector')
     map.addLayer(this._layer)
   }
 

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

@@ -1,6 +1,4 @@
 import { transform as projTransform } from 'ol/proj.js'
-import VectorLayer from 'ol/layer/Vector.js'
-import VectorTileLayer from 'ol/layer/VectorTile.js'
 import { testOLFeature, testRenderFeature, bestOf } from './snapGeometry.js'
 
 // VectorTile geometry is clipped to a rectangle (tile extent + buffer), producing fake
@@ -136,11 +134,15 @@ const pickVisibleCandidates = (best, candidates, context) => {
   return result
 }
 
-// Collected on each query — VectorTileLayers are replaced when the map style changes
+// Collected on each query — VectorTileLayers are replaced when the map style changes.
+// Classified by the `layerType` tag the provider sets at creation, not `instanceof
+// VectorTileLayer` — this adapter and the provider are independently-bundled scripts in
+// a UMD consumer, each with its own copy of ol, so a class reference from this bundle
+// never matches an instance the provider built.
 const getVTLayers = (map) => {
   const layers = []
   map.getLayers().forEach(l => {
-    if (l instanceof VectorTileLayer) { layers.push(l) }
+    if (l.get('layerType') === 'vectorTile') { layers.push(l) }
   })
   return layers
 }
@@ -155,7 +157,10 @@ export const createSnapEngine = (map, snapLayers = []) => {
     for (const entry of layers ?? []) {
       if (typeof entry === 'string') {
         vtLayerNames.add(entry)
-      } else if (entry instanceof VectorLayer) {
+      } else if (typeof entry?.getSource === 'function') {
+        // Duck-typed rather than `instanceof VectorLayer` — an entry here can be a live
+        // layer object a consumer built themselves with their own copy of ol, which would
+        // never satisfy an instanceof check against this bundle's own copy of the class.
         olLayers.push(entry)
       } else {
         // unsupported layer type — skip

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

@@ -35,6 +35,7 @@ const renderFeature = (type, flat, ends = null, mapboxLayer = { id: 'boundaries'
 const setupVT = ({ features, withTileGrid = true, fillNeighbour = false }) => {
   const map = createEngineMap()
   const vtLayer = new VectorTileLayer({})
+  vtLayer.set('layerType', 'vectorTile') // mirrors the provider's own tagging in tileLayers.js
   if (withTileGrid) {
     jest.spyOn(vtLayer, 'getSource').mockReturnValue({ getTileGrid: () => tileGrid, getProjection: () => null })
   }