Resolve layer extent and disable issue

Revert "Change (back) what StaticTileLayer.option._leafletLayer points to"

This reverts commit 5240b23.

Revert inadvertent test change (I think) that was causing a few failures

Author: AliyanH

src/layer.js

@@ -224,10 +224,10 @@ export class MapLayer extends HTMLElement {
     // user checking/unchecking the layer from the layer control
     // this must be done *after* the layer is actually added to the map
     this._layer.on('add remove', this._onLayerChange, this);
-    this._layer.on('add remove extentload', this._validateDisabled, this);
+    this._layer.on('add remove foo', this._validateDisabled, this);
     // toggle the this.disabled attribute depending on whether the layer
     // is: same prj as map, within view/zoom of map
-    this._layer._map.on('moveend', this._validateDisabled, this);
+    this._layer._map.on('moveend layeradd', this._validateDisabled, this);
 
     // if controls option is enabled, insert the layer into the overlays array
     if (this.parentNode._layerControl && !this.hidden) {

src/map-feature.js

@@ -216,6 +216,7 @@ export class MapFeature extends HTMLElement {
     // if the <layer- > is not removed, then regenerate featureGroup and update the mapmlvectors accordingly
     let native = this._getNativeZoomAndCS(this._layer._content);
     this._featureGroup = mapmlvectors.addData(this, native.cs, native.zoom);
+    this._layer._setLayerElExtent();
     mapmlvectors._layers[this._featureGroup._leaflet_id] = this._featureGroup;
     this._groupEl = this._featureGroup.options.group;
     if (mapmlvectors._staticFeature) {

src/mapml/layers/FeatureLayer.js

@@ -52,7 +52,7 @@ export var FeatureLayer = L.FeatureGroup.extend({
       }
       this.addData(mapml, native.cs, native.zoom);
     } else if (!mapml) {
-      this.isVisible = true;
+      this.isVisible = false;
       this.layerBounds = this.options.extent;
       this.zoomBounds = this.options.zoomBounds;
     }
@@ -201,6 +201,9 @@ export var FeatureLayer = L.FeatureGroup.extend({
   },
 
   addData: function (mapml, nativeCS, nativeZoom) {
+    if (mapml) {
+      this.isVisible = true;
+    }
     var features =
         mapml.nodeType === Node.DOCUMENT_NODE || mapml.nodeName === 'LAYER-'
           ? mapml.getElementsByTagName('map-feature')

src/mapml/layers/MapMLLayer.js

@@ -187,6 +187,7 @@ export var MapMLLayer = L.Layer.extend({
         this
       );
     }
+    this._setLayerElExtent();
 
     this.setZIndex(this.options.zIndex);
     this.getPane().appendChild(this._container);
@@ -368,7 +369,31 @@ export var MapMLLayer = L.Layer.extend({
             this._properties._mapExtents[i].templatedLayer.zoomBounds =
               zoomBounds;
           }
-        } else {
+        } else if (type === '_staticTileLayer') {
+          if (this[type].layerBounds) {
+            if (!bounds) {
+              bounds = this[type].layerBounds;
+              zoomBounds = this[type].zoomBounds;
+            } else {
+              bounds.extend(this[type].layerBounds.min);
+              bounds.extend(this[type].layerBounds.max);
+            }
+          }
+        } else if (type === '_imageLayer') {
+          if (this[type].layerBounds) {
+            if (!bounds) {
+              bounds = this[type].layerBounds;
+              zoomBounds = this[type].zoomBounds;
+            } else {
+              bounds.extend(this[type].layerBounds.min);
+              bounds.extend(this[type].layerBounds.max);
+            }
+          }
+        } else if (
+          // only process extent if mapmlvectors is not empty
+          type === '_mapmlvectors' &&
+          Object.keys(this[type]._layers).length !== 0
+        ) {
           if (this[type].layerBounds) {
             if (!bounds) {
               bounds = this[type].layerBounds;
@@ -385,7 +410,7 @@ export var MapMLLayer = L.Layer.extend({
       //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 }
+        { zoom: zoomBounds, projection: this._properties.projection }
       );
     }
   },
@@ -868,7 +893,6 @@ export var MapMLLayer = L.Layer.extend({
         // if layer does not have a parent Element, do not need to set Controls
         layer._layerEl.parentElement._toggleControls();
       }
-      layer._setLayerElExtent();
       layer.fire('foo', layer, false);
       // local functions
       // sets layer._properties.projection.  Supposed to replace / simplify
@@ -1529,6 +1553,7 @@ export var MapMLLayer = L.Layer.extend({
           layer._mapmlTileContainer.appendChild(tiles);
           layer._staticTileLayer = M.staticTileLayer({
             pane: layer._container,
+            _leafletLayer: layer,
             projection: layer._properties.projection,
             className: 'mapml-static-tile-layer',
             tileContainer: layer._mapmlTileContainer,

src/mapml/layers/StaticTileLayer.js

@@ -5,7 +5,6 @@ export var StaticTileLayer = L.GridLayer.extend({
       options.maxZoomBound
     );
     L.extend(options, this.zoomBounds);
-    L.extend(options, { _leafletLayer: this });
     L.setOptions(this, options);
     this._groups = this._groupTiles(
       this.options.tileContainer.getElementsByTagName('map-tile')

test/e2e/mapml-viewer/mapml-viewer.html

@@ -27,7 +27,7 @@
 </head>
 
 <body>
-  <mapml-viewer style="height: 600px;width:500px;" projection="CBMTILE" zoom="0" lat="47" lon="-92" controls>
+  <mapml-viewer data-testid="testviewer" style="height: 600px;width:500px;" projection="CBMTILE" zoom="0" lat="47" lon="-92" controls>
     <layer- data-testid="testlayer" label="CBMT - INLINE" checked>
       <map-extent units="CBMTILE">
         <map-input name="zoomLevel" type="zoom" value="3" min="0" max="3" ></map-input>