Revert "Rename / refactor _setLayerElExtent to _getExtent, create getter for"

This reverts commit f27ea67.

Author: yhy0217

src/layer.js

@@ -56,10 +56,6 @@ export class MapLayer extends HTMLElement {
     this.setAttribute('opacity', val);
   }
 
-  get extent() {
-    if (this._layer) return this._layer._getExtent();
-  }
-
   constructor() {
     // Always call super first in constructor
     super();
@@ -441,6 +437,7 @@ export class MapLayer extends HTMLElement {
     }
   }
   zoomTo() {
+    if (!this.extent) return;
     let map = this._layer._map,
       tL = this.extent.topLeft.pcrs,
       bR = this.extent.bottomRight.pcrs,

src/map-feature.js

@@ -155,6 +155,8 @@ export class MapFeature extends HTMLElement {
         .addData(this, native.cs, native.zoom)
         .addTo(this._map);
       placeholder.replaceWith(this._featureGroup.options.group);
+      // TODO: getBounds() should dynamically update the layerBounds
+      this._layer._setLayerElExtent();
       delete this._getFeatureExtent;
     }
   }
@@ -232,6 +234,9 @@ export class MapFeature extends HTMLElement {
         }
       }
 
+      if (Object.keys(mapmlvectors._layers).length === 1) {
+        this._layer._setLayerElExtent();
+      }
       this._setUpEvents();
     });
   }
@@ -256,6 +261,7 @@ export class MapFeature extends HTMLElement {
       mapmlvectors.layerBounds = M.getBounds(this._layer._content);
       // add feature layers to map
       // mapmlvectors._resetFeatures();
+      this._layer._setLayerElExtent();
       // update map's zoom limit
       this._map._addZoomLimit(mapmlvectors);
       L.extend(mapmlvectors.options, mapmlvectors.zoomBounds);

src/mapml/layers/MapMLLayer.js

@@ -119,11 +119,13 @@ export var MapMLLayer = L.Layer.extend({
           extentEl: extentEl._DOMnode || extentEl
         }).addTo(this._map);
         extentEl.templatedLayer.setZIndex();
+        this._setLayerElExtent();
       }
     } else {
       L.DomEvent.stopPropagation(e);
       extentEl.checked = false;
       if (this._layerEl.checked) this._map.removeLayer(extentEl.templatedLayer);
+      this._setLayerElExtent();
     }
   },
   titleIsReadOnly() {
@@ -185,6 +187,7 @@ export var MapMLLayer = L.Layer.extend({
         this
       );
     }
+    this._setLayerElExtent();
 
     this.setZIndex(this.options.zIndex);
     this.getPane().appendChild(this._container);
@@ -258,7 +261,7 @@ export var MapMLLayer = L.Layer.extend({
   },
 
   //sets the <layer-> elements .bounds property
-  _getExtent: function () {
+  _setLayerElExtent: function () {
     let bounds,
       zoomMax,
       zoomMin,
@@ -402,7 +405,8 @@ export var MapMLLayer = L.Layer.extend({
       }
     });
     if (bounds) {
-      return Object.assign(
+      //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 }
       );

src/mapml/utils/Util.js

@@ -533,9 +533,11 @@ export var Util = {
             layer.parentElement.querySelectorAll('layer-').length === 1
           )
             layer.parentElement.projection = layer._layer.getProjection();
-          if (zoomTo)
-            layer.parentElement.zoomTo(+zoomTo.lat, +zoomTo.lng, +zoomTo.z);
-          else layer.zoomTo();
+          if (layer.extent) {
+            if (zoomTo)
+              layer.parentElement.zoomTo(+zoomTo.lat, +zoomTo.lng, +zoomTo.z);
+            else layer.zoomTo();
+          }
           if (opacity) layer.opacity = opacity;
           map.getContainer().focus();
         });