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

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

@@ -22,7 +22,7 @@ export const bboxContains = (outer, inner) => {
     inner[0] >= outer[0] && // west
     inner[1] >= outer[1] && // south
     inner[2] <= outer[2] && // east
-    inner[3] <= outer[3] // north
+    inner[3] <= outer[3] // NOSONAR, north
   )
 }
 
@@ -40,7 +40,7 @@ export const expandBbox = (existing, addition) => {
     Math.min(existing[0], addition[0]), // west
     Math.min(existing[1], addition[1]), // south
     Math.max(existing[2], addition[2]), // east
-    Math.max(existing[3], addition[3]) // north
+    Math.max(existing[3], addition[3]) // NOSONAR, north
   ]
 }
 
@@ -57,8 +57,8 @@ export const bboxIntersects = (a, b) => {
   return !(
     a[2] < b[0] || // a is left of b
     a[0] > b[2] || // a is right of b
-    a[3] < b[1] || // a is below b
-    a[1] > b[3] // a is above b
+    a[3] < b[1] || // NOSONAR a is below b
+    a[1] > b[3] // NOSONAR a is above b
   )
 }
 
@@ -98,7 +98,7 @@ export const getGeometryBbox = (geometry) => {
       processCoords(geometry.coordinates, 2)
       break
     case 'MultiPolygon':
-      processCoords(geometry.coordinates, 3)
+      processCoords(geometry.coordinates, 3) // NOSONAR: 3 = coordinate nesting depth for MultiPolygon ([polygons][rings][points])
       break
     case 'GeometryCollection':
       geometry.geometries.forEach(g => {
@@ -109,6 +109,8 @@ export const getGeometryBbox = (geometry) => {
         maxY = Math.max(maxY, b[3])
       })
       break
+    default:
+      throw new Error(`Unsupported geometry type: ${geometry.type}`)
   }
 
   return [minX, minY, maxX, maxY]

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

@@ -8,8 +8,11 @@ export const buildExclusionFilter = (originalFilter, idProperty, excludeIds) =>
   }
 
   // Coerce both sides to strings to handle number/string type mismatches
-  const stringIds = excludeIds.map(id => String(id))
-  const exclusionFilter = ['!', ['in', ['to-string', ['get', idProperty]], ['literal', stringIds]]]
+  // 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

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

@@ -0,0 +1,78 @@
+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,
+    toggleVisibility: sublayer.toggleVisibility ?? false,
+    filter: combinedFilter,
+    minZoom: dataset.minZoom,
+    maxZoom: dataset.maxZoom,
+    ...getFillProps(dataset, sublayerStyle)
+  }
+}

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

@@ -1 +1 @@
-.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}.im-c-button-wrapper--draw-add-point{position:absolute;bottom:calc(100% + var(--primary-gap));z-index: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}