Skip to content

Commit faae7b2

Browse files
committed
Make mapml a dependency, not a devDependency, since it must be present
at runtime / installed with product Revert <layer-> to <map-layer> refactoring, because that code has not been released yet
1 parent 0798b48 commit faae7b2

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

packages/web/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
"@storybook/addon-a11y": "^8.0.9",
3939
"@storybook/addons": "^7.6.17",
4040
"@storybook/test": "^8.0.9",
41-
"@storybook/theming": "^8.0.9"
41+
"@storybook/theming": "^8.0.9",
42+
"@maps4html/mapml": "^0.14.1"
4243
},
4344
"devDependencies": {
4445
"@axe-core/puppeteer": "^4.7.3",
@@ -47,7 +48,6 @@
4748
"@babel/preset-typescript": "^7.21.0",
4849
"@cdssnc/gcds-tokens": "^1.20.2",
4950
"@fortawesome/fontawesome-free": "^6.3.0",
50-
"@maps4html/mapml": "^0.14.1",
5151
"@stencil/angular-output-target": "file:../../utils/angular-output-target",
5252
"@stencil/postcss": "^2.1.0",
5353
"@stencil/sass": "^3.0.0-0",

packages/web/src/components/gcds-map/gcds-map.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class GcdsMap {
2727
// Reference the <mapml-viewer> element
2828
this.mapViewer = this.el.shadowRoot.querySelector('mapml-viewer') as HTMLMapmlViewerElement;
2929

30-
// Handle <map-layer> readiness once the map is rendered
30+
// Handle <layer-> readiness once the map is rendered
3131
this.handleLayerReady();
3232
}
3333

@@ -67,13 +67,13 @@ export class GcdsMap {
6767
}
6868

6969
handleLayerReady() {
70-
// Wait for the 'map-layer' custom element to be defined
71-
customElements.whenDefined('map-layer').then(() => {
72-
// Find all <map-layer> elements inside the mapml-viewer
73-
const layers = Array.from(this.el.shadowRoot.querySelectorAll('map-layer'));
70+
// Wait for the 'layer-' custom element to be defined
71+
customElements.whenDefined('layer-').then(() => {
72+
// Find all <layer-> elements inside the mapml-viewer
73+
const layers = Array.from(this.el.shadowRoot.querySelectorAll('layer-'));
7474

7575
layers.forEach((layer) => {
76-
// Now we know the <map-layer> element is fully defined, call whenReady()
76+
// Now we know the <layer-> element is fully defined, call whenReady()
7777
(layer as any).whenReady().then(() => {
7878
// Check for <map-extent> in the layer's shadow DOM and add 'checked' attribute
7979
// this is necessary only for geogratis MapML resources, but harmless
@@ -106,13 +106,13 @@ export class GcdsMap {
106106
controlslist={this.controlslist ? this.controlslist : undefined}
107107
>
108108
{layers.map((layer) => (
109-
<map-layer
109+
<layer-
110110
label={layer.getAttribute('label')}
111111
src={layer.getAttribute('src')}
112112
hidden={layer.getAttribute('hidden') === 'true' ? 'hidden' : undefined}
113113
checked={layer.getAttribute('checked') === 'true' ? 'checked' : undefined}
114114
opacity={layer.getAttribute('opacity')}
115-
></map-layer>
115+
></layer->
116116
))}
117117
</mapml-viewer>
118118
<script type="module" src="./dist/gcds/gcds-map/mapml.js"></script>

0 commit comments

Comments
 (0)