@defra/interactive-map 0.0.23-alpha → 0.0.25-alpha

package/providers/maplibre/src/utils/patternImages.js

@@ -61,14 +61,19 @@ export const addPatternsToMap = async (map, styleArray, mapStyleId, patternRegis
   }
 
   const effectiveRatio = getEffectivePixelRatio(pixelRatio)
-  await Promise.all(styleArray.map(async (config) => {
-    const imageId = patternRegistry.getPatternImageId(config, mapStyleId, pixelRatio)
-    if (!imageId || map.hasImage(imageId)) {
-      return
+  // Build a unique set of imagesToAdd callbacks to avoid redundant rasterisation and map.addImage calls
+  const addImages = styleArray.reduce((imagesToAdd, style) => {
+    const imageId = patternRegistry.getPatternImageId(style, mapStyleId, pixelRatio)
+    if (imageId && !imagesToAdd[imageId] && !map.hasImage(imageId)) {
+      imagesToAdd[imageId] = async () => {
+        const result = await rasterisePattern(style, mapStyleId, patternRegistry, pixelRatio)
+        if (result) {
+          map.addImage(result.imageId, result.imageData, { pixelRatio: effectiveRatio })
+        }
+      }
     }
-    const result = await rasterisePattern(config, mapStyleId, patternRegistry, pixelRatio)
-    if (result) {
-      map.addImage(result.imageId, result.imageData, { pixelRatio: effectiveRatio })
-    }
-  }))
+    return imagesToAdd
+  }, {})
+  // Execute the unique set of addImage callbacks in parallel
+  await Promise.all(Object.values(addImages).map(addImage => addImage()))
 }

package/providers/maplibre/src/utils/patternImages.test.js

@@ -76,7 +76,8 @@ describe('addPatternsToMap', () => {
 
     it('processes multiple configs in parallel', async () => {
       const map = makeMap()
-      patternRegistry.register('dots', SVG_CONTENT)
+      patternRegistry.register('dots', "fillPatternForegroundColor: '#aabbcc', fillPatternBackgroundColor: '#112233'")
+      console.log('patternRegistry.list', patternRegistry.list())
       await addPatternsToMap(map, [{ fillPattern: 'stripes' }, { fillPattern: 'dots' }], OUTDOOR, patternRegistry)
       expect(map.addImage).toHaveBeenCalledTimes(2)
     })

package/rollup.esm.mjs

@@ -82,7 +82,7 @@ const PREACT_EXTERNALS = [
 // dependency so it auto-installs for consumers and is resolved transparently.
 const BABEL_RUNTIME_EXTERNAL = /@babel\/runtime/
 
-const createESMConfig = (entryPath, outDir, isCore = false, manualChunks = null) => {
+const createESMConfig = (entryPath, outDir, isCore = false, manualChunks = null, extraExternals = []) => {
   const esmDir = path.resolve(__dirname, outDir)
   // Use the parent dir as output.dir so CSS can be emitted to css/index.css
   // (a sibling subdir) without Rollup 4's ban on ".." in emitted file names.
@@ -108,7 +108,8 @@ const createESMConfig = (entryPath, outDir, isCore = false, manualChunks = null)
           // instance from their own node_modules rather than a 1 MB copy bundled
           // into the provider.  (UMD keeps it bundled — no bundler available there.)
           'maplibre-gl',
-          /^@arcgis\/core/
+          /^@arcgis\/core/,
+          ...extraExternals
         ],
 
     plugins: [
@@ -228,6 +229,16 @@ const ALL_BUILDS = [
     outDir: 'providers/beta/esri/dist/esm',
     manualChunks: (id) => { if (id.includes('/esriProvider')) return 'im-esri-provider' }
   },
+  {
+    entryPath: './providers/beta/openlayers/src/index.js',
+    outDir: 'providers/beta/openlayers/dist/esm',
+    extraExternals: [/^ol\//, 'proj4'],
+    manualChunks: (id) => {
+      if (id.includes('/openlayersProvider')) {
+        return 'im-openlayers-provider'
+      }
+    }
+  },
 
   // Plugins — each lazy-loads ./manifest.js; manualChunks names that split chunk
   {
@@ -293,5 +304,5 @@ const buildsToRun = BUILD_TARGET
   : ALL_BUILDS
 
 export default buildsToRun.map(b =>
-  createESMConfig(b.entryPath, b.outDir, b.isCore || false, b.manualChunks || null)
+  createESMConfig(b.entryPath, b.outDir, b.isCore || false, b.manualChunks || null, b.extraExternals || [])
 )

package/src/App/hooks/useFeatureItems.test.js

@@ -47,6 +47,7 @@ describe('useFeatureItems — event subscription', () => {
   it('does not subscribe when eventBus is undefined', () => {
     const spy = jest.spyOn(console, 'error').mockImplementation(() => {})
     renderHook(() => useFeatureItems(undefined))
+    expect(spy).not.toHaveBeenCalled()
     spy.mockRestore()
   })
 })

package/src/App/hooks/useLayoutMeasurements.test.js

@@ -201,7 +201,6 @@ describe('useLayoutMeasurements', () => {
     const { dispatch } = setup({ app: { arePluginsEvaluated: false } })
     renderHook(() => useLayoutMeasurements())
     expect(dispatch).not.toHaveBeenCalledWith(expect.objectContaining({ type: 'SET_SAFE_ZONE_INSET' }))
-    expect(layoutRefs => layoutRefs).toBeDefined() // no layout calculation
   })
 
   test('re-dispatches safe zone when arePluginsEvaluated becomes true', () => {

package/src/App/hooks/useMarkersAPI.test.js

@@ -117,6 +117,7 @@ describe('useMarkers — markerRef and positioning', () => {
     act(() => result.current.markerRef('m1')(ctx.mockElement))
     const renderCallback = ctx.mockEventBus.on.mock.calls.find(call => call[0] === 'map:render')?.[1]
     if (renderCallback) act(() => renderCallback())
+    expect(ctx.mockElement.style.transform).toBeUndefined()
   })
 
   it('updates positions on mapSize change', () => {

package/src/App/hooks/useModalPanelBehaviour.test.js

@@ -256,9 +256,10 @@ describe('useModalPanelBehaviour', () => {
     })
 
     it('handles null focus targets gracefully', () => {
+      refs.panel.current.focus = jest.fn()
       render(<TestComponent />)
       dispatchFocusIn(null)
-      expect(true).toBe(true)
+      expect(refs.panel.current.focus).not.toHaveBeenCalled()
     })
   })
 

package/src/App/layout/layout.module.scss

@@ -350,6 +350,7 @@
   .im-c-panel--side {
     width: 100%;
     max-width: 80%;
+    bottom: 0;
 
     @include tools.border-focus-base(
       $is-inset: true,

package/src/App/store/AppProvider.test.jsx

@@ -82,6 +82,9 @@ describe('AppProvider', () => {
       breakpointCb('sm')
       interfaceCb('mobile')
     })
+
+    expect(mockBreakpointDetector.subscribe).toHaveBeenCalledWith(expect.any(Function))
+    expect(detectInterface.subscribeToInterfaceChanges).toHaveBeenCalledWith(expect.any(Function))
   })
 
   test('handles eventBus setmode and revertmode', () => {
@@ -94,6 +97,8 @@ describe('AppProvider', () => {
       mockOptions.eventBus.off('app:setmode', capturedSetMode)
       mockOptions.eventBus.off('app:revertmode', capturedRevertMode)
     })
+    expect(mockOptions.eventBus.on).toHaveBeenCalledWith('app:setmode', capturedSetMode)
+    expect(mockOptions.eventBus.on).toHaveBeenCalledWith('app:revertmode', capturedRevertMode)
   })
 
   test('provides state, dispatch, and layoutRefs via context', () => {

package/src/App/store/MapProvider.test.jsx

@@ -186,9 +186,14 @@ describe('MapProvider', () => {
   })
 
   test('handles dispatch actions correctly', () => {
+    let contextValue
+    const Child = () => {
+      contextValue = React.useContext(MapContext)
+      return null
+    }
     render(
       <MapProvider options={{ id: 'map1', mapSize: '100x100', eventBus: mockEventBus }}>
-        <div>Child</div>
+        <Child />
       </MapProvider>
     )
 
@@ -197,5 +202,7 @@ describe('MapProvider', () => {
       capturedHandlers['map:setstyle']({ id: 'style2' })
       capturedHandlers['map:setsize']('400x400')
     })
+
+    expect(contextValue.isMapReady).toBe(true)
   })
 })

package/src/services/announcer.test.js

@@ -24,21 +24,19 @@ describe('createAnnouncer', () => {
 
   it('does nothing if mapStatusRef.current is null', () => {
     const announceWithNull = createAnnouncer({ current: null })
-    announceWithNull('Hello')
-    jest.advanceTimersByTime(1000)
-    expect(true).toBe(true) // just confirm no throw
+    expect(() => {
+      announceWithNull('Hello')
+      jest.advanceTimersByTime(1000)
+    }).not.toThrow()
   })
 
   it('returns early if mapStatusRef.current becomes null during setTimeout', () => {
     announce('Test message', 'plugin')
     expect(mapStatusRef.current.textContent).toBe('') // cleared immediately
 
-    // Set current to null before setTimeout fires
     mapStatusRef.current = null
 
-    jest.advanceTimersByTime(100)
-    // Should not throw, just return early
-    expect(true).toBe(true)
+    expect(() => jest.advanceTimersByTime(100)).not.toThrow()
   })
 
   it('sets textContent for a plugin message immediately', () => {

package/src/types.js

@@ -403,8 +403,18 @@
  * Falls back to `#0b0c0c` (light) or `#ffffff` (dark).
  * Injected as the `--map-overlay-foreground-color` CSS custom property.
  *
+ * @property {'raster' | 'ogc-vt'} [type]
+ * Tile layer type. Controls how the map provider constructs the basemap source. Omit (or leave
+ * undefined) for the default Mapbox GL vector tile path. The OpenLayers provider supports all
+ * three types, enabling raster, standard vector tile, and OGC vector tile basemaps:
+ * - `'raster'` — XYZ raster tile source; `url` should be a tile URL template.
+ * - `'ogc-vt'` — OGC API - Tiles vector tile source; `url` should point to an OGC style endpoint
+ *   that returns a Mapbox GL style document. **Currently only supported by the OpenLayers provider.**
+ *
  * @property {string} url
- * URL to the style.json (Mapbox Style Specification).
+ * URL for the style. For the default vector tile path and `'ogc-vt'`, this should be a URL that
+ * returns a Mapbox GL style document (Mapbox Style Specification). For `'raster'`, this should
+ * be an XYZ tile URL template with `{x}`, `{y}`, `{z}` placeholders.
  */
 
 /**

package/webpack.dev.mjs

@@ -20,7 +20,9 @@ export default {
     index: path.join(__dirname, 'demo/js/index.js'),
     draw: path.join(__dirname, 'demo/js/draw.js'),
     farming: path.join(__dirname, 'demo/js/farming.js'),
-    planning: path.join(__dirname, 'demo/js/planning.js')
+    planning: path.join(__dirname, 'demo/js/planning.js'),
+    'planning-ol': path.join(__dirname, 'demo/js/planning-ol.js'),
+    gep: path.join(__dirname, 'demo/js/gep.js')
   },
   output: {
     path: path.resolve(__dirname, 'public'),
@@ -56,10 +58,10 @@ export default {
     new webpack.DefinePlugin({
       'process.env': {
         // OS Open Zoomstack
-        OUTDOOR_URL: JSON.stringify(process.env.OUTDOOR_URL),
-        NIGHT_URL: JSON.stringify(process.env.NIGHT_URL),
-        DEUTERANOPIA_URL: JSON.stringify(process.env.DEUTERANOPIA_URL),
-        TRITANOPIA_URL: JSON.stringify(process.env.TRITANOPIA_URL),
+        OZS_OUTDOOR_URL: JSON.stringify(process.env.OZS_OUTDOOR_URL),
+        OZS_NIGHT_URL: JSON.stringify(process.env.OZS_NIGHT_URL),
+        OZS_DEUTERANOPIA_URL: JSON.stringify(process.env.OZS_DEUTERANOPIA_URL),
+        OZS_TRITANOPIA_URL: JSON.stringify(process.env.OZS_TRITANOPIA_URL),
         // OS Vector Tile API (3857)
         VTS_OUTDOOR_URL: JSON.stringify(process.env.VTS_OUTDOOR_URL),
         VTS_DARK_URL: JSON.stringify(process.env.VTS_DARK_URL),
@@ -68,8 +70,15 @@ export default {
         VTS_OUTDOOR_URL_27700: JSON.stringify(process.env.VTS_OUTDOOR_URL_27700),
         VTS_DARK_URL_27700: JSON.stringify(process.env.VTS_DARK_URL_27700),
         VTS_BLACK_AND_WHITE_URL_27700: JSON.stringify(process.env.VTS_BLACK_AND_WHITE_URL_27700),
+        // OS NGD Tiles API (OGC, 27700)
+        NGD_OUTDOOR_URL_27700: JSON.stringify(process.env.NGD_OUTDOOR_URL_27700),
+        NGD_BLACK_AND_WHITE_URL_27700: JSON.stringify(process.env.NGD_BLACK_AND_WHITE_URL_27700),
         // Aerial photography
         AERIAL_URL: JSON.stringify(process.env.AERIAL_URL),
+        // OS Maps API (27700 raster)
+        MAPS_OUTDOOR_URL: JSON.stringify(process.env.MAPS_OUTDOOR_URL),
+        MAPS_ROAD_URL: JSON.stringify(process.env.MAPS_ROAD_URL),
+        MAPS_LIGHT_URL: JSON.stringify(process.env.MAPS_LIGHT_URL),
         // OS Auth
         OS_CLIENT_ID: JSON.stringify(process.env.OS_CLIENT_ID),
         OS_CLIENT_SECRET: JSON.stringify(process.env.OS_CLIENT_SECRET),

package/webpack.umd.mjs

@@ -137,6 +137,7 @@ const ALL_BUILDS = [
   // Providers
   { entryPath: './providers/maplibre/src/index.js', libraryPath: 'maplibreProvider', outDir: 'providers/maplibre/dist/umd' },
   { entryPath: './providers/beta/open-names/src/index.js', libraryPath: 'openNamesProvider', outDir: 'providers/beta/open-names/dist/umd' },
+  { entryPath: './providers/beta/openlayers/src/index.js', libraryPath: 'openLayersProvider', outDir: 'providers/beta/openlayers/dist/umd' },
 
   // Plugins
   { entryPath: './plugins/beta/scale-bar/src/index.js', libraryPath: 'scaleBarPlugin', outDir: 'plugins/beta/scale-bar/dist/umd' },