Get rid of unused location variable in AnnounceMovement.js

Comment out / remove call to private leaflet map function in map-feature

In AnnounceMovement.announceBounds function
Change:
      visible =
        mapZoom <= this._map._layersMaxZoom &&
       mapZoom >= this._map._layersMinZoom &&
        this._map.totalLayerBounds.overlaps(mapBounds);

To:
      visible =
        mapZoom <= this._map.getMaxZoom() &&
        mapZoom >= this._map.getMinZoom() &&
        this._map.totalLayerBounds.overlaps(mapBounds);

Change: _map._layersMaxZoom usage to _map.getMaxZoom() everywhere

Get rid of unused location variable in AnnounceMovement.focusAnnouncement
function.

Author: prushfor

src/map-feature.js

@@ -229,7 +229,7 @@ export class MapFeature extends HTMLElement {
           // todo: dynamically update layer bounds of vector layer
           mapmlvectors.layerBounds = M.getBounds(this._layer._content);
           // update map's zoom limit
-          this._map._addZoomLimit(mapmlvectors);
+          // this._map._addZoomLimit(mapmlvectors);
           // TODO: can be set as a handler of featureLayer
           mapmlvectors._resetFeatures();
           L.extend(mapmlvectors.options, mapmlvectors.zoomBounds);

src/mapml/handlers/AnnounceMovement.js

@@ -45,10 +45,9 @@ export var AnnounceMovement = L.Handler.extend({
         : mapEl.shadowRoot.querySelector('.leaflet-container');
 
       let mapZoom = mapEl._map.getZoom();
-      let location = M._gcrsToTileMatrix(mapEl);
       let standard = M.options.locale.amZoom + ' ' + mapZoom;
 
-      if (mapZoom === mapEl._map._layersMaxZoom) {
+      if (mapZoom === mapEl._map.getMaxZoom()) {
         standard = M.options.locale.amMaxZoom + ' ' + standard;
       } else if (mapZoom === mapEl._map._layersMinZoom) {
         standard = M.options.locale.amMinZoom + ' ' + standard;
@@ -75,8 +74,8 @@ export var AnnounceMovement = L.Handler.extend({
     let visible = true;
     if (this._map.totalLayerBounds) {
       visible =
-        mapZoom <= this._map._layersMaxZoom &&
-        mapZoom >= this._map._layersMinZoom &&
+        mapZoom <= this._map.getMaxZoom() &&
+        mapZoom >= this._map.getMinZoom() &&
         this._map.totalLayerBounds.overlaps(mapBounds);
     }
 
@@ -86,8 +85,6 @@ export var AnnounceMovement = L.Handler.extend({
         )
       : this.shadowRoot.querySelector('.mapml-screen-reader-output');
 
-    //GCRS to TileMatrix
-    let location = M._gcrsToTileMatrix(this);
     let standard = M.options.locale.amZoom + ' ' + mapZoom;
 
     if (!visible) {
@@ -113,7 +110,7 @@ export var AnnounceMovement = L.Handler.extend({
       let prevZoom = this._history[this._historyIndex - 1]
         ? this._history[this._historyIndex - 1].zoom
         : this._history[this._historyIndex].zoom;
-      if (mapZoom === this._map._layersMaxZoom && mapZoom !== prevZoom) {
+      if (mapZoom === this._map.getMaxZoom() && mapZoom !== prevZoom) {
         output.innerText = M.options.locale.amMaxZoom + ' ' + standard;
       } else if (mapZoom === this._map._layersMinZoom && mapZoom !== prevZoom) {
         output.innerText = M.options.locale.amMinZoom + ' ' + standard;

src/mapml/keyboard.js

@@ -40,7 +40,7 @@ L.Map.Keyboard.include({
       }
     } else if (key in this._zoomKeys) {
       if (
-        (key in zoomIn && map._layersMaxZoom !== map.getZoom()) ||
+        (key in zoomIn && map.getMaxZoom() !== map.getZoom()) ||
         (key in zoomOut && map._layersMinZoom !== map.getZoom())
       )
         map.setZoom(map.getZoom() + (e.shiftKey ? 3 : 1) * this._zoomKeys[key]);