@defra/interactive-map 0.0.17-alpha → 0.0.19-alpha

package/plugins/beta/datasets/src/adapters/maplibre/maplibreLayerAdapter.js

@@ -1,7 +1,10 @@
 import { applyExclusionFilter } from '../../utils/filters.js'
 import { getSourceId, getLayerIds, getSublayerLayerIds, getAllLayerIds } from './layerIds.js'
 import { addDatasetLayers, addSublayerLayers } from './layerBuilders.js'
-import { registerPatterns } from './patternRegistry.js'
+import { getPatternConfigs } from './patternImages.js'
+import { getSymbolConfigs, getSymbolImageId } from './symbolImages.js'
+import { mergeSublayer } from '../../utils/mergeSublayer.js'
+import { scaleFactor } from '../../../../../../src/config/appConfig.js'
 
 /**
  * MapLibre GL JS implementation of the LayerAdapter interface for the datasets plugin.
@@ -11,12 +14,25 @@ import { registerPatterns } from './patternRegistry.js'
  * - Pattern image registration (delegated to patternRegistry)
  * - Visibility toggling, feature filtering, style changes
  * - Style-change recovery (re-adding layers after basemap swap)
+ *
+ * Symbol image rasterisation is delegated to the map provider via
+ * `mapProvider.registerSymbols()`, keeping this adapter free of provider internals.
  */
 export default class MaplibreLayerAdapter {
-  constructor (map) {
-    this._map = map
+  /**
+   * @param {Object} mapProvider - Map provider instance (e.g. MapLibreProvider)
+   * @param {Object} symbolRegistry
+   * @param {Object} patternRegistry
+   */
+  constructor (mapProvider, symbolRegistry, patternRegistry) {
+    this._mapProvider = mapProvider
+    this._map = mapProvider.map
+    this._symbolRegistry = symbolRegistry
+    this._patternRegistry = patternRegistry
     // datasetId → sourceId, used by setData to update the correct source
     this._datasetSourceMap = new Map()
+    // Tracks all active symbol-type layer IDs so non-symbol layers can be kept below them
+    this._symbolLayerIds = new Set()
   }
 
   // ─── Lifecycle ──────────────────────────────────────────────────────────────
@@ -24,12 +40,18 @@ export default class MaplibreLayerAdapter {
   /**
    * Initialise all datasets: register patterns, add layers, then wait for idle.
    * @param {Object[]} datasets
-   * @param {string} mapStyleId
+   * @param {Object} mapStyle
    * @returns {Promise<void>} Resolves once the map has processed all layers.
    */
-  async init (datasets, mapStyleId) {
-    await registerPatterns(this._map, datasets, mapStyleId)
-    datasets.forEach(dataset => this._addLayers(dataset, mapStyleId))
+  async init (datasets, mapStyle) {
+    const mapStyleId = mapStyle.id
+    const pixelRatio = this._pixelRatio
+    await Promise.all([
+      this._mapProvider.registerPatterns(getPatternConfigs(datasets, this._patternRegistry), mapStyleId, this._patternRegistry),
+      this._mapProvider.registerSymbols(getSymbolConfigs(datasets), mapStyle, this._symbolRegistry)
+    ])
+    this._symbolLayerIds.clear()
+    datasets.forEach(dataset => this._addLayers(dataset, mapStyle, pixelRatio))
     await new Promise(resolve => this._map.once('idle', resolve))
   }
 
@@ -58,17 +80,23 @@ export default class MaplibreLayerAdapter {
    * Re-register patterns and re-add all layers after a basemap style change,
    * then reapply cached dynamic source data and hidden-feature filters.
    * @param {Object[]} datasets
-   * @param {string} newStyleId
+   * @param {Object} newMapStyle
    * @param {Object} hiddenFeatures - pluginState.hiddenFeatures
    * @param {Map} dynamicSources - datasetId → dynamic source instance
    * @returns {Promise<void>}
    */
-  async onStyleChange (datasets, newStyleId, hiddenFeatures, dynamicSources) {
+  async onStyleChange (datasets, newMapStyle, hiddenFeatures, dynamicSources) {
     // MapLibre wipes all sources/layers on style change — must wait for idle first
     await new Promise(resolve => this._map.once('idle', resolve))
 
-    await registerPatterns(this._map, datasets, newStyleId)
-    datasets.forEach(dataset => this._addLayers(dataset, newStyleId))
+    const newStyleId = newMapStyle.id
+    const pixelRatio = this._pixelRatio
+    await Promise.all([
+      this._mapProvider.registerPatterns(getPatternConfigs(datasets, this._patternRegistry), newStyleId, this._patternRegistry),
+      this._mapProvider.registerSymbols(getSymbolConfigs(datasets), newMapStyle, this._symbolRegistry)
+    ])
+    this._symbolLayerIds.clear()
+    datasets.forEach(dataset => this._addLayers(dataset, newMapStyle, pixelRatio))
 
     // Re-push cached data for dynamic sources
     dynamicSources.forEach(source => source.reapply())
@@ -83,15 +111,45 @@ export default class MaplibreLayerAdapter {
     })
   }
 
+  /**
+   * Re-register symbols at the new pixel ratio and update icon-image on all symbol layers.
+   * Called when the map size changes so symbols are rasterised at the correct resolution.
+   * @param {Object[]} datasets
+   * @param {Object} mapStyle
+   * @returns {Promise<void>}
+   */
+  async onSizeChange (datasets, mapStyle) {
+    await this._mapProvider.registerSymbols(getSymbolConfigs(datasets), mapStyle, this._symbolRegistry)
+    const pixelRatio = this._pixelRatio
+    datasets.forEach(dataset => {
+      getAllLayerIds(dataset).forEach(layerId => {
+        if (!this._symbolLayerIds.has(layerId) || !this._map.getLayer(layerId)) { return }
+        const imageId = getSymbolImageId(dataset, mapStyle, this._symbolRegistry, false, pixelRatio)
+        if (imageId) {
+          this._map.setLayoutProperty(layerId, 'icon-image', imageId)
+        }
+      })
+      dataset.sublayers?.forEach(sublayer => {
+        const { symbolLayerId } = getSublayerLayerIds(dataset.id, sublayer.id)
+        if (!this._map.getLayer(symbolLayerId)) { return }
+        const merged = mergeSublayer(dataset, sublayer)
+        const imageId = getSymbolImageId(merged, mapStyle, this._symbolRegistry, false, pixelRatio)
+        if (imageId) {
+          this._map.setLayoutProperty(symbolLayerId, 'icon-image', imageId)
+        }
+      })
+    })
+  }
+
   // ─── Dataset operations ─────────────────────────────────────────────────────
 
   /**
    * Add a single dataset's source and layers to the map.
    * @param {Object} dataset
-   * @param {string} mapStyleId
+   * @param {Object} mapStyle
    */
-  addDataset (dataset, mapStyleId) {
-    this._addLayers(dataset, mapStyleId)
+  addDataset (dataset, mapStyle) {
+    this._addLayers(dataset, mapStyle, this._pixelRatio)
   }
 
   /**
@@ -108,6 +166,7 @@ export default class MaplibreLayerAdapter {
       if (this._map.getLayer(layerId)) {
         this._map.removeLayer(layerId)
       }
+      this._symbolLayerIds.delete(layerId)
     })
 
     const sourceIsShared = allDatasets.some(d => d.id !== dataset.id && getSourceId(d) === sourceId)
@@ -141,13 +200,12 @@ export default class MaplibreLayerAdapter {
    * @param {string} sublayerId
    */
   showSublayer (datasetId, sublayerId) {
-    const { fillLayerId, strokeLayerId } = getSublayerLayerIds(datasetId, sublayerId)
-    if (this._map.getLayer(fillLayerId)) {
-      this._map.setLayoutProperty(fillLayerId, 'visibility', 'visible')
-    }
-    if (this._map.getLayer(strokeLayerId)) {
-      this._map.setLayoutProperty(strokeLayerId, 'visibility', 'visible')
-    }
+    const { fillLayerId, strokeLayerId, symbolLayerId } = getSublayerLayerIds(datasetId, sublayerId)
+    ;[fillLayerId, strokeLayerId, symbolLayerId].forEach(layerId => {
+      if (this._map.getLayer(layerId)) {
+        this._map.setLayoutProperty(layerId, 'visibility', 'visible')
+      }
+    })
   }
 
   /**
@@ -156,13 +214,12 @@ export default class MaplibreLayerAdapter {
    * @param {string} sublayerId
    */
   hideSublayer (datasetId, sublayerId) {
-    const { fillLayerId, strokeLayerId } = getSublayerLayerIds(datasetId, sublayerId)
-    if (this._map.getLayer(fillLayerId)) {
-      this._map.setLayoutProperty(fillLayerId, 'visibility', 'none')
-    }
-    if (this._map.getLayer(strokeLayerId)) {
-      this._map.setLayoutProperty(strokeLayerId, 'visibility', 'none')
-    }
+    const { fillLayerId, strokeLayerId, symbolLayerId } = getSublayerLayerIds(datasetId, sublayerId)
+    ;[fillLayerId, strokeLayerId, symbolLayerId].forEach(layerId => {
+      if (this._map.getLayer(layerId)) {
+        this._map.setLayoutProperty(layerId, 'visibility', 'none')
+      }
+    })
   }
 
   // ─── Feature operations ─────────────────────────────────────────────────────
@@ -190,42 +247,54 @@ export default class MaplibreLayerAdapter {
   /**
    * Update a dataset's style and re-render all its layers.
    * @param {Object} dataset - Updated dataset (style changes already merged in)
-   * @param {string} mapStyleId
+   * @param {Object} mapStyle
    * @returns {Promise<void>}
    */
-  async setStyle (dataset, mapStyleId) {
+  async setStyle (dataset, mapStyle) {
+    const mapStyleId = mapStyle.id
+    const pixelRatio = this._pixelRatio
     getAllLayerIds(dataset).forEach(layerId => {
       if (this._map.getLayer(layerId)) {
         this._map.removeLayer(layerId)
       }
+      this._symbolLayerIds.delete(layerId)
     })
-    await registerPatterns(this._map, [dataset], mapStyleId)
-    this._addLayers(dataset, mapStyleId)
+    await Promise.all([
+      this._mapProvider.registerPatterns(getPatternConfigs([dataset], this._patternRegistry), mapStyleId, this._patternRegistry),
+      this._mapProvider.registerSymbols(getSymbolConfigs([dataset]), mapStyle, this._symbolRegistry)
+    ])
+    this._addLayers(dataset, mapStyle, pixelRatio)
   }
 
   /**
    * Update a single sublayer's style and re-render its layers.
    * @param {Object} dataset - Updated dataset (sublayer style changes already merged in)
    * @param {string} sublayerId
-   * @param {string} mapStyleId
+   * @param {Object} mapStyle
    * @returns {Promise<void>}
    */
-  async setSublayerStyle (dataset, sublayerId, mapStyleId) {
-    const { fillLayerId, strokeLayerId } = getSublayerLayerIds(dataset.id, sublayerId)
-    if (this._map.getLayer(fillLayerId)) {
-      this._map.removeLayer(fillLayerId)
-    }
-    if (this._map.getLayer(strokeLayerId)) {
-      this._map.removeLayer(strokeLayerId)
-    }
+  async setSublayerStyle (dataset, sublayerId, mapStyle) {
+    const mapStyleId = mapStyle.id
+    const pixelRatio = this._pixelRatio
+    const { fillLayerId, strokeLayerId, symbolLayerId } = getSublayerLayerIds(dataset.id, sublayerId)
+    ;[fillLayerId, strokeLayerId, symbolLayerId].forEach(layerId => {
+      if (this._map.getLayer(layerId)) {
+        this._map.removeLayer(layerId)
+      }
+      this._symbolLayerIds.delete(layerId)
+    })
     const sublayer = dataset.sublayers?.find(s => s.id === sublayerId)
     if (!sublayer) {
       return
     }
-    await registerPatterns(this._map, [dataset], mapStyleId)
+    await Promise.all([
+      this._mapProvider.registerPatterns(getPatternConfigs([dataset], this._patternRegistry), mapStyleId, this._patternRegistry),
+      this._mapProvider.registerSymbols(getSymbolConfigs([dataset]), mapStyle, this._symbolRegistry)
+    ])
     const sourceId = this._datasetSourceMap.get(dataset.id)
     const sourceLayer = dataset.tiles?.length ? dataset.sourceLayer : undefined
-    addSublayerLayers(this._map, dataset, sublayer, sourceId, sourceLayer, mapStyleId)
+    addSublayerLayers(this._map, dataset, sublayer, sourceId, sourceLayer, { mapStyle, symbolRegistry: this._symbolRegistry, patternRegistry: this._patternRegistry, pixelRatio })
+    this._maintainSymbolOrdering(dataset)
   }
 
   /**
@@ -275,9 +344,43 @@ export default class MaplibreLayerAdapter {
 
   // ─── Private ─────────────────────────────────────────────────────────────────
 
-  _addLayers (dataset, mapStyleId) {
-    const sourceId = addDatasetLayers(this._map, dataset, mapStyleId)
+  get _pixelRatio () {
+    return this._mapProvider.map.getPixelRatio() * (scaleFactor[this._mapProvider.mapSize] || 1)
+  }
+
+  _addLayers (dataset, mapStyle, pixelRatio) {
+    const sourceId = addDatasetLayers(this._map, dataset, mapStyle, this._symbolRegistry, this._patternRegistry, pixelRatio)
     this._datasetSourceMap.set(dataset.id, sourceId)
+    this._maintainSymbolOrdering(dataset)
+  }
+
+  _getFirstSymbolLayerId () {
+    const style = this._map.getStyle()
+    if (!style?.layers) {
+      return null
+    }
+    const layer = style.layers.find(l => this._symbolLayerIds.has(l.id))
+    return layer?.id ?? null
+  }
+
+  _maintainSymbolOrdering (dataset) {
+    const layerIds = getAllLayerIds(dataset).filter(id => id && this._map.getLayer(id))
+    layerIds.forEach(id => {
+      if (this._map.getLayer(id)?.type === 'symbol') {
+        this._symbolLayerIds.add(id)
+      } else {
+        this._symbolLayerIds.delete(id)
+      }
+    })
+    const firstSymbolId = this._getFirstSymbolLayerId()
+    if (!firstSymbolId) {
+      return
+    }
+    layerIds.forEach(id => {
+      if (!this._symbolLayerIds.has(id)) {
+        this._map.moveLayer(id, firstSymbolId)
+      }
+    })
   }
 
   _setDatasetVisibility (datasetId, visibility) {
@@ -307,14 +410,12 @@ export default class MaplibreLayerAdapter {
       })
       return
     }
-    const { fillLayerId, strokeLayerId } = getLayerIds(dataset)
+    const { fillLayerId, strokeLayerId, symbolLayerId } = getLayerIds(dataset)
     const originalFilter = dataset.filter || null
-    if (fillLayerId) {
-      applyExclusionFilter(this._map, fillLayerId, originalFilter, idProperty, excludeIds)
-    }
-    if (strokeLayerId) {
-      applyExclusionFilter(this._map, strokeLayerId, originalFilter, idProperty, excludeIds)
-    }
+    const layerIds = [fillLayerId, strokeLayerId, symbolLayerId].filter(Boolean)
+    layerIds.forEach(layerId => {
+      applyExclusionFilter(this._map, layerId, originalFilter, idProperty, excludeIds)
+    })
   }
 
   _setPaintOpacity (layerId, opacity) {
@@ -322,7 +423,8 @@ export default class MaplibreLayerAdapter {
     if (!layer) {
       return
     }
-    const prop = layer.type === 'line' ? 'line-opacity' : 'fill-opacity'
+    const opacityProps = { line: 'line-opacity', symbol: 'icon-opacity' }
+    const prop = opacityProps[layer.type] || 'fill-opacity'
     this._map.setPaintProperty(layerId, prop, opacity)
   }
 

package/plugins/beta/datasets/src/adapters/maplibre/patternImages.js

@@ -0,0 +1,27 @@
+// Re-export pure pattern utilities from core — no map engine dependency.
+import { hasPattern } from '../../../../../../src/utils/patternUtils.js'
+import { mergeSublayer } from '../../utils/mergeSublayer.js'
+
+export { hasPattern, getPatternInnerContent, getPatternImageId, getKeyPatternPaths, injectColors } from '../../../../../../src/utils/patternUtils.js'
+
+/**
+ * Returns a flat list of datasets and merged sublayers that require pattern images.
+ * Handles sublayer merging so callers (e.g. mapProvider.registerPatterns) receive ready-to-use configs.
+ *
+ * @param {Object[]} datasets
+ * @param {Object} patternRegistry
+ * @returns {Object[]}
+ */
+export const getPatternConfigs = (datasets, patternRegistry) =>
+  datasets.flatMap(dataset => {
+    const configs = hasPattern(dataset) ? [dataset] : []
+    if (dataset.sublayers?.length) {
+      dataset.sublayers.forEach(sublayer => {
+        const merged = mergeSublayer(dataset, sublayer)
+        if (hasPattern(merged)) {
+          configs.push(merged)
+        }
+      })
+    }
+    return configs
+  })

package/plugins/beta/datasets/src/adapters/maplibre/symbolImages.js

@@ -0,0 +1,31 @@
+// Re-export pure symbol resolution utilities from core — no map engine dependency.
+import { hasSymbol } from '../../../../../../src/utils/symbolUtils.js'
+import { mergeSublayer } from '../../utils/mergeSublayer.js'
+
+export { hasSymbol, getSymbolDef, getSymbolStyleColors, getSymbolViewBox, getSymbolAnchor } from '../../../../../../src/utils/symbolUtils.js'
+
+// Re-export MapLibre-specific symbol utilities from the provider.
+// This is the single cross-boundary import in the adapter; in a separate-package
+// setup this would be: '@interactive-map/maplibre-provider/utils/symbolImages'
+export { anchorToMaplibre, getSymbolImageId } from '../../../../../../providers/maplibre/src/utils/symbolImages.js'
+
+/**
+ * Returns a flat list of datasets and merged sublayers that require symbol images.
+ * Handles sublayer merging so callers (e.g. mapProvider.registerSymbols) receive ready-to-use configs.
+ *
+ * @param {Object[]} datasets
+ * @returns {Object[]}
+ */
+export const getSymbolConfigs = (datasets) =>
+  datasets.flatMap(dataset => {
+    const configs = hasSymbol(dataset) ? [dataset] : []
+    if (dataset.sublayers?.length) {
+      dataset.sublayers.forEach(sublayer => {
+        const merged = mergeSublayer(dataset, sublayer)
+        if (hasSymbol(merged)) {
+          configs.push(merged)
+        }
+      })
+    }
+    return configs
+  })

package/plugins/beta/datasets/src/api/addDataset.js

@@ -1,6 +1,6 @@
 import { datasetDefaults } from '../defaults.js'
 
 export const addDataset = ({ pluginState, mapState }, dataset) => {
-  pluginState.layerAdapter?.addDataset({ ...datasetDefaults, ...dataset }, mapState.mapStyle.id)
+  pluginState.layerAdapter?.addDataset({ ...datasetDefaults, ...dataset }, mapState.mapStyle)
   pluginState.dispatch({ type: 'ADD_DATASET', payload: { dataset, datasetDefaults } })
 }

package/plugins/beta/datasets/src/api/setData.js

@@ -1,7 +1,9 @@
-export const setData = ({ pluginState, services }, geojson, { datasetId }) => {
+import { logger } from '../../../../../src/services/logger.js'
+
+export const setData = ({ pluginState }, geojson, { datasetId }) => {
   const dataset = pluginState.datasets?.find(d => d.id === datasetId)
   if (dataset?.tiles) {
-    services.logger.warn(`setData called on vector tile dataset "${datasetId}" — has no effect`)
+    logger.warn(`setData called on vector tile dataset "${datasetId}" — has no effect`)
     return
   }
   pluginState.layerAdapter?.setData(datasetId, geojson)

package/plugins/beta/datasets/src/api/setStyle.js

@@ -12,11 +12,11 @@ export const setStyle = ({ pluginState, mapState }, style, { datasetId, sublayer
         sublayer.id === sublayerId ? { ...sublayer, style: { ...sublayer.style, ...style } } : sublayer
       )
     }
-    pluginState.layerAdapter?.setSublayerStyle(updatedSublayerDataset, sublayerId, mapState.mapStyle.id)
+    pluginState.layerAdapter?.setSublayerStyle(updatedSublayerDataset, sublayerId, mapState.mapStyle)
     return
   }
 
   pluginState.dispatch({ type: 'SET_DATASET_STYLE', payload: { datasetId, styleChanges: style } })
   const updatedDataset = { ...dataset, ...style }
-  pluginState.layerAdapter?.setStyle(updatedDataset, mapState.mapStyle.id)
+  pluginState.layerAdapter?.setStyle(updatedDataset, mapState.mapStyle)
 }

package/plugins/beta/datasets/src/components/EmptyKey.jsx

@@ -0,0 +1,7 @@
+export const EmptyKey = ({ text }) => {
+  return (
+    <div className='im-c-datasets-key'>
+      <p className='im-c-datasets-key__empty-message'>{text}</p>
+    </div>
+  )
+}

package/plugins/beta/datasets/src/components/EmptyKey.test.jsx

@@ -0,0 +1,21 @@
+import { render, screen } from '@testing-library/react'
+import { EmptyKey } from './EmptyKey'
+
+describe('EmptyKey', () => {
+  const text = 'No features available'
+
+  it('renders the wrapper div with the correct class', async () => {
+    const { container } = render(<EmptyKey text={text} />)
+    expect(container.querySelector('.im-c-datasets-key')).toBeTruthy()
+  })
+
+  it('renders the empty message paragraph with the correct class', async () => {
+    const { container } = render(<EmptyKey text={text} />)
+    expect(container.querySelector('.im-c-datasets-key__empty-message')).toBeTruthy()
+  })
+
+  it('renders the provided text', async () => {
+    render(<EmptyKey text={text} />)
+    expect(screen.getByText(text)).toBeTruthy()
+  })
+})

package/plugins/beta/datasets/src/components/KeySvg.jsx

@@ -0,0 +1,24 @@
+import { hasSymbol, getSymbolDef } from '../../../../../src/utils/symbolUtils.js'
+import { hasPattern } from '../../../../../src/utils/patternUtils.js'
+import { KeySvgPattern } from './KeySvgPattern.jsx'
+import { KeySvgSymbol } from './KeySvgSymbol.jsx'
+import { KeySvgLine } from './KeySvgLine.jsx'
+import { KeySvgRect } from './KeySvgRect.jsx'
+
+export const KeySvg = (props) => {
+  const { symbolRegistry } = props
+  const symbolDef = hasSymbol(props) && getSymbolDef(props, symbolRegistry)
+  if (symbolDef) {
+    return <KeySvgSymbol {...props} symbolDef={symbolDef} />
+  }
+
+  if (hasPattern(props)) {
+    return <KeySvgPattern {...props} />
+  }
+
+  if (props.keySymbolShape === 'line') {
+    return <KeySvgLine {...props} />
+  }
+
+  return <KeySvgRect {...props} />
+}

package/plugins/beta/datasets/src/components/KeySvgLine.jsx

@@ -0,0 +1,19 @@
+import { svgProps, SVG_SIZE, SVG_CENTER } from './svgProperties.js'
+import { getValueForStyle } from '../../../../../src/utils/getValueForStyle'
+
+export const KeySvgLine = (props) => {
+  const { mapStyle } = props
+  return (
+    <svg {...svgProps}>
+      <line
+        x1={props.strokeWidth / 2}
+        y1={SVG_CENTER}
+        x2={SVG_SIZE - props.strokeWidth / 2}
+        y2={SVG_CENTER}
+        stroke={getValueForStyle(props.stroke, mapStyle.id)}
+        strokeWidth={props.strokeWidth}
+        strokeLinecap='round'
+      />
+    </svg>
+  )
+}

package/plugins/beta/datasets/src/components/KeySvgPattern.jsx

@@ -0,0 +1,15 @@
+import { getKeyPatternPaths } from '../../../../../src/utils/patternUtils.js'
+import { svgProps } from './svgProperties.js'
+const PATTERN_INSET = 2
+
+export const KeySvgPattern = (props) => {
+  const { patternRegistry, mapStyle } = props
+
+  const paths = getKeyPatternPaths(props, mapStyle.id, patternRegistry)
+  return (
+    <svg {...svgProps}>
+      <g dangerouslySetInnerHTML={{ __html: paths.border }} />
+      <g transform={`translate(${PATTERN_INSET}, ${PATTERN_INSET})`} dangerouslySetInnerHTML={{ __html: paths.content }} />
+    </svg>
+  )
+}

package/plugins/beta/datasets/src/components/KeySvgRect.jsx

@@ -0,0 +1,22 @@
+import { getValueForStyle } from '../../../../../src/utils/getValueForStyle'
+import { svgProps, SVG_SIZE } from './svgProperties.js'
+
+export const KeySvgRect = (props) => {
+  const { mapStyle } = props
+  return (
+    <svg {...svgProps}>
+      <rect
+        x={props.strokeWidth / 2}
+        y={props.strokeWidth / 2}
+        width={SVG_SIZE - props.strokeWidth}
+        height={SVG_SIZE - props.strokeWidth}
+        rx={props.strokeWidth}
+        ry={props.strokeWidth}
+        fill={getValueForStyle(props.fill, mapStyle.id)}
+        stroke={getValueForStyle(props.stroke, mapStyle.id)}
+        strokeWidth={props.strokeWidth}
+        strokeLinejoin='round'
+      />
+    </svg>
+  )
+}

package/plugins/beta/datasets/src/components/KeySvgSymbol.jsx

@@ -0,0 +1,16 @@
+import { getSymbolStyleColors, getSymbolViewBox } from '../../../../../src/utils/symbolUtils.js'
+import { svgSymbolProps } from './svgProperties.js'
+
+export const KeySvgSymbol = (props) => {
+  const { symbolRegistry, mapStyle, symbolDef } = props
+  const mapColorScheme = mapStyle?.appColorScheme ?? 'light'
+  const keyMapStyle = { ...mapStyle, mapColorScheme }
+
+  const resolvedSvg = symbolRegistry.resolve(symbolDef, getSymbolStyleColors(props), keyMapStyle)
+  const viewBox = getSymbolViewBox(props, symbolDef)
+  return (
+    <svg {...svgSymbolProps} viewBox={viewBox}>
+      <g dangerouslySetInnerHTML={{ __html: resolvedSvg }} />
+    </svg>
+  )
+}

package/plugins/beta/datasets/src/components/svgProperties.js

@@ -0,0 +1,20 @@
+export const SVG_SIZE = 20
+export const SVG_CENTER = SVG_SIZE / 2
+const SVG_SYMBOL_SIZE = 38
+
+export const svgProps = {
+  xmlns: 'http://www.w3.org/2000/svg',
+  width: SVG_SIZE,
+  height: SVG_SIZE,
+  viewBox: `0 0 ${SVG_SIZE} ${SVG_SIZE}`,
+  className: 'am-c-datasets-key-symbol',
+  'aria-hidden': 'true',
+  focusable: 'false'
+}
+
+export const svgSymbolProps = {
+  ...svgProps,
+  width: SVG_SYMBOL_SIZE,
+  height: SVG_SYMBOL_SIZE,
+  className: 'am-c-datasets-key-symbol am-c-datasets-key-symbol--point'
+}

package/plugins/beta/datasets/src/datasets.js

@@ -11,7 +11,7 @@ export const createDatasets = ({
   adapter,
   pluginConfig,
   pluginStateRef,
-  mapStyleId,
+  mapStyle,
   mapProvider,
   events,
   eventBus
@@ -25,7 +25,7 @@ export const createDatasets = ({
 
   // Initialise all datasets via the adapter, then set up dynamic sources
   const processedDatasets = datasets.map(d => applyDatasetDefaults(d, datasetDefaults))
-  adapter.init(processedDatasets, mapStyleId).then(() => {
+  adapter.init(processedDatasets, mapStyle).then(() => {
     processedDatasets.forEach(dataset => {
       if (!isDynamicSource(dataset)) {
         return
@@ -42,16 +42,25 @@ export const createDatasets = ({
     eventBus.emit('datasets:ready')
   })
 
+  let currentMapStyle = mapStyle
+
   // Handle basemap style changes — delegate entirely to the adapter
-  const onSetStyle = (e) => {
-    adapter.onStyleChange(getDatasets(), e.id, getHiddenFeatures(), dynamicSources)
+  const onSetStyle = (newMapStyle) => {
+    currentMapStyle = newMapStyle
+    adapter.onStyleChange(getDatasets(), newMapStyle, getHiddenFeatures(), dynamicSources)
+  }
+
+  const onSizeChange = () => {
+    adapter.onSizeChange(getDatasets(), currentMapStyle)
   }
 
   eventBus.on(events.MAP_SET_STYLE, onSetStyle)
+  eventBus.on(events.MAP_SIZE_CHANGE, onSizeChange)
 
   return {
     remove () {
       eventBus.off(events.MAP_SET_STYLE, onSetStyle)
+      eventBus.off(events.MAP_SIZE_CHANGE, onSizeChange)
 
       // Clean up dynamic sources
       dynamicSources.forEach(source => source.destroy())

package/plugins/beta/datasets/src/defaults.js

@@ -16,12 +16,14 @@ const datasetDefaults = {
 const STYLE_PROPS = [
   'stroke', 'strokeWidth', 'strokeDashArray',
   'fill', 'fillPattern', 'fillPatternSvgContent', 'fillPatternForegroundColor', 'fillPatternBackgroundColor',
-  'opacity', 'symbolDescription', 'keySymbolShape'
+  'opacity', 'symbolDescription', 'keySymbolShape',
+  'symbol', 'symbolSvgContent', 'symbolViewBox', 'symbolAnchor',
+  'symbolBackgroundColor', 'symbolForegroundColor', 'symbolHaloWidth', 'symbolGraphic'
 ]
 
 // Props whose presence in a style object indicates a custom visual style.
 // When any are set, the default symbolDescription is not appropriate.
-const VISUAL_STYLE_PROPS = ['stroke', 'fill', 'fillPattern', 'fillPatternSvgContent']
+const VISUAL_STYLE_PROPS = ['stroke', 'fill', 'fillPattern', 'fillPatternSvgContent', 'symbol', 'symbolSvgContent']
 
 const hasCustomVisualStyle = (style) =>
   VISUAL_STYLE_PROPS.some(prop => prop in style)

package/plugins/beta/datasets/src/index.js

@@ -1,8 +1,9 @@
 // /plugins/datasets/index.js
 import './datasets.scss'
 
-export default function createPlugin (options = {}) {
+export default function createPlugin (options = { }) {
   const plugin = {
+    noKeyItemText: 'No features displayed',
     ...options,
     id: 'datasets',
     load: async () => {