forked from Maps4HTML/MapML.js
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow changing layer title in layer control via HTMLLayerElement.label
under limited conditions (no <map-title> in content). Encapsulate accessible name change into MapMLLayer.setName() method Remove unused, unspecified labelchanged event Add test fixture Add <map-meta name="projection"...> so as to not rely on default projection value just yet, wait until that lands. Add that the extentload event emitted by the HTMLLayerElement bubbles, which I believe is normal. Use this event to ensure that tests can rely on the layer metadata being final before testing name change ability. Add MapMLLayer.getName method to complement new setName. Name being the 'accessible name' of the layer, represented in the layer control via the MapMLLayer._title value. Add setTimeout to work around the evil createmap event -caused issues Add test of HTMLLayerElement.label behaviour
- Loading branch information
1 parent
7b0858f
commit 2677ab5
Showing
6 changed files
with
216 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <title>domApi-HTMLLayerElement.html</title> | ||
| <meta charset="UTF-8"> | ||
| <script type="module" src="mapml-viewer.js"></script> | ||
| </head> | ||
| <body> | ||
| <template> | ||
| <layer- id="remote-with-title" label="This should not appear in layer control" src="with-title.mapml" checked></layer-> | ||
| <layer- id="remote-no-title" label="Layer with name settable via HTMLLayerElement.label" src="no-title.mapml" checked></layer-> | ||
| <layer- id="local-no-title" label="Another Layer with name settable via HTMLLayerElement.label" checked> | ||
| <map-meta name="projection" content="OSMTILE"></map-meta> | ||
| <map-feature id="hg" zoom="3" min="0" max="22"> | ||
| <map-featurecaption>Statue of a guy with a hat</map-featurecaption> | ||
| <map-geometry cs="gcrs"> | ||
| <map-point> | ||
| <map-coordinates>-75.70628 45.39878</map-coordinates> | ||
| </map-point> | ||
| </map-geometry> | ||
| <map-properties> | ||
| <h1>A Man With Two Hats</h1> | ||
| </map-properties> | ||
| </map-feature> | ||
| </layer-> | ||
| <layer- id="local-with-title" label="This should not appear in layer control" checked> | ||
| <map-title>Layer name set via local map-title element - unsettable via HTMLLayerelement.label</map-title> | ||
| <map-meta name="projection" content="OSMTILE"></map-meta> | ||
| <map-feature id="hg" zoom="3" min="0" max="22"> | ||
| <map-featurecaption>Statue of a guy with a hat</map-featurecaption> | ||
| <map-geometry cs="gcrs"> | ||
| <map-point> | ||
| <map-coordinates>-75.70528 45.39778</map-coordinates> | ||
| </map-point> | ||
| </map-geometry> | ||
| <map-properties> | ||
| <h1>A Man With Two Hats</h1> | ||
| </map-properties> | ||
| </map-feature> | ||
| </layer-> | ||
| </template> | ||
| <mapml-viewer projection="OSMTILE" controls zoom="15" lat="45.39778" lon="-75.70528" width="500" height="500"> | ||
| </mapml-viewer> | ||
| </body> | ||
| <script> | ||
|
|
||
| let remoteWithTitle = document.querySelector('template').content.cloneNode(true).querySelector('#remote-with-title'); | ||
| remoteWithTitle = document.querySelector('mapml-viewer').appendChild(remoteWithTitle); | ||
| let remoteNoTitle = document.querySelector('template').content.cloneNode(true).querySelector('#remote-no-title'); | ||
| remoteNoTitle = document.querySelector('mapml-viewer').appendChild(remoteNoTitle); | ||
| let localNoTitle = document.querySelector('template').content.cloneNode(true).querySelector('#local-no-title'); | ||
| localNoTitle = document.querySelector('mapml-viewer').appendChild(localNoTitle); | ||
| let localWithTitle = document.querySelector('template').content.cloneNode(true).querySelector('#local-with-title'); | ||
| localWithTitle = document.querySelector('mapml-viewer').appendChild(localWithTitle); | ||
|
|
||
|
|
||
| addEventListener("extentload", (e) => { | ||
| if (e.target === remoteWithTitle) { | ||
| // setting label should not change the layer name in layer control | ||
| remoteWithTitle.label = "Unforsettable in every way"; | ||
| } else if (e.target === remoteNoTitle) { | ||
| // setting label should set the layer name in layer control | ||
| remoteNoTitle.label = "Bedtime For Bonzo"; | ||
| } else if (e.target === localWithTitle) { | ||
| // setting label should not set the layer name in layer control | ||
| localWithTitle.label = "No dice, buddy!"; | ||
| } else if (e.target === localNoTitle) { | ||
| // setting label should set the layer name in layer control | ||
| // but because the layer is not fully initialized, need to wait unit | ||
| // it triggers the createmap event, which eventually creates layer-._layer | ||
| // but if we run this too early, before createmap, then the setter | ||
| // for label does not have any (desired) side effects, namely running | ||
| // layer-._layer.setName(labelValue). hence setTimeout. | ||
| setTimeout(()=>{ | ||
| localNoTitle.label = "Go ahead, make my day!"; | ||
| }, 500); | ||
| } | ||
| }); | ||
|
|
||
| </script> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| import { test, expect, chromium } from '@playwright/test'; | ||
|
|
||
| test.describe('HTMLLayerElement DOM API Tests', () => { | ||
| let page; | ||
| let context; | ||
| test.beforeAll(async () => { | ||
| context = await chromium.launchPersistentContext(''); | ||
| page = | ||
| context.pages().find((page) => page.url() === 'about:blank') || | ||
| (await context.newPage()); | ||
| page = await context.newPage(); | ||
| await page.goto('domApi-HTMLLayerElement.html'); | ||
| }); | ||
|
|
||
| test.afterAll(async function () { | ||
| await context.close(); | ||
| }); | ||
| test('Setting HTMLLayerElement.label sets the layer name per spec', async () => { | ||
| let remoteWithTitleLabel = await page.evaluate(() => { | ||
| return document.querySelector('#remote-with-title').label; | ||
| }); | ||
| expect(remoteWithTitleLabel).toEqual('Unforsettable in every way'); | ||
| let remoteWithTitleName = await page.evaluate(() => { | ||
| let layer = document.querySelector('#remote-with-title'); | ||
| return layer._layer.getName(); | ||
| }); | ||
| expect(remoteWithTitleName).toEqual( | ||
| 'MapML author-controlled name - unsettable' | ||
| ); | ||
|
|
||
| let remoteNoTitleLabel = await page.evaluate(() => { | ||
| return document.querySelector('#remote-no-title').label; | ||
| }); | ||
| expect(remoteNoTitleLabel).toEqual('Bedtime For Bonzo'); | ||
| let remoteNoTitleName = await page.evaluate(() => { | ||
| let layer = document.querySelector('#remote-no-title'); | ||
| return layer._layer.getName(); | ||
| }); | ||
| expect(remoteNoTitleName).toEqual(remoteNoTitleLabel); | ||
|
|
||
| let localWithTitleLabel = await page.evaluate(() => { | ||
| return document.querySelector('#local-with-title').label; | ||
| }); | ||
| expect(localWithTitleLabel).toEqual('No dice, buddy!'); | ||
| let localWithTitleName = await page.evaluate(() => { | ||
| let layer = document.querySelector('#local-with-title'); | ||
| return layer._layer.getName(); | ||
| }); | ||
| expect(localWithTitleName).not.toEqual(localWithTitleLabel); | ||
|
|
||
| // THIS SHOULD NOT BE NECESSARY, BUT IT IS see comment below | ||
| await page.waitForTimeout(500); | ||
| let localNoTitleLabel = await page.evaluate(() => { | ||
| return document.querySelector('#local-no-title').label; | ||
| }); | ||
| expect(localNoTitleLabel).toEqual('Go ahead, make my day!'); | ||
| let localNoTitleName = await page.evaluate(() => { | ||
| let layer = document.querySelector('#local-no-title'); | ||
| return layer._layer.getName(); | ||
| }); | ||
| // this isn't working, because waiting for the createmap event means | ||
| // that the layer-._layer doesn't exist, so attributeChangeCallback on label | ||
| // shortcircuits (does / can not setName on _layer) unless you wait for it. | ||
| // need to ditch the createmap event!! | ||
| expect(localNoTitleName).toEqual(localNoTitleLabel); | ||
| }); | ||
| // add other tests here for HTMLLayerElement | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <mapml- xmlns="http://www.w3.org/1999/xhtml"> | ||
| <map-head> | ||
| <!-- no map-title provided means the HTML <layer- src> that references | ||
| this file may set its name via the HTMLLayerElement.label setter --> | ||
| <map-meta charset="utf-8" ></map-meta> | ||
| <map-meta content="text/mapml" http-equiv="Content-Type" ></map-meta> | ||
| <map-link rel="license" href="http://opendatacommons.org/licenses/odbl/1-0/" title="© OpenStreetMap and contributors" /> | ||
| <map-meta name="projection" content="OSMTILE"></map-meta> | ||
| <map-meta name="zoom" content="min=0,max=22,value=3" ></map-meta> | ||
| <map-meta name="cs" content="gcrs" ></map-meta> | ||
| <map-meta name="extent" content="top-left-easting=-8433179, top-left-northing=5689316, bottom-right-easting=-8420968, bottom-right-northing=5683139"></map-meta> | ||
| </map-head> | ||
| <map-body> | ||
| <map-feature id="hg" zoom="3" min="0" max="22"> | ||
| <map-featurecaption>Statue of a guy with a hat</map-featurecaption> | ||
| <map-geometry cs="gcrs"> | ||
| <map-point> | ||
| <map-coordinates>-75.70528 45.39878</map-coordinates> | ||
| </map-point> | ||
| </map-geometry> | ||
| <map-properties> | ||
| <h1>A Man With Two Hats</h1> | ||
| </map-properties> | ||
| </map-feature> | ||
| </map-body> | ||
| </mapml-> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <mapml- xmlns="http://www.w3.org/1999/xhtml"> | ||
| <map-head> | ||
| <map-title>MapML author-controlled name - unsettable</map-title> | ||
| <map-meta charset="utf-8" ></map-meta> | ||
| <map-meta content="text/mapml" http-equiv="Content-Type" ></map-meta> | ||
| <map-link rel="license" href="http://opendatacommons.org/licenses/odbl/1-0/" title="© OpenStreetMap and contributors" /> | ||
| <map-meta name="projection" content="OSMTILE"></map-meta> | ||
| <map-meta name="zoom" content="min=0,max=22,value=3" ></map-meta> | ||
| <map-meta name="cs" content="gcrs" ></map-meta> | ||
| <map-meta name="extent" content="top-left-easting=-8433179, top-left-northing=5689316, bottom-right-easting=-8420968, bottom-right-northing=5683139"></map-meta> | ||
| </map-head> | ||
| <map-body> | ||
| <map-feature id="hg" zoom="3" min="0" max="22"> | ||
| <map-featurecaption>Statue of a guy with a hat</map-featurecaption> | ||
| <map-geometry cs="gcrs"> | ||
| <map-point> | ||
| <map-coordinates>-75.70628 45.39778</map-coordinates> | ||
| </map-point> | ||
| </map-geometry> | ||
| <map-properties> | ||
| <h1>A Man With Two Hats</h1> | ||
| </map-properties> | ||
| </map-feature> | ||
| </map-body> | ||
| </mapml-> |