Skip to content

IM-411 fixed key issues and shows all SW layers in esri demo #413

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
markfee merged 54 commits into from
Jul 17, 2026
Merged

IM-411 fixed key issues and shows all SW layers in esri demo #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
688b4e2
IM-360 added isBaseMapReady to providers - OL is a TODO
markfee Jun 12, 2026
28a2415
IM-360 Added a stub implementation of EsriLayerAdapter
markfee Jun 12, 2026
541c973
IM-360 added an esri-datasets demo
markfee Jun 15, 2026
6271a7f
IM-360 Very basic flood zone layer rendering
markfee Jun 15, 2026
792f4ef
IM-360 added flood-zones-cc
markfee Jun 15, 2026
e2b7f9d
IM-360 wip - setting esri styles at runTime
markfee Jun 16, 2026
301ba8d
IM-360 adding vtls with some styling
markfee Jun 17, 2026
b52d56c
IM-360 refactored to use an esriDataset adapter
markfee Jun 17, 2026
cf865cf
IM-360 map style change working
markfee Jun 17, 2026
391b528
IM-360 replaced styleLayerId with esriStyleLayerId
markfee Jun 17, 2026
04dcc5f
IM-360 implemented global visibility
markfee Jun 17, 2026
51405c1
IM-360 opacity working for esriDatasets
markfee Jun 18, 2026
508b1e8
IM-360 added comment to visibleWhen, removed unused ...args
markfee Jun 18, 2026
9045325
IM-360 corrected unit test after menu change
markfee Jun 19, 2026
114b541
IM-373 added a temp assertion of mapStyle
markfee Jun 19, 2026
fb002ea
IM-373 WIP towards moving the mapStyle dependency out of the layerAda…
markfee Jun 19, 2026
0447ae2
IM-373 removed maplibreLayerAdapter's mapStyle dependency
markfee Jun 25, 2026
1270c58
IM-373 initialiseDatasets.test.js updated to reflect new mapStyle method
markfee Jun 26, 2026
3445851
IM-373 fixed maplibreLayerAdapter.test.js
markfee Jun 26, 2026
3a947b4
IM-373 maplibreLayerAdapter fully covered
markfee Jun 26, 2026
cd75575
IM-373 mapLibreDataset fully covered
markfee Jun 26, 2026
477cd52
IM-373 covered layerBuilders
markfee Jun 26, 2026
3ddf0ba
IM-373 covered esriDataset
markfee Jun 26, 2026
c1ff718
IM-373 removed some mocks in esriDataset.test.js
markfee Jun 26, 2026
97b5b03
IM-373 esriLayerAdapter method signatures match mapLibres
markfee Jul 8, 2026
b908371
IM-373 fixed a couple of tests
markfee Jul 8, 2026
5f75092
IM-373 removed MapLibreDataset from maplibreLayerAdapter.test.js
markfee Jul 8, 2026
11dc03a
IM-373 removed commented tests
markfee Jul 8, 2026
acd0f4c
IM-394 added a remove dataset api
markfee Jul 9, 2026
c65f3b8
IM-394 added tests to cover removeDataset
markfee Jul 9, 2026
19d480a
IM-394 removed un-needed params in esriLayerAdapter.test.js
markfee Jul 9, 2026
cbfd63e
IM-394 covered missing line in esriLayerAdapter
markfee Jul 9, 2026
2029c6c
IM-394 added an addDataset method
markfee Jul 9, 2026
f87db00
IM-394 added tests for addDataset
markfee Jul 9, 2026
7c9cc0d
IM-394 added __mocks__ for logger
markfee Jul 9, 2026
45854a5
IM-360-reviewed added tests for new providers code
markfee Jul 14, 2026
a1139df
IM-372 Added Layers Menu for user configured radios (#398)
markfee Jul 14, 2026
15ac98d
IM-401 moved plugins out of /beta
markfee Jul 14, 2026
6cd4409
IM-401 ammended paths to and from plugins/datasets
markfee Jul 14, 2026
8de1161
IM-401 addressed some Sonar Issues
markfee Jul 14, 2026
dda7db2
IM-401 more sonar fixes
markfee Jul 14, 2026
8e2ec3e
IM-399 fixed umd build issue with isVisibleWhen setMenuState
markfee Jul 14, 2026
f83badf
IM-399 featureLayers working - but no styles
markfee Jul 14, 2026
c32915d
IM-399 featureLayers styles working
markfee Jul 14, 2026
a9a0248
IM-399 ignore __data__ for coverage
markfee Jul 17, 2026
a334730
IM-399 Sonar issue handled
markfee Jul 17, 2026
2033b59
IM-411 key visibility fix for menu based implementation
markfee Jul 17, 2026
11d7318
IM-411 fixed surface water layers (wrong way round)
markfee Jul 17, 2026
5bd912c
IM-411 added a SW key only dataset
markfee Jul 17, 2026
72bc2bc
IM-411 removed need for showInMenu when menu is passed in config
markfee Jul 17, 2026
c45a7fb
IM-411 added surfaceWaterDatasetGenerator to demo
markfee Jul 17, 2026
0fac68c
IM-411 shows All Surface Water Layers
markfee Jul 17, 2026
0382a83
IM-411 esri demo has manifest to fix label to left
markfee Jul 17, 2026
6a2ce9a
Merge remote-tracking branch 'origin/main' into IM-411
markfee Jul 17, 2026
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/add-polygons.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/datasets/dist/css/index.css" rel="stylesheet" type="text/css">
<link href="/plugin-assets/%40defra%2Finteractive-map/plugins/datasets/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/datasets/dist/umd/index.js"></script>
<script src="/plugin-assets/%40defra%2Finteractive-map/plugins/datasets/dist/umd/index.js"></script>

<script>
// GeoJSON can also be loaded from a URL; use the tiles property for vector tile sources
Expand Down
4 changes: 2 additions & 2 deletions assets/templates/add-symbols.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/datasets/dist/css/index.css" rel="stylesheet" type="text/css">
<link href="/plugin-assets/%40defra%2Finteractive-map/plugins/datasets/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/datasets/dist/umd/index.js"></script>
<script src="/plugin-assets/%40defra%2Finteractive-map/plugins/datasets/dist/umd/index.js"></script>

<script>
const symbolGraphic = 'M3 15H1V1h2v2h2V1h2v5h2V4h2v2h2V4h2v11H6V9H3v6z'
Expand Down
2 changes: 1 addition & 1 deletion demo/DemoMapPolygons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function MapInner () {
Promise.all([
import('../src/index.js'),
import('../providers/maplibre/src/index.js'),
import('../plugins/beta/datasets/src/index.js')
import('../plugins/datasets/src/index.js')
]).then(([
{ default: InteractiveMap },
{ default: maplibreProvider },
Expand Down
2 changes: 1 addition & 1 deletion demo/DemoMapSymbols.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function MapInner () {
Promise.all([
import('../src/index.js'),
import('../providers/maplibre/src/index.js'),
import('../plugins/beta/datasets/src/index.js')
import('../plugins/datasets/src/index.js')
]).then(([
{ default: InteractiveMap },
{ default: maplibreProvider },
Expand Down
15 changes: 15 additions & 0 deletions demo/esri-datasets.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>React TypeScript Webpack App</title>
<link href="/assets/govuk-frontend.min.css" rel="stylesheet" media="all">
<link href="./index.css" rel="stylesheet" media="all">
</head>
<body style="padding: 20px">
<script>document.body.classList.add('im-is-loading')</script>
<div id="map"></div>
<script src="./esri-datasets.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion demo/js/draw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import maplibreProvider from '/providers/maplibre/src/index.js'
import openNamesProvider from '/providers/beta/open-names/src/index.js'
// Plugins
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import createDatasetsPlugin from '/plugins/beta/datasets/src/index.js'
import createDatasetsPlugin from '/plugins/datasets/src/index.js'
import createDrawPlugin from '/plugins/beta/draw-ml/src/index.js'
import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
Expand Down
2 changes: 1 addition & 1 deletion demo/js/esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import maplibreProvider from '/providers/maplibre/src/index.js'
import openNamesProvider from '/providers/beta/open-names/src/index.js'
// Plugins
import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
import createDatasetsPlugin from '/plugins/beta/datasets/dist/esm/index.js'
import createDatasetsPlugin from '/plugins/datasets/dist/esm/index.js'
import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
import searchPlugin from '/plugins/search/src/index.js'
import createInteractPlugin from '/plugins/interact/src/index.js'
Expand Down
Loading
Loading