Update mapFeature test after bug Fix to use Enter + Update map-Feature.test to reflect current changes/work with map-meta, also remove timeout's for now - TBD + comment out addZoomLimit - TBD

AliyanH · prushforth · commit 1d5325048813 · 2023-10-11T15:54:48.000-04:00
diff --git a/index.html b/index.html
@@ -73,13 +73,15 @@
   </head>
   <body>
 <mapml-viewer projection="OSMTILE" zoom="10" lon="-75.7" lat="45.4" controls="">
+  <layer- label="OpenStreetMap" src="https://maps4html.org/web-map-doc/demo/data/osm.mapml" checked=""></layer->
+  
   <layer- label="Polygon" checked>
     <map-meta name="projection" content="OSMTILE"></map-meta>
     <map-meta name="zoom" content="min=10,max=11"></map-meta>
     <map-feature zoom="10">
       <map-featurecaption>Click me!</map-featurecaption>
       <!-- Setting the geometry coordinates to gcrs, as the default is pcrs -->
-      <map-geometry cs="gcrs">
+      <map-geometry>
         <map-a href="#15, -75.699, 45.420">
           <map-polygon class="polygon">
             <map-coordinates>-75.8242035 45.3526278 -75.6793213 45.4572409 -75.5680847 45.4692806 -75.6092834 45.4215881 -75.5756378 45.3810901 -75.7946777 45.3120804</map-coordinates>
@@ -90,13 +92,12 @@
     </map-feature>
   </layer->
 
-<!--  <layer- label="Points" checked>
+ <layer- label="Points" checked>
     <map-meta name="projection" content="OSMTILE"></map-meta>
     <map-meta name="zoom" content="min=14,max=24"></map-meta>
     <map-feature>
       <map-featurecaption>Point 1</map-featurecaption>
-       Setting the geometry coordinates to gcrs, as the default is pcrs 
-      <map-geometry cs="gcrs">
+      <map-geometry>
         <map-point class="point">
           <map-coordinates>-75.6978285 45.4202251</map-coordinates>
         </map-point>
@@ -105,8 +106,7 @@
     </map-feature>
     <map-feature>
       <map-featurecaption>Point 2</map-featurecaption>
-       Setting the geometry coordinates to gcrs, as the default is pcrs 
-      <map-geometry cs="gcrs">
+      <map-geometry>
         <map-point class="point">
           <map-coordinates>-75.7002854 45.4199465</map-coordinates>
         </map-point>
@@ -115,14 +115,13 @@
     </map-feature>
     <map-feature>
       <map-featurecaption>point 3</map-featurecaption>
-       Setting the geometry coordinates to gcrs, as the default is pcrs 
-      <map-geometry cs="gcrs">
+      <map-geometry>
         <map-point class="point">
           <map-coordinates>-75.6984723 45.4179207</map-coordinates>
         </map-point>
       </map-geometry>
       <map-properties></map-properties>
     </map-feature>
-  </layer->-->
+  </layer->
 </mapml-viewer>  </body>
 </html>
diff --git a/src/map-feature.js b/src/map-feature.js
@@ -229,7 +229,7 @@ export class MapFeature extends HTMLElement {
           // todo: dynamically update layer bounds of vector layer
           mapmlvectors.layerBounds = M.getBounds(this._layer._content);
           // update map's zoom limit
-          this._map._addZoomLimit(mapmlvectors);
+          //this._map._addZoomLimit(mapmlvectors);
           // TODO: can be set as a handler of featureLayer
           mapmlvectors._resetFeatures();
           L.extend(mapmlvectors.options, mapmlvectors.zoomBounds);
diff --git a/test/e2e/core/featureIndexOverlayFocus.test.js b/test/e2e/core/featureIndexOverlayFocus.test.js
@@ -142,8 +142,9 @@ test.describe('Feature Index Overlay Focus tests', () => {
     await page.locator('#map3').getByTitle('Reload').click();
   });
   test('Feature index overlay and reticle show after following a link', async () => {
-    await page.locator('#map3').scrollIntoViewIfNeeded();
-    await page.locator('#map3 .leaflet-interactive.map-a').click();
+    await page.locator('#map3').click();
+    await page.keyboard.press('Tab');
+    await page.keyboard.press('Enter');
     const afterFollowingLinkReticle = page.locator(
       '#map3 .mapml-feature-index-box'
     );
diff --git a/test/e2e/features/mapFeature.test.js b/test/e2e/features/mapFeature.test.js
@@ -21,7 +21,7 @@ test.describe('Playwright map-feature tests', () => {
     await expect(page.getByTestId('viewer')).toHaveJSProperty('zoom', '10');
 
     // click the polygon link to zoom
-    await page.getByRole('link', { name: 'Click me!' }).click({ timeout: 300 });
+    await page.getByLabel('Click me!').click();
 
     // traversing the link, expect the new map location to be centered #15, -75.699, 45.420
     await expect(page.getByTestId('viewer')).toHaveJSProperty('lat', '45.42');
@@ -32,15 +32,15 @@ test.describe('Playwright map-feature tests', () => {
     // await page.getByTestId('points').evaluate((layer)=>layer._layer._setLayerElExtent());
 
     // click the first point on the map
-    await page.getByRole('button', { name: 'Point 1' }).click({ timeout: 300 });
+    await page.getByRole('button', { name: 'Point 1' }).click();
     // expect the popup for Point 1 to have specific content
     await page.getByRole('heading', { name: 'Point 1' });
     // expect the popup to have a Zoom to here link
     await page
       .getByRole('link', { name: 'Zoom to here' })
-      .click({ timeout: 300 });
+      .click();
 
-    // traversing the link, expect the new map location to be centered #14,-75.6978309903406,45.42022684737822
+    // traversing the link, expect the new map location to be centered #24,-75.6978309903406,45.42022684737822 because it is zooming to the map-feature, and it has no map-meta value set, or a map-feature zoom attribute
     await expect(page.getByTestId('viewer')).toHaveJSProperty(
       'lat',
       '45.42022684737822'
@@ -49,9 +49,16 @@ test.describe('Playwright map-feature tests', () => {
       'lon',
       '-75.6978309903406'
     );
-    await expect(page.getByTestId('viewer')).toHaveJSProperty('zoom', '14');
+    await expect(page.getByTestId('viewer')).toHaveJSProperty('zoom', '24');
+    // click the first point on the map
+    await page.getByRole('button', { name: 'Point 1' }).click();
+    // expect the popup for Point 1 to have specific content
+    await page.getByRole('heading', { name: 'Point 1' });
+    // expect the popup to have a Zoom to here link
+    await page.getByRole('link', { name: 'Zoom to here' })
+    // close the popup
     await page
       .getByRole('button', { name: 'Close popup' })
-      .click({ timeout: 300 });
+      .click();
   });
 });
