@defra/interactive-map 0.0.42-fmp-4 → 0.0.43-alpha

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)
       }