@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
|
@@ -14,25 +14,6 @@ import { createLiveStroke } from '../../../validation/liveStroke.js'
|
|
|
14
14
|
|
|
15
15
|
const TOUCH_INTERFACE = 'touch'
|
|
16
16
|
const VERTEX_TYPE = 'vertex'
|
|
17
|
-
const MOVE_VERTEX = 'commit-move'
|
|
18
|
-
const INSERT_VERTEX = 'commit-insert'
|
|
19
|
-
const DELETE_VERTEX = 'commit-delete'
|
|
20
|
-
|
|
21
|
-
// Map an undo-op type onto the geometry-change `phase` consumed by validation.
|
|
22
|
-
const OP_PHASE = {
|
|
23
|
-
move_vertex: MOVE_VERTEX,
|
|
24
|
-
insert_vertex: INSERT_VERTEX,
|
|
25
|
-
delete_vertex: DELETE_VERTEX
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
// Undoing an op commits the inverse change (undo of a delete re-inserts, etc.),
|
|
29
|
-
// so its re-validation reports the inverse phase.
|
|
30
|
-
const UNDO_INVERSE_PHASE = {
|
|
31
|
-
move_vertex: MOVE_VERTEX,
|
|
32
|
-
insert_vertex: DELETE_VERTEX,
|
|
33
|
-
delete_vertex: INSERT_VERTEX
|
|
34
|
-
}
|
|
35
|
-
|
|
36
17
|
// Live invalid-stroke wiring: re-validate the displayed geometry on every geometry
|
|
37
18
|
// change (Modify drag, touch drag, keyboard nudge) via the shared controller —
|
|
38
19
|
// default rules synchronously, user callback throttled. All committed vertices are
|
|
@@ -72,7 +53,7 @@ const wireLiveStroke = ({ map, manager, olFeature }) => {
|
|
|
72
53
|
feature: { type: 'Feature', geometry: { type, coordinates } },
|
|
73
54
|
context: { mode: 'edit_vertex' },
|
|
74
55
|
numVertices,
|
|
75
|
-
|
|
56
|
+
onGeometryPreview: manager._previewValidator
|
|
76
57
|
})
|
|
77
58
|
}
|
|
78
59
|
olFeature.getGeometry().on('change', updateLiveValidity)
|
|
@@ -109,7 +90,7 @@ const createVertexActions = ({ olFeature, undoStack, selection, getTouchHandler
|
|
|
109
90
|
}
|
|
110
91
|
undoStack.push({ type: 'delete_vertex', vertexIndex: result.deletedIndex, deletedCoord: result.deletedCoord })
|
|
111
92
|
syncGeom()
|
|
112
|
-
emitGeometryValidation(
|
|
93
|
+
emitGeometryValidation(result.deletedIndex)
|
|
113
94
|
setState({ selectedVertexIndex: -1, selectedVertexType: null })
|
|
114
95
|
}
|
|
115
96
|
|
|
@@ -123,7 +104,7 @@ const createVertexActions = ({ olFeature, undoStack, selection, getTouchHandler
|
|
|
123
104
|
syncGeom()
|
|
124
105
|
// An undo commits the inverse change, so it must re-validate like any other
|
|
125
106
|
// commit — otherwise the invalid stroke and the Done gate go stale.
|
|
126
|
-
emitGeometryValidation(
|
|
107
|
+
emitGeometryValidation(restoredIndex)
|
|
127
108
|
// Only re-select if a vertex was already active — undo must not create a new selection
|
|
128
109
|
const newIndex = previousIndex >= 0 ? restoredIndex : -1
|
|
129
110
|
setState({
|
|
@@ -152,7 +133,7 @@ const wireTouchHandler = ({ map, container, manager, snap, olFeature, undoStack,
|
|
|
152
133
|
onVertexMoved ({ vertexIndex, previousCoord }) {
|
|
153
134
|
undoStack.push({ type: 'move_vertex', vertexIndex, previousCoord })
|
|
154
135
|
syncGeom()
|
|
155
|
-
emitGeometryValidation(
|
|
136
|
+
emitGeometryValidation(vertexIndex)
|
|
156
137
|
selectVertex(vertexIndex)
|
|
157
138
|
touchHandler.updateTargetPosition()
|
|
158
139
|
},
|
|
@@ -173,7 +154,7 @@ const wireTouchHandler = ({ map, container, manager, snap, olFeature, undoStack,
|
|
|
173
154
|
}
|
|
174
155
|
undoStack.push({ type: 'insert_vertex', vertexIndex: result.insertedIndex })
|
|
175
156
|
syncGeom()
|
|
176
|
-
emitGeometryValidation(
|
|
157
|
+
emitGeometryValidation(result.insertedIndex)
|
|
177
158
|
selectVertex(result.insertedIndex)
|
|
178
159
|
touchHandler.updateTargetPosition()
|
|
179
160
|
}
|
|
@@ -202,13 +183,13 @@ const wireKeyboardHandler = ({ map, container, snap, undoStack, selection, touch
|
|
|
202
183
|
onVertexMoved ({ vertexIndex, previousCoord }) {
|
|
203
184
|
undoStack.push({ type: 'move_vertex', vertexIndex, previousCoord })
|
|
204
185
|
syncGeom()
|
|
205
|
-
emitGeometryValidation(
|
|
186
|
+
emitGeometryValidation(vertexIndex)
|
|
206
187
|
setState({ selectedVertexIndex: vertexIndex, selectedVertexType: VERTEX_TYPE })
|
|
207
188
|
},
|
|
208
189
|
onInserted ({ insertedIndex }) {
|
|
209
190
|
undoStack.push({ type: 'insert_vertex', vertexIndex: insertedIndex })
|
|
210
191
|
syncGeom()
|
|
211
|
-
emitGeometryValidation(
|
|
192
|
+
emitGeometryValidation(insertedIndex)
|
|
212
193
|
},
|
|
213
194
|
onDeleted: actions.doDeleteVertex,
|
|
214
195
|
onUndo: actions.doUndo,
|
|
@@ -321,11 +302,23 @@ const buildModeApi = ({ manager, store, olFeature, originalFeatureStyle, selecti
|
|
|
321
302
|
}
|
|
322
303
|
undoStack.push({ type: 'insert_vertex', vertexIndex: result.insertedIndex })
|
|
323
304
|
syncGeom()
|
|
324
|
-
emitGeometryValidation(
|
|
305
|
+
emitGeometryValidation(result.insertedIndex)
|
|
325
306
|
setState({ selectedVertexIndex: result.insertedIndex, selectedVertexType: VERTEX_TYPE })
|
|
326
307
|
touchHandler.updateTargetPosition()
|
|
327
308
|
},
|
|
328
309
|
|
|
310
|
+
// Replaces the whole shape (e.g. a corrected boundary from the consumer) as one undoable
|
|
311
|
+
// commit. Vertex indices no longer refer to the same points, so the selection is cleared.
|
|
312
|
+
setGeometry (geometry) {
|
|
313
|
+
const geom = olFeature.getGeometry()
|
|
314
|
+
undoStack.push({ type: 'replace_geometry', previousCoordinates: geom.getCoordinates() })
|
|
315
|
+
geom.setCoordinates(geometry.coordinates)
|
|
316
|
+
syncGeom()
|
|
317
|
+
emitGeometryValidation()
|
|
318
|
+
setState({ selectedVertexIndex: -1, selectedVertexType: null })
|
|
319
|
+
touchHandler.hide()
|
|
320
|
+
},
|
|
321
|
+
|
|
329
322
|
destroy () {
|
|
330
323
|
parts.live.destroy()
|
|
331
324
|
olFeature.setStyle(originalFeatureStyle)
|
|
@@ -381,7 +374,7 @@ export const createEditMode = ({ map, manager, options }) => {
|
|
|
381
374
|
return
|
|
382
375
|
}
|
|
383
376
|
undoStack.push(op)
|
|
384
|
-
emitGeometryValidation(
|
|
377
|
+
emitGeometryValidation(op.vertexIndex)
|
|
385
378
|
setState({ selectedVertexIndex: op.vertexIndex, selectedVertexType: VERTEX_TYPE })
|
|
386
379
|
}
|
|
387
380
|
})
|
|
@@ -112,7 +112,7 @@ test('a LineString edit computes numVertices directly from coordinates.length (n
|
|
|
112
112
|
|
|
113
113
|
expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.VERTEX_CHANGE, { numVertices: 3 })
|
|
114
114
|
|
|
115
|
-
//
|
|
115
|
+
// PREVIEW_RULES (self-intersect/area) only ever apply to Polygon (see rules.js's getPolygon
|
|
116
116
|
// guard) — a self-crossing LineString still drives updateLiveValidity, but never flips
|
|
117
117
|
// the stroke invalid, unlike the Polygon case above.
|
|
118
118
|
olFeature.getGeometry().setCoordinates([[0, 0], [100, 100], [100, 0], [0, 100]])
|
|
@@ -122,12 +122,12 @@ test('a LineString edit computes numVertices directly from coordinates.length (n
|
|
|
122
122
|
test('the user callback runs throttled during an edit drag', () => {
|
|
123
123
|
jest.useFakeTimers()
|
|
124
124
|
const { manager, olFeature } = setup()
|
|
125
|
-
manager.
|
|
125
|
+
manager._previewValidator = jest.fn(() => ({ valid: false, reason: 'outside region' }))
|
|
126
126
|
olFeature.getGeometry().setCoordinates([[[0, 0], [110, 0], [100, 100], [0, 100], [0, 0]]])
|
|
127
127
|
olFeature.getGeometry().setCoordinates([[[0, 0], [120, 0], [100, 100], [0, 100], [0, 0]]])
|
|
128
|
-
expect(manager.
|
|
128
|
+
expect(manager._previewValidator).not.toHaveBeenCalled() // deferred to the frame
|
|
129
129
|
jest.runAllTimers()
|
|
130
|
-
expect(manager.
|
|
130
|
+
expect(manager._previewValidator).toHaveBeenCalledTimes(1) // trailing edge only
|
|
131
131
|
expect(currentStyle(olFeature)).toBe(manager.styles.editFeatureStyleInvalid)
|
|
132
132
|
jest.useRealTimers()
|
|
133
133
|
})
|
|
@@ -215,7 +215,7 @@ test('undo re-validates with the inverse change phase (undo of a delete re-inser
|
|
|
215
215
|
mode.undo()
|
|
216
216
|
jest.runAllTimers()
|
|
217
217
|
expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, expect.objectContaining({
|
|
218
|
-
phase: '
|
|
218
|
+
phase: 'change',
|
|
219
219
|
vertexIndex: 1,
|
|
220
220
|
feature: expect.any(Object)
|
|
221
221
|
}))
|
|
@@ -372,3 +372,24 @@ test('destroy removes interactions, layers and listeners, and restores the featu
|
|
|
372
372
|
expect(map.layers).toHaveLength(0)
|
|
373
373
|
expect(olFeature.getStyle()).toBeNull()
|
|
374
374
|
})
|
|
375
|
+
|
|
376
|
+
test('setGeometry replaces the shape as one undoable change, clearing the selection', () => {
|
|
377
|
+
jest.useFakeTimers()
|
|
378
|
+
const { manager, mode, ring } = setup()
|
|
379
|
+
const replacement = [[0, 0], [200, 0], [200, 200], [0, 200], [0, 0]]
|
|
380
|
+
mode.selectVertex(1)
|
|
381
|
+
manager.emit.mockClear()
|
|
382
|
+
|
|
383
|
+
mode.setGeometry({ type: 'Polygon', coordinates: [replacement] })
|
|
384
|
+
expect(ring()).toEqual(replacement)
|
|
385
|
+
expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.VERTEX_SELECTION, { index: -1, numVertices: 4 })
|
|
386
|
+
jest.runAllTimers()
|
|
387
|
+
expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, expect.objectContaining({ phase: 'change' }))
|
|
388
|
+
|
|
389
|
+
manager.emit.mockClear()
|
|
390
|
+
mode.undo()
|
|
391
|
+
expect(ring()).toEqual(RING)
|
|
392
|
+
jest.runAllTimers()
|
|
393
|
+
expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, expect.objectContaining({ phase: 'change' }))
|
|
394
|
+
jest.useRealTimers()
|
|
395
|
+
})
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { getCoords, getMidpoints } from '../utils/geometryHelpers.js'
|
|
2
|
-
import { ADAPTER_EVENTS } from '../../../adapterEvents.js'
|
|
2
|
+
import { ADAPTER_EVENTS, CHANGE_PHASE } from '../../../adapterEvents.js'
|
|
3
3
|
|
|
4
4
|
// Deferred commit-level geometrychange emitter (feature + change phase + vertex index)
|
|
5
|
-
// consumed by the validation layer. Deferred a tick so
|
|
6
|
-
//
|
|
7
|
-
const createGeometryValidationEmitter = (manager, store, olFeature) => (
|
|
8
|
-
if (!phase) { return }
|
|
5
|
+
// consumed by the validation layer. Deferred a tick so it reports the shape after the
|
|
6
|
+
// current mutation's undo bookkeeping has settled.
|
|
7
|
+
const createGeometryValidationEmitter = (manager, store, olFeature) => (vertexIndex) => {
|
|
9
8
|
setTimeout(() => {
|
|
10
|
-
manager.emit(ADAPTER_EVENTS.GEOMETRY_CHANGE, { feature: store.toGeoJSON(olFeature), phase, vertexIndex })
|
|
9
|
+
manager.emit(ADAPTER_EVENTS.GEOMETRY_CHANGE, { feature: store.toGeoJSON(olFeature), phase: CHANGE_PHASE, vertexIndex })
|
|
11
10
|
}, 0)
|
|
12
11
|
}
|
|
13
12
|
|
|
@@ -75,29 +75,19 @@ test('emitGeometryValidation emits a deferred commit-level geometrychange with t
|
|
|
75
75
|
const { selection, manager, store } = setup()
|
|
76
76
|
manager.emit.mockClear()
|
|
77
77
|
|
|
78
|
-
selection.emitGeometryValidation(
|
|
78
|
+
selection.emitGeometryValidation(2)
|
|
79
79
|
// Deferred a tick to avoid re-entrancy — nothing emitted synchronously.
|
|
80
80
|
expect(manager.emit).not.toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, expect.anything())
|
|
81
81
|
|
|
82
82
|
jest.runAllTimers()
|
|
83
83
|
expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, {
|
|
84
84
|
feature: store.toGeoJSON(),
|
|
85
|
-
phase: '
|
|
85
|
+
phase: 'change',
|
|
86
86
|
vertexIndex: 2
|
|
87
87
|
})
|
|
88
88
|
jest.useRealTimers()
|
|
89
89
|
})
|
|
90
90
|
|
|
91
|
-
test('emitGeometryValidation is a no-op without a change phase', () => {
|
|
92
|
-
jest.useFakeTimers()
|
|
93
|
-
const { selection, manager } = setup()
|
|
94
|
-
manager.emit.mockClear()
|
|
95
|
-
selection.emitGeometryValidation(undefined, 0)
|
|
96
|
-
jest.runAllTimers()
|
|
97
|
-
expect(manager.emit).not.toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, expect.anything())
|
|
98
|
-
jest.useRealTimers()
|
|
99
|
-
})
|
|
100
|
-
|
|
101
91
|
test('geometry changes refresh the layers until destroy unbinds the listener', () => {
|
|
102
92
|
const { selection, olFeature, layers } = setup()
|
|
103
93
|
olFeature.getGeometry().setCoordinates([[[0, 0], [20, 0], [20, 20], [0, 0]]])
|
|
@@ -76,6 +76,13 @@ export const undoDeleteVertex = (olFeature, op) => {
|
|
|
76
76
|
return vertexIndex
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
+
// Restores the whole geometry a setGeometry replaced. Vertex indices no longer refer to the
|
|
80
|
+
// same points, so there is nothing to re-select.
|
|
81
|
+
export const undoReplaceGeometry = (olFeature, op) => {
|
|
82
|
+
olFeature.getGeometry().setCoordinates(op.previousCoordinates)
|
|
83
|
+
return -1
|
|
84
|
+
}
|
|
85
|
+
|
|
79
86
|
/**
|
|
80
87
|
* Dispatch the correct undo handler based on operation type.
|
|
81
88
|
* @returns {number} vertex index to re-select after undo, or -1 for none
|
|
@@ -88,6 +95,8 @@ export const applyUndo = (olFeature, op) => {
|
|
|
88
95
|
return undoInsertVertex(olFeature, op)
|
|
89
96
|
case 'delete_vertex':
|
|
90
97
|
return undoDeleteVertex(olFeature, op)
|
|
98
|
+
case 'replace_geometry':
|
|
99
|
+
return undoReplaceGeometry(olFeature, op)
|
|
91
100
|
default:
|
|
92
101
|
return -1
|
|
93
102
|
}
|
|
@@ -61,4 +61,11 @@ describe('applyUndo dispatch', () => {
|
|
|
61
61
|
expect(applyUndo(feature, { type: 'insert_vertex', vertexIndex: 1 })).toBe(-1)
|
|
62
62
|
expect(applyUndo(feature, { type: 'resize' })).toBe(-1)
|
|
63
63
|
})
|
|
64
|
+
|
|
65
|
+
test('replace_geometry restores the whole previous geometry, with nothing to re-select', () => {
|
|
66
|
+
const feature = polygonFeature(SQUARE)
|
|
67
|
+
const previousCoordinates = [[[0, 0], [5, 0], [5, 5], [0, 0]]]
|
|
68
|
+
expect(applyUndo(feature, { type: 'replace_geometry', previousCoordinates })).toBe(-1)
|
|
69
|
+
expect(feature.getGeometry().getCoordinates()).toEqual(previousCoordinates)
|
|
70
|
+
})
|
|
64
71
|
})
|
|
@@ -2,7 +2,7 @@ import Draw from 'ol/interaction/Draw.js'
|
|
|
2
2
|
import { noModifierKeys } from 'ol/events/condition.js'
|
|
3
3
|
import { wireInputEvents, applyCrossHairVisibility } from '../draw/drawInput.js'
|
|
4
4
|
import { ADAPTER_EVENTS } from '../../../adapterEvents.js'
|
|
5
|
-
import { validatePlacement } from '../../../validation/validateGeometry.js'
|
|
5
|
+
import { validatePlacement, toPlacementBlocked } from '../../../validation/validateGeometry.js'
|
|
6
6
|
import { TOLERANCES } from '../defaults.js'
|
|
7
7
|
|
|
8
8
|
const MODE = 'draw_point'
|
|
@@ -11,15 +11,12 @@ const MODE = 'draw_point'
|
|
|
11
11
|
// directly rather than via validateGeometry.js's Polygon/LineString-only attemptPlacement.
|
|
12
12
|
const canPlaceVertex = (manager) => (coordinate) => {
|
|
13
13
|
const candidate = { type: 'Feature', geometry: { type: 'Point', coordinates: coordinate }, properties: {} }
|
|
14
|
-
const {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
)
|
|
19
|
-
if (!valid) {
|
|
20
|
-
manager.emit(ADAPTER_EVENTS.PLACEMENT_BLOCKED, { feature: candidate, reason: reason ?? null, phase: 'place', mode: MODE, vertexIndex: 0 })
|
|
14
|
+
const context = { mode: MODE, vertexIndex: 0 }
|
|
15
|
+
const result = validatePlacement(candidate, context, { onGeometryPreview: manager._previewValidator })
|
|
16
|
+
if (!result.valid) {
|
|
17
|
+
manager.emit(ADAPTER_EVENTS.PLACEMENT_BLOCKED, toPlacementBlocked(candidate, result, context))
|
|
21
18
|
}
|
|
22
|
-
return valid
|
|
19
|
+
return result.valid
|
|
23
20
|
}
|
|
24
21
|
|
|
25
22
|
// Commit a finished point to the store under the requested id and emit CREATE. Symbol
|
|
@@ -90,9 +90,9 @@ describe('createDrawPointMode', () => {
|
|
|
90
90
|
expect(nonGeometryProps).toEqual({})
|
|
91
91
|
})
|
|
92
92
|
|
|
93
|
-
test('condition vetoes placement via
|
|
93
|
+
test('condition vetoes placement via onGeometryPreview', () => {
|
|
94
94
|
const { interaction, manager, emitted } = setup()
|
|
95
|
-
manager.
|
|
95
|
+
manager._previewValidator = () => ({ valid: false, reason: 'not allowed here' })
|
|
96
96
|
const condition = interaction.condition_
|
|
97
97
|
const allowed = condition({ coordinate: [1, 2], originalEvent: {} })
|
|
98
98
|
expect(allowed).toBe(false)
|
|
@@ -154,7 +154,7 @@ describe('createDrawPointMode', () => {
|
|
|
154
154
|
test('a vetoed crosshair placement never commits', () => {
|
|
155
155
|
const { wireArgs, manager, emitted, interaction } = setup()
|
|
156
156
|
const { append, finish } = spyOnCommit(interaction)
|
|
157
|
-
manager.
|
|
157
|
+
manager._previewValidator = () => false
|
|
158
158
|
wireArgs.placeVertex()
|
|
159
159
|
expect(append).not.toHaveBeenCalled()
|
|
160
160
|
expect(finish).not.toHaveBeenCalled()
|
|
@@ -10,10 +10,6 @@ import { STYLES_CHANGED_EVENT } from '../core/internalEvents.js'
|
|
|
10
10
|
import { createLiveStroke } from '../../../validation/liveStroke.js'
|
|
11
11
|
|
|
12
12
|
const TOUCH_INTERFACE = 'touch'
|
|
13
|
-
// Shared phase name with edit_vertex's own move_vertex op — a moved point re-validates the
|
|
14
|
-
// same way (validation/rules.js has no Point-specific rule, so this only ever gates a
|
|
15
|
-
// consumer's own onGeometryChange callback).
|
|
16
|
-
const MOVE_VERTEX = 'commit-move'
|
|
17
13
|
|
|
18
14
|
// A symbol icon renders far bigger than buildModifyCondition's fixed-radius hit-test (tuned
|
|
19
15
|
// for a plain vertex dot), so this hit-tests the icon's own rendered pixels instead. No touch
|
|
@@ -43,7 +39,7 @@ const wirePointLiveValidity = ({ manager, olFeature }) => {
|
|
|
43
39
|
feature: { type: 'Feature', geometry: { type: 'Point', coordinates } },
|
|
44
40
|
context: { mode: 'edit_point' },
|
|
45
41
|
numVertices: 1,
|
|
46
|
-
|
|
42
|
+
onGeometryPreview: manager._previewValidator
|
|
47
43
|
})
|
|
48
44
|
}
|
|
49
45
|
olFeature.getGeometry().on('change', updateLiveValidity)
|
|
@@ -70,7 +66,7 @@ const wireTouchHandler = ({ map, container, manager, snap, undoStack, selection
|
|
|
70
66
|
onVertexMoved ({ vertexIndex, previousCoord }) {
|
|
71
67
|
undoStack.push({ type: 'move_vertex', vertexIndex, previousCoord })
|
|
72
68
|
syncGeom()
|
|
73
|
-
emitGeometryValidation(
|
|
69
|
+
emitGeometryValidation(vertexIndex)
|
|
74
70
|
},
|
|
75
71
|
// A stray tap never relocates the point — only the offset-target drag and the D-pad do
|
|
76
72
|
// (mirrors the ML adapter's editPointMode/touchHandlers.js onTap no-op).
|
|
@@ -99,7 +95,18 @@ const createUndoAction = ({ olFeature, undoStack, selection }) => () => {
|
|
|
99
95
|
selection.syncGeom()
|
|
100
96
|
// An undo commits the inverse change, so it must re-validate like any other commit —
|
|
101
97
|
// otherwise the Done gate could go stale. Always vertexIndex 0 — a point has only one.
|
|
102
|
-
selection.emitGeometryValidation(
|
|
98
|
+
selection.emitGeometryValidation(0)
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
// Moves the point to the given geometry's coordinate as one undoable commit (setGeometry).
|
|
102
|
+
const createSetGeometryAction = ({ olFeature, undoStack, selection, touchHandler }) => (geometry) => {
|
|
103
|
+
undoStack.push({ type: 'replace_geometry', vertexIndex: 0, previousCoord: olFeature.getGeometry().getCoordinates() })
|
|
104
|
+
movePoint(olFeature, 0, geometry.coordinates)
|
|
105
|
+
selection.syncGeom()
|
|
106
|
+
selection.emitGeometryValidation(0)
|
|
107
|
+
if (selection.getState().interfaceType === TOUCH_INTERFACE) {
|
|
108
|
+
touchHandler.updateTargetPosition()
|
|
109
|
+
}
|
|
103
110
|
}
|
|
104
111
|
|
|
105
112
|
const wireKeyboardHandler = ({ map, container, snap, undoStack, selection, touchHandler, doUndo }) => {
|
|
@@ -114,7 +121,7 @@ const wireKeyboardHandler = ({ map, container, snap, undoStack, selection, touch
|
|
|
114
121
|
onVertexMoved ({ vertexIndex, previousCoord }) {
|
|
115
122
|
undoStack.push({ type: 'move_vertex', vertexIndex, previousCoord })
|
|
116
123
|
syncGeom()
|
|
117
|
-
emitGeometryValidation(
|
|
124
|
+
emitGeometryValidation(vertexIndex)
|
|
118
125
|
},
|
|
119
126
|
// No midpoint concept for a point, so this is never actually reached — required by
|
|
120
127
|
// createKeyboardHandler's interface all the same. Not reachable through this module's
|
|
@@ -204,7 +211,7 @@ export const createEditPointMode = ({ map, manager, options }) => {
|
|
|
204
211
|
return
|
|
205
212
|
}
|
|
206
213
|
undoStack.push(op)
|
|
207
|
-
selection.emitGeometryValidation(
|
|
214
|
+
selection.emitGeometryValidation(op.vertexIndex)
|
|
208
215
|
}
|
|
209
216
|
})
|
|
210
217
|
|
|
@@ -254,6 +261,8 @@ export const createEditPointMode = ({ map, manager, options }) => {
|
|
|
254
261
|
// once at construction (pointSelectionState's VERTEX_SELECTION) and held for the session.
|
|
255
262
|
nudgeSelectedVertex: keyboardHandler.nudgeByDelta,
|
|
256
263
|
|
|
264
|
+
setGeometry: createSetGeometryAction({ olFeature, undoStack, selection, touchHandler }),
|
|
265
|
+
|
|
257
266
|
destroy () {
|
|
258
267
|
live.destroy()
|
|
259
268
|
olFeature.setStyle(originalFeatureStyle)
|
|
@@ -66,10 +66,10 @@ test('destroy restores the feature\'s pre-edit style', () => {
|
|
|
66
66
|
expect(olFeature.getStyle()).not.toBe(selectedStyleFn)
|
|
67
67
|
})
|
|
68
68
|
|
|
69
|
-
test('validity flips (user callback only — a Point has no built-in
|
|
69
|
+
test('validity flips (user callback only — a Point has no built-in PLACE_RULES violation) gate the Done button', () => {
|
|
70
70
|
jest.useFakeTimers()
|
|
71
71
|
const { manager, olFeature } = setup()
|
|
72
|
-
manager.
|
|
72
|
+
manager._previewValidator = jest.fn(() => ({ valid: false, reason: 'outside region' }))
|
|
73
73
|
olFeature.getGeometry().setCoordinates([9, 9])
|
|
74
74
|
jest.runAllTimers()
|
|
75
75
|
expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.VALIDITY_CHANGE,
|
|
@@ -219,7 +219,7 @@ test('nudgeSelectedVertex (MapControls D-pad) moves the point and is undoable',
|
|
|
219
219
|
mode.undo() // empty stack — no-op
|
|
220
220
|
})
|
|
221
221
|
|
|
222
|
-
test('undo re-validates with the
|
|
222
|
+
test('undo re-validates with the change phase', () => {
|
|
223
223
|
jest.useFakeTimers()
|
|
224
224
|
const { manager, mode } = setup()
|
|
225
225
|
mode.nudgeSelectedVertex(1, 0, true)
|
|
@@ -228,7 +228,7 @@ test('undo re-validates with the commit-move phase', () => {
|
|
|
228
228
|
mode.undo()
|
|
229
229
|
jest.runAllTimers()
|
|
230
230
|
expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, expect.objectContaining({
|
|
231
|
-
phase: '
|
|
231
|
+
phase: 'change',
|
|
232
232
|
vertexIndex: 0,
|
|
233
233
|
feature: expect.any(Object)
|
|
234
234
|
}))
|
|
@@ -341,3 +341,28 @@ test('destroy removes the point drag interaction and listeners', () => {
|
|
|
341
341
|
expect(map.removeInteraction).toHaveBeenCalled()
|
|
342
342
|
expect(map.interactions.length).toBeLessThan(interactionsBefore)
|
|
343
343
|
})
|
|
344
|
+
|
|
345
|
+
test('setGeometry moves the point as one undoable change', () => {
|
|
346
|
+
jest.useFakeTimers()
|
|
347
|
+
const { manager, mode, coord } = setup([5, 5])
|
|
348
|
+
manager.emit.mockClear()
|
|
349
|
+
|
|
350
|
+
mode.setGeometry({ type: 'Point', coordinates: [9, 9] })
|
|
351
|
+
expect(coord()).toEqual([9, 9])
|
|
352
|
+
jest.runAllTimers()
|
|
353
|
+
expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, expect.objectContaining({ phase: 'change', vertexIndex: 0 }))
|
|
354
|
+
|
|
355
|
+
manager.emit.mockClear()
|
|
356
|
+
mode.undo()
|
|
357
|
+
expect(coord()).toEqual([5, 5])
|
|
358
|
+
jest.runAllTimers()
|
|
359
|
+
expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, expect.objectContaining({ phase: 'change' }))
|
|
360
|
+
jest.useRealTimers()
|
|
361
|
+
})
|
|
362
|
+
|
|
363
|
+
test('setGeometry repositions the touch target in touch mode', () => {
|
|
364
|
+
const { mode, coord } = setup([5, 5])
|
|
365
|
+
mode.setInterfaceType('touch')
|
|
366
|
+
expect(() => mode.setGeometry({ type: 'Point', coordinates: [9, 9] })).not.toThrow()
|
|
367
|
+
expect(coord()).toEqual([9, 9])
|
|
368
|
+
})
|
|
@@ -23,11 +23,12 @@ export const undoMovePoint = (olFeature, op) => {
|
|
|
23
23
|
|
|
24
24
|
/**
|
|
25
25
|
* Dispatch the correct undo handler based on operation type — mirrors edit/undoOps.js's
|
|
26
|
-
* applyUndo, but with the
|
|
26
|
+
* applyUndo, but with the two op types a Point produces (a move, or a setGeometry).
|
|
27
27
|
* @returns {number} vertex index to re-select after undo (always 0), or -1 for none
|
|
28
28
|
*/
|
|
29
29
|
export const applyPointUndo = (olFeature, op) => {
|
|
30
|
-
|
|
30
|
+
// A replace_geometry op (setGeometry) stores the previous coordinate the same way
|
|
31
|
+
if (op.type === 'move_vertex' || op.type === 'replace_geometry') {
|
|
31
32
|
return undoMovePoint(olFeature, op)
|
|
32
33
|
}
|
|
33
34
|
return -1
|
|
@@ -24,6 +24,12 @@ describe('applyPointUndo', () => {
|
|
|
24
24
|
expect(feature.getGeometry().getCoordinates()).toEqual([3, 4])
|
|
25
25
|
})
|
|
26
26
|
|
|
27
|
+
test('dispatches replace_geometry (a setGeometry) the same way', () => {
|
|
28
|
+
const feature = pointFeature([5, 5])
|
|
29
|
+
expect(applyPointUndo(feature, { type: 'replace_geometry', previousCoord: [1, 2] })).toBe(0)
|
|
30
|
+
expect(feature.getGeometry().getCoordinates()).toEqual([1, 2])
|
|
31
|
+
})
|
|
32
|
+
|
|
27
33
|
test('returns -1 for an unknown operation type', () => {
|
|
28
34
|
const feature = pointFeature([5, 5])
|
|
29
35
|
expect(applyPointUndo(feature, { type: 'unknown' })).toBe(-1)
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import { ADAPTER_EVENTS } from '../../../adapterEvents.js'
|
|
1
|
+
import { ADAPTER_EVENTS, CHANGE_PHASE } from '../../../adapterEvents.js'
|
|
2
2
|
|
|
3
3
|
// Deferred commit-level geometrychange emitter (feature + change phase + vertex index)
|
|
4
4
|
// consumed by the validation layer — copied from edit/selectionState.js's own (identical
|
|
5
5
|
// shape, no ring dependency to strip).
|
|
6
|
-
const createGeometryValidationEmitter = (manager, store, olFeature) => (
|
|
7
|
-
if (!phase) { return }
|
|
6
|
+
const createGeometryValidationEmitter = (manager, store, olFeature) => (vertexIndex) => {
|
|
8
7
|
setTimeout(() => {
|
|
9
|
-
manager.emit(ADAPTER_EVENTS.GEOMETRY_CHANGE, { feature: store.toGeoJSON(olFeature), phase, vertexIndex })
|
|
8
|
+
manager.emit(ADAPTER_EVENTS.GEOMETRY_CHANGE, { feature: store.toGeoJSON(olFeature), phase: CHANGE_PHASE, vertexIndex })
|
|
10
9
|
}, 0)
|
|
11
10
|
}
|
|
12
11
|
|
|
@@ -75,28 +75,18 @@ test('emitGeometryValidation emits a deferred commit-level geometrychange with t
|
|
|
75
75
|
const { selection, manager, store } = setup()
|
|
76
76
|
manager.emit.mockClear()
|
|
77
77
|
|
|
78
|
-
selection.emitGeometryValidation(
|
|
78
|
+
selection.emitGeometryValidation(0)
|
|
79
79
|
expect(manager.emit).not.toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, expect.anything())
|
|
80
80
|
|
|
81
81
|
jest.runAllTimers()
|
|
82
82
|
expect(manager.emit).toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, {
|
|
83
83
|
feature: store.toGeoJSON(),
|
|
84
|
-
phase: '
|
|
84
|
+
phase: 'change',
|
|
85
85
|
vertexIndex: 0
|
|
86
86
|
})
|
|
87
87
|
jest.useRealTimers()
|
|
88
88
|
})
|
|
89
89
|
|
|
90
|
-
test('emitGeometryValidation is a no-op without a change phase', () => {
|
|
91
|
-
jest.useFakeTimers()
|
|
92
|
-
const { selection, manager } = setup()
|
|
93
|
-
manager.emit.mockClear()
|
|
94
|
-
selection.emitGeometryValidation(undefined, 0)
|
|
95
|
-
jest.runAllTimers()
|
|
96
|
-
expect(manager.emit).not.toHaveBeenCalledWith(ADAPTER_EVENTS.GEOMETRY_CHANGE, expect.anything())
|
|
97
|
-
jest.useRealTimers()
|
|
98
|
-
})
|
|
99
|
-
|
|
100
90
|
test('geometry changes refresh the cached coordinate until destroy unbinds the listener', () => {
|
|
101
91
|
const { selection, olFeature } = setup()
|
|
102
92
|
olFeature.getGeometry().setCoordinates([20, 20])
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getPixelRatio, resolvePointSymbol, refreshAllPointSymbols } from './pointSymbolImages.js'
|
|
2
2
|
import { createSymbolRegistry } from '../../../../../../src/services/symbolRegistry.js'
|
|
3
|
-
import { SymbolImageCache } from '../../../../../../providers/
|
|
3
|
+
import { SymbolImageCache } from '../../../../../../providers/openlayers/src/utils/symbolImages.js'
|
|
4
4
|
|
|
5
5
|
const symbolRegistry = createSymbolRegistry()
|
|
6
6
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { flattenStyleProperties } from '../utils/flattenStyleProperties.js'
|
|
2
|
+
import { startCheckSession } from '../validation/commitChecks.js'
|
|
2
3
|
|
|
3
4
|
// Shared body for newLine/newPolygon — the two are identical except which draw_* mode they
|
|
4
5
|
// enter, so that's the only thing parameterised here. Kept out of newPoint.js: a Point also
|
|
@@ -12,15 +13,14 @@ export const createNewShape = (mode) => ({ appState, appConfig, pluginConfig, pl
|
|
|
12
13
|
return
|
|
13
14
|
}
|
|
14
15
|
|
|
15
|
-
|
|
16
|
+
const { stroke, fill, strokeWidth, properties: customProperties, onGeometryChange, onGeometryPreview, ...modeOptions } = options
|
|
17
|
+
startCheckSession(draw, { onGeometryChange, onGeometryPreview }, pluginConfig, eventBus)
|
|
18
|
+
eventBus.emit('draw:started', { mode, featureId })
|
|
16
19
|
|
|
17
20
|
const snapLayers = options.snapLayers === undefined ? (pluginConfig.snapLayers ?? null) : options.snapLayers
|
|
18
21
|
draw.setSnapLayers(snapLayers)
|
|
19
22
|
dispatch({ type: 'SET_HAS_SNAP_LAYERS', payload: snapLayers?.length > 0 })
|
|
20
23
|
|
|
21
|
-
const { stroke, fill, strokeWidth, properties: customProperties, onGeometryChange, ...modeOptions } = options
|
|
22
|
-
// Per-call callback overrides the plugin-level one; events.js reads this on every commit.
|
|
23
|
-
draw._geometryValidator = onGeometryChange ?? pluginConfig.onGeometryChange
|
|
24
24
|
const properties = {
|
|
25
25
|
...customProperties,
|
|
26
26
|
...flattenStyleProperties({ stroke, fill, strokeWidth })
|
|
@@ -37,7 +37,7 @@ describe('createNewShape', () => {
|
|
|
37
37
|
const { context, dispatch, eventBus, draw } = makeContext()
|
|
38
38
|
createNewShape('draw_custom')(context, 'f1')
|
|
39
39
|
|
|
40
|
-
expect(eventBus.emit).toHaveBeenCalledWith('draw:started', { mode: 'draw_custom' })
|
|
40
|
+
expect(eventBus.emit).toHaveBeenCalledWith('draw:started', { mode: 'draw_custom', featureId: 'f1' })
|
|
41
41
|
expect(draw.changeMode).toHaveBeenCalledWith('draw_custom', expect.objectContaining({ featureId: 'f1' }))
|
|
42
42
|
expect(dispatch).toHaveBeenCalledWith({ type: 'SET_MODE', payload: 'draw_custom' })
|
|
43
43
|
})
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { validateGeometry } from '../validation/validateGeometry.js'
|
|
1
|
+
import { startCheckSession, getCommitChecks } from '../validation/commitChecks.js'
|
|
3
2
|
|
|
4
3
|
export const editFeature = ({ appState, appConfig, mapState, pluginConfig, pluginState, mapProvider, services }, featureId, options = {}) => {
|
|
5
4
|
const { dispatch } = pluginState
|
|
@@ -15,14 +14,13 @@ export const editFeature = ({ appState, appConfig, mapState, pluginConfig, plugi
|
|
|
15
14
|
return false
|
|
16
15
|
}
|
|
17
16
|
|
|
18
|
-
|
|
19
|
-
draw._geometryValidator = options.onGeometryChange ?? pluginConfig.onGeometryChange
|
|
17
|
+
startCheckSession(draw, options, pluginConfig, eventBus)
|
|
20
18
|
|
|
21
19
|
// A Point has no ring of vertices to edit — edit_point relocates the single coordinate
|
|
22
20
|
// instead of edit_vertex's ring-of-vertices machinery.
|
|
23
21
|
const editModeMap = { LineString: 'edit_line', Polygon: 'edit_polygon', Point: 'edit_point' }
|
|
24
22
|
const mode = existingFeature.geometry.type === 'Point' ? 'edit_point' : 'edit_vertex'
|
|
25
|
-
eventBus.emit('draw:editstart', { mode: editModeMap[existingFeature.geometry.type] })
|
|
23
|
+
eventBus.emit('draw:editstart', { mode: editModeMap[existingFeature.geometry.type], featureId })
|
|
26
24
|
|
|
27
25
|
const snapLayers = options.snapLayers === undefined ? (pluginConfig.snapLayers ?? null) : options.snapLayers
|
|
28
26
|
draw.setSnapLayers(snapLayers)
|
|
@@ -34,7 +32,7 @@ export const editFeature = ({ appState, appConfig, mapState, pluginConfig, plugi
|
|
|
34
32
|
undoButtonId: `${appConfig.id}-draw-undo`,
|
|
35
33
|
isPanEnabled: appState.interfaceType !== 'keyboard',
|
|
36
34
|
interfaceType: appState.interfaceType,
|
|
37
|
-
scale:
|
|
35
|
+
scale: mapState.mapSizeScale,
|
|
38
36
|
featureId,
|
|
39
37
|
getSnapEnabled: () => draw.isSnapEnabled()
|
|
40
38
|
})
|
|
@@ -47,11 +45,10 @@ export const editFeature = ({ appState, appConfig, mapState, pluginConfig, plugi
|
|
|
47
45
|
|
|
48
46
|
dispatch({ type: 'SET_MODE', payload: mode })
|
|
49
47
|
|
|
50
|
-
// Seed the Done-button gate and the stroke from the feature's starting
|
|
51
|
-
//
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
draw.setInvalid?.(!valid)
|
|
48
|
+
// Seed the Done-button gate and the stroke from the feature's starting check, so an
|
|
49
|
+
// already invalid feature opens dashed and cannot be "finished" until fixed. events.js
|
|
50
|
+
// applies the result once it settles (straight away unless onGeometryChange is async).
|
|
51
|
+
getCommitChecks(draw).run({ feature, context: { phase: 'edit-start', mode }, onGeometryChange: draw._commitValidator })
|
|
55
52
|
|
|
56
53
|
return true
|
|
57
54
|
}
|