Skip to content

Commit 34572cb

Browse files
prushforthprushforth
committed
Get preferred-content.test working. Should be an easier way to express
'no preference' on the part of the extension.
1 parent 46fa134 commit 34572cb

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

‎src/popup.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ function loadOptions() {
2222
featureIndexOverlayOption: false,
2323
renderMap: false,
2424
defaultExtCoor: 'pcrs',
25-
defaultLocCoor: 'gcrs'
25+
defaultLocCoor: 'gcrs',
26+
contentPreference: []
2627
};
2728
for (let name in options) {
2829
let elem = document.getElementById(name);

‎test/e2e/basics/preferred-content.html‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
<meta name="viewport" content="width=device-width,initial-scale=1">
66
<title>Preferred Content Test</title>
77
<script type="module" src="../../../src/dist/mapml.js"></script>
8-
<script>
8+
<!-- <script>
99
document.addEventListener('DOMContentLoaded',(e)=>{
1010
let l, map = document.querySelector('mapml-viewer'),
11-
prefersEverything = map.matchMedia('(prefers-map-content: image) and (prefers-map-content: tile) and (prefers-map-content: feature) and (prefers-map-content: table)').matches === 'true',
11+
prefersEverything = map.matchMedia('(prefers-map-content: image) and (prefers-map-content: tile) and (prefers-map-content: feature) and (prefers-map-content: table)').matches === true,
1212
t = document.querySelector('template'),
13-
prefersFeaturesOnly = map.matchMedia('(prefers-map-content: feature) and ( not ((prefers-map-content: image) or (prefers-map-content: tile)))').matches === 'true',
14-
prefersTiles = map.matchMedia('(prefers-map-content: tile');
13+
prefersFeaturesOnly = map.matchMedia('(prefers-map-content: feature) and ( not ((prefers-map-content: image) or (prefers-map-content: tile)))').matches === true,
14+
prefersImages = map.matchMedia('(prefers-map-content: image) and ( not ((prefers-map-content: feature) or (prefers-map-content: tile)))').matches === true,
15+
prefersTiles = map.matchMedia('(prefers-map-content: tile) and ( not ((prefers-map-content: feature) or (prefers-map-content: image)))').matches === true;
1516
if (prefersFeaturesOnly) {
1617
l = t.content.querySelector('#features').cloneNode(true);
1718
} else if (prefersImages) {
@@ -21,11 +22,13 @@
2122
}
2223
map.appendChild(l);
2324
});
24-
</script>
25+
</script>-->
2526
</head>
2627
<body>
2728
<mapml-viewer data-testid="viewer" style="height: 500px;width:500px;" projection="CBMTILE" zoom="8" lat="46.51231982020816" lon="-63.25669692277839" controls>
28-
<map-layer data-testid="test-layer" label="Provinces and Territories" src="../data/cbmt-cbmtile.mapml" checked></map-layer>
29+
<!-- this is stupid there should be a simpler way to detect no preference -->
30+
<map-layer data-testid="test-layer" media="((prefers-map-content: image) or (not ((prefers-map-content: image) and (prefers-map-content: tile) and (prefers-map-content: feature) and (prefers-map-content: table))))" label="Provinces and Territories" src="../data/cbmt-cbmtile.mapml" checked></map-layer>
31+
<map-layer data-testid="test-layer2" media="(prefers-map-content: feature)" label="Provinces and Territories" src="../data/features.mapml" checked></map-layer>
2932
</mapml-viewer>
3033
</body>
3134
</html>

‎test/e2e/basics/preferred-content.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ test.describe("Preferred content test", () => {
5252
await newPage.goto("test/e2e/basics/preferred-content.html", { waitUntil: "domcontentloaded" });
5353
await newPage.waitForTimeout(1000);
5454

55-
const layer = newPage.getByTestId('test-layer');
55+
const layer = newPage.getByTestId('test-layer2');
5656
const label = await layer.evaluate((l) => l._layerControlLabel.textContent);
5757
expect(label).toEqual('Feature content');
5858
});

‎test/e2e/data/cbmt-cbmtile.mapml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
<map-meta http-equiv="Content-Type" content="application/xml;charset=UTF-8"></map-meta>
55
<map-meta charset="utf-8"></map-meta>
66
<map-link rel="license" href="https://www.nrcan.gc.ca/earth-sciences/geography/topographic-information/free-data-geogratis/licence/17285" title="Canada Base Map © Natural Resources Canada"></map-link>
7-
<map-link rel="style self" media="prefers-map-content=image" href="cbmt-cbmtile.mapml" title="Image content" />
8-
<map-link rel="style" media="prefers-map-content=feature" href="features.mapml" title="Feature content" />
7+
<!-- these don't work -->
8+
<map-link rel="style self" media="(prefers-map-content: image)" href="cbmt-cbmtile.mapml" title="Image content" />
9+
<map-link rel="style" media="(prefers-map-content: feature)" href="features.mapml" title="Feature content" />
910
</map-head>
1011
<map-body>
1112
<map-extent units="CBMTILE" checked="checked">

‎test/e2e/data/features.mapml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
<map-head>
33
<map-title>Feature content</map-title>
44
<map-meta charset="utf-8"></map-meta>
5-
<map-link rel="style" media="prefers-map-content=image" href="cbmt-cbmtile.mapml" title="Image content" />
6-
<map-link rel="style self" media="prefers-map-content=feature" href="features.mapml" title="Feature content" />
5+
<!-- these don't work -->
6+
<map-link rel="style" media="(prefers-map-content: image)" href="cbmt-cbmtile.mapml" title="Image content" />
7+
<map-link rel="style self" media="(prefers-map-content: feature)" href="features.mapml" title="Feature content" />
78
</map-head>
89
<map-body>
910
<map-extent units="CBMTILE" checked="checked">

0 commit comments

Comments
 (0)