Change uppercase / lowercase comparison to compare projection strings

without folding

add a few waitForTimeout() after zoom to fix the flaky multipleQueryExtent test

Author: prushfor

src/mapml/layers/MapMLLayer.js

@@ -257,9 +257,7 @@ export var MapMLLayer = L.Layer.extend({
         }
       }
     }
-    return !(
-      noLayer || this.getProjection() !== map.options.projection.toUpperCase()
-    );
+    return !(noLayer || this.getProjection() !== map.options.projection);
   },
 
   //sets the <layer-> elements .bounds property
@@ -906,7 +904,7 @@ export var MapMLLayer = L.Layer.extend({
               mapml
                 .querySelector('map-meta[name=projection]')
                 .getAttribute('content')
-            ).content.toUpperCase() || projection;
+            ).content || projection;
         } else if (mapml.querySelector('map-extent[units]')) {
           const getProjectionFrom = (extents) => {
             let extentProj = extents[0].attributes.units.value;

test/e2e/layers/multipleQueryExtents.test.js

@@ -114,6 +114,7 @@ test.describe('Multiple Extent Query Tests', () => {
     await page.evaluateHandle(() =>
       document.querySelector('mapml-viewer').zoomTo(10, 5, 0)
     );
+    await page.waitForTimeout(300);
     await page.click('div');
     await page.waitForSelector(
       'div > div.leaflet-pane.leaflet-map-pane > div.leaflet-pane.leaflet-popup-pane > div'
@@ -162,6 +163,7 @@ test.describe('Multiple Extent Query Tests', () => {
     await page.evaluateHandle(() =>
       document.querySelector('mapml-viewer').zoomTo(-18, 5, 0)
     );
+    await page.waitForTimeout(300);
     await page.click('div');
     await page.waitForSelector(
       'div > div.leaflet-pane.leaflet-map-pane > div.leaflet-pane.leaflet-popup-pane > div',
@@ -175,6 +177,7 @@ test.describe('Multiple Extent Query Tests', () => {
     await page.evaluateHandle(() =>
       document.querySelector('mapml-viewer').zoomTo(-16, -40, 0)
     );
+    await page.waitForTimeout(300);
     await page.click('div');
     const popupNumBottom = await page.$eval(
       'div > div.leaflet-pane.leaflet-map-pane > div.leaflet-pane.leaflet-popup-pane',
@@ -184,6 +187,7 @@ test.describe('Multiple Extent Query Tests', () => {
     await page.evaluateHandle(() =>
       document.querySelector('mapml-viewer').zoomTo(33, -170, 0)
     );
+    await page.waitForTimeout(300);
     await page.click('div');
     const popupNumLeft = await page.$eval(
       'div > div.leaflet-pane.leaflet-map-pane > div.leaflet-pane.leaflet-popup-pane',
@@ -193,6 +197,7 @@ test.describe('Multiple Extent Query Tests', () => {
     await page.evaluateHandle(() =>
       document.querySelector('mapml-viewer').zoomTo(30, 98, 0)
     );
+    await page.waitForTimeout(300);
     await page.click('div');
     const popupNumTop = await page.$eval(
       'div > div.leaflet-pane.leaflet-map-pane > div.leaflet-pane.leaflet-popup-pane',