@defra/interactive-map 0.0.55-alpha → 0.0.57-alpha

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (502) hide show
  1. package/assets/templates/style-switcher.njk +2 -2
  2. package/dist/esm/im-core.js +1 -1
  3. package/dist/esm/im-shell.js +1 -1
  4. package/dist/umd/im-core.js +1 -1
  5. package/dist/umd/index.js +1 -1
  6. package/docs/api/button-definition.md +11 -0
  7. package/docs/api/context.md +4 -0
  8. package/docs/api.md +20 -2
  9. package/docs/architecture/interactive-map.likec4 +4 -4
  10. package/docs/plugins/datasets.md +11 -0
  11. package/docs/plugins/draw.md +197 -35
  12. package/docs/plugins/interact.md +24 -1
  13. package/docs/plugins/search.md +2 -2
  14. package/docusaurus.config.cjs +25 -3
  15. package/govuk-prototype-kit.config.json +6 -7
  16. package/package.json +20 -23
  17. package/plugins/datasets/dist/esm/im-datasets-esri-adapter.js +1 -1
  18. package/plugins/datasets/dist/esm/im-datasets-ml-adapter.js +1 -1
  19. package/plugins/datasets/dist/esm/im-datasets-ol-adapter.js +1 -1
  20. package/plugins/datasets/dist/esm/im-datasets-plugin.js +1 -1
  21. package/plugins/datasets/dist/esm/index.js +1 -1
  22. package/plugins/datasets/dist/esm/mapboxStyleLayerAdapter.js +1 -1
  23. package/plugins/datasets/dist/umd/im-datasets-ml-adapter.js +1 -1
  24. package/plugins/datasets/dist/umd/im-datasets-ol-adapter.js +1 -1
  25. package/plugins/datasets/dist/umd/im-datasets-plugin.js +1 -1
  26. package/plugins/datasets/dist/umd/index.js +1 -1
  27. package/plugins/datasets/src/adapters/esri/esriLayerAdapter.js +18 -16
  28. package/plugins/datasets/src/adapters/esri/esriLayerAdapter.test.js +2 -2
  29. package/plugins/datasets/src/adapters/esri/registry/esriDataset.js +2 -3
  30. package/plugins/datasets/src/adapters/esri/registry/esriDataset.test.js +1 -1
  31. package/plugins/datasets/src/adapters/loadLayerAdapter.js +2 -20
  32. package/plugins/datasets/src/adapters/loadLayerAdapter.test.js +9 -9
  33. package/plugins/datasets/src/adapters/mapboxStyleLayerAdapter.js +7 -7
  34. package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.js +19 -19
  35. package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.test.js +1 -1
  36. package/plugins/datasets/src/adapters/maplibre/registry/mapLibreDataset.test.js +1 -1
  37. package/plugins/datasets/src/adapters/openlayers/canvasPatternStyle.test.js +2 -2
  38. package/plugins/datasets/src/adapters/openlayers/layerBuilders.test.js +1 -1
  39. package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.js +21 -21
  40. package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.test.js +5 -5
  41. package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.js +2 -3
  42. package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.test.js +2 -2
  43. package/plugins/datasets/src/api/getOpacity.js +1 -2
  44. package/plugins/datasets/src/api/getOpacity.test.js +9 -12
  45. package/plugins/datasets/src/api/getStyle.js +1 -2
  46. package/plugins/datasets/src/api/getStyle.test.js +5 -8
  47. package/plugins/datasets/src/api/removeDataset.js +2 -4
  48. package/plugins/datasets/src/api/removeDataset.test.js +5 -10
  49. package/plugins/datasets/src/api/setData.js +2 -4
  50. package/plugins/datasets/src/api/setData.test.js +6 -14
  51. package/plugins/datasets/src/api/setFeatureVisibility.js +1 -2
  52. package/plugins/datasets/src/api/setFeatureVisibility.test.js +8 -11
  53. package/plugins/datasets/src/components/LayersMenu/LayersMenu.jsx +1 -0
  54. package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.jsx +1 -3
  55. package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.test.jsx +13 -18
  56. package/plugins/datasets/src/index.js +2 -2
  57. package/plugins/datasets/src/index.test.js +8 -1
  58. package/plugins/datasets/src/initialise/DatasetsInit.jsx +37 -26
  59. package/plugins/datasets/src/initialise/DatasetsInit.test.jsx +120 -89
  60. package/plugins/datasets/src/initialise/initialiseDatasets.js +2 -3
  61. package/plugins/datasets/src/initialise/initialiseDatasets.test.js +23 -10
  62. package/plugins/datasets/src/manifest.js +53 -44
  63. package/plugins/datasets/src/manifest.test.js +36 -4
  64. package/plugins/datasets/src/reducers/pluginState.js +5 -5
  65. package/plugins/datasets/src/reducers/pluginState.test.js +21 -20
  66. package/plugins/datasets/src/registry/__mocks__/datasetRegistry.js +7 -6
  67. package/plugins/datasets/src/registry/createDataset.js +2 -2
  68. package/plugins/datasets/src/registry/dataset.js +9 -10
  69. package/plugins/datasets/src/registry/dataset.test.js +63 -64
  70. package/plugins/datasets/src/registry/datasetRegistry.js +39 -10
  71. package/plugins/datasets/src/registry/datasetRegistry.test.js +83 -1
  72. package/plugins/datasets/src/registry/globalDataset.js +9 -17
  73. package/plugins/datasets/src/registry/isVisibleWhen.js +9 -17
  74. package/plugins/datasets/src/registry/isVisibleWhen.test.js +27 -20
  75. package/plugins/datasets/src/registry/mapboxStyleDataset.test.js +26 -27
  76. package/plugins/datasets/src/utils/hasLayersMenu.js +13 -0
  77. package/plugins/datasets/src/utils/hasLayersMenu.test.js +25 -0
  78. package/plugins/draw/dist/esm/im-draw-ml-adapter.js +1 -1
  79. package/plugins/draw/dist/esm/im-draw-ol-adapter.js +1 -1
  80. package/plugins/draw/dist/esm/im-draw-plugin.js +1 -1
  81. package/plugins/draw/dist/esm/index.js +1 -1
  82. package/plugins/draw/dist/esm/liveDrawChecks.js +1 -1
  83. package/plugins/draw/dist/umd/im-draw-ml-adapter.js +1 -1
  84. package/plugins/draw/dist/umd/im-draw-ol-adapter.js +1 -1
  85. package/plugins/draw/dist/umd/im-draw-plugin.js +1 -1
  86. package/plugins/draw/dist/umd/index.js +1 -1
  87. package/plugins/draw/src/DrawInit.jsx +53 -29
  88. package/plugins/draw/src/DrawInit.test.jsx +105 -2
  89. package/plugins/draw/src/adapterEvents.js +78 -44
  90. package/plugins/draw/src/adapters/adapterContract.test.js +3 -3
  91. package/plugins/draw/src/adapters/maplibre/MaplibreDrawAdapter.js +18 -10
  92. package/plugins/draw/src/adapters/maplibre/MaplibreDrawAdapter.test.js +31 -22
  93. package/plugins/draw/src/adapters/maplibre/drawEvents.js +2 -1
  94. package/plugins/draw/src/adapters/maplibre/modes/drawMode/clickHandlers.js +13 -12
  95. package/plugins/draw/src/adapters/maplibre/modes/drawMode/clickHandlers.test.js +5 -5
  96. package/plugins/draw/src/adapters/maplibre/modes/drawMode/undoHandlers.js +1 -1
  97. package/plugins/draw/src/adapters/maplibre/modes/drawMode/undoHandlers.test.js +2 -2
  98. package/plugins/draw/src/adapters/maplibre/modes/drawPointMode.js +6 -9
  99. package/plugins/draw/src/adapters/maplibre/modes/drawPointMode.test.js +4 -4
  100. package/plugins/draw/src/adapters/maplibre/modes/editPointMode/pointerHandlers.js +6 -9
  101. package/plugins/draw/src/adapters/maplibre/modes/editPointMode/pointerHandlers.test.js +1 -1
  102. package/plugins/draw/src/adapters/maplibre/modes/editPointMode/undoHandlers.js +8 -14
  103. package/plugins/draw/src/adapters/maplibre/modes/editPointMode/undoHandlers.test.js +37 -8
  104. package/plugins/draw/src/adapters/maplibre/modes/editPointMode.js +11 -1
  105. package/plugins/draw/src/adapters/maplibre/modes/editVertexMode/undoHandlers.js +14 -19
  106. package/plugins/draw/src/adapters/maplibre/modes/editVertexMode/undoHandlers.test.js +41 -4
  107. package/plugins/draw/src/adapters/maplibre/modes/editVertexMode.js +12 -1
  108. package/plugins/draw/src/adapters/maplibre/utils/editModeEvents.js +3 -1
  109. package/plugins/draw/src/adapters/maplibre/utils/geometryValidation.js +9 -10
  110. package/plugins/draw/src/adapters/maplibre/utils/geometryValidation.test.js +5 -24
  111. package/plugins/draw/src/adapters/openlayers/OLDrawAdapter.js +10 -7
  112. package/plugins/draw/src/adapters/openlayers/OLDrawAdapter.test.js +12 -7
  113. package/plugins/draw/src/adapters/openlayers/core/OLDrawManager.js +5 -0
  114. package/plugins/draw/src/adapters/openlayers/core/OLDrawManager.test.js +7 -3
  115. package/plugins/draw/src/adapters/openlayers/core/styles.test.js +1 -1
  116. package/plugins/draw/src/adapters/openlayers/draw/DrawMode.js +11 -11
  117. package/plugins/draw/src/adapters/openlayers/draw/DrawMode.test.js +15 -15
  118. package/plugins/draw/src/adapters/openlayers/edit/EditMode.js +21 -28
  119. package/plugins/draw/src/adapters/openlayers/edit/EditMode.test.js +26 -5
  120. package/plugins/draw/src/adapters/openlayers/edit/selectionState.js +5 -6
  121. package/plugins/draw/src/adapters/openlayers/edit/selectionState.test.js +2 -12
  122. package/plugins/draw/src/adapters/openlayers/edit/undoOps.js +9 -0
  123. package/plugins/draw/src/adapters/openlayers/edit/undoOps.test.js +7 -0
  124. package/plugins/draw/src/adapters/openlayers/point/drawPointMode.js +6 -9
  125. package/plugins/draw/src/adapters/openlayers/point/drawPointMode.test.js +3 -3
  126. package/plugins/draw/src/adapters/openlayers/point/editPointMode.js +18 -9
  127. package/plugins/draw/src/adapters/openlayers/point/editPointMode.test.js +29 -4
  128. package/plugins/draw/src/adapters/openlayers/point/pointOps.js +3 -2
  129. package/plugins/draw/src/adapters/openlayers/point/pointOps.test.js +6 -0
  130. package/plugins/draw/src/adapters/openlayers/point/pointSelectionState.js +3 -4
  131. package/plugins/draw/src/adapters/openlayers/point/pointSelectionState.test.js +2 -12
  132. package/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js +1 -1
  133. package/plugins/draw/src/api/createNewShape.js +4 -4
  134. package/plugins/draw/src/api/createNewShape.test.js +1 -1
  135. package/plugins/draw/src/api/editFeature.js +8 -11
  136. package/plugins/draw/src/api/editFeature.test.js +33 -22
  137. package/plugins/draw/src/api/newLine.test.js +3 -3
  138. package/plugins/draw/src/api/newPoint.js +4 -5
  139. package/plugins/draw/src/api/newPoint.test.js +3 -3
  140. package/plugins/draw/src/api/newPolygon.test.js +3 -3
  141. package/plugins/draw/src/api/recheckGeometry.js +32 -0
  142. package/plugins/draw/src/api/recheckGeometry.test.js +55 -0
  143. package/plugins/draw/src/api/setGeometry.js +33 -0
  144. package/plugins/draw/src/api/setGeometry.test.js +48 -0
  145. package/plugins/draw/src/api/split.js +23 -22
  146. package/plugins/draw/src/api/split.test.js +33 -18
  147. package/plugins/draw/src/events.js +265 -77
  148. package/plugins/draw/src/events.test.js +708 -34
  149. package/plugins/draw/src/hooks/useSpatialList.js +10 -11
  150. package/plugins/draw/src/hooks/useSpatialList.test.js +3 -3
  151. package/plugins/draw/src/manifest.js +33 -17
  152. package/plugins/draw/src/manifest.test.js +104 -10
  153. package/plugins/draw/src/reducer.js +31 -9
  154. package/plugins/draw/src/reducer.test.js +35 -3
  155. package/plugins/draw/src/utils/drawModes.js +27 -0
  156. package/plugins/draw/src/utils/drawModes.test.js +27 -0
  157. package/plugins/draw/src/utils/needsDrawTarget.js +18 -0
  158. package/plugins/draw/src/utils/needsDrawTarget.test.js +32 -0
  159. package/plugins/draw/src/utils/touchTarget.js +34 -26
  160. package/plugins/draw/src/utils/touchTarget.test.js +32 -20
  161. package/plugins/draw/src/validation/commitChecks.js +185 -0
  162. package/plugins/draw/src/validation/commitChecks.test.js +205 -0
  163. package/plugins/draw/src/validation/liveDrawChecks.js +11 -11
  164. package/plugins/draw/src/validation/liveDrawChecks.test.js +37 -37
  165. package/plugins/draw/src/validation/liveStroke.js +6 -6
  166. package/plugins/draw/src/validation/liveStroke.test.js +27 -27
  167. package/plugins/draw/src/validation/rules.js +16 -14
  168. package/plugins/draw/src/validation/rules.test.js +5 -5
  169. package/plugins/draw/src/validation/validateGeometry.js +58 -31
  170. package/plugins/draw/src/validation/validateGeometry.test.js +68 -44
  171. package/plugins/draw-es/dist/esm/index.js +1 -0
  172. package/plugins/{beta/draw-es → draw-es}/src/DrawInit.jsx +1 -1
  173. package/plugins/{beta/draw-es → draw-es}/src/events.test.js +1 -1
  174. package/plugins/{beta/draw-es → draw-es}/src/graphic.js +1 -1
  175. package/plugins/frame/dist/esm/index.js +1 -0
  176. package/plugins/{beta/frame → frame}/dist/umd/im-frame-plugin.js +1 -1
  177. package/plugins/{beta/frame → frame}/dist/umd/index.js +1 -1
  178. package/plugins/{beta/frame → frame}/package.json +2 -2
  179. package/plugins/interact/dist/esm/im-interact-plugin.js +1 -1
  180. package/plugins/interact/dist/esm/index.js +1 -1
  181. package/plugins/interact/dist/umd/im-interact-plugin.js +1 -1
  182. package/plugins/interact/dist/umd/index.js +1 -1
  183. package/plugins/interact/src/InteractInit.jsx +3 -3
  184. package/plugins/interact/src/api/enable.test.js +13 -0
  185. package/plugins/interact/src/defaults.js +1 -0
  186. package/plugins/interact/src/hooks/useCrossHairVisibility.js +27 -17
  187. package/plugins/interact/src/hooks/useCrossHairVisibility.test.js +72 -7
  188. package/plugins/interact/src/hooks/useInteractionHandlers.js +3 -5
  189. package/plugins/interact/src/hooks/useInteractionHandlers.test.js +4 -3
  190. package/plugins/interact/src/hooks/useSpatialList.js +16 -17
  191. package/plugins/interact/src/hooks/useSpatialList.test.js +9 -9
  192. package/plugins/interact/src/manifest.js +4 -4
  193. package/plugins/interact/src/manifest.test.js +29 -0
  194. package/plugins/interact/src/reducer.js +7 -2
  195. package/plugins/interact/src/reducer.test.js +12 -2
  196. package/plugins/interact/src/utils/needsTarget.js +20 -0
  197. package/plugins/interact/src/utils/needsTarget.test.js +36 -0
  198. package/plugins/map-key/dist/esm/im-map-key-plugin.js +1 -1
  199. package/plugins/map-key/dist/esm/index.js +1 -1
  200. package/plugins/map-key/dist/umd/im-map-key-plugin.js +1 -1
  201. package/plugins/map-key/dist/umd/index.js +1 -1
  202. package/plugins/map-key/src/components/Key/KeySvgSymbol.jsx +4 -0
  203. package/plugins/map-key/src/components/Key/MapKey.jsx +15 -15
  204. package/plugins/map-key/src/components/Key/MapKey.test.jsx +29 -15
  205. package/plugins/map-key/src/initialise/MapKeyInit.jsx +5 -8
  206. package/plugins/map-key/src/initialise/MapKeyInit.test.jsx +9 -7
  207. package/plugins/map-key/src/manifest.test.js +0 -1
  208. package/plugins/map-key/src/reducers/mergeKeyGroupItems.js +14 -33
  209. package/plugins/map-key/src/reducers/mergeKeyGroupItems.test.js +34 -50
  210. package/plugins/map-key/src/reducers/pluginState.js +6 -1
  211. package/plugins/map-key/src/reducers/pluginState.test.js +13 -4
  212. package/plugins/map-styles/dist/esm/im-map-styles-plugin.js +1 -0
  213. package/plugins/map-styles/dist/esm/index.js +1 -0
  214. package/plugins/map-styles/dist/umd/im-map-styles-plugin.js +1 -0
  215. package/plugins/{beta/map-styles → map-styles}/dist/umd/index.js +1 -1
  216. package/plugins/{beta/map-styles → map-styles}/src/MapStyles.jsx +3 -3
  217. package/plugins/{beta/map-styles → map-styles}/src/MapStylesInit.jsx +1 -1
  218. package/plugins/menu/dist/esm/index.js +1 -1
  219. package/plugins/scale-bar/dist/esm/index.js +1 -0
  220. package/plugins/{beta/scale-bar → scale-bar}/dist/umd/im-scale-bar-plugin.js +1 -1
  221. package/plugins/{beta/scale-bar → scale-bar}/dist/umd/index.js +1 -1
  222. package/plugins/{beta/scale-bar → scale-bar}/package.json +2 -2
  223. package/plugins/search/dist/esm/im-search-plugin.js +1 -1
  224. package/plugins/search/dist/esm/index.js +1 -1
  225. package/plugins/search/dist/umd/im-search-plugin.js +1 -1
  226. package/plugins/search/dist/umd/index.js +1 -1
  227. package/plugins/search/src/components/Suggestions/Suggestions.jsx +3 -1
  228. package/plugins/search/src/components/Suggestions/Suggestions.test.jsx +11 -0
  229. package/plugins/search/src/utils/markedToElements.jsx +25 -0
  230. package/plugins/search/src/utils/markedToElements.test.jsx +49 -0
  231. package/plugins/search/src/utils/parseOsNamesResults.js +6 -4
  232. package/plugins/search/src/utils/parseOsNamesResults.test.js +18 -0
  233. package/plugins/use-location/dist/esm/index.js +1 -0
  234. package/plugins/{beta/use-location → use-location}/dist/umd/im-use-location-plugin.js +1 -1
  235. package/plugins/{beta/use-location → use-location}/dist/umd/index.js +1 -1
  236. package/providers/esri/dist/esm/index.js +1 -0
  237. package/providers/{beta/esri → esri}/src/esriProvider.js +1 -1
  238. package/providers/{beta/esri → esri}/src/mapEvents.js +2 -2
  239. package/providers/maplibre/dist/esm/index.js +1 -1
  240. package/providers/maplibre/dist/umd/index.js +1 -1
  241. package/providers/maplibre/src/index.js +11 -2
  242. package/providers/maplibre/src/index.test.js +23 -1
  243. package/providers/maplibre/src/utils/detectModuleWorker.js +8 -19
  244. package/providers/maplibre/src/utils/detectModuleWorker.test.js +19 -23
  245. package/providers/maplibre/src/utils/workerUrl.js +12 -0
  246. package/providers/maplibre/src/utils/workerUrl.test.js +14 -1
  247. package/providers/open-names/dist/esm/index.js +1 -0
  248. package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js +1 -1
  249. package/providers/{beta/open-names → open-names}/dist/umd/index.js +1 -1
  250. package/providers/openlayers/dist/esm/index.js +1 -0
  251. package/providers/openlayers/dist/umd/im-openlayers-provider.js +2 -0
  252. package/providers/{beta/openlayers → openlayers}/dist/umd/index.js +1 -1
  253. package/providers/{beta/openlayers → openlayers}/src/index.js +4 -4
  254. package/providers/{beta/openlayers → openlayers}/src/mapEvents.js +2 -2
  255. package/providers/{beta/openlayers → openlayers}/src/mapEvents.test.js +2 -2
  256. package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.js +3 -3
  257. package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.js +1 -1
  258. package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.js +1 -1
  259. package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.js +1 -1
  260. package/rollup.esm.mjs +43 -47
  261. package/sonar-project.properties +1 -1
  262. package/src/App/App.jsx +4 -1
  263. package/src/App/App.test.jsx +6 -0
  264. package/src/App/components/MapButton/MapButton.jsx +6 -0
  265. package/src/App/components/MapButton/MapButton.test.jsx +10 -0
  266. package/src/App/components/Markers/Markers.jsx +3 -5
  267. package/src/App/components/Markers/Markers.test.jsx +9 -11
  268. package/src/App/components/Panel/Panel.jsx +2 -9
  269. package/src/App/hooks/useInterfaceAPI.js +16 -4
  270. package/src/App/hooks/useInterfaceAPI.test.js +66 -1
  271. package/src/App/renderer/PluginInits.jsx +8 -7
  272. package/src/App/renderer/PluginInits.test.jsx +20 -5
  273. package/src/App/renderer/SlotItemsProvider.jsx +33 -0
  274. package/src/App/renderer/SlotItemsProvider.test.jsx +59 -0
  275. package/src/App/renderer/SlotRenderer.jsx +3 -14
  276. package/src/App/renderer/SlotRenderer.test.jsx +11 -44
  277. package/src/App/renderer/mapButtons.js +24 -12
  278. package/src/App/renderer/mapButtons.test.js +32 -1
  279. package/src/App/renderer/mapControls.js +6 -8
  280. package/src/App/renderer/mapControls.test.js +10 -0
  281. package/src/App/renderer/mapPanels.js +16 -19
  282. package/src/App/renderer/mapPanels.test.js +37 -9
  283. package/src/App/renderer/pluginWrapper.js +10 -8
  284. package/src/App/renderer/pluginWrapper.test.js +23 -9
  285. package/src/App/renderer/slotAggregator.js +18 -5
  286. package/src/App/renderer/slotAggregator.test.js +68 -25
  287. package/src/App/renderer/slotHelpers.js +13 -0
  288. package/src/App/renderer/slotHelpers.test.js +16 -1
  289. package/src/App/store/AppProvider.jsx +19 -1
  290. package/src/App/store/AppProvider.test.jsx +41 -0
  291. package/src/App/store/MapProvider.jsx +3 -0
  292. package/src/App/store/MapProvider.test.jsx +24 -0
  293. package/src/App/store/appActionsMap.js +10 -1
  294. package/src/App/store/appActionsMap.test.js +21 -0
  295. package/src/App/store/appDispatchMiddleware.js +29 -17
  296. package/src/App/store/appDispatchMiddleware.test.js +31 -0
  297. package/src/InteractiveMap/parseDataProperties.js +4 -4
  298. package/src/InteractiveMap/parseDataProperties.test.js +62 -6
  299. package/src/config/events.js +4 -2
  300. package/src/config/mapSizeScales.js +3 -0
  301. package/src/scss/tools/_govuk-content.scss +4 -3
  302. package/src/types.js +4 -0
  303. package/src/utils/focusAfterPanelClose.js +9 -0
  304. package/src/utils/focusAfterPanelClose.test.js +40 -0
  305. package/webpack.dev.mjs +9 -3
  306. package/webpack.prod.mjs +11 -4
  307. package/webpack.umd.mjs +6 -7
  308. package/plugins/beta/draw-es/dist/esm/index.js +0 -1
  309. package/plugins/beta/draw-ml/dist/esm/im-draw-ml-plugin.js +0 -1
  310. package/plugins/beta/draw-ml/dist/esm/index.js +0 -1
  311. package/plugins/beta/draw-ml/dist/umd/im-draw-ml-plugin.js +0 -1
  312. package/plugins/beta/draw-ml/dist/umd/index.js +0 -2
  313. package/plugins/beta/draw-ml/src/DrawInit.jsx +0 -85
  314. package/plugins/beta/draw-ml/src/api/addFeature.js +0 -27
  315. package/plugins/beta/draw-ml/src/api/deleteFeature.js +0 -13
  316. package/plugins/beta/draw-ml/src/api/editFeature.js +0 -75
  317. package/plugins/beta/draw-ml/src/api/merge.js +0 -9
  318. package/plugins/beta/draw-ml/src/api/newLine.js +0 -68
  319. package/plugins/beta/draw-ml/src/api/newPolygon.js +0 -68
  320. package/plugins/beta/draw-ml/src/api/split.js +0 -81
  321. package/plugins/beta/draw-ml/src/defaults.js +0 -17
  322. package/plugins/beta/draw-ml/src/draw.scss +0 -26
  323. package/plugins/beta/draw-ml/src/events.js +0 -185
  324. package/plugins/beta/draw-ml/src/index.js +0 -13
  325. package/plugins/beta/draw-ml/src/manifest.js +0 -110
  326. package/plugins/beta/draw-ml/src/mapboxDraw.js +0 -143
  327. package/plugins/beta/draw-ml/src/mapboxSnap.js +0 -321
  328. package/plugins/beta/draw-ml/src/modes/createDrawMode.js +0 -552
  329. package/plugins/beta/draw-ml/src/modes/disabledMode.js +0 -23
  330. package/plugins/beta/draw-ml/src/modes/drawLineMode.js +0 -18
  331. package/plugins/beta/draw-ml/src/modes/drawPolygonMode.js +0 -16
  332. package/plugins/beta/draw-ml/src/modes/editVertex/geometryHelpers.js +0 -135
  333. package/plugins/beta/draw-ml/src/modes/editVertex/helpers.js +0 -2
  334. package/plugins/beta/draw-ml/src/modes/editVertex/touchHandlers.js +0 -142
  335. package/plugins/beta/draw-ml/src/modes/editVertex/undoHandlers.js +0 -133
  336. package/plugins/beta/draw-ml/src/modes/editVertex/vertexOperations.js +0 -142
  337. package/plugins/beta/draw-ml/src/modes/editVertex/vertexQueries.js +0 -121
  338. package/plugins/beta/draw-ml/src/modes/editVertexMode.js +0 -495
  339. package/plugins/beta/draw-ml/src/reducer.js +0 -90
  340. package/plugins/beta/draw-ml/src/styles.js +0 -190
  341. package/plugins/beta/draw-ml/src/undoStack.js +0 -50
  342. package/plugins/beta/draw-ml/src/utils/debounce.js +0 -16
  343. package/plugins/beta/draw-ml/src/utils/flattenStyleProperties.js +0 -49
  344. package/plugins/beta/draw-ml/src/utils/snapHelpers.js +0 -200
  345. package/plugins/beta/draw-ml/src/utils/spatial.js +0 -258
  346. package/plugins/beta/draw-ol/dist/css/index.css +0 -1
  347. package/plugins/beta/draw-ol/dist/esm/DrawMode.js +0 -1
  348. package/plugins/beta/draw-ol/dist/esm/EditMode.js +0 -1
  349. package/plugins/beta/draw-ol/dist/esm/geometryHelpers.js +0 -1
  350. package/plugins/beta/draw-ol/dist/esm/im-draw-ol-plugin.js +0 -1
  351. package/plugins/beta/draw-ol/dist/esm/index.js +0 -1
  352. package/plugins/beta/draw-ol/src/DrawInit.jsx +0 -65
  353. package/plugins/beta/draw-ol/src/api/addFeature.js +0 -29
  354. package/plugins/beta/draw-ol/src/api/deleteFeature.js +0 -11
  355. package/plugins/beta/draw-ol/src/api/editFeature.js +0 -50
  356. package/plugins/beta/draw-ol/src/api/newLine.js +0 -44
  357. package/plugins/beta/draw-ol/src/api/newPolygon.js +0 -44
  358. package/plugins/beta/draw-ol/src/core/OLDrawManager.js +0 -153
  359. package/plugins/beta/draw-ol/src/core/featureStore.js +0 -65
  360. package/plugins/beta/draw-ol/src/core/styles.js +0 -98
  361. package/plugins/beta/draw-ol/src/core/undoStack.js +0 -31
  362. package/plugins/beta/draw-ol/src/defaults.js +0 -16
  363. package/plugins/beta/draw-ol/src/draw/DrawMode.js +0 -121
  364. package/plugins/beta/draw-ol/src/draw/drawInput.js +0 -243
  365. package/plugins/beta/draw-ol/src/draw.scss +0 -17
  366. package/plugins/beta/draw-ol/src/edit/EditMode.js +0 -424
  367. package/plugins/beta/draw-ol/src/edit/keyboardHandler.js +0 -229
  368. package/plugins/beta/draw-ol/src/edit/midpointLayer.js +0 -57
  369. package/plugins/beta/draw-ol/src/edit/touchHandler.js +0 -171
  370. package/plugins/beta/draw-ol/src/edit/undoOps.js +0 -95
  371. package/plugins/beta/draw-ol/src/edit/vertexHitTest.js +0 -72
  372. package/plugins/beta/draw-ol/src/edit/vertexLayer.js +0 -49
  373. package/plugins/beta/draw-ol/src/edit/vertexOps.js +0 -99
  374. package/plugins/beta/draw-ol/src/events.js +0 -114
  375. package/plugins/beta/draw-ol/src/index.js +0 -12
  376. package/plugins/beta/draw-ol/src/manifest.js +0 -125
  377. package/plugins/beta/draw-ol/src/olDraw.js +0 -38
  378. package/plugins/beta/draw-ol/src/reducer.js +0 -41
  379. package/plugins/beta/draw-ol/src/snap/snapEngine.js +0 -153
  380. package/plugins/beta/draw-ol/src/snap/snapGeometry.js +0 -177
  381. package/plugins/beta/draw-ol/src/snap/snapIndicator.js +0 -81
  382. package/plugins/beta/draw-ol/src/snap/snapInteraction.js +0 -57
  383. package/plugins/beta/draw-ol/src/snap/snapManager.js +0 -99
  384. package/plugins/beta/draw-ol/src/utils/flattenStyleProperties.js +0 -47
  385. package/plugins/beta/draw-ol/src/utils/geometryHelpers.js +0 -103
  386. package/plugins/beta/draw-ol/src/utils/olCoords.js +0 -35
  387. package/plugins/beta/draw-ol/src/utils/resolveColors.js +0 -39
  388. package/plugins/beta/draw-ol/src/utils/spatial.js +0 -24
  389. package/plugins/beta/draw-ol/src/utils/touchTarget.js +0 -61
  390. package/plugins/beta/frame/dist/esm/index.js +0 -1
  391. package/plugins/beta/map-styles/dist/esm/im-map-styles-plugin.js +0 -1
  392. package/plugins/beta/map-styles/dist/esm/index.js +0 -1
  393. package/plugins/beta/map-styles/dist/umd/im-map-styles-plugin.js +0 -1
  394. package/plugins/beta/scale-bar/dist/esm/index.js +0 -1
  395. package/plugins/beta/use-location/dist/esm/index.js +0 -1
  396. package/plugins/map-key/src/registry/getDatasetRegistry.js +0 -6
  397. package/plugins/map-key/src/registry/getDatasetRegistry.test.js +0 -23
  398. package/plugins/map-key/src/registry/index.js +0 -1
  399. package/plugins/map-key/src/registry/index.test.js +0 -7
  400. package/providers/beta/esri/dist/esm/index.js +0 -1
  401. package/providers/beta/open-names/dist/esm/index.js +0 -1
  402. package/providers/beta/openlayers/dist/esm/index.js +0 -1
  403. package/providers/beta/openlayers/dist/umd/im-openlayers-provider.js +0 -2
  404. package/providers/beta/openlayers/dist/umd/index.js.LICENSE.txt +0 -1
  405. /package/plugins/{beta/draw-es → draw-es}/dist/esm/im-draw-es-plugin.js +0 -0
  406. /package/plugins/{beta/draw-es → draw-es}/src/api/addFeature.js +0 -0
  407. /package/plugins/{beta/draw-es → draw-es}/src/api/deleteFeature.js +0 -0
  408. /package/plugins/{beta/draw-es → draw-es}/src/api/editFeature.js +0 -0
  409. /package/plugins/{beta/draw-es → draw-es}/src/api/newPolygon.js +0 -0
  410. /package/plugins/{beta/draw-es → draw-es}/src/api/removeSafeZone.js +0 -0
  411. /package/plugins/{beta/draw-es → draw-es}/src/events.js +0 -0
  412. /package/plugins/{beta/draw-es → draw-es}/src/index.js +0 -0
  413. /package/plugins/{beta/draw-es → draw-es}/src/manifest.js +0 -0
  414. /package/plugins/{beta/draw-es → draw-es}/src/reducer.js +0 -0
  415. /package/plugins/{beta/draw-es → draw-es}/src/sketchViewModel.js +0 -0
  416. /package/plugins/{beta/frame → frame}/dist/css/index.css +0 -0
  417. /package/plugins/{beta/frame → frame}/dist/esm/im-frame-plugin.js +0 -0
  418. /package/plugins/{beta/draw-ml → frame}/dist/umd/index.js.LICENSE.txt +0 -0
  419. /package/plugins/{beta/frame → frame}/src/Frame.jsx +0 -0
  420. /package/plugins/{beta/frame → frame}/src/FrameInit.jsx +0 -0
  421. /package/plugins/{beta/frame → frame}/src/api/addFrame.js +0 -0
  422. /package/plugins/{beta/frame → frame}/src/api/editFeature.js +0 -0
  423. /package/plugins/{beta/frame → frame}/src/config.js +0 -0
  424. /package/plugins/{beta/frame → frame}/src/frame.scss +0 -0
  425. /package/plugins/{beta/frame → frame}/src/index.js +0 -0
  426. /package/plugins/{beta/frame → frame}/src/manifest.js +0 -0
  427. /package/plugins/{beta/frame → frame}/src/reducer.js +0 -0
  428. /package/plugins/{beta/frame → frame}/src/utils.js +0 -0
  429. /package/plugins/{beta/map-styles → map-styles}/dist/css/index.css +0 -0
  430. /package/plugins/{beta/frame → map-styles}/dist/umd/index.js.LICENSE.txt +0 -0
  431. /package/plugins/{beta/map-styles → map-styles}/src/config.js +0 -0
  432. /package/plugins/{beta/map-styles → map-styles}/src/index.js +0 -0
  433. /package/plugins/{beta/map-styles → map-styles}/src/manifest.js +0 -0
  434. /package/plugins/{beta/map-styles → map-styles}/src/mapStyles.scss +0 -0
  435. /package/plugins/{beta/scale-bar → scale-bar}/dist/css/index.css +0 -0
  436. /package/plugins/{beta/scale-bar → scale-bar}/dist/esm/im-scale-bar-plugin.js +0 -0
  437. /package/plugins/{beta/map-styles → scale-bar}/dist/umd/index.js.LICENSE.txt +0 -0
  438. /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.jsx +0 -0
  439. /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.test.jsx +0 -0
  440. /package/plugins/{beta/scale-bar → scale-bar}/src/index.js +0 -0
  441. /package/plugins/{beta/scale-bar → scale-bar}/src/index.test.js +0 -0
  442. /package/plugins/{beta/scale-bar → scale-bar}/src/manifest.js +0 -0
  443. /package/plugins/{beta/scale-bar → scale-bar}/src/scaleBar.scss +0 -0
  444. /package/plugins/{beta/scale-bar → scale-bar}/src/utils.js +0 -0
  445. /package/plugins/{beta/scale-bar → scale-bar}/src/utils.test.js +0 -0
  446. /package/plugins/{beta/use-location → use-location}/dist/esm/im-use-location-plugin.js +0 -0
  447. /package/plugins/{beta/scale-bar → use-location}/dist/umd/index.js.LICENSE.txt +0 -0
  448. /package/plugins/{beta/use-location → use-location}/src/UseLocation.jsx +0 -0
  449. /package/plugins/{beta/use-location → use-location}/src/UseLocationInit.jsx +0 -0
  450. /package/plugins/{beta/use-location → use-location}/src/defaults.js +0 -0
  451. /package/plugins/{beta/use-location → use-location}/src/events.js +0 -0
  452. /package/plugins/{beta/use-location → use-location}/src/index.js +0 -0
  453. /package/plugins/{beta/use-location → use-location}/src/manifest.js +0 -0
  454. /package/plugins/{beta/use-location → use-location}/src/reducer.js +0 -0
  455. /package/providers/{beta/esri → esri}/dist/css/index.css +0 -0
  456. /package/providers/{beta/esri → esri}/dist/esm/im-esri-provider.js +0 -0
  457. /package/providers/{beta/esri → esri}/src/appEvents.js +0 -0
  458. /package/providers/{beta/esri → esri}/src/defaults.js +0 -0
  459. /package/providers/{beta/esri → esri}/src/esriProvider.scss +0 -0
  460. /package/providers/{beta/esri → esri}/src/index.js +0 -0
  461. /package/providers/{beta/esri → esri}/src/utils/coords.js +0 -0
  462. /package/providers/{beta/esri → esri}/src/utils/coords.test.js +0 -0
  463. /package/providers/{beta/esri → esri}/src/utils/detectWebGL.js +0 -0
  464. /package/providers/{beta/esri → esri}/src/utils/esriFixes.js +0 -0
  465. /package/providers/{beta/esri → esri}/src/utils/query.js +0 -0
  466. /package/providers/{beta/esri → esri}/src/utils/spatial.js +0 -0
  467. /package/providers/{beta/esri → esri}/src/utils/spatial.test.js +0 -0
  468. /package/providers/{beta/open-names → open-names}/dist/esm/im-reverse-geocode.js +0 -0
  469. /package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js.LICENSE.txt +0 -0
  470. /package/{plugins/beta/use-location → providers/open-names}/dist/umd/index.js.LICENSE.txt +0 -0
  471. /package/providers/{beta/open-names → open-names}/src/index.js +0 -0
  472. /package/providers/{beta/open-names → open-names}/src/reverseGeocode.js +0 -0
  473. /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.js +0 -0
  474. /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.test.js +0 -0
  475. /package/providers/{beta/openlayers → openlayers}/dist/esm/im-openlayers-provider.js +0 -0
  476. /package/providers/{beta/openlayers → openlayers}/dist/umd/im-openlayers-provider.js.LICENSE.txt +0 -0
  477. /package/providers/{beta/open-names → openlayers}/dist/umd/index.js.LICENSE.txt +0 -0
  478. /package/providers/{beta/openlayers → openlayers}/src/appEvents.js +0 -0
  479. /package/providers/{beta/openlayers → openlayers}/src/appEvents.test.js +0 -0
  480. /package/providers/{beta/openlayers → openlayers}/src/defaults.js +0 -0
  481. /package/providers/{beta/openlayers → openlayers}/src/index.test.js +0 -0
  482. /package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.test.js +0 -0
  483. /package/providers/{beta/openlayers → openlayers}/src/utils/bngProjection.js +0 -0
  484. /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.js +0 -0
  485. /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.test.js +0 -0
  486. /package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.test.js +0 -0
  487. /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.js +0 -0
  488. /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.test.js +0 -0
  489. /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.js +0 -0
  490. /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.test.js +0 -0
  491. /package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.test.js +0 -0
  492. /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.js +0 -0
  493. /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.test.js +0 -0
  494. /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.js +0 -0
  495. /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.test.js +0 -0
  496. /package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.test.js +0 -0
  497. /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.js +0 -0
  498. /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.test.js +0 -0
  499. /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.js +0 -0
  500. /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.test.js +0 -0
  501. /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.js +0 -0
  502. /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.test.js +0 -0
@@ -1,8 +1,7 @@
1
1
  import { mappedDatasetsReducer } from '../../reducers/mappedDatasetsReducer.js'
2
2
  import { datasets as datasetDefinitions } from '../../reducers/__data__/demoDatasets.js'
3
3
  import { datasets as esriDatasetDefinitions } from '../../reducers/__data__/esriDatasets.js'
4
- import { attachGlobalState } from '../globalDataset.js'
5
- const { datasetRegistry } = jest.requireActual('../datasetRegistry.js')
4
+ const { createDatasetRegistry } = jest.requireActual('../datasetRegistry.js')
6
5
  const { mappedDatasets, orderedDatasets } = mappedDatasetsReducer({ datasets: datasetDefinitions })
7
6
 
8
7
  const globalState = {
@@ -12,14 +11,16 @@ const globalState = {
12
11
  }
13
12
 
14
13
  // By adding jest.mock('<path-to>/datasetRegistry.js')
15
- // to a test file, any import of datasetRegistry from that file will get this
16
- // version with the demo datasets attached for testing.
14
+ // to a test file, datasetRegistry imported from that file will be a registry
15
+ // with the demo datasets attached for testing, to pass to datasets and adapters.
17
16
  // If we need to test against a different set of datasets
18
17
  // we can import that config from demoDatasets.js (or roll our own)
19
18
  // and attach it in the specific test
19
+ const datasetRegistry = createDatasetRegistry()
20
+
20
21
  beforeEach(() => {
21
22
  datasetRegistry.attach(mappedDatasets, orderedDatasets)
22
- attachGlobalState(globalState)
23
+ datasetRegistry.attachGlobals(globalState)
23
24
  })
24
25
 
25
26
  datasetRegistry.mockExtend = (extraDatasets) => datasetRegistry.attach(
@@ -35,4 +36,4 @@ datasetRegistry.useEsriDatasets = (extraDatasets = {}) => {
35
36
  )
36
37
  }
37
38
 
38
- export { datasetRegistry }
39
+ export { datasetRegistry, createDatasetRegistry }
@@ -1,5 +1,5 @@
1
1
  import { Dataset } from './dataset.js'
2
2
 
3
- export const createDataset = (datasetDefinition) => {
4
- return new Dataset(datasetDefinition)
3
+ export const createDataset = (datasetDefinition, datasetRegistry) => {
4
+ return new Dataset(datasetDefinition, datasetRegistry)
5
5
  }
@@ -1,14 +1,13 @@
1
- import { datasetRegistry } from './datasetRegistry.js'
2
- import { isVisibleWhen } from './isVisibleWhen.js'
3
1
  import { datasetDefaults, hasCustomVisualStyle, applyStyleDefaults } from '../initialise/defaults.js'
4
2
  import { hasPattern } from '../../../../src/utils/patternUtils.js'
5
3
  import { hasSymbol } from '../../../../src/utils/symbolUtils.js'
6
4
  import { DynamicGeoJson } from './dynamicGeoJson.js'
7
- import { calculateOpacity, getGlobalVisibility } from './globalDataset.js'
5
+ import { calculateOpacity } from './globalDataset.js'
8
6
 
9
7
  export class Dataset {
10
- constructor (dataset) {
8
+ constructor (dataset, datasetRegistry) {
11
9
  this._datasetDefinition = dataset
10
+ this._datasetRegistry = datasetRegistry
12
11
  }
13
12
 
14
13
  get id () { return this._datasetDefinition.id }
@@ -57,7 +56,7 @@ export class Dataset {
57
56
  get opacity () {
58
57
  const myOpacity = this.style?.opacity
59
58
  const parentOpacity = this.parent?.style?.opacity
60
- return calculateOpacity(myOpacity, parentOpacity)
59
+ return calculateOpacity(this._datasetRegistry.globals, myOpacity, parentOpacity)
61
60
  }
62
61
 
63
62
  get hasDynamicGeoJSON () {
@@ -85,7 +84,7 @@ export class Dataset {
85
84
  if (this.isSublayer) {
86
85
  return !this.parent?.visible
87
86
  }
88
- return !getGlobalVisibility()
87
+ return !this._datasetRegistry.globals.visible
89
88
  }
90
89
 
91
90
  // Returns true if this dataset is visible based on its own visibility setting,
@@ -103,7 +102,7 @@ export class Dataset {
103
102
  if (this.isSublayer) {
104
103
  return this._datasetDefinition.visible && (this.parent?.visible)
105
104
  }
106
- return this._datasetDefinition.visible && getGlobalVisibility()
105
+ return this._datasetDefinition.visible && this._datasetRegistry.globals.visible
107
106
  }
108
107
 
109
108
  get esriStyleLayerId () { return this._datasetDefinition.esriStyleLayerId }
@@ -111,7 +110,7 @@ export class Dataset {
111
110
  get visibility () {
112
111
  const { visible, visibleWhen } = this
113
112
  if (visible && visibleWhen) {
114
- return isVisibleWhen(visibleWhen) ? 'visible' : 'none'
113
+ return this._datasetRegistry.isVisibleWhen(visibleWhen) ? 'visible' : 'none'
115
114
  }
116
115
  return visible ? 'visible' : 'none'
117
116
  }
@@ -152,14 +151,14 @@ export class Dataset {
152
151
  get sublayers () {
153
152
  const { sublayerIds } = this
154
153
  if (sublayerIds) {
155
- return sublayerIds.map(id => datasetRegistry.getDataset(id))
154
+ return sublayerIds.map(id => this._datasetRegistry.getDataset(id))
156
155
  }
157
156
  return []
158
157
  }
159
158
 
160
159
  get parent () {
161
160
  if (this._datasetDefinition.parentId) {
162
- return datasetRegistry.getDataset(this._datasetDefinition.parentId)
161
+ return this._datasetRegistry.getDataset(this._datasetDefinition.parentId)
163
162
  }
164
163
  return undefined
165
164
  }
@@ -1,6 +1,5 @@
1
1
  import { Dataset } from './dataset.js'
2
2
  import { datasetRegistry } from './datasetRegistry.js'
3
- import { attachGlobalState } from './globalDataset.js'
4
3
  // Use the mock datasetRegistry with the demo datasets attached before each test
5
4
  // so we can test Dataset methods that depend on parent/sublayer relationships and styles
6
5
  jest.mock('./datasetRegistry.js')
@@ -35,7 +34,7 @@ describe('Dataset class', () => {
35
34
  })
36
35
 
37
36
  it('returns false for a dataset with an empty sublayerIds array', () => {
38
- const dataset = new Dataset({ sublayerIds: [] })
37
+ const dataset = new Dataset({ sublayerIds: [] }, datasetRegistry)
39
38
  expect(dataset.hasSublayers).toBe(false)
40
39
  })
41
40
  })
@@ -73,7 +72,7 @@ describe('Dataset class', () => {
73
72
 
74
73
  describe('style', () => {
75
74
  it('returns a default style object when none are provided', () => {
76
- const dataset = new Dataset({ id: 'dataset' })
75
+ const dataset = new Dataset({ id: 'dataset' }, datasetRegistry)
77
76
  expect(dataset.style).toEqual({
78
77
  stroke: '#d4351c',
79
78
  strokeWidth: 2,
@@ -82,7 +81,7 @@ describe('Dataset class', () => {
82
81
  })
83
82
 
84
83
  it('returns the style object when one are provided', () => {
85
- const dataset = new Dataset({ id: 'dataset', style: { stroke: '#0000ff' } })
84
+ const dataset = new Dataset({ id: 'dataset', style: { stroke: '#0000ff' } }, datasetRegistry)
86
85
  expect(dataset.style).toEqual({
87
86
  stroke: '#0000ff',
88
87
  strokeWidth: 2
@@ -90,7 +89,7 @@ describe('Dataset class', () => {
90
89
  })
91
90
 
92
91
  it('returns the dataset style, with the default strokeWidth, when there is no parent', () => {
93
- const dataset = new Dataset({ style: { stroke: '#ff0000', fill: 'transparent' } })
92
+ const dataset = new Dataset({ style: { stroke: '#ff0000', fill: 'transparent' } }, datasetRegistry)
94
93
  expect(dataset.style).toEqual({ stroke: '#ff0000', fill: 'transparent', strokeWidth: 2 })
95
94
  })
96
95
 
@@ -134,11 +133,11 @@ describe('Dataset class', () => {
134
133
  ['a symbol id', { symbol: 'pin' }],
135
134
  ['inline symbolSvgContent', { symbolSvgContent: '<circle r="4"/>' }]
136
135
  ])('is a symbol dataset when its style has %s', (_, style) => {
137
- expect(new Dataset({ style }).hasSymbol).toBe(true)
136
+ expect(new Dataset({ style }, datasetRegistry).hasSymbol).toBe(true)
138
137
  })
139
138
 
140
139
  it('is not a symbol dataset with neither', () => {
141
- expect(new Dataset({ style: { fill: '#ff0000' } }).hasSymbol).toBe(false)
140
+ expect(new Dataset({ style: { fill: '#ff0000' } }, datasetRegistry).hasSymbol).toBe(false)
142
141
  })
143
142
  })
144
143
 
@@ -151,38 +150,38 @@ describe('Dataset class', () => {
151
150
  ['symbol', { symbol: 'square' }],
152
151
  ['symbolSvgContent', { symbolSvgContent: '<svg/>' }]
153
152
  ])('returns true when style contains %s', (_, style) => {
154
- expect(new Dataset({ style }).hasCustomVisualStyle).toBe(true)
153
+ expect(new Dataset({ style }, datasetRegistry).hasCustomVisualStyle).toBe(true)
155
154
  })
156
155
 
157
156
  it('returns false when style contains no visual style properties', () => {
158
- const dataset = new Dataset({ style: { symbolBackgroundColor: '#ff0000', strokeWidth: 3 } })
157
+ const dataset = new Dataset({ style: { symbolBackgroundColor: '#ff0000', strokeWidth: 3 } }, datasetRegistry)
159
158
  expect(dataset.hasCustomVisualStyle).toBe(false)
160
159
  })
161
160
 
162
161
  it('returns false when there is no style', () => {
163
- const dataset = new Dataset({})
162
+ const dataset = new Dataset({}, datasetRegistry)
164
163
  expect(dataset.hasCustomVisualStyle).toBe(false)
165
164
  })
166
165
  })
167
166
 
168
167
  describe('symbolDescription', () => {
169
168
  it("returns the dataset's own symbolDescription", () => {
170
- const dataset = new Dataset({ style: { symbolDescription: 'a circle' } })
169
+ const dataset = new Dataset({ style: { symbolDescription: 'a circle' } }, datasetRegistry)
171
170
  expect(dataset.symbolDescription).toBe('a circle')
172
171
  })
173
172
 
174
173
  it("returns the dataset's own symbolDescription alongside a custom visual style", () => {
175
- const dataset = new Dataset({ style: { stroke: '#0000ff', symbolDescription: 'blue outline' } })
174
+ const dataset = new Dataset({ style: { stroke: '#0000ff', symbolDescription: 'blue outline' } }, datasetRegistry)
176
175
  expect(dataset.symbolDescription).toBe('blue outline')
177
176
  })
178
177
 
179
178
  it('returns undefined when the dataset has a custom visual style but no symbolDescription', () => {
180
- const dataset = new Dataset({ style: { stroke: '#ff0000' } })
179
+ const dataset = new Dataset({ style: { stroke: '#ff0000' } }, datasetRegistry)
181
180
  expect(dataset.symbolDescription).toBeUndefined()
182
181
  })
183
182
 
184
183
  it('returns the default symbolDescription when the dataset has no style', () => {
185
- const dataset = new Dataset({})
184
+ const dataset = new Dataset({}, datasetRegistry)
186
185
  expect(dataset.symbolDescription).toBe('red outline')
187
186
  })
188
187
 
@@ -191,7 +190,7 @@ describe('Dataset class', () => {
191
190
  const childDef = { id: 'child', parentId: 'parent', style: {} }
192
191
  datasetRegistry.attach({ parent: parentDef, child: childDef })
193
192
 
194
- const dataset = new Dataset(childDef)
193
+ const dataset = new Dataset(childDef, datasetRegistry)
195
194
  expect(dataset.symbolDescription).toBe('parent symbol')
196
195
  })
197
196
 
@@ -202,7 +201,7 @@ describe('Dataset class', () => {
202
201
 
203
202
  // parent has a custom visual style (stroke) → parent.symbolDescription = undefined
204
203
  // child has no visual style → inherits undefined from parent
205
- const dataset = new Dataset(childDef)
204
+ const dataset = new Dataset(childDef, datasetRegistry)
206
205
  expect(dataset.symbolDescription).toBeUndefined()
207
206
  })
208
207
  })
@@ -212,15 +211,15 @@ describe('Dataset class', () => {
212
211
  const parentDef = { id: 'parent', sublayerIds: ['child'], style: parentStyle }
213
212
  const childDef = { id: 'child', parentId: 'parent', style: childStyle }
214
213
  datasetRegistry.attach({ parent: parentDef, child: childDef })
215
- return new Dataset(childDef)
214
+ return new Dataset(childDef, datasetRegistry)
216
215
  }
217
216
 
218
217
  it('applies the default stroke when there is no style', () => {
219
- expect(new Dataset({}).style).toMatchObject({ stroke: '#d4351c', strokeWidth: 2, symbolDescription: 'red outline' })
218
+ expect(new Dataset({}, datasetRegistry).style).toMatchObject({ stroke: '#d4351c', strokeWidth: 2, symbolDescription: 'red outline' })
220
219
  })
221
220
 
222
221
  it('applies the whole default style when the style only sets opacity', () => {
223
- expect(new Dataset({ style: { opacity: 0.5 } }).style).toEqual({
222
+ expect(new Dataset({ style: { opacity: 0.5 } }, datasetRegistry).style).toEqual({
224
223
  opacity: 0.5,
225
224
  stroke: '#d4351c',
226
225
  strokeWidth: 2,
@@ -229,7 +228,7 @@ describe('Dataset class', () => {
229
228
  })
230
229
 
231
230
  it('applies the default stroke when the style only adjusts it', () => {
232
- expect(new Dataset({ style: { strokeWidth: 4, opacity: 0.5 } }).style).toMatchObject({ stroke: '#d4351c', strokeWidth: 4, opacity: 0.5 })
231
+ expect(new Dataset({ style: { strokeWidth: 4, opacity: 0.5 } }, datasetRegistry).style).toMatchObject({ stroke: '#d4351c', strokeWidth: 4, opacity: 0.5 })
233
232
  })
234
233
 
235
234
  it.each([
@@ -240,14 +239,14 @@ describe('Dataset class', () => {
240
239
  ['custom symbol content', { symbolSvgContent: '<path/>' }],
241
240
  ['an explicitly empty stroke', { stroke: null }]
242
241
  ])('does not apply the default stroke to a style with %s', (_, style) => {
243
- const dataset = new Dataset({ style })
242
+ const dataset = new Dataset({ style }, datasetRegistry)
244
243
  expect(dataset.style.stroke ?? null).toBeNull()
245
244
  expect(dataset.hasStroke).toBe(false)
246
245
  expect(dataset.symbolDescription).toBeUndefined()
247
246
  })
248
247
 
249
248
  it('applies the default strokeWidth to a custom stroke', () => {
250
- expect(new Dataset({ style: { stroke: '#0000ff' } }).style.strokeWidth).toBe(2)
249
+ expect(new Dataset({ style: { stroke: '#0000ff' } }, datasetRegistry).style.strokeWidth).toBe(2)
251
250
  })
252
251
 
253
252
  it('does not apply the default stroke to a sublayer with a fill when the parent has no style', () => {
@@ -270,24 +269,24 @@ describe('Dataset class', () => {
270
269
 
271
270
  describe('label', () => {
272
271
  it('returns the dataset label', () => {
273
- const dataset = new Dataset({ label: 'My dataset' })
272
+ const dataset = new Dataset({ label: 'My dataset' }, datasetRegistry)
274
273
  expect(dataset.label).toBe('My dataset')
275
274
  })
276
275
 
277
276
  it('returns undefined when no label is set', () => {
278
- const dataset = new Dataset({})
277
+ const dataset = new Dataset({}, datasetRegistry)
279
278
  expect(dataset.label).toBeUndefined()
280
279
  })
281
280
  })
282
281
 
283
282
  describe('showInKey', () => {
284
283
  it('returns true when showInKey is set on the dataset', () => {
285
- const dataset = new Dataset({ showInKey: true })
284
+ const dataset = new Dataset({ showInKey: true }, datasetRegistry)
286
285
  expect(dataset.showInKey).toBe(true)
287
286
  })
288
287
 
289
288
  it('returns false when showInKey is not set and there is no parent', () => {
290
- const dataset = new Dataset({})
289
+ const dataset = new Dataset({}, datasetRegistry)
291
290
  expect(dataset.showInKey).toBe(false)
292
291
  })
293
292
 
@@ -295,58 +294,58 @@ describe('Dataset class', () => {
295
294
  const parentDef = { id: 'parent', showInKey: true, style: {} }
296
295
  const childDef = { id: 'child', parentId: 'parent', style: {} }
297
296
  datasetRegistry.attach({ parent: parentDef, child: childDef })
298
- expect(new Dataset(childDef).showInKey).toBe(true)
297
+ expect(new Dataset(childDef, datasetRegistry).showInKey).toBe(true)
299
298
  })
300
299
 
301
300
  it('returns false when neither the sublayer nor the parent has showInKey set', () => {
302
301
  const parentDef = { id: 'parent', style: {} }
303
302
  const childDef = { id: 'child', parentId: 'parent', style: {} }
304
303
  datasetRegistry.attach({ parent: parentDef, child: childDef })
305
- expect(new Dataset(childDef).showInKey).toBe(false)
304
+ expect(new Dataset(childDef, datasetRegistry).showInKey).toBe(false)
306
305
  })
307
306
 
308
307
  it('allows a sublayer to opt out with showInKey: false even when parent has showInKey: true', () => {
309
308
  const parentDef = { id: 'parent', showInKey: true, style: {} }
310
309
  const childDef = { id: 'child', parentId: 'parent', showInKey: false, style: {} }
311
310
  datasetRegistry.attach({ parent: parentDef, child: childDef })
312
- expect(new Dataset(childDef).showInKey).toBe(false)
311
+ expect(new Dataset(childDef, datasetRegistry).showInKey).toBe(false)
313
312
  })
314
313
 
315
314
  it('allows a sublayer to opt in with showInKey: true even when parent has showInKey: false', () => {
316
315
  const parentDef = { id: 'parent', showInKey: false, style: {} }
317
316
  const childDef = { id: 'child', parentId: 'parent', showInKey: true, style: {} }
318
317
  datasetRegistry.attach({ parent: parentDef, child: childDef })
319
- expect(new Dataset(childDef).showInKey).toBe(true)
318
+ expect(new Dataset(childDef, datasetRegistry).showInKey).toBe(true)
320
319
  })
321
320
  })
322
321
 
323
322
  describe('tiles, geojson, idProperty, parentId', () => {
324
323
  it('returns tiles from the definition', () => {
325
324
  const tiles = ['https://example.com/{z}/{x}/{y}']
326
- const dataset = new Dataset({ tiles })
325
+ const dataset = new Dataset({ tiles }, datasetRegistry)
327
326
  expect(dataset.tiles).toBe(tiles)
328
327
  })
329
328
 
330
329
  it('returns geojson from the definition', () => {
331
330
  const geojson = { type: 'FeatureCollection', features: [] }
332
- const dataset = new Dataset({ geojson })
331
+ const dataset = new Dataset({ geojson }, datasetRegistry)
333
332
  expect(dataset.geojson).toBe(geojson)
334
333
  })
335
334
 
336
335
  it('returns idProperty from the definition', () => {
337
- const dataset = new Dataset({ idProperty: 'gid' })
336
+ const dataset = new Dataset({ idProperty: 'gid' }, datasetRegistry)
338
337
  expect(dataset.idProperty).toBe('gid')
339
338
  })
340
339
 
341
340
  it('returns parentId from the definition', () => {
342
- const dataset = new Dataset({ parentId: 'parent' })
341
+ const dataset = new Dataset({ parentId: 'parent' }, datasetRegistry)
343
342
  expect(dataset.parentId).toBe('parent')
344
343
  })
345
344
  })
346
345
 
347
346
  describe('minZoom / maxZoom', () => {
348
347
  it('returns minZoom from the definition', () => {
349
- const dataset = new Dataset({ minZoom: 8 })
348
+ const dataset = new Dataset({ minZoom: 8 }, datasetRegistry)
350
349
  expect(dataset.minZoom).toBe(8)
351
350
  })
352
351
 
@@ -354,11 +353,11 @@ describe('Dataset class', () => {
354
353
  const parentDef = { id: 'parent', minZoom: 10, style: {} }
355
354
  const childDef = { id: 'child', parentId: 'parent', style: {} }
356
355
  datasetRegistry.attach({ parent: parentDef, child: childDef })
357
- expect(new Dataset(childDef).minZoom).toBe(10)
356
+ expect(new Dataset(childDef, datasetRegistry).minZoom).toBe(10)
358
357
  })
359
358
 
360
359
  it('returns maxZoom from the definition', () => {
361
- const dataset = new Dataset({ maxZoom: 20 })
360
+ const dataset = new Dataset({ maxZoom: 20 }, datasetRegistry)
362
361
  expect(dataset.maxZoom).toBe(20)
363
362
  })
364
363
 
@@ -366,7 +365,7 @@ describe('Dataset class', () => {
366
365
  const parentDef = { id: 'parent', maxZoom: 22, style: {} }
367
366
  const childDef = { id: 'child', parentId: 'parent', style: {} }
368
367
  datasetRegistry.attach({ parent: parentDef, child: childDef })
369
- expect(new Dataset(childDef).maxZoom).toBe(22)
368
+ expect(new Dataset(childDef, datasetRegistry).maxZoom).toBe(22)
370
369
  })
371
370
  })
372
371
 
@@ -444,7 +443,7 @@ describe('Dataset class', () => {
444
443
 
445
444
  describe('with opacityMode set to "multiply"', () => {
446
445
  beforeEach(() => {
447
- attachGlobalState({
446
+ datasetRegistry.attachGlobals({
448
447
  ...globalState,
449
448
  opacityMode: 'multiply',
450
449
  opacity: 0.75
@@ -480,7 +479,7 @@ describe('Dataset class', () => {
480
479
 
481
480
  describe('with opacityMode set to "global"', () => {
482
481
  beforeEach(() => {
483
- attachGlobalState({
482
+ datasetRegistry.attachGlobals({
484
483
  ...globalState,
485
484
  opacityMode: 'global',
486
485
  opacity: 0.6
@@ -521,27 +520,27 @@ describe('Dataset class', () => {
521
520
 
522
521
  describe('hiddenFeatures / hasHiddenFeatures', () => {
523
522
  it('returns hiddenFeatures from the definition', () => {
524
- const dataset = new Dataset({ hiddenFeatures: [1, 2] })
523
+ const dataset = new Dataset({ hiddenFeatures: [1, 2] }, datasetRegistry)
525
524
  expect(dataset.hiddenFeatures).toEqual([1, 2])
526
525
  })
527
526
 
528
527
  it('returns undefined when hiddenFeatures is not set', () => {
529
- const dataset = new Dataset({})
528
+ const dataset = new Dataset({}, datasetRegistry)
530
529
  expect(dataset.hiddenFeatures).toBeUndefined()
531
530
  })
532
531
 
533
532
  it('returns true from hasHiddenFeatures when hiddenFeatures is a non-empty array', () => {
534
- const dataset = new Dataset({ hiddenFeatures: [42] })
533
+ const dataset = new Dataset({ hiddenFeatures: [42] }, datasetRegistry)
535
534
  expect(dataset.hasHiddenFeatures).toBe(true)
536
535
  })
537
536
 
538
537
  it('returns false from hasHiddenFeatures when hiddenFeatures is empty', () => {
539
- const dataset = new Dataset({ hiddenFeatures: [] })
538
+ const dataset = new Dataset({ hiddenFeatures: [] }, datasetRegistry)
540
539
  expect(dataset.hasHiddenFeatures).toBe(false)
541
540
  })
542
541
 
543
542
  it('returns false from hasHiddenFeatures when hiddenFeatures is not set', () => {
544
- const dataset = new Dataset({})
543
+ const dataset = new Dataset({}, datasetRegistry)
545
544
  expect(dataset.hasHiddenFeatures).toBe(false)
546
545
  })
547
546
 
@@ -549,25 +548,25 @@ describe('Dataset class', () => {
549
548
  const parentDef = { id: 'parent', hiddenFeatures: [7], style: {} }
550
549
  const childDef = { id: 'child', parentId: 'parent', style: {} }
551
550
  datasetRegistry.attach({ parent: parentDef, child: childDef })
552
- expect(new Dataset(childDef).hasHiddenFeatures).toBe(true)
551
+ expect(new Dataset(childDef, datasetRegistry).hasHiddenFeatures).toBe(true)
553
552
  })
554
553
  })
555
554
 
556
555
  describe('filter', () => {
557
556
  it('returns null', () => {
558
- const dataset = new Dataset({ filter: ['==', ['get', 'type'], 'foo'] })
557
+ const dataset = new Dataset({ filter: ['==', ['get', 'type'], 'foo'] }, datasetRegistry)
559
558
  expect(dataset.filter).toBeNull()
560
559
  })
561
560
  })
562
561
 
563
562
  describe('symbolAnchor', () => {
564
563
  it('returns symbolAnchor from its own style', () => {
565
- const dataset = new Dataset({ style: { symbolAnchor: [0.5, 1] } })
564
+ const dataset = new Dataset({ style: { symbolAnchor: [0.5, 1] } }, datasetRegistry)
566
565
  expect(dataset.symbolAnchor).toEqual([0.5, 1])
567
566
  })
568
567
 
569
568
  it('returns undefined when no symbolAnchor is set and there is no parent', () => {
570
- const dataset = new Dataset({ style: {} })
569
+ const dataset = new Dataset({ style: {} }, datasetRegistry)
571
570
  expect(dataset.symbolAnchor).toBeUndefined()
572
571
  })
573
572
 
@@ -575,18 +574,18 @@ describe('Dataset class', () => {
575
574
  const parentDef = { id: 'parent', style: { symbolAnchor: [0.1, 0.9] } }
576
575
  const childDef = { id: 'child', parentId: 'parent', style: {} }
577
576
  datasetRegistry.attach({ parent: parentDef, child: childDef })
578
- expect(new Dataset(childDef).symbolAnchor).toEqual([0.1, 0.9])
577
+ expect(new Dataset(childDef, datasetRegistry).symbolAnchor).toEqual([0.1, 0.9])
579
578
  })
580
579
  })
581
580
 
582
581
  describe('sourceLayer', () => {
583
582
  it('returns the sourceLayer from a tile-based top-level dataset', () => {
584
- const dataset = new Dataset({ tiles: ['https://example.com/{z}/{x}/{y}'], sourceLayer: 'my_layer' })
583
+ const dataset = new Dataset({ tiles: ['https://example.com/{z}/{x}/{y}'], sourceLayer: 'my_layer' }, datasetRegistry)
585
584
  expect(dataset.sourceLayer).toBe('my_layer')
586
585
  })
587
586
 
588
587
  it('returns undefined for a geojson dataset with no tiles', () => {
589
- const dataset = new Dataset({ geojson: { type: 'FeatureCollection', features: [] } })
588
+ const dataset = new Dataset({ geojson: { type: 'FeatureCollection', features: [] } }, datasetRegistry)
590
589
  expect(dataset.sourceLayer).toBeUndefined()
591
590
  })
592
591
 
@@ -594,7 +593,7 @@ describe('Dataset class', () => {
594
593
  const parentDef = { id: 'parent', tiles: ['https://example.com/{z}/{x}/{y}'], sourceLayer: 'parent_layer', style: {} }
595
594
  const childDef = { id: 'child', parentId: 'parent', style: {} }
596
595
  datasetRegistry.attach({ parent: parentDef, child: childDef })
597
- expect(new Dataset(childDef).sourceLayer).toBe('parent_layer')
596
+ expect(new Dataset(childDef, datasetRegistry).sourceLayer).toBe('parent_layer')
598
597
  })
599
598
  })
600
599
 
@@ -603,35 +602,35 @@ describe('Dataset class', () => {
603
602
  const parentDef = { id: 'parent', visible: false, style: {} }
604
603
  const childDef = { id: 'child', parentId: 'parent', visible: true, style: {} }
605
604
  datasetRegistry.attach({ parent: parentDef, child: childDef })
606
- expect(new Dataset(childDef).isHiddenByInheritance).toBe(true)
605
+ expect(new Dataset(childDef, datasetRegistry).isHiddenByInheritance).toBe(true)
607
606
  })
608
607
 
609
608
  it('returns false for a sublayer whose parent is visible', () => {
610
609
  const parentDef = { id: 'parent', visible: true, style: {} }
611
610
  const childDef = { id: 'child', parentId: 'parent', visible: true, style: {} }
612
611
  datasetRegistry.attach({ parent: parentDef, child: childDef })
613
- expect(new Dataset(childDef).isHiddenByInheritance).toBe(false)
612
+ expect(new Dataset(childDef, datasetRegistry).isHiddenByInheritance).toBe(false)
614
613
  })
615
614
 
616
615
  it('returns false for a top-level dataset when global visibility is true', () => {
617
- const dataset = new Dataset({ id: 'top', visible: true, style: {} })
616
+ const dataset = new Dataset({ id: 'top', visible: true, style: {} }, datasetRegistry)
618
617
  expect(dataset.isHiddenByInheritance).toBe(false)
619
618
  })
620
619
  })
621
620
 
622
621
  describe('isLocallyVisible', () => {
623
622
  it('returns the raw visible flag from the definition when not visible', () => {
624
- const dataset = new Dataset({ visible: false })
623
+ const dataset = new Dataset({ visible: false }, datasetRegistry)
625
624
  expect(dataset.isLocallyVisible).toBe(false)
626
625
  })
627
626
 
628
627
  it('returns undefined when visible is not set and dataset is not visible', () => {
629
- const dataset = new Dataset({})
628
+ const dataset = new Dataset({}, datasetRegistry)
630
629
  expect(dataset.isLocallyVisible).toBeUndefined()
631
630
  })
632
631
 
633
632
  it('returns true when isVisible is truthy (subclass override scenario)', () => {
634
- const dataset = new Dataset({ visible: false })
633
+ const dataset = new Dataset({ visible: false }, datasetRegistry)
635
634
  Object.defineProperty(dataset, 'isVisible', { get: () => true, configurable: true })
636
635
  expect(dataset.isLocallyVisible).toBe(true)
637
636
  })
@@ -642,7 +641,7 @@ describe('Dataset class', () => {
642
641
  const dataset = new Dataset({
643
642
  id: 'parcels',
644
643
  dynamicGeoJSON: { url: 'http://example.com', idProperty: 'parcel_id' }
645
- })
644
+ }, datasetRegistry)
646
645
  const dg = dataset.dynamicGeoJSON
647
646
  expect(dg.source.promoteId).toBe('parcel_id')
648
647
  expect(dg.source.generateId).toBeUndefined()
@@ -652,7 +651,7 @@ describe('Dataset class', () => {
652
651
  const dataset = new Dataset({
653
652
  id: 'parcels',
654
653
  dynamicGeoJSON: { url: 'http://example.com' }
655
- })
654
+ }, datasetRegistry)
656
655
  const dg = dataset.dynamicGeoJSON
657
656
  expect(dg.source.generateId).toBe(true)
658
657
  expect(dg.source.promoteId).toBeUndefined()
@@ -661,17 +660,17 @@ describe('Dataset class', () => {
661
660
 
662
661
  describe('groupId', () => {
663
662
  it('returns the groupId from the dataset definition', () => {
664
- const dataset = new Dataset({ id: 'dataset', groupId: 'group-1' })
663
+ const dataset = new Dataset({ id: 'dataset', groupId: 'group-1' }, datasetRegistry)
665
664
  expect(dataset.groupId).toBe('group-1')
666
665
  })
667
666
 
668
667
  it('builds a groupId from the dataset definitions groupLabel', () => {
669
- const dataset = new Dataset({ id: 'dataset', groupLabel: 'Roast Potatoes' })
668
+ const dataset = new Dataset({ id: 'dataset', groupLabel: 'Roast Potatoes' }, datasetRegistry)
670
669
  expect(dataset.groupId).toBe('roast-potatoes')
671
670
  })
672
671
 
673
672
  it('returns null if no groupId is set', () => {
674
- const dataset = new Dataset({ id: 'dataset' })
673
+ const dataset = new Dataset({ id: 'dataset' }, datasetRegistry)
675
674
  expect(dataset.groupId).toBeNull()
676
675
  })
677
676
  })