@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.
- package/assets/templates/style-switcher.njk +2 -2
- package/dist/esm/im-core.js +1 -1
- package/dist/esm/im-shell.js +1 -1
- package/dist/umd/im-core.js +1 -1
- package/dist/umd/index.js +1 -1
- package/docs/api/button-definition.md +11 -0
- package/docs/api/context.md +4 -0
- package/docs/api.md +20 -2
- package/docs/architecture/interactive-map.likec4 +4 -4
- package/docs/plugins/datasets.md +11 -0
- package/docs/plugins/draw.md +197 -35
- package/docs/plugins/interact.md +24 -1
- package/docs/plugins/search.md +2 -2
- package/docusaurus.config.cjs +25 -3
- package/govuk-prototype-kit.config.json +6 -7
- package/package.json +20 -23
- package/plugins/datasets/dist/esm/im-datasets-esri-adapter.js +1 -1
- package/plugins/datasets/dist/esm/im-datasets-ml-adapter.js +1 -1
- package/plugins/datasets/dist/esm/im-datasets-ol-adapter.js +1 -1
- package/plugins/datasets/dist/esm/im-datasets-plugin.js +1 -1
- package/plugins/datasets/dist/esm/index.js +1 -1
- package/plugins/datasets/dist/esm/mapboxStyleLayerAdapter.js +1 -1
- package/plugins/datasets/dist/umd/im-datasets-ml-adapter.js +1 -1
- package/plugins/datasets/dist/umd/im-datasets-ol-adapter.js +1 -1
- package/plugins/datasets/dist/umd/im-datasets-plugin.js +1 -1
- package/plugins/datasets/dist/umd/index.js +1 -1
- package/plugins/datasets/src/adapters/esri/esriLayerAdapter.js +18 -16
- package/plugins/datasets/src/adapters/esri/esriLayerAdapter.test.js +2 -2
- package/plugins/datasets/src/adapters/esri/registry/esriDataset.js +2 -3
- package/plugins/datasets/src/adapters/esri/registry/esriDataset.test.js +1 -1
- package/plugins/datasets/src/adapters/loadLayerAdapter.js +2 -20
- package/plugins/datasets/src/adapters/loadLayerAdapter.test.js +9 -9
- package/plugins/datasets/src/adapters/mapboxStyleLayerAdapter.js +7 -7
- package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.js +19 -19
- package/plugins/datasets/src/adapters/maplibre/maplibreLayerAdapter.test.js +1 -1
- package/plugins/datasets/src/adapters/maplibre/registry/mapLibreDataset.test.js +1 -1
- package/plugins/datasets/src/adapters/openlayers/canvasPatternStyle.test.js +2 -2
- package/plugins/datasets/src/adapters/openlayers/layerBuilders.test.js +1 -1
- package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.js +21 -21
- package/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.test.js +5 -5
- package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.js +2 -3
- package/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.test.js +2 -2
- package/plugins/datasets/src/api/getOpacity.js +1 -2
- package/plugins/datasets/src/api/getOpacity.test.js +9 -12
- package/plugins/datasets/src/api/getStyle.js +1 -2
- package/plugins/datasets/src/api/getStyle.test.js +5 -8
- package/plugins/datasets/src/api/removeDataset.js +2 -4
- package/plugins/datasets/src/api/removeDataset.test.js +5 -10
- package/plugins/datasets/src/api/setData.js +2 -4
- package/plugins/datasets/src/api/setData.test.js +6 -14
- package/plugins/datasets/src/api/setFeatureVisibility.js +1 -2
- package/plugins/datasets/src/api/setFeatureVisibility.test.js +8 -11
- package/plugins/datasets/src/components/LayersMenu/LayersMenu.jsx +1 -0
- package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.jsx +1 -3
- package/plugins/datasets/src/components/LayersMenu/LayersMenuCheckbox.test.jsx +13 -18
- package/plugins/datasets/src/index.js +2 -2
- package/plugins/datasets/src/index.test.js +8 -1
- package/plugins/datasets/src/initialise/DatasetsInit.jsx +37 -26
- package/plugins/datasets/src/initialise/DatasetsInit.test.jsx +120 -89
- package/plugins/datasets/src/initialise/initialiseDatasets.js +2 -3
- package/plugins/datasets/src/initialise/initialiseDatasets.test.js +23 -10
- package/plugins/datasets/src/manifest.js +53 -44
- package/plugins/datasets/src/manifest.test.js +36 -4
- package/plugins/datasets/src/reducers/pluginState.js +5 -5
- package/plugins/datasets/src/reducers/pluginState.test.js +21 -20
- package/plugins/datasets/src/registry/__mocks__/datasetRegistry.js +7 -6
- package/plugins/datasets/src/registry/createDataset.js +2 -2
- package/plugins/datasets/src/registry/dataset.js +9 -10
- package/plugins/datasets/src/registry/dataset.test.js +63 -64
- package/plugins/datasets/src/registry/datasetRegistry.js +39 -10
- package/plugins/datasets/src/registry/datasetRegistry.test.js +83 -1
- package/plugins/datasets/src/registry/globalDataset.js +9 -17
- package/plugins/datasets/src/registry/isVisibleWhen.js +9 -17
- package/plugins/datasets/src/registry/isVisibleWhen.test.js +27 -20
- package/plugins/datasets/src/registry/mapboxStyleDataset.test.js +26 -27
- package/plugins/datasets/src/utils/hasLayersMenu.js +13 -0
- package/plugins/datasets/src/utils/hasLayersMenu.test.js +25 -0
- package/plugins/draw/dist/esm/im-draw-ml-adapter.js +1 -1
- package/plugins/draw/dist/esm/im-draw-ol-adapter.js +1 -1
- package/plugins/draw/dist/esm/im-draw-plugin.js +1 -1
- package/plugins/draw/dist/esm/index.js +1 -1
- package/plugins/draw/dist/esm/liveDrawChecks.js +1 -1
- package/plugins/draw/dist/umd/im-draw-ml-adapter.js +1 -1
- package/plugins/draw/dist/umd/im-draw-ol-adapter.js +1 -1
- package/plugins/draw/dist/umd/im-draw-plugin.js +1 -1
- package/plugins/draw/dist/umd/index.js +1 -1
- package/plugins/draw/src/DrawInit.jsx +53 -29
- package/plugins/draw/src/DrawInit.test.jsx +105 -2
- package/plugins/draw/src/adapterEvents.js +78 -44
- package/plugins/draw/src/adapters/adapterContract.test.js +3 -3
- package/plugins/draw/src/adapters/maplibre/MaplibreDrawAdapter.js +18 -10
- package/plugins/draw/src/adapters/maplibre/MaplibreDrawAdapter.test.js +31 -22
- package/plugins/draw/src/adapters/maplibre/drawEvents.js +2 -1
- package/plugins/draw/src/adapters/maplibre/modes/drawMode/clickHandlers.js +13 -12
- package/plugins/draw/src/adapters/maplibre/modes/drawMode/clickHandlers.test.js +5 -5
- package/plugins/draw/src/adapters/maplibre/modes/drawMode/undoHandlers.js +1 -1
- package/plugins/draw/src/adapters/maplibre/modes/drawMode/undoHandlers.test.js +2 -2
- package/plugins/draw/src/adapters/maplibre/modes/drawPointMode.js +6 -9
- package/plugins/draw/src/adapters/maplibre/modes/drawPointMode.test.js +4 -4
- package/plugins/draw/src/adapters/maplibre/modes/editPointMode/pointerHandlers.js +6 -9
- package/plugins/draw/src/adapters/maplibre/modes/editPointMode/pointerHandlers.test.js +1 -1
- package/plugins/draw/src/adapters/maplibre/modes/editPointMode/undoHandlers.js +8 -14
- package/plugins/draw/src/adapters/maplibre/modes/editPointMode/undoHandlers.test.js +37 -8
- package/plugins/draw/src/adapters/maplibre/modes/editPointMode.js +11 -1
- package/plugins/draw/src/adapters/maplibre/modes/editVertexMode/undoHandlers.js +14 -19
- package/plugins/draw/src/adapters/maplibre/modes/editVertexMode/undoHandlers.test.js +41 -4
- package/plugins/draw/src/adapters/maplibre/modes/editVertexMode.js +12 -1
- package/plugins/draw/src/adapters/maplibre/utils/editModeEvents.js +3 -1
- package/plugins/draw/src/adapters/maplibre/utils/geometryValidation.js +9 -10
- package/plugins/draw/src/adapters/maplibre/utils/geometryValidation.test.js +5 -24
- package/plugins/draw/src/adapters/openlayers/OLDrawAdapter.js +10 -7
- package/plugins/draw/src/adapters/openlayers/OLDrawAdapter.test.js +12 -7
- package/plugins/draw/src/adapters/openlayers/core/OLDrawManager.js +5 -0
- package/plugins/draw/src/adapters/openlayers/core/OLDrawManager.test.js +7 -3
- package/plugins/draw/src/adapters/openlayers/core/styles.test.js +1 -1
- package/plugins/draw/src/adapters/openlayers/draw/DrawMode.js +11 -11
- package/plugins/draw/src/adapters/openlayers/draw/DrawMode.test.js +15 -15
- package/plugins/draw/src/adapters/openlayers/edit/EditMode.js +21 -28
- package/plugins/draw/src/adapters/openlayers/edit/EditMode.test.js +26 -5
- package/plugins/draw/src/adapters/openlayers/edit/selectionState.js +5 -6
- package/plugins/draw/src/adapters/openlayers/edit/selectionState.test.js +2 -12
- package/plugins/draw/src/adapters/openlayers/edit/undoOps.js +9 -0
- package/plugins/draw/src/adapters/openlayers/edit/undoOps.test.js +7 -0
- package/plugins/draw/src/adapters/openlayers/point/drawPointMode.js +6 -9
- package/plugins/draw/src/adapters/openlayers/point/drawPointMode.test.js +3 -3
- package/plugins/draw/src/adapters/openlayers/point/editPointMode.js +18 -9
- package/plugins/draw/src/adapters/openlayers/point/editPointMode.test.js +29 -4
- package/plugins/draw/src/adapters/openlayers/point/pointOps.js +3 -2
- package/plugins/draw/src/adapters/openlayers/point/pointOps.test.js +6 -0
- package/plugins/draw/src/adapters/openlayers/point/pointSelectionState.js +3 -4
- package/plugins/draw/src/adapters/openlayers/point/pointSelectionState.test.js +2 -12
- package/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js +1 -1
- package/plugins/draw/src/api/createNewShape.js +4 -4
- package/plugins/draw/src/api/createNewShape.test.js +1 -1
- package/plugins/draw/src/api/editFeature.js +8 -11
- package/plugins/draw/src/api/editFeature.test.js +33 -22
- package/plugins/draw/src/api/newLine.test.js +3 -3
- package/plugins/draw/src/api/newPoint.js +4 -5
- package/plugins/draw/src/api/newPoint.test.js +3 -3
- package/plugins/draw/src/api/newPolygon.test.js +3 -3
- package/plugins/draw/src/api/recheckGeometry.js +32 -0
- package/plugins/draw/src/api/recheckGeometry.test.js +55 -0
- package/plugins/draw/src/api/setGeometry.js +33 -0
- package/plugins/draw/src/api/setGeometry.test.js +48 -0
- package/plugins/draw/src/api/split.js +23 -22
- package/plugins/draw/src/api/split.test.js +33 -18
- package/plugins/draw/src/events.js +265 -77
- package/plugins/draw/src/events.test.js +708 -34
- package/plugins/draw/src/hooks/useSpatialList.js +10 -11
- package/plugins/draw/src/hooks/useSpatialList.test.js +3 -3
- package/plugins/draw/src/manifest.js +33 -17
- package/plugins/draw/src/manifest.test.js +104 -10
- package/plugins/draw/src/reducer.js +31 -9
- package/plugins/draw/src/reducer.test.js +35 -3
- package/plugins/draw/src/utils/drawModes.js +27 -0
- package/plugins/draw/src/utils/drawModes.test.js +27 -0
- package/plugins/draw/src/utils/needsDrawTarget.js +18 -0
- package/plugins/draw/src/utils/needsDrawTarget.test.js +32 -0
- package/plugins/draw/src/utils/touchTarget.js +34 -26
- package/plugins/draw/src/utils/touchTarget.test.js +32 -20
- package/plugins/draw/src/validation/commitChecks.js +185 -0
- package/plugins/draw/src/validation/commitChecks.test.js +205 -0
- package/plugins/draw/src/validation/liveDrawChecks.js +11 -11
- package/plugins/draw/src/validation/liveDrawChecks.test.js +37 -37
- package/plugins/draw/src/validation/liveStroke.js +6 -6
- package/plugins/draw/src/validation/liveStroke.test.js +27 -27
- package/plugins/draw/src/validation/rules.js +16 -14
- package/plugins/draw/src/validation/rules.test.js +5 -5
- package/plugins/draw/src/validation/validateGeometry.js +58 -31
- package/plugins/draw/src/validation/validateGeometry.test.js +68 -44
- package/plugins/draw-es/dist/esm/index.js +1 -0
- package/plugins/{beta/draw-es → draw-es}/src/DrawInit.jsx +1 -1
- package/plugins/{beta/draw-es → draw-es}/src/events.test.js +1 -1
- package/plugins/{beta/draw-es → draw-es}/src/graphic.js +1 -1
- package/plugins/frame/dist/esm/index.js +1 -0
- package/plugins/{beta/frame → frame}/dist/umd/im-frame-plugin.js +1 -1
- package/plugins/{beta/frame → frame}/dist/umd/index.js +1 -1
- package/plugins/{beta/frame → frame}/package.json +2 -2
- package/plugins/interact/dist/esm/im-interact-plugin.js +1 -1
- package/plugins/interact/dist/esm/index.js +1 -1
- package/plugins/interact/dist/umd/im-interact-plugin.js +1 -1
- package/plugins/interact/dist/umd/index.js +1 -1
- package/plugins/interact/src/InteractInit.jsx +3 -3
- package/plugins/interact/src/api/enable.test.js +13 -0
- package/plugins/interact/src/defaults.js +1 -0
- package/plugins/interact/src/hooks/useCrossHairVisibility.js +27 -17
- package/plugins/interact/src/hooks/useCrossHairVisibility.test.js +72 -7
- package/plugins/interact/src/hooks/useInteractionHandlers.js +3 -5
- package/plugins/interact/src/hooks/useInteractionHandlers.test.js +4 -3
- package/plugins/interact/src/hooks/useSpatialList.js +16 -17
- package/plugins/interact/src/hooks/useSpatialList.test.js +9 -9
- package/plugins/interact/src/manifest.js +4 -4
- package/plugins/interact/src/manifest.test.js +29 -0
- package/plugins/interact/src/reducer.js +7 -2
- package/plugins/interact/src/reducer.test.js +12 -2
- package/plugins/interact/src/utils/needsTarget.js +20 -0
- package/plugins/interact/src/utils/needsTarget.test.js +36 -0
- package/plugins/map-key/dist/esm/im-map-key-plugin.js +1 -1
- package/plugins/map-key/dist/esm/index.js +1 -1
- package/plugins/map-key/dist/umd/im-map-key-plugin.js +1 -1
- package/plugins/map-key/dist/umd/index.js +1 -1
- package/plugins/map-key/src/components/Key/KeySvgSymbol.jsx +4 -0
- package/plugins/map-key/src/components/Key/MapKey.jsx +15 -15
- package/plugins/map-key/src/components/Key/MapKey.test.jsx +29 -15
- package/plugins/map-key/src/initialise/MapKeyInit.jsx +5 -8
- package/plugins/map-key/src/initialise/MapKeyInit.test.jsx +9 -7
- package/plugins/map-key/src/manifest.test.js +0 -1
- package/plugins/map-key/src/reducers/mergeKeyGroupItems.js +14 -33
- package/plugins/map-key/src/reducers/mergeKeyGroupItems.test.js +34 -50
- package/plugins/map-key/src/reducers/pluginState.js +6 -1
- package/plugins/map-key/src/reducers/pluginState.test.js +13 -4
- package/plugins/map-styles/dist/esm/im-map-styles-plugin.js +1 -0
- package/plugins/map-styles/dist/esm/index.js +1 -0
- package/plugins/map-styles/dist/umd/im-map-styles-plugin.js +1 -0
- package/plugins/{beta/map-styles → map-styles}/dist/umd/index.js +1 -1
- package/plugins/{beta/map-styles → map-styles}/src/MapStyles.jsx +3 -3
- package/plugins/{beta/map-styles → map-styles}/src/MapStylesInit.jsx +1 -1
- package/plugins/menu/dist/esm/index.js +1 -1
- package/plugins/scale-bar/dist/esm/index.js +1 -0
- package/plugins/{beta/scale-bar → scale-bar}/dist/umd/im-scale-bar-plugin.js +1 -1
- package/plugins/{beta/scale-bar → scale-bar}/dist/umd/index.js +1 -1
- package/plugins/{beta/scale-bar → scale-bar}/package.json +2 -2
- package/plugins/search/dist/esm/im-search-plugin.js +1 -1
- package/plugins/search/dist/esm/index.js +1 -1
- package/plugins/search/dist/umd/im-search-plugin.js +1 -1
- package/plugins/search/dist/umd/index.js +1 -1
- package/plugins/search/src/components/Suggestions/Suggestions.jsx +3 -1
- package/plugins/search/src/components/Suggestions/Suggestions.test.jsx +11 -0
- package/plugins/search/src/utils/markedToElements.jsx +25 -0
- package/plugins/search/src/utils/markedToElements.test.jsx +49 -0
- package/plugins/search/src/utils/parseOsNamesResults.js +6 -4
- package/plugins/search/src/utils/parseOsNamesResults.test.js +18 -0
- package/plugins/use-location/dist/esm/index.js +1 -0
- package/plugins/{beta/use-location → use-location}/dist/umd/im-use-location-plugin.js +1 -1
- package/plugins/{beta/use-location → use-location}/dist/umd/index.js +1 -1
- package/providers/esri/dist/esm/index.js +1 -0
- package/providers/{beta/esri → esri}/src/esriProvider.js +1 -1
- package/providers/{beta/esri → esri}/src/mapEvents.js +2 -2
- package/providers/maplibre/dist/esm/index.js +1 -1
- package/providers/maplibre/dist/umd/index.js +1 -1
- package/providers/maplibre/src/index.js +11 -2
- package/providers/maplibre/src/index.test.js +23 -1
- package/providers/maplibre/src/utils/detectModuleWorker.js +8 -19
- package/providers/maplibre/src/utils/detectModuleWorker.test.js +19 -23
- package/providers/maplibre/src/utils/workerUrl.js +12 -0
- package/providers/maplibre/src/utils/workerUrl.test.js +14 -1
- package/providers/open-names/dist/esm/index.js +1 -0
- package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js +1 -1
- package/providers/{beta/open-names → open-names}/dist/umd/index.js +1 -1
- package/providers/openlayers/dist/esm/index.js +1 -0
- package/providers/openlayers/dist/umd/im-openlayers-provider.js +2 -0
- package/providers/{beta/openlayers → openlayers}/dist/umd/index.js +1 -1
- package/providers/{beta/openlayers → openlayers}/src/index.js +4 -4
- package/providers/{beta/openlayers → openlayers}/src/mapEvents.js +2 -2
- package/providers/{beta/openlayers → openlayers}/src/mapEvents.test.js +2 -2
- package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.js +3 -3
- package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.js +1 -1
- package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.js +1 -1
- package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.js +1 -1
- package/rollup.esm.mjs +43 -47
- package/sonar-project.properties +1 -1
- package/src/App/App.jsx +4 -1
- package/src/App/App.test.jsx +6 -0
- package/src/App/components/MapButton/MapButton.jsx +6 -0
- package/src/App/components/MapButton/MapButton.test.jsx +10 -0
- package/src/App/components/Markers/Markers.jsx +3 -5
- package/src/App/components/Markers/Markers.test.jsx +9 -11
- package/src/App/components/Panel/Panel.jsx +2 -9
- package/src/App/hooks/useInterfaceAPI.js +16 -4
- package/src/App/hooks/useInterfaceAPI.test.js +66 -1
- package/src/App/renderer/PluginInits.jsx +8 -7
- package/src/App/renderer/PluginInits.test.jsx +20 -5
- package/src/App/renderer/SlotItemsProvider.jsx +33 -0
- package/src/App/renderer/SlotItemsProvider.test.jsx +59 -0
- package/src/App/renderer/SlotRenderer.jsx +3 -14
- package/src/App/renderer/SlotRenderer.test.jsx +11 -44
- package/src/App/renderer/mapButtons.js +24 -12
- package/src/App/renderer/mapButtons.test.js +32 -1
- package/src/App/renderer/mapControls.js +6 -8
- package/src/App/renderer/mapControls.test.js +10 -0
- package/src/App/renderer/mapPanels.js +16 -19
- package/src/App/renderer/mapPanels.test.js +37 -9
- package/src/App/renderer/pluginWrapper.js +10 -8
- package/src/App/renderer/pluginWrapper.test.js +23 -9
- package/src/App/renderer/slotAggregator.js +18 -5
- package/src/App/renderer/slotAggregator.test.js +68 -25
- package/src/App/renderer/slotHelpers.js +13 -0
- package/src/App/renderer/slotHelpers.test.js +16 -1
- package/src/App/store/AppProvider.jsx +19 -1
- package/src/App/store/AppProvider.test.jsx +41 -0
- package/src/App/store/MapProvider.jsx +3 -0
- package/src/App/store/MapProvider.test.jsx +24 -0
- package/src/App/store/appActionsMap.js +10 -1
- package/src/App/store/appActionsMap.test.js +21 -0
- package/src/App/store/appDispatchMiddleware.js +29 -17
- package/src/App/store/appDispatchMiddleware.test.js +31 -0
- package/src/InteractiveMap/parseDataProperties.js +4 -4
- package/src/InteractiveMap/parseDataProperties.test.js +62 -6
- package/src/config/events.js +4 -2
- package/src/config/mapSizeScales.js +3 -0
- package/src/scss/tools/_govuk-content.scss +4 -3
- package/src/types.js +4 -0
- package/src/utils/focusAfterPanelClose.js +9 -0
- package/src/utils/focusAfterPanelClose.test.js +40 -0
- package/webpack.dev.mjs +9 -3
- package/webpack.prod.mjs +11 -4
- package/webpack.umd.mjs +6 -7
- package/plugins/beta/draw-es/dist/esm/index.js +0 -1
- package/plugins/beta/draw-ml/dist/esm/im-draw-ml-plugin.js +0 -1
- package/plugins/beta/draw-ml/dist/esm/index.js +0 -1
- package/plugins/beta/draw-ml/dist/umd/im-draw-ml-plugin.js +0 -1
- package/plugins/beta/draw-ml/dist/umd/index.js +0 -2
- package/plugins/beta/draw-ml/src/DrawInit.jsx +0 -85
- package/plugins/beta/draw-ml/src/api/addFeature.js +0 -27
- package/plugins/beta/draw-ml/src/api/deleteFeature.js +0 -13
- package/plugins/beta/draw-ml/src/api/editFeature.js +0 -75
- package/plugins/beta/draw-ml/src/api/merge.js +0 -9
- package/plugins/beta/draw-ml/src/api/newLine.js +0 -68
- package/plugins/beta/draw-ml/src/api/newPolygon.js +0 -68
- package/plugins/beta/draw-ml/src/api/split.js +0 -81
- package/plugins/beta/draw-ml/src/defaults.js +0 -17
- package/plugins/beta/draw-ml/src/draw.scss +0 -26
- package/plugins/beta/draw-ml/src/events.js +0 -185
- package/plugins/beta/draw-ml/src/index.js +0 -13
- package/plugins/beta/draw-ml/src/manifest.js +0 -110
- package/plugins/beta/draw-ml/src/mapboxDraw.js +0 -143
- package/plugins/beta/draw-ml/src/mapboxSnap.js +0 -321
- package/plugins/beta/draw-ml/src/modes/createDrawMode.js +0 -552
- package/plugins/beta/draw-ml/src/modes/disabledMode.js +0 -23
- package/plugins/beta/draw-ml/src/modes/drawLineMode.js +0 -18
- package/plugins/beta/draw-ml/src/modes/drawPolygonMode.js +0 -16
- package/plugins/beta/draw-ml/src/modes/editVertex/geometryHelpers.js +0 -135
- package/plugins/beta/draw-ml/src/modes/editVertex/helpers.js +0 -2
- package/plugins/beta/draw-ml/src/modes/editVertex/touchHandlers.js +0 -142
- package/plugins/beta/draw-ml/src/modes/editVertex/undoHandlers.js +0 -133
- package/plugins/beta/draw-ml/src/modes/editVertex/vertexOperations.js +0 -142
- package/plugins/beta/draw-ml/src/modes/editVertex/vertexQueries.js +0 -121
- package/plugins/beta/draw-ml/src/modes/editVertexMode.js +0 -495
- package/plugins/beta/draw-ml/src/reducer.js +0 -90
- package/plugins/beta/draw-ml/src/styles.js +0 -190
- package/plugins/beta/draw-ml/src/undoStack.js +0 -50
- package/plugins/beta/draw-ml/src/utils/debounce.js +0 -16
- package/plugins/beta/draw-ml/src/utils/flattenStyleProperties.js +0 -49
- package/plugins/beta/draw-ml/src/utils/snapHelpers.js +0 -200
- package/plugins/beta/draw-ml/src/utils/spatial.js +0 -258
- package/plugins/beta/draw-ol/dist/css/index.css +0 -1
- package/plugins/beta/draw-ol/dist/esm/DrawMode.js +0 -1
- package/plugins/beta/draw-ol/dist/esm/EditMode.js +0 -1
- package/plugins/beta/draw-ol/dist/esm/geometryHelpers.js +0 -1
- package/plugins/beta/draw-ol/dist/esm/im-draw-ol-plugin.js +0 -1
- package/plugins/beta/draw-ol/dist/esm/index.js +0 -1
- package/plugins/beta/draw-ol/src/DrawInit.jsx +0 -65
- package/plugins/beta/draw-ol/src/api/addFeature.js +0 -29
- package/plugins/beta/draw-ol/src/api/deleteFeature.js +0 -11
- package/plugins/beta/draw-ol/src/api/editFeature.js +0 -50
- package/plugins/beta/draw-ol/src/api/newLine.js +0 -44
- package/plugins/beta/draw-ol/src/api/newPolygon.js +0 -44
- package/plugins/beta/draw-ol/src/core/OLDrawManager.js +0 -153
- package/plugins/beta/draw-ol/src/core/featureStore.js +0 -65
- package/plugins/beta/draw-ol/src/core/styles.js +0 -98
- package/plugins/beta/draw-ol/src/core/undoStack.js +0 -31
- package/plugins/beta/draw-ol/src/defaults.js +0 -16
- package/plugins/beta/draw-ol/src/draw/DrawMode.js +0 -121
- package/plugins/beta/draw-ol/src/draw/drawInput.js +0 -243
- package/plugins/beta/draw-ol/src/draw.scss +0 -17
- package/plugins/beta/draw-ol/src/edit/EditMode.js +0 -424
- package/plugins/beta/draw-ol/src/edit/keyboardHandler.js +0 -229
- package/plugins/beta/draw-ol/src/edit/midpointLayer.js +0 -57
- package/plugins/beta/draw-ol/src/edit/touchHandler.js +0 -171
- package/plugins/beta/draw-ol/src/edit/undoOps.js +0 -95
- package/plugins/beta/draw-ol/src/edit/vertexHitTest.js +0 -72
- package/plugins/beta/draw-ol/src/edit/vertexLayer.js +0 -49
- package/plugins/beta/draw-ol/src/edit/vertexOps.js +0 -99
- package/plugins/beta/draw-ol/src/events.js +0 -114
- package/plugins/beta/draw-ol/src/index.js +0 -12
- package/plugins/beta/draw-ol/src/manifest.js +0 -125
- package/plugins/beta/draw-ol/src/olDraw.js +0 -38
- package/plugins/beta/draw-ol/src/reducer.js +0 -41
- package/plugins/beta/draw-ol/src/snap/snapEngine.js +0 -153
- package/plugins/beta/draw-ol/src/snap/snapGeometry.js +0 -177
- package/plugins/beta/draw-ol/src/snap/snapIndicator.js +0 -81
- package/plugins/beta/draw-ol/src/snap/snapInteraction.js +0 -57
- package/plugins/beta/draw-ol/src/snap/snapManager.js +0 -99
- package/plugins/beta/draw-ol/src/utils/flattenStyleProperties.js +0 -47
- package/plugins/beta/draw-ol/src/utils/geometryHelpers.js +0 -103
- package/plugins/beta/draw-ol/src/utils/olCoords.js +0 -35
- package/plugins/beta/draw-ol/src/utils/resolveColors.js +0 -39
- package/plugins/beta/draw-ol/src/utils/spatial.js +0 -24
- package/plugins/beta/draw-ol/src/utils/touchTarget.js +0 -61
- package/plugins/beta/frame/dist/esm/index.js +0 -1
- package/plugins/beta/map-styles/dist/esm/im-map-styles-plugin.js +0 -1
- package/plugins/beta/map-styles/dist/esm/index.js +0 -1
- package/plugins/beta/map-styles/dist/umd/im-map-styles-plugin.js +0 -1
- package/plugins/beta/scale-bar/dist/esm/index.js +0 -1
- package/plugins/beta/use-location/dist/esm/index.js +0 -1
- package/plugins/map-key/src/registry/getDatasetRegistry.js +0 -6
- package/plugins/map-key/src/registry/getDatasetRegistry.test.js +0 -23
- package/plugins/map-key/src/registry/index.js +0 -1
- package/plugins/map-key/src/registry/index.test.js +0 -7
- package/providers/beta/esri/dist/esm/index.js +0 -1
- package/providers/beta/open-names/dist/esm/index.js +0 -1
- package/providers/beta/openlayers/dist/esm/index.js +0 -1
- package/providers/beta/openlayers/dist/umd/im-openlayers-provider.js +0 -2
- package/providers/beta/openlayers/dist/umd/index.js.LICENSE.txt +0 -1
- /package/plugins/{beta/draw-es → draw-es}/dist/esm/im-draw-es-plugin.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/api/addFeature.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/api/deleteFeature.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/api/editFeature.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/api/newPolygon.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/api/removeSafeZone.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/events.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/index.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/manifest.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/reducer.js +0 -0
- /package/plugins/{beta/draw-es → draw-es}/src/sketchViewModel.js +0 -0
- /package/plugins/{beta/frame → frame}/dist/css/index.css +0 -0
- /package/plugins/{beta/frame → frame}/dist/esm/im-frame-plugin.js +0 -0
- /package/plugins/{beta/draw-ml → frame}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/plugins/{beta/frame → frame}/src/Frame.jsx +0 -0
- /package/plugins/{beta/frame → frame}/src/FrameInit.jsx +0 -0
- /package/plugins/{beta/frame → frame}/src/api/addFrame.js +0 -0
- /package/plugins/{beta/frame → frame}/src/api/editFeature.js +0 -0
- /package/plugins/{beta/frame → frame}/src/config.js +0 -0
- /package/plugins/{beta/frame → frame}/src/frame.scss +0 -0
- /package/plugins/{beta/frame → frame}/src/index.js +0 -0
- /package/plugins/{beta/frame → frame}/src/manifest.js +0 -0
- /package/plugins/{beta/frame → frame}/src/reducer.js +0 -0
- /package/plugins/{beta/frame → frame}/src/utils.js +0 -0
- /package/plugins/{beta/map-styles → map-styles}/dist/css/index.css +0 -0
- /package/plugins/{beta/frame → map-styles}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/plugins/{beta/map-styles → map-styles}/src/config.js +0 -0
- /package/plugins/{beta/map-styles → map-styles}/src/index.js +0 -0
- /package/plugins/{beta/map-styles → map-styles}/src/manifest.js +0 -0
- /package/plugins/{beta/map-styles → map-styles}/src/mapStyles.scss +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/dist/css/index.css +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/dist/esm/im-scale-bar-plugin.js +0 -0
- /package/plugins/{beta/map-styles → scale-bar}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.jsx +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/ScaleBar.test.jsx +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/index.js +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/index.test.js +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/manifest.js +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/scaleBar.scss +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/utils.js +0 -0
- /package/plugins/{beta/scale-bar → scale-bar}/src/utils.test.js +0 -0
- /package/plugins/{beta/use-location → use-location}/dist/esm/im-use-location-plugin.js +0 -0
- /package/plugins/{beta/scale-bar → use-location}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/plugins/{beta/use-location → use-location}/src/UseLocation.jsx +0 -0
- /package/plugins/{beta/use-location → use-location}/src/UseLocationInit.jsx +0 -0
- /package/plugins/{beta/use-location → use-location}/src/defaults.js +0 -0
- /package/plugins/{beta/use-location → use-location}/src/events.js +0 -0
- /package/plugins/{beta/use-location → use-location}/src/index.js +0 -0
- /package/plugins/{beta/use-location → use-location}/src/manifest.js +0 -0
- /package/plugins/{beta/use-location → use-location}/src/reducer.js +0 -0
- /package/providers/{beta/esri → esri}/dist/css/index.css +0 -0
- /package/providers/{beta/esri → esri}/dist/esm/im-esri-provider.js +0 -0
- /package/providers/{beta/esri → esri}/src/appEvents.js +0 -0
- /package/providers/{beta/esri → esri}/src/defaults.js +0 -0
- /package/providers/{beta/esri → esri}/src/esriProvider.scss +0 -0
- /package/providers/{beta/esri → esri}/src/index.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/coords.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/coords.test.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/detectWebGL.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/esriFixes.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/query.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/spatial.js +0 -0
- /package/providers/{beta/esri → esri}/src/utils/spatial.test.js +0 -0
- /package/providers/{beta/open-names → open-names}/dist/esm/im-reverse-geocode.js +0 -0
- /package/providers/{beta/open-names → open-names}/dist/umd/im-reverse-geocode.js.LICENSE.txt +0 -0
- /package/{plugins/beta/use-location → providers/open-names}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/providers/{beta/open-names → open-names}/src/index.js +0 -0
- /package/providers/{beta/open-names → open-names}/src/reverseGeocode.js +0 -0
- /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.js +0 -0
- /package/providers/{beta/open-names → open-names}/src/utils/mapToLocationModel.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/dist/esm/im-openlayers-provider.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/dist/umd/im-openlayers-provider.js.LICENSE.txt +0 -0
- /package/providers/{beta/open-names → openlayers}/dist/umd/index.js.LICENSE.txt +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/appEvents.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/appEvents.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/defaults.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/index.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/openlayersProvider.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/bngProjection.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/filterEvaluator.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/highlightFeatures.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/hoverCursor.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/openLayersFixes.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/patternImages.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/queryFeatures.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/spatial.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/symbolImages.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/tileLayers.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/vtTileFragments.test.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.js +0 -0
- /package/providers/{beta/openlayers → openlayers}/src/utils/zoom.test.js +0 -0
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { editFeature } from './editFeature.js'
|
|
2
|
-
|
|
3
|
-
jest.mock('../defaults.js', () => ({ MAP_SIZE_SCALES: { medium: 1.5, large: 2 } }))
|
|
2
|
+
import { getCommitChecks } from '../validation/commitChecks.js'
|
|
4
3
|
|
|
5
4
|
const makeContext = (overrides = {}) => {
|
|
6
5
|
const dispatch = jest.fn()
|
|
@@ -14,7 +13,7 @@ const makeContext = (overrides = {}) => {
|
|
|
14
13
|
const context = {
|
|
15
14
|
appState: { layoutRefs: { viewportRef: { current: 'viewport' } }, interfaceType: 'mouse' },
|
|
16
15
|
appConfig: { id: 'app' },
|
|
17
|
-
mapState: {
|
|
16
|
+
mapState: { mapSizeScale: 1.5 },
|
|
18
17
|
pluginConfig: { snapLayers: ['pc-layer'] },
|
|
19
18
|
pluginState: { dispatch },
|
|
20
19
|
mapProvider: { draw },
|
|
@@ -45,7 +44,7 @@ describe('editFeature', () => {
|
|
|
45
44
|
const result = editFeature(context, 'f1')
|
|
46
45
|
|
|
47
46
|
expect(result).toBe(true)
|
|
48
|
-
expect(eventBus.emit).toHaveBeenCalledWith('draw:editstart', { mode: 'edit_polygon' })
|
|
47
|
+
expect(eventBus.emit).toHaveBeenCalledWith('draw:editstart', { mode: 'edit_polygon', featureId: 'f1' })
|
|
49
48
|
expect(draw.setSnapLayers).toHaveBeenCalledWith(['pc-layer'])
|
|
50
49
|
expect(dispatch).toHaveBeenCalledWith({ type: 'SET_HAS_SNAP_LAYERS', payload: true })
|
|
51
50
|
|
|
@@ -71,7 +70,7 @@ describe('editFeature', () => {
|
|
|
71
70
|
const { context, eventBus, draw } = makeContext()
|
|
72
71
|
draw.get.mockReturnValue({ id: 'f1', geometry: { type: 'LineString' } })
|
|
73
72
|
editFeature(context, 'f1')
|
|
74
|
-
expect(eventBus.emit).toHaveBeenCalledWith('draw:editstart', { mode: 'edit_line' })
|
|
73
|
+
expect(eventBus.emit).toHaveBeenCalledWith('draw:editstart', { mode: 'edit_line', featureId: 'f1' })
|
|
75
74
|
})
|
|
76
75
|
|
|
77
76
|
// A Point has no ring of vertices — editing one goes through edit_point (relocate the
|
|
@@ -82,12 +81,12 @@ describe('editFeature', () => {
|
|
|
82
81
|
|
|
83
82
|
editFeature(context, 'f1')
|
|
84
83
|
|
|
85
|
-
expect(eventBus.emit).toHaveBeenCalledWith('draw:editstart', { mode: 'edit_point' })
|
|
84
|
+
expect(eventBus.emit).toHaveBeenCalledWith('draw:editstart', { mode: 'edit_point', featureId: 'f1' })
|
|
86
85
|
expect(draw.changeMode).toHaveBeenCalledWith('edit_point', expect.objectContaining({ featureId: 'f1' }))
|
|
87
86
|
expect(dispatch).toHaveBeenCalledWith({ type: 'SET_MODE', payload: 'edit_point' })
|
|
88
87
|
// Point geometry is always valid (validation/rules.js has no Point branch) — the gate
|
|
89
88
|
// opens immediately, unlike a self-intersecting/zero-area polygon.
|
|
90
|
-
expect(
|
|
89
|
+
expect(getCommitChecks(draw).state.status).toBe('valid')
|
|
91
90
|
})
|
|
92
91
|
|
|
93
92
|
test('stores a per-call onGeometryChange validator, overriding the plugin-level one', () => {
|
|
@@ -95,35 +94,47 @@ describe('editFeature', () => {
|
|
|
95
94
|
const onGeometryChange = jest.fn()
|
|
96
95
|
const { context, draw } = makeContext({ pluginConfig: { snapLayers: ['pc-layer'], onGeometryChange: pluginOnGeometryChange } })
|
|
97
96
|
editFeature(context, 'f1', { onGeometryChange })
|
|
98
|
-
expect(draw.
|
|
97
|
+
expect(draw._commitValidator).toBe(onGeometryChange)
|
|
98
|
+
})
|
|
99
|
+
|
|
100
|
+
test('stores a per-call onGeometryPreview validator, overriding the plugin-level one', () => {
|
|
101
|
+
const onGeometryPreview = jest.fn(() => true)
|
|
102
|
+
const { context, draw } = makeContext({ pluginConfig: { onGeometryPreview: jest.fn() } })
|
|
103
|
+
editFeature(context, 'f1', { onGeometryPreview })
|
|
104
|
+
draw._previewValidator({ phase: 'preview' })
|
|
105
|
+
expect(onGeometryPreview).toHaveBeenCalledWith({ phase: 'preview' })
|
|
99
106
|
})
|
|
100
107
|
|
|
101
|
-
|
|
102
|
-
|
|
108
|
+
// The check's result is applied by events.js once it settles — here, its state is
|
|
109
|
+
// what seeds the Done gate and the stroke.
|
|
110
|
+
test('seeds the gate from the feature starting check (phase: edit-start)', () => {
|
|
111
|
+
const { context, draw } = makeContext()
|
|
103
112
|
// A valid square → gate opens.
|
|
104
113
|
draw.get.mockReturnValue({ id: 'f1', geometry: { type: 'Polygon', coordinates: [[[0, 0], [1, 0], [1, 1], [0, 1], [0, 0]]] } })
|
|
105
114
|
editFeature(context, 'f1')
|
|
106
|
-
expect(
|
|
115
|
+
expect(getCommitChecks(draw).state).toEqual(expect.objectContaining({
|
|
116
|
+
status: 'valid',
|
|
117
|
+
context: { phase: 'edit-start', mode: 'edit_vertex' }
|
|
118
|
+
}))
|
|
107
119
|
})
|
|
108
120
|
|
|
109
121
|
test('seeds the gate closed for an already self-intersecting feature', () => {
|
|
110
|
-
const { context,
|
|
122
|
+
const { context, draw } = makeContext()
|
|
111
123
|
draw.get.mockReturnValue({ id: 'f1', geometry: { type: 'Polygon', coordinates: [[[0, 0], [1, 1], [1, 0], [0, 1], [0, 0]]] } })
|
|
112
124
|
editFeature(context, 'f1')
|
|
113
|
-
expect(
|
|
125
|
+
expect(getCommitChecks(draw).state.status).toBe('invalid')
|
|
114
126
|
})
|
|
115
127
|
|
|
116
|
-
test('
|
|
128
|
+
test('an async starting check leaves the gate pending until it settles', () => {
|
|
129
|
+
const onGeometryChange = jest.fn(() => new Promise(() => {}))
|
|
117
130
|
const { context, draw } = makeContext()
|
|
118
|
-
draw.setInvalid = jest.fn()
|
|
119
|
-
draw.get.mockReturnValue({ id: 'f1', geometry: { type: 'Polygon', coordinates: [[[0, 0], [1, 1], [1, 0], [0, 1], [0, 0]]] } })
|
|
120
|
-
editFeature(context, 'f1')
|
|
121
|
-
expect(draw.setInvalid).toHaveBeenCalledWith(true)
|
|
122
|
-
|
|
123
|
-
draw.setInvalid.mockClear()
|
|
124
131
|
draw.get.mockReturnValue({ id: 'f1', geometry: { type: 'Polygon', coordinates: [[[0, 0], [1, 0], [1, 1], [0, 1], [0, 0]]] } })
|
|
125
|
-
editFeature(context, 'f1')
|
|
126
|
-
expect(
|
|
132
|
+
editFeature(context, 'f1', { onGeometryChange })
|
|
133
|
+
expect(onGeometryChange).toHaveBeenCalledWith(
|
|
134
|
+
expect.objectContaining({ phase: 'edit-start', mode: 'edit_vertex' }),
|
|
135
|
+
expect.objectContaining({ signal: expect.any(AbortSignal) })
|
|
136
|
+
)
|
|
137
|
+
expect(getCommitChecks(draw).state.status).toBe('pending')
|
|
127
138
|
})
|
|
128
139
|
|
|
129
140
|
test('disables panning for the keyboard interface', () => {
|
|
@@ -36,7 +36,7 @@ describe('newLine', () => {
|
|
|
36
36
|
|
|
37
37
|
newLine(context, 'f1', { stroke: 'red', fill: 'blue', strokeWidth: 3, properties: { name: 'x' }, extra: 'opt' })
|
|
38
38
|
|
|
39
|
-
expect(eventBus.emit).toHaveBeenCalledWith('draw:started', { mode: 'draw_line' })
|
|
39
|
+
expect(eventBus.emit).toHaveBeenCalledWith('draw:started', { mode: 'draw_line', featureId: 'f1' })
|
|
40
40
|
expect(flattenStyleProperties).toHaveBeenCalledWith({ stroke: 'red', fill: 'blue', strokeWidth: 3 })
|
|
41
41
|
|
|
42
42
|
expect(draw.changeMode).toHaveBeenCalledWith('draw_line', expect.objectContaining({
|
|
@@ -80,7 +80,7 @@ describe('newLine', () => {
|
|
|
80
80
|
const { context, draw } = makeContext()
|
|
81
81
|
const onGeometryChange = jest.fn()
|
|
82
82
|
newLine(context, 'f1', { onGeometryChange })
|
|
83
|
-
expect(draw.
|
|
83
|
+
expect(draw._commitValidator).toBe(onGeometryChange)
|
|
84
84
|
expect(draw.changeMode.mock.calls[0][1]).not.toHaveProperty('onGeometryChange')
|
|
85
85
|
})
|
|
86
86
|
|
|
@@ -88,6 +88,6 @@ describe('newLine', () => {
|
|
|
88
88
|
const pluginOnGeometryChange = jest.fn()
|
|
89
89
|
const { context, draw } = makeContext({ pluginConfig: { onGeometryChange: pluginOnGeometryChange } })
|
|
90
90
|
newLine(context, 'f1')
|
|
91
|
-
expect(draw.
|
|
91
|
+
expect(draw._commitValidator).toBe(pluginOnGeometryChange)
|
|
92
92
|
})
|
|
93
93
|
})
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { SYMBOL_KEYS } from '../utils/symbolKeys.js'
|
|
2
|
+
import { startCheckSession } from '../validation/commitChecks.js'
|
|
2
3
|
|
|
3
4
|
export const newPoint = ({ appState, appConfig, pluginConfig, pluginState, mapState, mapProvider, services }, featureId, options = {}) => {
|
|
4
5
|
const { dispatch } = pluginState
|
|
@@ -9,16 +10,14 @@ export const newPoint = ({ appState, appConfig, pluginConfig, pluginState, mapSt
|
|
|
9
10
|
return
|
|
10
11
|
}
|
|
11
12
|
|
|
12
|
-
|
|
13
|
+
const { properties: customProperties, onGeometryChange, onGeometryPreview, ...modeOptions } = options
|
|
14
|
+
startCheckSession(draw, { onGeometryChange, onGeometryPreview }, pluginConfig, eventBus)
|
|
15
|
+
eventBus.emit('draw:started', { mode: 'draw_point', featureId })
|
|
13
16
|
|
|
14
17
|
const snapLayers = options.snapLayers === undefined ? (pluginConfig.snapLayers ?? null) : options.snapLayers
|
|
15
18
|
draw.setSnapLayers(snapLayers)
|
|
16
19
|
dispatch({ type: 'SET_HAS_SNAP_LAYERS', payload: snapLayers?.length > 0 })
|
|
17
20
|
|
|
18
|
-
const { properties: customProperties, onGeometryChange, ...modeOptions } = options
|
|
19
|
-
// Per-call callback overrides the plugin-level one; events.js reads this on every commit.
|
|
20
|
-
draw._geometryValidator = onGeometryChange ?? pluginConfig.onGeometryChange
|
|
21
|
-
|
|
22
21
|
const symbolStyle = {}
|
|
23
22
|
SYMBOL_KEYS.forEach((key) => {
|
|
24
23
|
if (modeOptions[key] !== undefined) {
|
|
@@ -36,7 +36,7 @@ describe('newPoint', () => {
|
|
|
36
36
|
extra: 'opt'
|
|
37
37
|
})
|
|
38
38
|
|
|
39
|
-
expect(eventBus.emit).toHaveBeenCalledWith('draw:started', { mode: 'draw_point' })
|
|
39
|
+
expect(eventBus.emit).toHaveBeenCalledWith('draw:started', { mode: 'draw_point', featureId: 'f1' })
|
|
40
40
|
|
|
41
41
|
expect(draw.changeMode).toHaveBeenCalledWith('draw_point', expect.objectContaining({
|
|
42
42
|
container: 'viewport',
|
|
@@ -104,7 +104,7 @@ describe('newPoint', () => {
|
|
|
104
104
|
const { context, draw } = makeContext()
|
|
105
105
|
const onGeometryChange = jest.fn()
|
|
106
106
|
newPoint(context, 'f1', { onGeometryChange })
|
|
107
|
-
expect(draw.
|
|
107
|
+
expect(draw._commitValidator).toBe(onGeometryChange)
|
|
108
108
|
expect(draw.changeMode.mock.calls[0][1]).not.toHaveProperty('onGeometryChange')
|
|
109
109
|
})
|
|
110
110
|
|
|
@@ -112,6 +112,6 @@ describe('newPoint', () => {
|
|
|
112
112
|
const pluginOnGeometryChange = jest.fn()
|
|
113
113
|
const { context, draw } = makeContext({ pluginConfig: { onGeometryChange: pluginOnGeometryChange } })
|
|
114
114
|
newPoint(context, 'f1')
|
|
115
|
-
expect(draw.
|
|
115
|
+
expect(draw._commitValidator).toBe(pluginOnGeometryChange)
|
|
116
116
|
})
|
|
117
117
|
})
|
|
@@ -36,7 +36,7 @@ describe('newPolygon', () => {
|
|
|
36
36
|
|
|
37
37
|
newPolygon(context, 'f1', { stroke: 'red', fill: 'blue', strokeWidth: 3, properties: { name: 'x' }, extra: 'opt' })
|
|
38
38
|
|
|
39
|
-
expect(eventBus.emit).toHaveBeenCalledWith('draw:started', { mode: 'draw_polygon' })
|
|
39
|
+
expect(eventBus.emit).toHaveBeenCalledWith('draw:started', { mode: 'draw_polygon', featureId: 'f1' })
|
|
40
40
|
expect(flattenStyleProperties).toHaveBeenCalledWith({ stroke: 'red', fill: 'blue', strokeWidth: 3 })
|
|
41
41
|
|
|
42
42
|
expect(draw.changeMode).toHaveBeenCalledWith('draw_polygon', expect.objectContaining({
|
|
@@ -80,7 +80,7 @@ describe('newPolygon', () => {
|
|
|
80
80
|
const { context, draw } = makeContext()
|
|
81
81
|
const onGeometryChange = jest.fn()
|
|
82
82
|
newPolygon(context, 'f1', { onGeometryChange })
|
|
83
|
-
expect(draw.
|
|
83
|
+
expect(draw._commitValidator).toBe(onGeometryChange)
|
|
84
84
|
expect(draw.changeMode.mock.calls[0][1]).not.toHaveProperty('onGeometryChange')
|
|
85
85
|
})
|
|
86
86
|
|
|
@@ -88,6 +88,6 @@ describe('newPolygon', () => {
|
|
|
88
88
|
const pluginOnGeometryChange = jest.fn()
|
|
89
89
|
const { context, draw } = makeContext({ pluginConfig: { onGeometryChange: pluginOnGeometryChange } })
|
|
90
90
|
newPolygon(context, 'f1')
|
|
91
|
-
expect(draw.
|
|
91
|
+
expect(draw._commitValidator).toBe(pluginOnGeometryChange)
|
|
92
92
|
})
|
|
93
93
|
})
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { getCommitChecks } from '../validation/commitChecks.js'
|
|
2
|
+
import { isCheckedMode } from '../utils/drawModes.js'
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Check the current shape again, unchanged, by calling `onGeometryChange` with
|
|
6
|
+
* `phase: 'recheck'`. Use it when the answer may have changed without the shape
|
|
7
|
+
* changing (e.g. the user ignored a warning), or to retry a check that failed.
|
|
8
|
+
*
|
|
9
|
+
* Does nothing outside a draw/edit session, or before the shape has been checked.
|
|
10
|
+
*
|
|
11
|
+
* @param {object} context - plugin context
|
|
12
|
+
* @param {*} [detail] - passed to `onGeometryChange` as `event.detail`, e.g. to say why
|
|
13
|
+
* @returns {boolean} whether a check was started
|
|
14
|
+
*/
|
|
15
|
+
export const recheckGeometry = ({ mapProvider }, detail) => {
|
|
16
|
+
const { draw } = mapProvider
|
|
17
|
+
|
|
18
|
+
if (!draw) {
|
|
19
|
+
return false
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const mode = draw.getMode()
|
|
23
|
+
const checks = getCommitChecks(draw)
|
|
24
|
+
const { feature } = checks.state
|
|
25
|
+
if (!isCheckedMode(mode) || !feature) {
|
|
26
|
+
return false
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
const context = { phase: 'recheck', mode, ...(detail !== undefined && { detail }) }
|
|
30
|
+
checks.run({ feature, context, onGeometryChange: draw._commitValidator })
|
|
31
|
+
return true
|
|
32
|
+
}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { recheckGeometry } from './recheckGeometry.js'
|
|
2
|
+
import { getCommitChecks } from '../validation/commitChecks.js'
|
|
3
|
+
|
|
4
|
+
const square = { type: 'Feature', geometry: { type: 'Polygon', coordinates: [[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]] } }
|
|
5
|
+
|
|
6
|
+
const makeDraw = (mode = 'edit_vertex') => ({ getMode: jest.fn(() => mode) })
|
|
7
|
+
|
|
8
|
+
describe('recheckGeometry', () => {
|
|
9
|
+
test('checks the last checked shape again with phase recheck', () => {
|
|
10
|
+
const draw = makeDraw()
|
|
11
|
+
draw._commitValidator = jest.fn()
|
|
12
|
+
.mockReturnValueOnce({ valid: false, reason: 'near a parcel' })
|
|
13
|
+
.mockReturnValueOnce(true)
|
|
14
|
+
const checks = getCommitChecks(draw)
|
|
15
|
+
checks.run({ feature: square, context: { phase: 'change', mode: 'edit_vertex' }, onGeometryChange: draw._commitValidator })
|
|
16
|
+
expect(checks.state.status).toBe('invalid')
|
|
17
|
+
|
|
18
|
+
expect(recheckGeometry({ mapProvider: { draw } })).toBe(true)
|
|
19
|
+
expect(draw._commitValidator).toHaveBeenLastCalledWith(
|
|
20
|
+
{ feature: square, phase: 'recheck', mode: 'edit_vertex' },
|
|
21
|
+
expect.objectContaining({ signal: expect.any(AbortSignal) })
|
|
22
|
+
)
|
|
23
|
+
expect(checks.state.status).toBe('valid')
|
|
24
|
+
})
|
|
25
|
+
|
|
26
|
+
test('passes a detail through to onGeometryChange', () => {
|
|
27
|
+
const draw = makeDraw()
|
|
28
|
+
draw._commitValidator = jest.fn(() => true)
|
|
29
|
+
getCommitChecks(draw).run({ feature: square, context: { phase: 'change', mode: 'edit_vertex' }, onGeometryChange: draw._commitValidator })
|
|
30
|
+
recheckGeometry({ mapProvider: { draw } }, { refresh: false })
|
|
31
|
+
expect(draw._commitValidator).toHaveBeenLastCalledWith(
|
|
32
|
+
{ feature: square, phase: 'recheck', mode: 'edit_vertex', detail: { refresh: false } },
|
|
33
|
+
expect.anything()
|
|
34
|
+
)
|
|
35
|
+
})
|
|
36
|
+
|
|
37
|
+
test('does nothing before the shape has been checked', () => {
|
|
38
|
+
const draw = makeDraw()
|
|
39
|
+
draw._commitValidator = jest.fn()
|
|
40
|
+
expect(recheckGeometry({ mapProvider: { draw } })).toBe(false)
|
|
41
|
+
expect(draw._commitValidator).not.toHaveBeenCalled()
|
|
42
|
+
})
|
|
43
|
+
|
|
44
|
+
test('does nothing outside a draw/edit session', () => {
|
|
45
|
+
const draw = makeDraw('disabled')
|
|
46
|
+
draw._commitValidator = jest.fn(() => true)
|
|
47
|
+
getCommitChecks(draw).run({ feature: square, context: { phase: 'change' } })
|
|
48
|
+
expect(recheckGeometry({ mapProvider: { draw } })).toBe(false)
|
|
49
|
+
expect(draw._commitValidator).not.toHaveBeenCalled()
|
|
50
|
+
})
|
|
51
|
+
|
|
52
|
+
test('does nothing without a draw instance', () => {
|
|
53
|
+
expect(recheckGeometry({ mapProvider: { draw: null } })).toBe(false)
|
|
54
|
+
})
|
|
55
|
+
})
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { isEditMode } from '../utils/drawModes.js'
|
|
2
|
+
|
|
3
|
+
// Not structuredClone: it's missing from older browsers we still support, and coordinates
|
|
4
|
+
// are plain arrays of numbers, which JSON copies exactly
|
|
5
|
+
const copyCoordinates = (coordinates) => JSON.parse(JSON.stringify(coordinates)) // NOSONAR
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Replace the shape being edited, e.g. with a corrected boundary. The change can be
|
|
9
|
+
* undone and is checked like any other, with `phase: 'change'`.
|
|
10
|
+
*
|
|
11
|
+
* Does nothing outside an edit session, or when the geometry type differs from the
|
|
12
|
+
* shape being edited.
|
|
13
|
+
*
|
|
14
|
+
* @param {object} context - plugin context
|
|
15
|
+
* @param {object} geometry - GeoJSON geometry of the same type as the edited shape
|
|
16
|
+
* @returns {boolean} whether the shape was replaced
|
|
17
|
+
*/
|
|
18
|
+
export const setGeometry = ({ mapProvider, pluginState }, geometry) => {
|
|
19
|
+
const { draw } = mapProvider
|
|
20
|
+
|
|
21
|
+
if (!draw || !isEditMode(draw.getMode())) {
|
|
22
|
+
return false
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
const current = draw.get(pluginState.feature?.id)
|
|
26
|
+
if (!current || current.geometry?.type !== geometry?.type) {
|
|
27
|
+
return false
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
// Copied so later changes to the caller's object can't reach the edited shape
|
|
31
|
+
draw.setGeometry({ type: geometry.type, coordinates: copyCoordinates(geometry.coordinates) })
|
|
32
|
+
return true
|
|
33
|
+
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { setGeometry } from './setGeometry.js'
|
|
2
|
+
|
|
3
|
+
const polygon = { type: 'Polygon', coordinates: [[[0, 0], [0, 1], [1, 1], [0, 0]]] }
|
|
4
|
+
|
|
5
|
+
const makeContext = ({ mode = 'edit_vertex', current = { id: 'f1', geometry: { type: 'Polygon' } } } = {}) => {
|
|
6
|
+
const draw = {
|
|
7
|
+
getMode: jest.fn(() => mode),
|
|
8
|
+
get: jest.fn(() => current),
|
|
9
|
+
setGeometry: jest.fn()
|
|
10
|
+
}
|
|
11
|
+
return { context: { mapProvider: { draw }, pluginState: { feature: { id: 'f1' } } }, draw }
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
describe('setGeometry', () => {
|
|
15
|
+
test('replaces the edited shape with a copy of the geometry', () => {
|
|
16
|
+
const { context, draw } = makeContext()
|
|
17
|
+
expect(setGeometry(context, polygon)).toBe(true)
|
|
18
|
+
expect(draw.get).toHaveBeenCalledWith('f1')
|
|
19
|
+
const [passed] = draw.setGeometry.mock.calls[0]
|
|
20
|
+
expect(passed).toEqual(polygon)
|
|
21
|
+
expect(passed.coordinates).not.toBe(polygon.coordinates)
|
|
22
|
+
})
|
|
23
|
+
|
|
24
|
+
test('works in a point edit too', () => {
|
|
25
|
+
const { context, draw } = makeContext({ mode: 'edit_point', current: { id: 'f1', geometry: { type: 'Point' } } })
|
|
26
|
+
expect(setGeometry(context, { type: 'Point', coordinates: [1, 2] })).toBe(true)
|
|
27
|
+
expect(draw.setGeometry).toHaveBeenCalledWith({ type: 'Point', coordinates: [1, 2] })
|
|
28
|
+
})
|
|
29
|
+
|
|
30
|
+
test('does nothing outside an edit session', () => {
|
|
31
|
+
const { context, draw } = makeContext({ mode: 'draw_polygon' })
|
|
32
|
+
expect(setGeometry(context, polygon)).toBe(false)
|
|
33
|
+
expect(draw.setGeometry).not.toHaveBeenCalled()
|
|
34
|
+
})
|
|
35
|
+
|
|
36
|
+
test('does nothing when the geometry type differs', () => {
|
|
37
|
+
const { context, draw } = makeContext()
|
|
38
|
+
expect(setGeometry(context, { type: 'LineString', coordinates: [[0, 0], [1, 1]] })).toBe(false)
|
|
39
|
+
expect(draw.setGeometry).not.toHaveBeenCalled()
|
|
40
|
+
})
|
|
41
|
+
|
|
42
|
+
test('does nothing without a draw instance or an edited feature', () => {
|
|
43
|
+
expect(setGeometry({ mapProvider: { draw: null }, pluginState: {} }, polygon)).toBe(false)
|
|
44
|
+
const { context, draw } = makeContext({ current: null })
|
|
45
|
+
expect(setGeometry(context, polygon)).toBe(false)
|
|
46
|
+
expect(draw.setGeometry).not.toHaveBeenCalled()
|
|
47
|
+
})
|
|
48
|
+
})
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { splitPolygon } from '../utils/spatial.js'
|
|
2
|
-
import { ADAPTER_EVENTS } from '../adapterEvents.js'
|
|
2
|
+
import { ADAPTER_EVENTS, CHANGE_PHASE } from '../adapterEvents.js'
|
|
3
|
+
import { getCommitChecks } from '../validation/commitChecks.js'
|
|
3
4
|
|
|
4
5
|
const INVALID_REASON = 'Line does not split the shape into two parts'
|
|
5
6
|
const MIN_LINE_VERTICES = 2
|
|
@@ -21,29 +22,25 @@ const applySplitPreview = ({ draw, polygonFeature, feature }) => {
|
|
|
21
22
|
return isValid
|
|
22
23
|
}
|
|
23
24
|
|
|
24
|
-
// Colours the preview
|
|
25
|
+
// Colours the preview for a committed vertex and records whether the split is valid.
|
|
26
|
+
// Its returned verdict gates Done and the finish gesture (events.js).
|
|
25
27
|
const applySplitCommit = ({ draw, dispatch, polygonFeature, feature }) => {
|
|
26
28
|
const isValid = applySplitPreview({ draw, polygonFeature, feature })
|
|
27
29
|
dispatch({ type: 'SET_ACTION', payload: { name: 'split', isValid } })
|
|
28
|
-
dispatch({ type: 'SET_GEOMETRY_VALID', payload: isValid })
|
|
29
|
-
draw.setGeometryValid(isValid)
|
|
30
30
|
return isValid
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
//
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
}
|
|
45
|
-
return isValid ? { valid: true } : { valid: false, reason: INVALID_REASON }
|
|
46
|
-
}
|
|
33
|
+
const toResult = (isValid) => (isValid ? { valid: true } : { valid: false, reason: INVALID_REASON })
|
|
34
|
+
|
|
35
|
+
// Installed as draw._previewValidator. 'place' is a no-op — a split isn't complete
|
|
36
|
+
// until its last vertex, so checking it would block placement.
|
|
37
|
+
const createSplitPreviewValidator = ({ draw, polygonFeature }) => ({ feature, phase }) =>
|
|
38
|
+
phase === 'preview' ? toResult(applySplitPreview({ draw, polygonFeature, feature })) : { valid: true }
|
|
39
|
+
|
|
40
|
+
// Installed as draw._commitValidator. 'create' is a no-op — checking it would
|
|
41
|
+
// hijack an early finish into edit mode.
|
|
42
|
+
const createSplitCommitValidator = ({ draw, dispatch, polygonFeature }) => ({ feature, phase }) =>
|
|
43
|
+
phase === CHANGE_PHASE ? toResult(applySplitCommit({ draw, dispatch, polygonFeature, feature })) : { valid: true }
|
|
47
44
|
|
|
48
45
|
/**
|
|
49
46
|
* Start drawing a split line for a polygon.
|
|
@@ -63,9 +60,12 @@ export const split = ({ appState, appConfig, pluginState, mapState, mapProvider,
|
|
|
63
60
|
|
|
64
61
|
const polygonFeature = draw.get(featureId)
|
|
65
62
|
|
|
66
|
-
// Swap in split's own
|
|
67
|
-
const
|
|
68
|
-
|
|
63
|
+
// Swap in split's own rules; restored in stopListening.
|
|
64
|
+
const previousPreviewValidator = draw._previewValidator
|
|
65
|
+
const previousValidator = draw._commitValidator
|
|
66
|
+
draw._previewValidator = createSplitPreviewValidator({ draw, polygonFeature })
|
|
67
|
+
draw._commitValidator = createSplitCommitValidator({ draw, dispatch, polygonFeature })
|
|
68
|
+
getCommitChecks(draw).reset()
|
|
69
69
|
|
|
70
70
|
// Always include the draw outline layer so the split line snaps to it
|
|
71
71
|
const snapLayers = ['stroke-inactive.cold', ...(options.snapLayers || [])]
|
|
@@ -84,7 +84,8 @@ export const split = ({ appState, appConfig, pluginState, mapState, mapProvider,
|
|
|
84
84
|
|
|
85
85
|
// Unregister everything scoped to this session.
|
|
86
86
|
const stopListening = () => {
|
|
87
|
-
draw.
|
|
87
|
+
draw._previewValidator = previousPreviewValidator
|
|
88
|
+
draw._commitValidator = previousValidator
|
|
88
89
|
draw.off(ADAPTER_EVENTS.CREATE, onSplitCreate)
|
|
89
90
|
draw.off(ADAPTER_EVENTS.CANCEL, onSplitCancel)
|
|
90
91
|
}
|
|
@@ -13,7 +13,7 @@ const makeContext = (overrides = {}) => {
|
|
|
13
13
|
on: jest.fn(),
|
|
14
14
|
off: jest.fn(),
|
|
15
15
|
isSnapEnabled: jest.fn(() => true),
|
|
16
|
-
|
|
16
|
+
setCanFinish: jest.fn(),
|
|
17
17
|
setDrawingPreviewProperty: jest.fn(),
|
|
18
18
|
delete: jest.fn()
|
|
19
19
|
}
|
|
@@ -47,7 +47,8 @@ describe('split', () => {
|
|
|
47
47
|
|
|
48
48
|
split(context, 'poly')
|
|
49
49
|
|
|
50
|
-
expect(typeof draw.
|
|
50
|
+
expect(typeof draw._previewValidator).toBe('function')
|
|
51
|
+
expect(typeof draw._commitValidator).toBe('function')
|
|
51
52
|
expect(draw.setSnapLayers).toHaveBeenCalledWith(['stroke-inactive.cold'])
|
|
52
53
|
expect(dispatch).toHaveBeenCalledWith({ type: 'SET_HAS_SNAP_LAYERS', payload: true })
|
|
53
54
|
expect(draw.changeMode).toHaveBeenCalledWith('draw_line', expect.objectContaining({
|
|
@@ -72,12 +73,14 @@ describe('split', () => {
|
|
|
72
73
|
expect(draw.setSnapLayers).toHaveBeenCalledWith(['stroke-inactive.cold', 'extra'])
|
|
73
74
|
})
|
|
74
75
|
|
|
75
|
-
test('finalising the line computes a valid split, emits the result, and restores the previous
|
|
76
|
+
test('finalising the line computes a valid split, emits the result, and restores the previous validators', () => {
|
|
76
77
|
const { context, dispatch, draw, eventBus } = makeContext()
|
|
77
78
|
const polygonFeature = { id: 'poly' }
|
|
78
79
|
const featureCollection = { type: 'FeatureCollection' }
|
|
79
80
|
const previousValidator = jest.fn()
|
|
80
|
-
|
|
81
|
+
const previousPreviewValidator = jest.fn()
|
|
82
|
+
draw._commitValidator = previousValidator
|
|
83
|
+
draw._previewValidator = previousPreviewValidator
|
|
81
84
|
draw.get.mockReturnValue(polygonFeature)
|
|
82
85
|
splitPolygon.mockReturnValue(featureCollection)
|
|
83
86
|
|
|
@@ -91,7 +94,8 @@ describe('split', () => {
|
|
|
91
94
|
expect(splitPolygon).toHaveBeenCalledWith(polygonFeature, geojson)
|
|
92
95
|
expect(dispatch).toHaveBeenCalledWith({ type: 'SET_ACTION', payload: { name: 'split', isValid: true } })
|
|
93
96
|
expect(eventBus.emit).toHaveBeenCalledWith('draw:split', { originalFeatureId: 'poly', featureCollection })
|
|
94
|
-
expect(draw.
|
|
97
|
+
expect(draw._commitValidator).toBe(previousValidator)
|
|
98
|
+
expect(draw._previewValidator).toBe(previousPreviewValidator)
|
|
95
99
|
// The splitter line only ever existed to compute the split — it must not
|
|
96
100
|
// linger in the draw store afterwards.
|
|
97
101
|
expect(draw.delete).toHaveBeenCalledWith('_splitter')
|
|
@@ -100,7 +104,7 @@ describe('split', () => {
|
|
|
100
104
|
test('cancelling the splitter line stops listening and restores the previous validator', () => {
|
|
101
105
|
const { context, draw } = makeContext()
|
|
102
106
|
const previousValidator = jest.fn()
|
|
103
|
-
draw.
|
|
107
|
+
draw._commitValidator = previousValidator
|
|
104
108
|
|
|
105
109
|
split(context, 'poly')
|
|
106
110
|
const onCancel = handlerFor(draw, 'cancel')
|
|
@@ -109,7 +113,7 @@ describe('split', () => {
|
|
|
109
113
|
expect(draw.off).toHaveBeenCalledWith('create', expect.any(Function))
|
|
110
114
|
expect(draw.off).toHaveBeenCalledWith('cancel', onCancel)
|
|
111
115
|
expect(splitPolygon).not.toHaveBeenCalled()
|
|
112
|
-
expect(draw.
|
|
116
|
+
expect(draw._commitValidator).toBe(previousValidator)
|
|
113
117
|
})
|
|
114
118
|
|
|
115
119
|
test('finalising the line computes an invalid split and does not emit', () => {
|
|
@@ -124,13 +128,13 @@ describe('split', () => {
|
|
|
124
128
|
expect(draw.delete).toHaveBeenCalledWith('_splitter')
|
|
125
129
|
})
|
|
126
130
|
|
|
127
|
-
describe('the installed
|
|
131
|
+
describe('the installed validators', () => {
|
|
128
132
|
test('never blocks a hard placement veto (phase: place)', () => {
|
|
129
133
|
const { context, dispatch, draw } = makeContext()
|
|
130
134
|
split(context, 'poly')
|
|
131
135
|
dispatch.mockClear()
|
|
132
136
|
|
|
133
|
-
const result = draw.
|
|
137
|
+
const result = draw._previewValidator({ feature: lineFeature([[0, 0], [1, 1]]), phase: 'place', mode: 'draw_line', vertexIndex: 1 })
|
|
134
138
|
|
|
135
139
|
expect(result).toEqual({ valid: true })
|
|
136
140
|
expect(splitPolygon).not.toHaveBeenCalled()
|
|
@@ -143,7 +147,7 @@ describe('split', () => {
|
|
|
143
147
|
split(context, 'poly')
|
|
144
148
|
dispatch.mockClear()
|
|
145
149
|
|
|
146
|
-
const result = draw.
|
|
150
|
+
const result = draw._commitValidator({ feature: lineFeature([[0, 0], [1, 1]]), phase: 'create', mode: 'draw_line' })
|
|
147
151
|
|
|
148
152
|
expect(result).toEqual({ valid: true })
|
|
149
153
|
expect(splitPolygon).not.toHaveBeenCalled()
|
|
@@ -162,39 +166,50 @@ describe('split', () => {
|
|
|
162
166
|
// gates the built-in rules by numVertices, not a caller's own rule, so this
|
|
163
167
|
// must still reach the validator (numVertices: 1, below MIN_VERTICES.LineString).
|
|
164
168
|
const feature = lineFeature([[0, 0], [1, 1]])
|
|
165
|
-
const result = draw.
|
|
169
|
+
const result = draw._previewValidator({ feature, phase: 'preview', mode: 'draw_line', numVertices: 1 })
|
|
166
170
|
|
|
167
171
|
expect(splitPolygon).toHaveBeenCalledWith(polygonFeature, { id: '_splitter', geometry: feature.geometry })
|
|
168
172
|
expect(draw.setDrawingPreviewProperty).toHaveBeenCalledWith('splitter', 'valid')
|
|
169
|
-
// Committed Done-gating (pluginState.geometryValid / map.
|
|
173
|
+
// Committed Done-gating (pluginState.geometryValid / map._drawCanFinish) must only
|
|
170
174
|
// change on an actual commit — otherwise a live "what if you added a point here" check
|
|
171
175
|
// could flicker a just-committed valid split back to disabled.
|
|
172
176
|
expect(dispatch).not.toHaveBeenCalled()
|
|
173
|
-
expect(draw.
|
|
177
|
+
expect(draw.setCanFinish).not.toHaveBeenCalled()
|
|
174
178
|
expect(result).toEqual({ valid: true })
|
|
175
179
|
})
|
|
176
180
|
|
|
177
|
-
test('a committed vertex (phase:
|
|
181
|
+
test('a committed vertex (phase: change) updates the visual colour and returns the verdict that gates Done', () => {
|
|
178
182
|
const { context, dispatch, draw } = makeContext()
|
|
179
183
|
splitPolygon.mockReturnValue(null)
|
|
180
184
|
split(context, 'poly')
|
|
181
185
|
|
|
182
186
|
const feature = lineFeature([[0, 0], [1, 1]])
|
|
183
|
-
const result = draw.
|
|
187
|
+
const result = draw._commitValidator({ feature, phase: 'change', mode: 'draw_line', vertexIndex: 1 })
|
|
184
188
|
|
|
185
189
|
expect(draw.setDrawingPreviewProperty).toHaveBeenCalledWith('splitter', 'invalid')
|
|
186
190
|
expect(dispatch).toHaveBeenCalledWith({ type: 'SET_ACTION', payload: { name: 'split', isValid: false } })
|
|
187
|
-
|
|
188
|
-
expect(
|
|
191
|
+
// The Done gate is applied by events.js from the returned verdict, not written here
|
|
192
|
+
expect(dispatch).not.toHaveBeenCalledWith(expect.objectContaining({ type: 'SET_VALIDATION_STATUS' }))
|
|
193
|
+
expect(draw.setCanFinish).not.toHaveBeenCalled()
|
|
189
194
|
expect(result).toEqual({ valid: false, reason: expect.any(String) })
|
|
190
195
|
})
|
|
191
196
|
|
|
197
|
+
test('the commit validator ignores the live preview phase', () => {
|
|
198
|
+
const { context, draw } = makeContext()
|
|
199
|
+
split(context, 'poly')
|
|
200
|
+
|
|
201
|
+
const result = draw._commitValidator({ feature: lineFeature([[0, 0], [1, 1]]), phase: 'preview', mode: 'draw_line' })
|
|
202
|
+
|
|
203
|
+
expect(result).toEqual({ valid: true })
|
|
204
|
+
expect(splitPolygon).not.toHaveBeenCalled()
|
|
205
|
+
})
|
|
206
|
+
|
|
192
207
|
test('a line with fewer than two coordinates is treated as invalid without calling splitPolygon', () => {
|
|
193
208
|
const { context, draw } = makeContext()
|
|
194
209
|
split(context, 'poly')
|
|
195
210
|
|
|
196
211
|
const feature = lineFeature([[0, 0]])
|
|
197
|
-
const result = draw.
|
|
212
|
+
const result = draw._previewValidator({ feature, phase: 'preview', mode: 'draw_line', numVertices: 0 })
|
|
198
213
|
|
|
199
214
|
expect(splitPolygon).not.toHaveBeenCalled()
|
|
200
215
|
expect(draw.setDrawingPreviewProperty).toHaveBeenCalledWith('splitter', 'invalid')
|