From 94ed3e2a2b0081ed7772da629b9ce020275772b0 Mon Sep 17 00:00:00 2001
From: prushfor <prushfor@L-BSC-A146390.nrn.nrcan.gc.ca>
Date: Thu, 23 Nov 2023 16:01:58 -0500
Subject: [PATCH] WIP on map-link:

* delete map-link._templateVars.boundsFallbackPCRS, unused, problematic
* change implementation of map-link.getBounds() to use getFallbackBounds
when necessary, which gets those bounds from the CRS.  map-link.getBounds()
is called during connectedCallback, so usually the CRS is defined by then.
* make map-extent.units getter fall back to M.FALLBACK_PROJECTION if no units
attribute is present
---
 src/map-extent.js |  3 +--
 src/map-link.js   | 25 +++++++++----------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/map-extent.js b/src/map-extent.js
index b15af167f..b54e6a77e 100644
--- a/src/map-extent.js
+++ b/src/map-extent.js
@@ -4,8 +4,7 @@ export class MapExtent extends HTMLElement {
     return ['checked', 'label', 'opacity', 'hidden'];
   }
   get units() {
-    // this should fallback to something??
-    return this.getAttribute('units');
+    return this.getAttribute('units') || M.FALLBACK_PROJECTION;
   }
 
   get checked() {
diff --git a/src/map-link.js b/src/map-link.js
index 628b1d094..22a013223 100644
--- a/src/map-link.js
+++ b/src/map-link.js
@@ -474,11 +474,7 @@ export class MapLink extends HTMLElement {
         inputsReady: Promise.allSettled(inputsReady),
         zoom: linkedZoomInput,
         zoomBounds: this._getZoomBounds(linkedZoomInput),
-        boundsFallbackPCRS: this.getFallbackBounds(
-          this.parentElement.units || M.FALLBACK_PROJECTION
-        ),
-        // TODO: make map-extent.units fall back automatically
-        projection: this.parentElement.units || M.FALLBACK_PROJECTION,
+        projection: this.parentElement.units,
         tms: this.tms,
         step: step
       };
@@ -493,12 +489,12 @@ export class MapLink extends HTMLElement {
   getBounds() {
     let template = this._templateVars;
     let inputs = template.values,
-      projection = template.projection || M.FALLBACK_PROJECTION,
+      projection = this.parentElement.units,
       value = 0,
       boundsUnit = M.FALLBACK_CS;
-    let bounds = M[template.projection].options.crs.tilematrix.bounds(0),
+    let bounds = M[projection].options.crs.tilematrix.bounds(0),
       defaultMinZoom = 0,
-      defaultMaxZoom = M[template.projection].options.resolutions.length - 1,
+      defaultMaxZoom = M[projection].options.resolutions.length - 1,
       nativeMinZoom = defaultMinZoom,
       nativeMaxZoom = defaultMaxZoom;
     let locInputs = false,
@@ -554,12 +550,12 @@ export class MapLink extends HTMLElement {
     if (numberOfAxes >= 2) {
       locInputs = true;
     }
-    if (!locInputs && template.boundsFallbackPCRS) {
-      bounds = template.boundsFallbackPCRS;
+    if (!locInputs) {
+      bounds = this.getFallbackBounds(projection);
     } else if (locInputs) {
       bounds = M.boundsToPCRSBounds(bounds, value, projection, boundsUnit);
     } else {
-      bounds = M[template.projection].options.crs.pcrs.bounds;
+      bounds = M[projection].options.crs.pcrs.bounds;
     }
     return bounds;
   }
@@ -621,11 +617,8 @@ export class MapLink extends HTMLElement {
         cs
       );
     } else {
-      // TODO review.  Should this.parentElement.units automatically fall back
-      // i.e. to OSMTILE if not specified?  Probably, but it does not currently.
-      let fallbackProjection =
-        M[this.parentElement.units || M.FALLBACK_PROJECTION];
-      bounds = fallbackProjection.options.crs.pcrs.bounds;
+      let crs = M[this.parentElement.units];
+      bounds = crs.options.crs.pcrs.bounds;
     }
     return bounds;
   }