Skip to content

Remove the beta folders, and delete the old draw-ml and draw-ol plugins #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dannyleech merged 1 commit into from
Oct 21, 2026
Merged

Remove the beta folders, and delete the old draw-ml and draw-ol plugins #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/templates/style-switcher.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% block head %}
<link href="/public/stylesheets/application.css" rel="stylesheet" type="text/css">
<link href="/plugin-assets/%40defra%2Finteractive-map/dist/css/index.css" rel="stylesheet" type="text/css">
<link href="/plugin-assets/%40defra%2Finteractive-map/plugins/beta/map-styles/dist/css/index.css" rel="stylesheet" type="text/css">
<link href="/plugin-assets/%40defra%2Finteractive-map/plugins/map-styles/dist/css/index.css" rel="stylesheet" type="text/css">
{% endblock %}

{% block bodyStart %}
Expand Down Expand Up @@ -39,7 +39,7 @@
<!-- Defra library scripts -->
<script src="/plugin-assets/%40defra%2Finteractive-map/dist/umd/index.js"></script>
<script src="/plugin-assets/%40defra%2Finteractive-map/providers/maplibre/dist/umd/index.js"></script>
<script src="/plugin-assets/%40defra%2Finteractive-map/plugins/beta/map-styles/dist/umd/index.js"></script>
<script src="/plugin-assets/%40defra%2Finteractive-map/plugins/map-styles/dist/umd/index.js"></script>

<script>
const attribution = 'OpenFreeMap © OpenMapTiles Data from OpenStreetMap'
Expand Down
2 changes: 1 addition & 1 deletion demo/DemoMapStyleSwitcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function MapInner () {
Promise.all([
import('../src/index.js'),
import('../providers/maplibre/src/index.js'),
import('../plugins/beta/map-styles/src/index.js')
import('../plugins/map-styles/src/index.js')
]).then(([
{ default: InteractiveMap },
{ default: maplibreProvider },
Expand Down
8 changes: 4 additions & 4 deletions demo/js/draw-ol.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// InteractiveMap with OpenLayers provider and draw-ol plugin
// InteractiveMap with OpenLayers provider and draw plugin
import InteractiveMap from '../../src/index.js'
import { vtsMapStyles27700, ngdMapStyles27700, apgbAerialStyle } from './mapStyles.js'
import { transformGeocodeRequest, transformVtsRequest27700 } from './auth.js'
// Providers
import openLayersProvider from '/providers/beta/openlayers/src/index.js'
import openNamesProvider from '/providers/beta/open-names/src/index.js'
import openLayersProvider from '/providers/openlayers/src/index.js'
import openNamesProvider from '/providers/open-names/src/index.js'
// Plugins
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import mapStylesPlugin from '/plugins/map-styles/src/index.js'
import createDrawPlugin from '/plugins/draw/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
import createInteractPlugin from '/plugins/interact/src/index.js'
Expand Down
6 changes: 3 additions & 3 deletions demo/js/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
import { transformGeocodeRequest, transformVtsRequest3857, transformDataRequest } from './auth.js'
// Providers
import maplibreProvider from '/providers/maplibre/src/index.js'
import openNamesProvider from '/providers/beta/open-names/src/index.js'
import openNamesProvider from '/providers/open-names/src/index.js'
// Plugins
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import mapStylesPlugin from '/plugins/map-styles/src/index.js'
import createDatasetsPlugin from '/plugins/datasets/src/index.js'
import createMapKeyPlugin from '/plugins/map-key/src/index.js'
import createDrawPlugin from '/plugins/draw/src/index.js'
import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
import createInteractPlugin from '/plugins/interact/src/index.js'

Expand Down
8 changes: 4 additions & 4 deletions demo/js/esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
import { transformGeocodeRequest, transformVtsRequest3857, transformDataRequest } from './auth.js'
// Providers
import maplibreProvider from '/providers/maplibre/dist/esm/index.js'
import openNamesProvider from '/providers/beta/open-names/dist/esm/index.js'
import openNamesProvider from '/providers/open-names/dist/esm/index.js'
// Plugins
import mapStylesPlugin from '/plugins/beta/map-styles/dist/esm/index.js'
import mapStylesPlugin from '/plugins/map-styles/dist/esm/index.js'
import createDatasetsPlugin from '/plugins/datasets/dist/esm/index.js'
import createMapKeyPlugin from '/plugins/map-key/dist/esm/index.js'
import createDrawPlugin from '/plugins/draw/dist/esm/index.js'
import scaleBarPlugin from '/plugins/beta/scale-bar/dist/esm/index.js'
import scaleBarPlugin from '/plugins/scale-bar/dist/esm/index.js'
import searchPlugin from '/plugins/search/dist/esm/index.js'
import createInteractPlugin from '/plugins/interact/dist/esm/index.js'
import createFramePlugin from '/plugins/beta/frame/dist/esm/index.js'
import createFramePlugin from '/plugins/frame/dist/esm/index.js'

const pointData = {
type: 'FeatureCollection',
Expand Down
6 changes: 3 additions & 3 deletions demo/js/esri-datasets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import InteractiveMap from '../../src/index.js'
import esriProvider from '/providers/beta/esri/src/index.js'
import esriProvider from '/providers/esri/src/index.js'
// Plugins
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import mapStylesPlugin from '/plugins/map-styles/src/index.js'
import createDatasetsPlugin from '/plugins/datasets/src/index.js'
import createMapKeyPlugin from '/plugins/map-key/src/index.js'
import createMenuPlugin from '/plugins/menu/src/index.js'
// Setup
import { vtsMapStyles27700 } from './mapStyles.js'
import { drawPlugin, framePlugin, attachDrawPlugin } from './planning/drawPlugin.js'
import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
import { transformGeocodeRequest, transformVtsRequest3857, setupEsriConfig } from './auth.js'
import createInteractPlugin from '/plugins/interact/src/index.js'
Expand Down
12 changes: 6 additions & 6 deletions demo/js/farming.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
import { transformGeocodeRequest, transformVtsRequest3857, transformDataRequest } from './auth.js'
// Providers
import maplibreProvider from '/providers/maplibre/src/index.js'
import openNamesProvider from '/providers/beta/open-names/src/index.js'
import openNamesProvider from '/providers/open-names/src/index.js'
// Plugins
import useLocationPlugin from '/plugins/beta/use-location/src/index.js'
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import useLocationPlugin from '/plugins/use-location/src/index.js'
import mapStylesPlugin from '/plugins/map-styles/src/index.js'
import createDatasetsPlugin from '/plugins/datasets/src/index.js'
import createMapKeyPlugin from '/plugins/map-key/src/index.js'
import createDrawPlugin from '/plugins/beta/draw-ml/src/index.js'
import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
import createDrawPlugin from '/plugins/draw/src/index.js'
import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
import createInteractPlugin from '/plugins/interact/src/index.js'
import createFramePlugin from '/plugins/beta/frame/src/index.js'
import createFramePlugin from '/plugins/frame/src/index.js'

var feature = { id: 'test1234', type: 'Feature', geometry: { coordinates: [[[-2.9406643378873127,54.918060570259456],[-2.9092219779267054,54.91564249172612],[-2.904350626383433,54.90329530000005],[-2.909664828067463,54.89540129642464],[-2.9225074821353587,54.88979816151294],[-2.937121536764323,54.88826989853317],[-2.95682836800691,54.88916139231736],[-2.965463945742613,54.898966521920045],[-2.966349646023133,54.910805898763385],[-2.9406643378873127,54.918060570259456]]], type: 'Polygon' }}

Expand Down
8 changes: 4 additions & 4 deletions demo/js/gep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { vtsMapStyles27700, apgbAerialStyle } from './mapStyles.js'
import { transformGeocodeRequest, transformVtsRequest27700 } from './auth.js'
import '/plugins/datasets/src/datasets.scss' // in a separate repo: import '@defra/interactive-map/plugins/datasets/css'
// Providers
import openLayersProvider from '/providers/beta/openlayers/src/index.js'
import openNamesProvider from '/providers/beta/open-names/src/index.js'
import openLayersProvider from '/providers/openlayers/src/index.js'
import openNamesProvider from '/providers/open-names/src/index.js'
// Plugins
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
import mapStylesPlugin from '/plugins/map-styles/src/index.js'
import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
import createInteractPlugin from '/plugins/interact/src/index.js'
// GEP demo utils
Expand Down
6 changes: 3 additions & 3 deletions demo/js/index-ol.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import InteractiveMap from '../../src/index.js'
import { vtsMapStyles27700 } from './mapStyles.js'
import { transformGeocodeRequest, transformVtsRequest27700 } from './auth.js'
// Providers
import openLayersProvider from '/providers/beta/openlayers/src/index.js'
import openNamesProvider from '/providers/beta/open-names/src/index.js'
import openLayersProvider from '/providers/openlayers/src/index.js'
import openNamesProvider from '/providers/open-names/src/index.js'
// Plugins
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import mapStylesPlugin from '/plugins/map-styles/src/index.js'
import createDatasetsPlugin from '/plugins/datasets/src/index.js'
import createMapKeyPlugin from '/plugins/map-key/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
Expand Down
18 changes: 8 additions & 10 deletions demo/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
// CSS
// import '../../dist/css/index.css'
// import '/plugins/beta/map-styles/dist/css/index.css'
// import '/plugins/map-styles/dist/css/index.css'
// import '/plugins/datasets/dist/css/index.css'
// import '/plugins/beta/draw-ml/dist/css/index.css'
// import '/plugins/beta/scale-bar/dist/css/index.css'
// import '/plugins/scale-bar/dist/css/index.css'
// import '/plugins/search/dist/css/index.css'
// import '/plugins/interact/dist/css/index.css'
// import '/plugins/beta/frame/dist/css/index.css'
// import '/plugins/frame/dist/css/index.css'
// InteractiveMap
import InteractiveMap from '../../src/index.js'
import { openMapStyles, vtsMapStyles3857 } from './mapStyles.js'
import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
import { transformGeocodeRequest, transformVtsRequest3857, transformDataRequest } from './auth.js'
// Providers
import maplibreProvider from '/providers/maplibre/src/index.js'
import openNamesProvider from '/providers/beta/open-names/src/index.js'
import openNamesProvider from '/providers/open-names/src/index.js'
// Plugins
import useLocationPlugin from '/plugins/beta/use-location/src/index.js'
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import useLocationPlugin from '/plugins/use-location/src/index.js'
import mapStylesPlugin from '/plugins/map-styles/src/index.js'
import createDatasetsPlugin from '/plugins/datasets/src/index.js'
import createMapKeyPlugin from '/plugins/map-key/src/index.js'
// import createDrawPlugin from '/plugins/beta/draw-ml/src/index.js'
import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
import createInteractPlugin from '/plugins/interact/src/index.js'
import createFramePlugin from '/plugins/beta/frame/src/index.js'
import createFramePlugin from '/plugins/frame/src/index.js'
import { shieldSymbolSvg } from './customSymbols.js'

const POINT_DATA = {
Expand Down
2 changes: 1 addition & 1 deletion demo/js/mapStyles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const BW_LABEL = 'Black/White'

// Real OS National Grid coverage extent [minX, minY, maxX, maxY], EPSG:27700 — captured from
// OS's own VTS capabilities response (matches the TILE_GRID_ORIGIN corner already baked into
// providers/beta/openlayers/src/defaults.js). Used to stop the raster styles below requesting
// providers/openlayers/src/defaults.js). Used to stop the raster styles below requesting
// tiles for areas OS has no coverage for.
const OS_NATIONAL_GRID_EXTENT_27700 = [-238375, 0, 700000, 1300000]

Expand Down
8 changes: 4 additions & 4 deletions demo/js/ml-datasets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
import { transformGeocodeRequest, transformVtsRequest3857, transformDataRequest } from './auth.js'
// Providers
import maplibreProvider from '/providers/maplibre/src/index.js'
import openNamesProvider from '/providers/beta/open-names/src/index.js'
import openNamesProvider from '/providers/open-names/src/index.js'
// Plugins
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import mapStylesPlugin from '/plugins/map-styles/src/index.js'
import createDatasetsPlugin from '/plugins/datasets/src/index.js'
import createMapKeyPlugin from '/plugins/map-key/src/index.js'
import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
import createInteractPlugin from '/plugins/interact/src/index.js'
import createFramePlugin from '/plugins/beta/frame/src/index.js'
import createFramePlugin from '/plugins/frame/src/index.js'

const pointData = {
type: 'FeatureCollection',
Expand Down
10 changes: 5 additions & 5 deletions demo/js/planning-ol.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import InteractiveMap from '../../src/index.js'
// Providers
import openNamesProvider from '/providers/beta/open-names/src/index.js'
import openLayersProvider from '/providers/beta/openlayers/src/index.js'
import openNamesProvider from '/providers/open-names/src/index.js'
import openLayersProvider from '/providers/openlayers/src/index.js'
// Plugins
import useLocationPlugin from '/plugins/beta/use-location/src/index.js'
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
import useLocationPlugin from '/plugins/use-location/src/index.js'
import mapStylesPlugin from '/plugins/map-styles/src/index.js'
import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
import createInteractPlugin from '/plugins/interact/src/index.js'
// Demo utils
Expand Down
20 changes: 10 additions & 10 deletions demo/js/planning.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// CSS
// import '../../dist/css/index.css'
// import '/plugins/beta/map-styles/dist/css/index.css'
// import '/plugins/beta/scale-bar/dist/css/index.css'
// import '/plugins/map-styles/dist/css/index.css'
// import '/plugins/scale-bar/dist/css/index.css'
// import '/plugins/search/dist/css/index.css'
// import '/plugins/interact/dist/css/index.css'
// import '/plugins/beta/frame/dist/css/index.css'
// import '/plugins/frame/dist/css/index.css'
// InteractiveMap
import InteractiveMap from '../../src/index.js'
// Providers
import openNamesProvider from '/providers/beta/open-names/src/index.js'
import esriProvider from '/providers/beta/esri/src/index.js'
import openNamesProvider from '/providers/open-names/src/index.js'
import esriProvider from '/providers/esri/src/index.js'
// Plugins
import useLocationPlugin from '/plugins/beta/use-location/src/index.js'
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import createDrawPlugin from '/plugins/beta/draw-es/src/index.js'
import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
import useLocationPlugin from '/plugins/use-location/src/index.js'
import mapStylesPlugin from '/plugins/map-styles/src/index.js'
import createDrawPlugin from '/plugins/draw-es/src/index.js'
import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
import createInteractPlugin from '/plugins/interact/src/index.js'
import createFramePlugin from '/plugins/beta/frame/src/index.js'
import createFramePlugin from '/plugins/frame/src/index.js'
// Demo utils
import { vtsMapStyles27700 } from './mapStyles.js'
import { gridRefSearchOSGB36 } from './searchCustomDatasets.js'
Expand Down
4 changes: 2 additions & 2 deletions demo/js/planning/drawPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import createDrawPlugin from '/plugins/beta/draw-es/src/index.js';
import createFramePlugin from '/plugins/beta/frame/src/index.js'
import createDrawPlugin from '/plugins/draw-es/src/index.js';
import createFramePlugin from '/plugins/frame/src/index.js'
import { SiteBoundary, siteBoundary } from './siteBoundary.js'
import { terms } from './terms.js'

Expand Down
8 changes: 4 additions & 4 deletions docs/architecture/interactive-map.likec4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ model {
}

// Available Plugins (optional, consumer chooses which to include)
drawMl = plugin 'Draw Plugin (MapLibre)' {
draw = plugin 'Draw Plugin' {
description 'Polygon, line, point drawing tools'
technology '@defra/im-draw-ml-plugin'
technology '@defra/im-draw-plugin'
}

drawEs = plugin 'Draw Plugin (Esri)' {
Expand Down Expand Up @@ -157,7 +157,7 @@ model {
interactiveMap.entryPoint -> esri 'dynamically loads'

// Plugins loaded by plugin system
interactiveMap.pluginSystem -> drawMl 'loads'
interactiveMap.pluginSystem -> draw 'loads'
interactiveMap.pluginSystem -> drawEs 'loads'
interactiveMap.pluginSystem -> datasets 'loads'
interactiveMap.pluginSystem -> search 'loads'
Expand Down Expand Up @@ -202,7 +202,7 @@ views {
description 'Optional plugins that can be included by consumers'

include interactiveMap.pluginSystem
include drawMl
include draw
include drawEs
include datasets
include search
Expand Down
13 changes: 6 additions & 7 deletions govuk-prototype-kit.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,14 @@
"/plugins/interact/dist",
"/plugins/search/dist",
"/plugins/draw/dist",
"/providers/beta/open-names/dist",
"/providers/beta/openlayers/dist",
"/providers/open-names/dist",
"/providers/openlayers/dist",
"/plugins/datasets/dist",
"/plugins/map-key/dist",
"/plugins/menu/dist",
"/plugins/beta/map-styles/dist",
"/plugins/beta/scale-bar/dist",
"/plugins/beta/use-location/dist",
"/plugins/beta/draw-ml/dist",
"/plugins/beta/frame/dist"
"/plugins/map-styles/dist",
"/plugins/scale-bar/dist",
"/plugins/use-location/dist",
"/plugins/frame/dist"
]
}
16 changes: 8 additions & 8 deletions jest.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ export default {
'<rootDir>/demo',
'<rootDir>/src/test-utils.js',
'__helpers__',
'<rootDir>/providers/beta/',
'<rootDir>/plugins/beta/draw-es',
'<rootDir>/plugins/beta/draw-ml',
'<rootDir>/plugins/beta/draw-ol',
'<rootDir>/plugins/beta/frame',
'<rootDir>/plugins/beta/map-styles',
'<rootDir>/plugins/beta/scale-bar',
'<rootDir>/plugins/beta/use-location',
'<rootDir>/providers/esri',
'<rootDir>/providers/open-names',
'<rootDir>/providers/openlayers',
'<rootDir>/plugins/draw-es',
'<rootDir>/plugins/frame',
'<rootDir>/plugins/map-styles',
'<rootDir>/plugins/scale-bar',
'<rootDir>/plugins/use-location',
'<rootDir>/.docusaurus',
'<rootDir>/build/assets/js',
'/dist/'
Expand Down
Loading
Loading