@defra/interactive-map 0.0.54-alpha → 0.0.56-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/add-polygons.njk +1 -1
- package/assets/templates/add-symbols.njk +4 -4
- package/assets/templates/draw-tools.njk +7 -7
- package/assets/templates/marker-panel.njk +5 -5
- package/assets/templates/place-marker.njk +8 -8
- package/assets/templates/search-control.njk +1 -1
- package/assets/templates/select-feature.njk +7 -7
- package/assets/templates/style-switcher.njk +6 -6
- package/assets/templates/toggle-marker-label.njk +3 -3
- package/dist/esm/im-core.js +1 -1
- package/dist/esm/im-shell.js +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/umd/im-core.js +1 -1
- package/dist/umd/im-core.js.LICENSE.txt +0 -30
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.LICENSE.txt +0 -20
- package/docs/api/context.md +2 -0
- package/docs/api.md +20 -14
- package/docs/architecture/interactive-map.likec4 +4 -4
- package/docs/building-a-plugin.md +2 -2
- package/docs/examples/add-marker-with-panel.mdx +46 -44
- package/docs/examples/add-polygons.mdx +100 -98
- package/docs/examples/add-symbols.mdx +75 -73
- package/docs/examples/basic-map.mdx +16 -14
- package/docs/examples/button-map.mdx +16 -14
- package/docs/examples/draw-tools.mdx +119 -117
- package/docs/examples/place-marker.mdx +51 -49
- package/docs/examples/search-control.mdx +22 -20
- package/docs/examples/select-feature.mdx +107 -105
- package/docs/examples/style-switcher.mdx +47 -45
- package/docs/examples/toggle-marker-label.mdx +30 -28
- package/docs/getting-started.md +26 -24
- package/docs/plugins/datasets.md +11 -0
- package/docs/plugins/draw.md +18 -12
- package/docs/plugins/interact.md +33 -10
- package/docs/plugins/plugin-descriptor.md +1 -1
- package/docs/plugins/search.md +5 -5
- package/docusaurus.config.cjs +48 -3
- package/govuk-prototype-kit.config.json +6 -7
- package/package.json +22 -29
- 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/layerAdapter.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 +48 -26
- package/plugins/datasets/src/initialise/DatasetsInit.test.jsx +160 -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 +47 -26
- package/plugins/draw/src/DrawInit.test.jsx +90 -2
- package/plugins/draw/src/adapters/maplibre/styles.js +3 -2
- package/plugins/draw/src/adapters/maplibre/styles.test.js +3 -3
- package/plugins/draw/src/adapters/openlayers/core/styles.test.js +1 -1
- package/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js +1 -1
- package/plugins/draw/src/manifest.js +3 -2
- package/plugins/draw/src/manifest.test.js +13 -1
- package/plugins/draw/src/utils/needsDrawTarget.js +22 -0
- package/plugins/draw/src/utils/needsDrawTarget.test.js +42 -0
- package/plugins/draw-es/dist/esm/im-draw-es-plugin.js +1 -0
- 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/im-frame-plugin.js +1 -0
- package/plugins/frame/dist/esm/index.js +1 -0
- package/plugins/frame/dist/umd/im-frame-plugin.js +1 -0
- package/plugins/frame/dist/umd/index.js +2 -0
- 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/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/map-styles/dist/umd/index.js +2 -0
- package/plugins/{beta/map-styles → map-styles}/src/MapStyles.jsx +2 -2
- package/plugins/{beta/map-styles → map-styles}/src/MapStylesInit.jsx +1 -1
- package/plugins/menu/dist/esm/im-menu-plugin.js +1 -1
- package/plugins/menu/dist/esm/index.js +1 -1
- package/plugins/menu/dist/umd/im-menu-plugin.js +1 -1
- package/plugins/menu/dist/umd/index.js +1 -1
- package/plugins/scale-bar/dist/esm/im-scale-bar-plugin.js +1 -0
- package/plugins/scale-bar/dist/esm/index.js +1 -0
- package/plugins/scale-bar/dist/umd/im-scale-bar-plugin.js +1 -0
- package/plugins/scale-bar/dist/umd/index.js +2 -0
- 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/im-use-location-plugin.js +1 -0
- package/plugins/use-location/dist/esm/index.js +1 -0
- package/plugins/use-location/dist/umd/im-use-location-plugin.js +1 -0
- package/plugins/use-location/dist/umd/index.js +2 -0
- package/providers/esri/dist/esm/im-esri-provider.js +1 -0
- 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/im-maplibre-provider.js +1 -1
- package/providers/maplibre/dist/esm/index.js +1 -1
- package/providers/maplibre/dist/umd/im-maplibre-framework.js +1 -1
- package/providers/maplibre/dist/umd/im-maplibre-framework.js.LICENSE.txt +3 -3
- package/providers/maplibre/dist/umd/im-maplibre-provider.js +1 -1
- package/providers/maplibre/dist/umd/im-maplibre-worker.js +2 -0
- package/providers/maplibre/dist/umd/im-maplibre-worker.js.LICENSE.txt +4 -0
- package/providers/maplibre/dist/umd/index.js +1 -1
- package/providers/maplibre/src/index.js +41 -12
- package/providers/maplibre/src/index.test.js +43 -12
- package/providers/maplibre/src/utils/detectModuleWorker.js +25 -0
- package/providers/maplibre/src/utils/detectModuleWorker.test.js +40 -0
- package/providers/maplibre/src/utils/spatial.js +22 -12
- package/providers/maplibre/src/utils/spatial.test.js +6 -6
- package/providers/maplibre/src/utils/workerUrl.js +15 -0
- package/providers/maplibre/src/utils/workerUrl.test.js +14 -0
- package/providers/open-names/dist/esm/im-reverse-geocode.js +1 -0
- package/providers/open-names/dist/esm/index.js +1 -0
- package/providers/open-names/dist/umd/im-reverse-geocode.js +2 -0
- package/providers/open-names/dist/umd/index.js +2 -0
- package/providers/openlayers/dist/esm/im-openlayers-provider.js +1 -0
- package/providers/openlayers/dist/esm/index.js +1 -0
- package/providers/openlayers/dist/umd/im-openlayers-provider.js +2 -0
- package/providers/openlayers/dist/umd/index.js +2 -0
- package/providers/openlayers/src/index.js +60 -0
- package/providers/openlayers/src/index.test.js +47 -0
- 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 +79 -46
- package/sonar-project.properties +1 -1
- package/src/App/App.jsx +4 -1
- package/src/App/App.test.jsx +6 -0
- 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 +22 -11
- package/src/App/renderer/mapButtons.test.js +23 -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/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/InteractiveMap.js +2 -1
- package/src/InteractiveMap/InteractiveMap.test.js +9 -2
- package/src/InteractiveMap/domStateManager.js +21 -1
- package/src/InteractiveMap/domStateManager.test.js +48 -1
- package/src/InteractiveMap/parseDataProperties.js +4 -4
- package/src/InteractiveMap/parseDataProperties.test.js +62 -6
- package/src/InteractiveMap/polyfills.js +4 -3
- package/src/InteractiveMap/polyfills.test.js +12 -0
- package/src/config/events.js +4 -2
- package/src/scss/tools/_govuk-content.scss +4 -3
- package/src/types.js +3 -5
- package/webpack.dev.mjs +11 -3
- package/webpack.prod.mjs +11 -4
- package/webpack.umd.mjs +34 -14
- package/plugins/beta/draw-es/dist/esm/im-draw-es-plugin.js +0 -1
- 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/im-frame-plugin.js +0 -1
- package/plugins/beta/frame/dist/esm/index.js +0 -1
- package/plugins/beta/frame/dist/umd/im-frame-plugin.js +0 -1
- package/plugins/beta/frame/dist/umd/index.js +0 -2
- 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/map-styles/dist/umd/index.js +0 -2
- package/plugins/beta/scale-bar/dist/esm/im-scale-bar-plugin.js +0 -1
- package/plugins/beta/scale-bar/dist/esm/index.js +0 -1
- package/plugins/beta/scale-bar/dist/umd/im-scale-bar-plugin.js +0 -1
- package/plugins/beta/scale-bar/dist/umd/index.js +0 -2
- package/plugins/beta/use-location/dist/esm/im-use-location-plugin.js +0 -1
- package/plugins/beta/use-location/dist/esm/index.js +0 -1
- package/plugins/beta/use-location/dist/umd/im-use-location-plugin.js +0 -1
- package/plugins/beta/use-location/dist/umd/index.js +0 -2
- 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/im-esri-provider.js +0 -1
- package/providers/beta/esri/dist/esm/index.js +0 -1
- package/providers/beta/open-names/dist/esm/im-reverse-geocode.js +0 -1
- package/providers/beta/open-names/dist/esm/index.js +0 -1
- package/providers/beta/open-names/dist/umd/im-reverse-geocode.js +0 -2
- package/providers/beta/open-names/dist/umd/index.js +0 -2
- package/providers/beta/openlayers/dist/esm/im-openlayers-provider.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 +0 -2
- package/providers/beta/openlayers/dist/umd/index.js.LICENSE.txt +0 -1
- package/providers/beta/openlayers/src/index.js +0 -37
- /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/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/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/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}/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/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/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/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
package/docs/plugins/draw.md
CHANGED
|
@@ -343,11 +343,11 @@ Always snaps to the polygon's own outline, in addition to any layers in `snapLay
|
|
|
343
343
|
```js
|
|
344
344
|
drawPlugin.split(selectedFeatureId)
|
|
345
345
|
|
|
346
|
-
interactiveMap.on('draw:split', (
|
|
347
|
-
drawPlugin.deleteFeature([
|
|
348
|
-
|
|
346
|
+
interactiveMap.on('draw:split', (event) => {
|
|
347
|
+
drawPlugin.deleteFeature([event.originalFeatureId])
|
|
348
|
+
event.featureCollection.features.forEach((feature, index) => {
|
|
349
349
|
drawPlugin.addFeature({
|
|
350
|
-
id: `${
|
|
350
|
+
id: `${event.originalFeatureId}-${index === 0 ? 'a' : 'b'}`,
|
|
351
351
|
type: feature.type,
|
|
352
352
|
geometry: feature.geometry,
|
|
353
353
|
properties: feature.properties
|
|
@@ -371,13 +371,13 @@ Merge multiple contiguous polygons into one. Like `split`, this is a pure comput
|
|
|
371
371
|
```js
|
|
372
372
|
drawPlugin.merge(selectedFeatureIds)
|
|
373
373
|
|
|
374
|
-
interactiveMap.on('draw:merge', (
|
|
375
|
-
drawPlugin.deleteFeature(
|
|
374
|
+
interactiveMap.on('draw:merge', (event) => {
|
|
375
|
+
drawPlugin.deleteFeature(event.originalFeatureIds)
|
|
376
376
|
drawPlugin.addFeature({
|
|
377
|
-
id:
|
|
378
|
-
type:
|
|
379
|
-
geometry:
|
|
380
|
-
properties:
|
|
377
|
+
id: event.originalFeatureIds[0],
|
|
378
|
+
type: event.feature.type,
|
|
379
|
+
geometry: event.feature.geometry,
|
|
380
|
+
properties: event.feature.properties
|
|
381
381
|
})
|
|
382
382
|
})
|
|
383
383
|
```
|
|
@@ -405,11 +405,17 @@ new InteractiveMap('map', {
|
|
|
405
405
|
Or set `draw: false` when every button on the map is deliberate — for example a single-task map that goes straight into editing a shape — so nothing is hidden.
|
|
406
406
|
|
|
407
407
|
> [!NOTE]
|
|
408
|
-
> The mode only changes the interface. Other plugins' own behaviour keeps running while their buttons are hidden, so disable any that shouldn't respond while drawing
|
|
408
|
+
> The mode only changes the interface. Other plugins' own behaviour keeps running while their buttons are hidden, so disable any that shouldn't respond while drawing.
|
|
409
|
+
|
|
410
|
+
> [!IMPORTANT]
|
|
411
|
+
> If you use the [interact plugin](interact.md), disable it while drawing or editing. Otherwise map clicks select features as well as placing points, and both plugins show and hide the same crosshair. Call `interactPlugin.disable()` on [`draw:started`](#drawstarted) and [`draw:editstart`](#draweditstart), and `interactPlugin.enable()` on [`draw:created`](#drawcreated), [`draw:edited`](#drawedited) and [`draw:cancelled`](#drawcancelled).
|
|
409
412
|
|
|
410
413
|
## Buttons and keyboard shortcuts
|
|
411
414
|
|
|
412
|
-
The plugin registers its own toolbar buttons automatically — Cancel, Add point
|
|
415
|
+
The plugin registers its own toolbar buttons automatically — Cancel, Add point and Done in the actions bar, plus Undo, Snap and Delete point in the middle of the top row — which show and enable themselves based on the current draw/edit state. You don't need to render these yourself; augment them with your own trigger buttons (e.g. "Draw polygon", "Draw line") the way the [Draw tools example](../examples/draw-tools.mdx) does.
|
|
416
|
+
|
|
417
|
+
> [!NOTE]
|
|
418
|
+
> While drawing, a crosshair marks where the next point is placed. On touch, it's shown with the Add point button. Keyboard users get the crosshair and press <kbd>Enter</kbd> to add a point. Opening the map controls shows the crosshair and Add point button for every input type. Edit modes don't use the crosshair: vertices and midpoints are selected directly.
|
|
413
419
|
|
|
414
420
|
| Shortcut | Action |
|
|
415
421
|
|----------|--------|
|
package/docs/plugins/interact.md
CHANGED
|
@@ -37,7 +37,9 @@ Controls which interactions are active when the user clicks the map. Values can
|
|
|
37
37
|
- `'placeMarker'` — if no feature is matched (or `selectFeature` is not active), places a location marker at the clicked coordinates
|
|
38
38
|
|
|
39
39
|
> [!NOTE]
|
|
40
|
-
> On touch
|
|
40
|
+
> On touch, a crosshair and "Select" action button are shown when `'placeMarker'` or `'selectFeature'` is included — modes where a precise point on the map needs to be chosen. When `'selectMarker'` is the only active mode, touch users tap markers directly and neither is shown. [`touchTarget`](#touchtarget) turns them off for touch in every mode.
|
|
41
|
+
>
|
|
42
|
+
> Keyboard users get the crosshair while the map has focus, and press <kbd>Enter</kbd> to select. Opening the map controls shows the crosshair and "Select" button for every input type.
|
|
41
43
|
|
|
42
44
|
**Common combinations:**
|
|
43
45
|
|
|
@@ -113,6 +115,27 @@ Click detection radius in pixels applied to line features. Lines have a 1px rend
|
|
|
113
115
|
|
|
114
116
|
---
|
|
115
117
|
|
|
118
|
+
### `touchTarget`
|
|
119
|
+
**Type:** `boolean`
|
|
120
|
+
**Default:** `true`
|
|
121
|
+
|
|
122
|
+
When `false`, touch users don't get the crosshair and "Select" button, and tap features directly instead. Opening the map controls shows both again, for every input type. Keyboard behaviour is unchanged.
|
|
123
|
+
|
|
124
|
+
```js
|
|
125
|
+
createInteractPlugin({
|
|
126
|
+
interactionModes: ['selectFeature'],
|
|
127
|
+
touchTarget: false
|
|
128
|
+
})
|
|
129
|
+
```
|
|
130
|
+
|
|
131
|
+
> [!IMPORTANT]
|
|
132
|
+
> Only set `touchTarget: false` when the features users select are at least 44×44 CSS pixels at the zoom levels they use ([WCAG 2.2 Target Size (Enhanced)](https://www.w3.org/WAI/WCAG22/Understanding/target-size-enhanced)), for example field parcels at a sensible zoom. Thin lines and small shapes are hard to tap accurately, especially for users with motor impairments, who rely on the crosshair to position the map instead.
|
|
133
|
+
|
|
134
|
+
> [!NOTE]
|
|
135
|
+
> If you also use the [draw plugin](draw.md), disable interact while drawing or editing, so the two plugins don't both control the crosshair. See [Application mode](draw.md#application-mode).
|
|
136
|
+
|
|
137
|
+
---
|
|
138
|
+
|
|
116
139
|
### `closeOnAction`
|
|
117
140
|
**Type:** `boolean`
|
|
118
141
|
**Default:** `true`
|
|
@@ -288,15 +311,15 @@ Emitted when the user confirms their selection (clicks "Done").
|
|
|
288
311
|
```
|
|
289
312
|
|
|
290
313
|
```js
|
|
291
|
-
interactiveMap.on('interact:done', (
|
|
292
|
-
if (
|
|
293
|
-
console.log('Location selected:',
|
|
314
|
+
interactiveMap.on('interact:done', (event) => {
|
|
315
|
+
if (event.coords) {
|
|
316
|
+
console.log('Location selected:', event.coords)
|
|
294
317
|
}
|
|
295
|
-
if (
|
|
296
|
-
console.log('Features selected:',
|
|
318
|
+
if (event.selectedFeatures) {
|
|
319
|
+
console.log('Features selected:', event.selectedFeatures)
|
|
297
320
|
}
|
|
298
|
-
if (
|
|
299
|
-
console.log('Markers selected:',
|
|
321
|
+
if (event.selectedMarkers) {
|
|
322
|
+
console.log('Markers selected:', event.selectedMarkers)
|
|
300
323
|
}
|
|
301
324
|
})
|
|
302
325
|
```
|
|
@@ -333,8 +356,8 @@ Emitted whenever the selected features or selected markers change.
|
|
|
333
356
|
```
|
|
334
357
|
|
|
335
358
|
```js
|
|
336
|
-
interactiveMap.on('interact:selectionchange', (
|
|
337
|
-
console.log('Selected features:',
|
|
359
|
+
interactiveMap.on('interact:selectionchange', (event) => {
|
|
360
|
+
console.log('Selected features:', event.selectedFeatures)
|
|
338
361
|
})
|
|
339
362
|
```
|
|
340
363
|
|
|
@@ -24,7 +24,7 @@ Any properties passed to the factory (except `id` and `load`) are available as [
|
|
|
24
24
|
|
|
25
25
|
```js
|
|
26
26
|
// Registering the plugin with configuration
|
|
27
|
-
import createScaleBarPlugin from '@defra/interactive-map
|
|
27
|
+
import createScaleBarPlugin from '@defra/interactive-map/plugins/scale-bar'
|
|
28
28
|
|
|
29
29
|
const interactiveMap = new InteractiveMap({
|
|
30
30
|
plugins: [
|
package/docs/plugins/search.md
CHANGED
|
@@ -205,7 +205,7 @@ Custom datasets let you add your own search sources alongside or instead of OS N
|
|
|
205
205
|
const gridRefDataset = {
|
|
206
206
|
name: 'gridref',
|
|
207
207
|
includeRegex: /^[A-Z]{2}\d{6,10}$/i,
|
|
208
|
-
buildRequest: (query) => `https://api.example.com/gridref?q=${query}`,
|
|
208
|
+
buildRequest: (query) => `https://api.example.com/gridref?q=${encodeURIComponent(query)}`,
|
|
209
209
|
parseResults: (json, query) => [{
|
|
210
210
|
id: query,
|
|
211
211
|
text: query,
|
|
@@ -272,7 +272,7 @@ Each suggestion object must have:
|
|
|
272
272
|
|----------|------|-------------|
|
|
273
273
|
| `id` | `string` | Unique identifier for the suggestion |
|
|
274
274
|
| `text` | `string` | Display text shown in the autocomplete list |
|
|
275
|
-
| `marked` | `string` | Optional.
|
|
275
|
+
| `marked` | `string` | Optional. Label text with query terms wrapped in `<mark>` tags. Any other markup is shown as text, not rendered as HTML. If omitted, the suggestion label will be blank |
|
|
276
276
|
| `point` | `[x, y]` | Centre coordinate for placing a marker |
|
|
277
277
|
| `bounds` | `[minX, minY, maxX, maxY]` | Bounding box to fit the map to when selected |
|
|
278
278
|
| `type` | `string` | Optional. Value to include in the `search:match` payload to identify the source dataset |
|
|
@@ -340,9 +340,9 @@ The full suggestion object returned by the dataset's `parseResults` function, pl
|
|
|
340
340
|
```
|
|
341
341
|
|
|
342
342
|
```js
|
|
343
|
-
interactiveMap.on('search:match', (
|
|
344
|
-
if (
|
|
345
|
-
interactPlugin.selectFeature({ featureId:
|
|
343
|
+
interactiveMap.on('search:match', (event) => {
|
|
344
|
+
if (event.type === 'parcel') {
|
|
345
|
+
interactPlugin.selectFeature({ featureId: event.properties.id, layerId: 'parcels' })
|
|
346
346
|
}
|
|
347
347
|
})
|
|
348
348
|
```
|
package/docusaurus.config.cjs
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// @ts-check
|
|
2
|
-
const path = require('path');
|
|
2
|
+
const path = require('node:path');
|
|
3
|
+
const { getBabelOptions } = require('@docusaurus/babel');
|
|
3
4
|
require('dotenv').config({ path: path.join(__dirname, '.env'), quiet: true });
|
|
4
5
|
|
|
5
6
|
/** @type {import('@docusaurus/types').Config} */
|
|
@@ -31,8 +32,29 @@ const config = {
|
|
|
31
32
|
|
|
32
33
|
presets: [],
|
|
33
34
|
|
|
35
|
+
// Docusaurus compiles the map's source with loose Babel, which assumes every iterable
|
|
36
|
+
// is an array: [...map.values()] becomes [].concat(map.values()), an array holding the
|
|
37
|
+
// iterator rather than its values. Turning off that one assumption spreads iterables
|
|
38
|
+
// properly and keeps the rest of the Docusaurus Babel setup.
|
|
39
|
+
//
|
|
40
|
+
// It's limited to the map's own source because Docusaurus also compiles its own
|
|
41
|
+
// CommonJS packages, where the helper imports this adds break their `exports`.
|
|
42
|
+
webpack: {
|
|
43
|
+
jsLoader: (isServer) => ({
|
|
44
|
+
loader: require.resolve('babel-loader'),
|
|
45
|
+
options: {
|
|
46
|
+
...getBabelOptions({ isServer }),
|
|
47
|
+
overrides: [{
|
|
48
|
+
include: ['src', 'plugins', 'providers'].map((dir) => path.join(__dirname, dir)),
|
|
49
|
+
assumptions: { iterableIsArray: false },
|
|
50
|
+
}],
|
|
51
|
+
},
|
|
52
|
+
}),
|
|
53
|
+
},
|
|
54
|
+
|
|
34
55
|
themes: [
|
|
35
|
-
|
|
56
|
+
/** @type {import('@docusaurus/types').PluginConfig} */
|
|
57
|
+
([
|
|
36
58
|
require.resolve('@easyops-cn/docusaurus-search-local'),
|
|
37
59
|
/** @type {import("@easyops-cn/docusaurus-search-local").PluginOptions} */
|
|
38
60
|
({
|
|
@@ -45,7 +67,7 @@ const config = {
|
|
|
45
67
|
highlightSearchTermsOnTargetPage: true,
|
|
46
68
|
searchResultContextMaxLength: 60,
|
|
47
69
|
}),
|
|
48
|
-
],
|
|
70
|
+
]),
|
|
49
71
|
'@defra/docusaurus-theme-govuk',
|
|
50
72
|
],
|
|
51
73
|
|
|
@@ -58,6 +80,29 @@ const config = {
|
|
|
58
80
|
},
|
|
59
81
|
};
|
|
60
82
|
},
|
|
83
|
+
// Maps only render in the browser, and maplibre-gl only exports an `import`
|
|
84
|
+
// condition, which the server build doesn't resolve.
|
|
85
|
+
//
|
|
86
|
+
// The client build must emit MapLibre's worker as a file. The GOV.UK theme types
|
|
87
|
+
// every .mjs file as `javascript/auto`, which would bundle the worker as a module
|
|
88
|
+
// instead, so this rule is added last, after all plugins' rules, to take precedence.
|
|
89
|
+
function maplibrePlugin() {
|
|
90
|
+
return {
|
|
91
|
+
name: 'maplibre',
|
|
92
|
+
configureWebpack(_webpackConfig, isServer) {
|
|
93
|
+
if (isServer) {
|
|
94
|
+
return { resolve: { alias: { 'maplibre-gl$': false } } };
|
|
95
|
+
}
|
|
96
|
+
return {
|
|
97
|
+
plugins: [{
|
|
98
|
+
apply(compiler) {
|
|
99
|
+
compiler.options.module.rules.push({ test: /maplibre-gl-worker\.mjs$/, type: 'asset/resource' });
|
|
100
|
+
},
|
|
101
|
+
}],
|
|
102
|
+
};
|
|
103
|
+
},
|
|
104
|
+
};
|
|
105
|
+
},
|
|
61
106
|
[
|
|
62
107
|
'@docusaurus/plugin-content-docs',
|
|
63
108
|
{
|
|
@@ -64,15 +64,14 @@
|
|
|
64
64
|
"/plugins/interact/dist",
|
|
65
65
|
"/plugins/search/dist",
|
|
66
66
|
"/plugins/draw/dist",
|
|
67
|
-
"/providers/
|
|
68
|
-
"/providers/
|
|
67
|
+
"/providers/open-names/dist",
|
|
68
|
+
"/providers/openlayers/dist",
|
|
69
69
|
"/plugins/datasets/dist",
|
|
70
70
|
"/plugins/map-key/dist",
|
|
71
71
|
"/plugins/menu/dist",
|
|
72
|
-
"/plugins/
|
|
73
|
-
"/plugins/
|
|
74
|
-
"/plugins/
|
|
75
|
-
"/plugins/
|
|
76
|
-
"/plugins/beta/frame/dist"
|
|
72
|
+
"/plugins/map-styles/dist",
|
|
73
|
+
"/plugins/scale-bar/dist",
|
|
74
|
+
"/plugins/use-location/dist",
|
|
75
|
+
"/plugins/frame/dist"
|
|
77
76
|
]
|
|
78
77
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@defra/interactive-map",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.56-alpha",
|
|
4
4
|
"description": "An accessible map component",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -18,23 +18,23 @@
|
|
|
18
18
|
"require": "./providers/maplibre/dist/umd/index.js"
|
|
19
19
|
},
|
|
20
20
|
"./providers/open-names": {
|
|
21
|
-
"import": "./providers/
|
|
22
|
-
"require": "./providers/
|
|
21
|
+
"import": "./providers/open-names/dist/esm/index.js",
|
|
22
|
+
"require": "./providers/open-names/dist/umd/index.js"
|
|
23
23
|
},
|
|
24
24
|
"./providers/esri": {
|
|
25
|
-
"import": "./providers/
|
|
25
|
+
"import": "./providers/esri/dist/esm/index.js"
|
|
26
26
|
},
|
|
27
27
|
"./providers/openlayers": {
|
|
28
|
-
"import": "./providers/
|
|
29
|
-
"require": "./providers/
|
|
28
|
+
"import": "./providers/openlayers/dist/esm/index.js",
|
|
29
|
+
"require": "./providers/openlayers/dist/umd/index.js"
|
|
30
30
|
},
|
|
31
31
|
"./plugins/scale-bar": {
|
|
32
|
-
"import": "./plugins/
|
|
33
|
-
"require": "./plugins/
|
|
32
|
+
"import": "./plugins/scale-bar/dist/esm/index.js",
|
|
33
|
+
"require": "./plugins/scale-bar/dist/umd/index.js"
|
|
34
34
|
},
|
|
35
35
|
"./plugins/use-location": {
|
|
36
|
-
"import": "./plugins/
|
|
37
|
-
"require": "./plugins/
|
|
36
|
+
"import": "./plugins/use-location/dist/esm/index.js",
|
|
37
|
+
"require": "./plugins/use-location/dist/umd/index.js"
|
|
38
38
|
},
|
|
39
39
|
"./plugins/search": {
|
|
40
40
|
"import": "./plugins/search/dist/esm/index.js",
|
|
@@ -53,40 +53,31 @@
|
|
|
53
53
|
"./plugins/map-key": {
|
|
54
54
|
"import": "./plugins/map-key/dist/esm/index.js"
|
|
55
55
|
},
|
|
56
|
-
"./plugins/datasets/adapters/maplibre": {
|
|
57
|
-
"import": "./plugins/datasets/dist/adapters/maplibre/esm/index.js"
|
|
58
|
-
},
|
|
59
56
|
"./plugins/map-styles": {
|
|
60
|
-
"import": "./plugins/
|
|
61
|
-
"require": "./plugins/
|
|
62
|
-
},
|
|
63
|
-
"./plugins/draw-ml": {
|
|
64
|
-
"import": "./plugins/beta/draw-ml/dist/esm/index.js",
|
|
65
|
-
"require": "./plugins/beta/draw-ml/dist/umd/index.js"
|
|
57
|
+
"import": "./plugins/map-styles/dist/esm/index.js",
|
|
58
|
+
"require": "./plugins/map-styles/dist/umd/index.js"
|
|
66
59
|
},
|
|
67
60
|
"./plugins/draw-es": {
|
|
68
|
-
"import": "./plugins/
|
|
61
|
+
"import": "./plugins/draw-es/dist/esm/index.js"
|
|
69
62
|
},
|
|
70
63
|
"./plugins/draw": {
|
|
71
64
|
"import": "./plugins/draw/dist/esm/index.js",
|
|
72
65
|
"require": "./plugins/draw/dist/umd/index.js"
|
|
73
66
|
},
|
|
74
67
|
"./plugins/frame": {
|
|
75
|
-
"import": "./plugins/
|
|
76
|
-
"require": "./plugins/
|
|
68
|
+
"import": "./plugins/frame/dist/esm/index.js",
|
|
69
|
+
"require": "./plugins/frame/dist/umd/index.js"
|
|
77
70
|
},
|
|
78
71
|
"./css": "./dist/css/index.css",
|
|
79
|
-
"./plugins/draw-ml/css": "./plugins/beta/draw-ml/dist/css/index.css",
|
|
80
72
|
"./plugins/draw/css": "./plugins/draw/dist/css/index.css",
|
|
81
|
-
"./plugins/scale-bar/css": "./plugins/
|
|
73
|
+
"./plugins/scale-bar/css": "./plugins/scale-bar/dist/css/index.css",
|
|
82
74
|
"./plugins/datasets/css": "./plugins/datasets/dist/css/index.css",
|
|
83
75
|
"./plugins/menu/css": "./plugins/menu/dist/css/index.css",
|
|
84
76
|
"./plugins/map-key/css": "./plugins/map-key/dist/css/index.css",
|
|
85
|
-
"./plugins/frame/css": "./plugins/
|
|
86
|
-
"./plugins/map-styles/css": "./plugins/
|
|
77
|
+
"./plugins/frame/css": "./plugins/frame/dist/css/index.css",
|
|
78
|
+
"./plugins/map-styles/css": "./plugins/map-styles/dist/css/index.css",
|
|
87
79
|
"./plugins/search/css": "./plugins/search/dist/css/index.css",
|
|
88
|
-
"./
|
|
89
|
-
"./providers/esri/css": "./providers/beta/esri/dist/css/index.css"
|
|
80
|
+
"./providers/esri/css": "./providers/esri/dist/css/index.css"
|
|
90
81
|
},
|
|
91
82
|
"type": "module",
|
|
92
83
|
"sideEffects": [
|
|
@@ -155,6 +146,7 @@
|
|
|
155
146
|
"@babel/preset-env": "^7.28.0",
|
|
156
147
|
"@babel/preset-react": "^7.27.1",
|
|
157
148
|
"@defra/docusaurus-theme-govuk": "^0.0.22-alpha",
|
|
149
|
+
"@docusaurus/babel": "^3.10.1",
|
|
158
150
|
"@docusaurus/core": "^3.10.1",
|
|
159
151
|
"@docusaurus/module-type-aliases": "^3.10.1",
|
|
160
152
|
"@docusaurus/plugin-content-docs": "^3.10.1",
|
|
@@ -177,6 +169,7 @@
|
|
|
177
169
|
"@types/react": "^19.1.8",
|
|
178
170
|
"@types/react-dom": "^19.1.6",
|
|
179
171
|
"babel-loader": "^10.0.0",
|
|
172
|
+
"babel-plugin-transform-import-meta": "^3.0.0",
|
|
180
173
|
"compression-webpack-plugin": "^12.0.0",
|
|
181
174
|
"copy-webpack-plugin": "^13.0.1",
|
|
182
175
|
"css-loader": "^7.1.2",
|
|
@@ -248,7 +241,7 @@
|
|
|
248
241
|
"@turf/union": "^7.3.5",
|
|
249
242
|
"accessible-autocomplete": "^3.0.1",
|
|
250
243
|
"govuk-frontend": "^5.13.0",
|
|
251
|
-
"maplibre-gl": "^
|
|
244
|
+
"maplibre-gl": "^6.14.0",
|
|
252
245
|
"polygon-splitter": "^0.0.11",
|
|
253
246
|
"preact": "^10.27.2",
|
|
254
247
|
"tslib": "^2.8.1"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import
|
|
1
|
+
import t from"@arcgis/core/layers/VectorTileLayer.js";import e from"@arcgis/core/layers/FeatureLayer.js";import i from"@arcgis/core/layers/GroupLayer.js";import{g as s,L as a}from"./layerAdapter.js";import{D as r,l as y}from"./im-datasets-plugin.js";import"preact/compat";import"preact/jsx-runtime";class o extends r{applyLayerPaintProperties(t){const{mapStyle:e}=this._datasetRegistry;return this.hasStroke&&(t["line-color"]=s(this.style.stroke,e.id)),this.hasFill&&(t["fill-color"]=s(this.style.fill,e.id)),t}get esriGroupId(){return void 0===this._datasetDefinition.esriGroupId?this.parent?.esriGroupId:this._datasetDefinition.esriGroupId}get useServerStyle(){return Boolean(this._datasetDefinition.esriUseServerStyle)}get renderer(){if("FeatureService"!==this.type)return;const t=this._datasetDefinition.style?.renderer||this.parent?.renderer;if(!t)return;const{mapStyle:e}=this._datasetRegistry,i=structuredClone(t);return i.symbol?.color&&(i.symbol.color=s(i.symbol.color,e.id)),i.symbol?.outline?.color&&(i.symbol.outline.color=s(i.symbol.outline.color,e.id)),i}}const l=(t,e)=>{if("baseLayer"===t.id)return-1/0;if(t.id.includes("ketchLayer"))return 1/0;const i="group"===t.type?t.layers?.items?.[0]?.id:t.id;return e.indexOf(i)};class p extends a{constructor(t,e,i,s){super(),this._datasetRegistry=s,this.ready=new Promise(t=>{this.resolveReady=t}),this._mapProvider=t,this._map=t.map,this._mapVisibilityLayers={},this._mapOpacityLayers={},this._groupLayers={}}createDataset(t,e){return new o(t,e)}async init(){const t=this._datasetRegistry.topLevelDatasets(),e=async t=>this._addLayers(t).then(()=>{const e=this._mapVisibilityLayers[t.id];t.sublayers?.forEach(t=>{"visible"===t.visibility&&this._applyStyleLayerPaintProperties(t,e)}),this.applyDatasetVisibility(t.id)});for(const i of t)"visible"===i.visibility&&await e(i);this._reorderLayers();for(const i of t)"visible"!==i.visibility&&await e(i);await this.onMapStyleChange(),await this.applyGlobalOpacity(),await Promise.all(t.map(t=>this.applyDatasetVisibility(t.id))),this._reorderLayers(),this.resolveReady()}_reorderLayers(){const t=this._map?.allLayers?.items;if(!t?.length)return;const e=this._datasetRegistry._orderedDatasets;[...t.filter(t=>"group"!==t.parent?.type)].sort((t,i)=>l(t,e)-l(i,e)).forEach((t,e)=>this._map.reorder(t,e)),this._reorderGroupLayers()}_reorderGroupLayers(){const t=this._datasetRegistry._orderedDatasets;Object.values(this._groupLayers).forEach(e=>{[...e?.allLayers?.items||[]].filter(Boolean).sort((e,i)=>l(e,t)-l(i,t)).forEach((t,i)=>e?.reorder?.(t,i))})}_addGroupLayer(t){if(!this._groupLayers[t]){const e=new i({id:t,opacity:1,visible:!0});this._groupLayers[t]=e,this._map.add(e)}return this._groupLayers[t]}async _addFeatureLayers(t){const i=new e({id:t.id,url:t.tiles,renderer:t.renderer,opacity:1,visible:!1});this._mapVisibilityLayers[t.id]=i,this._mapOpacityLayers[t.id]=i;try{return this._map.add(i),i.when()}catch(e){y.error(`Error adding FeatureLayer for dataset ${t.id}:`,e)}return null}async _addLayers(e){const{type:i,esriGroupId:s,tiles:a}=e;if(!a)return null;if("FeatureService"===i)return this._addFeatureLayers(e);const r=s?this._addGroupLayer(s):this._map,y=new t({id:e.id,url:e.tiles,opacity:1,visible:!1});return this._mapVisibilityLayers[e.id]=y,this._mapOpacityLayers[e.id]=s?r:y,r.add(y),y.when()}async addDataset(t){const e=this._datasetRegistry.getDataset(t);if(!e)return void y.warn(`addDataset called, but Dataset with id ${t} not found in registry`);await this._addLayers(e);const{parentId:i}=e,s=this._mapVisibilityLayers[i||t];this._reorderLayers(),this.applyDatasetOpacity(t),this._applyStyleLayerPaintProperties(e,s),this.applyDatasetVisibility(t)}async removeDataset(t){const e=this._datasetRegistry.getDataset(t);if(!e)return;const{esriGroupId:i}=e,s=this._mapVisibilityLayers[t],a=i?this._groupLayers[i]:null,r=a||this._map;s&&(r.remove(s),delete this._mapVisibilityLayers[t],delete this._mapOpacityLayers[t]),0===a?.layers.length&&(this._map.remove(a),delete this._groupLayers[i])}_applyRegistryDatasetVisibility(t){const{id:e,isSublayer:i,parentId:s}=t,a="visible"===t.visibility,r=this._mapVisibilityLayers[i?s:e];r&&(i?this._applyStyleLayerVisibility(t,r):(a&&t.sublayers.forEach(t=>this._applyStyleLayerVisibility(t,r)),r.visible=a))}async applyDatasetVisibility(t){const e=this._datasetRegistry.getDataset(t);e&&this._applyRegistryDatasetVisibility(e)}async applyGlobalVisibility(){this._datasetRegistry.forEachDataset(t=>this._applyRegistryDatasetVisibility(t))}async applyDatasetOpacity(t){const e=this._mapOpacityLayers[t],i=this._datasetRegistry.getDataset(t);e&&i&&(e.opacity=i.opacity)}async applyGlobalOpacity(){Object.entries(this._mapOpacityLayers).forEach(([t,e])=>{const i=this._datasetRegistry.getDataset(t);i&&(e.opacity=i.opacity)})}_applyStyleLayerVisibility(t,e){const{esriStyleLayerId:i}=t;i&&e&&this.ready.then(()=>{e.setStyleLayerVisibility(i,t.visibility)})}_applyStyleLayerPaintProperties(t,e){const{esriStyleLayerId:i,useServerStyle:s}=t;if(s||!i||!e)return;const a=e.getPaintProperties(i);a&&e.setPaintProperties(i,t.applyLayerPaintProperties(a))}async onMapStyleChange(){this._datasetRegistry.forEach(t=>{const{id:e,isSublayer:i,parent:s}=t,a=this._mapVisibilityLayers[i?s.id:e];a&&("FeatureService"===t.type?a.renderer=t.renderer:(this._applyStyleLayerVisibility(t,a),this._applyStyleLayerPaintProperties(t,a)))})}async onMapSizeChange(){}async applyFeatureFilter(...t){console.log("TODO: applyFeatureFilter",t)}async setData(...t){console.log("TODO: setData",t)}async applyStyle(...t){console.log("TODO: applyStyle",t)}}export{p as default};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import
|
|
1
|
+
import{g as t}from"./layerAdapter.js";import{M as e,a as s}from"./mapboxStyleLayerAdapter.js";import{l as a}from"./im-datasets-plugin.js";import"preact/compat";import"preact/jsx-runtime";const i=(e,s,a,r,o,y)=>{const{map:l}=e,{sourceId:n,source:h}=s;h&&!l.getSource(n)&&l.addSource(n,h);const d=a.id;return((t,e,s,a,i)=>{const{map:r}=t,{hasSymbol:o,symbolLayerId:y}=e;if(!o||!a||!y||r.getLayer(y))return;const l=a.getSymbolDef(e.style);if(!l)return;const n=a.getSymbolImageId(e.style,s,"normal",i);n&&r.addLayer(e.getSymbolSource(n,t.getSymbolIconLayout(l)))})(e,s,a,r,y),((e,s,a,i,r=1)=>{const{hasFill:o,fillLayerId:y}=s;if(!o||!y||e.getLayer(y))return;const l=i.getPatternImageId(s.style,a,r),n=l?{"fill-pattern":l,"fill-opacity":s.opacity}:{"fill-color":t(s.style.fill,a),"fill-opacity":s.opacity};e.addLayer(s.getFillSource(n))})(l,s,d,o,y),((e,s,a)=>{const{hasStroke:i,strokeLayerId:r}=s;if(!i||e.getLayer(r))return;const o={"line-color":t(s.style.stroke,a),"line-width":s.style.strokeWidth,"line-opacity":s.opacity,...s.style.strokeDashArray?{"line-dasharray":s.style.strokeDashArray}:{}},y=s.getStrokeSource(o);e.addLayer(y)})(l,s,d),s.sublayers?.length?(s.sublayers.forEach(t=>{i(e,t,a,r,o,y)}),n):s.isSublayer?void 0:n};class r extends e{get fillLayerId(){return this.hasSublayers||this.hasSymbol?null:this.hasFill?this.id:null}get strokeLayerId(){return this.hasSublayers||this.hasSymbol?null:this.hasStroke?this.hasFill?`${this.id}-stroke`:this.id:null}get symbolLayerId(){return this.hasSublayers?null:this.hasSymbol?this.id:null}get leafLayerIds(){return[this.symbolLayerId,this.fillLayerId,this.strokeLayerId].filter(Boolean)}_geojsonIdStrategy(){return this.idProperty?{promoteId:this.idProperty}:this.generateIds?{generateId:!0}:(this.geojson?.features?.some(t=>"string"==typeof t.id)&&a.warn(`Dataset "${this.id}" has GeoJSON features with string native IDs. MapLibre only surfaces integer native feature IDs through queryRenderedFeatures. Use idProperty to promote a string property instead.`),{})}get source(){if(this.hasDynamicGeoJSON)return this.dynamicGeoJSON.source;if(this.tiles){const t={type:"vector",tiles:this.tiles,minzoom:this.minZoom||0,maxzoom:this.maxZoom||22};return this.idProperty&&this.sourceLayer&&(t.promoteId={[this.sourceLayer]:this.idProperty}),t}return this.geojson?{type:"geojson",data:this.geojson,...this._geojsonIdStrategy()}:null}getSymbolSource(t,e){return{id:this.symbolLayerId,type:"symbol",source:this.sourceId,"source-layer":this.sourceLayer,minzoom:this.minZoom,maxzoom:this.maxZoom,layout:{visibility:this.visibility,"icon-image":t,...e,"icon-allow-overlap":!0},...this.filter?{filter:this.filter}:{}}}getFillSource(t){return{id:this.fillLayerId,type:"fill",source:this.sourceId,"source-layer":this.sourceLayer,minzoom:this.minZoom,maxzoom:this.maxZoom,layout:{visibility:this.visibility},paint:t,...this.filter?{filter:this.filter}:{}}}getStrokeSource(t){return{id:this.strokeLayerId,type:"line",source:this.sourceId,"source-layer":this.sourceLayer,minzoom:this.minZoom,maxzoom:this.maxZoom,layout:{visibility:this.visibility},paint:t,...this.filter?{filter:this.filter}:{}}}}class o extends s{constructor(t,e,s,a){super(t,e,s,a),this._datasetSourceMap=new Map,window._datasetSourceMap=this._datasetSourceMap,this._symbolLayerIds=new Set}createDataset(t,e){return new r(t,e)}async init(){const{patternConfigs:t,symbolConfigs:e}=this._datasetRegistry.getPatternAndSymbolConfigs();await this.addPatternsAndSymbolsToMap(t,e),this._symbolLayerIds.clear(),this._datasetRegistry.forEachDataset(t=>this._addLayers(t)),await new Promise(t=>this._map.once("idle",t))}removeLayer(t){this._map.getLayer(t)&&this._map.removeLayer(t),this._symbolLayerIds.delete(t)}async addPatternsAndSymbolsToMap(t,e){const s=this._datasetRegistry.mapStyle,a=s.id;return Promise.all([this._mapProvider.addPatternsToMap(t,a,this._patternRegistry),this._mapProvider.addSymbolsToMap(e,s,this._symbolRegistry)])}destroy(){const t=new Set;this._datasetRegistry.forEachDataset(e=>{const s=e.sourceId;this._getLayersUsingSource(s).forEach(t=>this.removeLayer(t)),!t.has(s)&&this._map.getSource(s)&&(this._map.removeSource(s),t.add(s))}),this._datasetSourceMap.clear()}async onMapStyleChange(){await new Promise(t=>this._map.once("idle",t));const{patternConfigs:t,symbolConfigs:e}=this._datasetRegistry.getPatternAndSymbolConfigs();await this.addPatternsAndSymbolsToMap(t,e),this._symbolLayerIds.clear(),this._datasetRegistry.forEachDataset(t=>{this._addLayers(t),this._applyFeatureFilter(t)}),this.dynamicSources.forEach(t=>t.reapply())}async onMapSizeChange(){const{mapStyle:t}=this._datasetRegistry,e=this._pixelRatio,{patternConfigs:s,symbolConfigs:a}=this._datasetRegistry.getPatternAndSymbolConfigs();await this.addPatternsAndSymbolsToMap(s,a),this._pixelRatio===e&&this._datasetRegistry.forEach(s=>{const{fillLayerId:a,symbolLayerId:i}=s;if(i&&this._symbolLayerIds.has(i)&&this._map.getLayer(i)){const a=this._symbolRegistry.getSymbolImageId(s.style,t,"normal",e);return void(a&&this._map.setLayoutProperty(i,"icon-image",a))}if(a&&this._map.getLayer(a)){const i=this._patternRegistry.getPatternImageId(s.style,t.id,e);i&&this._map.setPaintProperty(a,"fill-pattern",i)}})}_registerPatternsAndSymbols(t){return this.addPatternsAndSymbolsToMap(t.patternConfigs,t.symbolConfigs)}removeDataset(t){const e=this._datasetRegistry.getDataset(t);if(!e)return;const{sourceId:s,layerIds:a}=e;a.forEach(t=>this.removeLayer(t));!this._datasetRegistry.topLevelDatasets().some(e=>e.id!==t&&e.sourceId===s)&&this._map.getSource(s)&&this._map.removeSource(s),this._datasetSourceMap.delete(t)}applyFeatureFilter(t){const e=this._datasetRegistry.getDataset(t);e&&this._applyFeatureFilter(e)}async applyStyle(t){const e=this._datasetRegistry.getDataset(t);e.layerIds.forEach(t=>this.removeLayer(t)),await this._registerPatternsAndSymbols(e),this._addLayers(e)}setData(t,e){const s=this._datasetSourceMap.get(t);if(!s)return;const a=this._map.getSource(s);a&&"function"==typeof a.setData&&a.setData(e)}_addLayers(t){const{mapStyle:e}=this._datasetRegistry,s=i(this._mapProvider,t,e,this._symbolRegistry,this._patternRegistry,this._pixelRatio);this._datasetSourceMap.set(t.id,s),this._maintainSymbolOrdering(t)}_getFirstSymbolLayerId(){const t=this._map.getStyle();if(!t?.layers)return null;const e=t.layers.find(t=>this._symbolLayerIds.has(t.id));return e?.id??null}_maintainSymbolOrdering(t){const e=(t=t.isSublayer?t.parent:t).layerIds.filter(t=>t&&this._map.getLayer(t));e.forEach(t=>{"symbol"===this._map.getLayer(t)?.type?this._symbolLayerIds.add(t):this._symbolLayerIds.delete(t)});const s=this._getFirstSymbolLayerId();s&&e.forEach(t=>{this._symbolLayerIds.has(t)||this._map.moveLayer(t,s)})}_setLayerVisibility(t,e){this._map.getLayer(t)&&this._map.setLayoutProperty(t,"visibility",e)}_applyFeatureFilter(t){t.getLayersWithFilters().forEach(({layerIds:t,filter:e})=>{t.forEach(t=>{this._map.getLayer(t)&&this._map.setFilter(t,e)})})}_setLayerOpacity(t,e){const s=this._map.getLayer(t);if(!s)return;const a={line:"line-opacity",symbol:"icon-opacity"}[s.type]||"fill-opacity";this._map.setPaintProperty(t,a,e)}_getLayersUsingSource(t){const e=this._map.getStyle();return e?.layers?e.layers.filter(e=>e.source===t).map(t=>t.id):[]}}export{o as default};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import
|
|
1
|
+
import{M as t,a as e}from"./mapboxStyleLayerAdapter.js";import{g as s}from"./layerAdapter.js";import a from"ol/source/Vector.js";import r from"ol/layer/Vector.js";import i from"ol/source/VectorTile.js";import o from"ol/layer/VectorTile.js";import l from"ol/format/GeoJSON.js";import y from"ol/format/MVT.js";import h from"ol/Feature.js";import n from"ol/tilegrid/TileGrid.js";import{l as d}from"./im-datasets-plugin.js";import c from"ol/style/Style.js";import m from"ol/style/Stroke.js";import"preact/compat";import"preact/jsx-runtime";class p extends t{get leafLayerIds(){return this.hasSublayers?[]:this.hasFill||this.hasStroke||this.hasSymbol?[this.id]:[]}get source(){return this.hasDynamicGeoJSON?{type:"geojson",data:{type:"FeatureCollection",features:[]}}:this.tiles?{type:"vector",tiles:this.tiles,minzoom:this.minZoom||0,maxzoom:this.maxZoom||22}:this.geojson?{type:"geojson",data:this.geojson}:null}get idStrategy(){return this.hasDynamicGeoJSON?this.dynamicGeoJSON.idProperty||null:this.idProperty||null}get filter(){const t=super.filter;if(!this.sourceLayer)return t;const e=["==",["get","layer"],this.sourceLayer];return t?"all"===t[0]?[...t,e]:["all",t,e]:e}_wrapWithFilter(t){return this.filter?[{filter:this.filter,style:t}]:t}getSymbolMeta({pixelRatio:t,symbolRegistry:e}){if(!this.hasSymbol)return null;const s=e.getSymbolImageId(this.style,this._datasetRegistry.mapStyle,"normal",t);return s?{imageId:s,anchor:e.getSymbolDef(this.style).anchor,pixelRatio:t}:null}_symbolStyle(t){const e={},s=this.getSymbolMeta(t),a=s&&t.getSymbolDataUri(s.imageId);return a&&(e["icon-src"]=a,e["icon-anchor"]=s.anchor,e["icon-scale"]=1/t.pixelRatio),this._wrapWithFilter(e)}getFlatStyle(t){if(this.hasSymbol)return this._symbolStyle(t);const e=this._datasetRegistry.mapStyle?.id,a={};return this.hasFill&&!this.hasPattern&&(a["fill-color"]=s(this.style.fill,e)),this.hasStroke&&(a["stroke-color"]=s(this.style.stroke,e),a["stroke-width"]=this.style.strokeWidth,this.style.strokeDashArray&&(a["stroke-line-dash"]=this.style.strokeDashArray)),this._wrapWithFilter(a)}}const g=(t,e)=>{if(t.hasStroke)return new m({color:s(t.style.stroke,e),width:t.style.strokeWidth,lineDash:t.style.strokeDashArray})},u="EPSG:27700",_=new l({dataProjection:u,featureProjection:u}),f=1e-6,S=13e5,b=[0,0,S,S],L=new n({extent:b,origin:[b[0],b[3]],resolutions:Array.from({length:25},(t,e)=>(b[2]-b[0])/(256*2**e)),tileSize:256}),I=(t,e)=>{if(!e)return _.readFeatures(t);const s={...t,features:t.features.map(t=>({...t,id:t.properties?.[e]??t.id}))};return _.readFeatures(s)},v=t=>{const{source:e,id:s,idStrategy:r}=t;if(!e)return null;if("geojson"===e.type){const t=new a;return"string"==typeof e.data?((t,e,s,a)=>{fetch(e).then(t=>{if(!t.ok)throw new Error(`${t.status} ${t.statusText}`);return t.json()}).then(e=>t.addFeatures(I(e,s))).catch(t=>d.warn(`OpenLayers datasets adapter: failed to fetch geojson for dataset "${a}" — ${t.message}`))})(t,e.data,r,s):e.data?.features?.length&&t.addFeatures(I(e.data,r)),t}if("vector"===e.type){const t=Array.isArray(e.tiles)?e.tiles:[e.tiles];return new i({format:new y({featureClass:h,idProperty:r||void 0}),urls:t,projection:u,tileGrid:L})}return d.warn(`OpenLayers datasets adapter: unsupported source type "${e.type}" (dataset "${s}")`),null},D=(t,e={})=>t.hasPattern?((t,{mapStyleId:e,pixelRatio:s,patternRegistry:a,getPatternFill:r,buildFilterEvaluator:i})=>{const o=a.getPatternImageId(t.style,e,s),l=o&&r(o),y=l?new c({fill:l,stroke:g(t,e)}):void 0,h=i(t.filter);return t=>{if(y&&(!h||h(t)))return y}})(t,e):t.getFlatStyle(e);class R extends e{constructor(t,e,s,a){super(t,e,s,a),this._sourcesById=new Map,this._layersById=new Map,this.createDataset=this.createDataset.bind(this)}createDataset(t,e){return new p(t,e)}get _styleContext(){return{mapStyleId:this._datasetRegistry.mapStyle?.id,pixelRatio:this._pixelRatio,patternRegistry:this._patternRegistry,symbolRegistry:this._symbolRegistry,getSymbolDataUri:t=>this._mapProvider.getSymbolDataUri(t),getPatternFill:t=>this._mapProvider.getPatternFill(t),buildFilterEvaluator:t=>this._mapProvider.buildFilterEvaluator(t)}}async init(){await Promise.all([this._registerPatterns(),this._registerSymbols()]),this._datasetRegistry.forEachDataset(t=>this._addLayers(t))}destroy(){this._layersById.forEach(t=>this._map.removeLayer(t)),this._layersById.clear(),this._sourcesById.clear()}async onMapStyleChange(){await Promise.all([this._registerPatterns(),this._registerSymbols()]),this._datasetRegistry.forEachDataset(t=>this._forEachLeafDataset(t,t=>{this._setLayerStyle(t)})),this._reapplyHighlights()}async onMapSizeChange(){const t=this._pixelRatio;await Promise.all([this._registerPatterns(),this._registerSymbols()]),this._pixelRatio===t&&(this._datasetRegistry.forEachDataset(t=>this._forEachLeafDataset(t,t=>{(t.hasPattern||t.hasSymbol)&&this._setLayerStyle(t)})),this._reapplyHighlights())}_reapplyHighlights(){this._mapProvider.reapplyHighlights()}_registerPatternsAndSymbols(t){return Promise.all([this._registerPatterns([t]),this._registerSymbols([t])])}removeDataset(t){const e=this._datasetRegistry.getDataset(t);if(!e)return;e.layerIds.forEach(t=>{const e=this._layersById.get(t);e&&(this._map.removeLayer(e),this._layersById.delete(t))});const{sourceId:s}=e;this._datasetRegistry.topLevelDatasets().some(e=>e.id!==t&&e.sourceId===s)||this._sourcesById.delete(s)}async applyStyle(t){const e=this._datasetRegistry.getDataset(t);e&&(await this._registerPatternsAndSymbols(e),this._forEachLeafDataset(e,t=>{this._layersById.has(t.id)?this._setLayerStyle(t):this._addLayers(t)}))}_setLayerOpacity(t,e){this._layersById.get(t)?.setOpacity(e)}_setLayerVisibility(t,e){this._layersById.get(t)?.setVisible("visible"===e)}applyFeatureFilter(t){const e=this._datasetRegistry.getDataset(t);e&&this._forEachLeafDataset(e,t=>{this._setLayerStyle(t)})}setData(t,e){const s=this._datasetRegistry.getDataset(t),a=s&&this._sourcesById.get(s.sourceId);a&&(a.clear(),e?.features?.length&&a.addFeatures(I(e,s.idStrategy)))}async _registerPatterns(t=this._datasetRegistry.topLevelDatasets()){const e=[];t.forEach(t=>this._forEachLeafDataset(t,t=>{t.hasPattern&&e.push(t.style)})),e.length&&await this._mapProvider.addPatternsToMap(e,this._datasetRegistry.mapStyle?.id,this._patternRegistry,this._pixelRatio)}async _registerSymbols(t=this._datasetRegistry.topLevelDatasets()){const e=[];t.forEach(t=>this._forEachLeafDataset(t,t=>{t.hasSymbol&&e.push(t.style)})),e.length&&await this._mapProvider.addSymbolsToMap(e,this._datasetRegistry.mapStyle,this._symbolRegistry,this._pixelRatio)}_setLayerStyle(t){const e=this._layersById.get(t.id);if(e)try{e.setStyle(D(t,this._styleContext)),t.hasSymbol&&e.set("symbolMeta",t.getSymbolMeta(this._styleContext))}catch(e){d.warn(`OpenLayers datasets adapter: failed to build a style for dataset "${t.id}" — ${e.message}`)}}_forEachLeafDataset(t,e){t.hasSublayers?t.sublayers.forEach(t=>this._forEachLeafDataset(t,e)):e(t)}_getOrCreateSource(t){const{sourceId:e}=t;if(this._sourcesById.has(e))return this._sourcesById.get(e);let s;try{s=v(t)}catch(e){return d.warn(`OpenLayers datasets adapter: failed to build a source for dataset "${t.id}" — ${e.message}`),null}return s&&this._sourcesById.set(e,s),s}_addLayers(t){if(t.hasSublayers)return this._getOrCreateSource(t),void t.sublayers.forEach(t=>this._addLayers(t));if(!t.leafLayerIds.length)return;const e=this._getOrCreateSource(t);if(!e)return;let s;try{s=((t,e,s)=>{const a=e instanceof i,l=new(a?o:r)({source:e,style:D(t,s),opacity:t.opacity,visible:"visible"===t.visibility,minZoom:(h=t.minZoom,void 0===h?void 0:h-f),maxZoom:(y=t.maxZoom,void 0===y?void 0:y-f),zIndex:t.hasSymbol?1:0,...a?{renderMode:"vector"}:{}});var y,h;return l.set("layerType",a?"vectorTile":"vector"),l.set("layerId",t.id),t.filter&&l.set("filter",t.filter),t.hasSymbol&&l.set("symbolMeta",t.getSymbolMeta(s)),l})(t,e,this._styleContext)}catch(e){return void d.warn(`OpenLayers datasets adapter: failed to build a style for dataset "${t.id}" — ${e.message}`)}this._map.addLayer(s),this._layersById.set(t.id,s)}}export{R as default};
|