@defra/interactive-map 0.0.30-alpha → 0.0.32-alpha

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

@@ -1,34 +0,0 @@
-/**
- * Build a filter that excludes specific features by ID property
- * Coerces values to strings for comparison to handle mixed number/string types
- */
-export const buildExclusionFilter = (originalFilter, idProperty, excludeIds) => {
-  if (!excludeIds || excludeIds.length === 0) {
-    return originalFilter
-  }
-
-  // Coerce both sides to strings to handle number/string type mismatches
-  // When no idProperty, use feature-level id via ['id'] (GeoJSON feature.id)
-  const idExpr = idProperty ? ['to-string', ['get', idProperty]] : ['to-string', ['id']]
-  // Convert all IDs to strings; map passes each element as the first argument to String
-  const stringIds = excludeIds.map(String)
-  const exclusionFilter = ['!', ['in', idExpr, ['literal', stringIds]]]
-
-  if (!originalFilter) {
-    return exclusionFilter
-  }
-
-  return ['all', originalFilter, exclusionFilter]
-}
-
-/**
- * Apply exclusion filter to a map layer
- */
-export const applyExclusionFilter = (map, layerId, originalFilter, idProperty, excludeIds) => {
-  if (!map.getLayer(layerId)) {
-    return
-  }
-
-  const filter = buildExclusionFilter(originalFilter, idProperty, excludeIds)
-  map.setFilter(layerId, filter)
-}

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

@@ -1,86 +0,0 @@
-import { hasCustomVisualStyle } from '../defaults.js'
-
-const getFillProps = (dataset, sublayerStyle) => {
-  if (sublayerStyle.fillPattern || sublayerStyle.fillPatternSvgContent) {
-    return {
-      fillPattern: sublayerStyle.fillPattern,
-      fillPatternSvgContent: sublayerStyle.fillPatternSvgContent,
-      fillPatternForegroundColor: sublayerStyle.fillPatternForegroundColor ?? dataset.fillPatternForegroundColor,
-      fillPatternBackgroundColor: sublayerStyle.fillPatternBackgroundColor ?? dataset.fillPatternBackgroundColor
-    }
-  }
-  if ('fill' in sublayerStyle) {
-    // Sublayer explicitly sets a plain fill — do not inherit any parent pattern
-    return { fill: sublayerStyle.fill }
-  }
-  return {
-    fill: dataset.fill,
-    fillPattern: dataset.fillPattern,
-    fillPatternSvgContent: dataset.fillPatternSvgContent,
-    fillPatternForegroundColor: dataset.fillPatternForegroundColor,
-    fillPatternBackgroundColor: dataset.fillPatternBackgroundColor
-  }
-}
-
-const getCombinedFilter = (datasetFilter, sublayerFilter) => {
-  if (datasetFilter && sublayerFilter) {
-    return ['all', datasetFilter, sublayerFilter]
-  }
-  return sublayerFilter || datasetFilter || null
-}
-
-const getSymbolDescription = (dataset, sublayerStyle) => {
-  if ('symbolDescription' in sublayerStyle) {
-    return sublayerStyle.symbolDescription
-  }
-  if (hasCustomVisualStyle(sublayerStyle)) {
-    return undefined
-  }
-  return dataset.symbolDescription
-}
-
-/**
- * Merge a sublayer with its parent dataset, producing a flat style
- * object suitable for layer creation and key symbol rendering.
- *
- * The sublayer's nested `style` object is flattened before merging.
- *
- * Fill precedence (highest to lowest):
- *   1. Sublayer's own fillPattern
- *   2. Sublayer's own fill (explicit, even if transparent — clears any parent pattern)
- *   3. Parent's fillPattern
- *   4. Parent's fill
- *
- * symbolDescription is only inherited from the parent when the sublayer has no
- * custom visual styles of its own. If the sublayer overrides stroke/fill/pattern
- * without setting symbolDescription explicitly, no description is shown.
- */
-export const mergeSublayer = (dataset, sublayer) => {
-  const sublayerStyle = sublayer.style || {}
-  const combinedFilter = getCombinedFilter(dataset.filter, sublayer.filter)
-
-  return {
-    id: sublayer.id,
-    label: sublayer.label,
-    stroke: sublayerStyle.stroke ?? dataset.stroke,
-    strokeWidth: sublayerStyle.strokeWidth ?? dataset.strokeWidth,
-    strokeDashArray: sublayerStyle.strokeDashArray ?? dataset.strokeDashArray,
-    opacity: sublayerStyle.opacity ?? dataset.opacity,
-    keySymbolShape: sublayerStyle.keySymbolShape ?? dataset.keySymbolShape,
-    symbolDescription: getSymbolDescription(dataset, sublayerStyle),
-    showInKey: sublayer.showInKey ?? dataset.showInKey,
-    showInMenu: sublayer.showInMenu ?? false,
-    filter: combinedFilter,
-    minZoom: dataset.minZoom,
-    maxZoom: dataset.maxZoom,
-    symbol: sublayerStyle.symbol ?? dataset.symbol,
-    symbolSvgContent: sublayerStyle.symbolSvgContent ?? dataset.symbolSvgContent,
-    symbolViewBox: sublayerStyle.symbolViewBox ?? dataset.symbolViewBox,
-    symbolAnchor: sublayerStyle.symbolAnchor ?? dataset.symbolAnchor,
-    symbolBackgroundColor: sublayerStyle.symbolBackgroundColor ?? dataset.symbolBackgroundColor,
-    symbolForegroundColor: sublayerStyle.symbolForegroundColor ?? dataset.symbolForegroundColor,
-    symbolHaloWidth: sublayerStyle.symbolHaloWidth ?? dataset.symbolHaloWidth,
-    symbolGraphic: sublayerStyle.symbolGraphic ?? dataset.symbolGraphic,
-    ...getFillProps(dataset, sublayerStyle)
-  }
-}

package/plugins/beta/draw-ml/dist/css/index.css

@@ -1,21 +0,0 @@
-.touch-vertex-target circle {
-  fill: var(--map-overlay-foreground-color);
-}
-.touch-vertex-target path {
-  fill: var(--map-overlay-halo-color);
-}
-
-.im-c-actions .im-c-button-wrapper--draw-done,
-.im-c-actions .im-c-button-wrapper--draw-menu,
-.im-c-actions .im-c-button-wrapper--draw-cancel {
-  width: 33.33%;
-}
-
-.im-o-app--tablet .im-c-actions .im-c-button-wrapper--draw-done,
-.im-o-app--tablet .im-c-actions .im-c-button-wrapper--draw-menu,
-.im-o-app--tablet .im-c-actions .im-c-button-wrapper--draw-cancel,
-.im-o-app--desktop .im-c-actions .im-c-button-wrapper--draw-done,
-.im-o-app--desktop .im-c-actions .im-c-button-wrapper--draw-menu,
-.im-o-app--desktop .im-c-actions .im-c-button-wrapper--draw-cancel {
-  width: 100px;
-}