@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,24 +1,12 @@
1
1
  import { render, act } from '@testing-library/react'
2
2
  import { DatasetsInit } from './DatasetsInit.jsx'
3
- import { datasetRegistry } from '../registry/datasetRegistry.js'
4
- import { attachGlobalState } from '../registry/globalDataset.js'
5
- import { loadLayerAdapter, layerAdapter } from '../adapters/loadLayerAdapter.js'
3
+ import { loadLayerAdapter } from '../adapters/loadLayerAdapter.js'
6
4
  import { initialiseDatasets } from './initialiseDatasets.js'
7
5
  import { EVENTS } from '../../../../src/config/events.js'
6
+ import { datasetsToMenu } from '../reducers/datasetsToMenu.js'
8
7
 
9
- jest.mock('../registry/datasetRegistry.js', () => ({
10
- datasetRegistry: {
11
- attach: jest.fn(),
12
- attachMapStyle: jest.fn(),
13
- attachCreateDataset: jest.fn()
14
- }
15
- }))
16
- jest.mock('../registry/globalDataset.js', () => ({
17
- attachGlobalState: jest.fn()
18
- }))
19
8
  jest.mock('../adapters/loadLayerAdapter.js', () => ({
20
- loadLayerAdapter: jest.fn(),
21
- layerAdapter: {}
9
+ loadLayerAdapter: jest.fn()
22
10
  }))
23
11
  jest.mock('./initialiseDatasets.js')
24
12
 
@@ -33,30 +21,46 @@ const makeAdapter = () => ({
33
21
  init: jest.fn().mockResolvedValue(undefined)
34
22
  })
35
23
 
24
+ const makeDatasetRegistry = () => ({
25
+ attach: jest.fn(),
26
+ attachMapStyle: jest.fn(),
27
+ attachGlobals: jest.fn()
28
+ })
29
+
30
+ // The registry the manifest put in this map's plugin state; clearAllMocks resets it between tests
31
+ const datasetRegistry = makeDatasetRegistry()
32
+
36
33
  const makePluginState = (overrides = {}) => ({
37
34
  dispatch: jest.fn(),
35
+ datasetRegistry,
38
36
  mappedDatasets: {},
39
37
  orderedDatasets: [],
38
+ menu: [],
39
+ menuInitialised: true,
40
40
  globals: { visible: true, opacity: 1 },
41
41
  actionsArray: [],
42
42
  ...overrides
43
43
  })
44
44
 
45
- const makeProps = (overrides = {}) => ({
46
- pluginConfig: {
45
+ const makeProps = (overrides = {}) => {
46
+ const pluginConfig = overrides.pluginConfig ?? {
47
47
  datasets: [{ id: 'roads', label: 'Roads', showInMenu: true }]
48
- },
49
- pluginState: makePluginState(),
50
- appState: {},
51
- mapState: { mapStyle: { id: 'outdoor' } },
52
- mapProvider: { isBaseMapReady: jest.fn().mockReturnValue(true) },
53
- services: {
54
- eventBus: makeEventBus(),
55
- symbolRegistry: {},
56
- patternRegistry: {}
57
- },
58
- ...overrides
59
- })
48
+ }
49
+ return {
50
+ appConfig: { id: 'test-map' },
51
+ appState: { openPanels: {} },
52
+ pluginConfig,
53
+ pluginState: makePluginState({ menu: datasetsToMenu(pluginConfig) }),
54
+ mapState: { mapStyle: { id: 'outdoor' } },
55
+ mapProvider: { isBaseMapReady: jest.fn().mockReturnValue(true) },
56
+ services: {
57
+ eventBus: makeEventBus(),
58
+ symbolRegistry: {},
59
+ patternRegistry: {}
60
+ },
61
+ ...overrides
62
+ }
63
+ }
60
64
 
61
65
  describe('DatasetsInit', () => {
62
66
  let adapter
@@ -73,54 +77,40 @@ describe('DatasetsInit', () => {
73
77
  expect(container.firstChild).toBeNull()
74
78
  })
75
79
 
76
- // ─── hasMenu / panel removal ─────────────────────────────────────────────────
77
-
78
80
  describe('menu panel management', () => {
79
- it('removes the datasetsLayers panel when no datasets have showInMenu', async () => {
80
- const props = makeProps({
81
- pluginConfig: { datasets: [{ id: 'roads', label: 'Roads' }] }
82
- })
83
- await render(<DatasetsInit {...props} />)
84
- expect(props.services.eventBus.emitWhenReady).toHaveBeenCalledWith(
85
- EVENTS.APP_REMOVE_PANEL, 'datasetsLayers'
86
- )
87
- expect(props.services.eventBus.emitWhenReady).toHaveBeenCalledWith(
88
- EVENTS.APP_TOGGLE_BUTTON_STATE, { id: 'datasetsLayers', prop: 'hidden', value: true }
89
- )
81
+ const openPanelState = { openPanels: { datasetsLayers: {} } }
82
+
83
+ it('does not remove the panel or hide the button when there is no menu', () => {
84
+ const props = makeProps({ pluginConfig: { datasets: [] } })
85
+ render(<DatasetsInit {...props} />)
86
+ expect(props.services.eventBus.emitWhenReady).not.toHaveBeenCalled()
87
+ expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.APP_REMOVE_PANEL, expect.anything())
88
+ expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.APP_TOGGLE_BUTTON_STATE, expect.anything())
90
89
  })
91
90
 
92
- it('does not remove the panel when at least one dataset has showInMenu', async () => {
93
- const props = makeProps()
94
- await render(<DatasetsInit {...props} />)
95
- expect(props.services.eventBus.emitWhenReady).not.toHaveBeenCalledWith(
96
- EVENTS.APP_REMOVE_PANEL, 'datasetsLayers'
97
- )
91
+ it('closes the open panel when the menu empties', () => {
92
+ const props = makeProps({ appState: openPanelState })
93
+ const { rerender } = render(<DatasetsInit {...props} />)
94
+ expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
95
+
96
+ rerender(<DatasetsInit {...props} pluginState={makePluginState()} />)
97
+ expect(props.services.eventBus.emit).toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
98
98
  })
99
99
 
100
- it('removes the panel when hasMenu is explicitly false', async () => {
101
- const props = makeProps({
102
- pluginConfig: { hasMenu: false, datasets: [{ id: 'roads', label: 'Roads', showInMenu: true }] }
103
- })
104
- await render(<DatasetsInit {...props} />)
105
- expect(props.services.eventBus.emitWhenReady).toHaveBeenCalledWith(
106
- EVENTS.APP_REMOVE_PANEL, 'datasetsLayers'
107
- )
100
+ it('closes a panel that is open on load when there is no menu', () => {
101
+ const props = makeProps({ pluginConfig: { datasets: [] }, appState: openPanelState })
102
+ render(<DatasetsInit {...props} />)
103
+ expect(props.services.eventBus.emit).toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
108
104
  })
109
105
 
110
- it('includes datasets with sublayer showInMenu when checking for menu items', async () => {
111
- const props = makeProps({
112
- pluginConfig: {
113
- datasets: [{
114
- id: 'parent',
115
- label: 'Parent',
116
- sublayers: [{ id: 'child', showInMenu: true }]
117
- }]
118
- }
119
- })
120
- await render(<DatasetsInit {...props} />)
121
- expect(props.services.eventBus.emitWhenReady).not.toHaveBeenCalledWith(
122
- EVENTS.APP_REMOVE_PANEL, 'datasetsLayers'
123
- )
106
+ it.each([
107
+ ['the panel is closed', {}, makePluginState()],
108
+ ['menu datasets remain', openPanelState.openPanels, makePluginState({ menu: [{ id: 'roads' }] })],
109
+ ['the live menu is still loading', openPanelState.openPanels, makePluginState({ menuInitialised: false })]
110
+ ])('leaves the panel alone when %s', (_, openPanels, pluginState) => {
111
+ const props = makeProps({ appState: { openPanels } })
112
+ render(<DatasetsInit {...props} pluginState={pluginState} />)
113
+ expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
124
114
  })
125
115
  })
126
116
 
@@ -131,11 +121,38 @@ describe('DatasetsInit', () => {
131
121
  const props = makeProps()
132
122
  await render(<DatasetsInit {...props} />)
133
123
  expect(loadLayerAdapter).toHaveBeenCalledWith(
134
- props.mapProvider, props.services.symbolRegistry, props.services.patternRegistry
124
+ props.mapProvider, props.services.symbolRegistry, props.services.patternRegistry, datasetRegistry
135
125
  )
136
126
  expect(initialiseDatasets).toHaveBeenCalled()
137
127
  })
138
128
 
129
+ it('passes the registry from plugin state and its adapter to initialiseDatasets', async () => {
130
+ const props = makeProps()
131
+ render(<DatasetsInit {...props} />)
132
+ await act(async () => {})
133
+ expect(initialiseDatasets).toHaveBeenCalledWith(expect.objectContaining({ adapter, datasetRegistry }))
134
+ })
135
+
136
+ it('puts the adapter on its map provider once loaded', async () => {
137
+ const props = makeProps()
138
+ render(<DatasetsInit {...props} />)
139
+ expect(props.mapProvider.datasets).toBeUndefined()
140
+ await act(async () => {})
141
+ expect(props.mapProvider.datasets).toBe(adapter)
142
+ })
143
+
144
+ it('gives each map provider its own adapter', async () => {
145
+ const otherAdapter = makeAdapter()
146
+ loadLayerAdapter.mockResolvedValueOnce(adapter).mockResolvedValueOnce(otherAdapter)
147
+ const propsA = makeProps()
148
+ const propsB = makeProps()
149
+ render(<DatasetsInit {...propsA} />)
150
+ render(<DatasetsInit {...propsB} />)
151
+ await act(async () => {})
152
+ expect(propsA.mapProvider.datasets).toBe(adapter)
153
+ expect(propsB.mapProvider.datasets).toBe(otherAdapter)
154
+ })
155
+
139
156
  it('does not initialise when base map is not ready', async () => {
140
157
  const props = makeProps({
141
158
  mapProvider: { isBaseMapReady: jest.fn().mockReturnValue(false) }
@@ -176,6 +193,7 @@ describe('DatasetsInit', () => {
176
193
  await act(async () => {})
177
194
  unmount()
178
195
  expect(removeFn).toHaveBeenCalled()
196
+ expect(props.mapProvider.datasets).toBeNull()
179
197
  })
180
198
  })
181
199
 
@@ -198,13 +216,14 @@ describe('DatasetsInit', () => {
198
216
  expect(datasetRegistry.attachMapStyle).toHaveBeenCalledWith(props.mapState.mapStyle)
199
217
  })
200
218
 
201
- it('calls layerAdapter.onMapStyleChange when available', async () => {
202
- const onMapStyleChange = jest.fn()
203
- Object.assign(layerAdapter, { onMapStyleChange })
219
+ it('calls layerAdapter.onMapStyleChange when the map style changes after the adapter loads', async () => {
220
+ adapter.onMapStyleChange = jest.fn()
204
221
  const props = makeProps()
205
- await render(<DatasetsInit {...props} />)
206
- expect(onMapStyleChange).toHaveBeenCalled()
207
- delete layerAdapter.onMapStyleChange
222
+ const { rerender } = render(<DatasetsInit {...props} />)
223
+ await act(async () => {})
224
+ expect(adapter.onMapStyleChange).not.toHaveBeenCalled()
225
+ rerender(<DatasetsInit {...props} mapState={{ mapStyle: { id: 'dark' } }} />)
226
+ expect(adapter.onMapStyleChange).toHaveBeenCalled()
208
227
  })
209
228
 
210
229
  // MapLibre gets this re-apply for free (map.addImage()/setPaintProperty() naturally
@@ -214,46 +233,58 @@ describe('DatasetsInit', () => {
214
233
  // re-resolved symbols/patterns after a style change, instead of a stale highlight sticking.
215
234
  it('emits MAP_DATA_CHANGE once onMapStyleChange resolves, so highlights re-resolve for the new theme', async () => {
216
235
  let resolveOnMapStyleChange
217
- const onMapStyleChange = jest.fn(() => new Promise(resolve => { resolveOnMapStyleChange = resolve }))
218
- Object.assign(layerAdapter, { onMapStyleChange })
236
+ adapter.onMapStyleChange = jest.fn(() => new Promise(resolve => { resolveOnMapStyleChange = resolve }))
219
237
  const props = makeProps()
220
- await render(<DatasetsInit {...props} />)
238
+ const { rerender } = render(<DatasetsInit {...props} />)
239
+ await act(async () => {})
240
+ rerender(<DatasetsInit {...props} mapState={{ mapStyle: { id: 'dark' } }} />)
221
241
  expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.MAP_DATA_CHANGE)
222
242
  await act(async () => {
223
243
  resolveOnMapStyleChange()
224
244
  await Promise.resolve()
225
245
  })
226
246
  expect(props.services.eventBus.emit).toHaveBeenCalledWith(EVENTS.MAP_DATA_CHANGE)
227
- delete layerAdapter.onMapStyleChange
228
247
  })
229
248
  })
230
249
 
231
250
  // ─── globals effect ──────────────────────────────────────────────────────────
232
251
 
233
252
  describe('globals effect', () => {
234
- it('calls attachGlobalState with the current globals', async () => {
253
+ it('attaches the current globals to the registry', async () => {
235
254
  const globals = { visible: false, opacity: 0.5 }
236
255
  const props = makeProps({ pluginState: makePluginState({ globals }) })
237
256
  await render(<DatasetsInit {...props} />)
238
- expect(attachGlobalState).toHaveBeenCalledWith(globals)
257
+ expect(datasetRegistry.attachGlobals).toHaveBeenCalledWith(globals)
239
258
  })
240
259
  })
241
260
 
242
261
  // ─── actionsArray effect ─────────────────────────────────────────────────────
243
262
 
244
263
  describe('actionsArray effect', () => {
245
- it('calls each queued adapter method and dispatches REMOVE_ADAPTER_ACTIONS', async () => {
246
- const applyStyle = jest.fn()
247
- Object.assign(layerAdapter, { applyStyle })
264
+ it('runs actions queued before the adapter loads once it has loaded, and dispatches REMOVE_ADAPTER_ACTIONS', async () => {
265
+ adapter.applyStyle = jest.fn()
248
266
  const actions = [{ method: 'applyStyle', parameters: ['roads', {}] }]
249
267
  const dispatch = jest.fn()
250
268
  const props = makeProps({
251
269
  pluginState: makePluginState({ actionsArray: actions, dispatch })
252
270
  })
253
- await render(<DatasetsInit {...props} />)
254
- expect(applyStyle).toHaveBeenCalledWith('roads', {})
271
+ render(<DatasetsInit {...props} />)
272
+ expect(adapter.applyStyle).not.toHaveBeenCalled()
273
+ await act(async () => {})
274
+ expect(adapter.applyStyle).toHaveBeenCalledWith('roads', {})
275
+ expect(dispatch).toHaveBeenCalledWith({ type: 'REMOVE_ADAPTER_ACTIONS', payload: actions })
276
+ })
277
+
278
+ it('runs actions queued after the adapter has loaded straight away', async () => {
279
+ adapter.applyStyle = jest.fn()
280
+ const actions = [{ method: 'applyStyle', parameters: ['roads', {}] }]
281
+ const dispatch = jest.fn()
282
+ const props = makeProps({ pluginState: makePluginState({ dispatch }) })
283
+ const { rerender } = render(<DatasetsInit {...props} />)
284
+ await act(async () => {})
285
+ rerender(<DatasetsInit {...props} pluginState={makePluginState({ actionsArray: actions, dispatch })} />)
286
+ expect(adapter.applyStyle).toHaveBeenCalledWith('roads', {})
255
287
  expect(dispatch).toHaveBeenCalledWith({ type: 'REMOVE_ADAPTER_ACTIONS', payload: actions })
256
- delete layerAdapter.applyStyle
257
288
  })
258
289
 
259
290
  it('skips dispatching when actionsArray is empty', async () => {
@@ -1,11 +1,10 @@
1
1
  import { createDynamicSource } from '../fetch/createDynamicSource.js'
2
2
  import { mappedDatasetsReducer } from '../reducers/mappedDatasetsReducer.js'
3
- import { datasetRegistry } from '../registry/datasetRegistry.js'
4
- import { attachMenuStateRef } from '../registry/isVisibleWhen.js'
5
3
  import { datasetsToMenu } from '../reducers/datasetsToMenu.js'
6
4
 
7
5
  export const initialiseDatasets = ({
8
6
  adapter,
7
+ datasetRegistry,
9
8
  pluginConfig,
10
9
  mapStyle,
11
10
  mapProvider,
@@ -28,7 +27,7 @@ export const initialiseDatasets = ({
28
27
  datasetRegistry.attach(mappedDatasets, orderedDatasets, mapStyle)
29
28
  const menu = datasetsToMenu({ datasets })
30
29
 
31
- eventBus.requestOnce('menu:state', attachMenuStateRef) // Request the menu state from the menu plugin
30
+ eventBus.requestOnce('menu:state', menuStateRef => datasetRegistry.attachMenuStateRef(menuStateRef)) // Request the menu state from the menu plugin
32
31
 
33
32
  dispatch({ type: 'SET_MENU', payload: { menu } })
34
33
  dispatch({ type: 'SET_DATASETS', payload: { mappedDatasets, orderedDatasets } })
@@ -1,17 +1,15 @@
1
1
  import { initialiseDatasets } from './initialiseDatasets.js'
2
2
  import { createDynamicSource } from '../fetch/createDynamicSource.js'
3
- import { datasetRegistry } from '../registry/datasetRegistry.js'
4
3
 
5
4
  jest.mock('../fetch/createDynamicSource.js')
6
- jest.mock('../registry/datasetRegistry.js', () => ({
7
- datasetRegistry: {
8
- attach: jest.fn(),
9
- attachCreateDataset: jest.fn(),
10
- forEachDataset: jest.fn(),
11
- invalidateKeyItemsOnMenuStateChange: jest.fn(),
12
- _invalidateCache: jest.fn()
13
- }
14
- }))
5
+
6
+ const datasetRegistry = {
7
+ attach: jest.fn(),
8
+ attachCreateDataset: jest.fn(),
9
+ attachMenuStateRef: jest.fn(),
10
+ forEachDataset: jest.fn(),
11
+ invalidateKeyItemsOnMenuStateChange: jest.fn()
12
+ }
15
13
 
16
14
  // ─── helpers ─────────────────────────────────────────────────────────────────
17
15
 
@@ -43,6 +41,7 @@ const makeArgs = (overrides = {}) => {
43
41
  const eventBus = makeEventBus()
44
42
  return {
45
43
  adapter: makeAdapter(),
44
+ datasetRegistry,
46
45
  pluginConfig: { datasets: [{ id: 'roads', label: 'Roads' }] },
47
46
  pluginStateRef: {},
48
47
  mapStyle: { layers: [] },
@@ -281,6 +280,20 @@ describe('onUpdate callback', () => {
281
280
  })
282
281
  })
283
282
 
283
+ // ─── menu:state request ───────────────────────────────────────────────────────
284
+
285
+ describe('menu:state request', () => {
286
+ it('attaches the menu state ref to the registry', () => {
287
+ const args = makeArgs()
288
+ initialiseDatasets(args)
289
+
290
+ const menuStateRef = { current: { menuState: { timeframe: 'present' } } }
291
+ args.eventBus._handlers['menu:state'](menuStateRef)
292
+
293
+ expect(datasetRegistry.attachMenuStateRef).toHaveBeenCalledWith(menuStateRef)
294
+ })
295
+ })
296
+
284
297
  // ─── menu:changed handler ─────────────────────────────────────────────────────
285
298
 
286
299
  describe('menu:changed handler', () => {
@@ -12,57 +12,66 @@ import { setOpacity } from './api/setOpacity.js'
12
12
  import { getOpacity } from './api/getOpacity.js'
13
13
  import { setData } from './api/setData.js'
14
14
  import { setGlobals } from './api/setGlobals.js'
15
+ import { hasLayersMenu } from './utils/hasLayersMenu.js'
16
+ import { createDatasetRegistry } from './registry/datasetRegistry.js'
15
17
 
16
- export const manifest = {
18
+ const layersPanel = {
19
+ id: 'datasetsLayers',
20
+ label: 'Layers',
21
+ mobile: {
22
+ slot: 'drawer',
23
+ modal: true,
24
+ dismissible: true
25
+ },
26
+ tablet: {
27
+ slot: 'left-top',
28
+ dismissible: true,
29
+ exclusive: true,
30
+ width: '260px'
31
+ },
32
+ desktop: {
33
+ slot: 'left-top',
34
+ modal: false,
35
+ dismissible: true,
36
+ exclusive: true,
37
+ width: '280px'
38
+ },
39
+ render: LayersMenu
40
+ }
41
+
42
+ const layersButton = {
43
+ id: 'datasetsLayers',
44
+ label: 'Layers',
45
+ panelId: 'datasetsLayers',
46
+ excludeWhen: (context) => !hasLayersMenu(context),
47
+ iconId: 'layers',
48
+ mobile: {
49
+ slot: 'top-left',
50
+ showLabel: true
51
+ },
52
+ tablet: {
53
+ slot: 'top-left',
54
+ showLabel: true
55
+ },
56
+ desktop: {
57
+ slot: 'top-left',
58
+ showLabel: true
59
+ }
60
+ }
61
+
62
+ // With hasMenu: false the Layers button and panel are never registered
63
+ export const createManifest = ({ hasMenu } = {}) => ({
17
64
  InitComponent: DatasetsInit,
18
65
 
66
+ // load() calls createManifest once per map, so each map gets its own dataset registry
19
67
  reducer: {
20
- initialState,
68
+ initialState: { ...initialState, datasetRegistry: createDatasetRegistry() },
21
69
  actions
22
70
  },
23
71
 
24
- panels: [{
25
- id: 'datasetsLayers',
26
- label: 'Layers',
27
- mobile: {
28
- slot: 'drawer',
29
- modal: true,
30
- dismissible: true
31
- },
32
- tablet: {
33
- slot: 'left-top',
34
- dismissible: true,
35
- exclusive: true,
36
- width: '260px'
37
- },
38
- desktop: {
39
- slot: 'left-top',
40
- modal: false,
41
- dismissible: true,
42
- exclusive: true,
43
- width: '280px'
44
- },
45
- render: LayersMenu
46
- }],
72
+ panels: hasMenu === false ? [] : [layersPanel],
47
73
 
48
- buttons: [{
49
- id: 'datasetsLayers',
50
- label: 'Layers',
51
- panelId: 'datasetsLayers',
52
- iconId: 'layers',
53
- mobile: {
54
- slot: 'top-left',
55
- showLabel: true
56
- },
57
- tablet: {
58
- slot: 'top-left',
59
- showLabel: true
60
- },
61
- desktop: {
62
- slot: 'top-left',
63
- showLabel: true
64
- }
65
- }],
74
+ buttons: hasMenu === false ? [] : [layersButton],
66
75
 
67
76
  icons: [{
68
77
  id: 'layers',
@@ -84,4 +93,4 @@ export const manifest = {
84
93
  setData,
85
94
  setGlobals
86
95
  }
87
- }
96
+ })
@@ -1,6 +1,9 @@
1
- import { manifest } from './manifest.js'
1
+ import { createManifest } from './manifest.js'
2
+ import { hasLayersMenu } from './utils/hasLayersMenu.js'
2
3
 
3
- jest.mock('./reducers/pluginState.js', () => ({ initialState: {}, actions: {} }))
4
+ jest.mock('./reducers/pluginState.js', () => ({ initialState: { menu: [] }, actions: {} }))
5
+ jest.mock('./registry/datasetRegistry.js', () => ({ createDatasetRegistry: jest.fn(() => ({})) }))
6
+ jest.mock('./utils/hasLayersMenu.js', () => ({ hasLayersMenu: jest.fn() }))
4
7
  jest.mock('./initialise/DatasetsInit.jsx', () => ({ DatasetsInit: jest.fn() }))
5
8
  jest.mock('./components/LayersMenu/LayersMenu.jsx', () => ({ LayersMenu: jest.fn() }))
6
9
  jest.mock('./api/addDataset.js', () => ({ addDataset: jest.fn() }))
@@ -14,8 +17,10 @@ jest.mock('./api/getOpacity.js', () => ({ getOpacity: jest.fn() }))
14
17
  jest.mock('./api/setData.js', () => ({ setData: jest.fn() }))
15
18
  jest.mock('./api/setGlobals.js', () => ({ setGlobals: jest.fn() }))
16
19
 
17
- describe('manifest', () => {
18
- it('exports a manifest object', () => {
20
+ describe('createManifest', () => {
21
+ const manifest = createManifest()
22
+
23
+ it('returns a manifest object', () => {
19
24
  expect(manifest).toBeDefined()
20
25
  expect(typeof manifest).toBe('object')
21
26
  })
@@ -30,6 +35,15 @@ describe('manifest', () => {
30
35
  expect(manifest.reducer.actions).toBeDefined()
31
36
  })
32
37
 
38
+ it('adds a dataset registry to the initial state', () => {
39
+ expect(manifest.reducer.initialState).toEqual({ menu: [], datasetRegistry: expect.any(Object) })
40
+ })
41
+
42
+ it('creates a separate dataset registry for each manifest, so each map has its own', () => {
43
+ const otherManifest = createManifest()
44
+ expect(otherManifest.reducer.initialState.datasetRegistry).not.toBe(manifest.reducer.initialState.datasetRegistry)
45
+ })
46
+
33
47
  it('has panels with a datasetsLayers panel', () => {
34
48
  expect(Array.isArray(manifest.panels)).toBe(true)
35
49
  expect(manifest.panels.find(p => p.id === 'datasetsLayers')).toBeDefined()
@@ -39,6 +53,24 @@ describe('manifest', () => {
39
53
  expect(Array.isArray(manifest.buttons)).toBe(true)
40
54
  })
41
55
 
56
+ it('excludes the Layers button when there is no layers menu', () => {
57
+ const button = manifest.buttons.find(button => button.id === 'datasetsLayers')
58
+ const context = { pluginConfig: {}, pluginState: {} }
59
+
60
+ hasLayersMenu.mockReturnValue(false)
61
+ expect(button.excludeWhen(context)).toBe(true)
62
+ hasLayersMenu.mockReturnValue(true)
63
+ expect(button.excludeWhen(context)).toBe(false)
64
+ expect(hasLayersMenu).toHaveBeenCalledWith(context)
65
+ })
66
+
67
+ it('leaves out the Layers button and panel when hasMenu is false', () => {
68
+ const withoutMenu = createManifest({ hasMenu: false })
69
+ expect(withoutMenu.buttons).toEqual([])
70
+ expect(withoutMenu.panels).toEqual([])
71
+ expect(withoutMenu.api).toEqual(manifest.api)
72
+ })
73
+
42
74
  it('has an api with all expected methods', () => {
43
75
  expect(manifest.api.addDataset).toBeDefined()
44
76
  expect(manifest.api.removeDataset).toBeDefined()
@@ -18,7 +18,8 @@ const initialState = {
18
18
  mappedDatasets: {},
19
19
  orderedDatasets: [],
20
20
  actionsArray: [],
21
- menu: []
21
+ menu: [],
22
+ menuInitialised: false
22
23
  }
23
24
 
24
25
  const validateDatasetExists = (state, datasetId, prefix, suffix = 'not found') => {
@@ -29,10 +30,8 @@ const validateDatasetExists = (state, datasetId, prefix, suffix = 'not found') =
29
30
  return true
30
31
  }
31
32
 
32
- let actionId = 0
33
33
  const addAction = (method, parameters, state) => {
34
- actionId = state.actionsArray.length ? actionId + 1 : 0
35
- return { ...state, actionsArray: [...state.actionsArray, { method, parameters, actionId }] }
34
+ return { ...state, actionsArray: [...state.actionsArray, { method, parameters }] }
36
35
  }
37
36
 
38
37
  const setGlobalState = (state, payload) => {
@@ -48,7 +47,8 @@ const setMenu = (state, payload) => {
48
47
  const { menu } = payload
49
48
  return {
50
49
  ...state,
51
- menu
50
+ menu,
51
+ menuInitialised: true
52
52
  }
53
53
  }
54
54
 
@@ -190,6 +190,12 @@ describe('SET_MENU', () => {
190
190
  expect(result.menu).toBe(menu)
191
191
  })
192
192
 
193
+ it('marks the menu as initialised', () => {
194
+ const state = makeState()
195
+ const result = actions.SET_MENU(state, { menu: [] })
196
+ expect(result.menuInitialised).toBe(true)
197
+ })
198
+
193
199
  it('does not add to actionsArray', () => {
194
200
  const state = makeState()
195
201
  const result = actions.SET_MENU(state, { menu: [] })
@@ -365,8 +371,8 @@ describe('SHOW_FEATURES', () => {
365
371
 
366
372
  describe('REMOVE_ADAPTER_ACTIONS', () => {
367
373
  it('removes completed actions from actionsArray', () => {
368
- const action1 = { method: 'addDataset', parameters: ['roads'], actionId: 0 }
369
- const action2 = { method: 'applyStyle', parameters: ['roads', {}], actionId: 1 }
374
+ const action1 = { method: 'addDataset', parameters: ['roads'] }
375
+ const action2 = { method: 'applyStyle', parameters: ['roads', {}] }
370
376
  const state = { ...makeState(), actionsArray: [action1, action2] }
371
377
 
372
378
  const result = actions.REMOVE_ADAPTER_ACTIONS(state, [action1])
@@ -374,6 +380,19 @@ describe('REMOVE_ADAPTER_ACTIONS', () => {
374
380
  expect(result.actionsArray).toEqual([action2])
375
381
  })
376
382
 
383
+ it('only removes the completed action when another has the same method and parameters', () => {
384
+ const state = makeStateWithDataset('roads')
385
+ const state1 = actions.SET_DATASET_VISIBILITY(state, { datasetId: 'roads', visible: false })
386
+ const state2 = actions.SET_GLOBAL_OPACITY(state1, { opacity: 0.5 })
387
+ const state3 = actions.SET_GLOBAL_OPACITY(state2, { opacity: 0.8 })
388
+ const [, firstOpacityAction, secondOpacityAction] = state3.actionsArray
389
+
390
+ const result = actions.REMOVE_ADAPTER_ACTIONS(state3, [firstOpacityAction])
391
+
392
+ expect(result.actionsArray).toEqual([state3.actionsArray[0], secondOpacityAction])
393
+ expect(result.actionsArray[1]).toBe(secondOpacityAction)
394
+ })
395
+
377
396
  it('returns unchanged state when completedActions is empty', () => {
378
397
  const state = makeState()
379
398
  const result = actions.REMOVE_ADAPTER_ACTIONS(state, [])
@@ -386,21 +405,3 @@ describe('REMOVE_ADAPTER_ACTIONS', () => {
386
405
  expect(result).toBe(state)
387
406
  })
388
407
  })
389
-
390
- // ─── actionId counter behaviour ───────────────────────────────────────────────
391
-
392
- describe('actionId counter', () => {
393
- it('resets actionId to 0 when actionsArray is empty', () => {
394
- const state = makeStateWithDataset('roads')
395
- const result = actions.SET_DATASET_VISIBILITY(state, { datasetId: 'roads', visible: false })
396
- expect(result.actionsArray[0].actionId).toBe(0)
397
- })
398
-
399
- it('increments actionId for each successive queued action', () => {
400
- const state = makeStateWithDataset('roads')
401
- const state1 = actions.SET_DATASET_VISIBILITY(state, { datasetId: 'roads', visible: false })
402
- const state2 = actions.SET_DATASET_VISIBILITY(state1, { datasetId: 'roads', visible: true })
403
-
404
- expect(state2.actionsArray[1].actionId).toBe(1)
405
- })
406
- })