@defra/interactive-map 0.0.3-alpha → 0.0.5-alpha

package/plugins/{datasets → beta/datasets}/src/mapLayers.js

@@ -1,4 +1,4 @@
-import { getValueForStyle } from '../../../src/utils/getValueForStyle.js'
+import { getValueForStyle } from '../../../../src/utils/getValueForStyle.js'
 
 // Generate a hash for consistent source ID generation
 const hashString = (str) => {
@@ -18,6 +18,10 @@ const getSourceId = (dataset) => {
     return `tiles-${hashString(tilesKey)}`
   }
   if (dataset.geojson) {
+    // Dynamic sources get unique IDs per dataset (no sharing)
+    if (isDynamicSource(dataset)) {
+      return `geojson-dynamic-${dataset.id}`
+    }
     // URL strings can be shared, inline GeoJSON objects get unique IDs per dataset
     if (typeof dataset.geojson === 'string') {
       return `geojson-${hashString(dataset.geojson)}`
@@ -29,6 +33,33 @@ const getSourceId = (dataset) => {
   return `source-${dataset.id}`
 }
 
+/**
+ * Check if a dataset uses dynamic fetching (bbox-based)
+ * Dynamic sources require: URL geojson, idProperty for deduplication, and transformRequest for URL building
+ * @param {Object} dataset
+ * @returns {boolean}
+ */
+const isDynamicSource = (dataset) => {
+  return (
+    typeof dataset.geojson === 'string' &&
+    !!dataset.idProperty &&
+    typeof dataset.transformRequest === 'function'
+  )
+}
+
+/**
+ * Update the data for a GeoJSON source
+ * @param {Object} map - Map instance
+ * @param {string} sourceId - Source ID
+ * @param {Object} geojson - GeoJSON FeatureCollection
+ */
+const updateSourceData = (map, sourceId, geojson) => {
+  const source = map.getSource(sourceId)
+  if (source && typeof source.setData === 'function') {
+    source.setData(geojson)
+  }
+}
+
 /**
  * Get all layer IDs that use a given source
  * @param {string} sourceId
@@ -60,10 +91,15 @@ const addMapLayers = (map, mapStyleId, dataset) => {
         maxzoom: dataset.maxZoom || 22
       })
     } else if (dataset.geojson) {
-      // GeoJSON URL
+      // Dynamic source - start with empty FeatureCollection, will be populated by createDynamicSource
+      // Static source - use URL or inline GeoJSON directly
+      const initialData = isDynamicSource(dataset)
+        ? { type: 'FeatureCollection', features: [] }
+        : dataset.geojson
+
       map.addSource(sourceId, {
         type: 'geojson',
-        data: dataset.geojson
+        data: initialData
       })
     } else {
       // No action
@@ -123,5 +159,7 @@ const addMapLayers = (map, mapStyleId, dataset) => {
 export {
   getSourceId,
   getLayersUsingSource,
-  addMapLayers
+  addMapLayers,
+  isDynamicSource,
+  updateSourceData
 }

package/plugins/{datasets → beta/datasets}/src/panels/Key.jsx

@@ -1,5 +1,5 @@
 import React from "react"
-import { getValueForStyle } from '../../../../src/utils/getValueForStyle'
+import { getValueForStyle } from '../../../../../src/utils/getValueForStyle'
 
 export const Key = ({ mapState, pluginState }) => {
   const { mapStyle } = mapState

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

@@ -0,0 +1,115 @@
+/**
+ * Get bbox from map as array [west, south, east, north]
+ * @param {Object} map - Map instance
+ * @returns {number[]} bbox as [west, south, east, north]
+ */
+export const getBboxArray = (map) => {
+  const bounds = map.getBounds()
+  return [bounds.getWest(), bounds.getSouth(), bounds.getEast(), bounds.getNorth()]
+}
+
+/**
+ * Check if inner bbox is fully contained within outer bbox
+ * @param {number[]} outer - [west, south, east, north]
+ * @param {number[]} inner - [west, south, east, north]
+ * @returns {boolean}
+ */
+export const bboxContains = (outer, inner) => {
+  if (!outer || !inner) {
+    return false
+  }
+  return (
+    inner[0] >= outer[0] && // west
+    inner[1] >= outer[1] && // south
+    inner[2] <= outer[2] && // east
+    inner[3] <= outer[3]    // north
+  )
+}
+
+/**
+ * Expand bbox to include another bbox
+ * @param {number[]|null} existing - Current bbox or null
+ * @param {number[]} addition - Bbox to include
+ * @returns {number[]} Expanded bbox
+ */
+export const expandBbox = (existing, addition) => {
+  if (!existing) {
+    return [...addition]
+  }
+  return [
+    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
+  ]
+}
+
+/**
+ * Check if two bboxes intersect
+ * @param {number[]} a - [west, south, east, north]
+ * @param {number[]} b - [west, south, east, north]
+ * @returns {boolean}
+ */
+export const bboxIntersects = (a, b) => {
+  if (!a || !b) {
+    return false
+  }
+  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
+  )
+}
+
+/**
+ * Get bbox from a GeoJSON geometry
+ * @param {Object} geometry - GeoJSON geometry
+ * @returns {number[]} bbox as [west, south, east, north]
+ */
+export const getGeometryBbox = (geometry) => {
+  let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity
+
+  const processCoord = (coord) => {
+    minX = Math.min(minX, coord[0])
+    minY = Math.min(minY, coord[1])
+    maxX = Math.max(maxX, coord[0])
+    maxY = Math.max(maxY, coord[1])
+  }
+
+  const processCoords = (coords, depth) => {
+    if (depth === 0) {
+      processCoord(coords)
+    } else {
+      coords.forEach(c => processCoords(c, depth - 1))
+    }
+  }
+
+  switch (geometry.type) {
+    case 'Point':
+      processCoords(geometry.coordinates, 0)
+      break
+    case 'LineString':
+    case 'MultiPoint':
+      processCoords(geometry.coordinates, 1)
+      break
+    case 'Polygon':
+    case 'MultiLineString':
+      processCoords(geometry.coordinates, 2)
+      break
+    case 'MultiPolygon':
+      processCoords(geometry.coordinates, 3)
+      break
+    case 'GeometryCollection':
+      geometry.geometries.forEach(g => {
+        const b = getGeometryBbox(g)
+        minX = Math.min(minX, b[0])
+        minY = Math.min(minY, b[1])
+        maxX = Math.max(maxX, b[2])
+        maxY = Math.max(maxY, b[3])
+      })
+      break
+  }
+
+  return [minX, minY, maxX, maxY]
+}

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

@@ -0,0 +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))}