@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
|
@@ -315,7 +315,7 @@ describe('live invalid stroke (draw mode)', () => {
|
|
|
315
315
|
|
|
316
316
|
test('commit-level (has a phase) events do not drive the stroke; events.js owns those', () => {
|
|
317
317
|
const { map } = drawPolygonSetup()
|
|
318
|
-
onHandler(map, CUSTOM_DRAW_EVENTS.GEOMETRY_CHANGE)({ feature: bowtie, phase: '
|
|
318
|
+
onHandler(map, CUSTOM_DRAW_EVENTS.GEOMETRY_CHANGE)({ feature: bowtie, phase: 'change', vertexIndex: 3 })
|
|
319
319
|
expect(map.setLayoutProperty).not.toHaveBeenCalled()
|
|
320
320
|
})
|
|
321
321
|
|
|
@@ -355,13 +355,13 @@ describe('live invalid stroke (draw mode)', () => {
|
|
|
355
355
|
test('the user callback runs ONCE per frame in draw mode, with phase preview, driving both the stroke and Add point from that single call', () => {
|
|
356
356
|
jest.useFakeTimers()
|
|
357
357
|
const { map, bus } = drawPolygonSetup()
|
|
358
|
-
map.
|
|
358
|
+
map._drawPreviewValidator = jest.fn(() => ({ valid: false, reason: 'outside region' }))
|
|
359
359
|
const fire = onHandler(map, CUSTOM_DRAW_EVENTS.GEOMETRY_CHANGE)
|
|
360
360
|
fire(square)
|
|
361
|
-
expect(map.
|
|
361
|
+
expect(map._drawPreviewValidator).not.toHaveBeenCalled() // deferred to the frame
|
|
362
362
|
jest.runAllTimers()
|
|
363
|
-
expect(map.
|
|
364
|
-
expect(map.
|
|
363
|
+
expect(map._drawPreviewValidator).toHaveBeenCalledTimes(1) // not once per gate
|
|
364
|
+
expect(map._drawPreviewValidator).toHaveBeenCalledWith(expect.objectContaining({ phase: 'preview' }))
|
|
365
365
|
expect(map.setLayoutProperty).toHaveBeenCalledWith('stroke-active-invalid.hot', 'visibility', 'visible')
|
|
366
366
|
expect(bus.emit).toHaveBeenCalledWith('canplacechange', expect.objectContaining({ canPlace: false, reason: 'outside region' }))
|
|
367
367
|
jest.useRealTimers()
|
|
@@ -370,12 +370,12 @@ describe('live invalid stroke (draw mode)', () => {
|
|
|
370
370
|
test('the user callback runs even before any vertex is placed, gating both the stroke and Add point from the very first candidate point', () => {
|
|
371
371
|
jest.useFakeTimers()
|
|
372
372
|
const { map, bus } = drawPolygonSetup()
|
|
373
|
-
map.
|
|
373
|
+
map._drawPreviewValidator = jest.fn(() => ({ valid: false, reason: 'outside region' }))
|
|
374
374
|
const fire = onHandler(map, CUSTOM_DRAW_EVENTS.GEOMETRY_CHANGE)
|
|
375
375
|
// Zero committed vertices — coordinates is just the rubber-band cursor point.
|
|
376
376
|
fire({ type: 'draw.geometrychange', coordinates: [[[5, 5]]] })
|
|
377
377
|
jest.runAllTimers()
|
|
378
|
-
expect(map.
|
|
378
|
+
expect(map._drawPreviewValidator).toHaveBeenCalledWith(expect.objectContaining({ numVertices: 0, phase: 'preview' }))
|
|
379
379
|
expect(bus.emit).toHaveBeenCalledWith('canplacechange', expect.objectContaining({ canPlace: false, reason: 'outside region' }))
|
|
380
380
|
expect(map.setLayoutProperty).toHaveBeenCalledWith('stroke-active-invalid.hot', 'visibility', 'visible')
|
|
381
381
|
jest.useRealTimers()
|
|
@@ -430,7 +430,7 @@ describe('live invalid stroke (edit mode)', () => {
|
|
|
430
430
|
const { map, draw, bus } = editSetup()
|
|
431
431
|
draw.getMode.mockReturnValue('edit_point')
|
|
432
432
|
const fire = onHandler(map, CUSTOM_DRAW_EVENTS.GEOMETRY_CHANGE)
|
|
433
|
-
map.
|
|
433
|
+
map._drawPreviewValidator = () => ({ valid: false, reason: 'outside region' })
|
|
434
434
|
fire({ type: 'draw.geometrychange', coordinates: [5, 5] })
|
|
435
435
|
jest.runAllTimers()
|
|
436
436
|
expect(bus.emit).toHaveBeenCalledWith('validitychange', expect.objectContaining({ valid: false, reason: 'outside region' }))
|
|
@@ -446,25 +446,34 @@ describe('live invalid stroke (edit mode)', () => {
|
|
|
446
446
|
test('the user callback runs throttled during an edit drag', () => {
|
|
447
447
|
jest.useFakeTimers()
|
|
448
448
|
const { map } = editSetup()
|
|
449
|
-
map.
|
|
449
|
+
map._drawPreviewValidator = jest.fn(() => ({ valid: false, reason: 'outside region' }))
|
|
450
450
|
const fire = onHandler(map, CUSTOM_DRAW_EVENTS.GEOMETRY_CHANGE)
|
|
451
451
|
fire({ type: 'draw.geometrychange', coordinates: [[[0, 0], [10, 0], [10, 10], [0, 10]]] })
|
|
452
452
|
fire({ type: 'draw.geometrychange', coordinates: [[[0, 0], [10, 0], [10, 10], [0, 11]]] })
|
|
453
|
-
expect(map.
|
|
453
|
+
expect(map._drawPreviewValidator).not.toHaveBeenCalled() // deferred to the frame
|
|
454
454
|
jest.runAllTimers()
|
|
455
|
-
expect(map.
|
|
455
|
+
expect(map._drawPreviewValidator).toHaveBeenCalledTimes(1) // trailing edge only
|
|
456
456
|
expect(map.setLayoutProperty).toHaveBeenCalledWith('stroke-active-invalid.hot', 'visibility', 'visible')
|
|
457
457
|
jest.useRealTimers()
|
|
458
458
|
})
|
|
459
459
|
})
|
|
460
460
|
|
|
461
|
-
describe('
|
|
462
|
-
test('stores the validator on the map for modes to read, and reads it back', () => {
|
|
461
|
+
describe('_previewValidator accessor', () => {
|
|
462
|
+
test('stores the preview validator on the map for modes to read, and reads it back', () => {
|
|
463
463
|
const { adapter, map } = setup()
|
|
464
464
|
const validator = () => true
|
|
465
|
-
adapter.
|
|
466
|
-
expect(map.
|
|
467
|
-
expect(adapter.
|
|
465
|
+
adapter._previewValidator = validator
|
|
466
|
+
expect(map._drawPreviewValidator).toBe(validator)
|
|
467
|
+
expect(adapter._previewValidator).toBe(validator)
|
|
468
|
+
})
|
|
469
|
+
})
|
|
470
|
+
|
|
471
|
+
describe('setGeometry', () => {
|
|
472
|
+
test('bridges into the active mode via a custom event', () => {
|
|
473
|
+
const { adapter, map } = setup()
|
|
474
|
+
const geometry = { type: 'Polygon', coordinates: [[[0, 0], [1, 0], [1, 1], [0, 0]]] }
|
|
475
|
+
adapter.setGeometry(geometry)
|
|
476
|
+
expect(map.fire).toHaveBeenCalledWith('draw.setgeometry', { geometry })
|
|
468
477
|
})
|
|
469
478
|
})
|
|
470
479
|
|
|
@@ -511,13 +520,13 @@ describe('changeMode', () => {
|
|
|
511
520
|
})
|
|
512
521
|
})
|
|
513
522
|
|
|
514
|
-
describe('
|
|
523
|
+
describe('setCanFinish', () => {
|
|
515
524
|
test('records validity on the map for the draw mode to read', () => {
|
|
516
525
|
const { adapter, map } = setup()
|
|
517
|
-
adapter.
|
|
518
|
-
expect(map.
|
|
519
|
-
adapter.
|
|
520
|
-
expect(map.
|
|
526
|
+
adapter.setCanFinish(false)
|
|
527
|
+
expect(map._drawCanFinish).toBe(false)
|
|
528
|
+
adapter.setCanFinish(true)
|
|
529
|
+
expect(map._drawCanFinish).toBe(true)
|
|
521
530
|
})
|
|
522
531
|
})
|
|
523
532
|
|
|
@@ -766,7 +775,7 @@ describe('simple delegations', () => {
|
|
|
766
775
|
const render = jest.fn()
|
|
767
776
|
// A commit event (has a phase) must not become the cached preview target — it
|
|
768
777
|
// carries a `feature`, not the live `properties` object rubber-band moves do.
|
|
769
|
-
onHandler(map, CUSTOM_DRAW_EVENTS.GEOMETRY_CHANGE)({ feature: {}, phase: '
|
|
778
|
+
onHandler(map, CUSTOM_DRAW_EVENTS.GEOMETRY_CHANGE)({ feature: {}, phase: 'change', ctx: { store: { render } } })
|
|
770
779
|
|
|
771
780
|
expect(() => adapter.setDrawingPreviewProperty('splitter', 'valid')).not.toThrow()
|
|
772
781
|
expect(render).not.toHaveBeenCalled()
|
|
@@ -30,7 +30,8 @@ export const CUSTOM_DRAW_EVENTS = {
|
|
|
30
30
|
PLACEMENT_BLOCKED: 'draw.placementblocked',
|
|
31
31
|
NUDGE_VERTEX: 'draw.nudgevertex',
|
|
32
32
|
SELECT_VERTEX: 'draw.selectvertex',
|
|
33
|
-
INSERT_VERTEX_AT_MIDPOINT: 'draw.insertvertexatmidpoint'
|
|
33
|
+
INSERT_VERTEX_AT_MIDPOINT: 'draw.insertvertexatmidpoint',
|
|
34
|
+
SET_GEOMETRY: 'draw.setgeometry'
|
|
34
35
|
}
|
|
35
36
|
|
|
36
37
|
// Native MapLibre map event (not a draw event) — fires whenever the map style data changes.
|
|
@@ -2,25 +2,26 @@ import {
|
|
|
2
2
|
getSnapInstance, isSnapActive, isSnapEnabled, createSnappedEvent, createSnappedClickEvent
|
|
3
3
|
} from '../../utils/snapHelpers.js'
|
|
4
4
|
import { attemptPlacement } from '../../../../validation/validateGeometry.js'
|
|
5
|
+
import { CHANGE_PHASE } from '../../../../adapterEvents.js'
|
|
5
6
|
|
|
6
7
|
// The commit-level geometrychange payload for a vertex commit: the placed-only
|
|
7
8
|
// geometry (trailing rubber-band point dropped so validation tests the committed shape).
|
|
8
|
-
const placedDrawGeometryChange = (feature, getCoords
|
|
9
|
+
const placedDrawGeometryChange = (feature, getCoords) => {
|
|
9
10
|
const placed = getCoords(feature).slice(0, -1)
|
|
10
11
|
const type = feature.toGeoJSON().geometry.type
|
|
11
12
|
const geometry = type === 'Polygon'
|
|
12
13
|
? { type: 'Polygon', coordinates: [placed] }
|
|
13
14
|
: { type: 'LineString', coordinates: placed }
|
|
14
|
-
return { feature: { type: 'Feature', geometry, properties: {} }, phase, vertexIndex: Math.max(0, placed.length - 1) }
|
|
15
|
+
return { feature: { type: 'Feature', geometry, properties: {} }, phase: CHANGE_PHASE, vertexIndex: Math.max(0, placed.length - 1) }
|
|
15
16
|
}
|
|
16
17
|
|
|
17
18
|
// Fire a commit-level geometrychange for validation, deferred a tick so it runs after
|
|
18
19
|
// the current click settles.
|
|
19
|
-
const scheduleDrawValidation = (map, getFeature, getCoords, state
|
|
20
|
+
const scheduleDrawValidation = (map, getFeature, getCoords, state) => {
|
|
20
21
|
setTimeout(() => {
|
|
21
22
|
const feature = getFeature(state)
|
|
22
23
|
if (!feature) { return }
|
|
23
|
-
map.fire('draw.geometrychange', placedDrawGeometryChange(feature, getCoords
|
|
24
|
+
map.fire('draw.geometrychange', placedDrawGeometryChange(feature, getCoords))
|
|
24
25
|
}, 0)
|
|
25
26
|
}
|
|
26
27
|
|
|
@@ -38,7 +39,7 @@ const createClickHelpers = ({ geometryType, getFeature, getCoords }) => ({
|
|
|
38
39
|
return e.originalEvent.button > 0 || this.map._undoInProgress || e.originalEvent.target !== this.map.getCanvas()
|
|
39
40
|
},
|
|
40
41
|
|
|
41
|
-
// Attempt a placement through the shared
|
|
42
|
+
// Attempt a placement through the shared placement rules + user callback. On a veto
|
|
42
43
|
// the vertex never appears and a draw.placementblocked event carries the
|
|
43
44
|
// reason. The trailing rubber-band coord is dropped so the candidate is placed
|
|
44
45
|
// vertices + the point about to be placed.
|
|
@@ -49,7 +50,7 @@ const createClickHelpers = ({ geometryType, getFeature, getCoords }) => ({
|
|
|
49
50
|
placed: getCoords(feature).slice(0, -1),
|
|
50
51
|
point,
|
|
51
52
|
geometryType,
|
|
52
|
-
|
|
53
|
+
onGeometryPreview: this.map._drawPreviewValidator
|
|
53
54
|
})
|
|
54
55
|
if (!result.valid) {
|
|
55
56
|
this.map.fire('draw.placementblocked', result.blocked)
|
|
@@ -66,8 +67,8 @@ const createClickHelpers = ({ geometryType, getFeature, getCoords }) => ({
|
|
|
66
67
|
|
|
67
68
|
// Emit a commit-level geometrychange after a vertex commit (placement or undo)
|
|
68
69
|
// so the validation layer can gate the Done button.
|
|
69
|
-
emitDrawValidation (state
|
|
70
|
-
scheduleDrawValidation(this.map, getFeature, getCoords, state
|
|
70
|
+
emitDrawValidation (state) {
|
|
71
|
+
scheduleDrawValidation(this.map, getFeature, getCoords, state)
|
|
71
72
|
},
|
|
72
73
|
|
|
73
74
|
onTap () {
|
|
@@ -107,8 +108,8 @@ const createClickActions = ({ ParentMode, getFeature, getCoords, validateClick,
|
|
|
107
108
|
if (this._isIgnorableClick(e)) {
|
|
108
109
|
return
|
|
109
110
|
}
|
|
110
|
-
// Block a finish/close gesture (clicking a placed vertex) while the shape
|
|
111
|
-
if (this.map.
|
|
111
|
+
// Block a finish/close gesture (clicking a placed vertex) while the shape can't be finished.
|
|
112
|
+
if (this.map._drawCanFinish === false && e.featureTarget?.properties?.meta === 'vertex') {
|
|
112
113
|
return
|
|
113
114
|
}
|
|
114
115
|
const snap = getSnapInstance(this.map)
|
|
@@ -146,9 +147,9 @@ const createClickActions = ({ ParentMode, getFeature, getCoords, validateClick,
|
|
|
146
147
|
|
|
147
148
|
if (!validateClick(feature)) {
|
|
148
149
|
// For lines: clicking same spot (like double-click) should finish the line — but
|
|
149
|
-
// only when
|
|
150
|
+
// only when it can be finished, so a line whose check failed can't be completed.
|
|
150
151
|
// isValidLineClick only returns false with 2+ coords, so coords.length is always > 1 here.
|
|
151
|
-
if (finishOnInvalidClick && this.map.
|
|
152
|
+
if (finishOnInvalidClick && this.map._drawCanFinish !== false) {
|
|
152
153
|
coords.pop()
|
|
153
154
|
this.map.fire('draw.create', { features: [feature.toGeoJSON()] })
|
|
154
155
|
this.changeMode('simple_select', { featureIds: [feature.id] })
|
|
@@ -49,7 +49,7 @@ describe('mouse clicks (polygon)', () => {
|
|
|
49
49
|
|
|
50
50
|
test('the user callback can veto a mouse placement (and receives phase "place")', () => {
|
|
51
51
|
const { ctx, state } = setup(DrawPolygonMode)
|
|
52
|
-
ctx.map.
|
|
52
|
+
ctx.map._drawPreviewValidator = jest.fn((event) =>
|
|
53
53
|
event.phase === 'place' ? { valid: false, reason: 'outside region' } : { valid: true })
|
|
54
54
|
clickAt(ctx, state, 0, 0)
|
|
55
55
|
expect(state.polygon.coordinates[0]).toHaveLength(0) // first vertex vetoed
|
|
@@ -87,7 +87,7 @@ describe('mouse clicks (polygon)', () => {
|
|
|
87
87
|
clickAt(ctx, state, 10, 0)
|
|
88
88
|
jest.runAllTimers()
|
|
89
89
|
const geomChange = firedWith(ctx.map, 'draw.geometrychange').pop()
|
|
90
|
-
expect(geomChange).toEqual(expect.objectContaining({ phase: '
|
|
90
|
+
expect(geomChange).toEqual(expect.objectContaining({ phase: 'change', feature: expect.any(Object) }))
|
|
91
91
|
jest.useRealTimers()
|
|
92
92
|
})
|
|
93
93
|
|
|
@@ -116,7 +116,7 @@ describe('mouse clicks (polygon)', () => {
|
|
|
116
116
|
clickAt(ctx, state, 0, 0)
|
|
117
117
|
clickAt(ctx, state, 10, 0)
|
|
118
118
|
clickAt(ctx, state, 5, 10)
|
|
119
|
-
ctx.map.
|
|
119
|
+
ctx.map._drawCanFinish = false
|
|
120
120
|
const lenBefore = state.polygon.coordinates[0].length
|
|
121
121
|
ctx.onClick(state, { ...clickEvent(ctx, 0, 0), featureTarget: { properties: { meta: 'vertex' } } })
|
|
122
122
|
expect(state.polygon.coordinates[0].length).toBe(lenBefore) // finish gesture ignored
|
|
@@ -146,7 +146,7 @@ describe('add-vertex button and doClick', () => {
|
|
|
146
146
|
const { ctx, state } = setup(DrawLineMode)
|
|
147
147
|
clickAt(ctx, state, 0, 0)
|
|
148
148
|
clickAt(ctx, state, 10, 0)
|
|
149
|
-
ctx.map.
|
|
149
|
+
ctx.map._drawCanFinish = false
|
|
150
150
|
// Rubber-band duplicates the last placed vertex → a finish gesture.
|
|
151
151
|
state.line.setCoordinates([[0, 0], [10, 0], [10, 0]])
|
|
152
152
|
ctx.doClick(state)
|
|
@@ -178,7 +178,7 @@ describe('add-vertex button and doClick', () => {
|
|
|
178
178
|
|
|
179
179
|
test('the user callback can veto a doClick placement', () => {
|
|
180
180
|
const { ctx, state } = setup(DrawPolygonMode)
|
|
181
|
-
ctx.map.
|
|
181
|
+
ctx.map._drawPreviewValidator = () => ({ valid: false, reason: 'outside region' })
|
|
182
182
|
ctx.doClick(state)
|
|
183
183
|
expect(state.polygon.coordinates[0]).toHaveLength(0)
|
|
184
184
|
expect(firedWith(ctx.map, 'draw.placementblocked').pop()).toEqual(
|
|
@@ -39,7 +39,7 @@ const createUndoStackHandlers = ({ geometryType, getFeature }) => ({
|
|
|
39
39
|
this.undoVertex(state)
|
|
40
40
|
// An undo commits a vertex removal, so it must re-validate like any other
|
|
41
41
|
// commit — otherwise the Done gate goes stale.
|
|
42
|
-
this.emitDrawValidation(state
|
|
42
|
+
this.emitDrawValidation(state)
|
|
43
43
|
}
|
|
44
44
|
},
|
|
45
45
|
|
|
@@ -87,7 +87,7 @@ describe('undo via draw.undo event and reinitialisation', () => {
|
|
|
87
87
|
expect(state.polygon.coordinates[0]).toHaveLength(3)
|
|
88
88
|
})
|
|
89
89
|
|
|
90
|
-
test('undo re-validates the committed shape (deferred, phase
|
|
90
|
+
test('undo re-validates the committed shape (deferred, phase change)', () => {
|
|
91
91
|
jest.useFakeTimers()
|
|
92
92
|
const { ctx, state } = setup(DrawPolygonMode)
|
|
93
93
|
clickAt(ctx, state, 0, 0)
|
|
@@ -98,7 +98,7 @@ describe('undo via draw.undo event and reinitialisation', () => {
|
|
|
98
98
|
ctx.onUndo(state)
|
|
99
99
|
jest.runAllTimers()
|
|
100
100
|
expect(firedWith(ctx.map, 'draw.geometrychange').pop()).toEqual(expect.objectContaining({
|
|
101
|
-
phase: '
|
|
101
|
+
phase: 'change',
|
|
102
102
|
feature: expect.any(Object)
|
|
103
103
|
}))
|
|
104
104
|
jest.useRealTimers()
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import MapboxDraw from '@mapbox/mapbox-gl-draw'
|
|
2
2
|
import { createLifecycle } from './drawMode/lifecycle.js'
|
|
3
|
-
import { validatePlacement } from '../../../validation/validateGeometry.js'
|
|
3
|
+
import { validatePlacement, toPlacementBlocked } from '../../../validation/validateGeometry.js'
|
|
4
4
|
import {
|
|
5
5
|
getSnapInstance, isSnapEnabled, isSnapActive, getSnapLngLat, triggerSnapAtPoint, triggerSnapAtCenter
|
|
6
6
|
} from '../utils/snapHelpers.js'
|
|
@@ -16,15 +16,12 @@ const INTERFACE_KEYS = new Set(['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown
|
|
|
16
16
|
// Polygon/LineString via MODE_BY_GEOMETRY, so a Point candidate is built and validated directly.
|
|
17
17
|
const canPlace = (map, coord) => {
|
|
18
18
|
const candidate = { type: 'Feature', geometry: { type: 'Point', coordinates: coord }, properties: {} }
|
|
19
|
-
const {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
)
|
|
24
|
-
if (!valid) {
|
|
25
|
-
map.fire('draw.placementblocked', { feature: candidate, reason: reason ?? null, phase: 'place', mode: MODE, vertexIndex: 0 })
|
|
19
|
+
const context = { mode: MODE, vertexIndex: 0 }
|
|
20
|
+
const result = validatePlacement(candidate, context, { onGeometryPreview: map._drawPreviewValidator })
|
|
21
|
+
if (!result.valid) {
|
|
22
|
+
map.fire('draw.placementblocked', toPlacementBlocked(candidate, result, context))
|
|
26
23
|
}
|
|
27
|
-
return valid
|
|
24
|
+
return result.valid
|
|
28
25
|
}
|
|
29
26
|
|
|
30
27
|
const ParentMode = MapboxDraw.modes.draw_point
|
|
@@ -11,7 +11,7 @@ const createMap = () => {
|
|
|
11
11
|
_undoInProgress: false,
|
|
12
12
|
_undoStack: null,
|
|
13
13
|
_snapInstance: null,
|
|
14
|
-
|
|
14
|
+
_drawPreviewValidator: undefined,
|
|
15
15
|
getCanvas: () => canvas,
|
|
16
16
|
getCenter: () => ({ ...CENTER }),
|
|
17
17
|
project: jest.fn(() => ({ x: 50, y: 50 })),
|
|
@@ -179,9 +179,9 @@ describe('DrawPointMode', () => {
|
|
|
179
179
|
expect(state.point.coordinates).toEqual([])
|
|
180
180
|
})
|
|
181
181
|
|
|
182
|
-
it('vetoes placement via
|
|
182
|
+
it('vetoes placement via onGeometryPreview and never commits', () => {
|
|
183
183
|
const { ctx, state } = setup()
|
|
184
|
-
ctx.map.
|
|
184
|
+
ctx.map._drawPreviewValidator = () => ({ valid: false, reason: 'not allowed here' })
|
|
185
185
|
ctx.onClick(state, clickEvent(ctx, 1, 2))
|
|
186
186
|
expect(state.point.coordinates).toEqual([])
|
|
187
187
|
const blocked = firedWith(ctx.map, 'draw.placementblocked')
|
|
@@ -192,7 +192,7 @@ describe('DrawPointMode', () => {
|
|
|
192
192
|
|
|
193
193
|
it('defaults the blocked reason to null when the veto gives none', () => {
|
|
194
194
|
const { ctx, state } = setup()
|
|
195
|
-
ctx.map.
|
|
195
|
+
ctx.map._drawPreviewValidator = () => false // no {reason} shape
|
|
196
196
|
ctx.onClick(state, clickEvent(ctx, 1, 2))
|
|
197
197
|
const blocked = firedWith(ctx.map, 'draw.placementblocked')
|
|
198
198
|
expect(blocked[0].reason).toBeNull()
|
|
@@ -3,7 +3,7 @@ import { isActiveFeature } from '../../../../../../../node_modules/@mapbox/mapbo
|
|
|
3
3
|
import {
|
|
4
4
|
getSnapInstance, isSnapEnabled, getSnapLngLat, triggerSnapAtPoint, clearSnapState, setAutoSnapSuspended
|
|
5
5
|
} from '../../utils/snapHelpers.js'
|
|
6
|
-
import { validatePlacement } from '../../../../validation/validateGeometry.js'
|
|
6
|
+
import { validatePlacement, toPlacementBlocked } from '../../../../validation/validateGeometry.js'
|
|
7
7
|
|
|
8
8
|
const MODE = 'edit_point'
|
|
9
9
|
|
|
@@ -13,15 +13,12 @@ const MODE = 'edit_point'
|
|
|
13
13
|
// Point candidate is built and validated directly instead.
|
|
14
14
|
const canPlaceAt = (map, coord) => {
|
|
15
15
|
const candidate = { type: 'Feature', geometry: { type: 'Point', coordinates: coord }, properties: {} }
|
|
16
|
-
const {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
)
|
|
21
|
-
if (!valid) {
|
|
22
|
-
map.fire('draw.placementblocked', { feature: candidate, reason: reason ?? null, phase: 'place', mode: MODE, vertexIndex: 0 })
|
|
16
|
+
const context = { mode: MODE, vertexIndex: 0 }
|
|
17
|
+
const result = validatePlacement(candidate, context, { onGeometryPreview: map._drawPreviewValidator })
|
|
18
|
+
if (!result.valid) {
|
|
19
|
+
map.fire('draw.placementblocked', toPlacementBlocked(candidate, result, context))
|
|
23
20
|
}
|
|
24
|
-
return valid
|
|
21
|
+
return result.valid
|
|
25
22
|
}
|
|
26
23
|
|
|
27
24
|
/**
|
|
@@ -77,7 +77,7 @@ describe('pointerHandlers', () => {
|
|
|
77
77
|
|
|
78
78
|
test('onClick is vetoed by a rejecting geometry validator, firing draw.placementblocked with a fallback null reason, and leaving the point untouched', () => {
|
|
79
79
|
const { ctx, state, map } = createHarness()
|
|
80
|
-
map.
|
|
80
|
+
map._drawPreviewValidator = () => false // no {reason} shape
|
|
81
81
|
ctx.onClick(state, { featureTarget: undefined, lngLat: { lng: 9, lat: 9 }, point: { x: 90, y: 90 } })
|
|
82
82
|
expect(state.feature.coordinates).toEqual([5, 5])
|
|
83
83
|
expect(map.fire).toHaveBeenCalledWith('draw.placementblocked', expect.objectContaining({ reason: null }))
|
|
@@ -1,21 +1,12 @@
|
|
|
1
1
|
import { scalePoint } from '../editVertexMode/helpers.js'
|
|
2
2
|
import { sharedUndoHandlers } from '../../utils/geometryValidation.js'
|
|
3
3
|
|
|
4
|
-
// Map an undo-stack op type onto the geometry-change `phase` consumed by validation. Read off
|
|
5
|
-
// `this` by the shared pushUndo mixin (utils/geometryValidation.js) — see that file's comment.
|
|
6
|
-
const UNDO_OP_PHASE = { move_point: 'commit-move' }
|
|
7
|
-
|
|
8
|
-
// Undoing a move commits the inverse move, so it re-validates with the same phase.
|
|
9
|
-
const UNDO_INVERSE_PHASE = { move_point: 'commit-move' }
|
|
10
|
-
|
|
11
4
|
// Same dispatch-by-op-type pattern as editVertexMode/undoHandlers.js, but with a single op
|
|
12
5
|
// type — there's no insert/delete concept for a Point's one coordinate — so undoMovePoint
|
|
13
6
|
// writes the coordinate directly, with no getRingSegments/getSegmentForIndex/
|
|
14
7
|
// getModifiableCoords lookup needed at all.
|
|
15
8
|
export const undoHandlers = {
|
|
16
9
|
...sharedUndoHandlers,
|
|
17
|
-
UNDO_OP_PHASE,
|
|
18
|
-
UNDO_INVERSE_PHASE,
|
|
19
10
|
|
|
20
11
|
handleUndo (state) {
|
|
21
12
|
const undoStack = this.map._undoStack
|
|
@@ -25,22 +16,25 @@ export const undoHandlers = {
|
|
|
25
16
|
|
|
26
17
|
const op = undoStack.pop()
|
|
27
18
|
|
|
28
|
-
if (op.type === 'move_point') {
|
|
19
|
+
if (op.type === 'move_point' || op.type === 'replace_geometry') {
|
|
29
20
|
this.undoMovePoint(state, op)
|
|
30
21
|
}
|
|
31
22
|
// An undo commits the inverse change, so it must re-validate like any other
|
|
32
23
|
// commit — otherwise the invalid stroke and the Done gate go stale.
|
|
33
|
-
this.emitGeometryValidation(
|
|
24
|
+
this.emitGeometryValidation(op.vertexIndex, op.featureId)
|
|
34
25
|
},
|
|
35
26
|
|
|
36
27
|
undoMovePoint (state, op) {
|
|
37
|
-
|
|
28
|
+
this.setPointPosition(state, op.featureId, op.previousPosition)
|
|
29
|
+
},
|
|
30
|
+
|
|
31
|
+
setPointPosition (state, featureId, position) {
|
|
38
32
|
const feature = this.getFeature(featureId)
|
|
39
33
|
if (!feature) { return }
|
|
40
34
|
|
|
41
|
-
feature.updateCoordinate('',
|
|
35
|
+
feature.updateCoordinate('', position[0], position[1])
|
|
42
36
|
this._ctx.store.render()
|
|
43
37
|
this.fireGeometryChange(state)
|
|
44
|
-
this.updateTouchPointTarget(state, scalePoint(this.map.project(
|
|
38
|
+
this.updateTouchPointTarget(state, scalePoint(this.map.project(position), state.scale))
|
|
45
39
|
}
|
|
46
40
|
}
|
|
@@ -3,16 +3,16 @@ import { createHarness } from './__helpers__/harness.js'
|
|
|
3
3
|
// fireGeometryChange/emitGeometryValidation/pushUndo are the shared mixin from
|
|
4
4
|
// utils/geometryValidation.js — their own behaviour is covered by
|
|
5
5
|
// utils/geometryValidation.test.js. This file only tests what's specific to editPointMode:
|
|
6
|
-
// pushUndo's
|
|
6
|
+
// pushUndo's validation for 'move_point', handleUndo's single-op-type dispatch,
|
|
7
7
|
// and undoMovePoint itself.
|
|
8
8
|
describe('undoHandlers', () => {
|
|
9
|
-
test('pushUndo maps move_point to the
|
|
9
|
+
test('pushUndo maps move_point to the change phase', () => {
|
|
10
10
|
jest.useFakeTimers()
|
|
11
11
|
const { ctx, map } = createHarness()
|
|
12
12
|
map.fire.mockClear()
|
|
13
13
|
ctx.pushUndo({ type: 'move_point', featureId: 'feat-1', vertexIndex: 0 })
|
|
14
14
|
jest.runAllTimers()
|
|
15
|
-
expect(map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({ phase: '
|
|
15
|
+
expect(map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({ phase: 'change' }))
|
|
16
16
|
jest.useRealTimers()
|
|
17
17
|
})
|
|
18
18
|
|
|
@@ -28,15 +28,44 @@ describe('undoHandlers', () => {
|
|
|
28
28
|
expect(() => ctx.handleUndo(state)).not.toThrow()
|
|
29
29
|
})
|
|
30
30
|
|
|
31
|
-
// handleUndo's own call to emitGeometryValidation
|
|
32
|
-
//
|
|
33
|
-
// single-entry map, so it would just re-confirm the 'commit-move' phase already checked
|
|
34
|
-
// above via pushUndo. (editVertexMode's equivalent op/inverse maps genuinely differ —
|
|
35
|
-
// see its own undoHandlers.test.js.)
|
|
31
|
+
// handleUndo's own call to emitGeometryValidation isn't re-asserted here — it reports the
|
|
32
|
+
// same 'change' phase already checked above via pushUndo.
|
|
36
33
|
test('undoMovePoint restores the previous position directly, guarding a missing feature', () => {
|
|
37
34
|
const { ctx, state } = createHarness()
|
|
38
35
|
ctx.undoMovePoint({ ...state, featureId: 'missing' }, { previousPosition: [0, 0], featureId: 'missing' })
|
|
39
36
|
ctx.undoMovePoint(state, { previousPosition: [3, 4], featureId: 'feat-1' })
|
|
40
37
|
expect(ctx.getFeature('feat-1').coordinates).toEqual([3, 4])
|
|
41
38
|
})
|
|
39
|
+
|
|
40
|
+
describe('setGeometry', () => {
|
|
41
|
+
test('moves the point on draw.setgeometry and re-validates as a change', () => {
|
|
42
|
+
jest.useFakeTimers()
|
|
43
|
+
const { ctx, map } = createHarness()
|
|
44
|
+
map.fire.mockClear()
|
|
45
|
+
map.fire('draw.setgeometry', { geometry: { type: 'Point', coordinates: [7, 8] } })
|
|
46
|
+
expect(ctx.getFeature('feat-1').coordinates).toEqual([7, 8])
|
|
47
|
+
jest.runAllTimers()
|
|
48
|
+
expect(map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({ phase: 'change' }))
|
|
49
|
+
jest.useRealTimers()
|
|
50
|
+
})
|
|
51
|
+
|
|
52
|
+
test('undo moves the point back and re-validates as a change', () => {
|
|
53
|
+
jest.useFakeTimers()
|
|
54
|
+
const { ctx, state, map } = createHarness()
|
|
55
|
+
const original = [...ctx.getFeature('feat-1').coordinates]
|
|
56
|
+
map.fire('draw.setgeometry', { geometry: { type: 'Point', coordinates: [7, 8] } })
|
|
57
|
+
jest.runAllTimers()
|
|
58
|
+
map.fire.mockClear()
|
|
59
|
+
ctx.handleUndo(state)
|
|
60
|
+
expect(ctx.getFeature('feat-1').coordinates).toEqual(original)
|
|
61
|
+
jest.runAllTimers()
|
|
62
|
+
expect(map.fire).toHaveBeenCalledWith('draw.geometrychange', expect.objectContaining({ phase: 'change' }))
|
|
63
|
+
jest.useRealTimers()
|
|
64
|
+
})
|
|
65
|
+
|
|
66
|
+
test('guards a missing feature', () => {
|
|
67
|
+
const { ctx, state } = createHarness()
|
|
68
|
+
expect(() => ctx.onSetGeometry({ ...state, featureId: 'missing' }, { geometry: { type: 'Point', coordinates: [1, 1] } })).not.toThrow()
|
|
69
|
+
})
|
|
70
|
+
})
|
|
42
71
|
})
|
|
@@ -98,7 +98,7 @@ export const EditPointMode = {
|
|
|
98
98
|
},
|
|
99
99
|
|
|
100
100
|
setupEventListeners (state) {
|
|
101
|
-
const handlers = this.handlers = buildEditModeHandlers(this, state, { nudge: this.onNudgePoint })
|
|
101
|
+
const handlers = this.handlers = buildEditModeHandlers(this, state, { nudge: this.onNudgePoint, setgeometry: this.onSetGeometry })
|
|
102
102
|
bindEditModeListeners(state, this.map, handlers)
|
|
103
103
|
},
|
|
104
104
|
|
|
@@ -136,6 +136,16 @@ export const EditPointMode = {
|
|
|
136
136
|
this.updateTouchPointTarget(state, scalePoint(this.map.project(state.feature.coordinates), state.scale))
|
|
137
137
|
},
|
|
138
138
|
|
|
139
|
+
// Inbound signal from MaplibreDrawAdapter.setGeometry — moves the point to the given
|
|
140
|
+
// geometry's coordinate as one undoable commit.
|
|
141
|
+
onSetGeometry (state, event) {
|
|
142
|
+
const feature = this.getFeature(state.featureId)
|
|
143
|
+
if (!feature) { return }
|
|
144
|
+
const previousPosition = feature.getCoordinates()
|
|
145
|
+
this.setPointPosition(state, state.featureId, event.geometry.coordinates)
|
|
146
|
+
this.pushUndo({ type: 'replace_geometry', featureId: state.featureId, previousPosition })
|
|
147
|
+
},
|
|
148
|
+
|
|
139
149
|
onButtonClick (state, event) {
|
|
140
150
|
if (event.target.closest(`#${state.undoButtonId}`)) {
|
|
141
151
|
this.handleUndo(state)
|
|
@@ -6,26 +6,8 @@ import {
|
|
|
6
6
|
import { scalePoint } from './helpers.js'
|
|
7
7
|
import { sharedUndoHandlers } from '../../utils/geometryValidation.js'
|
|
8
8
|
|
|
9
|
-
// Map an undo-stack op type onto the geometry-change `phase` consumed by validation. Read off
|
|
10
|
-
// `this` by the shared pushUndo mixin (utils/geometryValidation.js) — see that file's comment.
|
|
11
|
-
const UNDO_OP_PHASE = {
|
|
12
|
-
move_vertex: 'commit-move',
|
|
13
|
-
insert_vertex: 'commit-insert',
|
|
14
|
-
delete_vertex: 'commit-delete'
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
// Undoing an op commits the inverse change (undo of a delete re-inserts, etc.),
|
|
18
|
-
// so its re-validation reports the inverse phase.
|
|
19
|
-
const UNDO_INVERSE_PHASE = {
|
|
20
|
-
move_vertex: 'commit-move',
|
|
21
|
-
insert_vertex: 'commit-delete',
|
|
22
|
-
delete_vertex: 'commit-insert'
|
|
23
|
-
}
|
|
24
|
-
|
|
25
9
|
export const undoHandlers = {
|
|
26
10
|
...sharedUndoHandlers,
|
|
27
|
-
UNDO_OP_PHASE,
|
|
28
|
-
UNDO_INVERSE_PHASE,
|
|
29
11
|
|
|
30
12
|
handleUndo (state) {
|
|
31
13
|
const undoStack = this.map._undoStack
|
|
@@ -41,12 +23,14 @@ export const undoHandlers = {
|
|
|
41
23
|
this.undoInsertVertex(state, op)
|
|
42
24
|
} else if (op.type === 'delete_vertex') {
|
|
43
25
|
this.undoDeleteVertex(state, op)
|
|
26
|
+
} else if (op.type === 'replace_geometry') {
|
|
27
|
+
this.replaceGeometry(state, op.featureId, op.previousGeometry)
|
|
44
28
|
} else {
|
|
45
29
|
// No action
|
|
46
30
|
}
|
|
47
31
|
// An undo commits the inverse change, so it must re-validate like any other
|
|
48
32
|
// commit — otherwise the invalid stroke and the Done gate go stale.
|
|
49
|
-
this.emitGeometryValidation(
|
|
33
|
+
this.emitGeometryValidation(op.vertexIndex, op.featureId)
|
|
50
34
|
},
|
|
51
35
|
|
|
52
36
|
undoMoveVertex (state, op) {
|
|
@@ -126,6 +110,17 @@ export const undoHandlers = {
|
|
|
126
110
|
this.changeMode(state, { selectedVertexIndex: vertexIndex, selectedVertexType: 'vertex', coordPath: this.getCoordPath(state, vertexIndex) })
|
|
127
111
|
},
|
|
128
112
|
|
|
113
|
+
// Swaps in a whole new geometry (setGeometry, or undoing one) and clears the selection,
|
|
114
|
+
// since vertex indices no longer refer to the same points.
|
|
115
|
+
replaceGeometry (state, featureId, geometry) {
|
|
116
|
+
const feature = this.getFeature(featureId)
|
|
117
|
+
if (!feature) { return }
|
|
118
|
+
this._applyUndoAndSync(state, { ...feature.toGeoJSON(), geometry }, featureId)
|
|
119
|
+
this.clearSelectedCoordinates()
|
|
120
|
+
this.hideTouchVertexIndicator(state)
|
|
121
|
+
this.changeMode(state, { selectedVertexIndex: -1, selectedVertexType: null })
|
|
122
|
+
},
|
|
123
|
+
|
|
129
124
|
_applyUndoAndSync (state, geojson, featureId) {
|
|
130
125
|
this._ctx.api.add(geojson)
|
|
131
126
|
state.vertices = this.getVertices(featureId)
|