Update default CS and Projection for layer

index.html

@@ -76,7 +76,6 @@
       <map-caption>A pleasing map of Canada</map-caption>
       <layer- label="CBMT" src="https://geogratis.gc.ca/mapml/en/cbmtile/cbmt/" checked></layer->
       <layer- label="Hat Guy" checked>
-        <map-meta name="projection" content="CBMTILE"></map-meta>
         <map-feature id="twohats" zoom="15" class="twohats">
         <map-properties>
           <table>
@@ -117,7 +116,7 @@
             </tr>
           </table>
         </map-properties>
-        <map-geometry cs="gcrs">
+        <map-geometry>
           <map-point>
             <map-coordinates>-75.705278 45.397778</map-coordinates>
           </map-point>

src/map-feature.js

@@ -310,7 +310,7 @@ export class MapFeature extends HTMLElement {
       if (this._extentEl.querySelector('map-link[rel=query]')) {
         // for query, fallback zoom is the current map zoom level that the query is returned
         nativeZoom = this._map.getZoom();
-        nativeCS = 'pcrs';
+        nativeCS = 'gcrs';
       } else if (this._extentEl.querySelector('map-link[rel=features]')) {
         // for templated feature, read fallback from the fetched mapml's map-meta[name=zoom / cs]
         nativeZoom = this._extentEl._nativeZoom;
@@ -340,7 +340,7 @@ export class MapFeature extends HTMLElement {
           csLength = csMeta?.length;
         nativeCS = csLength
           ? csMeta[csLength - 1].getAttribute('content')
-          : 'pcrs';
+          : 'gcrs';
         return { zoom: nativeZoom, cs: nativeCS };
       }
     }

src/mapml/layers/FeatureLayer.js

@@ -130,7 +130,7 @@ export var FeatureLayer = L.FeatureGroup.extend({
         M._metaContentToObject(
           mapml.querySelector('map-meta[name=cs]').getAttribute('content')
         ).content) ||
-      'PCRS';
+      'GCRS';
     return { zoom: nativeZoom, cs: nativeCS };
   },
 

src/mapml/layers/MapMLLayer.js

@@ -1428,6 +1428,15 @@ export var MapMLLayer = L.Layer.extend({
             projectionMatch =
               projection && projection === layer.options.mapprojection;
           }
+        } else {
+          // default projection set to parent projection when no map-meta projection element present
+          projection = layer.options.mapprojection;
+          projectionMatch = true;
+          serverMeta = projection;
+          console.log(
+            `A projection was not assigned to the '${this._layerEl.label}' Layer. Please specify a projection for that layer using a map-meta element. See more here - https://maps4html.org/web-map-doc/docs/elements/meta/`
+          );
+          // TODO: Add a more obvious warning.
         }
 
         var metaExtent = mapml.querySelector('map-meta[name=extent]'),
@@ -1496,7 +1505,13 @@ export var MapMLLayer = L.Layer.extend({
             }
           }
         } else {
-          layer._extent = serverMeta;
+          if (typeof serverMeta === 'string') {
+            // when map-meta projection not present for layer
+            layer._extent = { serverMeta };
+          } else {
+            // when map-meta projection present for layer
+            layer._extent = serverMeta;
+          }
         }
         layer._parseLicenseAndLegend(mapml, layer, projection);
 
@@ -1728,7 +1743,7 @@ export var MapMLLayer = L.Layer.extend({
     let extent = this._extent._mapExtents
       ? this._extent._mapExtents[0]
       : this._extent; // the projections for each extent eould be the same (as) validated in _validProjection, so can use mapExtents[0]
-    if (!extent) return FALLBACK_PROJECTION;
+    if (extent.serverMeta) return extent.serverMeta;
     switch (extent.tagName.toUpperCase()) {
       case 'MAP-EXTENT':
         if (extent.hasAttribute('units'))

src/mapml/layers/TemplatedFeaturesLayer.js

@@ -159,7 +159,7 @@ export var TemplatedFeaturesLayer = L.Layer.extend({
                     .querySelector('map-meta[name=cs]')
                     .getAttribute('content')
                 ).content) ||
-              'PCRS');
+              'GCRS');
             features.addData(mapml, nativeCS, nativeZoom);
             // "migrate" to extent's shadow
             // make a clone, prevent the elements from being removed from mapml file

test/e2e/core/metaDefault.html

@@ -34,6 +34,15 @@
           tref="http://wms.ess-ws.nrcan.gc.ca/wms/toporama_en?SERVICE=WMS&REQUEST=GetMap&FORMAT=image/jpeg&TRANSPARENT=FALSE&STYLES=&VERSION=1.3.0&LAYERS=WMS-Toporama&WIDTH={w}&HEIGHT={h}&CRS=EPSG:3978&BBOX={xmin},{ymin},{xmax},{ymax}&m4h=t" ></map-link>
       </map-extent>
     </layer->
+    <layer- label="Default meta" checked>
+      <map-feature>
+        <map-geometry>
+          <map-point>
+            <map-coordinates>-79.477626 43.764814</map-coordinates>
+          </map-point>
+        </map-geometry>
+      </map-feature>
+    </layer->
   </mapml-viewer>
 
 </body>

test/e2e/core/metaDefault.test.js

@@ -90,4 +90,8 @@ test.describe('Playwright Missing Min Max Attribute, Meta Default Tests', () =>
       expectedGCRSSecondLayer.bottomRight
     );
   });
+  test("Layer with no map-meta's is rendered on map", async () => {
+    let vector = await page.locator('.mapml-vector-container > svg');
+    await expect(vector).toHaveCount(1);
+  });
 });

test/e2e/mapml-viewer/customTCRS.test.js

@@ -71,7 +71,7 @@ test.describe('Playwright Custom TCRS Tests', () => {
 
     expect(featureThree).toEqual('M382 -28L809 -28L809 399L382 399z');
     expect(featureFour).toEqual(
-      'M55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231L55 231z'
+      'M150 429L171 426L175 438L181 457L183 461L185 463L185 465L187 465L185 468L185 470L184 472L186 477L186 481L188 485L182 486L154 490L154 492L157 494L157 497L158 498L156 501L154 501L151 499L150 495L149 495L148 498L148 501L144 501L141 477L141 448L141 431L139 430L150 429z'
     );
 
     expect(staticFeatures).toEqual(false);