@carto/ps-react-maps 4.7.1 → 4.7.2

package/dist/index.js

@@ -3,16 +3,16 @@ import { c as F } from "react/compiler-runtime";
 import { useImperativeHandle as WA, useEffect as K, useState as cA, createContext as KA, useContext as $A, useRef as TA, useMemo as RA, useCallback as vA } from "react";
 import { AttributionControl as Je, MapProvider as Xe, Map as At, useMap as et } from "react-map-gl/maplibre";
 import tt from "@deck.gl/react";
-import { useMap as Me, Map as rt, APIProvider as nt } from "@vis.gl/react-google-maps";
+import { useMap as Se, Map as rt, APIProvider as nt } from "@vis.gl/react-google-maps";
 import { GoogleMapsOverlay as it } from "@deck.gl/google-maps";
-import { createStore as ZA, useStore as JA, create as Se } from "zustand";
+import { createStore as ZA, useStore as JA, create as Me } from "zustand";
 import { FlyToInterpolator as ot, WebMercatorViewport as xe } from "@deck.gl/core";
 import { CompositeMode as st, TranslateMode as lt, ModifyMode as at, DrawPolygonByDraggingMode as ut, DrawCircleFromCenterMode as De, DrawRectangleMode as ct, DrawPolygonMode as ft, EditableGeoJsonLayer as ht, MeasureAreaMode as gt, getPickedEditHandle as pt, MeasureDistanceMode as dt, ViewMode as mt } from "@deck.gl-community/editable-layers";
 import { DataFilterExtension as wt, MaskExtension as yt } from "@deck.gl/extensions";
 import { Pan as oe, InputDirection as bt, EventManager as vt, Tap as se, Pinch as Et } from "mjolnir.js";
 import { GeoJsonLayer as kt } from "@deck.gl/layers";
 import { useShallow as IA } from "zustand/shallow";
-import { area as le, centroid as Pe, lineIntersect as Ct, booleanIntersects as Bt, feature as _t, bbox as Mt, featureCollection as St, multiPolygon as MA, multiLineString as xt, multiPoint as Dt, polygon as Pt, lineString as Tt, point as Lt } from "@turf/turf";
+import { area as le, centroid as Pe, lineIntersect as Ct, booleanIntersects as Bt, feature as _t, bbox as St, featureCollection as Mt, multiPolygon as SA, multiLineString as xt, multiPoint as Dt, polygon as Pt, lineString as Tt, point as Lt } from "@turf/turf";
 import { formatNumber as Te, formatCurrency as It } from "@carto/ps-utils";
 import Le from "convert-units";
 import Qt from "convert-units/definitions/length";
@@ -117,11 +117,11 @@ function r0(t) {
   A[24] !== e ? (k = /* @__PURE__ */ Y(Je, { compact: !1, ...e }), A[24] = e, A[25] = k) : k = A[25];
   let B;
   A[26] !== l || A[27] !== y || A[28] !== k ? (B = /* @__PURE__ */ Y(At, { reuseMaps: !1, mapStyle: l, attributionControl: !1, onLoad: y, children: k }), A[26] = l, A[27] = y, A[28] = k, A[29] = B) : B = A[29];
-  let M;
-  return A[30] !== b || A[31] !== r || A[32] !== n || A[33] !== i || A[34] !== o || A[35] !== f || A[36] !== d || A[37] !== u || A[38] !== g || A[39] !== m || A[40] !== v || A[41] !== B ? (M = /* @__PURE__ */ Y(Xe, { children: /* @__PURE__ */ Y("div", { className: "deckgl-map", children: /* @__PURE__ */ _e(tt, { controller: r, id: o, ref: u, layers: b, getCursor: n, getTooltip: i, onLoad: g, onViewStateChange: f, parameters: m, ...d, children: [
+  let S;
+  return A[30] !== b || A[31] !== r || A[32] !== n || A[33] !== i || A[34] !== o || A[35] !== f || A[36] !== d || A[37] !== u || A[38] !== g || A[39] !== m || A[40] !== v || A[41] !== B ? (S = /* @__PURE__ */ Y(Xe, { children: /* @__PURE__ */ Y("div", { className: "deckgl-map", children: /* @__PURE__ */ _e(tt, { controller: r, id: o, ref: u, layers: b, getCursor: n, getTooltip: i, onLoad: g, onViewStateChange: f, parameters: m, ...d, children: [
     v,
     B
-  ] }) }) }), A[30] = b, A[31] = r, A[32] = n, A[33] = i, A[34] = o, A[35] = f, A[36] = d, A[37] = u, A[38] = g, A[39] = m, A[40] = v, A[41] = B, A[42] = M) : M = A[42], M;
+  ] }) }) }), A[30] = b, A[31] = r, A[32] = n, A[33] = i, A[34] = o, A[35] = f, A[36] = d, A[37] = u, A[38] = g, A[39] = m, A[40] = v, A[41] = B, A[42] = S) : S = A[42], S;
 }
 function n0(t) {
   const {
@@ -148,7 +148,7 @@ const s0 = (t) => {
   A[0] === Symbol.for("react.memo_cache_sentinel") ? (e = new it({
     interleaved: !0
   }), A[0] = e) : e = A[0];
-  const r = e, n = Me();
+  const r = e, n = Se();
   let i, o;
   A[1] === Symbol.for("react.memo_cache_sentinel") ? (i = () => r, o = [r], A[1] = i, A[2] = o) : (i = A[1], o = A[2]), WA(t.instanceRef, i, o);
   let s, a;
@@ -252,13 +252,13 @@ function l0(t) {
       }
     });
   }, A[29] = i, A[30] = a, A[31] = B) : B = A[31];
-  const M = B;
+  const S = B;
   let C;
-  A[32] !== M || A[33] !== k ? (C = (X) => {
+  A[32] !== S || A[33] !== k ? (C = (X) => {
     const eA = k(X);
-    M(eA);
-  }, A[32] = M, A[33] = k, A[34] = C) : C = A[34];
-  const S = C, P = f.initialViewState?.latitude ?? 0, D = f.initialViewState?.longitude ?? 0;
+    S(eA);
+  }, A[32] = S, A[33] = k, A[34] = C) : C = A[34];
+  const M = C, P = f.initialViewState?.latitude ?? 0, D = f.initialViewState?.longitude ?? 0;
   let x;
   A[35] !== P || A[36] !== D ? (x = {
     lat: P,
@@ -266,12 +266,12 @@ function l0(t) {
   }, A[35] = P, A[36] = D, A[37] = x) : x = A[37];
   const R = (f.initialViewState?.zoom ?? 0) + 1, N = (f.initialViewState?.maxZoom ?? 23) + 1, E = (f.initialViewState?.minZoom ?? 0) + 1, _ = f.initialViewState?.pitch, T = f.initialViewState?.bearing;
   let L;
-  A[38] !== M || A[39] !== s || A[40] !== f.initialViewState ? (L = () => {
+  A[38] !== S || A[39] !== s || A[40] !== f.initialViewState ? (L = () => {
     s({
       type: "load",
       value: !0
-    }), M(f.initialViewState);
-  }, A[38] = M, A[39] = s, A[40] = f.initialViewState, A[41] = L) : L = A[41];
+    }), S(f.initialViewState);
+  }, A[38] = S, A[39] = s, A[40] = f.initialViewState, A[41] = L) : L = A[41];
   const O = typeof g.scrollZoom == "boolean" ? g.scrollZoom : !!g.scrollZoom, z = g.dragPan ? "greedy" : "none", G = !g.doubleClickZoom;
   let U;
   A[42] !== n || A[43] !== l ? (U = /* @__PURE__ */ Y(c0, { id: n, overlayRef: l }), A[42] = n, A[43] = l, A[44] = U) : U = A[44];
@@ -290,10 +290,10 @@ function l0(t) {
   let nA;
   A[49] !== v || A[50] !== n || A[51] !== i || A[52] !== f || A[53] !== V || A[54] !== q ? (nA = /* @__PURE__ */ Y(s0, { id: n, instanceRef: i, layers: v, onLoad: V, parameters: q, ...f }), A[49] = v, A[50] = n, A[51] = i, A[52] = f, A[53] = V, A[54] = q, A[55] = nA) : nA = A[55];
   let J;
-  A[56] !== w || A[57] !== e || A[58] !== S || A[59] !== n || A[60] !== x || A[61] !== R || A[62] !== N || A[63] !== E || A[64] !== _ || A[65] !== T || A[66] !== L || A[67] !== O || A[68] !== z || A[69] !== G || A[70] !== U || A[71] !== nA ? (J = /* @__PURE__ */ Y("div", { className: "deckgl-map", children: /* @__PURE__ */ _e(rt, { id: n, mapTypeId: e, disableDefaultUI: !0, ...w, center: x, zoom: R, maxZoom: N, minZoom: E, tilt: _, heading: T, onTilesLoaded: L, onBoundsChanged: S, onZoomChanged: S, scrollwheel: O, gestureHandling: z, disableDoubleClickZoom: G, children: [
+  A[56] !== w || A[57] !== e || A[58] !== M || A[59] !== n || A[60] !== x || A[61] !== R || A[62] !== N || A[63] !== E || A[64] !== _ || A[65] !== T || A[66] !== L || A[67] !== O || A[68] !== z || A[69] !== G || A[70] !== U || A[71] !== nA ? (J = /* @__PURE__ */ Y("div", { className: "deckgl-map", children: /* @__PURE__ */ _e(rt, { id: n, mapTypeId: e, disableDefaultUI: !0, ...w, center: x, zoom: R, maxZoom: N, minZoom: E, tilt: _, heading: T, onTilesLoaded: L, onBoundsChanged: M, onZoomChanged: M, scrollwheel: O, gestureHandling: z, disableDoubleClickZoom: G, children: [
     U,
     nA
-  ] }) }), A[56] = w, A[57] = e, A[58] = S, A[59] = n, A[60] = x, A[61] = R, A[62] = N, A[63] = E, A[64] = _, A[65] = T, A[66] = L, A[67] = O, A[68] = z, A[69] = G, A[70] = U, A[71] = nA, A[72] = J) : J = A[72];
+  ] }) }), A[56] = w, A[57] = e, A[58] = M, A[59] = n, A[60] = x, A[61] = R, A[62] = N, A[63] = E, A[64] = _, A[65] = T, A[66] = L, A[67] = O, A[68] = z, A[69] = G, A[70] = U, A[71] = nA, A[72] = J) : J = A[72];
   let aA;
   return A[73] !== d || A[74] !== b || A[75] !== J ? (aA = /* @__PURE__ */ Y(nt, { apiKey: b, ...d, children: J }), A[73] = d, A[74] = b, A[75] = J, A[76] = aA) : aA = A[76], aA;
 }
@@ -311,7 +311,7 @@ function c0(t) {
   const A = F(3), {
     id: e,
     overlayRef: r
-  } = t, n = Me(e);
+  } = t, n = Se(e);
   let i, o;
   return A[0] !== n ? (i = () => n, o = [n], A[0] = n, A[1] = i, A[2] = o) : (i = A[1], o = A[2]), WA(r, i, o), null;
 }
@@ -338,14 +338,14 @@ function f0(t) {
   const g = u, m = f === void 0 ? e0 : f, v = h === void 0 ? t0 : h, y = p === void 0 ? g0 : p;
   let k;
   A[15] === Symbol.for("react.memo_cache_sentinel") ? (k = [!1, !1], A[15] = k) : k = A[15];
-  const [B, M] = cA(k), {
+  const [B, S] = cA(k), {
     url: C,
-    type: S
-  } = _A[d], P = S === uA.googleMaps;
+    type: M
+  } = _A[d], P = M === uA.googleMaps;
   let D;
   A[16] === Symbol.for("react.memo_cache_sentinel") ? (D = (L) => {
     const O = L.type === "deckgl" ? 0 : 1;
-    M((z) => z.map((G, U) => U === O ? L.value : G));
+    S((z) => z.map((G, U) => U === O ? L.value : G));
   }, A[16] = D) : D = A[16];
   const x = D;
   let R, N;
@@ -611,16 +611,19 @@ const gA = /* @__PURE__ */ d0(w0), y0 = (t) => {
   return ((e, r) => ({
     viewports: A.viewports,
     initialViewStates: A.initialViewStates,
-    updateViewPort: (n) => {
-      const i = r();
-      if (!i.maps[n]?.isLoaded) return;
-      const o = i.getViewState(n);
-      if (!o) return;
-      const s = new xe(o);
-      e((a) => ({
+    updateViewPort: (n, i) => {
+      const o = r();
+      if (!o.maps[n]?.isLoaded) return;
+      const s = {
+        ...o.getViewState(n),
+        ...i
+      };
+      if (!s) return;
+      const a = new xe(s);
+      e((l) => ({
         viewports: {
-          ...a.viewports,
-          [n]: s
+          ...l.viewports,
+          [n]: a
         }
       }));
     },
@@ -671,7 +674,7 @@ const gA = /* @__PURE__ */ d0(w0), y0 = (t) => {
 }, E0 = ((t, A) => ({
   fitBounds: (e, r, n) => {
     const i = A(), o = i.getBounds(e, r, n);
-    o && (i.setViewState(e, o), i.updateViewPort(e));
+    o && (i.setViewState(e, o), i.updateViewPort(e, o));
   },
   flyTo: (e, r, n = {}) => {
     const i = A(), o = {
@@ -681,7 +684,7 @@ const gA = /* @__PURE__ */ d0(w0), y0 = (t) => {
       ...r,
       ...o
     };
-    i.setViewState(e, s), i.updateViewPort(e);
+    console.log("finalViewState", s), i.setViewState(e, s), i.updateViewPort(e, s);
   },
   loadInitialViewState: (e, r) => {
     const n = A();
@@ -779,7 +782,7 @@ function wi(t) {
   A[0] !== r ? (n = (c) => c.maps[r], A[0] = r, A[1] = n) : n = A[1];
   const {
     basemap: i
-  } = I(n), o = I(M0);
+  } = I(n), o = I(S0);
   let s;
   A[2] !== r || A[3] !== o ? (s = (c) => o(r, c), A[2] = r, A[3] = o, A[4] = s) : s = A[4];
   const a = s;
@@ -789,7 +792,7 @@ function wi(t) {
     setBasemap: a
   }), A[5] = i, A[6] = e, A[7] = a, A[8] = l) : l = A[8], l;
 }
-function M0(t) {
+function S0(t) {
   return t.setBasemap;
 }
 const rA = {
@@ -800,7 +803,7 @@ const rA = {
   finish: "finish",
   addPosition: "addPosition"
 };
-class S0 extends st {
+class M0 extends st {
   constructor() {
     super([new lt(), new at()]);
   }
@@ -873,9 +876,9 @@ const mA = "lassoLayer", QA = "maskLayer", x0 = {
   },
   edit: {
     value: "edit",
-    mode: S0
+    mode: M0
   }
-}, kA = Se((t, A) => ({
+}, kA = Me((t, A) => ({
   layers: {},
   setLayer: (e, r) => t((n) => {
     const i = {
@@ -1189,8 +1192,8 @@ function R0(t) {
   A[8] !== i || A[9] !== e || A[10] !== h || A[11] !== w || A[12] !== b ? (u = () => {
     const C = w[h];
     if (C && i) {
-      const S = C.mode;
-      b(e, new S());
+      const M = C.mode;
+      b(e, new M());
     }
   }, g = [i, e, h, w, b], A[8] = i, A[9] = e, A[10] = h, A[11] = w, A[12] = b, A[13] = u, A[14] = g) : (u = A[13], g = A[14]), K(u, g);
   const m = U0;
@@ -1202,14 +1205,14 @@ function R0(t) {
     o(e, !!C), p(e, C);
   }, A[17] = e, A[18] = o, A[19] = p, A[20] = k) : k = A[20];
   const B = k;
-  let M;
+  let S;
   if (A[21] !== r || A[22] !== i || A[23] !== B || A[24] !== e || A[25] !== y || A[26] !== h || A[27] !== w || A[28] !== o || A[29] !== l || A[30] !== c) {
     let C;
     A[32] !== e || A[33] !== l ? (C = (D, x) => l(e, D, x), A[32] = e, A[33] = l, A[34] = C) : C = A[34];
-    let S;
-    A[35] !== e || A[36] !== o ? (S = (D) => o(e, D), A[35] = e, A[36] = o, A[37] = S) : S = A[37];
+    let M;
+    A[35] !== e || A[36] !== o ? (M = (D) => o(e, D), A[35] = e, A[36] = o, A[37] = M) : M = A[37];
     let P;
-    A[38] !== e || A[39] !== c ? (P = (D, x) => c(e, D, x), A[38] = e, A[39] = c, A[40] = P) : P = A[40], M = r({
+    A[38] !== e || A[39] !== c ? (P = (D, x) => c(e, D, x), A[38] = e, A[39] = c, A[40] = P) : P = A[40], S = r({
       mapId: e,
       enabled: i,
       modes: w,
@@ -1218,13 +1221,13 @@ function R0(t) {
         mask: y
       },
       setValue: C,
-      setEnabled: S,
+      setEnabled: M,
       setVisibility: P,
       setModeSelected: B
-    }), A[21] = r, A[22] = i, A[23] = B, A[24] = e, A[25] = y, A[26] = h, A[27] = w, A[28] = o, A[29] = l, A[30] = c, A[31] = M;
+    }), A[21] = r, A[22] = i, A[23] = B, A[24] = e, A[25] = y, A[26] = h, A[27] = w, A[28] = o, A[29] = l, A[30] = c, A[31] = S;
   } else
-    M = A[31];
-  return M;
+    S = A[31];
+  return S;
 }
 function N0(t) {
   return t.type === "mask";
@@ -1775,12 +1778,12 @@ function rr({
       properties: E.properties,
       id: E.id
     }))
-  }), [v]), k = RA(() => v.filter((E) => E.properties.visible).map((E) => E.id), [v]), [B, M] = cA(y), [C, S] = cA([]), P = vA(() => {
+  }), [v]), k = RA(() => v.filter((E) => E.properties.visible).map((E) => E.id), [v]), [B, S] = cA(y), [C, M] = cA([]), P = vA(() => {
     const E = {
       ...y,
       features: y.features.filter((_) => _.properties?.visible)
     };
-    M(E);
+    S(E);
   }, [y]);
   K(() => {
     P();
@@ -1790,7 +1793,7 @@ function rr({
     b(A, [mA]);
   }), [w, A, b]);
   const x = vA(() => {
-    P(), S([]), l(A, !1);
+    P(), M([]), l(A, !1);
   }, [A, P, l]), R = vA((E) => {
     E.forEach((_, T) => {
       _.properties.label ??= `${r?.mask} ${D.current}`, _.properties.index = T, _.properties.visible = _.properties.visible ?? !0;
@@ -1809,7 +1812,7 @@ function rr({
       x();
       return;
     }
-    M(_), E !== rA.updateTentativeFeature && E === rA.addFeature && (p !== "edit" && (D.current = D.current + 1), R(_.features), x());
+    S(_), E !== rA.updateTentativeFeature && E === rA.addFeature && (p !== "edit" && (D.current = D.current + 1), R(_.features), x());
   }, [R, x, p]);
   return K(() => {
     const E = a, {
@@ -1830,7 +1833,7 @@ function rr({
         },
         onClick: (U) => {
           const V = U;
-          V.isGuide || S([V.index]);
+          V.isGuide || M([V.index]);
         }
       },
       getLineColor: (U) => C[0] === U.properties.index ? _ : O,
@@ -2118,11 +2121,11 @@ function je(t) {
     g(!!Q), y(e, Q);
   }, A[18] = y, A[19] = e, A[20] = g, A[21] = k) : k = A[21];
   const B = k;
-  let M;
-  A[22] !== e ? (M = (Q) => Q.measurements[e].finished, A[22] = e, A[23] = M) : M = A[23];
-  const C = H(M), S = H(fr);
+  let S;
+  A[22] !== e ? (S = (Q) => Q.measurements[e].finished, A[22] = e, A[23] = S) : S = A[23];
+  const C = H(S), M = H(fr);
   let P;
-  A[24] !== S || A[25] !== e ? (P = (Q) => S(e, Q), A[24] = S, A[25] = e, A[26] = P) : P = A[26];
+  A[24] !== M || A[25] !== e ? (P = (Q) => M(e, Q), A[24] = M, A[25] = e, A[26] = P) : P = A[26];
   const D = P;
   let x;
   A[27] !== e ? (x = (Q) => Q.measurements[e].locale, A[27] = e, A[28] = x) : x = A[28];
@@ -2153,11 +2156,11 @@ function je(t) {
     L?.resetClickSequence(), J([]);
   }, A[47] = L, A[48] = J, A[49] = AA) : AA = A[49];
   const oA = AA;
-  let SA;
-  A[50] !== g ? (SA = (Q) => {
+  let MA;
+  A[50] !== g ? (MA = (Q) => {
     g(Q);
-  }, A[50] = g, A[51] = SA) : SA = A[51];
-  const FA = SA;
+  }, A[50] = g, A[51] = MA) : MA = A[51];
+  const FA = MA;
   let xA;
   return A[52] !== oA || A[53] !== p || A[54] !== a || A[55] !== w || A[56] !== C || A[57] !== R || A[58] !== L || A[59] !== v || A[60] !== n || A[61] !== V || A[62] !== f || A[63] !== g || A[64] !== D || A[65] !== _ || A[66] !== G || A[67] !== B || A[68] !== J || A[69] !== $ || A[70] !== FA || A[71] !== X || A[72] !== o ? (xA = {
     modes: n,
@@ -2236,9 +2239,9 @@ function dr(t) {
     positions: y,
     setPositions: k,
     unit: B,
-    setUnit: M,
+    setUnit: S,
     clearLayer: C,
-    toggleLayer: S
+    toggleLayer: M
   } = je(i);
   let P;
   A[2] !== f || A[3] !== o || A[4] !== v || A[5] !== k ? (P = () => {
@@ -2253,12 +2256,12 @@ function dr(t) {
   let D;
   A[7] !== f || A[8] !== o || A[9] !== d || A[10] !== v || A[11] !== k ? (D = [o, f, k, v, d], A[7] = f, A[8] = o, A[9] = d, A[10] = v, A[11] = k, A[12] = D) : D = A[12], K(P, D);
   let x;
-  A[13] !== S || A[14] !== C || A[15] !== c || A[16] !== w ? (x = (_) => {
-    _ && (c || !w) && C(), S(_);
-  }, A[13] = S, A[14] = C, A[15] = c, A[16] = w, A[17] = x) : x = A[17];
+  A[13] !== M || A[14] !== C || A[15] !== c || A[16] !== w ? (x = (_) => {
+    _ && (c || !w) && C(), M(_);
+  }, A[13] = M, A[14] = C, A[15] = c, A[16] = w, A[17] = x) : x = A[17];
   const R = x, N = !!c;
   let E;
-  return A[18] !== n || A[19] !== C || A[20] !== a || A[21] !== p || A[22] !== w || A[23] !== u || A[24] !== e || A[25] !== m || A[26] !== f || A[27] !== o || A[28] !== y || A[29] !== l || A[30] !== d || A[31] !== b || A[32] !== g || A[33] !== h || A[34] !== k || A[35] !== M || A[36] !== N || A[37] !== r || A[38] !== R || A[39] !== B || A[40] !== s ? (E = n({
+  return A[18] !== n || A[19] !== C || A[20] !== a || A[21] !== p || A[22] !== w || A[23] !== u || A[24] !== e || A[25] !== m || A[26] !== f || A[27] !== o || A[28] !== y || A[29] !== l || A[30] !== d || A[31] !== b || A[32] !== g || A[33] !== h || A[34] !== k || A[35] !== S || A[36] !== N || A[37] !== r || A[38] !== R || A[39] !== B || A[40] !== s ? (E = n({
     mapId: e,
     distance: a,
     enabled: p,
@@ -2282,11 +2285,11 @@ function dr(t) {
     setFinished: b,
     setLocale: g,
     setPositions: k,
-    setUnit: M,
+    setUnit: S,
     setEnabled: d,
     toggleLayer: R,
     clearLayer: C
-  }), A[18] = n, A[19] = C, A[20] = a, A[21] = p, A[22] = w, A[23] = u, A[24] = e, A[25] = m, A[26] = f, A[27] = o, A[28] = y, A[29] = l, A[30] = d, A[31] = b, A[32] = g, A[33] = h, A[34] = k, A[35] = M, A[36] = N, A[37] = r, A[38] = R, A[39] = B, A[40] = s, A[41] = E) : E = A[41], E;
+  }), A[18] = n, A[19] = C, A[20] = a, A[21] = p, A[22] = w, A[23] = u, A[24] = e, A[25] = m, A[26] = f, A[27] = o, A[28] = y, A[29] = l, A[30] = d, A[31] = b, A[32] = g, A[33] = h, A[34] = k, A[35] = S, A[36] = N, A[37] = r, A[38] = R, A[39] = B, A[40] = s, A[41] = E) : E = A[41], E;
 }
 const mr = [fA];
 function wr(t) {
@@ -2318,9 +2321,9 @@ function wr(t) {
     unit: u,
     modeInstance: g
   } = je(c), m = kA(Br), v = I(Cr), y = I(kr), k = I(Er), B = I(vr);
-  let M;
-  A[4] !== r ? (M = (G) => G.maps[r]?.layers.filter(br), A[4] = r, A[5] = M) : M = A[5];
-  const C = I(IA(M)), S = I(yr);
+  let S;
+  A[4] !== r ? (S = (G) => G.maps[r]?.layers.filter(br), A[4] = r, A[5] = S) : S = A[5];
+  const C = I(IA(S)), M = I(yr);
   let P;
   A[6] === Symbol.for("react.memo_cache_sentinel") ? (P = {}, A[6] = P) : P = A[6];
   const D = TA(P);
@@ -2339,9 +2342,9 @@ function wr(t) {
     };
   }, N = [k, h, v, r, B, y], A[9] = k, A[10] = h, A[11] = v, A[12] = r, A[13] = B, A[14] = y, A[15] = R, A[16] = N) : (R = A[15], N = A[16]), K(R, N);
   let E, _;
-  A[17] !== h || A[18] !== S || A[19] !== r || A[20] !== C || A[21] !== m ? (E = () => {
+  A[17] !== h || A[18] !== M || A[19] !== r || A[20] !== C || A[21] !== m ? (E = () => {
     C?.forEach((G) => {
-      const U = S(r)?.props.layers.find((q) => q.props.id === G);
+      const U = M(r)?.props.layers.find((q) => q.props.id === G);
       if (!U)
         return;
       h && (D.current[G] = U?.props.pickable);
@@ -2352,7 +2355,7 @@ function wr(t) {
         }
       });
     });
-  }, _ = [h, S, r, C, m], A[17] = h, A[18] = S, A[19] = r, A[20] = C, A[21] = m, A[22] = E, A[23] = _) : (E = A[22], _ = A[23]), K(E, _);
+  }, _ = [h, M, r, C, m], A[17] = h, A[18] = M, A[19] = r, A[20] = C, A[21] = m, A[22] = E, A[23] = _) : (E = A[22], _ = A[23]), K(E, _);
   let T;
   A[24] !== g || A[25] !== f || A[26] !== d || A[27] !== b ? (T = (G) => {
     const {
@@ -2417,19 +2420,19 @@ function _r(t) {
   A[0] !== e ? (r = (a) => a.maps[e], A[0] = e, A[1] = r) : r = A[1];
   const {
     layers: n
-  } = I(r), i = kA(Sr);
+  } = I(r), i = kA(Mr);
   let o;
   if (A[2] !== i || A[3] !== n) {
     let a;
-    A[5] !== i ? (a = (l) => i[l], A[5] = i, A[6] = a) : a = A[6], o = n.map(a).filter(Mr), A[2] = i, A[3] = n, A[4] = o;
+    A[5] !== i ? (a = (l) => i[l], A[5] = i, A[6] = a) : a = A[6], o = n.map(a).filter(Sr), A[2] = i, A[3] = n, A[4] = o;
   } else
     o = A[4];
   return o;
 }
-function Mr(t) {
+function Sr(t) {
   return !!t;
 }
-function Sr(t) {
+function Mr(t) {
   return t.layers;
 }
 const we = [QA, mA, fA];
@@ -2467,11 +2470,11 @@ function bi(t) {
     mapId: e
   }, A[15] = e, A[16] = k) : k = A[16];
   const B = _r(k);
-  let M;
-  A[17] !== B ? (M = Ve(B), A[17] = B, A[18] = M) : M = A[18];
-  const C = M;
   let S;
-  A[19] !== e || A[20] !== n || A[21] !== g || A[22] !== y ? (S = (O) => {
+  A[17] !== B ? (S = Ve(B), A[17] = B, A[18] = S) : S = A[18];
+  const C = S;
+  let M;
+  A[19] !== e || A[20] !== n || A[21] !== g || A[22] !== y ? (M = (O) => {
     const z = g;
     if (h.current && clearInterval(h.current), h.current = setTimeout(() => {
       y(e);
@@ -2480,8 +2483,8 @@ function bi(t) {
       return;
     }
     z(e, O.viewState);
-  }, A[19] = e, A[20] = n, A[21] = g, A[22] = y, A[23] = S) : S = A[23];
-  const P = S;
+  }, A[19] = e, A[20] = n, A[21] = g, A[22] = y, A[23] = M) : M = A[23];
+  const P = M;
   let D;
   A[24] !== e || A[25] !== r || A[26] !== m || A[27] !== y ? (D = (O) => {
     m(e, O), r?.(O), y(e);
@@ -2930,7 +2933,7 @@ class Yr extends Qe {
   }
   /** @experimental */
   getExtent() {
-    const A = Mt(St(this.features));
+    const A = St(Mt(this.features));
     return Promise.resolve({
       bbox: A
     });
@@ -3107,7 +3110,7 @@ class qr extends Qe {
     return this._executeWorkerMethod(iA.GET_EXTENT, [e], A);
   }
 }
-const ie = Se()(Xt((t, A) => ({
+const ie = Me()(Xt((t, A) => ({
   sources: {},
   filters: {},
   setSource: (e, r) => t((n) => {
@@ -3502,11 +3505,11 @@ function sn(t) {
   let u;
   if (A[9] !== d || A[10] !== o) {
     let B;
-    A[12] !== d.length || A[13] !== o ? (B = (M, C) => {
-      const S = "column" in o ? $e(o.column, C, d.length) : void 0, P = "operationExp" in o ? EA(o.operationExp, C, d.length, "operationExp") : void 0, D = "operationColumn" in o ? EA(o.operationColumn, C, d.length, "operationColumn") : void 0, x = {
+    A[12] !== d.length || A[13] !== o ? (B = (S, C) => {
+      const M = "column" in o ? $e(o.column, C, d.length) : void 0, P = "operationExp" in o ? EA(o.operationExp, C, d.length, "operationExp") : void 0, D = "operationColumn" in o ? EA(o.operationColumn, C, d.length, "operationColumn") : void 0, x = {
         ...o,
         ..."column" in o && {
-          column: S
+          column: M
         },
         ...P !== void 0 && {
           operationExp: P
@@ -3523,21 +3526,21 @@ function sn(t) {
   let m;
   if (A[15] !== d || A[16] !== b || A[17] !== g) {
     let B;
-    A[19] !== b || A[20] !== g ? (B = (M, C) => {
-      const S = g[C], P = [...M, S], D = b?.[C];
+    A[19] !== b || A[20] !== g ? (B = (S, C) => {
+      const M = g[C], P = [...S, M], D = b?.[C];
       return D && P.push(D), P;
     }, A[19] = b, A[20] = g, A[21] = B) : B = A[21], m = d.map(B), A[15] = d, A[16] = b, A[17] = g, A[18] = m;
   } else
     m = A[18];
   const v = m;
   if (a) {
-    const B = f?.[0], M = h[0] ?? null, C = v[0];
-    let S;
-    return A[22] !== B || A[23] !== M || A[24] !== C ? (S = {
+    const B = f?.[0], S = h[0] ?? null, C = v[0];
+    let M;
+    return A[22] !== B || A[23] !== S || A[24] !== C ? (M = {
       mergedFilters: B,
-      widgetModel: M,
+      widgetModel: S,
       queryKey: C
-    }, A[22] = B, A[23] = M, A[24] = C, A[25] = S) : S = A[25], S;
+    }, A[22] = B, A[23] = S, A[24] = C, A[25] = M) : M = A[25], M;
   }
   let y;
   A[26] !== f ? (y = f ?? [], A[26] = f, A[27] = y) : y = A[27];
@@ -3634,14 +3637,14 @@ function lA({
         throw E;
       return s ? N.at(0) : N;
     }, i[15] = u, i[16] = m, i[17] = s, i[18] = y, i[19] = l, i[20] = B) : B = i[20];
-    const M = !!y.length && w;
+    const S = !!y.length && w;
     let C;
-    return i[21] !== k || i[22] !== B || i[23] !== M || i[24] !== d ? (C = {
+    return i[21] !== k || i[22] !== B || i[23] !== S || i[24] !== d ? (C = {
       queryKey: k,
       queryFn: B,
-      enabled: M,
+      enabled: S,
       ...d
-    }, i[21] = k, i[22] = B, i[23] = M, i[24] = d, i[25] = C) : C = i[25], Ie(C);
+    }, i[21] = k, i[22] = B, i[23] = S, i[24] = d, i[25] = C) : C = i[25], Ie(C);
   }
   function r(n) {
     const i = F(3), o = e(n);
@@ -3701,8 +3704,8 @@ const {
   queryKeyPrefix: ["categories"],
   getWidgetMethod: (t) => (A) => t.getCategories(A)
 }), {
-  useModelHook: Mi,
-  ModelComponent: Si
+  useModelHook: Si,
+  ModelComponent: Mi
 } = lA({
   queryKeyPrefix: ["features"],
   getWidgetMethod: (t) => (A) => t.getFeatures(A)
@@ -3942,7 +3945,7 @@ function hn(t) {
         i = void 0;
         break A;
       }
-      i = MA(o.map(gn)).geometry;
+      i = SA(o.map(gn)).geometry;
     }
     A[2] = n, A[3] = i;
   } else
@@ -3971,7 +3974,7 @@ function dn(t) {
     let o;
     if (A[2] !== n) {
       const s = Object.values(n).filter(wn).flatMap(mn);
-      o = MA(s), A[2] = n, A[3] = o;
+      o = SA(s), A[2] = n, A[3] = o;
     } else
       o = A[3];
     i = o.geometry;
@@ -4055,7 +4058,7 @@ function yn(t) {
       const d = s[p];
       if (d && d.length > 0) {
         const w = d.map(En).join("|"), b = `${p}:${w}`;
-        l.has(b) || l.set(b, MA(d.map(vn)).geometry), a.push(l.get(b));
+        l.has(b) || l.set(b, SA(d.map(vn)).geometry), a.push(l.get(b));
       }
     }
     const h = new Set(c.filter((p) => {
@@ -4127,8 +4130,8 @@ function _n(t) {
       if (d && d.length > 0) {
         const w = d.map(xn).join("|"), b = `static:${p}:${w}`;
         if (!l.has(b)) {
-          const u = d.flatMap(Sn);
-          l.set(b, MA(u).geometry);
+          const u = d.flatMap(Mn);
+          l.set(b, SA(u).geometry);
         }
         a.push(l.get(b));
       }
@@ -4137,7 +4140,7 @@ function _n(t) {
       const d = s[p];
       return d && d.length > 0;
     }).map((p) => {
-      const w = s[p].map(Mn).join("|");
+      const w = s[p].map(Sn).join("|");
       return `static:${p}:${w}`;
     }));
     for (const p of l.keys())
@@ -4147,10 +4150,10 @@ function _n(t) {
     a = A[8];
   return a;
 }
-function Mn(t) {
+function Sn(t) {
   return `${t.type}:${JSON.stringify(t.coordinates).length}`;
 }
-function Sn(t) {
+function Mn(t) {
   return t.type === "Polygon" ? [t.coordinates] : t.coordinates;
 }
 function xn(t) {
@@ -4243,7 +4246,7 @@ const Rn = {
   Polygon: (t) => Pt(t.coordinates),
   MultiPoint: (t) => Dt(t.coordinates),
   MultiLineString: (t) => xt(t.coordinates),
-  MultiPolygon: (t) => MA(t.coordinates)
+  MultiPolygon: (t) => SA(t.coordinates)
 };
 function Zi(t) {
   const A = Rn[t.type], e = A?.(t);
@@ -4533,7 +4536,7 @@ export {
   UA as CartoBasemapURL,
   sA as CartoBasemaps,
   _i as CategoriesModel,
-  S0 as CustomCompositeEditMode,
+  M0 as CustomCompositeEditMode,
   Ae as CustomEditableGeojsonLayer,
   K0 as CustomMeasureAreaMode,
   $0 as CustomMeasureBufferMode,
@@ -4548,7 +4551,7 @@ export {
   VA as DEFAULT_MEASURE_COLORS,
   f0 as DeckGLComponent,
   rA as EditableEditType,
-  Si as FeaturesModel,
+  Mi as FeaturesModel,
   Di as FormulaModel,
   NA as GmapsBasemap,
   Ti as HistogramModel,
@@ -4597,7 +4600,7 @@ export {
   ki as useAggregations,
   Bi as useCategories,
   Re as useEventManager,
-  Mi as useFeatures,
+  Si as useFeatures,
   We as useFilters,
   xi as useFormula,
   yn as useGroupedLassoToolsSpatialFilters,