@defra/interactive-map 0.0.54-alpha → 0.0.56-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 (472) hide show
  1. package/assets/templates/add-polygons.njk +1 -1
  2. package/assets/templates/add-symbols.njk +4 -4
  3. package/assets/templates/draw-tools.njk +7 -7
  4. package/assets/templates/marker-panel.njk +5 -5
  5. package/assets/templates/place-marker.njk +8 -8
  6. package/assets/templates/search-control.njk +1 -1
  7. package/assets/templates/select-feature.njk +7 -7
  8. package/assets/templates/style-switcher.njk +6 -6
  9. package/assets/templates/toggle-marker-label.njk +3 -3
  10. package/dist/esm/im-core.js +1 -1
  11. package/dist/esm/im-shell.js +1 -1
  12. package/dist/esm/index.js +1 -1
  13. package/dist/umd/im-core.js +1 -1
  14. package/dist/umd/im-core.js.LICENSE.txt +0 -30
  15. package/dist/umd/index.js +1 -1
  16. package/dist/umd/index.js.LICENSE.txt +0 -20
  17. package/docs/api/context.md +2 -0
  18. package/docs/api.md +20 -14
  19. package/docs/architecture/interactive-map.likec4 +4 -4
  20. package/docs/building-a-plugin.md +2 -2
  21. package/docs/examples/add-marker-with-panel.mdx +46 -44
  22. package/docs/examples/add-polygons.mdx +100 -98
  23. package/docs/examples/add-symbols.mdx +75 -73
  24. package/docs/examples/basic-map.mdx +16 -14
  25. package/docs/examples/button-map.mdx +16 -14
  26. package/docs/examples/draw-tools.mdx +119 -117
  27. package/docs/examples/place-marker.mdx +51 -49
  28. package/docs/examples/search-control.mdx +22 -20
  29. package/docs/examples/select-feature.mdx +107 -105
  30. package/docs/examples/style-switcher.mdx +47 -45
  31. package/docs/examples/toggle-marker-label.mdx +30 -28
  32. package/docs/getting-started.md +26 -24
  33. package/docs/plugins/datasets.md +11 -0
  34. package/docs/plugins/draw.md +18 -12
  35. package/docs/plugins/interact.md +33 -10
  36. package/docs/plugins/plugin-descriptor.md +1 -1
  37. package/docs/plugins/search.md +5 -5
  38. package/docusaurus.config.cjs +48 -3
  39. package/govuk-prototype-kit.config.json +6 -7
  40. package/package.json +22 -29
  41. package/plugins/datasets/dist/esm/im-datasets-esri-adapter.js +1 -1
  42. package/plugins/datasets/dist/esm/im-datasets-ml-adapter.js +1 -1
  43. package/plugins/datasets/dist/esm/im-datasets-ol-adapter.js +1 -1
  44. package/plugins/datasets/dist/esm/im-datasets-plugin.js +1 -1
  45. package/plugins/datasets/dist/esm/index.js +1 -1
  46. package/plugins/datasets/dist/esm/layerAdapter.js +1 -1
  47. package/plugins/datasets/dist/esm/mapboxStyleLayerAdapter.js +1 -1
  48. package/plugins/datasets/dist/umd/im-datasets-ml-adapter.js +1 -1
  49. package/plugins/datasets/dist/umd/im-datasets-ol-adapter.js +1 -1
  50. package/plugins/datasets/dist/umd/im-datasets-plugin.js +1 -1
  51. package/plugins/datasets/dist/umd/index.js +1 -1
  52. package/plugins/datasets/src/adapters/esri/esriLayerAdapter.js +18 -16
  53. package/plugins/datasets/src/adapters/esri/esriLayerAdapter.test.js +2 -2
  54. package/plugins/datasets/src/adapters/esri/registry/esriDataset.js +2 -3
  55. package/plugins/datasets/src/adapters/esri/registry/esriDataset.test.js +1 -1
  56. package/plugins/datasets/src/adapters/loadLayerAdapter.js +2 -20
  57. package/plugins/datasets/src/adapters/loadLayerAdapter.test.js +9 -9
  58. package/plugins/datasets/src/adapters/mapboxStyleLayerAdapter.js +7 -7
  59. package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.js +19 -19
  60. package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.test.js +1 -1
  61. package/plugins/datasets/src/adapters/maplibre/registry/mapLibreDataset.test.js +1 -1
  62. package/plugins/datasets/src/adapters/openlayers/canvasPatternStyle.test.js +2 -2
  63. package/plugins/datasets/src/adapters/openlayers/layerBuilders.test.js +1 -1
  64. package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.js +21 -21
  65. package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.test.js +5 -5
  66. package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.js +2 -3
  67. package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.test.js +2 -2
  68. package/plugins/datasets/src/api/getOpacity.js +1 -2
  69. package/plugins/datasets/src/api/getOpacity.test.js +9 -12
  70. package/plugins/datasets/src/api/getStyle.js +1 -2
  71. package/plugins/datasets/src/api/getStyle.test.js +5 -8
  72. package/plugins/datasets/src/api/removeDataset.js +2 -4
  73. package/plugins/datasets/src/api/removeDataset.test.js +5 -10
  74. package/plugins/datasets/src/api/setData.js +2 -4
  75. package/plugins/datasets/src/api/setData.test.js +6 -14
  76. package/plugins/datasets/src/api/setFeatureVisibility.js +1 -2
  77. package/plugins/datasets/src/api/setFeatureVisibility.test.js +8 -11
  78. package/plugins/datasets/src/components/LayersMenu/LayersMenu.jsx +1 -0
  79. package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.jsx +1 -3
  80. package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.test.jsx +13 -18
  81. package/plugins/datasets/src/index.js +2 -2
  82. package/plugins/datasets/src/index.test.js +8 -1
  83. package/plugins/datasets/src/initialise/DatasetsInit.jsx +48 -26
  84. package/plugins/datasets/src/initialise/DatasetsInit.test.jsx +160 -89
  85. package/plugins/datasets/src/initialise/initialiseDatasets.js +2 -3
  86. package/plugins/datasets/src/initialise/initialiseDatasets.test.js +23 -10
  87. package/plugins/datasets/src/manifest.js +53 -44
  88. package/plugins/datasets/src/manifest.test.js +36 -4
  89. package/plugins/datasets/src/reducers/pluginState.js +5 -5
  90. package/plugins/datasets/src/reducers/pluginState.test.js +21 -20
  91. package/plugins/datasets/src/registry/__mocks__/datasetRegistry.js +7 -6
  92. package/plugins/datasets/src/registry/createDataset.js +2 -2
  93. package/plugins/datasets/src/registry/dataset.js +9 -10
  94. package/plugins/datasets/src/registry/dataset.test.js +63 -64
  95. package/plugins/datasets/src/registry/datasetRegistry.js +39 -10
  96. package/plugins/datasets/src/registry/datasetRegistry.test.js +83 -1
  97. package/plugins/datasets/src/registry/globalDataset.js +9 -17
  98. package/plugins/datasets/src/registry/isVisibleWhen.js +9 -17
  99. package/plugins/datasets/src/registry/isVisibleWhen.test.js +27 -20
  100. package/plugins/datasets/src/registry/mapboxStyleDataset.test.js +26 -27
  101. package/plugins/datasets/src/utils/hasLayersMenu.js +13 -0
  102. package/plugins/datasets/src/utils/hasLayersMenu.test.js +25 -0
  103. package/plugins/draw/dist/esm/im-draw-ml-adapter.js +1 -1
  104. package/plugins/draw/dist/esm/im-draw-ol-adapter.js +1 -1
  105. package/plugins/draw/dist/esm/im-draw-plugin.js +1 -1
  106. package/plugins/draw/dist/esm/index.js +1 -1
  107. package/plugins/draw/dist/esm/liveDrawChecks.js +1 -1
  108. package/plugins/draw/dist/umd/im-draw-ml-adapter.js +1 -1
  109. package/plugins/draw/dist/umd/im-draw-ol-adapter.js +1 -1
  110. package/plugins/draw/dist/umd/im-draw-plugin.js +1 -1
  111. package/plugins/draw/dist/umd/index.js +1 -1
  112. package/plugins/draw/src/DrawInit.jsx +47 -26
  113. package/plugins/draw/src/DrawInit.test.jsx +90 -2
  114. package/plugins/draw/src/adapters/maplibre/styles.js +3 -2
  115. package/plugins/draw/src/adapters/maplibre/styles.test.js +3 -3
  116. package/plugins/draw/src/adapters/openlayers/core/styles.test.js +1 -1
  117. package/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js +1 -1
  118. package/plugins/draw/src/manifest.js +3 -2
  119. package/plugins/draw/src/manifest.test.js +13 -1
  120. package/plugins/draw/src/utils/needsDrawTarget.js +22 -0
  121. package/plugins/draw/src/utils/needsDrawTarget.test.js +42 -0
  122. package/plugins/draw-es/dist/esm/im-draw-es-plugin.js +1 -0
  123. package/plugins/draw-es/dist/esm/index.js +1 -0
  124. package/plugins/{beta/draw-es → draw-es}/src/DrawInit.jsx +1 -1
  125. package/plugins/{beta/draw-es → draw-es}/src/events.test.js +1 -1
  126. package/plugins/{beta/draw-es → draw-es}/src/graphic.js +1 -1
  127. package/plugins/frame/dist/esm/im-frame-plugin.js +1 -0
  128. package/plugins/frame/dist/esm/index.js +1 -0
  129. package/plugins/frame/dist/umd/im-frame-plugin.js +1 -0
  130. package/plugins/frame/dist/umd/index.js +2 -0
  131. package/plugins/{beta/frame → frame}/package.json +2 -2
  132. package/plugins/interact/dist/esm/im-interact-plugin.js +1 -1
  133. package/plugins/interact/dist/esm/index.js +1 -1
  134. package/plugins/interact/dist/umd/im-interact-plugin.js +1 -1
  135. package/plugins/interact/dist/umd/index.js +1 -1
  136. package/plugins/interact/src/InteractInit.jsx +3 -3
  137. package/plugins/interact/src/api/enable.test.js +13 -0
  138. package/plugins/interact/src/defaults.js +1 -0
  139. package/plugins/interact/src/hooks/useCrossHairVisibility.js +27 -17
  140. package/plugins/interact/src/hooks/useCrossHairVisibility.test.js +72 -7
  141. package/plugins/interact/src/manifest.js +4 -4
  142. package/plugins/interact/src/manifest.test.js +29 -0
  143. package/plugins/interact/src/reducer.js +7 -2
  144. package/plugins/interact/src/reducer.test.js +12 -2
  145. package/plugins/interact/src/utils/needsTarget.js +20 -0
  146. package/plugins/interact/src/utils/needsTarget.test.js +36 -0
  147. package/plugins/map-key/dist/esm/im-map-key-plugin.js +1 -1
  148. package/plugins/map-key/dist/esm/index.js +1 -1
  149. package/plugins/map-key/dist/umd/im-map-key-plugin.js +1 -1
  150. package/plugins/map-key/dist/umd/index.js +1 -1
  151. package/plugins/map-key/src/components/Key/KeySvgSymbol.jsx +4 -0
  152. package/plugins/map-key/src/components/Key/MapKey.jsx +15 -15
  153. package/plugins/map-key/src/components/Key/MapKey.test.jsx +29 -15
  154. package/plugins/map-key/src/initialise/MapKeyInit.jsx +5 -8
  155. package/plugins/map-key/src/initialise/MapKeyInit.test.jsx +9 -7
  156. package/plugins/map-key/src/manifest.test.js +0 -1
  157. package/plugins/map-key/src/reducers/mergeKeyGroupItems.js +14 -33
  158. package/plugins/map-key/src/reducers/mergeKeyGroupItems.test.js +34 -50
  159. package/plugins/map-key/src/reducers/pluginState.js +6 -1
  160. package/plugins/map-key/src/reducers/pluginState.test.js +13 -4
  161. package/plugins/map-styles/dist/esm/im-map-styles-plugin.js +1 -0
  162. package/plugins/map-styles/dist/esm/index.js +1 -0
  163. package/plugins/map-styles/dist/umd/im-map-styles-plugin.js +1 -0
  164. package/plugins/map-styles/dist/umd/index.js +2 -0
  165. package/plugins/{beta/map-styles → map-styles}/src/MapStyles.jsx +2 -2
  166. package/plugins/{beta/map-styles → map-styles}/src/MapStylesInit.jsx +1 -1
  167. package/plugins/menu/dist/esm/im-menu-plugin.js +1 -1
  168. package/plugins/menu/dist/esm/index.js +1 -1
  169. package/plugins/menu/dist/umd/im-menu-plugin.js +1 -1
  170. package/plugins/menu/dist/umd/index.js +1 -1
  171. package/plugins/scale-bar/dist/esm/im-scale-bar-plugin.js +1 -0
  172. package/plugins/scale-bar/dist/esm/index.js +1 -0
  173. package/plugins/scale-bar/dist/umd/im-scale-bar-plugin.js +1 -0
  174. package/plugins/scale-bar/dist/umd/index.js +2 -0
  175. package/plugins/{beta/scale-bar → scale-bar}/package.json +2 -2
  176. package/plugins/search/dist/esm/im-search-plugin.js +1 -1
  177. package/plugins/search/dist/esm/index.js +1 -1
  178. package/plugins/search/dist/umd/im-search-plugin.js +1 -1
  179. package/plugins/search/dist/umd/index.js +1 -1
  180. package/plugins/search/src/components/Suggestions/Suggestions.jsx +3 -1
  181. package/plugins/search/src/components/Suggestions/Suggestions.test.jsx +11 -0
  182. package/plugins/search/src/utils/markedToElements.jsx +25 -0
  183. package/plugins/search/src/utils/markedToElements.test.jsx +49 -0
  184. package/plugins/search/src/utils/parseOsNamesResults.js +6 -4
  185. package/plugins/search/src/utils/parseOsNamesResults.test.js +18 -0
  186. package/plugins/use-location/dist/esm/im-use-location-plugin.js +1 -0
  187. package/plugins/use-location/dist/esm/index.js +1 -0
  188. package/plugins/use-location/dist/umd/im-use-location-plugin.js +1 -0
  189. package/plugins/use-location/dist/umd/index.js +2 -0
  190. package/providers/esri/dist/esm/im-esri-provider.js +1 -0
  191. package/providers/esri/dist/esm/index.js +1 -0
  192. package/providers/{beta/esri → esri}/src/esriProvider.js +1 -1
  193. package/providers/{beta/esri → esri}/src/mapEvents.js +2 -2
  194. package/providers/maplibre/dist/esm/im-maplibre-provider.js +1 -1
  195. package/providers/maplibre/dist/esm/index.js +1 -1
  196. package/providers/maplibre/dist/umd/im-maplibre-framework.js +1 -1
  197. package/providers/maplibre/dist/umd/im-maplibre-framework.js.LICENSE.txt +3 -3
  198. package/providers/maplibre/dist/umd/im-maplibre-provider.js +1 -1
  199. package/providers/maplibre/dist/umd/im-maplibre-worker.js +2 -0
  200. package/providers/maplibre/dist/umd/im-maplibre-worker.js.LICENSE.txt +4 -0
  201. package/providers/maplibre/dist/umd/index.js +1 -1
  202. package/providers/maplibre/src/index.js +41 -12
  203. package/providers/maplibre/src/index.test.js +43 -12
  204. package/providers/maplibre/src/utils/detectModuleWorker.js +25 -0
  205. package/providers/maplibre/src/utils/detectModuleWorker.test.js +40 -0
  206. package/providers/maplibre/src/utils/spatial.js +22 -12
  207. package/providers/maplibre/src/utils/spatial.test.js +6 -6
  208. package/providers/maplibre/src/utils/workerUrl.js +15 -0
  209. package/providers/maplibre/src/utils/workerUrl.test.js +14 -0
  210. package/providers/open-names/dist/esm/im-reverse-geocode.js +1 -0
  211. package/providers/open-names/dist/esm/index.js +1 -0
  212. package/providers/open-names/dist/umd/im-reverse-geocode.js +2 -0
  213. package/providers/open-names/dist/umd/index.js +2 -0
  214. package/providers/openlayers/dist/esm/im-openlayers-provider.js +1 -0
  215. package/providers/openlayers/dist/esm/index.js +1 -0
  216. package/providers/openlayers/dist/umd/im-openlayers-provider.js +2 -0
  217. package/providers/openlayers/dist/umd/index.js +2 -0
  218. package/providers/openlayers/src/index.js +60 -0
  219. package/providers/openlayers/src/index.test.js +47 -0
  220. package/providers/{beta/openlayers → openlayers}/src/mapEvents.js +2 -2
  221. package/providers/{beta/openlayers → openlayers}/src/mapEvents.test.js +2 -2
  222. package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.js +3 -3
  223. package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.js +1 -1
  224. package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.js +1 -1
  225. package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.js +1 -1
  226. package/rollup.esm.mjs +79 -46
  227. package/sonar-project.properties +1 -1
  228. package/src/App/App.jsx +4 -1
  229. package/src/App/App.test.jsx +6 -0
  230. package/src/App/renderer/PluginInits.jsx +8 -7
  231. package/src/App/renderer/PluginInits.test.jsx +20 -5
  232. package/src/App/renderer/SlotItemsProvider.jsx +33 -0
  233. package/src/App/renderer/SlotItemsProvider.test.jsx +59 -0
  234. package/src/App/renderer/SlotRenderer.jsx +3 -14
  235. package/src/App/renderer/SlotRenderer.test.jsx +11 -44
  236. package/src/App/renderer/mapButtons.js +22 -11
  237. package/src/App/renderer/mapButtons.test.js +23 -1
  238. package/src/App/renderer/mapControls.js +6 -8
  239. package/src/App/renderer/mapControls.test.js +10 -0
  240. package/src/App/renderer/mapPanels.js +16 -19
  241. package/src/App/renderer/mapPanels.test.js +37 -9
  242. package/src/App/renderer/pluginWrapper.js +10 -8
  243. package/src/App/renderer/pluginWrapper.test.js +23 -9
  244. package/src/App/renderer/slotAggregator.js +18 -5
  245. package/src/App/renderer/slotAggregator.test.js +68 -25
  246. package/src/App/renderer/slotHelpers.js +13 -0
  247. package/src/App/renderer/slotHelpers.test.js +16 -1
  248. package/src/App/store/AppProvider.jsx +19 -1
  249. package/src/App/store/AppProvider.test.jsx +41 -0
  250. package/src/App/store/appActionsMap.js +10 -1
  251. package/src/App/store/appActionsMap.test.js +21 -0
  252. package/src/App/store/appDispatchMiddleware.js +29 -17
  253. package/src/App/store/appDispatchMiddleware.test.js +31 -0
  254. package/src/InteractiveMap/InteractiveMap.js +2 -1
  255. package/src/InteractiveMap/InteractiveMap.test.js +9 -2
  256. package/src/InteractiveMap/domStateManager.js +21 -1
  257. package/src/InteractiveMap/domStateManager.test.js +48 -1
  258. package/src/InteractiveMap/parseDataProperties.js +4 -4
  259. package/src/InteractiveMap/parseDataProperties.test.js +62 -6
  260. package/src/InteractiveMap/polyfills.js +4 -3
  261. package/src/InteractiveMap/polyfills.test.js +12 -0
  262. package/src/config/events.js +4 -2
  263. package/src/scss/tools/_govuk-content.scss +4 -3
  264. package/src/types.js +3 -5
  265. package/webpack.dev.mjs +11 -3
  266. package/webpack.prod.mjs +11 -4
  267. package/webpack.umd.mjs +34 -14
  268. package/plugins/beta/draw-es/dist/esm/im-draw-es-plugin.js +0 -1
  269. package/plugins/beta/draw-es/dist/esm/index.js +0 -1
  270. package/plugins/beta/draw-ml/dist/esm/im-draw-ml-plugin.js +0 -1
  271. package/plugins/beta/draw-ml/dist/esm/index.js +0 -1
  272. package/plugins/beta/draw-ml/dist/umd/im-draw-ml-plugin.js +0 -1
  273. package/plugins/beta/draw-ml/dist/umd/index.js +0 -2
  274. package/plugins/beta/draw-ml/src/DrawInit.jsx +0 -85
  275. package/plugins/beta/draw-ml/src/api/addFeature.js +0 -27
  276. package/plugins/beta/draw-ml/src/api/deleteFeature.js +0 -13
  277. package/plugins/beta/draw-ml/src/api/editFeature.js +0 -75
  278. package/plugins/beta/draw-ml/src/api/merge.js +0 -9
  279. package/plugins/beta/draw-ml/src/api/newLine.js +0 -68
  280. package/plugins/beta/draw-ml/src/api/newPolygon.js +0 -68
  281. package/plugins/beta/draw-ml/src/api/split.js +0 -81
  282. package/plugins/beta/draw-ml/src/defaults.js +0 -17
  283. package/plugins/beta/draw-ml/src/draw.scss +0 -26
  284. package/plugins/beta/draw-ml/src/events.js +0 -185
  285. package/plugins/beta/draw-ml/src/index.js +0 -13
  286. package/plugins/beta/draw-ml/src/manifest.js +0 -110
  287. package/plugins/beta/draw-ml/src/mapboxDraw.js +0 -143
  288. package/plugins/beta/draw-ml/src/mapboxSnap.js +0 -321
  289. package/plugins/beta/draw-ml/src/modes/createDrawMode.js +0 -552
  290. package/plugins/beta/draw-ml/src/modes/disabledMode.js +0 -23
  291. package/plugins/beta/draw-ml/src/modes/drawLineMode.js +0 -18
  292. package/plugins/beta/draw-ml/src/modes/drawPolygonMode.js +0 -16
  293. package/plugins/beta/draw-ml/src/modes/editVertex/geometryHelpers.js +0 -135
  294. package/plugins/beta/draw-ml/src/modes/editVertex/helpers.js +0 -2
  295. package/plugins/beta/draw-ml/src/modes/editVertex/touchHandlers.js +0 -142
  296. package/plugins/beta/draw-ml/src/modes/editVertex/undoHandlers.js +0 -133
  297. package/plugins/beta/draw-ml/src/modes/editVertex/vertexOperations.js +0 -142
  298. package/plugins/beta/draw-ml/src/modes/editVertex/vertexQueries.js +0 -121
  299. package/plugins/beta/draw-ml/src/modes/editVertexMode.js +0 -495
  300. package/plugins/beta/draw-ml/src/reducer.js +0 -90
  301. package/plugins/beta/draw-ml/src/styles.js +0 -190
  302. package/plugins/beta/draw-ml/src/undoStack.js +0 -50
  303. package/plugins/beta/draw-ml/src/utils/debounce.js +0 -16
  304. package/plugins/beta/draw-ml/src/utils/flattenStyleProperties.js +0 -49
  305. package/plugins/beta/draw-ml/src/utils/snapHelpers.js +0 -200
  306. package/plugins/beta/draw-ml/src/utils/spatial.js +0 -258
  307. package/plugins/beta/draw-ol/dist/css/index.css +0 -1
  308. package/plugins/beta/draw-ol/dist/esm/DrawMode.js +0 -1
  309. package/plugins/beta/draw-ol/dist/esm/EditMode.js +0 -1
  310. package/plugins/beta/draw-ol/dist/esm/geometryHelpers.js +0 -1
  311. package/plugins/beta/draw-ol/dist/esm/im-draw-ol-plugin.js +0 -1
  312. package/plugins/beta/draw-ol/dist/esm/index.js +0 -1
  313. package/plugins/beta/draw-ol/src/DrawInit.jsx +0 -65
  314. package/plugins/beta/draw-ol/src/api/addFeature.js +0 -29
  315. package/plugins/beta/draw-ol/src/api/deleteFeature.js +0 -11
  316. package/plugins/beta/draw-ol/src/api/editFeature.js +0 -50
  317. package/plugins/beta/draw-ol/src/api/newLine.js +0 -44
  318. package/plugins/beta/draw-ol/src/api/newPolygon.js +0 -44
  319. package/plugins/beta/draw-ol/src/core/OLDrawManager.js +0 -153
  320. package/plugins/beta/draw-ol/src/core/featureStore.js +0 -65
  321. package/plugins/beta/draw-ol/src/core/styles.js +0 -98
  322. package/plugins/beta/draw-ol/src/core/undoStack.js +0 -31
  323. package/plugins/beta/draw-ol/src/defaults.js +0 -16
  324. package/plugins/beta/draw-ol/src/draw/DrawMode.js +0 -121
  325. package/plugins/beta/draw-ol/src/draw/drawInput.js +0 -243
  326. package/plugins/beta/draw-ol/src/draw.scss +0 -17
  327. package/plugins/beta/draw-ol/src/edit/EditMode.js +0 -424
  328. package/plugins/beta/draw-ol/src/edit/keyboardHandler.js +0 -229
  329. package/plugins/beta/draw-ol/src/edit/midpointLayer.js +0 -57
  330. package/plugins/beta/draw-ol/src/edit/touchHandler.js +0 -171
  331. package/plugins/beta/draw-ol/src/edit/undoOps.js +0 -95
  332. package/plugins/beta/draw-ol/src/edit/vertexHitTest.js +0 -72
  333. package/plugins/beta/draw-ol/src/edit/vertexLayer.js +0 -49
  334. package/plugins/beta/draw-ol/src/edit/vertexOps.js +0 -99
  335. package/plugins/beta/draw-ol/src/events.js +0 -114
  336. package/plugins/beta/draw-ol/src/index.js +0 -12
  337. package/plugins/beta/draw-ol/src/manifest.js +0 -125
  338. package/plugins/beta/draw-ol/src/olDraw.js +0 -38
  339. package/plugins/beta/draw-ol/src/reducer.js +0 -41
  340. package/plugins/beta/draw-ol/src/snap/snapEngine.js +0 -153
  341. package/plugins/beta/draw-ol/src/snap/snapGeometry.js +0 -177
  342. package/plugins/beta/draw-ol/src/snap/snapIndicator.js +0 -81
  343. package/plugins/beta/draw-ol/src/snap/snapInteraction.js +0 -57
  344. package/plugins/beta/draw-ol/src/snap/snapManager.js +0 -99
  345. package/plugins/beta/draw-ol/src/utils/flattenStyleProperties.js +0 -47
  346. package/plugins/beta/draw-ol/src/utils/geometryHelpers.js +0 -103
  347. package/plugins/beta/draw-ol/src/utils/olCoords.js +0 -35
  348. package/plugins/beta/draw-ol/src/utils/resolveColors.js +0 -39
  349. package/plugins/beta/draw-ol/src/utils/spatial.js +0 -24
  350. package/plugins/beta/draw-ol/src/utils/touchTarget.js +0 -61
  351. package/plugins/beta/frame/dist/esm/im-frame-plugin.js +0 -1
  352. package/plugins/beta/frame/dist/esm/index.js +0 -1
  353. package/plugins/beta/frame/dist/umd/im-frame-plugin.js +0 -1
  354. package/plugins/beta/frame/dist/umd/index.js +0 -2
  355. package/plugins/beta/map-styles/dist/esm/im-map-styles-plugin.js +0 -1
  356. package/plugins/beta/map-styles/dist/esm/index.js +0 -1
  357. package/plugins/beta/map-styles/dist/umd/im-map-styles-plugin.js +0 -1
  358. package/plugins/beta/map-styles/dist/umd/index.js +0 -2
  359. package/plugins/beta/scale-bar/dist/esm/im-scale-bar-plugin.js +0 -1
  360. package/plugins/beta/scale-bar/dist/esm/index.js +0 -1
  361. package/plugins/beta/scale-bar/dist/umd/im-scale-bar-plugin.js +0 -1
  362. package/plugins/beta/scale-bar/dist/umd/index.js +0 -2
  363. package/plugins/beta/use-location/dist/esm/im-use-location-plugin.js +0 -1
  364. package/plugins/beta/use-location/dist/esm/index.js +0 -1
  365. package/plugins/beta/use-location/dist/umd/im-use-location-plugin.js +0 -1
  366. package/plugins/beta/use-location/dist/umd/index.js +0 -2
  367. package/plugins/map-key/src/registry/getDatasetRegistry.js +0 -6
  368. package/plugins/map-key/src/registry/getDatasetRegistry.test.js +0 -23
  369. package/plugins/map-key/src/registry/index.js +0 -1
  370. package/plugins/map-key/src/registry/index.test.js +0 -7
  371. package/providers/beta/esri/dist/esm/im-esri-provider.js +0 -1
  372. package/providers/beta/esri/dist/esm/index.js +0 -1
  373. package/providers/beta/open-names/dist/esm/im-reverse-geocode.js +0 -1
  374. package/providers/beta/open-names/dist/esm/index.js +0 -1
  375. package/providers/beta/open-names/dist/umd/im-reverse-geocode.js +0 -2
  376. package/providers/beta/open-names/dist/umd/index.js +0 -2
  377. package/providers/beta/openlayers/dist/esm/im-openlayers-provider.js +0 -1
  378. package/providers/beta/openlayers/dist/esm/index.js +0 -1
  379. package/providers/beta/openlayers/dist/umd/im-openlayers-provider.js +0 -2
  380. package/providers/beta/openlayers/dist/umd/index.js +0 -2
  381. package/providers/beta/openlayers/dist/umd/index.js.LICENSE.txt +0 -1
  382. package/providers/beta/openlayers/src/index.js +0 -37
  383. /package/plugins/{beta/draw-es → draw-es}/src/api/addFeature.js +0 -0
  384. /package/plugins/{beta/draw-es → draw-es}/src/api/deleteFeature.js +0 -0
  385. /package/plugins/{beta/draw-es → draw-es}/src/api/editFeature.js +0 -0
  386. /package/plugins/{beta/draw-es → draw-es}/src/api/newPolygon.js +0 -0
  387. /package/plugins/{beta/draw-es → draw-es}/src/api/removeSafeZone.js +0 -0
  388. /package/plugins/{beta/draw-es → draw-es}/src/events.js +0 -0
  389. /package/plugins/{beta/draw-es → draw-es}/src/index.js +0 -0
  390. /package/plugins/{beta/draw-es → draw-es}/src/manifest.js +0 -0
  391. /package/plugins/{beta/draw-es → draw-es}/src/reducer.js +0 -0
  392. /package/plugins/{beta/draw-es → draw-es}/src/sketchViewModel.js +0 -0
  393. /package/plugins/{beta/frame → frame}/dist/css/index.css +0 -0
  394. /package/plugins/{beta/draw-ml → frame}/dist/umd/index.js.LICENSE.txt +0 -0
  395. /package/plugins/{beta/frame → frame}/src/Frame.jsx +0 -0
  396. /package/plugins/{beta/frame → frame}/src/FrameInit.jsx +0 -0
  397. /package/plugins/{beta/frame → frame}/src/api/addFrame.js +0 -0
  398. /package/plugins/{beta/frame → frame}/src/api/editFeature.js +0 -0
  399. /package/plugins/{beta/frame → frame}/src/config.js +0 -0
  400. /package/plugins/{beta/frame → frame}/src/frame.scss +0 -0
  401. /package/plugins/{beta/frame → frame}/src/index.js +0 -0
  402. /package/plugins/{beta/frame → frame}/src/manifest.js +0 -0
  403. /package/plugins/{beta/frame → frame}/src/reducer.js +0 -0
  404. /package/plugins/{beta/frame → frame}/src/utils.js +0 -0
  405. /package/plugins/{beta/map-styles → map-styles}/dist/css/index.css +0 -0
  406. /package/plugins/{beta/frame → map-styles}/dist/umd/index.js.LICENSE.txt +0 -0
  407. /package/plugins/{beta/map-styles → map-styles}/src/config.js +0 -0
  408. /package/plugins/{beta/map-styles → map-styles}/src/index.js +0 -0
  409. /package/plugins/{beta/map-styles → map-styles}/src/manifest.js +0 -0
  410. /package/plugins/{beta/map-styles → map-styles}/src/mapStyles.scss +0 -0
  411. /package/plugins/{beta/scale-bar → scale-bar}/dist/css/index.css +0 -0
  412. /package/plugins/{beta/map-styles → scale-bar}/dist/umd/index.js.LICENSE.txt +0 -0
  413. /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.jsx +0 -0
  414. /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.test.jsx +0 -0
  415. /package/plugins/{beta/scale-bar → scale-bar}/src/index.js +0 -0
  416. /package/plugins/{beta/scale-bar → scale-bar}/src/index.test.js +0 -0
  417. /package/plugins/{beta/scale-bar → scale-bar}/src/manifest.js +0 -0
  418. /package/plugins/{beta/scale-bar → scale-bar}/src/scaleBar.scss +0 -0
  419. /package/plugins/{beta/scale-bar → scale-bar}/src/utils.js +0 -0
  420. /package/plugins/{beta/scale-bar → scale-bar}/src/utils.test.js +0 -0
  421. /package/plugins/{beta/scale-bar → use-location}/dist/umd/index.js.LICENSE.txt +0 -0
  422. /package/plugins/{beta/use-location → use-location}/src/UseLocation.jsx +0 -0
  423. /package/plugins/{beta/use-location → use-location}/src/UseLocationInit.jsx +0 -0
  424. /package/plugins/{beta/use-location → use-location}/src/defaults.js +0 -0
  425. /package/plugins/{beta/use-location → use-location}/src/events.js +0 -0
  426. /package/plugins/{beta/use-location → use-location}/src/index.js +0 -0
  427. /package/plugins/{beta/use-location → use-location}/src/manifest.js +0 -0
  428. /package/plugins/{beta/use-location → use-location}/src/reducer.js +0 -0
  429. /package/providers/{beta/esri → esri}/dist/css/index.css +0 -0
  430. /package/providers/{beta/esri → esri}/src/appEvents.js +0 -0
  431. /package/providers/{beta/esri → esri}/src/defaults.js +0 -0
  432. /package/providers/{beta/esri → esri}/src/esriProvider.scss +0 -0
  433. /package/providers/{beta/esri → esri}/src/index.js +0 -0
  434. /package/providers/{beta/esri → esri}/src/utils/coords.js +0 -0
  435. /package/providers/{beta/esri → esri}/src/utils/coords.test.js +0 -0
  436. /package/providers/{beta/esri → esri}/src/utils/detectWebGL.js +0 -0
  437. /package/providers/{beta/esri → esri}/src/utils/esriFixes.js +0 -0
  438. /package/providers/{beta/esri → esri}/src/utils/query.js +0 -0
  439. /package/providers/{beta/esri → esri}/src/utils/spatial.js +0 -0
  440. /package/providers/{beta/esri → esri}/src/utils/spatial.test.js +0 -0
  441. /package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js.LICENSE.txt +0 -0
  442. /package/{plugins/beta/use-location → providers/open-names}/dist/umd/index.js.LICENSE.txt +0 -0
  443. /package/providers/{beta/open-names → open-names}/src/index.js +0 -0
  444. /package/providers/{beta/open-names → open-names}/src/reverseGeocode.js +0 -0
  445. /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.js +0 -0
  446. /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.test.js +0 -0
  447. /package/providers/{beta/openlayers → openlayers}/dist/umd/im-openlayers-provider.js.LICENSE.txt +0 -0
  448. /package/providers/{beta/open-names → openlayers}/dist/umd/index.js.LICENSE.txt +0 -0
  449. /package/providers/{beta/openlayers → openlayers}/src/appEvents.js +0 -0
  450. /package/providers/{beta/openlayers → openlayers}/src/appEvents.test.js +0 -0
  451. /package/providers/{beta/openlayers → openlayers}/src/defaults.js +0 -0
  452. /package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.test.js +0 -0
  453. /package/providers/{beta/openlayers → openlayers}/src/utils/bngProjection.js +0 -0
  454. /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.js +0 -0
  455. /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.test.js +0 -0
  456. /package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.test.js +0 -0
  457. /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.js +0 -0
  458. /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.test.js +0 -0
  459. /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.js +0 -0
  460. /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.test.js +0 -0
  461. /package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.test.js +0 -0
  462. /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.js +0 -0
  463. /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.test.js +0 -0
  464. /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.js +0 -0
  465. /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.test.js +0 -0
  466. /package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.test.js +0 -0
  467. /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.js +0 -0
  468. /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.test.js +0 -0
  469. /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.js +0 -0
  470. /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.test.js +0 -0
  471. /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.js +0 -0
  472. /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,47 @@ 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
+ focusMap: jest.fn(),
59
+ symbolRegistry: {},
60
+ patternRegistry: {}
61
+ },
62
+ ...overrides
63
+ }
64
+ }
60
65
 
61
66
  describe('DatasetsInit', () => {
62
67
  let adapter
@@ -73,54 +78,79 @@ describe('DatasetsInit', () => {
73
78
  expect(container.firstChild).toBeNull()
74
79
  })
75
80
 
76
- // ─── hasMenu / panel removal ─────────────────────────────────────────────────
77
-
78
81
  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
- )
82
+ const openPanelState = { openPanels: { datasetsLayers: {} } }
83
+ let panelEl
84
+
85
+ beforeEach(() => {
86
+ jest.useFakeTimers()
87
+ panelEl = document.createElement('div')
88
+ panelEl.id = 'test-map-panel-datasets-layers'
89
+ panelEl.tabIndex = -1
90
+ document.body.appendChild(panelEl)
90
91
  })
91
92
 
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
- )
93
+ afterEach(() => {
94
+ panelEl.remove()
95
+ jest.useRealTimers()
98
96
  })
99
97
 
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
- )
98
+ it('does not remove the panel or hide the button when there is no menu', () => {
99
+ const props = makeProps({ pluginConfig: { datasets: [] } })
100
+ render(<DatasetsInit {...props} />)
101
+ expect(props.services.eventBus.emitWhenReady).not.toHaveBeenCalled()
102
+ expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.APP_REMOVE_PANEL, expect.anything())
103
+ expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.APP_TOGGLE_BUTTON_STATE, expect.anything())
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('closes the open panel and focuses the map when the menu empties with focus inside it', () => {
107
+ const props = makeProps({ appState: openPanelState })
108
+ const { eventBus, focusMap } = props.services
109
+ const { rerender } = render(<DatasetsInit {...props} />)
110
+ panelEl.focus()
111
+
112
+ rerender(<DatasetsInit {...props} pluginState={makePluginState()} />)
113
+ expect(eventBus.emit).toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
114
+ expect(focusMap).not.toHaveBeenCalled()
115
+ act(() => jest.runOnlyPendingTimers())
116
+ expect(focusMap).toHaveBeenCalledTimes(1)
117
+ })
118
+
119
+ it('closes the open panel without moving focus when focus is outside it', () => {
120
+ const props = makeProps({ appState: openPanelState })
121
+ const { eventBus, focusMap } = props.services
122
+ const { rerender } = render(<DatasetsInit {...props} />)
123
+
124
+ rerender(<DatasetsInit {...props} pluginState={makePluginState()} />)
125
+ act(() => jest.runOnlyPendingTimers())
126
+ expect(eventBus.emit).toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
127
+ expect(focusMap).not.toHaveBeenCalled()
128
+ })
129
+
130
+ it('closes a panel that is open on load when there is no menu', () => {
131
+ const props = makeProps({ pluginConfig: { datasets: [] }, appState: openPanelState })
132
+ render(<DatasetsInit {...props} />)
133
+ expect(props.services.eventBus.emit).toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
134
+ })
135
+
136
+ it.each([
137
+ ['the panel is closed', {}, makePluginState()],
138
+ ['menu datasets remain', openPanelState.openPanels, makePluginState({ menu: [{ id: 'roads' }] })],
139
+ ['the live menu is still loading', openPanelState.openPanels, makePluginState({ menuInitialised: false })]
140
+ ])('leaves the panel alone when %s', (_, openPanels, pluginState) => {
141
+ const props = makeProps({ appState: { openPanels } })
142
+ render(<DatasetsInit {...props} pluginState={pluginState} />)
143
+ expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.APP_HIDE_PANEL, 'datasetsLayers')
144
+ })
145
+
146
+ it('cancels a pending map focus on unmount', () => {
147
+ const props = makeProps({ appState: openPanelState })
148
+ const { rerender, unmount } = render(<DatasetsInit {...props} />)
149
+ panelEl.focus()
150
+ rerender(<DatasetsInit {...props} pluginState={makePluginState()} />)
151
+ unmount()
152
+ act(() => jest.runOnlyPendingTimers())
153
+ expect(props.services.focusMap).not.toHaveBeenCalled()
124
154
  })
125
155
  })
126
156
 
@@ -131,11 +161,38 @@ describe('DatasetsInit', () => {
131
161
  const props = makeProps()
132
162
  await render(<DatasetsInit {...props} />)
133
163
  expect(loadLayerAdapter).toHaveBeenCalledWith(
134
- props.mapProvider, props.services.symbolRegistry, props.services.patternRegistry
164
+ props.mapProvider, props.services.symbolRegistry, props.services.patternRegistry, datasetRegistry
135
165
  )
136
166
  expect(initialiseDatasets).toHaveBeenCalled()
137
167
  })
138
168
 
169
+ it('passes the registry from plugin state and its adapter to initialiseDatasets', async () => {
170
+ const props = makeProps()
171
+ render(<DatasetsInit {...props} />)
172
+ await act(async () => {})
173
+ expect(initialiseDatasets).toHaveBeenCalledWith(expect.objectContaining({ adapter, datasetRegistry }))
174
+ })
175
+
176
+ it('puts the adapter on its map provider once loaded', async () => {
177
+ const props = makeProps()
178
+ render(<DatasetsInit {...props} />)
179
+ expect(props.mapProvider.datasets).toBeUndefined()
180
+ await act(async () => {})
181
+ expect(props.mapProvider.datasets).toBe(adapter)
182
+ })
183
+
184
+ it('gives each map provider its own adapter', async () => {
185
+ const otherAdapter = makeAdapter()
186
+ loadLayerAdapter.mockResolvedValueOnce(adapter).mockResolvedValueOnce(otherAdapter)
187
+ const propsA = makeProps()
188
+ const propsB = makeProps()
189
+ render(<DatasetsInit {...propsA} />)
190
+ render(<DatasetsInit {...propsB} />)
191
+ await act(async () => {})
192
+ expect(propsA.mapProvider.datasets).toBe(adapter)
193
+ expect(propsB.mapProvider.datasets).toBe(otherAdapter)
194
+ })
195
+
139
196
  it('does not initialise when base map is not ready', async () => {
140
197
  const props = makeProps({
141
198
  mapProvider: { isBaseMapReady: jest.fn().mockReturnValue(false) }
@@ -176,6 +233,7 @@ describe('DatasetsInit', () => {
176
233
  await act(async () => {})
177
234
  unmount()
178
235
  expect(removeFn).toHaveBeenCalled()
236
+ expect(props.mapProvider.datasets).toBeNull()
179
237
  })
180
238
  })
181
239
 
@@ -198,13 +256,14 @@ describe('DatasetsInit', () => {
198
256
  expect(datasetRegistry.attachMapStyle).toHaveBeenCalledWith(props.mapState.mapStyle)
199
257
  })
200
258
 
201
- it('calls layerAdapter.onMapStyleChange when available', async () => {
202
- const onMapStyleChange = jest.fn()
203
- Object.assign(layerAdapter, { onMapStyleChange })
259
+ it('calls layerAdapter.onMapStyleChange when the map style changes after the adapter loads', async () => {
260
+ adapter.onMapStyleChange = jest.fn()
204
261
  const props = makeProps()
205
- await render(<DatasetsInit {...props} />)
206
- expect(onMapStyleChange).toHaveBeenCalled()
207
- delete layerAdapter.onMapStyleChange
262
+ const { rerender } = render(<DatasetsInit {...props} />)
263
+ await act(async () => {})
264
+ expect(adapter.onMapStyleChange).not.toHaveBeenCalled()
265
+ rerender(<DatasetsInit {...props} mapState={{ mapStyle: { id: 'dark' } }} />)
266
+ expect(adapter.onMapStyleChange).toHaveBeenCalled()
208
267
  })
209
268
 
210
269
  // MapLibre gets this re-apply for free (map.addImage()/setPaintProperty() naturally
@@ -214,46 +273,58 @@ describe('DatasetsInit', () => {
214
273
  // re-resolved symbols/patterns after a style change, instead of a stale highlight sticking.
215
274
  it('emits MAP_DATA_CHANGE once onMapStyleChange resolves, so highlights re-resolve for the new theme', async () => {
216
275
  let resolveOnMapStyleChange
217
- const onMapStyleChange = jest.fn(() => new Promise(resolve => { resolveOnMapStyleChange = resolve }))
218
- Object.assign(layerAdapter, { onMapStyleChange })
276
+ adapter.onMapStyleChange = jest.fn(() => new Promise(resolve => { resolveOnMapStyleChange = resolve }))
219
277
  const props = makeProps()
220
- await render(<DatasetsInit {...props} />)
278
+ const { rerender } = render(<DatasetsInit {...props} />)
279
+ await act(async () => {})
280
+ rerender(<DatasetsInit {...props} mapState={{ mapStyle: { id: 'dark' } }} />)
221
281
  expect(props.services.eventBus.emit).not.toHaveBeenCalledWith(EVENTS.MAP_DATA_CHANGE)
222
282
  await act(async () => {
223
283
  resolveOnMapStyleChange()
224
284
  await Promise.resolve()
225
285
  })
226
286
  expect(props.services.eventBus.emit).toHaveBeenCalledWith(EVENTS.MAP_DATA_CHANGE)
227
- delete layerAdapter.onMapStyleChange
228
287
  })
229
288
  })
230
289
 
231
290
  // ─── globals effect ──────────────────────────────────────────────────────────
232
291
 
233
292
  describe('globals effect', () => {
234
- it('calls attachGlobalState with the current globals', async () => {
293
+ it('attaches the current globals to the registry', async () => {
235
294
  const globals = { visible: false, opacity: 0.5 }
236
295
  const props = makeProps({ pluginState: makePluginState({ globals }) })
237
296
  await render(<DatasetsInit {...props} />)
238
- expect(attachGlobalState).toHaveBeenCalledWith(globals)
297
+ expect(datasetRegistry.attachGlobals).toHaveBeenCalledWith(globals)
239
298
  })
240
299
  })
241
300
 
242
301
  // ─── actionsArray effect ─────────────────────────────────────────────────────
243
302
 
244
303
  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 })
304
+ it('runs actions queued before the adapter loads once it has loaded, and dispatches REMOVE_ADAPTER_ACTIONS', async () => {
305
+ adapter.applyStyle = jest.fn()
248
306
  const actions = [{ method: 'applyStyle', parameters: ['roads', {}] }]
249
307
  const dispatch = jest.fn()
250
308
  const props = makeProps({
251
309
  pluginState: makePluginState({ actionsArray: actions, dispatch })
252
310
  })
253
- await render(<DatasetsInit {...props} />)
254
- expect(applyStyle).toHaveBeenCalledWith('roads', {})
311
+ render(<DatasetsInit {...props} />)
312
+ expect(adapter.applyStyle).not.toHaveBeenCalled()
313
+ await act(async () => {})
314
+ expect(adapter.applyStyle).toHaveBeenCalledWith('roads', {})
315
+ expect(dispatch).toHaveBeenCalledWith({ type: 'REMOVE_ADAPTER_ACTIONS', payload: actions })
316
+ })
317
+
318
+ it('runs actions queued after the adapter has loaded straight away', async () => {
319
+ adapter.applyStyle = jest.fn()
320
+ const actions = [{ method: 'applyStyle', parameters: ['roads', {}] }]
321
+ const dispatch = jest.fn()
322
+ const props = makeProps({ pluginState: makePluginState({ dispatch }) })
323
+ const { rerender } = render(<DatasetsInit {...props} />)
324
+ await act(async () => {})
325
+ rerender(<DatasetsInit {...props} pluginState={makePluginState({ actionsArray: actions, dispatch })} />)
326
+ expect(adapter.applyStyle).toHaveBeenCalledWith('roads', {})
255
327
  expect(dispatch).toHaveBeenCalledWith({ type: 'REMOVE_ADAPTER_ACTIONS', payload: actions })
256
- delete layerAdapter.applyStyle
257
328
  })
258
329
 
259
330
  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