Adjust to get tests passing, maybe

Author: Peter Rushforth

src/layer.js

@@ -472,16 +472,6 @@ export class BaseLayerElement extends HTMLElement {
    * child element processing.
    */
   _runMutationObserver(elementsGroup) {
-    const _addFeatureToMapMLVectors = (feature) => {
-      this.whenReady().then(() => {
-        // the layer extent must change as features are added, this.extent
-        // property only recalculates the bounds and zoomBounds when .bounds
-        // doesn't exist, so delete it to ensure that the extent is reset
-        delete this._layer.bounds;
-        // Features now manage themselves through connectedCallback and MapFeatureLayer
-        // This method now only handles extent recalculation
-      });
-    };
     const _addStylesheetLink = (mapLink) => {
       this.whenReady().then(() => {
         this._layer.renderStyles(mapLink);
@@ -513,9 +503,6 @@ export class BaseLayerElement extends HTMLElement {
     for (let i = 0; i < elementsGroup.length; ++i) {
       let element = elementsGroup[i];
       switch (element.nodeName) {
-        case 'MAP-FEATURE':
-          _addFeatureToMapMLVectors(element);
-          break;
         case 'MAP-LINK':
           if (element.link && !element.link.isConnected)
             _addStylesheetLink(element);
@@ -598,16 +585,19 @@ export class BaseLayerElement extends HTMLElement {
       opacity: window.getComputedStyle(this).opacity
     });
     // make sure the Leaflet layer has a reference to the map
-    this._layer._map = this.parentNode._map;
+    // this is causing problems with LayerGroup, as Leaflet uses the _map property
+    // to determine if a LayerGroup's child layers should have their onAdd invoked
+    // (be added to the map)
+    // this._layer._map = this.parentNode._map;
 
     if (this.checked) {
-      this._layer.addTo(this._layer._map);
+      this._layer.addTo(this.parentNode._map);
+      // toggle the this.disabled attribute depending on whether the layer
+      // is: same prj as map, within view/zoom of map
     }
+    this.parentNode._map.on('moveend layeradd', this._validateDisabled, this);
 
     this._layer.on('add remove', 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 layeradd', this._validateDisabled, this);
 
     if (this.parentNode._layerControl)
       this._layerControl = this.parentNode._layerControl;

src/map-feature.js

@@ -172,9 +172,9 @@ export class HTMLFeatureElement extends HTMLElement {
     // used for fallback zoom getter for static features
     this._initialZoom = this.getMapEl().zoom;
     this._parentEl =
-      this.parentNode.nodeName.toUpperCase() === 'MAP-LAYER' ||
-      this.parentNode.nodeName.toUpperCase() === 'LAYER-' ||
-      this.parentNode.nodeName.toUpperCase() === 'MAP-LINK'
+      this.parentNode.nodeName === 'MAP-LAYER' ||
+      this.parentNode.nodeName === 'LAYER-' ||
+      this.parentNode.nodeName === 'MAP-LINK'
         ? this.parentNode
         : this.parentNode.host;
     if (
@@ -183,8 +183,9 @@ export class HTMLFeatureElement extends HTMLElement {
     )
       return;
     if (
-      this._parentEl.nodeName === 'MAP-LINK' ||
-      this._parentEl.nodeName === 'MAP-LAYER'
+      this.parentNode.nodeName === 'MAP-LAYER' ||
+      this.parentNode.nodeName === 'LAYER-' ||
+      this.parentNode.nodeName === 'MAP-LINK'
     ) {
       this._createOrGetFeatureLayer();
     }

src/mapml/features/geometry.js

@@ -1,4 +1,4 @@
-import { FeatureGroup, LayerGroup, DomUtil, DomEvent, bounds } from 'leaflet';
+import { FeatureGroup, DomUtil, DomEvent, bounds } from 'leaflet';
 
 import { Path, path } from './path.js';
 
@@ -15,7 +15,7 @@ export var Geometry = FeatureGroup.extend({
         options
       );
 
-    LayerGroup.prototype.initialize.call(this, layers, options);
+    FeatureGroup.prototype.initialize.call(this, layers, options);
     this._featureEl = this.options.mapmlFeature;
 
     this.layerBounds = options.layerBounds;
@@ -55,7 +55,7 @@ export var Geometry = FeatureGroup.extend({
   },
 
   onAdd: function (map) {
-    LayerGroup.prototype.onAdd.call(this, map);
+    FeatureGroup.prototype.onAdd.call(this, map);
     this.updateInteraction();
   },