@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
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { createDataset } from './createDataset.js'
|
|
2
2
|
import { DatasetDefinitionCache } from './datasetDefinitionCache.js'
|
|
3
|
+
import { isVisibleWhen } from './isVisibleWhen.js'
|
|
3
4
|
|
|
4
|
-
|
|
5
|
+
// Shared by every registry; each registry's own state is set in createDatasetRegistry
|
|
6
|
+
const datasetRegistryMethods = {
|
|
5
7
|
attach (datasetsRef, orderedDatasetsRef, mapStyle) {
|
|
6
8
|
this._datasets = datasetsRef
|
|
7
9
|
this._orderedDatasets = orderedDatasetsRef
|
|
@@ -9,8 +11,6 @@ const datasetRegistry = {
|
|
|
9
11
|
this._invalidateChangedDatasets()
|
|
10
12
|
},
|
|
11
13
|
|
|
12
|
-
_definitionCache: new DatasetDefinitionCache(),
|
|
13
|
-
|
|
14
14
|
_invalidateCache () { // used in tests to clear the cache between runs
|
|
15
15
|
this._definitionCache = new DatasetDefinitionCache()
|
|
16
16
|
},
|
|
@@ -26,7 +26,7 @@ const datasetRegistry = {
|
|
|
26
26
|
// createDataset defaults to a generic dataset factory function, but can be overridden by calling
|
|
27
27
|
// attachCreateDataset, which allows the layer adapter to provide its own createDataset function,
|
|
28
28
|
attachCreateDataset (newCreateDatasetFunction) { this._createDataset = newCreateDatasetFunction },
|
|
29
|
-
_createDataset: (datasetDefinition) => createDataset(datasetDefinition),
|
|
29
|
+
_createDataset: (datasetDefinition, datasetRegistry) => createDataset(datasetDefinition, datasetRegistry),
|
|
30
30
|
|
|
31
31
|
attachMapStyle (mapStyle) {
|
|
32
32
|
if (mapStyle) {
|
|
@@ -38,6 +38,31 @@ const datasetRegistry = {
|
|
|
38
38
|
return this._mapStyle
|
|
39
39
|
},
|
|
40
40
|
|
|
41
|
+
attachGlobals (globals) {
|
|
42
|
+
if (globals) {
|
|
43
|
+
this._globals = globals
|
|
44
|
+
}
|
|
45
|
+
},
|
|
46
|
+
|
|
47
|
+
get globals () {
|
|
48
|
+
return this._globals
|
|
49
|
+
},
|
|
50
|
+
|
|
51
|
+
attachMenuStateRef (menuStateRef) {
|
|
52
|
+
this._menuStateRef = menuStateRef
|
|
53
|
+
},
|
|
54
|
+
|
|
55
|
+
isVisibleWhen (visibleWhen) {
|
|
56
|
+
return isVisibleWhen(visibleWhen, {
|
|
57
|
+
mapStyleId: this._mapStyle?.id,
|
|
58
|
+
menuState: this._menuStateRef?.current?.menuState
|
|
59
|
+
})
|
|
60
|
+
},
|
|
61
|
+
|
|
62
|
+
get datasets () {
|
|
63
|
+
return this._datasets
|
|
64
|
+
},
|
|
65
|
+
|
|
41
66
|
// getDataset retrieves a dataset by id, creating a new Dataset instance that wraps the definition
|
|
42
67
|
getDataset (id) {
|
|
43
68
|
const definition = this.datasets[id]
|
|
@@ -48,7 +73,7 @@ const datasetRegistry = {
|
|
|
48
73
|
if (cachedDefinition) {
|
|
49
74
|
return cachedDefinition
|
|
50
75
|
}
|
|
51
|
-
const registryDataset = this._createDataset(definition)
|
|
76
|
+
const registryDataset = this._createDataset(definition, this)
|
|
52
77
|
this._definitionCache.add(registryDataset)
|
|
53
78
|
if (registryDataset.isSublayer) {
|
|
54
79
|
// Ensure the parent dataset is also cached
|
|
@@ -83,7 +108,6 @@ const datasetRegistry = {
|
|
|
83
108
|
}, { patternConfigs: [], symbolConfigs: [] })
|
|
84
109
|
},
|
|
85
110
|
|
|
86
|
-
_lastMenuState: {},
|
|
87
111
|
invalidateKeyItemsOnMenuStateChange (menuState) {
|
|
88
112
|
if (menuState === this._lastMenuState) {
|
|
89
113
|
return
|
|
@@ -91,7 +115,6 @@ const datasetRegistry = {
|
|
|
91
115
|
this._lastMenuState = menuState
|
|
92
116
|
this._lastKeyItemsDatasets = null
|
|
93
117
|
},
|
|
94
|
-
_lastKeyItems: {},
|
|
95
118
|
keyItems () {
|
|
96
119
|
if (this.datasets === this._lastKeyItemsDatasets) {
|
|
97
120
|
return this._lastKeyItems
|
|
@@ -139,6 +162,12 @@ const datasetRegistry = {
|
|
|
139
162
|
}
|
|
140
163
|
}
|
|
141
164
|
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
export
|
|
165
|
+
// Each datasets plugin instance (one per map) creates its own registry, so maps on the same page
|
|
166
|
+
// never see each other's datasets
|
|
167
|
+
export const createDatasetRegistry = () => Object.assign(Object.create(datasetRegistryMethods), {
|
|
168
|
+
_definitionCache: new DatasetDefinitionCache(),
|
|
169
|
+
_globals: {},
|
|
170
|
+
_menuStateRef: {},
|
|
171
|
+
_lastMenuState: {},
|
|
172
|
+
_lastKeyItems: {}
|
|
173
|
+
})
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Dataset } from './dataset.js'
|
|
2
|
-
import { datasetRegistry } from './datasetRegistry.js'
|
|
2
|
+
import { datasetRegistry, createDatasetRegistry } from './datasetRegistry.js'
|
|
3
3
|
import { mappedDatasetsReducer } from '../reducers/mappedDatasetsReducer.js'
|
|
4
4
|
import { datasetsWithGroups } from '../reducers/__data__/demoDatasets.js'
|
|
5
5
|
// Use the mock datasetRegistry with the demo datasets attached before each test.
|
|
@@ -351,4 +351,86 @@ describe('datasetRegistry', () => {
|
|
|
351
351
|
expect(datasetRegistry._definitionCache.getByDefinition(existingFieldsDefinition)).toBeUndefined() // old definition should no longer be cached
|
|
352
352
|
})
|
|
353
353
|
})
|
|
354
|
+
|
|
355
|
+
describe('createDatasetRegistry', () => {
|
|
356
|
+
const createMapRegistry = (datasets, globals = { visible: true, opacity: 1, opacityMode: 'dataset' }) => {
|
|
357
|
+
const registry = createDatasetRegistry()
|
|
358
|
+
const { mappedDatasets, orderedDatasets } = mappedDatasetsReducer({ datasets })
|
|
359
|
+
registry.attach(mappedDatasets, orderedDatasets, { id: 'outdoor' })
|
|
360
|
+
registry.attachGlobals(globals)
|
|
361
|
+
return registry
|
|
362
|
+
}
|
|
363
|
+
|
|
364
|
+
it('keeps datasets with the same id separate for each registry', () => {
|
|
365
|
+
const registryA = createMapRegistry([{ id: 'features', geojson: '/map-a.geojson' }])
|
|
366
|
+
const registryB = createMapRegistry([{ id: 'features', geojson: '/map-b.geojson' }])
|
|
367
|
+
|
|
368
|
+
expect(registryA.getDataset('features').geojson).toBe('/map-a.geojson')
|
|
369
|
+
expect(registryB.getDataset('features').geojson).toBe('/map-b.geojson')
|
|
370
|
+
expect(registryA.getDataset('features').geojson).toBe('/map-a.geojson')
|
|
371
|
+
})
|
|
372
|
+
|
|
373
|
+
it('gives each registry its own state while sharing its methods', () => {
|
|
374
|
+
const registryA = createDatasetRegistry()
|
|
375
|
+
const registryB = createDatasetRegistry()
|
|
376
|
+
|
|
377
|
+
expect(registryA.getDataset).toBe(registryB.getDataset)
|
|
378
|
+
const stateKeys = ['_definitionCache', '_globals', '_menuStateRef', '_lastMenuState', '_lastKeyItems']
|
|
379
|
+
stateKeys.forEach(key => expect(registryA[key]).not.toBe(registryB[key]))
|
|
380
|
+
})
|
|
381
|
+
|
|
382
|
+
it('only iterates its own datasets', () => {
|
|
383
|
+
const registryA = createMapRegistry([{ id: 'a' }])
|
|
384
|
+
const registryB = createMapRegistry([{ id: 'b' }])
|
|
385
|
+
|
|
386
|
+
const idsA = []
|
|
387
|
+
registryA.forEachDataset(dataset => idsA.push(dataset.id))
|
|
388
|
+
expect(idsA).toEqual(['a'])
|
|
389
|
+
expect(registryB.topLevelDatasets().map(dataset => dataset.id)).toEqual(['b'])
|
|
390
|
+
})
|
|
391
|
+
|
|
392
|
+
it('applies its own globals to its datasets', () => {
|
|
393
|
+
const registryA = createMapRegistry([{ id: 'features', visible: true }])
|
|
394
|
+
const registryB = createMapRegistry([{ id: 'features', visible: true }], { visible: false, opacity: 0.5, opacityMode: 'global' })
|
|
395
|
+
|
|
396
|
+
expect(registryA.getDataset('features').visible).toBe(true)
|
|
397
|
+
expect(registryA.getDataset('features').opacity).toBe(1)
|
|
398
|
+
expect(registryB.getDataset('features').visible).toBe(false)
|
|
399
|
+
expect(registryB.getDataset('features').opacity).toBe(0.5)
|
|
400
|
+
})
|
|
401
|
+
|
|
402
|
+
it('keeps its attached map style and globals when attached again without one', () => {
|
|
403
|
+
const registry = createDatasetRegistry()
|
|
404
|
+
const mapStyle = { id: 'dark' }
|
|
405
|
+
const globals = { visible: true, opacity: 1, opacityMode: 'dataset' }
|
|
406
|
+
registry.attachMapStyle(mapStyle)
|
|
407
|
+
registry.attachGlobals(globals)
|
|
408
|
+
|
|
409
|
+
registry.attachMapStyle(undefined)
|
|
410
|
+
registry.attachGlobals(undefined)
|
|
411
|
+
|
|
412
|
+
expect(registry.mapStyle).toBe(mapStyle)
|
|
413
|
+
expect(registry.globals).toBe(globals)
|
|
414
|
+
})
|
|
415
|
+
|
|
416
|
+
it('checks visibleWhen against its own map style and menu state', () => {
|
|
417
|
+
const registry = createDatasetRegistry()
|
|
418
|
+
registry.attachMapStyle({ id: 'dark' })
|
|
419
|
+
registry.attachMenuStateRef({ current: { menuState: { timeframe: 'present' } } })
|
|
420
|
+
|
|
421
|
+
expect(registry.isVisibleWhen({ mapStyleId: 'dark', menu: { timeframe: ['present'] } })).toBe(true)
|
|
422
|
+
expect(registry.isVisibleWhen({ mapStyleId: 'outdoor' })).toBe(false)
|
|
423
|
+
expect(registry.isVisibleWhen({ menu: { timeframe: ['future'] } })).toBe(false)
|
|
424
|
+
})
|
|
425
|
+
|
|
426
|
+
it('passes itself to the dataset factory', () => {
|
|
427
|
+
const registry = createMapRegistry([{ id: 'features' }])
|
|
428
|
+
const factory = jest.fn((definition, owner) => new Dataset(definition, owner))
|
|
429
|
+
registry.attachCreateDataset(factory)
|
|
430
|
+
|
|
431
|
+
registry.getDataset('features')
|
|
432
|
+
|
|
433
|
+
expect(factory).toHaveBeenCalledWith(expect.objectContaining({ id: 'features' }), registry)
|
|
434
|
+
})
|
|
435
|
+
})
|
|
354
436
|
})
|
|
@@ -1,33 +1,25 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
export const attachGlobalState = (globalStateRef) => {
|
|
4
|
-
globalState = globalStateRef
|
|
5
|
-
}
|
|
6
|
-
|
|
7
|
-
const calculateLocalOpacity = (opacityValue, parentOpacityValue) => {
|
|
1
|
+
const calculateLocalOpacity = (globals, opacityValue, parentOpacityValue) => {
|
|
8
2
|
if (opacityValue === undefined) {
|
|
9
3
|
if (parentOpacityValue === undefined) {
|
|
10
|
-
return
|
|
4
|
+
return globals.opacity
|
|
11
5
|
}
|
|
12
6
|
return parentOpacityValue
|
|
13
7
|
}
|
|
14
8
|
return opacityValue
|
|
15
9
|
}
|
|
16
10
|
|
|
17
|
-
const multiplyOpacities = (opacityValue = 1, parentOpacityValue = 1) => {
|
|
18
|
-
return Math.round((opacityValue * parentOpacityValue *
|
|
11
|
+
const multiplyOpacities = (globals, opacityValue = 1, parentOpacityValue = 1) => {
|
|
12
|
+
return Math.round((opacityValue * parentOpacityValue * globals.opacity + Number.EPSILON) * 100) / 100
|
|
19
13
|
}
|
|
20
14
|
|
|
21
|
-
export const calculateOpacity = (opacityValue, parentOpacityValue) => {
|
|
22
|
-
switch (
|
|
15
|
+
export const calculateOpacity = (globals, opacityValue, parentOpacityValue) => {
|
|
16
|
+
switch (globals.opacityMode) {
|
|
23
17
|
case 'global':
|
|
24
|
-
return
|
|
18
|
+
return globals.opacity
|
|
25
19
|
case 'multiply':
|
|
26
|
-
return multiplyOpacities(opacityValue, parentOpacityValue)
|
|
20
|
+
return multiplyOpacities(globals, opacityValue, parentOpacityValue)
|
|
27
21
|
case 'dataset':
|
|
28
22
|
default:
|
|
29
|
-
return calculateLocalOpacity(opacityValue, parentOpacityValue)
|
|
23
|
+
return calculateLocalOpacity(globals, opacityValue, parentOpacityValue)
|
|
30
24
|
}
|
|
31
25
|
}
|
|
32
|
-
|
|
33
|
-
export const getGlobalVisibility = () => globalState.visible
|
|
@@ -1,12 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
let _menuStateRef = {}
|
|
4
|
-
export const attachMenuStateRef = (menuStateRef) => {
|
|
5
|
-
_menuStateRef = menuStateRef
|
|
6
|
-
}
|
|
7
|
-
|
|
8
|
-
const _isVisibleWhenMenuCheck = (menuVisibleWhen) => {
|
|
9
|
-
const menuState = _menuStateRef?.current?.menuState || {}
|
|
1
|
+
const _isVisibleWhenMenuCheck = (menuVisibleWhen, menuState = {}) => {
|
|
10
2
|
for (const [key, valueArray] of Object.entries(menuVisibleWhen)) {
|
|
11
3
|
const menuValue = menuState[key]
|
|
12
4
|
if (!valueArray.includes(menuValue)) {
|
|
@@ -16,14 +8,11 @@ const _isVisibleWhenMenuCheck = (menuVisibleWhen) => {
|
|
|
16
8
|
return true
|
|
17
9
|
}
|
|
18
10
|
|
|
19
|
-
const _isVisibleWhenMapStyleCheck = (visibleWhenValue) => {
|
|
11
|
+
const _isVisibleWhenMapStyleCheck = (visibleWhenValue, mapStyleId) => {
|
|
20
12
|
const mapStylesArray = Array.isArray(visibleWhenValue) ? visibleWhenValue : [visibleWhenValue]
|
|
21
|
-
return mapStylesArray.includes(
|
|
13
|
+
return mapStylesArray.includes(mapStyleId)
|
|
22
14
|
}
|
|
23
15
|
|
|
24
|
-
// exported so it can be mocked and overridden when testing
|
|
25
|
-
export const _getMapStyleId = () => datasetRegistry.mapStyle.id
|
|
26
|
-
|
|
27
16
|
/**
|
|
28
17
|
* receives a visibleWhen boolean or object
|
|
29
18
|
* and returns a boolean indicating whether the dataset should be visible
|
|
@@ -32,9 +21,12 @@ export const _getMapStyleId = () => datasetRegistry.mapStyle.id
|
|
|
32
21
|
* if visibleWhen is an object, it checks the properties of the object, against the relevant pluginState properties,
|
|
33
22
|
* and returns true if all properties are satisfied:
|
|
34
23
|
* @param {boolean|object} visibleWhen - the visibleWhen property of a dataset
|
|
24
|
+
* @param {object} context
|
|
25
|
+
* @param {string} context.mapStyleId - the current map style id
|
|
26
|
+
* @param {object} context.menuState - the current menu state
|
|
35
27
|
* @returns {boolean} - true if the dataset should be visible, false otherwise
|
|
36
28
|
*/
|
|
37
|
-
export const isVisibleWhen = (visibleWhen) => {
|
|
29
|
+
export const isVisibleWhen = (visibleWhen, { mapStyleId, menuState } = {}) => {
|
|
38
30
|
if (visibleWhen === undefined || visibleWhen === null) {
|
|
39
31
|
return true
|
|
40
32
|
}
|
|
@@ -44,10 +36,10 @@ export const isVisibleWhen = (visibleWhen) => {
|
|
|
44
36
|
if (typeof visibleWhen === 'object') {
|
|
45
37
|
// check each property of the visibleWhen object against the relevant pluginState property
|
|
46
38
|
for (const [visibleWhenKey, visibleWhenValue] of Object.entries(visibleWhen)) {
|
|
47
|
-
if (visibleWhenKey === 'mapStyleId' && !_isVisibleWhenMapStyleCheck(visibleWhenValue)) {
|
|
39
|
+
if (visibleWhenKey === 'mapStyleId' && !_isVisibleWhenMapStyleCheck(visibleWhenValue, mapStyleId)) {
|
|
48
40
|
return false
|
|
49
41
|
}
|
|
50
|
-
if (visibleWhenKey === 'menu' && !_isVisibleWhenMenuCheck(visibleWhenValue)) {
|
|
42
|
+
if (visibleWhenKey === 'menu' && !_isVisibleWhenMenuCheck(visibleWhenValue, menuState)) {
|
|
51
43
|
return false
|
|
52
44
|
}
|
|
53
45
|
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { isVisibleWhen
|
|
2
|
-
|
|
1
|
+
import { isVisibleWhen } from './isVisibleWhen.js'
|
|
2
|
+
|
|
3
|
+
let context
|
|
3
4
|
|
|
4
5
|
const setMenuState = (menuState) => {
|
|
5
|
-
|
|
6
|
+
context = { menuState }
|
|
6
7
|
}
|
|
7
8
|
|
|
8
9
|
describe('isVisibleWhen', () => {
|
|
@@ -12,66 +13,72 @@ describe('isVisibleWhen', () => {
|
|
|
12
13
|
})
|
|
13
14
|
|
|
14
15
|
it('returns true if visibleWhen is undefined', () => {
|
|
15
|
-
expect(isVisibleWhen(undefined)).toBe(true)
|
|
16
|
+
expect(isVisibleWhen(undefined, context)).toBe(true)
|
|
16
17
|
})
|
|
17
18
|
|
|
18
19
|
it('returns true if visibleWhen is null', () => {
|
|
19
|
-
expect(isVisibleWhen(null)).toBe(true)
|
|
20
|
+
expect(isVisibleWhen(null, context)).toBe(true)
|
|
20
21
|
})
|
|
21
22
|
|
|
22
23
|
it('returns the boolean value if visibleWhen is a boolean', () => {
|
|
23
|
-
expect(isVisibleWhen(true)).toBe(true)
|
|
24
|
-
expect(isVisibleWhen(false)).toBe(false)
|
|
24
|
+
expect(isVisibleWhen(true, context)).toBe(true)
|
|
25
|
+
expect(isVisibleWhen(false, context)).toBe(false)
|
|
25
26
|
})
|
|
26
27
|
|
|
27
28
|
it('returns true if all properties of visibleWhen object are satisfied', () => {
|
|
28
29
|
setMenuState({ datasets: 'floodZones', timeframe: 'climateChange' })
|
|
29
30
|
const visibleWhen = { menu: { datasets: ['floodZones'], timeframe: ['climateChange'] } }
|
|
30
|
-
expect(isVisibleWhen(visibleWhen)).toBe(true)
|
|
31
|
+
expect(isVisibleWhen(visibleWhen, context)).toBe(true)
|
|
31
32
|
})
|
|
32
33
|
|
|
33
34
|
it('returns false if any property of visibleWhen object is not satisfied', () => {
|
|
34
35
|
setMenuState({ datasets: 'floodZones', timeframe: 'climateChange' })
|
|
35
36
|
const visibleWhen = { menu: { datasets: ['floodZones'], timeframe: ['presentDay'] } }
|
|
36
|
-
expect(isVisibleWhen(visibleWhen)).toBe(false)
|
|
37
|
+
expect(isVisibleWhen(visibleWhen, context)).toBe(false)
|
|
37
38
|
})
|
|
38
39
|
|
|
39
40
|
it('returns true if mapStyleId is satisfied', () => {
|
|
40
41
|
const mapStyleId = 'outdoor'
|
|
41
|
-
|
|
42
|
+
context = { mapStyleId }
|
|
42
43
|
const visibleWhen = { mapStyleId }
|
|
43
|
-
expect(isVisibleWhen(visibleWhen)).toBe(true)
|
|
44
|
+
expect(isVisibleWhen(visibleWhen, context)).toBe(true)
|
|
44
45
|
})
|
|
45
46
|
|
|
46
47
|
it('returns false if mapStyleId is not satisfied', () => {
|
|
47
48
|
const mapStyleId = 'outdoor'
|
|
48
|
-
|
|
49
|
+
context = { mapStyleId }
|
|
49
50
|
const visibleWhen = { mapStyleId: 'dark' }
|
|
50
|
-
expect(isVisibleWhen(visibleWhen)).toBe(false)
|
|
51
|
+
expect(isVisibleWhen(visibleWhen, context)).toBe(false)
|
|
51
52
|
})
|
|
52
53
|
|
|
53
54
|
it('returns true if mapStyleId is an array and one of the values is satisfied', () => {
|
|
54
55
|
const mapStyleId = 'outdoor'
|
|
55
|
-
|
|
56
|
+
context = { mapStyleId }
|
|
56
57
|
const visibleWhen = { mapStyleId: ['dark', mapStyleId] }
|
|
57
|
-
expect(isVisibleWhen(visibleWhen)).toBe(true)
|
|
58
|
+
expect(isVisibleWhen(visibleWhen, context)).toBe(true)
|
|
58
59
|
})
|
|
59
60
|
|
|
60
61
|
it('returns false if mapStyleId is an array and none of the values are satisfied', () => {
|
|
61
62
|
const mapStyleId = 'outdoor'
|
|
62
|
-
|
|
63
|
+
context = { mapStyleId }
|
|
63
64
|
const visibleWhen = { mapStyleId: ['dark', 'black-and-white'] }
|
|
64
|
-
expect(isVisibleWhen(visibleWhen)).toBe(false)
|
|
65
|
+
expect(isVisibleWhen(visibleWhen, context)).toBe(false)
|
|
65
66
|
})
|
|
66
67
|
|
|
67
68
|
it('returns true if visibleWhen is incorrectly configured', () => {
|
|
68
69
|
const visibleWhen = 'incorrectly-configured'
|
|
69
|
-
expect(isVisibleWhen(visibleWhen)).toBe(true)
|
|
70
|
+
expect(isVisibleWhen(visibleWhen, context)).toBe(true)
|
|
70
71
|
})
|
|
71
72
|
|
|
72
73
|
it('returns false when menu condition is checked and menuState has not been set up', () => {
|
|
73
|
-
|
|
74
|
+
context = {} // menuState is undefined — exercises the default {}
|
|
74
75
|
const visibleWhen = { menu: { datasets: ['floodZones'] } }
|
|
75
|
-
expect(isVisibleWhen(visibleWhen)).toBe(false)
|
|
76
|
+
expect(isVisibleWhen(visibleWhen, context)).toBe(false)
|
|
77
|
+
})
|
|
78
|
+
|
|
79
|
+
it('treats a missing context as no map style and no menu state', () => {
|
|
80
|
+
expect(isVisibleWhen({ mapStyleId: 'outdoor' })).toBe(false)
|
|
81
|
+
expect(isVisibleWhen({ menu: { datasets: ['floodZones'] } })).toBe(false)
|
|
82
|
+
expect(isVisibleWhen({})).toBe(true)
|
|
76
83
|
})
|
|
77
84
|
})
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Dataset } from './dataset.js'
|
|
2
2
|
import { MapboxStyleDataset } from './mapboxStyleDataset.js'
|
|
3
3
|
import { datasetRegistry } from './datasetRegistry.js'
|
|
4
|
-
import { attachGlobalState } from './globalDataset.js'
|
|
5
4
|
import { hashString } from '../../../../src/utils/hashString.js'
|
|
6
5
|
// Use the mock datasetRegistry with the demo datasets attached before each test
|
|
7
6
|
jest.mock('./datasetRegistry.js')
|
|
@@ -14,44 +13,44 @@ const globalState = {
|
|
|
14
13
|
|
|
15
14
|
describe('MapboxStyleDataset', () => {
|
|
16
15
|
beforeEach(() => {
|
|
17
|
-
datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def))
|
|
16
|
+
datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def, datasetRegistry))
|
|
18
17
|
})
|
|
19
18
|
|
|
20
19
|
describe('_hiddenFeaturesIdExpression', () => {
|
|
21
20
|
it('uses get(idProperty) when idProperty is set', () => {
|
|
22
|
-
const dataset = new MapboxStyleDataset({ idProperty: 'ref' })
|
|
21
|
+
const dataset = new MapboxStyleDataset({ idProperty: 'ref' }, datasetRegistry)
|
|
23
22
|
expect(dataset._hiddenFeaturesIdExpression).toEqual(['to-string', ['get', 'ref']])
|
|
24
23
|
})
|
|
25
24
|
|
|
26
25
|
it('uses the feature id when idProperty is not set', () => {
|
|
27
|
-
const dataset = new MapboxStyleDataset({})
|
|
26
|
+
const dataset = new MapboxStyleDataset({}, datasetRegistry)
|
|
28
27
|
expect(dataset._hiddenFeaturesIdExpression).toEqual(['to-string', ['id']])
|
|
29
28
|
})
|
|
30
29
|
|
|
31
30
|
it('uses the dynamicGeoJSON hiddenFeaturesIdExpression when the dataset is dynamic', () => {
|
|
32
|
-
const dataset = new MapboxStyleDataset({ dynamicGeoJSON: { idProperty: 'ref' } })
|
|
31
|
+
const dataset = new MapboxStyleDataset({ dynamicGeoJSON: { idProperty: 'ref' } }, datasetRegistry)
|
|
33
32
|
expect(dataset._hiddenFeaturesIdExpression).toEqual(['to-string', ['get', 'ref']])
|
|
34
33
|
})
|
|
35
34
|
})
|
|
36
35
|
|
|
37
36
|
describe('filter', () => {
|
|
38
37
|
it('returns null when there is no filter and no hidden features', () => {
|
|
39
|
-
const dataset = new MapboxStyleDataset({})
|
|
38
|
+
const dataset = new MapboxStyleDataset({}, datasetRegistry)
|
|
40
39
|
expect(dataset.filter).toBeNull()
|
|
41
40
|
})
|
|
42
41
|
|
|
43
42
|
it('returns its own filter expression directly when it is the only filter', () => {
|
|
44
|
-
const dataset = new MapboxStyleDataset({ filter: ['==', ['get', 'type'], 'foo'] })
|
|
43
|
+
const dataset = new MapboxStyleDataset({ filter: ['==', ['get', 'type'], 'foo'] }, datasetRegistry)
|
|
45
44
|
expect(dataset.filter).toEqual(['==', ['get', 'type'], 'foo'])
|
|
46
45
|
})
|
|
47
46
|
|
|
48
47
|
it('returns the hidden features filter directly when it is the only filter', () => {
|
|
49
|
-
const dataset = new MapboxStyleDataset({ hiddenFeatures: [1, 2] })
|
|
48
|
+
const dataset = new MapboxStyleDataset({ hiddenFeatures: [1, 2] }, datasetRegistry)
|
|
50
49
|
expect(dataset.filter).toEqual(['!', ['in', ['to-string', ['id']], ['literal', ['1', '2']]]])
|
|
51
50
|
})
|
|
52
51
|
|
|
53
52
|
it('combines its own filter and the hidden features filter with "all"', () => {
|
|
54
|
-
const dataset = new MapboxStyleDataset({ filter: ['==', ['get', 'type'], 'foo'], hiddenFeatures: [5] })
|
|
53
|
+
const dataset = new MapboxStyleDataset({ filter: ['==', ['get', 'type'], 'foo'], hiddenFeatures: [5] }, datasetRegistry)
|
|
55
54
|
expect(dataset.filter).toEqual([
|
|
56
55
|
'all',
|
|
57
56
|
['==', ['get', 'type'], 'foo'],
|
|
@@ -63,28 +62,28 @@ describe('MapboxStyleDataset', () => {
|
|
|
63
62
|
const parentDef = { id: 'parent', filter: ['==', ['get', 'cat'], 'a'] }
|
|
64
63
|
const childDef = { id: 'child', parentId: 'parent', filter: ['==', ['get', 'sub'], 'b'] }
|
|
65
64
|
datasetRegistry.attach({ parent: parentDef, child: childDef })
|
|
66
|
-
expect(new MapboxStyleDataset(childDef).filter).toEqual(['all', parentDef.filter, childDef.filter])
|
|
65
|
+
expect(new MapboxStyleDataset(childDef, datasetRegistry).filter).toEqual(['all', parentDef.filter, childDef.filter])
|
|
67
66
|
})
|
|
68
67
|
})
|
|
69
68
|
|
|
70
69
|
describe('sourceId', () => {
|
|
71
70
|
it('returns a tiles-based id for an array of tiles URLs', () => {
|
|
72
|
-
const dataset = new MapboxStyleDataset({ id: 'ds', tiles: ['https://example.com/{z}/{x}/{y}'] })
|
|
71
|
+
const dataset = new MapboxStyleDataset({ id: 'ds', tiles: ['https://example.com/{z}/{x}/{y}'] }, datasetRegistry)
|
|
73
72
|
expect(dataset.sourceId).toBe(`tiles-${hashString('https://example.com/{z}/{x}/{y}')}`)
|
|
74
73
|
})
|
|
75
74
|
|
|
76
75
|
it('returns geojson-{hash} for a static string geojson url', () => {
|
|
77
|
-
const dataset = new MapboxStyleDataset({ id: 'ds', geojson: 'https://example.com/data.geojson' })
|
|
76
|
+
const dataset = new MapboxStyleDataset({ id: 'ds', geojson: 'https://example.com/data.geojson' }, datasetRegistry)
|
|
78
77
|
expect(dataset.sourceId).toBe(`geojson-${hashString('https://example.com/data.geojson')}`)
|
|
79
78
|
})
|
|
80
79
|
|
|
81
80
|
it('returns geojson-{id} for an inline geojson object', () => {
|
|
82
|
-
const dataset = new MapboxStyleDataset({ id: 'ds', geojson: { type: 'FeatureCollection', features: [] } })
|
|
81
|
+
const dataset = new MapboxStyleDataset({ id: 'ds', geojson: { type: 'FeatureCollection', features: [] } }, datasetRegistry)
|
|
83
82
|
expect(dataset.sourceId).toBe('geojson-ds')
|
|
84
83
|
})
|
|
85
84
|
|
|
86
85
|
it('returns source-{id} when there are no tiles and no geojson', () => {
|
|
87
|
-
const dataset = new MapboxStyleDataset({ id: 'ds' })
|
|
86
|
+
const dataset = new MapboxStyleDataset({ id: 'ds' }, datasetRegistry)
|
|
88
87
|
expect(dataset.sourceId).toBe('source-ds')
|
|
89
88
|
})
|
|
90
89
|
|
|
@@ -92,20 +91,20 @@ describe('MapboxStyleDataset', () => {
|
|
|
92
91
|
const parentDef = { id: 'parent', geojson: { type: 'FeatureCollection', features: [] } }
|
|
93
92
|
const childDef = { id: 'child', parentId: 'parent' }
|
|
94
93
|
datasetRegistry.attach({ parent: parentDef, child: childDef })
|
|
95
|
-
expect(new MapboxStyleDataset(childDef).sourceId).toBe('geojson-parent')
|
|
94
|
+
expect(new MapboxStyleDataset(childDef, datasetRegistry).sourceId).toBe('geojson-parent')
|
|
96
95
|
})
|
|
97
96
|
})
|
|
98
97
|
|
|
99
98
|
describe('leafLayerIds / layerIds', () => {
|
|
100
99
|
it('leafLayerIds defaults to an empty array on the base class', () => {
|
|
101
|
-
expect(new MapboxStyleDataset({ id: 'ds' }).leafLayerIds).toEqual([])
|
|
100
|
+
expect(new MapboxStyleDataset({ id: 'ds' }, datasetRegistry).leafLayerIds).toEqual([])
|
|
102
101
|
})
|
|
103
102
|
|
|
104
103
|
it('layerIds returns leafLayerIds for a dataset with no sublayers', () => {
|
|
105
104
|
class FakeAdapterDataset extends MapboxStyleDataset {
|
|
106
105
|
get leafLayerIds () { return [this.id] }
|
|
107
106
|
}
|
|
108
|
-
const dataset = new FakeAdapterDataset({ id: 'ds' })
|
|
107
|
+
const dataset = new FakeAdapterDataset({ id: 'ds' }, datasetRegistry)
|
|
109
108
|
expect(dataset.layerIds).toEqual(['ds'])
|
|
110
109
|
})
|
|
111
110
|
|
|
@@ -117,14 +116,14 @@ describe('MapboxStyleDataset', () => {
|
|
|
117
116
|
// attach() call alone does not reset — restore this file's own default afterward so this
|
|
118
117
|
// doesn't leak into other tests in this file.
|
|
119
118
|
try {
|
|
120
|
-
datasetRegistry.attachCreateDataset(def => new FakeAdapterDataset(def))
|
|
119
|
+
datasetRegistry.attachCreateDataset(def => new FakeAdapterDataset(def, datasetRegistry))
|
|
121
120
|
const parentDef = { id: 'parent', sublayerIds: ['child-a', 'child-b'] }
|
|
122
121
|
const childA = { id: 'child-a', parentId: 'parent' }
|
|
123
122
|
const childB = { id: 'child-b', parentId: 'parent' }
|
|
124
123
|
datasetRegistry.attach({ parent: parentDef, 'child-a': childA, 'child-b': childB })
|
|
125
124
|
expect(datasetRegistry.getDataset('parent').layerIds).toEqual(['child-a', 'child-b'])
|
|
126
125
|
} finally {
|
|
127
|
-
datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def))
|
|
126
|
+
datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def, datasetRegistry))
|
|
128
127
|
}
|
|
129
128
|
})
|
|
130
129
|
})
|
|
@@ -142,12 +141,12 @@ describe('MapboxStyleDataset', () => {
|
|
|
142
141
|
beforeEach(() => {
|
|
143
142
|
// visibility/opacity both fold in global state (see globalDataset.js) — set explicitly
|
|
144
143
|
// here rather than relying on whatever an earlier test in this file last left it as.
|
|
145
|
-
|
|
146
|
-
datasetRegistry.attachCreateDataset(def => new FakeAdapterDataset(def))
|
|
144
|
+
datasetRegistry.attachGlobals(globalState)
|
|
145
|
+
datasetRegistry.attachCreateDataset(def => new FakeAdapterDataset(def, datasetRegistry))
|
|
147
146
|
})
|
|
148
147
|
|
|
149
148
|
afterEach(() => {
|
|
150
|
-
datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def))
|
|
149
|
+
datasetRegistry.attachCreateDataset(def => new MapboxStyleDataset(def, datasetRegistry))
|
|
151
150
|
})
|
|
152
151
|
|
|
153
152
|
describe('getLayersWithVisibility', () => {
|
|
@@ -168,7 +167,7 @@ describe('MapboxStyleDataset', () => {
|
|
|
168
167
|
|
|
169
168
|
describe('getLayersWithOpacity', () => {
|
|
170
169
|
it('returns layerIds and opacity for a top-level dataset with no sublayers', () => {
|
|
171
|
-
const dataset = new FakeAdapterDataset({ id: 'ds', style: { opacity: 0.4 } })
|
|
170
|
+
const dataset = new FakeAdapterDataset({ id: 'ds', style: { opacity: 0.4 } }, datasetRegistry)
|
|
172
171
|
expect(dataset.getLayersWithOpacity()).toEqual([{ layerIds: ['ds'], opacity: 0.4 }])
|
|
173
172
|
})
|
|
174
173
|
|
|
@@ -190,7 +189,7 @@ describe('MapboxStyleDataset', () => {
|
|
|
190
189
|
class UnevenAdapterDataset extends MapboxStyleDataset {
|
|
191
190
|
get leafLayerIds () { return this.style?.renderable ? [this.id] : [] }
|
|
192
191
|
}
|
|
193
|
-
datasetRegistry.attachCreateDataset(def => new UnevenAdapterDataset(def))
|
|
192
|
+
datasetRegistry.attachCreateDataset(def => new UnevenAdapterDataset(def, datasetRegistry))
|
|
194
193
|
const parentDef = { id: 'parent', sublayerIds: ['child-renderable', 'child-unsupported'] }
|
|
195
194
|
const childRenderable = { id: 'child-renderable', parentId: 'parent', style: { renderable: true, opacity: 0.5 } }
|
|
196
195
|
const childUnsupported = { id: 'child-unsupported', parentId: 'parent', style: { opacity: 0.9 } }
|
|
@@ -203,12 +202,12 @@ describe('MapboxStyleDataset', () => {
|
|
|
203
202
|
|
|
204
203
|
describe('getLayersWithFilters', () => {
|
|
205
204
|
it('returns an empty array when there are no hidden features and no sublayers', () => {
|
|
206
|
-
const dataset = new FakeAdapterDataset({ id: 'ds' })
|
|
205
|
+
const dataset = new FakeAdapterDataset({ id: 'ds' }, datasetRegistry)
|
|
207
206
|
expect(dataset.getLayersWithFilters()).toEqual([])
|
|
208
207
|
})
|
|
209
208
|
|
|
210
209
|
it('returns an entry with layerIds and filter when the dataset has hidden features', () => {
|
|
211
|
-
const dataset = new FakeAdapterDataset({ id: 'ds', hiddenFeatures: [1, 2] })
|
|
210
|
+
const dataset = new FakeAdapterDataset({ id: 'ds', hiddenFeatures: [1, 2] }, datasetRegistry)
|
|
212
211
|
expect(dataset.getLayersWithFilters()).toEqual([{
|
|
213
212
|
layerIds: ['ds'],
|
|
214
213
|
filter: ['!', ['in', ['to-string', ['id']], ['literal', ['1', '2']]]]
|
|
@@ -235,6 +234,6 @@ describe('MapboxStyleDataset', () => {
|
|
|
235
234
|
})
|
|
236
235
|
|
|
237
236
|
it('extends the base Dataset class', () => {
|
|
238
|
-
expect(new MapboxStyleDataset({})).toBeInstanceOf(Dataset)
|
|
237
|
+
expect(new MapboxStyleDataset({}, datasetRegistry)).toBeInstanceOf(Dataset)
|
|
239
238
|
})
|
|
240
239
|
})
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export const hasLayersMenu = ({ pluginConfig, pluginState }) => {
|
|
2
|
+
if (pluginConfig.hasMenu === false) {
|
|
3
|
+
return false
|
|
4
|
+
}
|
|
5
|
+
|
|
6
|
+
// Before initialisation the live menu is empty, so use the configured datasets.
|
|
7
|
+
// Once initialised, an empty live menu also covers removal of the last dataset.
|
|
8
|
+
return pluginState.menuInitialised
|
|
9
|
+
? pluginState.menu.length > 0
|
|
10
|
+
: (pluginConfig.datasets || []).some(dataset =>
|
|
11
|
+
dataset.showInMenu || dataset.sublayers?.some(sublayer => sublayer.showInMenu)
|
|
12
|
+
)
|
|
13
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { hasLayersMenu } from './hasLayersMenu.js'
|
|
2
|
+
|
|
3
|
+
const dataset = { id: 'roads', label: 'Roads', showInMenu: true }
|
|
4
|
+
const menu = [{ id: 'roads', items: [{ id: 'roads' }] }]
|
|
5
|
+
const loading = { menu: [], menuInitialised: false }
|
|
6
|
+
|
|
7
|
+
describe('hasLayersMenu', () => {
|
|
8
|
+
it.each([
|
|
9
|
+
['no configured datasets', {}, false],
|
|
10
|
+
['datasets without showInMenu', { datasets: [{ id: 'roads' }] }, false],
|
|
11
|
+
['a configured menu dataset', { datasets: [dataset] }, true],
|
|
12
|
+
['a configured menu sublayer', { datasets: [{ id: 'parent', sublayers: [dataset] }] }, true],
|
|
13
|
+
['an explicitly disabled menu', { hasMenu: false, datasets: [dataset] }, false]
|
|
14
|
+
])('uses the configuration before the menu has loaded: %s', (_, pluginConfig, expected) => {
|
|
15
|
+
expect(hasLayersMenu({ pluginConfig, pluginState: loading })).toBe(expected)
|
|
16
|
+
})
|
|
17
|
+
|
|
18
|
+
it.each([
|
|
19
|
+
['an empty live menu', { datasets: [dataset] }, [], false],
|
|
20
|
+
['a populated live menu', { datasets: [] }, menu, true],
|
|
21
|
+
['an explicitly disabled menu', { hasMenu: false }, menu, false]
|
|
22
|
+
])('uses the live menu once it has loaded: %s', (_, pluginConfig, liveMenu, expected) => {
|
|
23
|
+
expect(hasLayersMenu({ pluginConfig, pluginState: { menu: liveMenu, menuInitialised: true } })).toBe(expected)
|
|
24
|
+
})
|
|
25
|
+
})
|