@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,7 +1,9 @@
1
1
  import { createDataset } from './createDataset.js'
2
2
  import { DatasetDefinitionCache } from './datasetDefinitionCache.js'
3
+ import { isVisibleWhen } from './isVisibleWhen.js'
3
4
 
4
- const datasetRegistry = {
5
+ // Shared by every registry; each registry's own state is set in createDatasetRegistry
6
+ const datasetRegistryMethods = {
5
7
  attach (datasetsRef, orderedDatasetsRef, mapStyle) {
6
8
  this._datasets = datasetsRef
7
9
  this._orderedDatasets = orderedDatasetsRef
@@ -9,8 +11,6 @@ const datasetRegistry = {
9
11
  this._invalidateChangedDatasets()
10
12
  },
11
13
 
12
- _definitionCache: new DatasetDefinitionCache(),
13
-
14
14
  _invalidateCache () { // used in tests to clear the cache between runs
15
15
  this._definitionCache = new DatasetDefinitionCache()
16
16
  },
@@ -26,7 +26,7 @@ const datasetRegistry = {
26
26
  // createDataset defaults to a generic dataset factory function, but can be overridden by calling
27
27
  // attachCreateDataset, which allows the layer adapter to provide its own createDataset function,
28
28
  attachCreateDataset (newCreateDatasetFunction) { this._createDataset = newCreateDatasetFunction },
29
- _createDataset: (datasetDefinition) => createDataset(datasetDefinition),
29
+ _createDataset: (datasetDefinition, datasetRegistry) => createDataset(datasetDefinition, datasetRegistry),
30
30
 
31
31
  attachMapStyle (mapStyle) {
32
32
  if (mapStyle) {
@@ -38,6 +38,31 @@ const datasetRegistry = {
38
38
  return this._mapStyle
39
39
  },
40
40
 
41
+ attachGlobals (globals) {
42
+ if (globals) {
43
+ this._globals = globals
44
+ }
45
+ },
46
+
47
+ get globals () {
48
+ return this._globals
49
+ },
50
+
51
+ attachMenuStateRef (menuStateRef) {
52
+ this._menuStateRef = menuStateRef
53
+ },
54
+
55
+ isVisibleWhen (visibleWhen) {
56
+ return isVisibleWhen(visibleWhen, {
57
+ mapStyleId: this._mapStyle?.id,
58
+ menuState: this._menuStateRef?.current?.menuState
59
+ })
60
+ },
61
+
62
+ get datasets () {
63
+ return this._datasets
64
+ },
65
+
41
66
  // getDataset retrieves a dataset by id, creating a new Dataset instance that wraps the definition
42
67
  getDataset (id) {
43
68
  const definition = this.datasets[id]
@@ -48,7 +73,7 @@ const datasetRegistry = {
48
73
  if (cachedDefinition) {
49
74
  return cachedDefinition
50
75
  }
51
- const registryDataset = this._createDataset(definition)
76
+ const registryDataset = this._createDataset(definition, this)
52
77
  this._definitionCache.add(registryDataset)
53
78
  if (registryDataset.isSublayer) {
54
79
  // Ensure the parent dataset is also cached
@@ -83,7 +108,6 @@ const datasetRegistry = {
83
108
  }, { patternConfigs: [], symbolConfigs: [] })
84
109
  },
85
110
 
86
- _lastMenuState: {},
87
111
  invalidateKeyItemsOnMenuStateChange (menuState) {
88
112
  if (menuState === this._lastMenuState) {
89
113
  return
@@ -91,7 +115,6 @@ const datasetRegistry = {
91
115
  this._lastMenuState = menuState
92
116
  this._lastKeyItemsDatasets = null
93
117
  },
94
- _lastKeyItems: {},
95
118
  keyItems () {
96
119
  if (this.datasets === this._lastKeyItemsDatasets) {
97
120
  return this._lastKeyItems
@@ -139,6 +162,12 @@ const datasetRegistry = {
139
162
  }
140
163
  }
141
164
 
142
- Object.defineProperty(datasetRegistry, 'datasets', { get: () => datasetRegistry._datasets })
143
-
144
- export { datasetRegistry }
165
+ // Each datasets plugin instance (one per map) creates its own registry, so maps on the same page
166
+ // never see each other's datasets
167
+ export const createDatasetRegistry = () => Object.assign(Object.create(datasetRegistryMethods), {
168
+ _definitionCache: new DatasetDefinitionCache(),
169
+ _globals: {},
170
+ _menuStateRef: {},
171
+ _lastMenuState: {},
172
+ _lastKeyItems: {}
173
+ })
@@ -1,5 +1,5 @@
1
1
  import { Dataset } from './dataset.js'
2
- import { datasetRegistry } from './datasetRegistry.js'
2
+ import { datasetRegistry, createDatasetRegistry } from './datasetRegistry.js'
3
3
  import { mappedDatasetsReducer } from '../reducers/mappedDatasetsReducer.js'
4
4
  import { datasetsWithGroups } from '../reducers/__data__/demoDatasets.js'
5
5
  // Use the mock datasetRegistry with the demo datasets attached before each test.
@@ -351,4 +351,86 @@ describe('datasetRegistry', () => {
351
351
  expect(datasetRegistry._definitionCache.getByDefinition(existingFieldsDefinition)).toBeUndefined() // old definition should no longer be cached
352
352
  })
353
353
  })
354
+
355
+ describe('createDatasetRegistry', () => {
356
+ const createMapRegistry = (datasets, globals = { visible: true, opacity: 1, opacityMode: 'dataset' }) => {
357
+ const registry = createDatasetRegistry()
358
+ const { mappedDatasets, orderedDatasets } = mappedDatasetsReducer({ datasets })
359
+ registry.attach(mappedDatasets, orderedDatasets, { id: 'outdoor' })
360
+ registry.attachGlobals(globals)
361
+ return registry
362
+ }
363
+
364
+ it('keeps datasets with the same id separate for each registry', () => {
365
+ const registryA = createMapRegistry([{ id: 'features', geojson: '/map-a.geojson' }])
366
+ const registryB = createMapRegistry([{ id: 'features', geojson: '/map-b.geojson' }])
367
+
368
+ expect(registryA.getDataset('features').geojson).toBe('/map-a.geojson')
369
+ expect(registryB.getDataset('features').geojson).toBe('/map-b.geojson')
370
+ expect(registryA.getDataset('features').geojson).toBe('/map-a.geojson')
371
+ })
372
+
373
+ it('gives each registry its own state while sharing its methods', () => {
374
+ const registryA = createDatasetRegistry()
375
+ const registryB = createDatasetRegistry()
376
+
377
+ expect(registryA.getDataset).toBe(registryB.getDataset)
378
+ const stateKeys = ['_definitionCache', '_globals', '_menuStateRef', '_lastMenuState', '_lastKeyItems']
379
+ stateKeys.forEach(key => expect(registryA[key]).not.toBe(registryB[key]))
380
+ })
381
+
382
+ it('only iterates its own datasets', () => {
383
+ const registryA = createMapRegistry([{ id: 'a' }])
384
+ const registryB = createMapRegistry([{ id: 'b' }])
385
+
386
+ const idsA = []
387
+ registryA.forEachDataset(dataset => idsA.push(dataset.id))
388
+ expect(idsA).toEqual(['a'])
389
+ expect(registryB.topLevelDatasets().map(dataset => dataset.id)).toEqual(['b'])
390
+ })
391
+
392
+ it('applies its own globals to its datasets', () => {
393
+ const registryA = createMapRegistry([{ id: 'features', visible: true }])
394
+ const registryB = createMapRegistry([{ id: 'features', visible: true }], { visible: false, opacity: 0.5, opacityMode: 'global' })
395
+
396
+ expect(registryA.getDataset('features').visible).toBe(true)
397
+ expect(registryA.getDataset('features').opacity).toBe(1)
398
+ expect(registryB.getDataset('features').visible).toBe(false)
399
+ expect(registryB.getDataset('features').opacity).toBe(0.5)
400
+ })
401
+
402
+ it('keeps its attached map style and globals when attached again without one', () => {
403
+ const registry = createDatasetRegistry()
404
+ const mapStyle = { id: 'dark' }
405
+ const globals = { visible: true, opacity: 1, opacityMode: 'dataset' }
406
+ registry.attachMapStyle(mapStyle)
407
+ registry.attachGlobals(globals)
408
+
409
+ registry.attachMapStyle(undefined)
410
+ registry.attachGlobals(undefined)
411
+
412
+ expect(registry.mapStyle).toBe(mapStyle)
413
+ expect(registry.globals).toBe(globals)
414
+ })
415
+
416
+ it('checks visibleWhen against its own map style and menu state', () => {
417
+ const registry = createDatasetRegistry()
418
+ registry.attachMapStyle({ id: 'dark' })
419
+ registry.attachMenuStateRef({ current: { menuState: { timeframe: 'present' } } })
420
+
421
+ expect(registry.isVisibleWhen({ mapStyleId: 'dark', menu: { timeframe: ['present'] } })).toBe(true)
422
+ expect(registry.isVisibleWhen({ mapStyleId: 'outdoor' })).toBe(false)
423
+ expect(registry.isVisibleWhen({ menu: { timeframe: ['future'] } })).toBe(false)
424
+ })
425
+
426
+ it('passes itself to the dataset factory', () => {
427
+ const registry = createMapRegistry([{ id: 'features' }])
428
+ const factory = jest.fn((definition, owner) => new Dataset(definition, owner))
429
+ registry.attachCreateDataset(factory)
430
+
431
+ registry.getDataset('features')
432
+
433
+ expect(factory).toHaveBeenCalledWith(expect.objectContaining({ id: 'features' }), registry)
434
+ })
435
+ })
354
436
  })
@@ -1,33 +1,25 @@
1
- let globalState = {}
2
-
3
- export const attachGlobalState = (globalStateRef) => {
4
- globalState = globalStateRef
5
- }
6
-
7
- const calculateLocalOpacity = (opacityValue, parentOpacityValue) => {
1
+ const calculateLocalOpacity = (globals, opacityValue, parentOpacityValue) => {
8
2
  if (opacityValue === undefined) {
9
3
  if (parentOpacityValue === undefined) {
10
- return globalState.opacity
4
+ return globals.opacity
11
5
  }
12
6
  return parentOpacityValue
13
7
  }
14
8
  return opacityValue
15
9
  }
16
10
 
17
- const multiplyOpacities = (opacityValue = 1, parentOpacityValue = 1) => {
18
- return Math.round((opacityValue * parentOpacityValue * globalState.opacity + Number.EPSILON) * 100) / 100
11
+ const multiplyOpacities = (globals, opacityValue = 1, parentOpacityValue = 1) => {
12
+ return Math.round((opacityValue * parentOpacityValue * globals.opacity + Number.EPSILON) * 100) / 100
19
13
  }
20
14
 
21
- export const calculateOpacity = (opacityValue, parentOpacityValue) => {
22
- switch (globalState.opacityMode) {
15
+ export const calculateOpacity = (globals, opacityValue, parentOpacityValue) => {
16
+ switch (globals.opacityMode) {
23
17
  case 'global':
24
- return globalState.opacity
18
+ return globals.opacity
25
19
  case 'multiply':
26
- return multiplyOpacities(opacityValue, parentOpacityValue)
20
+ return multiplyOpacities(globals, opacityValue, parentOpacityValue)
27
21
  case 'dataset':
28
22
  default:
29
- return calculateLocalOpacity(opacityValue, parentOpacityValue)
23
+ return calculateLocalOpacity(globals, opacityValue, parentOpacityValue)
30
24
  }
31
25
  }
32
-
33
- export const getGlobalVisibility = () => globalState.visible
@@ -1,12 +1,4 @@
1
- import { datasetRegistry } from './datasetRegistry.js'
2
-
3
- let _menuStateRef = {}
4
- export const attachMenuStateRef = (menuStateRef) => {
5
- _menuStateRef = menuStateRef
6
- }
7
-
8
- const _isVisibleWhenMenuCheck = (menuVisibleWhen) => {
9
- const menuState = _menuStateRef?.current?.menuState || {}
1
+ const _isVisibleWhenMenuCheck = (menuVisibleWhen, menuState = {}) => {
10
2
  for (const [key, valueArray] of Object.entries(menuVisibleWhen)) {
11
3
  const menuValue = menuState[key]
12
4
  if (!valueArray.includes(menuValue)) {
@@ -16,14 +8,11 @@ const _isVisibleWhenMenuCheck = (menuVisibleWhen) => {
16
8
  return true
17
9
  }
18
10
 
19
- const _isVisibleWhenMapStyleCheck = (visibleWhenValue) => {
11
+ const _isVisibleWhenMapStyleCheck = (visibleWhenValue, mapStyleId) => {
20
12
  const mapStylesArray = Array.isArray(visibleWhenValue) ? visibleWhenValue : [visibleWhenValue]
21
- return mapStylesArray.includes(_getMapStyleId())
13
+ return mapStylesArray.includes(mapStyleId)
22
14
  }
23
15
 
24
- // exported so it can be mocked and overridden when testing
25
- export const _getMapStyleId = () => datasetRegistry.mapStyle.id
26
-
27
16
  /**
28
17
  * receives a visibleWhen boolean or object
29
18
  * and returns a boolean indicating whether the dataset should be visible
@@ -32,9 +21,12 @@ export const _getMapStyleId = () => datasetRegistry.mapStyle.id
32
21
  * if visibleWhen is an object, it checks the properties of the object, against the relevant pluginState properties,
33
22
  * and returns true if all properties are satisfied:
34
23
  * @param {boolean|object} visibleWhen - the visibleWhen property of a dataset
24
+ * @param {object} context
25
+ * @param {string} context.mapStyleId - the current map style id
26
+ * @param {object} context.menuState - the current menu state
35
27
  * @returns {boolean} - true if the dataset should be visible, false otherwise
36
28
  */
37
- export const isVisibleWhen = (visibleWhen) => {
29
+ export const isVisibleWhen = (visibleWhen, { mapStyleId, menuState } = {}) => {
38
30
  if (visibleWhen === undefined || visibleWhen === null) {
39
31
  return true
40
32
  }
@@ -44,10 +36,10 @@ export const isVisibleWhen = (visibleWhen) => {
44
36
  if (typeof visibleWhen === 'object') {
45
37
  // check each property of the visibleWhen object against the relevant pluginState property
46
38
  for (const [visibleWhenKey, visibleWhenValue] of Object.entries(visibleWhen)) {
47
- if (visibleWhenKey === 'mapStyleId' && !_isVisibleWhenMapStyleCheck(visibleWhenValue)) {
39
+ if (visibleWhenKey === 'mapStyleId' && !_isVisibleWhenMapStyleCheck(visibleWhenValue, mapStyleId)) {
48
40
  return false
49
41
  }
50
- if (visibleWhenKey === 'menu' && !_isVisibleWhenMenuCheck(visibleWhenValue)) {
42
+ if (visibleWhenKey === 'menu' && !_isVisibleWhenMenuCheck(visibleWhenValue, menuState)) {
51
43
  return false
52
44
  }
53
45
  }
@@ -1,8 +1,9 @@
1
- import { isVisibleWhen, attachMenuStateRef } from './isVisibleWhen.js'
2
- import { datasetRegistry } from './datasetRegistry.js'
1
+ import { isVisibleWhen } from './isVisibleWhen.js'
2
+
3
+ let context
3
4
 
4
5
  const setMenuState = (menuState) => {
5
- attachMenuStateRef({ current: { menuState } })
6
+ context = { menuState }
6
7
  }
7
8
 
8
9
  describe('isVisibleWhen', () => {
@@ -12,66 +13,72 @@ describe('isVisibleWhen', () => {
12
13
  })
13
14
 
14
15
  it('returns true if visibleWhen is undefined', () => {
15
- expect(isVisibleWhen(undefined)).toBe(true)
16
+ expect(isVisibleWhen(undefined, context)).toBe(true)
16
17
  })
17
18
 
18
19
  it('returns true if visibleWhen is null', () => {
19
- expect(isVisibleWhen(null)).toBe(true)
20
+ expect(isVisibleWhen(null, context)).toBe(true)
20
21
  })
21
22
 
22
23
  it('returns the boolean value if visibleWhen is a boolean', () => {
23
- expect(isVisibleWhen(true)).toBe(true)
24
- expect(isVisibleWhen(false)).toBe(false)
24
+ expect(isVisibleWhen(true, context)).toBe(true)
25
+ expect(isVisibleWhen(false, context)).toBe(false)
25
26
  })
26
27
 
27
28
  it('returns true if all properties of visibleWhen object are satisfied', () => {
28
29
  setMenuState({ datasets: 'floodZones', timeframe: 'climateChange' })
29
30
  const visibleWhen = { menu: { datasets: ['floodZones'], timeframe: ['climateChange'] } }
30
- expect(isVisibleWhen(visibleWhen)).toBe(true)
31
+ expect(isVisibleWhen(visibleWhen, context)).toBe(true)
31
32
  })
32
33
 
33
34
  it('returns false if any property of visibleWhen object is not satisfied', () => {
34
35
  setMenuState({ datasets: 'floodZones', timeframe: 'climateChange' })
35
36
  const visibleWhen = { menu: { datasets: ['floodZones'], timeframe: ['presentDay'] } }
36
- expect(isVisibleWhen(visibleWhen)).toBe(false)
37
+ expect(isVisibleWhen(visibleWhen, context)).toBe(false)
37
38
  })
38
39
 
39
40
  it('returns true if mapStyleId is satisfied', () => {
40
41
  const mapStyleId = 'outdoor'
41
- datasetRegistry.attach([], [], { id: mapStyleId })
42
+ context = { mapStyleId }
42
43
  const visibleWhen = { mapStyleId }
43
- expect(isVisibleWhen(visibleWhen)).toBe(true)
44
+ expect(isVisibleWhen(visibleWhen, context)).toBe(true)
44
45
  })
45
46
 
46
47
  it('returns false if mapStyleId is not satisfied', () => {
47
48
  const mapStyleId = 'outdoor'
48
- datasetRegistry.attach([], [], { id: mapStyleId })
49
+ context = { mapStyleId }
49
50
  const visibleWhen = { mapStyleId: 'dark' }
50
- expect(isVisibleWhen(visibleWhen)).toBe(false)
51
+ expect(isVisibleWhen(visibleWhen, context)).toBe(false)
51
52
  })
52
53
 
53
54
  it('returns true if mapStyleId is an array and one of the values is satisfied', () => {
54
55
  const mapStyleId = 'outdoor'
55
- datasetRegistry.attach([], [], { id: mapStyleId })
56
+ context = { mapStyleId }
56
57
  const visibleWhen = { mapStyleId: ['dark', mapStyleId] }
57
- expect(isVisibleWhen(visibleWhen)).toBe(true)
58
+ expect(isVisibleWhen(visibleWhen, context)).toBe(true)
58
59
  })
59
60
 
60
61
  it('returns false if mapStyleId is an array and none of the values are satisfied', () => {
61
62
  const mapStyleId = 'outdoor'
62
- datasetRegistry.attach([], [], { id: mapStyleId })
63
+ context = { mapStyleId }
63
64
  const visibleWhen = { mapStyleId: ['dark', 'black-and-white'] }
64
- expect(isVisibleWhen(visibleWhen)).toBe(false)
65
+ expect(isVisibleWhen(visibleWhen, context)).toBe(false)
65
66
  })
66
67
 
67
68
  it('returns true if visibleWhen is incorrectly configured', () => {
68
69
  const visibleWhen = 'incorrectly-configured'
69
- expect(isVisibleWhen(visibleWhen)).toBe(true)
70
+ expect(isVisibleWhen(visibleWhen, context)).toBe(true)
70
71
  })
71
72
 
72
73
  it('returns false when menu condition is checked and menuState has not been set up', () => {
73
- attachMenuStateRef({}) // current is undefined — exercises the || {} fallback
74
+ context = {} // menuState is undefined — exercises the default {}
74
75
  const visibleWhen = { menu: { datasets: ['floodZones'] } }
75
- expect(isVisibleWhen(visibleWhen)).toBe(false)
76
+ expect(isVisibleWhen(visibleWhen, context)).toBe(false)
77
+ })
78
+
79
+ it('treats a missing context as no map style and no menu state', () => {
80
+ expect(isVisibleWhen({ mapStyleId: 'outdoor' })).toBe(false)
81
+ expect(isVisibleWhen({ menu: { datasets: ['floodZones'] } })).toBe(false)
82
+ expect(isVisibleWhen({})).toBe(true)
76
83
  })
77
84
  })
@@ -1,7 +1,6 @@
1
1
  import { Dataset } from './dataset.js'
2
2
  import { MapboxStyleDataset } from './mapboxStyleDataset.js'
3
3
  import { datasetRegistry } from './datasetRegistry.js'
4
- import { attachGlobalState } from './globalDataset.js'
5
4
  import { hashString } from '../../../../src/utils/hashString.js'
6
5
  // Use the mock datasetRegistry with the demo datasets attached before each test
7
6
  jest.mock('./datasetRegistry.js')
@@ -14,44 +13,44 @@ const globalState = {
14
13
 
15
14
  describe('MapboxStyleDataset', () => {
16
15
  beforeEach(() => {
17
- datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def))
16
+ datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def, datasetRegistry))
18
17
  })
19
18
 
20
19
  describe('_hiddenFeaturesIdExpression', () => {
21
20
  it('uses get(idProperty) when idProperty is set', () => {
22
- const dataset = new MapboxStyleDataset({ idProperty: 'ref' })
21
+ const dataset = new MapboxStyleDataset({ idProperty: 'ref' }, datasetRegistry)
23
22
  expect(dataset._hiddenFeaturesIdExpression).toEqual(['to-string', ['get', 'ref']])
24
23
  })
25
24
 
26
25
  it('uses the feature id when idProperty is not set', () => {
27
- const dataset = new MapboxStyleDataset({})
26
+ const dataset = new MapboxStyleDataset({}, datasetRegistry)
28
27
  expect(dataset._hiddenFeaturesIdExpression).toEqual(['to-string', ['id']])
29
28
  })
30
29
 
31
30
  it('uses the dynamicGeoJSON hiddenFeaturesIdExpression when the dataset is dynamic', () => {
32
- const dataset = new MapboxStyleDataset({ dynamicGeoJSON: { idProperty: 'ref' } })
31
+ const dataset = new MapboxStyleDataset({ dynamicGeoJSON: { idProperty: 'ref' } }, datasetRegistry)
33
32
  expect(dataset._hiddenFeaturesIdExpression).toEqual(['to-string', ['get', 'ref']])
34
33
  })
35
34
  })
36
35
 
37
36
  describe('filter', () => {
38
37
  it('returns null when there is no filter and no hidden features', () => {
39
- const dataset = new MapboxStyleDataset({})
38
+ const dataset = new MapboxStyleDataset({}, datasetRegistry)
40
39
  expect(dataset.filter).toBeNull()
41
40
  })
42
41
 
43
42
  it('returns its own filter expression directly when it is the only filter', () => {
44
- const dataset = new MapboxStyleDataset({ filter: ['==', ['get', 'type'], 'foo'] })
43
+ const dataset = new MapboxStyleDataset({ filter: ['==', ['get', 'type'], 'foo'] }, datasetRegistry)
45
44
  expect(dataset.filter).toEqual(['==', ['get', 'type'], 'foo'])
46
45
  })
47
46
 
48
47
  it('returns the hidden features filter directly when it is the only filter', () => {
49
- const dataset = new MapboxStyleDataset({ hiddenFeatures: [1, 2] })
48
+ const dataset = new MapboxStyleDataset({ hiddenFeatures: [1, 2] }, datasetRegistry)
50
49
  expect(dataset.filter).toEqual(['!', ['in', ['to-string', ['id']], ['literal', ['1', '2']]]])
51
50
  })
52
51
 
53
52
  it('combines its own filter and the hidden features filter with "all"', () => {
54
- const dataset = new MapboxStyleDataset({ filter: ['==', ['get', 'type'], 'foo'], hiddenFeatures: [5] })
53
+ const dataset = new MapboxStyleDataset({ filter: ['==', ['get', 'type'], 'foo'], hiddenFeatures: [5] }, datasetRegistry)
55
54
  expect(dataset.filter).toEqual([
56
55
  'all',
57
56
  ['==', ['get', 'type'], 'foo'],
@@ -63,28 +62,28 @@ describe('MapboxStyleDataset', () => {
63
62
  const parentDef = { id: 'parent', filter: ['==', ['get', 'cat'], 'a'] }
64
63
  const childDef = { id: 'child', parentId: 'parent', filter: ['==', ['get', 'sub'], 'b'] }
65
64
  datasetRegistry.attach({ parent: parentDef, child: childDef })
66
- expect(new MapboxStyleDataset(childDef).filter).toEqual(['all', parentDef.filter, childDef.filter])
65
+ expect(new MapboxStyleDataset(childDef, datasetRegistry).filter).toEqual(['all', parentDef.filter, childDef.filter])
67
66
  })
68
67
  })
69
68
 
70
69
  describe('sourceId', () => {
71
70
  it('returns a tiles-based id for an array of tiles URLs', () => {
72
- const dataset = new MapboxStyleDataset({ id: 'ds', tiles: ['https://example.com/{z}/{x}/{y}'] })
71
+ const dataset = new MapboxStyleDataset({ id: 'ds', tiles: ['https://example.com/{z}/{x}/{y}'] }, datasetRegistry)
73
72
  expect(dataset.sourceId).toBe(`tiles-${hashString('https://example.com/{z}/{x}/{y}')}`)
74
73
  })
75
74
 
76
75
  it('returns geojson-{hash} for a static string geojson url', () => {
77
- const dataset = new MapboxStyleDataset({ id: 'ds', geojson: 'https://example.com/data.geojson' })
76
+ const dataset = new MapboxStyleDataset({ id: 'ds', geojson: 'https://example.com/data.geojson' }, datasetRegistry)
78
77
  expect(dataset.sourceId).toBe(`geojson-${hashString('https://example.com/data.geojson')}`)
79
78
  })
80
79
 
81
80
  it('returns geojson-{id} for an inline geojson object', () => {
82
- const dataset = new MapboxStyleDataset({ id: 'ds', geojson: { type: 'FeatureCollection', features: [] } })
81
+ const dataset = new MapboxStyleDataset({ id: 'ds', geojson: { type: 'FeatureCollection', features: [] } }, datasetRegistry)
83
82
  expect(dataset.sourceId).toBe('geojson-ds')
84
83
  })
85
84
 
86
85
  it('returns source-{id} when there are no tiles and no geojson', () => {
87
- const dataset = new MapboxStyleDataset({ id: 'ds' })
86
+ const dataset = new MapboxStyleDataset({ id: 'ds' }, datasetRegistry)
88
87
  expect(dataset.sourceId).toBe('source-ds')
89
88
  })
90
89
 
@@ -92,20 +91,20 @@ describe('MapboxStyleDataset', () => {
92
91
  const parentDef = { id: 'parent', geojson: { type: 'FeatureCollection', features: [] } }
93
92
  const childDef = { id: 'child', parentId: 'parent' }
94
93
  datasetRegistry.attach({ parent: parentDef, child: childDef })
95
- expect(new MapboxStyleDataset(childDef).sourceId).toBe('geojson-parent')
94
+ expect(new MapboxStyleDataset(childDef, datasetRegistry).sourceId).toBe('geojson-parent')
96
95
  })
97
96
  })
98
97
 
99
98
  describe('leafLayerIds / layerIds', () => {
100
99
  it('leafLayerIds defaults to an empty array on the base class', () => {
101
- expect(new MapboxStyleDataset({ id: 'ds' }).leafLayerIds).toEqual([])
100
+ expect(new MapboxStyleDataset({ id: 'ds' }, datasetRegistry).leafLayerIds).toEqual([])
102
101
  })
103
102
 
104
103
  it('layerIds returns leafLayerIds for a dataset with no sublayers', () => {
105
104
  class FakeAdapterDataset extends MapboxStyleDataset {
106
105
  get leafLayerIds () { return [this.id] }
107
106
  }
108
- const dataset = new FakeAdapterDataset({ id: 'ds' })
107
+ const dataset = new FakeAdapterDataset({ id: 'ds' }, datasetRegistry)
109
108
  expect(dataset.layerIds).toEqual(['ds'])
110
109
  })
111
110
 
@@ -117,14 +116,14 @@ describe('MapboxStyleDataset', () => {
117
116
  // attach() call alone does not reset — restore this file's own default afterward so this
118
117
  // doesn't leak into other tests in this file.
119
118
  try {
120
- datasetRegistry.attachCreateDataset(def => new FakeAdapterDataset(def))
119
+ datasetRegistry.attachCreateDataset(def => new FakeAdapterDataset(def, datasetRegistry))
121
120
  const parentDef = { id: 'parent', sublayerIds: ['child-a', 'child-b'] }
122
121
  const childA = { id: 'child-a', parentId: 'parent' }
123
122
  const childB = { id: 'child-b', parentId: 'parent' }
124
123
  datasetRegistry.attach({ parent: parentDef, 'child-a': childA, 'child-b': childB })
125
124
  expect(datasetRegistry.getDataset('parent').layerIds).toEqual(['child-a', 'child-b'])
126
125
  } finally {
127
- datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def))
126
+ datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def, datasetRegistry))
128
127
  }
129
128
  })
130
129
  })
@@ -142,12 +141,12 @@ describe('MapboxStyleDataset', () => {
142
141
  beforeEach(() => {
143
142
  // visibility/opacity both fold in global state (see globalDataset.js) — set explicitly
144
143
  // here rather than relying on whatever an earlier test in this file last left it as.
145
- attachGlobalState(globalState)
146
- datasetRegistry.attachCreateDataset(def => new FakeAdapterDataset(def))
144
+ datasetRegistry.attachGlobals(globalState)
145
+ datasetRegistry.attachCreateDataset(def => new FakeAdapterDataset(def, datasetRegistry))
147
146
  })
148
147
 
149
148
  afterEach(() => {
150
- datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def))
149
+ datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def, datasetRegistry))
151
150
  })
152
151
 
153
152
  describe('getLayersWithVisibility', () => {
@@ -168,7 +167,7 @@ describe('MapboxStyleDataset', () => {
168
167
 
169
168
  describe('getLayersWithOpacity', () => {
170
169
  it('returns layerIds and opacity for a top-level dataset with no sublayers', () => {
171
- const dataset = new FakeAdapterDataset({ id: 'ds', style: { opacity: 0.4 } })
170
+ const dataset = new FakeAdapterDataset({ id: 'ds', style: { opacity: 0.4 } }, datasetRegistry)
172
171
  expect(dataset.getLayersWithOpacity()).toEqual([{ layerIds: ['ds'], opacity: 0.4 }])
173
172
  })
174
173
 
@@ -190,7 +189,7 @@ describe('MapboxStyleDataset', () => {
190
189
  class UnevenAdapterDataset extends MapboxStyleDataset {
191
190
  get leafLayerIds () { return this.style?.renderable ? [this.id] : [] }
192
191
  }
193
- datasetRegistry.attachCreateDataset(def => new UnevenAdapterDataset(def))
192
+ datasetRegistry.attachCreateDataset(def => new UnevenAdapterDataset(def, datasetRegistry))
194
193
  const parentDef = { id: 'parent', sublayerIds: ['child-renderable', 'child-unsupported'] }
195
194
  const childRenderable = { id: 'child-renderable', parentId: 'parent', style: { renderable: true, opacity: 0.5 } }
196
195
  const childUnsupported = { id: 'child-unsupported', parentId: 'parent', style: { opacity: 0.9 } }
@@ -203,12 +202,12 @@ describe('MapboxStyleDataset', () => {
203
202
 
204
203
  describe('getLayersWithFilters', () => {
205
204
  it('returns an empty array when there are no hidden features and no sublayers', () => {
206
- const dataset = new FakeAdapterDataset({ id: 'ds' })
205
+ const dataset = new FakeAdapterDataset({ id: 'ds' }, datasetRegistry)
207
206
  expect(dataset.getLayersWithFilters()).toEqual([])
208
207
  })
209
208
 
210
209
  it('returns an entry with layerIds and filter when the dataset has hidden features', () => {
211
- const dataset = new FakeAdapterDataset({ id: 'ds', hiddenFeatures: [1, 2] })
210
+ const dataset = new FakeAdapterDataset({ id: 'ds', hiddenFeatures: [1, 2] }, datasetRegistry)
212
211
  expect(dataset.getLayersWithFilters()).toEqual([{
213
212
  layerIds: ['ds'],
214
213
  filter: ['!', ['in', ['to-string', ['id']], ['literal', ['1', '2']]]]
@@ -235,6 +234,6 @@ describe('MapboxStyleDataset', () => {
235
234
  })
236
235
 
237
236
  it('extends the base Dataset class', () => {
238
- expect(new MapboxStyleDataset({})).toBeInstanceOf(Dataset)
237
+ expect(new MapboxStyleDataset({}, datasetRegistry)).toBeInstanceOf(Dataset)
239
238
  })
240
239
  })
@@ -0,0 +1,13 @@
1
+ export const hasLayersMenu = ({ pluginConfig, pluginState }) => {
2
+ if (pluginConfig.hasMenu === false) {
3
+ return false
4
+ }
5
+
6
+ // Before initialisation the live menu is empty, so use the configured datasets.
7
+ // Once initialised, an empty live menu also covers removal of the last dataset.
8
+ return pluginState.menuInitialised
9
+ ? pluginState.menu.length > 0
10
+ : (pluginConfig.datasets || []).some(dataset =>
11
+ dataset.showInMenu || dataset.sublayers?.some(sublayer => sublayer.showInMenu)
12
+ )
13
+ }
@@ -0,0 +1,25 @@
1
+ import { hasLayersMenu } from './hasLayersMenu.js'
2
+
3
+ const dataset = { id: 'roads', label: 'Roads', showInMenu: true }
4
+ const menu = [{ id: 'roads', items: [{ id: 'roads' }] }]
5
+ const loading = { menu: [], menuInitialised: false }
6
+
7
+ describe('hasLayersMenu', () => {
8
+ it.each([
9
+ ['no configured datasets', {}, false],
10
+ ['datasets without showInMenu', { datasets: [{ id: 'roads' }] }, false],
11
+ ['a configured menu dataset', { datasets: [dataset] }, true],
12
+ ['a configured menu sublayer', { datasets: [{ id: 'parent', sublayers: [dataset] }] }, true],
13
+ ['an explicitly disabled menu', { hasMenu: false, datasets: [dataset] }, false]
14
+ ])('uses the configuration before the menu has loaded: %s', (_, pluginConfig, expected) => {
15
+ expect(hasLayersMenu({ pluginConfig, pluginState: loading })).toBe(expected)
16
+ })
17
+
18
+ it.each([
19
+ ['an empty live menu', { datasets: [dataset] }, [], false],
20
+ ['a populated live menu', { datasets: [] }, menu, true],
21
+ ['an explicitly disabled menu', { hasMenu: false }, menu, false]
22
+ ])('uses the live menu once it has loaded: %s', (_, pluginConfig, liveMenu, expected) => {
23
+ expect(hasLayersMenu({ pluginConfig, pluginState: { menu: liveMenu, menuInitialised: true } })).toBe(expected)
24
+ })
25
+ })