@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
@@ -4,16 +4,16 @@ import { getRingSegments } from './geometryHelpers.js'
4
4
  // fireGeometryChange/emitGeometryValidation/pushUndo are the shared mixin from
5
5
  // utils/geometryValidation.js — their own behaviour is covered by
6
6
  // utils/geometryValidation.test.js. This file only tests what's specific to editVertexMode:
7
- // pushUndo's UNDO_OP_PHASE wiring, handleUndo's per-op-type dispatch, and the
7
+ // pushUndo's validation, handleUndo's per-op-type dispatch, and the
8
8
  // undoMoveVertex/undoInsertVertex/undoDeleteVertex ring operations themselves.
9
9
  describe('undoHandlers', () => {
10
- test('pushUndo maps each op type to its commit phase', () => {
10
+ test('pushUndo validates each op type as a change', () => {
11
11
  jest.useFakeTimers()
12
12
  const { ctx, map } = createHarness()
13
13
  map.fire.mockClear()
14
14
  ctx.pushUndo({ type: 'move_vertex', featureId: 'feat-1', vertexIndex: 2 })
15
15
  jest.runAllTimers()
16
- expect(map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({ phase: 'commit-move', vertexIndex: 2 }))
16
+ expect(map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({ phase: 'change', vertexIndex: 2 }))
17
17
  jest.useRealTimers()
18
18
  })
19
19
 
@@ -42,7 +42,7 @@ describe('undoHandlers', () => {
42
42
  ctx.handleUndo(state)
43
43
  jest.runAllTimers()
44
44
  expect(map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({
45
- phase: 'commit-insert',
45
+ phase: 'change',
46
46
  vertexIndex: 1,
47
47
  feature: expect.any(Object)
48
48
  }))
@@ -88,4 +88,41 @@ describe('undoHandlers', () => {
88
88
  ctx.undoDeleteVertex(state, { vertexIndex: seg.start + seg.length, position: [2, 2], featureId: 'feat-1' })
89
89
  expect(ctx.getVertices('feat-1')).toHaveLength(6)
90
90
  })
91
+
92
+ describe('setGeometry', () => {
93
+ const replacement = { type: 'Polygon', coordinates: [[[0, 0], [20, 0], [20, 20], [0, 20], [0, 0]]] }
94
+
95
+ test('replaces the shape on draw.setgeometry, clears the selection and re-validates as a change', () => {
96
+ jest.useFakeTimers()
97
+ const { ctx, map } = createHarness()
98
+ const changeMode = jest.spyOn(ctx, 'changeMode')
99
+ map.fire.mockClear()
100
+ map.fire('draw.setgeometry', { geometry: replacement })
101
+ expect(ctx.getFeature('feat-1').toGeoJSON().geometry).toEqual(replacement)
102
+ expect(changeMode).toHaveBeenCalledWith(expect.anything(), { selectedVertexIndex: -1, selectedVertexType: null })
103
+ jest.runAllTimers()
104
+ expect(map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({ phase: 'change' }))
105
+ jest.useRealTimers()
106
+ })
107
+
108
+ test('undo restores the previous shape and re-validates as a change', () => {
109
+ jest.useFakeTimers()
110
+ const { ctx, state, map } = createHarness()
111
+ const original = ctx.getFeature('feat-1').toGeoJSON().geometry
112
+ map.fire('draw.setgeometry', { geometry: replacement })
113
+ jest.runAllTimers()
114
+ map.fire.mockClear()
115
+ ctx.handleUndo(state)
116
+ expect(ctx.getFeature('feat-1').toGeoJSON().geometry).toEqual(original)
117
+ jest.runAllTimers()
118
+ expect(map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({ phase: 'change' }))
119
+ jest.useRealTimers()
120
+ })
121
+
122
+ test('guards a missing feature', () => {
123
+ const { ctx, state } = createHarness()
124
+ expect(() => ctx.onSetGeometry({ ...state, featureId: 'missing' }, { geometry: replacement })).not.toThrow()
125
+ expect(() => ctx.replaceGeometry(state, 'missing', replacement)).not.toThrow()
126
+ })
127
+ })
91
128
  })
@@ -79,7 +79,8 @@ export const EditVertexMode = {
79
79
  selectionchange: this.onSelectionChange,
80
80
  update: this.onUpdate,
81
81
  selectvertex: this.onSelectVertex,
82
- insertvertexatmidpoint: this.onInsertVertexAtMidpoint
82
+ insertvertexatmidpoint: this.onInsertVertexAtMidpoint,
83
+ setgeometry: this.onSetGeometry
83
84
  })
84
85
 
85
86
  bindEditModeListeners(state, this.map, handlers)
@@ -197,6 +198,16 @@ export const EditVertexMode = {
197
198
  this.insertVertex({ ...state, selectedVertexIndex: event.index, selectedVertexType: 'midpoint' })
198
199
  },
199
200
 
201
+ // Inbound signal from MaplibreDrawAdapter.setGeometry — replaces the whole shape (e.g. a
202
+ // corrected boundary from the consumer) as one undoable commit.
203
+ onSetGeometry (state, event) {
204
+ const feature = this.getFeature(state.featureId)
205
+ if (!feature) { return }
206
+ const previousGeometry = feature.toGeoJSON().geometry
207
+ this.replaceGeometry(state, state.featureId, event.geometry)
208
+ this.pushUndo({ type: 'replace_geometry', featureId: state.featureId, previousGeometry })
209
+ },
210
+
200
211
  onButtonClick (state, event) {
201
212
  if (event.target.closest(`#${state.deleteVertexButtonId}`) && state.selectedVertexType === 'vertex') {
202
213
  this.deleteVertex(state)
@@ -4,7 +4,7 @@ import { getSnapInstance, clearSnapIndicator } from './snapHelpers.js'
4
4
  // Builds the `handlers` map both modes' setupEventListeners bind to bindEditModeListeners —
5
5
  // the base set of window/container/scale/move/interface-type-change handlers is identical
6
6
  // in both, bound to whichever mode instance is passed in; `extra` supplies the handlers that
7
- // differ per mode (nudge, plus edit_vertex's own selectionchange/update).
7
+ // differ per mode (nudge and setgeometry, plus edit_vertex's own selectionchange/update).
8
8
  export const buildEditModeHandlers = (mode, state, extra = {}) => {
9
9
  const bind = (handler) => (event) => handler.call(mode, state, event)
10
10
  const handlers = {
@@ -48,6 +48,7 @@ export const bindEditModeListeners = (state, map, handlers) => {
48
48
  map.on('move', handlers.move)
49
49
  map.on(CUSTOM_DRAW_EVENTS.INTERFACE_TYPE_CHANGE, handlers.interfacetypechange)
50
50
  map.on(CUSTOM_DRAW_EVENTS.NUDGE_VERTEX, handlers.nudge)
51
+ map.on(CUSTOM_DRAW_EVENTS.SET_GEOMETRY, handlers.setgeometry)
51
52
  }
52
53
 
53
54
  // Mirrors bindEditModeListeners, plus the dragPan re-enable both modes' onStop does right
@@ -63,6 +64,7 @@ export const unbindEditModeListeners = (state, map, handlers) => {
63
64
  map.off('move', handlers.move)
64
65
  map.off(CUSTOM_DRAW_EVENTS.INTERFACE_TYPE_CHANGE, handlers.interfacetypechange)
65
66
  map.off(CUSTOM_DRAW_EVENTS.NUDGE_VERTEX, handlers.nudge)
67
+ map.off(CUSTOM_DRAW_EVENTS.SET_GEOMETRY, handlers.setgeometry)
66
68
  map.dragPan.enable()
67
69
  window.removeEventListener('click', handlers.click)
68
70
  window.removeEventListener('keydown', handlers.keydown, { capture: true })
@@ -1,8 +1,9 @@
1
+ import { CHANGE_PHASE } from '../../../adapterEvents.js'
2
+
1
3
  // Shared by editPointMode/undoHandlers.js and editVertexMode/undoHandlers.js — recording an
2
4
  // undo op and feeding it to commit-level validation is identical plumbing for both modes; only
3
5
  // the op types themselves differ (a Point only ever moves, a ring vertex can also be inserted
4
- // or deleted), which each mode still declares locally via its own UNDO_OP_PHASE/
5
- // UNDO_INVERSE_PHASE maps (read here off `this`, since pushUndo is mixed into both modes).
6
+ // or deleted).
6
7
  export const sharedUndoHandlers = {
7
8
  // Fire geometry change event (for external listeners)
8
9
  fireGeometryChange (state) {
@@ -15,16 +16,14 @@ export const sharedUndoHandlers = {
15
16
  }
16
17
  },
17
18
 
18
- // Emit a commit-level geometrychange (feature + change phase + vertex index) so the
19
- // validation layer can accept or reject the change. Deferred a tick to avoid
20
- // re-entrancy: rejection calls draw.undo(), which must run after the current
21
- // mutation (and its undo bookkeeping) has fully settled.
22
- emitGeometryValidation (phase, vertexIndex, featureId) {
23
- if (!phase) { return }
19
+ // Emit a commit-level geometrychange (feature + 'change' phase + vertex index) so the
20
+ // validation layer can gate the Done button. Deferred a tick so it reports the shape
21
+ // after the current mutation (and its undo bookkeeping) has fully settled.
22
+ emitGeometryValidation (vertexIndex, featureId) {
24
23
  setTimeout(() => {
25
24
  const feature = this.getFeature(featureId)
26
25
  if (!feature) { return }
27
- this.map.fire('draw.geometrychange', { feature: feature.toGeoJSON(), phase, vertexIndex })
26
+ this.map.fire('draw.geometrychange', { feature: feature.toGeoJSON(), phase: CHANGE_PHASE, vertexIndex })
28
27
  }, 0)
29
28
  },
30
29
 
@@ -37,6 +36,6 @@ export const sharedUndoHandlers = {
37
36
  undoStack.push(operation)
38
37
  // Every edit commit (move/insert/delete, via mouse/touch/keyboard/D-pad) records an undo
39
38
  // op here, so this is the single point that feeds commit-level validation.
40
- this.emitGeometryValidation(this.UNDO_OP_PHASE[operation.type], operation.vertexIndex, operation.featureId)
39
+ this.emitGeometryValidation(operation.vertexIndex, operation.featureId)
41
40
  }
42
41
  }
@@ -3,7 +3,6 @@ import { createUndoStack } from '../../../utils/undoStack.js'
3
3
 
4
4
  const makeCtx = (overrides = {}) => ({
5
5
  ...sharedUndoHandlers,
6
- UNDO_OP_PHASE: { move: 'commit-move' },
7
6
  map: { fire: jest.fn(), _undoStack: createUndoStack(() => {}) },
8
7
  getFeature: jest.fn((id) => (id === 'missing' ? undefined : { toGeoJSON: () => ({ type: 'Feature', id }) })),
9
8
  ...overrides
@@ -22,25 +21,16 @@ describe('fireGeometryChange', () => {
22
21
  })
23
22
 
24
23
  describe('emitGeometryValidation', () => {
25
- test('does nothing without a phase', () => {
26
- jest.useFakeTimers()
27
- const ctx = makeCtx()
28
- ctx.emitGeometryValidation(undefined, 0, 'feat-1')
29
- jest.runAllTimers()
30
- expect(ctx.map.fire).not.toHaveBeenCalled()
31
- jest.useRealTimers()
32
- })
33
-
34
24
  test('fires a deferred draw.geometrychange with the phase, vertexIndex and feature', () => {
35
25
  jest.useFakeTimers()
36
26
  const ctx = makeCtx()
37
- ctx.emitGeometryValidation('commit-move', 2, 'feat-1')
27
+ ctx.emitGeometryValidation(2, 'feat-1')
38
28
  // Deferred a tick to avoid re-entrancy — nothing fired synchronously.
39
29
  expect(ctx.map.fire).not.toHaveBeenCalled()
40
30
 
41
31
  jest.runAllTimers()
42
32
  expect(ctx.map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({
43
- phase: 'commit-move',
33
+ phase: 'change',
44
34
  vertexIndex: 2,
45
35
  feature: expect.any(Object)
46
36
  }))
@@ -50,7 +40,7 @@ describe('emitGeometryValidation', () => {
50
40
  test('does not fire once the feature is gone', () => {
51
41
  jest.useFakeTimers()
52
42
  const ctx = makeCtx()
53
- ctx.emitGeometryValidation('commit-move', 0, 'missing')
43
+ ctx.emitGeometryValidation(0, 'missing')
54
44
  jest.runAllTimers()
55
45
  expect(ctx.map.fire).not.toHaveBeenCalled()
56
46
  jest.useRealTimers()
@@ -63,23 +53,14 @@ describe('pushUndo', () => {
63
53
  expect(() => ctx.pushUndo({ type: 'move' })).not.toThrow()
64
54
  })
65
55
 
66
- test('pushes the operation and emits validation for a mapped op type', () => {
56
+ test('pushes the operation and emits validation as a change', () => {
67
57
  jest.useFakeTimers()
68
58
  const ctx = makeCtx()
69
59
  ctx.pushUndo({ type: 'move', featureId: 'feat-1', vertexIndex: 0 })
70
60
  expect(ctx.map._undoStack.length).toBe(1)
71
61
 
72
62
  jest.runAllTimers()
73
- expect(ctx.map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({ phase: 'commit-move' }))
74
- jest.useRealTimers()
75
- })
76
-
77
- test('does not emit validation for an unmapped op type', () => {
78
- jest.useFakeTimers()
79
- const ctx = makeCtx()
80
- ctx.pushUndo({ type: 'unmapped', featureId: 'feat-1' })
81
- jest.runAllTimers()
82
- expect(ctx.map.fire).not.toHaveBeenCalled()
63
+ expect(ctx.map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({ phase: 'change' }))
83
64
  jest.useRealTimers()
84
65
  })
85
66
  })
@@ -27,6 +27,7 @@ const DRAW_OUTLINE_STYLE_LAYER = 'stroke-inactive.cold'
27
27
  * done() / cancel() / undo() / deleteVertex()
28
28
  * nudgeSelectedVertex(dx, dy, isLargeStep)
29
29
  * getVertexItems() / selectVertex(index) / insertVertexAtMidpoint(index)
30
+ * setGeometry(geometry)
30
31
  * get(id) / add(feature) / setStyle(id, properties) / delete(id) / deleteAll()
31
32
  * setSnapEnabled(bool) / setSnapLayers(layers) / isSnapEnabled()
32
33
  * setFeatureProperty(id, property, value) / setDrawingPreviewProperty(property, value)
@@ -83,15 +84,17 @@ export class OLDrawAdapter {
83
84
  getVertexItems () { return this._manager.getVertexItems() }
84
85
  selectVertex (index) { this._manager.selectVertex(index) }
85
86
  insertVertexAtMidpoint (index) { this._manager.insertVertexAtMidpoint(index) }
87
+ setGeometry (geometry) { this._manager.setGeometry(geometry) }
86
88
 
87
- // Record the current geometry validity so the draw mode can block finish gestures
88
- // (double-click / click-to-close) while the in-progress shape is invalid.
89
- setGeometryValid (valid) { this._manager._geometryValid = valid }
89
+ // Record whether the in-progress shape can be finished, so the draw mode can block finish
90
+ // gestures (double-click / click-to-close) while its latest check has failed.
91
+ setCanFinish (canFinish) { this._manager._canFinish = canFinish }
90
92
 
91
- // The api entry points assign the active user validator to the adapter; store it
92
- // on the manager so the draw mode can veto placements synchronously.
93
- set _geometryValidator (fn) { this._manager._geometryValidator = fn }
94
- get _geometryValidator () { return this._manager._geometryValidator }
93
+ // The api entry points assign the session's onGeometryPreview callback to the adapter
94
+ // (see validation/commitChecks.js's startCheckSession); store it on the manager so the
95
+ // draw mode can veto placements synchronously.
96
+ set _previewValidator (fn) { this._manager._previewValidator = fn }
97
+ get _previewValidator () { return this._manager._previewValidator }
95
98
 
96
99
  // Show/hide the dashed invalid stroke on the active sketch or edit feature.
97
100
  setInvalid (invalid) { this._manager.setInvalid(invalid) }
@@ -19,6 +19,7 @@ const fakeManager = () => ({
19
19
  getVertexItems: jest.fn(() => ({ vertices: [[0, 0]], midpoints: [] })),
20
20
  selectVertex: jest.fn(),
21
21
  insertVertexAtMidpoint: jest.fn(),
22
+ setGeometry: jest.fn(),
22
23
  setInvalid: jest.fn(),
23
24
  setDrawingPreviewProperty: jest.fn(),
24
25
  get: jest.fn(() => 'feature'),
@@ -147,6 +148,10 @@ test('remaining calls delegate straight through; setFeatureProperty is a deliber
147
148
  adapter.insertVertexAtMidpoint(3)
148
149
  expect(manager.selectVertex).toHaveBeenCalledWith(2)
149
150
  expect(manager.insertVertexAtMidpoint).toHaveBeenCalledWith(3)
151
+
152
+ const geometry = { type: 'Polygon', coordinates: [] }
153
+ adapter.setGeometry(geometry)
154
+ expect(manager.setGeometry).toHaveBeenCalledWith(geometry)
150
155
  })
151
156
 
152
157
  // A directly-added Point skips draw_point's own icon-resolving drawend handler.
@@ -231,18 +236,18 @@ describe('setStyle()', () => {
231
236
  })
232
237
  })
233
238
 
234
- test('setGeometryValid records validity on the manager for finish gating', () => {
239
+ test('setCanFinish records validity on the manager for finish gating', () => {
235
240
  const { adapter, manager } = setup()
236
- adapter.setGeometryValid(false)
237
- expect(manager._geometryValid).toBe(false)
241
+ adapter.setCanFinish(false)
242
+ expect(manager._canFinish).toBe(false)
238
243
  })
239
244
 
240
- test('_geometryValidator accessor stores and retrieves the user callback on the manager', () => {
245
+ test('_previewValidator accessor stores and retrieves the preview callback on the manager', () => {
241
246
  const { adapter, manager } = setup()
242
247
  const validator = jest.fn(() => ({ valid: true }))
243
- adapter._geometryValidator = validator
244
- expect(manager._geometryValidator).toBe(validator)
245
- expect(adapter._geometryValidator).toBe(validator)
248
+ adapter._previewValidator = validator
249
+ expect(manager._previewValidator).toBe(validator)
250
+ expect(adapter._previewValidator).toBe(validator)
246
251
  })
247
252
 
248
253
  test('setInvalid delegates to the manager to toggle the dashed stroke', () => {
@@ -175,6 +175,11 @@ export class OLDrawManager {
175
175
  this._modeInstance?.insertVertexAtMidpoint?.(index)
176
176
  }
177
177
 
178
+ // Replaces the edited shape as one undoable commit. Only the edit modes implement it.
179
+ setGeometry (geometry) {
180
+ this._modeInstance?.setGeometry?.(geometry)
181
+ }
182
+
178
183
  // Show/hide the dashed invalid stroke on the active draw sketch or edit feature.
179
184
  setInvalid (invalid) {
180
185
  this._modeInstance?.setInvalid?.(invalid)
@@ -29,7 +29,8 @@ jest.mock('../edit/EditMode.js', () => ({
29
29
  setInvalid: jest.fn(),
30
30
  getVertexItems: jest.fn(() => ({ vertices: [[0, 0]], midpoints: [] })),
31
31
  selectVertex: jest.fn(),
32
- insertVertexAtMidpoint: jest.fn()
32
+ insertVertexAtMidpoint: jest.fn(),
33
+ setGeometry: jest.fn()
33
34
  }))
34
35
  }))
35
36
  jest.mock('../point/editPointMode.js', () => ({
@@ -144,7 +145,7 @@ describe('mode machine', () => {
144
145
  manager.done(); manager.undo(); manager.deleteVertex(); manager.nudgeSelectedVertex(1, 0, true); manager.setInterfaceType('touch'); manager.setInvalid(true) // no mode — no throw
145
146
  manager.setDrawingPreviewProperty('splitter', 'valid') // no mode — no throw
146
147
  expect(manager.getVertexItems()).toEqual({ vertices: [], midpoints: [] }) // no mode — safe default
147
- manager.selectVertex(1); manager.insertVertexAtMidpoint(1) // no mode — no throw
148
+ manager.selectVertex(1); manager.insertVertexAtMidpoint(1); manager.setGeometry({}) // no mode — no throw
148
149
 
149
150
  manager.changeMode('draw_polygon')
150
151
  const instance = createDrawMode.mock.results[0].value
@@ -172,7 +173,7 @@ describe('mode machine', () => {
172
173
  expect(manager.getMode()).toBe('disabled')
173
174
  })
174
175
 
175
- test('getVertexItems/selectVertex/insertVertexAtMidpoint delegate to the edit_vertex mode instance', () => {
176
+ test('getVertexItems/selectVertex/insertVertexAtMidpoint/setGeometry delegate to the edit_vertex mode instance', () => {
176
177
  const { manager } = setup()
177
178
  manager.changeMode('edit_vertex', { featureId: 'f1' })
178
179
  const instance = createEditMode.mock.results[0].value
@@ -180,8 +181,11 @@ describe('mode machine', () => {
180
181
  expect(manager.getVertexItems()).toEqual({ vertices: [[0, 0]], midpoints: [] })
181
182
  manager.selectVertex(2)
182
183
  manager.insertVertexAtMidpoint(3)
184
+ const geometry = { type: 'Polygon', coordinates: [] }
185
+ manager.setGeometry(geometry)
183
186
  expect(instance.selectVertex).toHaveBeenCalledWith(2)
184
187
  expect(instance.insertVertexAtMidpoint).toHaveBeenCalledWith(3)
188
+ expect(instance.setGeometry).toHaveBeenCalledWith(geometry)
185
189
  })
186
190
  })
187
191
 
@@ -5,7 +5,7 @@ import Icon from 'ol/style/Icon.js'
5
5
  import { createStyles } from './styles.js'
6
6
  import { SIZES } from '../defaults.js'
7
7
  import { polygonFeature, lineFeature, pointFeature } from '../__helpers__/harness.js'
8
- import { SymbolImageCache } from '../../../../../../providers/beta/openlayers/src/utils/symbolImages.js'
8
+ import { SymbolImageCache } from '../../../../../../providers/openlayers/src/utils/symbolImages.js'
9
9
 
10
10
  const colors = {
11
11
  editStroke: '#e5',
@@ -3,7 +3,7 @@ import { noModifierKeys } from 'ol/events/condition.js'
3
3
  import { createDrawInput } from './drawInput.js'
4
4
  import { getPlacedSketchCoords, getLastPlacedSketchCoord } from '../utils/sketchHelpers.js'
5
5
  import { TOLERANCES } from '../defaults.js'
6
- import { ADAPTER_EVENTS } from '../../../adapterEvents.js'
6
+ import { ADAPTER_EVENTS, CHANGE_PHASE } from '../../../adapterEvents.js'
7
7
  import { STYLES_CHANGED_EVENT } from '../core/internalEvents.js'
8
8
  import { attemptPlacement, MODE_BY_GEOMETRY } from '../../../validation/validateGeometry.js'
9
9
  import { MIN_VERTICES } from '../../../validation/rules.js'
@@ -52,7 +52,7 @@ const placedFeatureGeoJSON = (store, sketchFeature) => {
52
52
  }
53
53
 
54
54
  // Attempt a placement (mouse click, crosshair tap, Enter) through the shared
55
- // hard rules + user callback. On a veto the vertex never appears and a
55
+ // placement rules + user callback. On a veto the vertex never appears and a
56
56
  // PLACEMENT_BLOCKED event carries the reason.
57
57
  export const buildCanPlaceVertex = ({ manager, geometryType, getSketch }) => (coordinate) => {
58
58
  const sketch = getSketch()
@@ -60,7 +60,7 @@ export const buildCanPlaceVertex = ({ manager, geometryType, getSketch }) => (co
60
60
  placed: sketch ? getPlacedSketchCoords(sketch.getGeometry()) : [],
61
61
  point: coordinate,
62
62
  geometryType,
63
- onGeometryChange: manager._geometryValidator
63
+ onGeometryPreview: manager._previewValidator
64
64
  })
65
65
  if (!result.valid) {
66
66
  manager.emit(ADAPTER_EVENTS.PLACEMENT_BLOCKED, result.blocked)
@@ -102,15 +102,15 @@ const attachDrawListeners = (drawInteraction, { manager, featureId, properties,
102
102
  }
103
103
 
104
104
  // Tracks placed-vertex count and emits VERTEX_CHANGE plus, on each genuine placement,
105
- // a commit-level GEOMETRY_CHANGE ('commit-add') for validation. Deferred a tick so a
106
- // rejection's revert runs after the current click settles.
105
+ // a commit-level GEOMETRY_CHANGE ('change') for validation. Deferred a tick so it
106
+ // reports the shape after the current click settles.
107
107
  const createVertexTracker = (manager, getSketch) => {
108
108
  let lastPlacedCount = 0
109
- const emit = (phase, vertexIndex) => {
109
+ const emit = (vertexIndex) => {
110
110
  setTimeout(() => {
111
111
  const sketch = getSketch()
112
112
  if (!sketch) { return }
113
- manager.emit(ADAPTER_EVENTS.GEOMETRY_CHANGE, { feature: placedFeatureGeoJSON(manager.store, sketch), phase, vertexIndex })
113
+ manager.emit(ADAPTER_EVENTS.GEOMETRY_CHANGE, { feature: placedFeatureGeoJSON(manager.store, sketch), phase: CHANGE_PHASE, vertexIndex })
114
114
  }, 0)
115
115
  }
116
116
  return {
@@ -120,7 +120,7 @@ const createVertexTracker = (manager, getSketch) => {
120
120
  if (!sketch) { return }
121
121
  const placed = getPlacedSketchCoords(sketch.getGeometry()).length
122
122
  manager.emit(ADAPTER_EVENTS.VERTEX_CHANGE, { numVertices: placed })
123
- if (placed > lastPlacedCount) { emit('commit-add', placed - 1) }
123
+ if (placed > lastPlacedCount) { emit(placed - 1) }
124
124
  lastPlacedCount = placed
125
125
  },
126
126
  // An undo commits a vertex removal, so it must re-validate like any other
@@ -128,7 +128,7 @@ const createVertexTracker = (manager, getSketch) => {
128
128
  emitUndoValidation: () => {
129
129
  const sketch = getSketch()
130
130
  if (!sketch) { return }
131
- emit('commit-delete', getPlacedSketchCoords(sketch.getGeometry()).length)
131
+ emit(getPlacedSketchCoords(sketch.getGeometry()).length)
132
132
  }
133
133
  }
134
134
  }
@@ -196,7 +196,7 @@ export const createDrawMode = ({ map, manager, options }) => {
196
196
  snapTolerance: TOLERANCES.snapRadius,
197
197
  condition: buildCondition(map, geometryType, () => sketchFeature, canPlaceVertex),
198
198
  // Block finish gestures (double-click / click-to-close) while the shape is invalid.
199
- finishCondition: () => manager._geometryValid !== false
199
+ finishCondition: () => manager._canFinish !== false
200
200
  })
201
201
  map.addInteraction(drawInteraction)
202
202
 
@@ -221,7 +221,7 @@ export const createDrawMode = ({ map, manager, options }) => {
221
221
  const updateLiveValidity = () => {
222
222
  if (!sketchFeature) { return }
223
223
  const { feature, numVertices } = displayedSketch(geometryType, sketchFeature)
224
- liveDrawChecks.update({ feature, context: { mode: liveMode }, numVertices, onGeometryChange: manager._geometryValidator })
224
+ liveDrawChecks.update({ feature, context: { mode: liveMode }, numVertices, onGeometryPreview: manager._previewValidator })
225
225
  }
226
226
 
227
227
  // Update sketch style when map style changes
@@ -87,7 +87,7 @@ describe('buildCanPlaceVertex', () => {
87
87
  const gateFor = (ring, manager) =>
88
88
  buildCanPlaceVertex({ manager, geometryType: 'Polygon', getSketch: () => (ring ? polygonFeature(ring) : null) })
89
89
 
90
- test('a hard-rule veto emits PLACEMENT_BLOCKED with the candidate and reason', () => {
90
+ test('a placement-rule veto emits PLACEMENT_BLOCKED with the candidate and reason', () => {
91
91
  const manager = createFakeManager()
92
92
  const gate = gateFor([[0, 0], [2, 2], [2, 0], [9, 9], [0, 0]], manager)
93
93
  expect(gate([0, 2])).toBe(false)
@@ -102,7 +102,7 @@ describe('buildCanPlaceVertex', () => {
102
102
 
103
103
  test('the user callback can veto a placement (and receives phase "place")', () => {
104
104
  const manager = createFakeManager()
105
- manager._geometryValidator = jest.fn((event) =>
105
+ manager._previewValidator = jest.fn((event) =>
106
106
  event.phase === 'place' ? { valid: false, reason: 'outside region' } : { valid: true })
107
107
  const gate = gateFor([[0, 0], [2, 0], [9, 9], [0, 0]], manager)
108
108
  expect(gate([5, 5])).toBe(false)
@@ -112,7 +112,7 @@ describe('buildCanPlaceVertex', () => {
112
112
 
113
113
  test('the user callback can veto the very first vertex (no sketch yet)', () => {
114
114
  const manager = createFakeManager()
115
- manager._geometryValidator = () => ({ valid: false, reason: 'outside region' })
115
+ manager._previewValidator = () => ({ valid: false, reason: 'outside region' })
116
116
  const gate = gateFor(null, manager)
117
117
  expect(gate([5, 5])).toBe(false)
118
118
  expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.PLACEMENT_BLOCKED,
@@ -121,7 +121,7 @@ describe('buildCanPlaceVertex', () => {
121
121
 
122
122
  test('a valid placement passes and emits nothing', () => {
123
123
  const manager = createFakeManager()
124
- manager._geometryValidator = jest.fn(() => true)
124
+ manager._previewValidator = jest.fn(() => true)
125
125
  const gate = gateFor([[0, 0], [2, 0], [9, 9], [0, 0]], manager)
126
126
  expect(gate([2, 2])).toBe(true)
127
127
  expect(manager.emit).not.toHaveBeenCalled()
@@ -139,9 +139,9 @@ describe('drawing lifecycle', () => {
139
139
 
140
140
  test('finishCondition blocks finishing while the geometry is invalid', () => {
141
141
  const { manager, interaction } = setup()
142
- manager._geometryValid = false
142
+ manager._canFinish = false
143
143
  expect(interaction.finishCondition_()).toBe(false)
144
- manager._geometryValid = true
144
+ manager._canFinish = true
145
145
  expect(interaction.finishCondition_()).toBe(true)
146
146
  })
147
147
 
@@ -239,14 +239,14 @@ describe('drawing lifecycle', () => {
239
239
  test('the user callback runs ONCE per sketch change, with phase preview, driving both the stroke and Add point from that single call', () => {
240
240
  jest.useFakeTimers()
241
241
  const { manager, emitted, interaction } = setup('Polygon')
242
- manager._geometryValidator = jest.fn(() => ({ valid: false, reason: 'outside region' }))
242
+ manager._previewValidator = jest.fn(() => ({ valid: false, reason: 'outside region' }))
243
243
  const sketch = polygonFeature([[0, 0], [5, 5], [0, 0]])
244
244
  interaction.dispatchEvent({ type: 'drawstart', feature: sketch })
245
245
  sketch.getGeometry().setCoordinates([[[0, 0], [10, 0], [10, 10], [0, 10], [0, 0]]])
246
- expect(manager._geometryValidator).not.toHaveBeenCalled() // deferred to the frame
246
+ expect(manager._previewValidator).not.toHaveBeenCalled() // deferred to the frame
247
247
  jest.runAllTimers()
248
- expect(manager._geometryValidator).toHaveBeenCalledTimes(1) // not once per gate
249
- expect(manager._geometryValidator).toHaveBeenCalledWith(expect.objectContaining({ phase: 'preview' }))
248
+ expect(manager._previewValidator).toHaveBeenCalledTimes(1) // not once per gate
249
+ expect(manager._previewValidator).toHaveBeenCalledWith(expect.objectContaining({ phase: 'preview' }))
250
250
  expect(manager.styles.createSketchStyle).toHaveBeenLastCalledWith('Polygon', true)
251
251
  expect(emitted().find((e) => e.type === ADAPTER_EVENTS.CAN_PLACE_CHANGE)?.payload)
252
252
  .toEqual(expect.objectContaining({ canPlace: false, reason: 'outside region' }))
@@ -256,12 +256,12 @@ describe('drawing lifecycle', () => {
256
256
  test('the user callback runs even before any vertex is placed, gating Add point from the very first candidate point', () => {
257
257
  jest.useFakeTimers()
258
258
  const { manager, emitted, interaction } = setup('Polygon')
259
- manager._geometryValidator = jest.fn(() => ({ valid: false, reason: 'outside region' }))
259
+ manager._previewValidator = jest.fn(() => ({ valid: false, reason: 'outside region' }))
260
260
  const sketch = polygonFeature([[5, 5], [5, 5]]) // no committed vertices yet — rubber-band + closing dupe only
261
261
  interaction.dispatchEvent({ type: 'drawstart', feature: sketch })
262
262
  sketch.getGeometry().setCoordinates([[[5, 5], [5, 5]]])
263
263
  jest.runAllTimers()
264
- expect(manager._geometryValidator).toHaveBeenCalledWith(expect.objectContaining({ numVertices: 0, phase: 'preview' }))
264
+ expect(manager._previewValidator).toHaveBeenCalledWith(expect.objectContaining({ numVertices: 0, phase: 'preview' }))
265
265
  expect(emitted().find((e) => e.type === ADAPTER_EVENTS.CAN_PLACE_CHANGE)?.payload)
266
266
  .toEqual(expect.objectContaining({ canPlace: false, reason: 'outside region' }))
267
267
  jest.useRealTimers()
@@ -294,7 +294,7 @@ describe('drawing lifecycle', () => {
294
294
  expect(changed).toHaveBeenCalled()
295
295
  })
296
296
 
297
- test('undo re-validates the committed shape (deferred, phase commit-delete)', () => {
297
+ test('undo re-validates the committed shape (deferred, phase change)', () => {
298
298
  jest.useFakeTimers()
299
299
  const { mode, manager, emitted, interaction } = setup()
300
300
  const sketch = polygonFeature([[0, 0], [10, 0], [5, 5], [0, 0]])
@@ -304,7 +304,7 @@ describe('drawing lifecycle', () => {
304
304
  mode.undo()
305
305
  jest.runAllTimers()
306
306
  expect(emitted().filter((e) => e.type === ADAPTER_EVENTS.GEOMETRY_CHANGE).pop()?.payload).toEqual(
307
- expect.objectContaining({ phase: 'commit-delete', feature: expect.any(Object) }))
307
+ expect.objectContaining({ phase: 'change', feature: expect.any(Object) }))
308
308
  jest.useRealTimers()
309
309
  })
310
310
 
@@ -318,7 +318,7 @@ describe('drawing lifecycle', () => {
318
318
  expect(emitted().some((e) => e.type === ADAPTER_EVENTS.GEOMETRY_CHANGE)).toBe(false)
319
319
  jest.runAllTimers()
320
320
  const geom = emitted().find((e) => e.type === ADAPTER_EVENTS.GEOMETRY_CHANGE)
321
- expect(geom.payload).toEqual(expect.objectContaining({ phase: 'commit-add' }))
321
+ expect(geom.payload).toEqual(expect.objectContaining({ phase: 'change' }))
322
322
  jest.useRealTimers()
323
323
  })
324
324