@carto/ps-react-maps 3.0.0-canary.6 → 3.0.0-canary.7

package/dist/index.js

@@ -2,7 +2,7 @@ var gt = Object.defineProperty;
 var yt = (o, e, t) => e in o ? gt(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
 var ne = (o, e, t) => yt(o, typeof e != "symbol" ? e + "" : e, t);
 import { jsx as H, jsxs as ht } from "react/jsx-runtime";
-import { c as C } from "react/compiler-runtime";
+import { c as k } from "react/compiler-runtime";
 import { useState as fe, useEffect as Y, useImperativeHandle as St, createContext as qe, useContext as Ue, useMemo as de, useCallback as $, useRef as Ee } from "react";
 import { DeckGL as vt } from "@deck.gl/react";
 import { Map as bt, MapProvider as Tt, useMap as Mt } from "react-map-gl/maplibre";
@@ -76,17 +76,17 @@ function ss(o) {
   } : null;
 }
 function ns(o) {
-  var ye, L, je;
-  const e = C(66);
-  let t, n, s, r, i, a, l, m, c, p, d, u, g, f;
+  var ye, _, je;
+  const e = k(66);
+  let t, n, s, i, r, a, l, m, c, p, d, u, g, f;
   e[0] !== o ? ({
     instanceRef: t,
-    overlayRef: r,
+    overlayRef: i,
     basemap: l,
     controller: m,
     id: c,
     layers: p,
-    parameters: i,
+    parameters: r,
     gmapsProps: d,
     getCursor: u,
     getTooltip: g,
@@ -94,7 +94,7 @@ function ns(o) {
     onResize: s,
     onViewStateChange: f,
     ...a
-  } = o, e[0] = o, e[1] = t, e[2] = n, e[3] = s, e[4] = r, e[5] = i, e[6] = a, e[7] = l, e[8] = m, e[9] = c, e[10] = p, e[11] = d, e[12] = u, e[13] = g, e[14] = f) : (t = e[1], n = e[2], s = e[3], r = e[4], i = e[5], a = e[6], l = e[7], m = e[8], c = e[9], p = e[10], d = e[11], u = e[12], g = e[13], f = e[14]);
+  } = o, e[0] = o, e[1] = t, e[2] = n, e[3] = s, e[4] = i, e[5] = r, e[6] = a, e[7] = l, e[8] = m, e[9] = c, e[10] = p, e[11] = d, e[12] = u, e[13] = g, e[14] = f) : (t = e[1], n = e[2], s = e[3], i = e[4], r = e[5], a = e[6], l = e[7], m = e[8], c = e[9], p = e[10], d = e[11], u = e[12], g = e[13], f = e[14]);
   const M = l === void 0 ? ee.positron : l, h = m === void 0 ? !0 : m, y = c === void 0 ? "deck-gl-map" : c;
   let T;
   e[15] !== p ? (T = p === void 0 ? [] : p, e[15] = p, e[16] = T) : T = e[16];
@@ -103,19 +103,19 @@ function ns(o) {
   e[17] !== d ? (v = d === void 0 ? {
     apiKey: ""
   } : d, e[17] = d, e[18] = v) : v = e[18];
-  let _, E, F;
+  let L, E, w;
   e[19] !== v ? ({
-    apiKey: F,
-    APIProviderProps: _,
+    apiKey: w,
+    APIProviderProps: L,
     ...E
-  } = v, e[19] = v, e[20] = _, e[21] = E, e[22] = F) : (_ = e[20], E = e[21], F = e[22]);
+  } = v, e[19] = v, e[20] = L, e[21] = E, e[22] = w) : (L = e[20], E = e[21], w = e[22]);
   const O = u === void 0 ? ts : u, D = g === void 0 ? ss : g, U = f === void 0 ? ls : f;
   let V;
   e[23] === Symbol.for("react.memo_cache_sentinel") ? (V = [!1, !1], e[23] = V) : V = e[23];
   const [b, P] = fe(V);
-  let k;
-  e[24] !== b ? (k = b.every(as), e[24] = b, e[25] = k) : k = e[25];
-  const A = k;
+  let C;
+  e[24] !== b ? (C = b.every(as), e[24] = b, e[25] = C) : C = e[25];
+  const A = C;
   let x;
   e[26] !== s ? (x = (he) => {
     s == null || s(he);
@@ -125,7 +125,7 @@ function ns(o) {
     type: G
   } = nt[M], I = G === ue.googleMaps;
   let be, te;
-  e[28] !== S ? (te = S.filter(is).map(rs), e[28] = S, e[29] = te) : te = e[29], be = te;
+  e[28] !== S ? (te = S.filter(rs).map(is), e[28] = S, e[29] = te) : te = e[29], be = te;
   const ge = be;
   let oe;
   e[30] !== I || e[31] !== U ? (oe = (he) => {
@@ -135,57 +135,57 @@ function ns(o) {
     } : he;
     U(Fe);
   }, e[30] = I, e[31] = U, e[32] = oe) : oe = e[32];
-  const re = oe;
+  const ie = oe;
   let Z;
   e[33] === Symbol.for("react.memo_cache_sentinel") ? (Z = (he) => {
     const Fe = he.type === "deckgl" ? 0 : 1;
     P((ft) => ft.map((mt, pt) => pt === Fe ? !0 : mt));
   }, e[33] = Z) : Z = e[33];
-  const ie = Z;
+  const re = Z;
   let ae, le;
   e[34] !== A || e[35] !== n ? (ae = () => {
     n == null || n(A);
   }, le = [A, n], e[34] = A, e[35] = n, e[36] = ae, e[37] = le) : (ae = e[36], le = e[37]), Y(ae, le);
   let se;
-  e[38] === Symbol.for("react.memo_cache_sentinel") ? (se = () => ie({
+  e[38] === Symbol.for("react.memo_cache_sentinel") ? (se = () => re({
     type: "deckgl"
   }), e[38] = se) : se = e[38];
   let X;
-  e[39] !== i ? (X = {
+  e[39] !== r ? (X = {
     depthTest: !1,
-    ...i
-  }, e[39] = i, e[40] = X) : X = e[40];
+    ...r
+  }, e[39] = r, e[40] = X) : X = e[40];
   let z;
-  e[41] !== r ? (z = /* @__PURE__ */ H(cs, { overlayRef: r }), e[41] = r, e[42] = z) : z = e[42];
+  e[41] !== i ? (z = /* @__PURE__ */ H(cs, { overlayRef: i }), e[41] = i, e[42] = z) : z = e[42];
   let J;
   e[43] !== E || e[44] !== M || e[45] !== I || e[46] !== N || e[47] !== a ? (J = I ? /* @__PURE__ */ H(Lt, { mapTypeId: M, reuseMaps: !0, renderingType: "RASTER", ...E, defaultCenter: {
     lat: ((ye = a.initialViewState) == null ? void 0 : ye.latitude) ?? 0,
-    lng: ((L = a.initialViewState) == null ? void 0 : L.longitude) ?? 0
-  }, defaultZoom: ((je = a.initialViewState) == null ? void 0 : je.zoom) ?? 0, onTilesLoaded: () => ie({
+    lng: ((_ = a.initialViewState) == null ? void 0 : _.longitude) ?? 0
+  }, defaultZoom: ((je = a.initialViewState) == null ? void 0 : je.zoom) ?? 0, onTilesLoaded: () => re({
     type: "load"
-  }) }) : /* @__PURE__ */ H(bt, { reuseMaps: !0, mapStyle: N, onLoad: () => ie({
+  }) }) : /* @__PURE__ */ H(bt, { reuseMaps: !0, mapStyle: N, onLoad: () => re({
     type: "load"
   }), onRender: os }), e[43] = E, e[44] = M, e[45] = I, e[46] = N, e[47] = a, e[48] = J) : J = e[48];
   let W;
-  e[49] !== ge || e[50] !== h || e[51] !== O || e[52] !== D || e[53] !== B || e[54] !== re || e[55] !== y || e[56] !== t || e[57] !== a || e[58] !== X || e[59] !== z || e[60] !== J ? (W = /* @__PURE__ */ H(Tt, { children: /* @__PURE__ */ H("div", { className: "deckgl-map", children: /* @__PURE__ */ ht(vt, { controller: h, id: y, ref: t, layers: ge, getCursor: O, getTooltip: D, onLoad: se, onResize: B, onViewStateChange: re, parameters: X, ...a, children: [
+  e[49] !== ge || e[50] !== h || e[51] !== O || e[52] !== D || e[53] !== B || e[54] !== ie || e[55] !== y || e[56] !== t || e[57] !== a || e[58] !== X || e[59] !== z || e[60] !== J ? (W = /* @__PURE__ */ H(Tt, { children: /* @__PURE__ */ H("div", { className: "deckgl-map", children: /* @__PURE__ */ ht(vt, { controller: h, id: y, ref: t, layers: ge, getCursor: O, getTooltip: D, onLoad: se, onResize: B, onViewStateChange: ie, parameters: X, ...a, children: [
     z,
     J
-  ] }) }) }), e[49] = ge, e[50] = h, e[51] = O, e[52] = D, e[53] = B, e[54] = re, e[55] = y, e[56] = t, e[57] = a, e[58] = X, e[59] = z, e[60] = J, e[61] = W) : W = e[61];
+  ] }) }) }), e[49] = ge, e[50] = h, e[51] = O, e[52] = D, e[53] = B, e[54] = ie, e[55] = y, e[56] = t, e[57] = a, e[58] = X, e[59] = z, e[60] = J, e[61] = W) : W = e[61];
   let ce;
-  return e[62] !== _ || e[63] !== F || e[64] !== W ? (ce = /* @__PURE__ */ H(_t, { apiKey: F, ..._, children: W }), e[62] = _, e[63] = F, e[64] = W, e[65] = ce) : ce = e[65], ce;
+  return e[62] !== L || e[63] !== w || e[64] !== W ? (ce = /* @__PURE__ */ H(_t, { apiKey: w, ...L, children: W }), e[62] = L, e[63] = w, e[64] = W, e[65] = ce) : ce = e[65], ce;
 }
 function os() {
   const o = document.querySelector(".maplibregl-compact-show");
   o == null || o.classList.remove("maplibregl-compact-show");
 }
-function rs(o) {
+function is(o) {
   const {
     type: e,
     props: t
   } = o;
   return new e(t);
 }
-function is(o) {
+function rs(o) {
   return !!(o != null && o.type);
 }
 function as(o) {
@@ -195,13 +195,13 @@ function ls() {
   return null;
 }
 function cs(o) {
-  const e = C(4), {
+  const e = k(4), {
     overlayRef: t
   } = o, {
     default: n
   } = Mt(), s = Et();
-  let r, i;
-  return e[0] !== s || e[1] !== n ? (r = () => n ?? s, i = [n, s], e[0] = s, e[1] = n, e[2] = r, e[3] = i) : (r = e[2], i = e[3]), St(t, r, i), null;
+  let i, r;
+  return e[0] !== s || e[1] !== n ? (i = () => n ?? s, r = [n, s], e[0] = s, e[1] = n, e[2] = i, e[3] = r) : (i = e[2], r = e[3]), St(t, i, r), null;
 }
 const K = {
   addFeature: "addFeature",
@@ -297,21 +297,21 @@ const Te = "lassoLayer", ke = "maskLayer", ds = {
       return delete s[e], {
         layers: s
       };
-    const r = s[e] ?? {
+    const i = s[e] ?? {
       type: null,
       props: {}
-    }, i = [...r.props.extensions ?? [], ...((a = t.props) == null ? void 0 : a.extensions) ?? []].reduce((l, m) => (l.some((c) => c.equals(m)) || l.push(m), l), []);
+    }, r = [...i.props.extensions ?? [], ...((a = t.props) == null ? void 0 : a.extensions) ?? []].reduce((l, m) => (l.some((c) => c.equals(m)) || l.push(m), l), []);
     return s[e] = {
-      ...r,
+      ...i,
       ...t,
       props: {
         id: e,
-        ...r.props,
+        ...i.props,
         ...t.props,
-        extensions: i
+        extensions: r
       },
       legend: {
-        ...r.legend,
+        ...i.legend,
         ...t.legend
       }
     }, {
@@ -327,12 +327,12 @@ const Te = "lassoLayer", ke = "maskLayer", ds = {
   const e = o.reduce((t, n) => {
     const {
       id: s,
-      basemap: r
+      basemap: i
     } = n;
     return t[s] = {
       isLoaded: !1,
       areLayersLoaded: !1,
-      basemap: r,
+      basemap: i,
       instanceRef: {
         current: {}
       },
@@ -344,59 +344,59 @@ const Te = "lassoLayer", ke = "maskLayer", ds = {
   }, {});
   return (t, n) => ({
     maps: e,
-    setBasemap: (s, r) => t((i) => ({
+    setBasemap: (s, i) => t((r) => ({
       maps: {
-        ...i.maps,
+        ...r.maps,
         [s]: {
-          ...i.maps[s],
-          basemap: r
+          ...r.maps[s],
+          basemap: i
         }
       }
     })),
-    setLoad: (s, r) => t((i) => ({
+    setLoad: (s, i) => t((r) => ({
       maps: {
-        ...i.maps,
+        ...r.maps,
         [s]: {
-          ...i.maps[s],
-          isLoaded: r
+          ...r.maps[s],
+          isLoaded: i
         }
       }
     })),
-    setLayersLoad: (s, r) => t((i) => ({
+    setLayersLoad: (s, i) => t((r) => ({
       maps: {
-        ...i.maps,
+        ...r.maps,
         [s]: {
-          ...i.maps[s],
-          areLayersLoaded: r
+          ...r.maps[s],
+          areLayersLoaded: i
         }
       }
     })),
     getOverlayInstance: (s) => {
-      var i, a;
-      return (a = (i = n().maps[s]) == null ? void 0 : i.overlayRef) == null ? void 0 : a.current;
+      var r, a;
+      return (a = (r = n().maps[s]) == null ? void 0 : r.overlayRef) == null ? void 0 : a.current;
     },
     getDeckInstance: (s) => {
-      var i, a, l;
-      return (l = (a = (i = n().maps[s]) == null ? void 0 : i.instanceRef) == null ? void 0 : a.current) == null ? void 0 : l.deck;
+      var r, a, l;
+      return (l = (a = (r = n().maps[s]) == null ? void 0 : r.instanceRef) == null ? void 0 : a.current) == null ? void 0 : l.deck;
     },
     getViewState: (s) => {
-      const i = n().getDeckInstance(s);
-      return i == null ? void 0 : i.viewState;
+      const r = n().getDeckInstance(s);
+      return r == null ? void 0 : r.viewState;
     },
-    getViewports: (s, r) => {
+    getViewports: (s, i) => {
       const a = n().getDeckInstance(s);
-      return a == null ? void 0 : a.getViewports(r);
+      return a == null ? void 0 : a.getViewports(i);
     },
-    getViewport: (s, r = 0, i) => {
+    getViewport: (s, i = 0, r) => {
       var m;
       const l = n().getDeckInstance(s);
-      return (m = l == null ? void 0 : l.getViewports(i)) == null ? void 0 : m[r];
+      return (m = l == null ? void 0 : l.getViewports(r)) == null ? void 0 : m[i];
     },
-    addLayers: (s, r) => t((i) => {
+    addLayers: (s, i) => t((r) => {
       var c;
       const a = {
-        ...i.maps
-      }, l = ((c = a[s]) == null ? void 0 : c.layers) ?? [], m = /* @__PURE__ */ new Set([...l, ...r]);
+        ...r.maps
+      }, l = ((c = a[s]) == null ? void 0 : c.layers) ?? [], m = /* @__PURE__ */ new Set([...l, ...i]);
       return a[s] = {
         ...a[s],
         layers: [...m]
@@ -404,14 +404,14 @@ const Te = "lassoLayer", ke = "maskLayer", ds = {
         maps: a
       };
     }),
-    removeLayers: (s, r) => t((i) => {
+    removeLayers: (s, i) => t((r) => {
       var m;
       const a = {
-        ...i.maps
+        ...r.maps
       }, l = ((m = a[s]) == null ? void 0 : m.layers) ?? [];
       return a[s] = {
         ...a[s],
-        layers: l.filter((c) => !r.includes(c))
+        layers: l.filter((c) => !i.includes(c))
       }, {
         maps: a
       };
@@ -426,67 +426,67 @@ const Te = "lassoLayer", ke = "maskLayer", ds = {
     viewports: e.viewports,
     updateViewPort: (s) => {
       var a;
-      const r = n();
-      if (!((a = r.maps[s]) != null && a.isLoaded)) return;
-      const i = new jt(r.viewStates[s]);
+      const i = n();
+      if (!((a = i.maps[s]) != null && a.isLoaded)) return;
+      const r = new jt(i.viewStates[s]);
       t((l) => ({
         viewports: {
           ...l.viewports,
-          [s]: i
+          [s]: r
         }
       }));
     },
     viewStates: e.viewStates,
-    setViewState: (s, r) => t((i) => ({
+    setViewState: (s, i) => t((r) => ({
       viewStates: {
-        ...i.viewStates,
+        ...r.viewStates,
         [s]: {
-          ...i.viewStates[s],
-          ...r
+          ...r.viewStates[s],
+          ...i
         }
       }
     })),
-    setZoom: (s, r) => t((i) => ({
+    setZoom: (s, i) => t((r) => ({
       viewStates: {
-        ...i.viewStates,
+        ...r.viewStates,
         [s]: {
-          ...i.viewStates[s],
-          zoom: r
+          ...r.viewStates[s],
+          zoom: i
         }
       }
     })),
-    setMinZoom: (s, r) => t((i) => ({
+    setMinZoom: (s, i) => t((r) => ({
       viewStates: {
-        ...i.viewStates,
+        ...r.viewStates,
         [s]: {
-          ...i.viewStates[s],
-          minZoom: r
+          ...r.viewStates[s],
+          minZoom: i
         }
       }
     })),
-    setMaxZoom: (s, r) => t((i) => ({
+    setMaxZoom: (s, i) => t((r) => ({
       viewStates: {
-        ...i.viewStates,
+        ...r.viewStates,
         [s]: {
-          ...i.viewStates[s],
-          maxZoom: r
+          ...r.viewStates[s],
+          maxZoom: i
         }
       }
     }))
   });
 }, ys = (o, e) => ({
   fitBounds: (t, n, s) => {
-    const r = e(), i = r.getViewport(t);
-    if (!i) return;
+    const i = e(), r = i.getViewport(t);
+    if (!r) return;
     const l = {
-      ...i == null ? void 0 : i.fitBounds(n, s == null ? void 0 : s.boundsOptions),
+      ...r == null ? void 0 : r.fitBounds(n, s == null ? void 0 : s.boundsOptions),
       ...s == null ? void 0 : s.viewStateOptions
     };
-    r.setViewState(t, l);
+    i.setViewState(t, l);
   },
   flyTo: (t, n, s = {}) => {
-    const r = e();
-    if (!r.getViewport(t)) return;
+    const i = e();
+    if (!i.getViewport(t)) return;
     const a = {
       ...ms,
       ...s == null ? void 0 : s.viewStateOptions
@@ -494,7 +494,7 @@ const Te = "lassoLayer", ke = "maskLayer", ds = {
       ...n,
       ...a
     };
-    r.setViewState(t, l);
+    i.setViewState(t, l);
   }
 }), hs = (o) => $e()((...e) => ({
   ...ps(o)(...e),
@@ -502,17 +502,17 @@ const Te = "lassoLayer", ke = "maskLayer", ds = {
   ...ys(...e)
 })), ot = qe({});
 function Ss(o) {
-  const e = C(5), {
+  const e = k(5), {
     children: t,
     values: n
   } = o;
   let s;
   e[0] !== n ? (s = hs(n), e[0] = n, e[1] = s) : s = e[1];
-  const [r] = fe(s);
-  let i;
-  return e[2] !== t || e[3] !== r ? (i = /* @__PURE__ */ H(ot.Provider, { value: r, children: t }), e[2] = t, e[3] = r, e[4] = i) : i = e[4], i;
+  const [i] = fe(s);
+  let r;
+  return e[2] !== t || e[3] !== i ? (r = /* @__PURE__ */ H(ot.Provider, { value: i, children: t }), e[2] = t, e[3] = i, e[4] = r) : r = e[4], r;
 }
-function w(o) {
+function F(o) {
   const e = Ue(ot);
   if (!Object.keys(e).length)
     throw new Error("Missing MapProvider in the tree");
@@ -533,17 +533,17 @@ function bs() {
   }
   function t(h) {
     var y = Object.prototype.toString.call(h);
-    return y === "[object RegExp]" || y === "[object Date]" || r(h);
+    return y === "[object RegExp]" || y === "[object Date]" || i(h);
   }
   var n = typeof Symbol == "function" && Symbol.for, s = n ? Symbol.for("react.element") : 60103;
-  function r(h) {
+  function i(h) {
     return h.$$typeof === s;
   }
-  function i(h) {
+  function r(h) {
     return Array.isArray(h) ? [] : {};
   }
   function a(h, y) {
-    return y.clone !== !1 && y.isMergeableObject(h) ? f(i(h), h, y) : h;
+    return y.clone !== !1 && y.isMergeableObject(h) ? f(r(h), h, y) : h;
   }
   function l(h, y, T) {
     return h.concat(y).map(function(S) {
@@ -584,8 +584,8 @@ function bs() {
   }
   function f(h, y, T) {
     T = T || {}, T.arrayMerge = T.arrayMerge || l, T.isMergeableObject = T.isMergeableObject || o, T.cloneUnlessOtherwiseSpecified = a;
-    var S = Array.isArray(y), v = Array.isArray(h), _ = S === v;
-    return _ ? S ? T.arrayMerge(h, y, T) : g(h, y, T) : a(y, T);
+    var S = Array.isArray(y), v = Array.isArray(h), L = S === v;
+    return L ? S ? T.arrayMerge(h, y, T) : g(h, y, T) : a(y, T);
   }
   f.all = function(y, T) {
     if (!Array.isArray(y))
@@ -619,7 +619,7 @@ function Ls({
   getFillColor: n,
   pointColor: s
 }) {
-  const r = Me(o, {
+  const i = Me(o, {
     modeConfig: {
       //   // We force distance due to conversion is addressed at feature getText level
       //   formatTooltip: (_distance: number) => {
@@ -628,7 +628,7 @@ function Ls({
       preventOverlappingLines: !0
     },
     onEdit: e
-  }), i = Me(ds, {
+  }), r = Me(ds, {
     getTentativeLineColor: t,
     getTentativeFillColor: n,
     getLineColor: t,
@@ -637,20 +637,20 @@ function Ls({
     getEditHandlePointOutlineColor: s.outline,
     dataComparator: (l, m) => l.features[0] === m.features[0]
   });
-  return Me(i, r);
+  return Me(r, i);
 }
 const _s = (o) => $e()((e) => ({
   data: o.reduce((n, s) => {
     const {
-      enabled: r = !1,
-      mapId: i,
+      enabled: i = !1,
+      mapId: r,
       modeInstance: a,
       modes: l = Be,
       modeSelected: m = Be.polygon.value,
       values: c = {}
     } = s;
-    return n[i] = {
-      enabled: r,
+    return n[r] = {
+      enabled: i,
       modeInstance: a,
       modes: l,
       modeSelected: m,
@@ -658,49 +658,49 @@ const _s = (o) => $e()((e) => ({
     }, n;
   }, {}),
   setEnabled: (n, s) => {
-    e((r) => ({
+    e((i) => ({
       data: {
-        ...r.data,
+        ...i.data,
         [n]: {
-          ...r.data[n],
+          ...i.data[n],
           enabled: s,
           visible: s
         }
       }
     }));
   },
-  setValue: (n, s, r) => {
-    e((i) => {
+  setValue: (n, s, i) => {
+    e((r) => {
       const a = {
-        ...i.data[n].values
+        ...r.data[n].values
       }, l = a[s] ?? {
         type: "mask"
       };
       return a[s] = {
         ...l,
-        ...r,
+        ...i,
         id: s
-      }, r || delete a[s], {
+      }, i || delete a[s], {
         data: {
-          ...i.data,
+          ...r.data,
           [n]: {
-            ...i.data[n],
+            ...r.data[n],
             values: a
           }
         }
       };
     });
   },
-  setVisibility: (n, s, r) => {
-    e((i) => {
+  setVisibility: (n, s, i) => {
+    e((r) => {
       const a = {
-        ...i.data[n].values
+        ...r.data[n].values
       }, l = a[s] ?? {};
-      return l.properties.visible = r, {
+      return l.properties.visible = i, {
         data: {
-          ...i.data,
+          ...r.data,
           [n]: {
-            ...i.data[n],
+            ...r.data[n],
             values: {
               ...a,
               [s]: l
@@ -711,41 +711,41 @@ const _s = (o) => $e()((e) => ({
     });
   },
   setModeSelected: (n, s) => {
-    e((r) => ({
+    e((i) => ({
       data: {
-        ...r.data,
+        ...i.data,
         [n]: {
-          ...r.data[n],
+          ...i.data[n],
           modeSelected: s
         }
       }
     }));
   },
   setModeInstance: (n, s) => {
-    e((r) => ({
+    e((i) => ({
       data: {
-        ...r.data,
+        ...i.data,
         [n]: {
-          ...r.data[n],
+          ...i.data[n],
           modeInstance: s
         }
       }
     }));
   }
-})), rt = qe({});
+})), it = qe({});
 function Ps(o) {
-  const e = C(5), {
+  const e = k(5), {
     children: t,
     values: n
   } = o;
   let s;
   e[0] !== n ? (s = () => _s(n), e[0] = n, e[1] = s) : s = e[1];
-  const [r] = fe(s);
-  let i;
-  return e[2] !== t || e[3] !== r ? (i = /* @__PURE__ */ H(rt.Provider, { value: r, children: t }), e[2] = t, e[3] = r, e[4] = i) : i = e[4], i;
+  const [i] = fe(s);
+  let r;
+  return e[2] !== t || e[3] !== i ? (r = /* @__PURE__ */ H(it.Provider, { value: i, children: t }), e[2] = t, e[3] = i, e[4] = r) : r = e[4], r;
 }
 function j(o) {
-  const e = Ue(rt);
+  const e = Ue(it);
   if (!Object.keys(e).length)
     throw new Error("Missing LassoToolsProvider in the tree");
   return Ve(e, o);
@@ -760,7 +760,7 @@ function Es({
   }), n = j((u) => u.setEnabled), s = j((u) => {
     var g;
     return (g = u.data[o]) == null ? void 0 : g.values;
-  }), r = j((u) => u.setValue), i = j((u) => u.setVisibility), a = j((u) => {
+  }), i = j((u) => u.setValue), r = j((u) => u.setVisibility), a = j((u) => {
     var g;
     return (g = u.data[o]) == null ? void 0 : g.modeSelected;
   }), l = j((u) => u.setModeSelected), m = j((u) => {
@@ -799,13 +799,13 @@ function Es({
       mask: p
       // draw,
     },
-    setValue: $((u) => r(o, u), [o, r]),
+    setValue: $((u) => i(o, u), [o, i]),
     setEnabled: $((u) => n(o, u), [o, n]),
-    setVisibility: $((u, g) => i(o, u, g), [o, i]),
+    setVisibility: $((u, g) => r(o, u, g), [o, r]),
     setModeSelected: d
   });
 }
-function it({
+function rt({
   values: o
 }) {
   return Object.values(o ?? {}).filter((e) => e.type === "mask");
@@ -828,12 +828,12 @@ function Ce({
     autoSplitNumber: Ke
   }
 }) {
-  const r = e === xe["m-km"], i = e === xe["ft-mi"], a = r || i;
+  const i = e === xe["m-km"], r = e === xe["ft-mi"], a = i || r;
   let l, m;
   if (a) {
     const c = o < (n ?? Ke);
     let p = c ? R.meter : R.kilometer;
-    l = c ? Le.meter : Le.kilometer, i && (l = c ? Le.feet : Le.mile, p = c ? R.feet : R.mile), m = Qe(o, p);
+    l = c ? Le.meter : Le.kilometer, r && (l = c ? Le.feet : Le.mile, p = c ? R.feet : R.mile), m = Qe(o, p);
   } else
     l = Le[e], m = Qe(o, e);
   return `${st(m, t, {
@@ -865,15 +865,15 @@ function at(o, e, t) {
       turfOptions: {
         units: "kilometers"
       }
-    }, r = s == null ? void 0 : s.units;
-    let i;
-    n ? i = n(o) : i = `${parseFloat(o.toString()).toFixed(2)} ${r}`;
+    }, i = s == null ? void 0 : s.units;
+    let r;
+    n ? r = n(o) : r = `${parseFloat(o.toString()).toFixed(2)} ${i}`;
     const {
       measurementCallback: a
     } = t;
     return a && a(o), [{
       position: e,
-      text: i
+      text: r
     }];
   }
   return [];
@@ -893,12 +893,12 @@ class Cs extends Rt {
     this._isMeasuringSessionFinished && (this._isMeasuringSessionFinished = !1, this.resetClickSequence(), this.area = 0);
     const {
       picks: s
-    } = t, r = Dt(s), i = this.getClickSequence();
+    } = t, i = Dt(s), r = this.getClickSequence();
     let a = !1;
-    !r && !this.allowOverlapping(n) && (this.addClickSequence(t), a = !0), this.area = Ne({
+    !i && !this.allowOverlapping(n) && (this.addClickSequence(t), a = !0), this.area = Ne({
       type: "Polygon",
       coordinates: [this.getClickSequence()]
-    }), this.isFinalizedEdition(i, r) ? this.finalizeEdition(n) : a && n.onEdit({
+    }), this.isFinalizedEdition(r, i) ? this.finalizeEdition(n) : a && n.onEdit({
       // data is the same
       updatedData: n.data,
       editType: "addTentativePosition",
@@ -916,8 +916,8 @@ class Cs extends Rt {
     super.handlePointerMove(t, n);
     const s = this.getTentativeGuide(n);
     if (s && s.geometry.type === "Polygon") {
-      const r = It(s);
-      this.area = Ne(s), this.tooltips = at(this.area, r.geometry.coordinates, n.modeConfig);
+      const i = It(s);
+      this.area = Ne(s), this.tooltips = at(this.area, i.geometry.coordinates, n.modeConfig);
     }
   }
   resetClickSequence() {
@@ -938,19 +938,19 @@ class Cs extends Rt {
     return t.length > 2 && n !== void 0 && (s[0] === 0 || s[0] === t.length - 1);
   }
   allowOverlapping(t) {
-    var r;
+    var i;
     let n = !1;
     const s = this.getClickSequence();
     if (s.length > 2 && // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    ((r = t.modeConfig) != null && r.preventOverlappingLines)) {
-      const i = {
+    ((i = t.modeConfig) != null && i.preventOverlappingLines)) {
+      const r = {
         type: "LineString",
         coordinates: [...s, s[0]]
       }, a = {
         type: "LineString",
         coordinates: [...s.slice(0, s.length - 1)]
       };
-      Bt(i, a).features.length > 0 && (n = !0);
+      Bt(r, a).features.length > 0 && (n = !0);
     }
     return n;
   }
@@ -963,12 +963,12 @@ class Cs extends Rt {
       type: "FeatureCollection",
       features: []
     };
-    const r = this.getAddFeatureOrBooleanPolygonAction(s, t);
-    this._isMeasuringSessionFinished = !0, r && (this.resultPolygon = r.updatedData, t.onEdit({
-      ...r,
+    const i = this.getAddFeatureOrBooleanPolygonAction(s, t);
+    this._isMeasuringSessionFinished = !0, i && (this.resultPolygon = i.updatedData, t.onEdit({
+      ...i,
       editType: K.addPosition,
       editContext: {
-        ...r.editContext,
+        ...i.editContext,
         distance: this.area,
         positions: this.getClickSequence(),
         finished: this._isMeasuringSessionFinished
@@ -987,13 +987,13 @@ class Cs extends Rt {
     meters: t,
     locale: n,
     unit: s,
-    options: r
+    options: i
   }) {
     return Ce({
       meters: t,
       locale: n,
       unit: s,
-      options: r
+      options: i
     }) + "2";
   }
 }
@@ -1063,13 +1063,13 @@ class Fs extends Xe {
     meters: t,
     locale: n,
     unit: s,
-    options: r
+    options: i
   }) {
     return Ce({
       meters: t,
       locale: n,
       unit: s,
-      options: r
+      options: i
     }) + "2";
   }
 }
@@ -1092,7 +1092,7 @@ class lt extends xt {
     const {
       key: n
     } = e, s = this.getClickSequence().length;
-    let r = K.finish;
+    let i = K.finish;
     switch (n) {
       case "Escape":
         t.onEdit({
@@ -1105,9 +1105,9 @@ class lt extends xt {
         });
         break;
       case "Enter":
-        this._isMeasuringSessionFinished = !0, s === 1 && (this.resetClickSequence(), r = K.cancel), t.onUpdateCursor("cell"), t.onEdit({
+        this._isMeasuringSessionFinished = !0, s === 1 && (this.resetClickSequence(), i = K.cancel), t.onUpdateCursor("cell"), t.onEdit({
           updatedData: t.data,
-          editType: r,
+          editType: i,
           editContext: {
             finished: this._isMeasuringSessionFinished
           }
@@ -1267,9 +1267,9 @@ function qs({
     labels: Ae.labels
   },
   layerProps: s = {},
-  defaultType: r = "mask"
+  defaultType: i = "mask"
 }) {
-  const i = j((b) => {
+  const r = j((b) => {
     var P;
     return (P = b.data[e]) == null ? void 0 : P.enabled;
   }), a = j((b) => b.setEnabled), l = j((b) => {
@@ -1281,10 +1281,10 @@ function qs({
   }), p = j((b) => {
     var P;
     return (P = b.data[e]) == null ? void 0 : P.modeSelected;
-  }), d = _e((b) => b.setLayer), u = w((b) => b.addLayers), g = w((b) => b.removeLayers), f = w(tt((b) => {
+  }), d = _e((b) => b.setLayer), u = F((b) => b.addLayers), g = F((b) => b.removeLayers), f = F(tt((b) => {
     var P;
-    return (P = b.maps[e]) == null ? void 0 : P.layers.filter((k) => !xs.includes(k));
-  })), M = w((b) => b.getDeckInstance), h = Ee({}), y = de(() => it({
+    return (P = b.maps[e]) == null ? void 0 : P.layers.filter((C) => !xs.includes(C));
+  })), M = F((b) => b.getDeckInstance), h = Ee({}), y = de(() => rt({
     values: l
   }), [l]), T = de(() => ({
     type: "FeatureCollection",
@@ -1294,15 +1294,15 @@ function qs({
       properties: b.properties,
       id: b.id
     }))
-  }), [y]), S = de(() => y.filter((b) => b.properties.visible).map((b) => b.id), [y]), [v, _] = fe(T), [E, F] = fe([]), O = $(() => {
+  }), [y]), S = de(() => y.filter((b) => b.properties.visible).map((b) => b.id), [y]), [v, L] = fe(T), [E, w] = fe([]), O = $(() => {
     const b = {
       ...T,
       features: T.features.filter((P) => {
-        var k;
-        return (k = P.properties) == null ? void 0 : k.visible;
+        var C;
+        return (C = P.properties) == null ? void 0 : C.visible;
       })
     };
-    _(b);
+    L(b);
   }, [T]);
   Y(() => {
     O();
@@ -1312,7 +1312,7 @@ function qs({
     g(e, [Te]);
   }), [u, e, g]);
   const U = $(() => {
-    O(), F([]), a(e, !1);
+    O(), w([]), a(e, !1);
   }, [e, O, a]), V = $(({
     editType: b,
     updatedData: P
@@ -1321,22 +1321,22 @@ function qs({
       U();
       return;
     }
-    _(P), b !== K.updateTentativeFeature && b === K.addFeature && (p !== "edit" && (D.current = D.current + 1), P.features.forEach((k, A) => {
+    L(P), b !== K.updateTentativeFeature && b === K.addFeature && (p !== "edit" && (D.current = D.current + 1), P.features.forEach((C, A) => {
       var B;
-      (B = k.properties).label ?? (B.label = `${n == null ? void 0 : n.mask} ${D.current}`), k.properties.index = A, k.properties.visible = k.properties.visible ?? !0;
-      const x = k.id ?? crypto.randomUUID();
+      (B = C.properties).label ?? (B.label = `${n == null ? void 0 : n.mask} ${D.current}`), C.properties.index = A, C.properties.visible = C.properties.visible ?? !0;
+      const x = C.id ?? crypto.randomUUID();
       m(e, x, {
-        geometry: k.geometry,
-        properties: k.properties,
+        geometry: C.geometry,
+        properties: C.properties,
         // visible: true,
-        type: r
+        type: i
       });
     }), U());
-  }, [r, U, n == null ? void 0 : n.mask, e, p, m]);
+  }, [i, U, n == null ? void 0 : n.mask, e, p, m]);
   return Y(() => {
-    const b = i, {
+    const b = r, {
       border: P,
-      point: k,
+      point: C,
       fill: A
     } = t.colors.editing, {
       border: x,
@@ -1352,20 +1352,20 @@ function qs({
         },
         onClick: (G) => {
           const I = G;
-          I.isGuide || F([I.index]);
+          I.isGuide || w([I.index]);
         }
       },
       getLineColor: (G) => E[0] === G.properties.index ? P : x,
       getFillColor: (G) => E[0] === G.properties.index ? A : B,
       pointColor: {
-        fill: k,
+        fill: C,
         outline: P
       },
       onEdit: V,
       mode: b ? c : qt
     });
     d(Te, N);
-  }, [v, i, s.mask, S, c, V, E, d, t.colors.editing, t.colors.finished]), Y(() => {
+  }, [v, r, s.mask, S, c, V, E, d, t.colors.editing, t.colors.finished]), Y(() => {
     const b = {
       ...Pe,
       data: T,
@@ -1382,21 +1382,19 @@ function qs({
     };
   }, [u, e, T, S, g, d]), Y(() => {
     f == null || f.forEach((b) => {
-      var k;
-      if (i) {
-        const A = (k = M(e)) == null ? void 0 : k.props.layers.find((x) => x.props.id === b);
-        h.current[b] = A == null ? void 0 : A.props.pickable;
-      }
-      const P = !i && h.current[b];
+      var A;
+      const P = (A = M(e)) == null ? void 0 : A.props.layers.find((x) => x.props.id === b);
+      r && (h.current[b] = P == null ? void 0 : P.props.pickable);
+      const C = !r && (h.current[b] ?? (P == null ? void 0 : P.props.pickable));
       d(b, {
         props: {
-          pickable: P,
+          pickable: C,
           extensions: [new $t()],
-          maskId: !i && S.length ? ke : void 0
+          maskId: !r && S.length ? ke : void 0
         }
       });
     });
-  }, [i, M, e, f, S.length, d]), o;
+  }, [r, M, e, f, S.length, d]), o;
 }
 qs.Controls = Es;
 function Us({
@@ -1422,8 +1420,8 @@ function $s({
   locale: t,
   enabled: n,
   unit: s,
-  onEdit: r,
-  guideColor: i,
+  onEdit: i,
+  guideColor: r,
   pointColor: a,
   textOptions: l
 }) {
@@ -1438,7 +1436,7 @@ function $s({
       }
     },
     ...n && {
-      onEdit: r
+      onEdit: i
     },
     _subLayerProps: {
       tooltips: {
@@ -1466,20 +1464,20 @@ function $s({
   }), c = Me(ws, {
     _subLayerProps: {
       guides: {
-        getLineColor: i,
-        getFillColor: i.with(3, 20)
+        getLineColor: r,
+        getFillColor: r.with(3, 20)
       }
     },
     getEditHandlePointColor: a,
-    getEditHandlePointOutlineColor: i
+    getEditHandlePointOutlineColor: r
   });
   return Me(c, m);
 }
 const Vs = (o) => $e()((e) => ({
   measurements: o.reduce((n, s) => {
     const {
-      mapId: r,
-      modeSelected: i,
+      mapId: i,
+      modeSelected: r,
       modes: a = Rs,
       units: l = Ds,
       distance: m = 0,
@@ -1490,10 +1488,10 @@ const Vs = (o) => $e()((e) => ({
       unit: g = xe["m-km"],
       enabled: f = !1
     } = s;
-    return n[r] = {
+    return n[i] = {
       modes: a,
       units: l,
-      modeSelected: i,
+      modeSelected: r,
       distance: m,
       finished: c,
       locale: p,
@@ -1505,88 +1503,88 @@ const Vs = (o) => $e()((e) => ({
   }, {}),
   mode: lt,
   setModeInstance: (n, s) => {
-    e((r) => ({
+    e((i) => ({
       measurements: {
-        ...r.measurements,
+        ...i.measurements,
         [n]: {
-          ...r.measurements[n],
+          ...i.measurements[n],
           modeInstance: s
         }
       }
     }));
   },
   setModeSelected: (n, s) => {
-    e((r) => ({
+    e((i) => ({
       measurements: {
-        ...r.measurements,
+        ...i.measurements,
         [n]: {
-          ...r.measurements[n],
+          ...i.measurements[n],
           modeSelected: s
         }
       }
     }));
   },
   setFinished: (n, s) => {
-    e((r) => ({
+    e((i) => ({
       measurements: {
-        ...r.measurements,
+        ...i.measurements,
         [n]: {
-          ...r.measurements[n],
+          ...i.measurements[n],
           finished: s
         }
       }
     }));
   },
   setDistance: (n, s) => {
-    e((r) => ({
+    e((i) => ({
       measurements: {
-        ...r.measurements,
+        ...i.measurements,
         [n]: {
-          ...r.measurements[n],
+          ...i.measurements[n],
           distance: s
         }
       }
     }));
   },
   setUnit: (n, s) => {
-    e((r) => ({
+    e((i) => ({
       measurements: {
-        ...r.measurements,
+        ...i.measurements,
         [n]: {
-          ...r.measurements[n],
+          ...i.measurements[n],
           unit: s
         }
       }
     }));
   },
   setLocale: (n, s) => {
-    e((r) => ({
+    e((i) => ({
       measurements: {
-        ...r.measurements,
+        ...i.measurements,
         [n]: {
-          ...r.measurements[n],
+          ...i.measurements[n],
           locale: s
         }
       }
     }));
   },
   setPositions: (n, s) => {
-    e((r) => ({
+    e((i) => ({
       measurements: {
-        ...r.measurements,
+        ...i.measurements,
         [n]: {
-          ...r.measurements[n],
+          ...i.measurements[n],
           positions: [...s]
         }
       }
     }));
   },
   setEnabled: (n, s) => {
-    e((r) => ({
+    e((i) => ({
       measurements: {
-        ...r.measurements,
+        ...i.measurements,
         [n]: {
-          ...r.measurements[n],
+          ...i.measurements[n],
           enabled: s
         }
       }
@@ -1594,15 +1592,15 @@ const Vs = (o) => $e()((e) => ({
   }
 })), ct = qe({});
 function js(o) {
-  const e = C(5), {
+  const e = k(5), {
     children: t,
     values: n
   } = o;
   let s;
   e[0] !== n ? (s = Vs(n), e[0] = n, e[1] = s) : s = e[1];
-  const [r] = fe(s);
-  let i;
-  return e[2] !== t || e[3] !== r ? (i = /* @__PURE__ */ H(ct.Provider, { value: r, children: t }), e[2] = t, e[3] = r, e[4] = i) : i = e[4], i;
+  const [i] = fe(s);
+  let r;
+  return e[2] !== t || e[3] !== i ? (r = /* @__PURE__ */ H(ct.Provider, { value: i, children: t }), e[2] = t, e[3] = i, e[4] = r) : r = e[4], r;
 }
 function q(o) {
   const e = Ue(ct);
@@ -1611,67 +1609,67 @@ function q(o) {
   return Ve(e, o);
 }
 function ut(o) {
-  const e = C(74), {
+  const e = k(74), {
     mapId: t
   } = o;
   let n;
-  e[0] !== t ? (n = (L) => L.measurements[t].modes, e[0] = t, e[1] = n) : n = e[1];
+  e[0] !== t ? (n = (_) => _.measurements[t].modes, e[0] = t, e[1] = n) : n = e[1];
   const s = q(n);
-  let r;
-  e[2] !== t ? (r = (L) => L.measurements[t].units, e[2] = t, e[3] = r) : r = e[3];
-  const i = q(r);
+  let i;
+  e[2] !== t ? (i = (_) => _.measurements[t].units, e[2] = t, e[3] = i) : i = e[3];
+  const r = q(i);
   let a;
-  e[4] !== t ? (a = (L) => L.measurements[t].distance, e[4] = t, e[5] = a) : a = e[5];
+  e[4] !== t ? (a = (_) => _.measurements[t].distance, e[4] = t, e[5] = a) : a = e[5];
   const l = q(a), m = q(Zs);
   let c;
-  e[6] !== m || e[7] !== t ? (c = (L) => m(t, L), e[6] = m, e[7] = t, e[8] = c) : c = e[8];
+  e[6] !== m || e[7] !== t ? (c = (_) => m(t, _), e[6] = m, e[7] = t, e[8] = c) : c = e[8];
   const p = c;
   let d;
-  e[9] !== t ? (d = (L) => L.measurements[t].clearLayerOnStart, e[9] = t, e[10] = d) : d = e[10];
+  e[9] !== t ? (d = (_) => _.measurements[t].clearLayerOnStart, e[9] = t, e[10] = d) : d = e[10];
   const u = q(d);
   let g;
-  e[11] !== t ? (g = (L) => L.measurements[t].enabled, e[11] = t, e[12] = g) : g = e[12];
+  e[11] !== t ? (g = (_) => _.measurements[t].enabled, e[11] = t, e[12] = g) : g = e[12];
   const f = q(g), M = q(Gs);
   let h;
-  e[13] !== M || e[14] !== t ? (h = (L) => M(t, L), e[13] = M, e[14] = t, e[15] = h) : h = e[15];
+  e[13] !== M || e[14] !== t ? (h = (_) => M(t, _), e[13] = M, e[14] = t, e[15] = h) : h = e[15];
   const y = h;
   let T;
-  e[16] !== t ? (T = (L) => L.measurements[t].modeSelected, e[16] = t, e[17] = T) : T = e[17];
+  e[16] !== t ? (T = (_) => _.measurements[t].modeSelected, e[16] = t, e[17] = T) : T = e[17];
   const S = q(T), v = q(Ks);
-  let _;
-  e[18] !== v || e[19] !== t || e[20] !== y ? (_ = (L) => {
-    y(!!L), v(t, L);
-  }, e[18] = v, e[19] = t, e[20] = y, e[21] = _) : _ = e[21];
-  const E = _;
-  let F;
-  e[22] !== t ? (F = (L) => L.measurements[t].finished, e[22] = t, e[23] = F) : F = e[23];
-  const O = q(F), D = q(Qs);
+  let L;
+  e[18] !== v || e[19] !== t || e[20] !== y ? (L = (_) => {
+    y(!!_), v(t, _);
+  }, e[18] = v, e[19] = t, e[20] = y, e[21] = L) : L = e[21];
+  const E = L;
+  let w;
+  e[22] !== t ? (w = (_) => _.measurements[t].finished, e[22] = t, e[23] = w) : w = e[23];
+  const O = q(w), D = q(Qs);
   let U;
-  e[24] !== D || e[25] !== t ? (U = (L) => D(t, L), e[24] = D, e[25] = t, e[26] = U) : U = e[26];
+  e[24] !== D || e[25] !== t ? (U = (_) => D(t, _), e[24] = D, e[25] = t, e[26] = U) : U = e[26];
   const V = U;
   let b;
-  e[27] !== t ? (b = (L) => L.measurements[t].locale, e[27] = t, e[28] = b) : b = e[28];
-  const P = q(b), k = q(Hs);
+  e[27] !== t ? (b = (_) => _.measurements[t].locale, e[27] = t, e[28] = b) : b = e[28];
+  const P = q(b), C = q(Hs);
   let A;
-  e[29] !== k || e[30] !== t ? (A = (L) => k(t, L), e[29] = k, e[30] = t, e[31] = A) : A = e[31];
+  e[29] !== C || e[30] !== t ? (A = (_) => C(t, _), e[29] = C, e[30] = t, e[31] = A) : A = e[31];
   const x = A;
   let B;
-  e[32] !== t ? (B = (L) => L.measurements[t].modeInstance, e[32] = t, e[33] = B) : B = e[33];
+  e[32] !== t ? (B = (_) => _.measurements[t].modeInstance, e[32] = t, e[33] = B) : B = e[33];
   const N = q(B), G = q(Bs);
   let I;
-  e[34] !== G || e[35] !== t ? (I = (L) => G(t, L), e[34] = G, e[35] = t, e[36] = I) : I = e[36];
+  e[34] !== G || e[35] !== t ? (I = (_) => G(t, _), e[34] = G, e[35] = t, e[36] = I) : I = e[36];
   const be = I;
   let te;
-  e[37] !== t ? (te = (L) => L.measurements[t].positions, e[37] = t, e[38] = te) : te = e[38];
+  e[37] !== t ? (te = (_) => _.measurements[t].positions, e[37] = t, e[38] = te) : te = e[38];
   const ge = q(te), oe = q(Is);
-  let re;
-  e[39] !== oe || e[40] !== t ? (re = (L) => oe(t, L), e[39] = oe, e[40] = t, e[41] = re) : re = e[41];
-  const Z = re;
   let ie;
-  e[42] !== t ? (ie = (L) => L.measurements[t].unit, e[42] = t, e[43] = ie) : ie = e[43];
-  const ae = q(ie), le = q(Ns);
+  e[39] !== oe || e[40] !== t ? (ie = (_) => oe(t, _), e[39] = oe, e[40] = t, e[41] = ie) : ie = e[41];
+  const Z = ie;
+  let re;
+  e[42] !== t ? (re = (_) => _.measurements[t].unit, e[42] = t, e[43] = re) : re = e[43];
+  const ae = q(re), le = q(Ns);
   let se;
-  e[44] !== le || e[45] !== t ? (se = (L) => le(t, L), e[44] = le, e[45] = t, e[46] = se) : se = e[46];
+  e[44] !== le || e[45] !== t ? (se = (_) => le(t, _), e[44] = le, e[45] = t, e[46] = se) : se = e[46];
   const X = se;
   let z;
   e[47] !== N || e[48] !== Z ? (z = () => {
@@ -1679,14 +1677,14 @@ function ut(o) {
   }, e[47] = N, e[48] = Z, e[49] = z) : z = e[49];
   const J = z;
   let W;
-  e[50] !== y ? (W = (L) => {
-    y(L);
+  e[50] !== y ? (W = (_) => {
+    y(_);
   }, e[50] = y, e[51] = W) : W = e[51];
   const ce = W;
   let ye;
-  return e[52] !== J || e[53] !== u || e[54] !== l || e[55] !== f || e[56] !== O || e[57] !== P || e[58] !== N || e[59] !== S || e[60] !== s || e[61] !== ge || e[62] !== p || e[63] !== y || e[64] !== V || e[65] !== x || e[66] !== be || e[67] !== E || e[68] !== Z || e[69] !== X || e[70] !== ce || e[71] !== ae || e[72] !== i ? (ye = {
+  return e[52] !== J || e[53] !== u || e[54] !== l || e[55] !== f || e[56] !== O || e[57] !== P || e[58] !== N || e[59] !== S || e[60] !== s || e[61] !== ge || e[62] !== p || e[63] !== y || e[64] !== V || e[65] !== x || e[66] !== be || e[67] !== E || e[68] !== Z || e[69] !== X || e[70] !== ce || e[71] !== ae || e[72] !== r ? (ye = {
     modes: s,
-    units: i,
+    units: r,
     distance: l,
     clearLayerOnStart: u,
     modeSelected: S,
@@ -1706,7 +1704,7 @@ function ut(o) {
     toggleLayer: ce,
     clearLayer: J,
     setModeInstance: be
-  }, e[52] = J, e[53] = u, e[54] = l, e[55] = f, e[56] = O, e[57] = P, e[58] = N, e[59] = S, e[60] = s, e[61] = ge, e[62] = p, e[63] = y, e[64] = V, e[65] = x, e[66] = be, e[67] = E, e[68] = Z, e[69] = X, e[70] = ce, e[71] = ae, e[72] = i, e[73] = ye) : ye = e[73], ye;
+  }, e[52] = J, e[53] = u, e[54] = l, e[55] = f, e[56] = O, e[57] = P, e[58] = N, e[59] = S, e[60] = s, e[61] = ge, e[62] = p, e[63] = y, e[64] = V, e[65] = x, e[66] = be, e[67] = E, e[68] = Z, e[69] = X, e[70] = ce, e[71] = ae, e[72] = r, e[73] = ye) : ye = e[73], ye;
 }
 function Ns(o) {
   return o.setUnit;
@@ -1733,17 +1731,17 @@ function Zs(o) {
   return o.setDistance;
 }
 function zs(o) {
-  const e = C(42), {
+  const e = k(42), {
     mapId: t,
     textOptions: n,
     children: s
   } = o;
-  let r;
-  e[0] !== t ? (r = {
+  let i;
+  e[0] !== t ? (i = {
     mapId: t
-  }, e[0] = t, e[1] = r) : r = e[1];
+  }, e[0] = t, e[1] = i) : i = e[1];
   const {
-    modes: i,
+    modes: r,
     units: a,
     distance: l,
     setDistance: m,
@@ -1759,31 +1757,31 @@ function zs(o) {
     modeInstance: T,
     setModeInstance: S,
     positions: v,
-    setPositions: _,
+    setPositions: L,
     unit: E,
-    setUnit: F,
+    setUnit: w,
     clearLayer: O,
     toggleLayer: D
-  } = ut(r);
+  } = ut(i);
   let U;
-  e[2] !== p || e[3] !== i || e[4] !== S || e[5] !== _ ? (U = () => {
-    if (p && i[p]) {
-      const x = i[p].mode;
+  e[2] !== p || e[3] !== r || e[4] !== S || e[5] !== L ? (U = () => {
+    if (p && r[p]) {
+      const x = r[p].mode;
       S(new x());
     }
     return () => {
-      _([]);
+      L([]);
     };
-  }, e[2] = p, e[3] = i, e[4] = S, e[5] = _, e[6] = U) : U = e[6];
+  }, e[2] = p, e[3] = r, e[4] = S, e[5] = L, e[6] = U) : U = e[6];
   let V;
-  e[7] !== p || e[8] !== i || e[9] !== g || e[10] !== S || e[11] !== _ ? (V = [i, p, _, S, g], e[7] = p, e[8] = i, e[9] = g, e[10] = S, e[11] = _, e[12] = V) : V = e[12], Y(U, V);
+  e[7] !== p || e[8] !== r || e[9] !== g || e[10] !== S || e[11] !== L ? (V = [r, p, L, S, g], e[7] = p, e[8] = r, e[9] = g, e[10] = S, e[11] = L, e[12] = V) : V = e[12], Y(U, V);
   let b;
   e[13] !== D || e[14] !== O || e[15] !== c || e[16] !== f ? (b = (x) => {
     x && (c || !f) && O(), D(x);
   }, e[13] = D, e[14] = O, e[15] = c, e[16] = f, e[17] = b) : b = e[17];
-  const P = b, k = !!c;
+  const P = b, C = !!c;
   let A;
-  return e[18] !== s || e[19] !== O || e[20] !== l || e[21] !== u || e[22] !== f || e[23] !== h || e[24] !== t || e[25] !== T || e[26] !== p || e[27] !== i || e[28] !== v || e[29] !== m || e[30] !== g || e[31] !== M || e[32] !== y || e[33] !== d || e[34] !== _ || e[35] !== F || e[36] !== k || e[37] !== n || e[38] !== P || e[39] !== E || e[40] !== a ? (A = s({
+  return e[18] !== s || e[19] !== O || e[20] !== l || e[21] !== u || e[22] !== f || e[23] !== h || e[24] !== t || e[25] !== T || e[26] !== p || e[27] !== r || e[28] !== v || e[29] !== m || e[30] !== g || e[31] !== M || e[32] !== y || e[33] !== d || e[34] !== L || e[35] !== w || e[36] !== C || e[37] !== n || e[38] !== P || e[39] !== E || e[40] !== a ? (A = s({
     mapId: t,
     distance: l,
     enabled: u,
@@ -1791,9 +1789,9 @@ function zs(o) {
     locale: h,
     positions: v,
     unit: E,
-    clearLayerOnStart: k,
+    clearLayerOnStart: C,
     modeSelected: p,
-    modes: i,
+    modes: r,
     units: a,
     value: Ce({
       meters: l,
@@ -1806,12 +1804,12 @@ function zs(o) {
     setDistance: m,
     setFinished: M,
     setLocale: y,
-    setPositions: _,
-    setUnit: F,
+    setPositions: L,
+    setUnit: w,
     setEnabled: g,
     toggleLayer: P,
     clearLayer: O
-  }), e[18] = s, e[19] = O, e[20] = l, e[21] = u, e[22] = f, e[23] = h, e[24] = t, e[25] = T, e[26] = p, e[27] = i, e[28] = v, e[29] = m, e[30] = g, e[31] = M, e[32] = y, e[33] = d, e[34] = _, e[35] = F, e[36] = k, e[37] = n, e[38] = P, e[39] = E, e[40] = a, e[41] = A) : A = e[41], A;
+  }), e[18] = s, e[19] = O, e[20] = l, e[21] = u, e[22] = f, e[23] = h, e[24] = t, e[25] = T, e[26] = p, e[27] = r, e[28] = v, e[29] = m, e[30] = g, e[31] = M, e[32] = y, e[33] = d, e[34] = L, e[35] = w, e[36] = C, e[37] = n, e[38] = P, e[39] = E, e[40] = a, e[41] = A) : A = e[41], A;
 }
 const Ws = [ve];
 function Ys({
@@ -1826,8 +1824,8 @@ function Ys({
   textOptions: s
 }) {
   const {
-    setDistance: r,
-    clearLayerOnStart: i,
+    setDistance: i,
+    clearLayerOnStart: r,
     enabled: a,
     finished: l,
     setFinished: m,
@@ -1837,48 +1835,46 @@ function Ys({
     modeInstance: u
   } = ut({
     mapId: e
-  }), g = _e((v) => v.setLayer), f = w((v) => v.addLayers), M = w((v) => v.removeLayers), h = w(tt((v) => {
-    var _;
-    return (_ = v.maps[e]) == null ? void 0 : _.layers.filter((E) => !Ws.includes(E));
-  })), y = w((v) => v.getDeckInstance), T = Ee({});
+  }), g = _e((v) => v.setLayer), f = F((v) => v.addLayers), M = F((v) => v.removeLayers), h = F(tt((v) => {
+    var L;
+    return (L = v.maps[e]) == null ? void 0 : L.layers.filter((E) => !Ws.includes(E));
+  })), y = F((v) => v.getDeckInstance), T = Ee({});
   Y(() => (a && f(e, [ve]), () => {
     M(e, [ve]);
-  }), [f, i, e, M, a]), Y(() => {
+  }), [f, r, e, M, a]), Y(() => {
     h == null || h.forEach((v) => {
-      var E;
-      if (a) {
-        const F = (E = y(e)) == null ? void 0 : E.props.layers.find((O) => O.props.id === v);
-        T.current[v] = F == null ? void 0 : F.props.pickable;
-      }
-      const _ = !a && T.current[v];
+      var w;
+      const L = (w = y(e)) == null ? void 0 : w.props.layers.find((O) => O.props.id === v);
+      a && (T.current[v] = L == null ? void 0 : L.props.pickable);
+      const E = !a && (T.current[v] ?? (L == null ? void 0 : L.props.pickable));
       g(v, {
         props: {
-          pickable: _
+          pickable: E
         }
       });
     });
   }, [a, y, e, h, g]);
   const S = $(({
     editType: v,
-    editContext: _
+    editContext: L
   }) => {
     if (v === K.cancel) {
       u.resetClickSequence();
       return;
     }
-    v === K.addPosition && r(_.distance), m(!!_.finished);
-    const E = _.positions;
+    v === K.addPosition && i(L.distance), m(!!L.finished);
+    const E = L.positions;
     E != null && E.length && p(E);
-  }, [u, r, m, p]);
+  }, [u, i, m, p]);
   return Y(() => {
-    const v = l ? t.colors.finished : t.colors.editing, _ = l ? t.colors.finished : t.colors.point, E = Us({
+    const v = l ? t.colors.finished : t.colors.editing, L = l ? t.colors.finished : t.colors.point, E = Us({
       layerProps: {
         ...n,
         pickable: n.pickable ?? !l
       },
       enabled: a,
       guideColor: v,
-      pointColor: _,
+      pointColor: L,
       locale: c,
       onEdit: S,
       unit: d,
@@ -1890,21 +1886,21 @@ function Ys({
 }
 Ys.Controls = zs;
 function Xs(o) {
-  const e = C(7), {
+  const e = k(7), {
     mapId: t
   } = o;
   let n;
   e[0] !== t ? (n = (m) => m.maps[t], e[0] = t, e[1] = n) : n = e[1];
   const {
     layers: s
-  } = w(n), r = _e(en);
-  let i, a;
-  if (e[2] !== r || e[3] !== s) {
+  } = F(n), i = _e(en);
+  let r, a;
+  if (e[2] !== i || e[3] !== s) {
     let m;
-    e[5] !== r ? (m = (c) => r[c], e[5] = r, e[6] = m) : m = e[6], a = s.map(m).filter(Js), e[2] = r, e[3] = s, e[4] = a;
+    e[5] !== i ? (m = (c) => i[c], e[5] = i, e[6] = m) : m = e[6], a = s.map(m).filter(Js), e[2] = i, e[3] = s, e[4] = a;
   } else
     a = e[4];
-  return i = a, i;
+  return r = a, r;
 }
 function Js(o) {
   return !!o;
@@ -1926,9 +1922,9 @@ function zn({
 }) {
   const {
     basemap: s,
-    instanceRef: r,
-    overlayRef: i
-  } = w((S) => S.maps[o]), a = Ee(null), l = w((S) => S.viewStates[o]), m = w((S) => S.setViewState), c = w((S) => S.setLoad), p = w((S) => S.setLayersLoad), d = w((S) => S.updateViewPort), u = Xs({
+    instanceRef: i,
+    overlayRef: r
+  } = F((S) => S.maps[o]), a = Ee(null), l = F((S) => S.viewStates[o]), m = F((S) => S.setViewState), c = F((S) => S.setLoad), p = F((S) => S.setLayersLoad), d = F((S) => S.updateViewPort), u = Xs({
     mapId: o
   }), g = de(() => dt(u), [u]), f = $((S) => {
     const v = m;
@@ -1942,13 +1938,13 @@ function zn({
   }, [o, t, m, d]), M = $((S) => {
     c(o, S), e == null || e(S), d(o);
   }, [o, e, c, d]), h = $((S) => {
-    var E, F, O;
-    const v = (F = (E = r == null ? void 0 : r.current) == null ? void 0 : E.deck) == null ? void 0 : F.props.layers, _ = !!(v != null && v.every((D) => D == null ? void 0 : D.isLoaded));
-    p(o, _), (O = n.onAfterRender) == null || O.call(n, S);
-  }, [o, r, n, p]), y = n.onDragEnd, T = $((...S) => {
+    var E, w, O;
+    const v = (w = (E = i == null ? void 0 : i.current) == null ? void 0 : E.deck) == null ? void 0 : w.props.layers, L = !!(v != null && v.every((D) => D == null ? void 0 : D.isLoaded));
+    p(o, L), (O = n.onAfterRender) == null || O.call(n, S);
+  }, [o, i, n, p]), y = n.onDragEnd, T = $((...S) => {
     d(o), y && y(...S);
   }, [o, d, y]);
-  return /* @__PURE__ */ H(ns, { ...n, layers: g, instanceRef: r, overlayRef: i, basemap: s, initialViewState: l, onLoad: M, onViewStateChange: f, onAfterRender: h, onDragEnd: T });
+  return /* @__PURE__ */ H(ns, { ...n, layers: g, instanceRef: i, overlayRef: r, basemap: s, initialViewState: l, onLoad: M, onViewStateChange: f, onAfterRender: h, onDragEnd: T });
 }
 const sn = "https://gcp-us-east1.api.carto.com", nn = "ps", on = et((o) => ({
   sources: {},
@@ -1960,22 +1956,22 @@ const sn = "https://gcp-us-east1.api.carto.com", nn = "ps", on = et((o) => ({
       return delete s[e], {
         sources: s
       };
-    const r = {
+    const i = {
       ...s[e] ?? {
         apiBaseUrl: sn,
         clientId: nn
       },
       ...t
-    }, i = an({
-      source: r
+    }, r = an({
+      source: i
     });
-    return r.widgets = i, s[e] = r, {
+    return i.widgets = r, s[e] = i, {
       sources: s
     };
   })
 }));
 function rn(o) {
-  const e = C(2);
+  const e = k(2);
   let t;
   return e[0] !== o ? (t = (n) => n.sources[o], e[0] = o, e[1] = t) : t = e[1], on(t);
 }
@@ -2032,19 +2028,19 @@ function pe(o, e) {
   }, [o, t]);
 }
 function ln(o) {
-  const e = C(18), {
+  const e = k(18), {
     accessToken: t,
     sourceId: n,
     widgetProps: s,
-    useQueryProps: r
+    useQueryProps: i
   } = o;
-  let i;
-  e[0] !== r ? (i = r === void 0 ? {} : r, e[0] = r, e[1] = i) : i = e[1];
+  let r;
+  e[0] !== i ? (r = i === void 0 ? {} : i, e[0] = i, e[1] = r) : r = e[1];
   let a, l;
-  e[2] !== i ? ({
+  e[2] !== r ? ({
     enabled: a,
     ...l
-  } = i, e[2] = i, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
+  } = r, e[2] = r, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
   const m = a === void 0 ? !0 : a, c = pe(t, n), p = c == null ? void 0 : c.props.filters;
   let d;
   e[5] !== t || e[6] !== n || e[7] !== p || e[8] !== s ? (d = ["categories", n, t, s, p], e[5] = t, e[6] = n, e[7] = p, e[8] = s, e[9] = d) : d = e[9];
@@ -2060,30 +2056,30 @@ function ln(o) {
   }, e[13] = d, e[14] = u, e[15] = g, e[16] = l, e[17] = f) : f = e[17], me(f);
 }
 function Wn(o) {
-  const e = C(6);
+  const e = k(6);
   let t, n;
   e[0] !== o ? ({
     children: t,
     ...n
   } = o, e[0] = o, e[1] = t, e[2] = n) : (t = e[1], n = e[2]);
   const s = ln(n);
-  let r;
-  return e[3] !== t || e[4] !== s ? (r = t(s), e[3] = t, e[4] = s, e[5] = r) : r = e[5], r;
+  let i;
+  return e[3] !== t || e[4] !== s ? (i = t(s), e[3] = t, e[4] = s, e[5] = i) : i = e[5], i;
 }
 function cn(o) {
-  const e = C(18), {
+  const e = k(18), {
     accessToken: t,
     sourceId: n,
     widgetProps: s,
-    useQueryProps: r
+    useQueryProps: i
   } = o;
-  let i;
-  e[0] !== r ? (i = r === void 0 ? {} : r, e[0] = r, e[1] = i) : i = e[1];
+  let r;
+  e[0] !== i ? (r = i === void 0 ? {} : i, e[0] = i, e[1] = r) : r = e[1];
   let a, l;
-  e[2] !== i ? ({
+  e[2] !== r ? ({
     enabled: a,
     ...l
-  } = i, e[2] = i, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
+  } = r, e[2] = r, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
   const m = a === void 0 ? !0 : a, c = pe(t, n), p = c == null ? void 0 : c.props.filters;
   let d;
   e[5] !== t || e[6] !== n || e[7] !== p || e[8] !== s ? (d = ["features", n, t, s, p], e[5] = t, e[6] = n, e[7] = p, e[8] = s, e[9] = d) : d = e[9];
@@ -2099,30 +2095,30 @@ function cn(o) {
   }, e[13] = d, e[14] = u, e[15] = g, e[16] = l, e[17] = f) : f = e[17], me(f);
 }
 function Yn(o) {
-  const e = C(6);
+  const e = k(6);
   let t, n;
   e[0] !== o ? ({
     children: t,
     ...n
   } = o, e[0] = o, e[1] = t, e[2] = n) : (t = e[1], n = e[2]);
   const s = cn(n);
-  let r;
-  return e[3] !== t || e[4] !== s ? (r = t(s), e[3] = t, e[4] = s, e[5] = r) : r = e[5], r;
+  let i;
+  return e[3] !== t || e[4] !== s ? (i = t(s), e[3] = t, e[4] = s, e[5] = i) : i = e[5], i;
 }
 function un(o) {
-  const e = C(18), {
+  const e = k(18), {
     accessToken: t,
     sourceId: n,
     widgetProps: s,
-    useQueryProps: r
+    useQueryProps: i
   } = o;
-  let i;
-  e[0] !== r ? (i = r === void 0 ? {} : r, e[0] = r, e[1] = i) : i = e[1];
+  let r;
+  e[0] !== i ? (r = i === void 0 ? {} : i, e[0] = i, e[1] = r) : r = e[1];
   let a, l;
-  e[2] !== i ? ({
+  e[2] !== r ? ({
     enabled: a,
     ...l
-  } = i, e[2] = i, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
+  } = r, e[2] = r, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
   const m = a === void 0 ? !0 : a, c = pe(t, n), p = c == null ? void 0 : c.props.filters;
   let d;
   e[5] !== t || e[6] !== n || e[7] !== p || e[8] !== s ? (d = ["formula", n, t, s, p], e[5] = t, e[6] = n, e[7] = p, e[8] = s, e[9] = d) : d = e[9];
@@ -2138,30 +2134,30 @@ function un(o) {
   }, e[13] = d, e[14] = u, e[15] = g, e[16] = l, e[17] = f) : f = e[17], me(f);
 }
 function Xn(o) {
-  const e = C(6);
+  const e = k(6);
   let t, n;
   e[0] !== o ? ({
     children: t,
     ...n
   } = o, e[0] = o, e[1] = t, e[2] = n) : (t = e[1], n = e[2]);
   const s = un(n);
-  let r;
-  return e[3] !== t || e[4] !== s ? (r = t(s), e[3] = t, e[4] = s, e[5] = r) : r = e[5], r;
+  let i;
+  return e[3] !== t || e[4] !== s ? (i = t(s), e[3] = t, e[4] = s, e[5] = i) : i = e[5], i;
 }
 function dn(o) {
-  const e = C(18), {
+  const e = k(18), {
     accessToken: t,
     sourceId: n,
     widgetProps: s,
-    useQueryProps: r
+    useQueryProps: i
   } = o;
-  let i;
-  e[0] !== r ? (i = r === void 0 ? {} : r, e[0] = r, e[1] = i) : i = e[1];
+  let r;
+  e[0] !== i ? (r = i === void 0 ? {} : i, e[0] = i, e[1] = r) : r = e[1];
   let a, l;
-  e[2] !== i ? ({
+  e[2] !== r ? ({
     enabled: a,
     ...l
-  } = i, e[2] = i, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
+  } = r, e[2] = r, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
   const m = a === void 0 ? !0 : a, c = pe(t, n), p = c == null ? void 0 : c.props.filters;
   let d;
   e[5] !== t || e[6] !== n || e[7] !== p || e[8] !== s ? (d = ["histogram", n, t, s, p], e[5] = t, e[6] = n, e[7] = p, e[8] = s, e[9] = d) : d = e[9];
@@ -2177,30 +2173,30 @@ function dn(o) {
   }, e[13] = d, e[14] = u, e[15] = g, e[16] = l, e[17] = f) : f = e[17], me(f);
 }
 function Jn(o) {
-  const e = C(6);
+  const e = k(6);
   let t, n;
   e[0] !== o ? ({
     children: t,
     ...n
   } = o, e[0] = o, e[1] = t, e[2] = n) : (t = e[1], n = e[2]);
   const s = dn(n);
-  let r;
-  return e[3] !== t || e[4] !== s ? (r = t(s), e[3] = t, e[4] = s, e[5] = r) : r = e[5], r;
+  let i;
+  return e[3] !== t || e[4] !== s ? (i = t(s), e[3] = t, e[4] = s, e[5] = i) : i = e[5], i;
 }
 function fn(o) {
-  const e = C(18), {
+  const e = k(18), {
     accessToken: t,
     sourceId: n,
     widgetProps: s,
-    useQueryProps: r
+    useQueryProps: i
   } = o;
-  let i;
-  e[0] !== r ? (i = r === void 0 ? {} : r, e[0] = r, e[1] = i) : i = e[1];
+  let r;
+  e[0] !== i ? (r = i === void 0 ? {} : i, e[0] = i, e[1] = r) : r = e[1];
   let a, l;
-  e[2] !== i ? ({
+  e[2] !== r ? ({
     enabled: a,
     ...l
-  } = i, e[2] = i, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
+  } = r, e[2] = r, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
   const m = a === void 0 ? !0 : a, c = pe(t, n), p = c == null ? void 0 : c.props.filters;
   let d;
   e[5] !== t || e[6] !== n || e[7] !== p || e[8] !== s ? (d = ["range", n, t, s, p], e[5] = t, e[6] = n, e[7] = p, e[8] = s, e[9] = d) : d = e[9];
@@ -2216,30 +2212,30 @@ function fn(o) {
   }, e[13] = d, e[14] = u, e[15] = g, e[16] = l, e[17] = f) : f = e[17], me(f);
 }
 function eo(o) {
-  const e = C(6);
+  const e = k(6);
   let t, n;
   e[0] !== o ? ({
     children: t,
     ...n
   } = o, e[0] = o, e[1] = t, e[2] = n) : (t = e[1], n = e[2]);
   const s = fn(n);
-  let r;
-  return e[3] !== t || e[4] !== s ? (r = t(s), e[3] = t, e[4] = s, e[5] = r) : r = e[5], r;
+  let i;
+  return e[3] !== t || e[4] !== s ? (i = t(s), e[3] = t, e[4] = s, e[5] = i) : i = e[5], i;
 }
 function mn(o) {
-  const e = C(18), {
+  const e = k(18), {
     accessToken: t,
     sourceId: n,
     widgetProps: s,
-    useQueryProps: r
+    useQueryProps: i
   } = o;
-  let i;
-  e[0] !== r ? (i = r === void 0 ? {} : r, e[0] = r, e[1] = i) : i = e[1];
+  let r;
+  e[0] !== i ? (r = i === void 0 ? {} : i, e[0] = i, e[1] = r) : r = e[1];
   let a, l;
-  e[2] !== i ? ({
+  e[2] !== r ? ({
     enabled: a,
     ...l
-  } = i, e[2] = i, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
+  } = r, e[2] = r, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
   const m = a === void 0 ? !0 : a, c = pe(t, n), p = c == null ? void 0 : c.props.filters;
   let d;
   e[5] !== t || e[6] !== n || e[7] !== p || e[8] !== s ? (d = ["scatter", n, t, s, p], e[5] = t, e[6] = n, e[7] = p, e[8] = s, e[9] = d) : d = e[9];
@@ -2255,30 +2251,30 @@ function mn(o) {
   }, e[13] = d, e[14] = u, e[15] = g, e[16] = l, e[17] = f) : f = e[17], me(f);
 }
 function to(o) {
-  const e = C(6);
+  const e = k(6);
   let t, n;
   e[0] !== o ? ({
     children: t,
     ...n
   } = o, e[0] = o, e[1] = t, e[2] = n) : (t = e[1], n = e[2]);
   const s = mn(n);
-  let r;
-  return e[3] !== t || e[4] !== s ? (r = t(s), e[3] = t, e[4] = s, e[5] = r) : r = e[5], r;
+  let i;
+  return e[3] !== t || e[4] !== s ? (i = t(s), e[3] = t, e[4] = s, e[5] = i) : i = e[5], i;
 }
 function pn(o) {
-  const e = C(18), {
+  const e = k(18), {
     accessToken: t,
     sourceId: n,
     widgetProps: s,
-    useQueryProps: r
+    useQueryProps: i
   } = o;
-  let i;
-  e[0] !== r ? (i = r === void 0 ? {} : r, e[0] = r, e[1] = i) : i = e[1];
+  let r;
+  e[0] !== i ? (r = i === void 0 ? {} : i, e[0] = i, e[1] = r) : r = e[1];
   let a, l;
-  e[2] !== i ? ({
+  e[2] !== r ? ({
     enabled: a,
     ...l
-  } = i, e[2] = i, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
+  } = r, e[2] = r, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
   const m = a === void 0 ? !0 : a, c = pe(t, n), p = c == null ? void 0 : c.props.filters;
   let d;
   e[5] !== t || e[6] !== n || e[7] !== p || e[8] !== s ? (d = ["table", n, t, s, p], e[5] = t, e[6] = n, e[7] = p, e[8] = s, e[9] = d) : d = e[9];
@@ -2294,30 +2290,30 @@ function pn(o) {
   }, e[13] = d, e[14] = u, e[15] = g, e[16] = l, e[17] = f) : f = e[17], me(f);
 }
 function so(o) {
-  const e = C(6);
+  const e = k(6);
   let t, n;
   e[0] !== o ? ({
     children: t,
     ...n
   } = o, e[0] = o, e[1] = t, e[2] = n) : (t = e[1], n = e[2]);
   const s = pn(n);
-  let r;
-  return e[3] !== t || e[4] !== s ? (r = t(s), e[3] = t, e[4] = s, e[5] = r) : r = e[5], r;
+  let i;
+  return e[3] !== t || e[4] !== s ? (i = t(s), e[3] = t, e[4] = s, e[5] = i) : i = e[5], i;
 }
 function gn(o) {
-  const e = C(18), {
+  const e = k(18), {
     accessToken: t,
     sourceId: n,
     widgetProps: s,
-    useQueryProps: r
+    useQueryProps: i
   } = o;
-  let i;
-  e[0] !== r ? (i = r === void 0 ? {} : r, e[0] = r, e[1] = i) : i = e[1];
+  let r;
+  e[0] !== i ? (r = i === void 0 ? {} : i, e[0] = i, e[1] = r) : r = e[1];
   let a, l;
-  e[2] !== i ? ({
+  e[2] !== r ? ({
     enabled: a,
     ...l
-  } = i, e[2] = i, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
+  } = r, e[2] = r, e[3] = a, e[4] = l) : (a = e[3], l = e[4]);
   const m = a === void 0 ? !0 : a, c = pe(t, n), p = c == null ? void 0 : c.props.filters;
   let d;
   e[5] !== t || e[6] !== n || e[7] !== p || e[8] !== s ? (d = ["time-series", n, t, s, p], e[5] = t, e[6] = n, e[7] = p, e[8] = s, e[9] = d) : d = e[9];
@@ -2333,28 +2329,28 @@ function gn(o) {
   }, e[13] = d, e[14] = u, e[15] = g, e[16] = l, e[17] = f) : f = e[17], me(f);
 }
 function no(o) {
-  const e = C(6);
+  const e = k(6);
   let t, n;
   e[0] !== o ? ({
     children: t,
     ...n
   } = o, e[0] = o, e[1] = t, e[2] = n) : (t = e[1], n = e[2]);
   const s = gn(n);
-  let r;
-  return e[3] !== t || e[4] !== s ? (r = t(s), e[3] = t, e[4] = s, e[5] = r) : r = e[5], r;
+  let i;
+  return e[3] !== t || e[4] !== s ? (i = t(s), e[3] = t, e[4] = s, e[5] = i) : i = e[5], i;
 }
 function oo(o) {
-  const e = C(13), {
+  const e = k(13), {
     children: t,
     maps: n,
     lassoTools: s,
-    measureTools: r
+    measureTools: i
   } = o;
-  let i;
-  e[0] !== s ? (i = s === void 0 ? [] : s, e[0] = s, e[1] = i) : i = e[1];
-  const a = i;
+  let r;
+  e[0] !== s ? (r = s === void 0 ? [] : s, e[0] = s, e[1] = r) : r = e[1];
+  const a = r;
   let l;
-  e[2] !== r ? (l = r === void 0 ? [] : r, e[2] = r, e[3] = l) : l = e[3];
+  e[2] !== i ? (l = i === void 0 ? [] : i, e[2] = i, e[3] = l) : l = e[3];
   const m = l;
   let c;
   e[4] !== t || e[5] !== m ? (c = /* @__PURE__ */ H(js, { values: m, children: t }), e[4] = t, e[5] = m, e[6] = c) : c = e[6];
@@ -2363,8 +2359,8 @@ function oo(o) {
   let d;
   return e[10] !== n || e[11] !== p ? (d = /* @__PURE__ */ H(Ss, { values: n, children: p }), e[10] = n, e[11] = p, e[12] = d) : d = e[12], d;
 }
-function ro(o, e) {
-  const t = _e((m) => m.layers), n = _e((m) => m.setLayer), s = de(() => dt(o.map((m) => t[m]).filter((m) => !!m)), [t, o]), r = de(() => s.map(e), [e, s]), i = $(({
+function io(o, e) {
+  const t = _e((m) => m.layers), n = _e((m) => m.setLayer), s = de(() => dt(o.map((m) => t[m]).filter((m) => !!m)), [t, o]), i = de(() => s.map(e), [e, s]), r = $(({
     id: m,
     visible: c,
     ...p
@@ -2395,28 +2391,28 @@ function ro(o, e) {
     });
   }, [n]);
   return {
-    legend: r,
-    onChangeVisibility: i,
+    legend: i,
+    onChangeVisibility: r,
     onChangeOpacity: l,
     onChangRowCollapsed: a
   };
 }
-function io({
+function ro({
   mapId: o
 }) {
-  const [e, t] = fe(void 0), [n, s] = fe(!1), r = w((f) => {
+  const [e, t] = fe(void 0), [n, s] = fe(!1), i = F((f) => {
     var M;
     return (M = f.maps[o]) == null ? void 0 : M.basemap;
-  }), i = w((f) => f.getDeckInstance), a = w((f) => f.getOverlayInstance), l = w((f) => {
+  }), r = F((f) => f.getDeckInstance), a = F((f) => f.getOverlayInstance), l = F((f) => {
     var M;
     return (M = f.maps[o]) == null ? void 0 : M.areLayersLoaded;
-  }), c = w((f) => {
+  }), c = F((f) => {
     var M;
     return (M = f.maps[o]) == null ? void 0 : M.isLoaded;
   }) && l, {
     type: p
-  } = nt[r], d = p === ue.googleMaps, u = $(async () => {
-    const f = i(o), M = a(o);
+  } = nt[i], d = p === ue.googleMaps, u = $(async () => {
+    const f = r(o), M = a(o);
     try {
       const h = document.createElement("canvas");
       h.width = f.width ?? 0, h.height = f.height ?? 0;
@@ -2441,7 +2437,7 @@ function io({
     } finally {
       s(!1);
     }
-  }, [i, d, o, a]);
+  }, [r, d, o, a]);
   return {
     takeScreenshot: $(() => {
       s(!0), c && u();
@@ -2451,7 +2447,7 @@ function io({
   };
 }
 function ao(o) {
-  const e = C(8), {
+  const e = k(8), {
     mapId: t
   } = o;
   let n;
@@ -2459,63 +2455,63 @@ function ao(o) {
     mapId: t
   }, e[0] = t, e[1] = n) : n = e[1];
   const s = yn(n);
-  let r;
-  e[2] !== t ? (r = {
+  let i;
+  e[2] !== t ? (i = {
     mapId: t
-  }, e[2] = t, e[3] = r) : r = e[3];
-  const i = hn(r), a = i ?? s;
+  }, e[2] = t, e[3] = i) : i = e[3];
+  const r = hn(i), a = r ?? s;
   let l;
-  return e[4] !== i || e[5] !== a || e[6] !== s ? (l = {
+  return e[4] !== r || e[5] !== a || e[6] !== s ? (l = {
     spatialFilter: a,
-    lassoToolsSpatialFilter: i,
+    lassoToolsSpatialFilter: r,
     viewportSpatialFilter: s
-  }, e[4] = i, e[5] = a, e[6] = s, e[7] = l) : l = e[7], l;
+  }, e[4] = r, e[5] = a, e[6] = s, e[7] = l) : l = e[7], l;
 }
 function yn(o) {
-  const e = C(4), {
+  const e = k(4), {
     mapId: t
   } = o;
   let n;
-  e[0] !== t ? (n = (i) => i.viewports[t], e[0] = t, e[1] = n) : n = e[1];
-  const s = w(n);
-  let r;
+  e[0] !== t ? (n = (r) => r.viewports[t], e[0] = t, e[1] = n) : n = e[1];
+  const s = F(n);
+  let i;
   e: {
     if (!s) {
-      r = void 0;
+      i = void 0;
       break e;
     }
-    let i;
-    e[2] !== s ? (i = Xt(s.getBounds()), e[2] = s, e[3] = i) : i = e[3], r = i;
+    let r;
+    e[2] !== s ? (r = Xt(s.getBounds()), e[2] = s, e[3] = r) : r = e[3], i = r;
   }
-  return r;
+  return i;
 }
 function hn(o) {
-  const e = C(5), {
+  const e = k(5), {
     mapId: t
   } = o;
   let n;
-  e[0] !== t ? (n = (i) => {
+  e[0] !== t ? (n = (r) => {
     var a;
-    return (a = i.data[t]) == null ? void 0 : a.values;
+    return (a = r.data[t]) == null ? void 0 : a.values;
   }, e[0] = t, e[1] = n) : n = e[1];
   const s = j(n);
-  let r;
+  let i;
   e: {
-    let i;
+    let r;
     if (e[2] !== s) {
-      const a = it({
+      const a = rt({
         values: s
       }).filter(vn);
       if (!(a != null && a.length)) {
-        r = void 0;
+        i = void 0;
         break e;
       }
-      i = es(a.map(Sn)), e[2] = s, e[3] = i, e[4] = r;
+      r = es(a.map(Sn)), e[2] = s, e[3] = r, e[4] = i;
     } else
-      i = e[3], r = e[4];
-    r = i.geometry;
+      r = e[3], i = e[4];
+    i = r.geometry;
   }
-  return r;
+  return i;
 }
 function Sn(o) {
   return o.geometry.coordinates;
@@ -2547,14 +2543,14 @@ function lo({
   includeColumns: t = Object.keys(o),
   locale: n = "en-US",
   showColumnName: s = !0,
-  title: r,
-  getColumnName: i = _n,
+  title: i,
+  getColumnName: r = _n,
   getFieldHtml: a = Tn,
   getTitle: l = bn,
   getValue: m = Mn
 }) {
-  const c = r ? l(r) : "", d = t.reduce((u, g) => {
-    const f = e[g], M = o[g], h = m(M, n, f), y = s ? i(g) : "";
+  const c = i ? l(i) : "", d = t.reduce((u, g) => {
+    const f = e[g], M = o[g], h = m(M, n, f), y = s ? r(g) : "";
     return u + a(y, h);
   }, "");
   return c + d;
@@ -2579,37 +2575,37 @@ function _n(o) {
   return `<strong>${o}</strong>: `;
 }
 function co(o) {
-  var e, t, n, s, r, i, a, l;
+  var e, t, n, s, i, r, a, l;
   return {
     collapsed: (e = o.legend) == null ? void 0 : e.collapsed,
     collapsible: (t = o.legend) == null ? void 0 : t.collapsible,
     helperText: (n = o.legend) == null ? void 0 : n.helperText,
     id: o.props.id,
     legend: (s = o.legend) == null ? void 0 : s.variables,
-    maxZoom: (r = o.legend) == null ? void 0 : r.maxZoom,
-    minZoom: (i = o.legend) == null ? void 0 : i.minZoom,
+    maxZoom: (i = o.legend) == null ? void 0 : i.maxZoom,
+    minZoom: (r = o.legend) == null ? void 0 : r.minZoom,
     opacity: o.props.opacity ?? 1,
-    opacityControl: (a = o.legend) == null ? void 0 : a.opacityControl,
+    showOpacityControl: (a = o.legend) == null ? void 0 : a.opacityControl,
     switchable: (l = o.legend) == null ? void 0 : l.switchable,
     title: o.name,
     visible: o.props.visible ?? !0
   };
 }
 function uo(o) {
-  const e = C(18), {
+  const e = k(18), {
     children: t,
     mapId: n
   } = o;
   let s;
   e[0] !== n ? (s = (y) => y.viewStates[n], e[0] = n, e[1] = s) : s = e[1];
   const {
-    zoom: r,
-    maxZoom: i,
+    zoom: i,
+    maxZoom: r,
     minZoom: a
-  } = w(s);
+  } = F(s);
   let l;
   e[2] !== n ? (l = (y) => y.maps[n].areLayersLoaded, e[2] = n, e[3] = l) : l = e[3];
-  const m = w(l), c = w(En), p = w(Pn), d = !m;
+  const m = F(l), c = F(En), p = F(Pn), d = !m;
   let u;
   e[4] !== n || e[5] !== c ? (u = (y) => c(n, y), e[4] = n, e[5] = c, e[6] = u) : u = e[6];
   const g = u;
@@ -2617,14 +2613,14 @@ function uo(o) {
   e[7] !== p || e[8] !== n ? (f = (y) => p(n, y), e[7] = p, e[8] = n, e[9] = f) : f = e[9];
   const M = f;
   let h;
-  return e[10] !== t || e[11] !== i || e[12] !== a || e[13] !== d || e[14] !== g || e[15] !== M || e[16] !== r ? (h = t({
-    zoom: r,
-    maxZoom: i,
+  return e[10] !== t || e[11] !== r || e[12] !== a || e[13] !== d || e[14] !== g || e[15] !== M || e[16] !== i ? (h = t({
+    zoom: i,
+    maxZoom: r,
     minZoom: a,
     isLoading: d,
     setZoom: g,
     flyTo: M
-  }), e[10] = t, e[11] = i, e[12] = a, e[13] = d, e[14] = g, e[15] = M, e[16] = r, e[17] = h) : h = e[17], h;
+  }), e[10] = t, e[11] = r, e[12] = a, e[13] = d, e[14] = g, e[15] = M, e[16] = i, e[17] = h) : h = e[17], h;
 }
 function Pn(o) {
   return o.flyTo;
@@ -2703,9 +2699,9 @@ export {
   j as useLassoToolsState,
   _e as useLayerStore,
   Xs as useLayers,
-  ro as useLegend,
-  io as useMapScreenshot,
-  w as useMapStore,
+  io as useLegend,
+  ro as useMapScreenshot,
+  F as useMapStore,
   q as useMeasurementToolsState,
   fn as useRange,
   mn as useScatter,