add a parameter for convertAndFormatPCRS

Enable playwright tests, disable jest tests, possibly forever.

Skip featureIndexOverlay tests for now

Do 'npx playwright install' after 'npm install' per playwright error message.

Author: AliyanH

.github/workflows/ci-testing.yml

@@ -13,11 +13,12 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: '18.x'
-#    - run: sudo apt-get install xvfb
-#    - run: npm install --legacy-peer-deps
-#    - run: npm install -g grunt-cli
-#    - run: grunt default
-#    - run: xvfb-run --auto-servernum -- npm test
+    - run: sudo apt-get install xvfb
+    - run: npm install --legacy-peer-deps
+    - run: npx playwright install
+    - run: npm install -g grunt-cli
+    - run: grunt default
+    - run: xvfb-run --auto-servernum -- npm test
 #    - run: xvfb-run --auto-servernum -- npm run jest
       env:
         CI: true

package.json

@@ -32,7 +32,7 @@
     }
   ],
   "scripts": {
-    "test": "npx playwright test",
+    "test": "npx playwright test --grep-invert='featureIndexOverlay.*'",
     "jest": "jest --verbose --noStackTrace"
   },
   "devDependencies": {

src/map-feature.js

@@ -421,8 +421,11 @@ export class MapFeature extends HTMLElement {
           );
         }
         let result = Object.assign(
-          M._convertAndFormatPCRS(pcrsBound, map.options.crs),
-          { projection: map.options.projection }
+          M._convertAndFormatPCRS(
+            pcrsBound,
+            map.options.crs,
+            map.options.projection
+          )
         );
         // memoize calculated result
         extentCache = result;

src/mapml-viewer.js

@@ -109,14 +109,17 @@ export class MapViewer extends HTMLElement {
         map.getZoom(),
         map.options.projection
       );
-    let formattedExtent = M._convertAndFormatPCRS(pcrsBounds, map.options.crs);
+    let formattedExtent = M._convertAndFormatPCRS(
+      pcrsBounds,
+      map.options.crs,
+      this.projection
+    );
     if (map.getMaxZoom() !== Infinity) {
       formattedExtent.zoom = {
         minZoom: map.getMinZoom(),
         maxZoom: map.getMaxZoom()
       };
     }
-    formattedExtent.projection = this.projection;
     return formattedExtent;
   }
   get static() {

src/mapml/layers/MapMLLayer.js

@@ -408,8 +408,12 @@ export var MapMLLayer = L.Layer.extend({
     if (bounds) {
       //assigns the formatted extent object to .extent and spreads the zoom ranges to .extent also
       this._layerEl.extent = Object.assign(
-        M._convertAndFormatPCRS(bounds, this._properties.crs),
-        { zoom: zoomBounds, projection: this._properties.projection }
+        M._convertAndFormatPCRS(
+          bounds,
+          this._properties.crs,
+          this._properties.projection
+        ),
+        { zoom: zoomBounds }
       );
     }
   },

src/mapml/utils/Util.js

@@ -2,8 +2,8 @@ import { FALLBACK_CS, FALLBACK_PROJECTION } from './Constants';
 
 export var Util = {
   // _convertAndFormatPCRS returns the converted CRS and formatted pcrsBounds in gcrs, pcrs, tcrs, and tilematrix. Used for setting extent for the map and layer (map.extent, layer.extent).
-  // _convertAndFormatPCRS: L.Bounds, _map -> {...}
-  _convertAndFormatPCRS: function (pcrsBounds, crs) {
+  // _convertAndFormatPCRS: L.Bounds, _map, projection -> {...}
+  _convertAndFormatPCRS: function (pcrsBounds, crs, projection) {
     if (!pcrsBounds || !crs) return {};
 
     let tcrsTopLeft = [],
@@ -65,7 +65,7 @@ export var Util = {
     };
 
     //formats all extent data
-    return {
+    let extent = {
       topLeft: {
         tcrs: tcrsTopLeft,
         tilematrix: tileMatrixTopLeft,
@@ -79,6 +79,10 @@ export var Util = {
         pcrs: pcrs.bottomRight
       }
     };
+    if (projection) {
+      extent.projection = projection;
+    }
+    return extent;
   },
 
   // _extractInputBounds extracts and returns Input Bounds from the provided template

src/web-map.js

@@ -113,14 +113,17 @@ export class WebMap extends HTMLMapElement {
         map.getZoom(),
         map.options.projection
       );
-    let formattedExtent = M._convertAndFormatPCRS(pcrsBounds, map.options.crs);
+    let formattedExtent = M._convertAndFormatPCRS(
+      pcrsBounds,
+      map.options.crs,
+      this.projection
+    );
     if (map.getMaxZoom() !== Infinity) {
       formattedExtent.zoom = {
         minZoom: map.getMinZoom(),
         maxZoom: map.getMaxZoom()
       };
     }
-    formattedExtent.projection = this.projection;
     return formattedExtent;
   }
   get static() {