Implement Ahmad's M.options.announceMovement

ben-lu-uw · ben-lu-uw · commit 27c4862415b7 · 2021-11-15T09:24:41.000-05:00
diff --git a/src/mapml-viewer.js b/src/mapml-viewer.js
@@ -200,8 +200,7 @@ export class MapViewer extends HTMLElement {
             projection: this.projection,
             query: true,
             contextMenu: true,
-            //Will replace with M.options.announceMoves
-            announceMovement: true,
+            announceMovement: M.options.announceMovement,
             mapEl: this,
             crs: M[this.projection],
             zoom: this.zoom,
diff --git a/src/web-map.js b/src/web-map.js
@@ -214,8 +214,7 @@ export class WebMap extends HTMLMapElement {
             projection: this.projection,
             query: true,
             contextMenu: true,
-            //Will replace with M.options.announceMoves
-            announceMovement: true,
+            announceMovement: M.options.announceMovement,
             mapEl: this,
             crs: M[this.projection],
             zoom: this.zoom,
diff --git a/test/e2e/core/announceMovement.test.js b/test/e2e/core/announceMovement.test.js
@@ -1,4 +1,4 @@
-const playwright = require("playwright");
+﻿const playwright = require("playwright");
 jest.setTimeout(50000);
 (async () => {
     for (const browserType of BROWSER) {
@@ -22,13 +22,6 @@ jest.setTimeout(50000);
                 });
 
                 test("[" + browserType + "]" + " Output values are correct during regular movement", async ()=>{
-                    const announceMovement = await page.$eval(
-                        "body > mapml-viewer",
-                        (map) => map._map.announceMovement._enabled
-                    );
-                    if(!announceMovement){
-                        return;
-                    }
                     await page.keyboard.press("Tab");
                     await page.keyboard.press("ArrowUp");
                     await page.waitForTimeout(100);
@@ -61,13 +54,6 @@ jest.setTimeout(50000);
                 });
 
                 test("[" + browserType + "]" + " Output values are correct at bounds and bounces back", async ()=>{
-                    const announceMovement = await page.$eval(
-                        "body > mapml-viewer",
-                        (map) => map._map.announceMovement._enabled
-                    );
-                    if(!announceMovement){
-                        return;
-                    }
                     //Zoom out to min layer bound
                     await page.keyboard.press("Minus");
                     await page.waitForTimeout(100);
diff --git a/test/e2e/core/debugMode.test.js b/test/e2e/core/debugMode.test.js
@@ -169,7 +169,7 @@ jest.setTimeout(50000);
             "xpath=//html/body/mapml-viewer >> css=div > div.leaflet-pane.leaflet-map-pane > div.leaflet-pane.leaflet-overlay-pane > svg > g",
             (tile) => tile.childElementCount
           );
-          expect(feature).toEqual(4);
+          expect(feature).toEqual(3);
         });
 
         test("[" + browserType + "]" + " Layer deselected then reselected", async () => {
diff --git a/test/e2e/mapml-viewer/mapml-viewer.html b/test/e2e/mapml-viewer/mapml-viewer.html
@@ -4,6 +4,11 @@
 <head>
   <title>Basic Mapml-Viewer</title>
   <meta charset="UTF-8">
+  <script>
+    let options = document.createElement("map-options");
+    options.innerHTML = '{"announceMovement":true}';
+    document.head.appendChild(options);
+  </script>
   <script type="module" src="mapml-viewer.js"></script>
   <style>
     html {
