@defra/interactive-map 0.0.43-fmp-experimental → 0.0.44-alpha

package/plugins/datasets/src/registry/dataset.js

@@ -45,6 +45,14 @@ export class Dataset {
   // as it will be grouped with its siblings under the parents label if it doesn't.
   get groupLabel () { return this._datasetDefinition.groupLabel || this.parent?.groupLabel || this.parent?.label }
 
+  get groupId () {
+    const groupId = this._datasetDefinition.groupId || this.parent?.groupId
+    if (groupId) {
+      return groupId
+    }
+    return this.groupLabel ? this.groupLabel.toLowerCase().replace(/\s+/g, '-') : null
+  }
+
   get opacity () {
     const myOpacity = this.style?.opacity
     const parentOpacity = this.parent?.style?.opacity
@@ -202,17 +210,6 @@ export class Dataset {
     return styleSymbols
   }
 
-  get groupStyle () {
-    if (this._datasetDefinition.groupStyle) {
-      return this._datasetDefinition.groupStyle
-    }
-    return this.parent?.groupStyle
-  }
-
-  get hasRampStyleKey () {
-    return this.groupStyle === 'ramp'
-  }
-
   get keyDefinition () {
     return {
       id: this.id,
@@ -220,7 +217,6 @@ export class Dataset {
       label: this.label,
       hasSymbol: this.hasSymbol,
       hasPattern: this.hasPattern,
-      hasRampStyleKey: this.hasRampStyleKey,
       style: this.style,
       symbolDescription: this.symbolDescription
     }

package/plugins/datasets/src/registry/dataset.test.js

@@ -555,4 +555,21 @@ describe('Dataset class', () => {
       expect(dg.source.promoteId).toBeUndefined()
     })
   })
+
+  describe('groupId', () => {
+    it('returns the groupId from the dataset definition', () => {
+      const dataset = new Dataset({ id: 'dataset', groupId: 'group-1' })
+      expect(dataset.groupId).toBe('group-1')
+    })
+
+    it('builds a groupId from the dataset definitions groupLabel', () => {
+      const dataset = new Dataset({ id: 'dataset', groupLabel: 'Roast Potatoes' })
+      expect(dataset.groupId).toBe('roast-potatoes')
+    })
+
+    it('returns null if no groupId is set', () => {
+      const dataset = new Dataset({ id: 'dataset' })
+      expect(dataset.groupId).toBeNull()
+    })
+  })
 })

package/plugins/datasets/src/registry/datasetRegistry.js

@@ -100,15 +100,14 @@ const datasetRegistry = {
     const _items = []
     const groups = new Map()
 
-    const getOrCreateGroup = (groupLabel, groupStyle) => {
+    const getOrCreateGroup = (groupLabel, groupId) => {
       if (groups.has(groupLabel)) {
         return groups.get(groupLabel)
       }
       const groupObject = {
         type: 'group',
-        id: groupLabel.toLowerCase().replaceAll(/\s+/g, '-'),
+        id: groupId, // groupLabel.toLowerCase().replaceAll(/\s+/g, '-'),
         groupLabel,
-        groupStyle,
         keyDefinitions: []
       }
       groups.set(groupLabel, groupObject)
@@ -126,9 +125,9 @@ const datasetRegistry = {
         return
       }
 
+      const groupId = dataset.groupId
       const groupLabel = dataset.groupLabel || dataset.label
-      const groupStyle = dataset.groupStyle
-      const groupObject = getOrCreateGroup(groupLabel, groupStyle)
+      const groupObject = getOrCreateGroup(groupLabel, groupId)
       if (!dataset.hasSublayers) {
         groupObject.keyDefinitions.push(dataset.keyDefinition)
       }