@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,9 +1,7 @@
1
- import { layerAdapter } from '../adapters/loadLayerAdapter.js'
2
-
3
- export const removeDataset = ({ pluginState: { dispatch } }, datasetId) => {
1
+ export const removeDataset = ({ pluginState: { dispatch }, mapProvider }, datasetId) => {
4
2
  // Here we need to remove the dataset from the adapter before removing it from state,
5
3
  // otherwise the datasetDefinition will have been removed from the registry by the
6
4
  // time the adapter tries to remove the dataset, which causes an error
7
- layerAdapter.removeDataset(datasetId)
5
+ mapProvider.datasets?.removeDataset(datasetId)
8
6
  dispatch({ type: 'REMOVE_DATASET', payload: { id: datasetId } })
9
7
  }
@@ -1,22 +1,17 @@
1
1
  import { removeDataset } from './removeDataset.js'
2
- import { layerAdapter } from '../adapters/loadLayerAdapter.js'
3
2
 
4
- jest.mock('../adapters/loadLayerAdapter.js', () => ({
5
- layerAdapter: {
6
- removeDataset: jest.fn()
7
- }
8
- }))
3
+ const layerAdapter = { removeDataset: jest.fn() }
9
4
 
10
5
  describe('removeDataset', () => {
11
6
  const dispatch = jest.fn()
12
7
  it('calls layerAdapter.removeDataset with the datasetId', () => {
13
- removeDataset({ pluginState: { layerAdapter, dispatch } }, 'my-dataset')
8
+ removeDataset({ pluginState: { dispatch }, mapProvider: { datasets: layerAdapter } }, 'my-dataset')
14
9
 
15
10
  expect(layerAdapter.removeDataset).toHaveBeenCalledWith('my-dataset')
16
11
  })
17
12
 
18
13
  it('dispatches REMOVE_DATASET with the datasetId', () => {
19
- removeDataset({ pluginState: { layerAdapter, dispatch } }, 'my-dataset')
14
+ removeDataset({ pluginState: { dispatch }, mapProvider: { datasets: layerAdapter } }, 'my-dataset')
20
15
 
21
16
  expect(dispatch).toHaveBeenCalledWith({
22
17
  type: 'REMOVE_DATASET',
@@ -29,13 +24,13 @@ describe('removeDataset', () => {
29
24
  dispatch.mockImplementationOnce(() => callOrder.push('dispatch'))
30
25
  layerAdapter.removeDataset.mockImplementationOnce(() => callOrder.push('adapter'))
31
26
 
32
- removeDataset({ pluginState: { layerAdapter, dispatch } }, 'my-dataset')
27
+ removeDataset({ pluginState: { dispatch }, mapProvider: { datasets: layerAdapter } }, 'my-dataset')
33
28
 
34
29
  expect(callOrder).toEqual(['adapter', 'dispatch'])
35
30
  })
36
31
 
37
32
  it('still dispatches REMOVE_DATASET when layerAdapter is undefined', () => {
38
- removeDataset({ pluginState: { layerAdapter: undefined, dispatch } }, 'my-dataset')
33
+ removeDataset({ pluginState: { dispatch }, mapProvider: { datasets: undefined } }, 'my-dataset')
39
34
 
40
35
  expect(dispatch).toHaveBeenCalledWith({
41
36
  type: 'REMOVE_DATASET',
@@ -1,8 +1,6 @@
1
1
  import { logger } from '../../../../src/services/logger.js'
2
- import { datasetRegistry } from '../registry/datasetRegistry.js'
3
- import { layerAdapter } from '../adapters/loadLayerAdapter.js'
4
2
 
5
- export const setData = ({ _pluginState }, geojson, { datasetId }) => {
3
+ export const setData = ({ pluginState: { datasetRegistry }, mapProvider }, geojson, { datasetId }) => {
6
4
  const registryDataset = datasetRegistry.getDataset(datasetId)
7
5
  if (!registryDataset) {
8
6
  logger.warn(`setData: Dataset with id ${datasetId} not found`)
@@ -12,5 +10,5 @@ export const setData = ({ _pluginState }, geojson, { datasetId }) => {
12
10
  logger.warn(`setData called on vector tile dataset "${datasetId}" — has no effect`)
13
11
  return
14
12
  }
15
- layerAdapter.setData(datasetId, geojson)
13
+ mapProvider.datasets?.setData(datasetId, geojson)
16
14
  }
@@ -1,17 +1,9 @@
1
1
  import { setData } from './setData.js'
2
- import { datasetRegistry } from '../registry/datasetRegistry.js'
3
2
  import { logger } from '../../../../src/services/logger.js'
4
- import { layerAdapter } from '../adapters/loadLayerAdapter.js'
5
3
 
6
- jest.mock('../adapters/loadLayerAdapter.js', () => ({
7
- layerAdapter: {
8
- setData: jest.fn()
9
- }
10
- }))
4
+ const layerAdapter = { setData: jest.fn() }
11
5
 
12
- jest.mock('../registry/datasetRegistry.js', () => ({
13
- datasetRegistry: { getDataset: jest.fn() }
14
- }))
6
+ const datasetRegistry = { getDataset: jest.fn() }
15
7
 
16
8
  jest.mock('../../../../src/services/logger.js')
17
9
 
@@ -24,7 +16,7 @@ describe('setData', () => {
24
16
  it('calls layerAdapter.setData with datasetId and geojson', () => {
25
17
  datasetRegistry.getDataset.mockReturnValue({ id: 'my-dataset' })
26
18
 
27
- setData({ pluginState: { layerAdapter } }, geojson, { datasetId: 'my-dataset' })
19
+ setData({ pluginState: { datasetRegistry }, mapProvider: { datasets: layerAdapter } }, geojson, { datasetId: 'my-dataset' })
28
20
 
29
21
  expect(layerAdapter.setData).toHaveBeenCalledWith('my-dataset', geojson)
30
22
  })
@@ -32,7 +24,7 @@ describe('setData', () => {
32
24
  it('does nothing when the dataset is not found in the registry', () => {
33
25
  datasetRegistry.getDataset.mockReturnValue(undefined)
34
26
 
35
- setData({ pluginState: { layerAdapter } }, geojson, { datasetId: 'missing' })
27
+ setData({ pluginState: { datasetRegistry }, mapProvider: { datasets: layerAdapter } }, geojson, { datasetId: 'missing' })
36
28
 
37
29
  expect(layerAdapter.setData).not.toHaveBeenCalled()
38
30
  expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('missing'))
@@ -44,7 +36,7 @@ describe('setData', () => {
44
36
  tiles: ['https://example.com/{z}/{x}/{y}']
45
37
  })
46
38
 
47
- setData({ pluginState: { layerAdapter } }, geojson, { datasetId: 'tiles-dataset' })
39
+ setData({ pluginState: { datasetRegistry }, mapProvider: { datasets: layerAdapter } }, geojson, { datasetId: 'tiles-dataset' })
48
40
 
49
41
  expect(layerAdapter.setData).not.toHaveBeenCalled()
50
42
  expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('tiles-dataset'))
@@ -54,7 +46,7 @@ describe('setData', () => {
54
46
  datasetRegistry.getDataset.mockReturnValue({ id: 'my-dataset' })
55
47
  // Should not throw even if layerAdapter is undefined
56
48
  expect(() =>
57
- setData({ pluginState: { layerAdapter: undefined } }, geojson, { datasetId: 'my-dataset' })
49
+ setData({ pluginState: { datasetRegistry }, mapProvider: { datasets: undefined } }, geojson, { datasetId: 'my-dataset' })
58
50
  ).not.toThrow()
59
51
  })
60
52
  })
@@ -1,7 +1,6 @@
1
1
  import { logger } from '../../../../src/services/logger.js'
2
- import { datasetRegistry } from '../registry/datasetRegistry.js'
3
2
 
4
- export const setFeatureVisibility = ({ pluginState: { dispatch } }, visible, featureIds, { datasetId = null } = {}) => {
3
+ export const setFeatureVisibility = ({ pluginState: { dispatch, datasetRegistry } }, visible, featureIds, { datasetId = null } = {}) => {
5
4
  if (datasetId) {
6
5
  const dataset = datasetRegistry.getDataset(datasetId)
7
6
  if (dataset && !dataset.idProperty && !dataset.generateIds) {
@@ -1,10 +1,7 @@
1
1
  import { setFeatureVisibility } from './setFeatureVisibility.js'
2
- import { datasetRegistry } from '../registry/datasetRegistry.js'
3
2
  import { logger } from '../../../../src/services/logger.js'
4
3
 
5
- jest.mock('../registry/datasetRegistry.js', () => ({
6
- datasetRegistry: { getDataset: jest.fn() }
7
- }))
4
+ const datasetRegistry = { getDataset: jest.fn() }
8
5
 
9
6
  jest.mock('../../../../src/services/logger.js')
10
7
 
@@ -19,7 +16,7 @@ describe('setFeatureVisibility', () => {
19
16
  })
20
17
 
21
18
  it('dispatches SHOW_FEATURES when visible is true', () => {
22
- setFeatureVisibility({ pluginState: { dispatch } }, true, featureIds, { datasetId })
19
+ setFeatureVisibility({ pluginState: { dispatch, datasetRegistry } }, true, featureIds, { datasetId })
23
20
 
24
21
  expect(dispatch).toHaveBeenCalledWith({
25
22
  type: 'SHOW_FEATURES',
@@ -28,7 +25,7 @@ describe('setFeatureVisibility', () => {
28
25
  })
29
26
 
30
27
  it('dispatches HIDE_FEATURES when visible is false', () => {
31
- setFeatureVisibility({ pluginState: { dispatch } }, false, featureIds, { datasetId })
28
+ setFeatureVisibility({ pluginState: { dispatch, datasetRegistry } }, false, featureIds, { datasetId })
32
29
 
33
30
  expect(dispatch).toHaveBeenCalledWith({
34
31
  type: 'HIDE_FEATURES',
@@ -37,7 +34,7 @@ describe('setFeatureVisibility', () => {
37
34
  })
38
35
 
39
36
  it('uses null datasetId when options are not provided', () => {
40
- setFeatureVisibility({ pluginState: { dispatch } }, true, featureIds)
37
+ setFeatureVisibility({ pluginState: { dispatch, datasetRegistry } }, true, featureIds)
41
38
 
42
39
  expect(dispatch).toHaveBeenCalledWith({
43
40
  type: 'SHOW_FEATURES',
@@ -47,25 +44,25 @@ describe('setFeatureVisibility', () => {
47
44
 
48
45
  it('does not warn when dataset has idProperty set', () => {
49
46
  datasetRegistry.getDataset.mockReturnValue({ idProperty: 'parcel_id', generateIds: false })
50
- setFeatureVisibility({ pluginState: { dispatch } }, false, featureIds, { datasetId })
47
+ setFeatureVisibility({ pluginState: { dispatch, datasetRegistry } }, false, featureIds, { datasetId })
51
48
  expect(logger.warn).not.toHaveBeenCalled()
52
49
  })
53
50
 
54
51
  it('does not warn when dataset has generateIds set', () => {
55
52
  datasetRegistry.getDataset.mockReturnValue({ idProperty: null, generateIds: true })
56
- setFeatureVisibility({ pluginState: { dispatch } }, false, featureIds, { datasetId })
53
+ setFeatureVisibility({ pluginState: { dispatch, datasetRegistry } }, false, featureIds, { datasetId })
57
54
  expect(logger.warn).not.toHaveBeenCalled()
58
55
  })
59
56
 
60
57
  it('warns when dataset has neither idProperty nor generateIds', () => {
61
58
  datasetRegistry.getDataset.mockReturnValue({ idProperty: null, generateIds: false })
62
- setFeatureVisibility({ pluginState: { dispatch } }, false, featureIds, { datasetId })
59
+ setFeatureVisibility({ pluginState: { dispatch, datasetRegistry } }, false, featureIds, { datasetId })
63
60
  expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining(`"${datasetId}"`))
64
61
  expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('idProperty'))
65
62
  })
66
63
 
67
64
  it('does not warn or look up registry when datasetId is not provided', () => {
68
- setFeatureVisibility({ pluginState: { dispatch } }, false, featureIds)
65
+ setFeatureVisibility({ pluginState: { dispatch, datasetRegistry } }, false, featureIds)
69
66
  expect(datasetRegistry.getDataset).not.toHaveBeenCalled()
70
67
  expect(logger.warn).not.toHaveBeenCalled()
71
68
  })
@@ -23,6 +23,7 @@ export const LayersMenu = ({ pluginState }) => {
23
23
  <LayersMenuCheckbox
24
24
  key={menuGroupItem.id}
25
25
  menuGroupItem={menuGroupItem}
26
+ datasetRegistry={pluginState.datasetRegistry}
26
27
  onChange={handleDatasetChange}
27
28
  />)
28
29
  )
@@ -1,6 +1,4 @@
1
- import { datasetRegistry } from '../../registry/datasetRegistry.js'
2
-
3
- export const LayersMenuCheckbox = ({ menuGroupItem, onChange }) => {
1
+ export const LayersMenuCheckbox = ({ menuGroupItem, datasetRegistry, onChange }) => {
4
2
  const registryDataset = datasetRegistry.getDataset(menuGroupItem.id)
5
3
  if (!registryDataset) {
6
4
  return null
@@ -1,12 +1,7 @@
1
1
  import { render, screen, act } from '@testing-library/react'
2
- import { datasetRegistry } from '../../registry/datasetRegistry.js'
3
2
  import { LayersMenuCheckbox } from './LayersMenuCheckbox.jsx'
4
3
 
5
- jest.mock('../../registry/datasetRegistry.js', () => ({
6
- datasetRegistry: {
7
- getDataset: jest.fn()
8
- }
9
- }))
4
+ const datasetRegistry = { getDataset: jest.fn() }
10
5
 
11
6
  const onChange = jest.fn()
12
7
  const menuGroupItem = { id: 'dataset-1' }
@@ -29,7 +24,7 @@ describe('LayersMenuCheckbox', () => {
29
24
  describe('when the dataset is not in the registry', () => {
30
25
  it('returns null', () => {
31
26
  datasetRegistry.getDataset.mockReturnValue(undefined)
32
- const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
27
+ const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
33
28
  expect(container.firstChild).toBeNull()
34
29
  })
35
30
  })
@@ -37,19 +32,19 @@ describe('LayersMenuCheckbox', () => {
37
32
  describe('when the dataset exists', () => {
38
33
  it('renders a checkbox input', () => {
39
34
  datasetRegistry.getDataset.mockReturnValue(baseDataset)
40
- const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
35
+ const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
41
36
  expect(container.querySelector('input[type="checkbox"]')).toBeTruthy()
42
37
  })
43
38
 
44
39
  it('renders the dataset label', () => {
45
40
  datasetRegistry.getDataset.mockReturnValue(baseDataset)
46
- render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
41
+ render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
47
42
  expect(screen.getByText('Dataset One')).toBeTruthy()
48
43
  })
49
44
 
50
45
  it('associates the label with the input via htmlFor', () => {
51
46
  datasetRegistry.getDataset.mockReturnValue(baseDataset)
52
- const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
47
+ const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
53
48
  const label = container.querySelector('label')
54
49
  const input = container.querySelector('input')
55
50
  expect(label.htmlFor).toBe(input.id)
@@ -57,7 +52,7 @@ describe('LayersMenuCheckbox', () => {
57
52
 
58
53
  it('calls onChange when the checkbox changes', () => {
59
54
  datasetRegistry.getDataset.mockReturnValue(baseDataset)
60
- const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
55
+ const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
61
56
  const input = container.querySelector('input')
62
57
  const propsKey = Object.keys(input).find(k => k.startsWith('__reactProps'))
63
58
  act(() => { input[propsKey].onChange({ target: { checked: true, value: input.value } }) })
@@ -68,13 +63,13 @@ describe('LayersMenuCheckbox', () => {
68
63
  describe('checked state', () => {
69
64
  it('is checked when isLocallyVisible is true', () => {
70
65
  datasetRegistry.getDataset.mockReturnValue({ ...baseDataset, isLocallyVisible: true })
71
- const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
66
+ const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
72
67
  expect(container.querySelector('input').checked).toBe(true)
73
68
  })
74
69
 
75
70
  it('is unchecked when isLocallyVisible is false', () => {
76
71
  datasetRegistry.getDataset.mockReturnValue({ ...baseDataset, isLocallyVisible: false })
77
- const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
72
+ const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
78
73
  expect(container.querySelector('input').checked).toBe(false)
79
74
  })
80
75
  })
@@ -82,13 +77,13 @@ describe('LayersMenuCheckbox', () => {
82
77
  describe('item class', () => {
83
78
  it('does not include the --checked modifier when visible is true', () => {
84
79
  datasetRegistry.getDataset.mockReturnValue({ ...baseDataset, visible: true })
85
- const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
80
+ const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
86
81
  expect(container.firstChild.className).not.toContain('im-c-datasets-layers__item--checked')
87
82
  })
88
83
 
89
84
  it('includes the --checked modifier when visible is false', () => {
90
85
  datasetRegistry.getDataset.mockReturnValue({ ...baseDataset, visible: false })
91
- const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
86
+ const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
92
87
  expect(container.firstChild.className).toContain('im-c-datasets-layers__item--checked')
93
88
  })
94
89
  })
@@ -96,7 +91,7 @@ describe('LayersMenuCheckbox', () => {
96
91
  describe('data attributes', () => {
97
92
  it('uses the dataset id as data-dataset-id when not a sublayer', () => {
98
93
  datasetRegistry.getDataset.mockReturnValue({ ...baseDataset, isSublayer: false })
99
- const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
94
+ const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
100
95
  const input = container.querySelector('input')
101
96
  expect(input.dataset.datasetId).toBe('dataset-1')
102
97
  expect(input.dataset.sublayerId).toBeUndefined()
@@ -104,13 +99,13 @@ describe('LayersMenuCheckbox', () => {
104
99
 
105
100
  it('uses parentId as data-dataset-id when a sublayer', () => {
106
101
  datasetRegistry.getDataset.mockReturnValue({ ...baseDataset, id: 'sub-1', isSublayer: true, parentId: 'parent-1' })
107
- const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
102
+ const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
108
103
  expect(container.querySelector('input').dataset.datasetId).toBe('parent-1')
109
104
  })
110
105
 
111
106
  it('uses the sublayer id as data-sublayer-id when a sublayer', () => {
112
107
  datasetRegistry.getDataset.mockReturnValue({ ...baseDataset, id: 'sub-1', isSublayer: true, parentId: 'parent-1' })
113
- const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} onChange={onChange} />)
108
+ const { container } = render(<LayersMenuCheckbox menuGroupItem={menuGroupItem} datasetRegistry={datasetRegistry} onChange={onChange} />)
114
109
  expect(container.querySelector('input').dataset.sublayerId).toBe('sub-1')
115
110
  })
116
111
  })
@@ -7,8 +7,8 @@ export default function createPlugin (options = { }) {
7
7
  ...options,
8
8
  id: 'datasets',
9
9
  load: async () => {
10
- const module = (await import(/* webpackChunkName: "im-datasets-plugin" */ './manifest.js')).manifest
11
- return module
10
+ const { createManifest } = await import(/* webpackChunkName: "im-datasets-plugin" */ './manifest.js')
11
+ return createManifest(options)
12
12
  }
13
13
  }
14
14
 
@@ -1,8 +1,9 @@
1
1
  import createPlugin from './index.js'
2
+ import { createManifest } from './manifest.js'
2
3
 
3
4
  jest.mock('./datasets.scss', () => {})
4
5
  jest.mock('./manifest.js', () => ({
5
- manifest: { InitComponent: jest.fn(), reducer: {} }
6
+ createManifest: jest.fn(() => ({ InitComponent: jest.fn(), reducer: {} }))
6
7
  }))
7
8
 
8
9
  describe('createPlugin', () => {
@@ -33,4 +34,10 @@ describe('createPlugin', () => {
33
34
  const result = await plugin.load()
34
35
  expect(result).toBeDefined()
35
36
  })
37
+
38
+ it('load() builds the manifest from the plugin options', async () => {
39
+ const options = { hasMenu: false }
40
+ await createPlugin(options).load()
41
+ expect(createManifest).toHaveBeenCalledWith(options)
42
+ })
36
43
  })
@@ -2,27 +2,30 @@
2
2
  import { useEffect, useRef } from 'react'
3
3
  import { EVENTS } from '../../../../src/config/events.js'
4
4
  import { initialiseDatasets } from './initialiseDatasets.js'
5
- import { datasetRegistry } from '../registry/datasetRegistry.js'
6
- import { attachGlobalState } from '../registry/globalDataset.js'
7
- import { loadLayerAdapter, layerAdapter } from '../adapters/loadLayerAdapter.js'
5
+ import { loadLayerAdapter } from '../adapters/loadLayerAdapter.js'
6
+ import { hasLayersMenu } from '../utils/hasLayersMenu.js'
8
7
 
9
- const pluginConfigHasMenuItems = (pluginConfig) =>
10
- pluginConfig.datasets
11
- .some(dataset => dataset.showInMenu || dataset.sublayers?.some(sublayer => sublayer.showInMenu))
8
+ const LAYERS_PANEL_ID = 'datasetsLayers'
12
9
 
13
- export function DatasetsInit ({ pluginConfig, pluginState, mapState, mapProvider, services }) {
14
- const { dispatch } = pluginState
15
- const { eventBus, symbolRegistry, patternRegistry } = services
16
- const isBaseMapReady = Boolean(mapProvider?.isBaseMapReady())
10
+ // Closes the Layers panel if its menu empties while it's open
11
+ function useCloseEmptyLayersPanel ({ appState, pluginConfig, pluginState, services }) {
12
+ const { eventBus } = services
13
+ const hasMenu = hasLayersMenu({ pluginConfig, pluginState })
14
+ const isLayersPanelOpen = Boolean(appState.openPanels[LAYERS_PANEL_ID])
17
15
 
18
16
  useEffect(() => {
19
- const hasMenu = pluginConfig.hasMenu !== false && pluginConfigHasMenuItems(pluginConfig)
20
-
21
- if (!hasMenu) {
22
- eventBus.emitWhenReady(EVENTS.APP_REMOVE_PANEL, 'datasetsLayers')
23
- eventBus.emitWhenReady(EVENTS.APP_TOGGLE_BUTTON_STATE, { id: 'datasetsLayers', prop: 'hidden', value: true })
17
+ if (!hasMenu && isLayersPanelOpen) {
18
+ eventBus.emit(EVENTS.APP_HIDE_PANEL, LAYERS_PANEL_ID)
24
19
  }
25
- }, [pluginConfig.hasMenu])
20
+ }, [hasMenu, isLayersPanelOpen])
21
+ }
22
+
23
+ export function DatasetsInit ({ appState, pluginConfig, pluginState, mapState, mapProvider, services }) {
24
+ const { dispatch, datasetRegistry } = pluginState
25
+ const { eventBus, symbolRegistry, patternRegistry } = services
26
+ const isBaseMapReady = Boolean(mapProvider?.isBaseMapReady())
27
+
28
+ useCloseEmptyLayersPanel({ appState, pluginConfig, pluginState, services })
26
29
 
27
30
  // Keep a ref to the latest pluginState so event handlers can access current data
28
31
  const pluginStateRef = useRef(pluginState)
@@ -31,6 +34,14 @@ export function DatasetsInit ({ pluginConfig, pluginState, mapState, mapProvider
31
34
  // Track initialisation and store cleanup function
32
35
  const datasetsInstanceRef = useRef(null)
33
36
 
37
+ // Call layerAdapter methods queued from state updates. They wait until the adapter has loaded.
38
+ const runQueuedActions = (actionsArray) => {
39
+ const layerAdapter = mapProvider?.datasets
40
+ if (!actionsArray.length || !layerAdapter) { return }
41
+ actionsArray.forEach(({ method, parameters }) => layerAdapter[method](...parameters))
42
+ dispatch({ type: 'REMOVE_ADAPTER_ACTIONS', payload: actionsArray })
43
+ }
44
+
34
45
  useEffect(() => {
35
46
  if (!isBaseMapReady) {
36
47
  return
@@ -42,10 +53,11 @@ export function DatasetsInit ({ pluginConfig, pluginState, mapState, mapProvider
42
53
  }
43
54
 
44
55
  const initDatasets = async () => {
45
- const adapter = await loadLayerAdapter(mapProvider, symbolRegistry, patternRegistry)
56
+ const adapter = await loadLayerAdapter(mapProvider, symbolRegistry, patternRegistry, datasetRegistry)
46
57
 
47
58
  datasetsInstanceRef.current = initialiseDatasets({
48
59
  adapter,
60
+ datasetRegistry,
49
61
  pluginConfig,
50
62
  pluginStateRef,
51
63
  mapStyle: mapState.mapStyle,
@@ -54,6 +66,9 @@ export function DatasetsInit ({ pluginConfig, pluginState, mapState, mapProvider
54
66
  dispatch,
55
67
  eventBus
56
68
  })
69
+ // Each map has its own provider, so its API calls reach its own adapter
70
+ mapProvider.datasets = adapter
71
+ runQueuedActions(pluginStateRef.current.actionsArray)
57
72
  }
58
73
 
59
74
  initDatasets() // NOSONAR: Not changing for now as used in production
@@ -67,12 +82,13 @@ export function DatasetsInit ({ pluginConfig, pluginState, mapState, mapProvider
67
82
 
68
83
  useEffect(() => {
69
84
  datasetRegistry.attachMapStyle(mapState.mapStyle)
85
+ const layerAdapter = mapProvider?.datasets
70
86
  if (layerAdapter?.onMapStyleChange) {
71
87
  // MapLibre's own map.addImage()/setPaintProperty() calls (made while re-registering
72
88
  // symbols/patterns below) naturally re-trigger MAP_DATA_CHANGE via the GL engine's own
73
89
  // styledata event — nothing extra needed there. OL has no such generic signal (its
74
90
  // MAP_DATA_CHANGE is tied only to the basemap tile source's own tileloadend — see
75
- // providers/beta/openlayers/src/appEvents.js's comment), so re-registering a symbol on a
91
+ // providers/openlayers/src/appEvents.js's comment), so re-registering a symbol on a
76
92
  // plain ol/layer/Vector never fires it. Emitting it explicitly once re-registration
77
93
  // genuinely finishes lets the interact plugin's settle-window re-apply (armed by
78
94
  // MAP_STYLE_CHANGE, see useHighlightSync.js) pick up the new theme's selected/active
@@ -85,15 +101,9 @@ export function DatasetsInit ({ pluginConfig, pluginState, mapState, mapProvider
85
101
  },
86
102
  [mapState.mapStyle])
87
103
 
88
- useEffect(() => attachGlobalState(pluginState.globals), [pluginState.globals])
104
+ useEffect(() => datasetRegistry.attachGlobals(pluginState.globals), [pluginState.globals])
89
105
 
90
- // Call layerAdapter methods that are queued from state updates
91
- useEffect(() => {
92
- const { actionsArray } = pluginState
93
- if (!actionsArray.length) { return }
94
- actionsArray.forEach(({ method, parameters }) => layerAdapter[method](...parameters))
95
- dispatch({ type: 'REMOVE_ADAPTER_ACTIONS', payload: actionsArray })
96
- }, [pluginState.actionsArray])
106
+ useEffect(() => runQueuedActions(pluginState.actionsArray), [pluginState.actionsArray])
97
107
 
98
108
  // Cleanup only on unmount
99
109
  useEffect(() => {
@@ -101,6 +111,7 @@ export function DatasetsInit ({ pluginConfig, pluginState, mapState, mapProvider
101
111
  if (datasetsInstanceRef.current) {
102
112
  datasetsInstanceRef.current.remove()
103
113
  datasetsInstanceRef.current = null
114
+ mapProvider.datasets = null
104
115
  }
105
116
  }
106
117
  }, [])