@mesh3d/cesium-vectortile-gl 0.4.5 → 0.4.6

package/dist/cvt-gl.js

@@ -313,30 +313,30 @@ class We {
    */
   toGeoJSON(e, t, r) {
     const i = this.extent * Math.pow(2, r), s = this.extent * e, o = this.extent * t, a = this.loadGeometry();
-    function l(d) {
+    function l(p) {
       return [
-        (d.x + s) * 360 / i - 180,
-        360 / Math.PI * Math.atan(Math.exp((1 - (d.y + o) * 2 / i) * Math.PI)) - 90
+        (p.x + s) * 360 / i - 180,
+        360 / Math.PI * Math.atan(Math.exp((1 - (p.y + o) * 2 / i) * Math.PI)) - 90
       ];
     }
-    function u(d) {
-      return d.map(l);
+    function u(p) {
+      return p.map(l);
     }
     let c;
     if (this.type === 1) {
-      const d = [];
+      const p = [];
       for (const h of a)
-        d.push(h[0]);
-      const p = u(d);
-      c = d.length === 1 ? { type: "Point", coordinates: p[0] } : { type: "MultiPoint", coordinates: p };
+        p.push(h[0]);
+      const d = u(p);
+      c = p.length === 1 ? { type: "Point", coordinates: d[0] } : { type: "MultiPoint", coordinates: d };
     } else if (this.type === 2) {
-      const d = a.map(u);
-      c = d.length === 1 ? { type: "LineString", coordinates: d[0] } : { type: "MultiLineString", coordinates: d };
+      const p = a.map(u);
+      c = p.length === 1 ? { type: "LineString", coordinates: p[0] } : { type: "MultiLineString", coordinates: p };
     } else if (this.type === 3) {
-      const d = ki(a), p = [];
-      for (const h of d)
-        p.push(h.map(u));
-      c = p.length === 1 ? { type: "Polygon", coordinates: p[0] } : { type: "MultiPolygon", coordinates: p };
+      const p = Fi(a), d = [];
+      for (const h of p)
+        d.push(h.map(u));
+      c = d.length === 1 ? { type: "Polygon", coordinates: d[0] } : { type: "MultiPolygon", coordinates: d };
     } else
       throw new Error("unknown feature type");
     const f = {
@@ -359,7 +359,7 @@ function Rs(n, e) {
     e.properties[r] = i;
   }
 }
-function ki(n) {
+function Fi(n) {
   const e = n.length;
   if (e <= 1) return [n];
   const t = [];
@@ -423,7 +423,7 @@ function Zs(n, e, t) {
     r.length && (e[r.name] = r);
   }
 }
-class Fi {
+class ki {
   /**
    * 构造数据源实例。注意：该构造函数由VectorTileset调用，请勿在其他模块直接调用
    * @param {import('@maplibre/maplibre-gl-style-spec').SourceSpecification} styleSource
@@ -582,7 +582,7 @@ class Xs {
 }
 const Mt = {
   FEATURE: 0
-}, A = {
+}, z = {
   BOOLEAN: 0,
   INT_8: 1,
   UINT_8: 2,
@@ -922,9 +922,9 @@ function bo(n, e) {
 }
 function wo(n, e, t, r) {
   const i = e;
-  return t ? Co(r, n, i.runs) : To(r, n, i.runs);
+  return t ? To(r, n, i.runs) : Co(r, n, i.runs);
 }
-function To(n, e, t) {
+function Co(n, e, t) {
   const r = new Int32Array(n.size());
   let i = 0;
   for (let s = 0; s < t; s++) {
@@ -935,7 +935,7 @@ function To(n, e, t) {
   }
   return r;
 }
-function Co(n, e, t) {
+function To(n, e, t) {
   const r = new Int32Array(n.size());
   let i = 0;
   for (let s = 0; s < t; s++) {
@@ -996,13 +996,13 @@ function Eo(n, e, t) {
   }
   return r;
 }
-function zo(n) {
+function Ao(n) {
   return n[1];
 }
-function Ao(n) {
+function zo(n) {
   return Ee(n[1]);
 }
-function ko(n) {
+function Fo(n) {
   if (n.length == 2) {
     const r = Ee(n[1]);
     return [r, r];
@@ -1010,7 +1010,7 @@ function ko(n) {
   const e = Ee(n[2]), t = Ee(n[3]);
   return [e, t];
 }
-function Fo(n) {
+function ko(n) {
   return n[1];
 }
 function Po(n) {
@@ -1181,11 +1181,11 @@ function sr(n, e, t, r) {
     const s = i[0];
     return r ? Ee(s) : s;
   }
-  return r ? Ao(i) : zo(i);
+  return r ? zo(i) : Ao(i);
 }
 function qi(n, e, t) {
   const r = Jt(n, e, t);
-  return ko(r);
+  return Fo(r);
 }
 function Gi(n, e, t) {
   const r = Ht(n, e, t.numValues);
@@ -1205,7 +1205,7 @@ function $i(n, e, t, r) {
     const s = i[0];
     return r ? Re(s) : s;
   }
-  return r ? Po(i) : Fo(i);
+  return r ? Po(i) : ko(i);
 }
 function Bo(n, e, t, r) {
   switch (e.logicalLevelTechnique1) {
@@ -1425,7 +1425,7 @@ function Rr(n) {
   let t = 1, r = 1, i = 1, s = 0;
   const o = new Zo();
   let a = 0, l = 0;
-  const u = n.mortonSettings, c = n.topologyVector, f = c.geometryOffsets, d = c.partOffsets, p = c.ringOffsets, h = n.vertexOffsets, y = n.containsPolygonGeometry(), m = n.vertexBuffer;
+  const u = n.mortonSettings, c = n.topologyVector, f = c.geometryOffsets, p = c.partOffsets, d = c.ringOffsets, h = n.vertexOffsets, y = n.containsPolygonGeometry(), m = n.vertexBuffer;
   for (let v = 0; v < n.numGeometries; v++) {
     const w = n.geometryType(v);
     if (w === B.POINT) {
@@ -1433,52 +1433,52 @@ function Rr(n) {
         const g = m[a++], x = m[a++], b = new M(g, x);
         e[s++] = o.createPoint(b);
       } else if (n.vertexBufferType === Q.VEC_2) {
-        const g = h[l++] * 2, x = m[g], b = m[g + 1], C = new M(x, b);
-        e[s++] = o.createPoint(C);
+        const g = h[l++] * 2, x = m[g], b = m[g + 1], T = new M(x, b);
+        e[s++] = o.createPoint(T);
       } else {
-        const g = h[l++], x = m[g], b = ar(x, u.numBits, u.coordinateShift), C = new M(b.x, b.y);
-        e[s++] = o.createPoint(C);
+        const g = h[l++], x = m[g], b = ar(x, u.numBits, u.coordinateShift), T = new M(b.x, b.y);
+        e[s++] = o.createPoint(T);
       }
-      f && i++, d && t++, p && r++;
+      f && i++, p && t++, d && r++;
     } else if (w === B.MULTIPOINT) {
       const g = f[i] - f[i - 1];
       i++;
       const x = new Array(g);
       if (!h || h.length === 0) {
         for (let b = 0; b < g; b++) {
-          const C = m[a++], _ = m[a++];
-          x[b] = new M(C, _);
+          const T = m[a++], _ = m[a++];
+          x[b] = new M(T, _);
         }
         e[s++] = o.createMultiPoint(x);
       } else {
         for (let b = 0; b < g; b++) {
-          const C = h[l++] * 2, _ = m[C], I = m[C + 1];
+          const T = h[l++] * 2, _ = m[T], I = m[T + 1];
           x[b] = new M(_, I);
         }
         e[s++] = o.createMultiPoint(x);
       }
     } else if (w === B.LINESTRING) {
       let g = 0;
-      y ? (g = p[r] - p[r - 1], r++) : g = d[t] - d[t - 1], t++;
+      y ? (g = d[r] - d[r - 1], r++) : g = p[t] - p[t - 1], t++;
       let x;
       !h || h.length === 0 ? (x = Dn(m, a, g, !1), a += g * 2) : (x = n.vertexBufferType === Q.VEC_2 ? Nn(m, h, l, g, !1) : Bn(m, h, l, g, !1, u), l += g), e[s++] = o.createLineString(x), f && i++;
     } else if (w === B.POLYGON) {
-      const g = d[t] - d[t - 1];
+      const g = p[t] - p[t - 1];
       t++;
       const x = new Array(g - 1);
-      let b = p[r] - p[r - 1];
+      let b = d[r] - d[r - 1];
       if (r++, !h || h.length === 0) {
-        const C = wt(m, a, b);
+        const T = wt(m, a, b);
         a += b * 2;
         for (let _ = 0; _ < x.length; _++)
-          b = p[r] - p[r - 1], r++, x[_] = wt(m, a, b), a += b * 2;
-        e[s++] = o.createPolygon(C, x);
+          b = d[r] - d[r - 1], r++, x[_] = wt(m, a, b), a += b * 2;
+        e[s++] = o.createPolygon(T, x);
       } else {
-        const C = n.vertexBufferType === Q.VEC_2 ? Tt(m, h, l, b) : Ct(m, h, l, b, o, u);
+        const T = n.vertexBufferType === Q.VEC_2 ? Ct(m, h, l, b) : Tt(m, h, l, b, o, u);
         l += b;
         for (let _ = 0; _ < x.length; _++)
-          b = p[r] - p[r - 1], r++, x[_] = n.vertexBufferType === Q.VEC_2 ? Tt(m, h, l, b) : Ct(m, h, l, b, o, u), l += b;
-        e[s++] = o.createPolygon(C, x);
+          b = d[r] - d[r - 1], r++, x[_] = n.vertexBufferType === Q.VEC_2 ? Ct(m, h, l, b) : Tt(m, h, l, b, o, u), l += b;
+        e[s++] = o.createPolygon(T, x);
       }
       f && i++;
     } else if (w === B.MULTILINESTRING) {
@@ -1487,16 +1487,16 @@ function Rr(n) {
       const x = new Array(g);
       if (!h || h.length === 0) {
         for (let b = 0; b < g; b++) {
-          let C = 0;
-          y ? (C = p[r] - p[r - 1], r++) : C = d[t] - d[t - 1], t++, x[b] = Dn(m, a, C, !1), a += C * 2;
+          let T = 0;
+          y ? (T = d[r] - d[r - 1], r++) : T = p[t] - p[t - 1], t++, x[b] = Dn(m, a, T, !1), a += T * 2;
         }
         e[s++] = o.createMultiLineString(x);
       } else {
         for (let b = 0; b < g; b++) {
-          let C = 0;
-          y ? (C = p[r] - p[r - 1], r++) : C = d[t] - d[t - 1], t++;
-          const _ = n.vertexBufferType === Q.VEC_2 ? Nn(m, h, l, C, !1) : Bn(m, h, l, C, !1, u);
-          x[b] = _, l += C;
+          let T = 0;
+          y ? (T = d[r] - d[r - 1], r++) : T = p[t] - p[t - 1], t++;
+          const _ = n.vertexBufferType === Q.VEC_2 ? Nn(m, h, l, T, !1) : Bn(m, h, l, T, !1, u);
+          x[b] = _, l += T;
         }
         e[s++] = o.createMultiLineString(x);
       }
@@ -1506,31 +1506,31 @@ function Rr(n) {
       const x = new Array(g);
       let b = 0;
       if (!h || h.length === 0) {
-        for (let C = 0; C < g; C++) {
-          const _ = d[t] - d[t - 1];
+        for (let T = 0; T < g; T++) {
+          const _ = p[t] - p[t - 1];
           t++;
           const I = new Array(_ - 1);
-          b = p[r] - p[r - 1], r++;
-          const F = wt(m, a, b);
+          b = d[r] - d[r - 1], r++;
+          const k = wt(m, a, b);
           a += b * 2;
           for (let P = 0; P < I.length; P++) {
-            const G = p[r] - p[r - 1];
+            const G = d[r] - d[r - 1];
             r++, I[P] = wt(m, a, G), a += G * 2;
           }
-          x[C] = o.createPolygon(F, I);
+          x[T] = o.createPolygon(k, I);
         }
         e[s++] = o.createMultiPolygon(x);
       } else {
-        for (let C = 0; C < g; C++) {
-          const _ = d[t] - d[t - 1];
+        for (let T = 0; T < g; T++) {
+          const _ = p[t] - p[t - 1];
           t++;
           const I = new Array(_ - 1);
-          b = p[r] - p[r - 1], r++;
-          const F = n.vertexBufferType === Q.VEC_2 ? Tt(m, h, l, b) : Ct(m, h, l, b, o, u);
+          b = d[r] - d[r - 1], r++;
+          const k = n.vertexBufferType === Q.VEC_2 ? Ct(m, h, l, b) : Tt(m, h, l, b, o, u);
           l += b;
           for (let P = 0; P < I.length; P++)
-            b = p[r] - p[r - 1], r++, I[P] = n.vertexBufferType === Q.VEC_2 ? Tt(m, h, l, b) : Ct(m, h, l, b, o, u), l += b;
-          x[C] = o.createPolygon(F, I);
+            b = d[r] - d[r - 1], r++, I[P] = n.vertexBufferType === Q.VEC_2 ? Ct(m, h, l, b) : Tt(m, h, l, b, o, u), l += b;
+          x[T] = o.createPolygon(k, I);
         }
         e[s++] = o.createMultiPolygon(x);
       }
@@ -1542,10 +1542,10 @@ function Rr(n) {
 function wt(n, e, t) {
   return Dn(n, e, t, !0);
 }
-function Tt(n, e, t, r) {
+function Ct(n, e, t, r) {
   return Nn(n, e, t, r, !0);
 }
-function Ct(n, e, t, r, i, s) {
+function Tt(n, e, t, r, i, s) {
   return Bn(n, e, t, r, !0, s);
 }
 function Dn(n, e, t, r) {
@@ -1706,10 +1706,10 @@ class Hi {
       switch (this.geometryType(c)) {
         case B.POLYGON:
           {
-            const d = r[a] - r[a - 1];
+            const p = r[a] - r[a - 1];
             a++;
-            const p = [];
-            for (let h = 0; h < d; h++) {
+            const d = [];
+            for (let h = 0; h < p; h++) {
               const y = i[l] - i[l - 1];
               l++;
               const m = [];
@@ -1717,17 +1717,17 @@ class Hi {
                 const w = this._vertexBuffer[o++], g = this._vertexBuffer[o++];
                 m.push(new M(w, g));
               }
-              m.length > 0 && m.push(m[0]), p.push(m);
+              m.length > 0 && m.push(m[0]), d.push(m);
             }
-            e[c] = p, s && u++;
+            e[c] = d, s && u++;
           }
           break;
         case B.MULTIPOLYGON:
           {
-            const d = s[u] - s[u - 1];
+            const p = s[u] - s[u - 1];
             u++;
-            const p = [];
-            for (let h = 0; h < d; h++) {
+            const d = [];
+            for (let h = 0; h < p; h++) {
               const y = r[a] - r[a - 1];
               a++;
               for (let m = 0; m < y; m++) {
@@ -1738,10 +1738,10 @@ class Hi {
                   const x = this._vertexBuffer[o++], b = this._vertexBuffer[o++];
                   w.push(new M(x, b));
                 }
-                w.length > 0 && w.push(w[0]), p.push(w);
+                w.length > 0 && w.push(w[0]), d.push(w);
               }
             }
-            e[c] = p;
+            e[c] = d;
           }
           break;
       }
@@ -1790,7 +1790,7 @@ class Ko extends Hi {
 }
 function Qo(n, e, t, r, i) {
   const s = Y(n, t), o = Kt(s, r, n, t);
-  let a = null, l = null, u = null, c = null, f = null, d = null, p = null, h = null;
+  let a = null, l = null, u = null, c = null, f = null, p = null, d = null, h = null;
   if (o === N.CONST) {
     const m = sr(n, t, s, !1);
     for (let v = 0; v < e - 1; v++) {
@@ -1808,7 +1808,7 @@ function Qo(n, e, t, r, i) {
               u = we(n, t, w);
               break;
             case K.TRIANGLES:
-              p = we(n, t, w);
+              d = we(n, t, w);
           }
           break;
         case U.OFFSET: {
@@ -1827,7 +1827,7 @@ function Qo(n, e, t, r, i) {
             f = Z(n, t, w, !0);
           else {
             const g = w;
-            d = {
+            p = {
               numBits: g.numBits,
               coordinateShift: g.coordinateShift
             }, f = Z(n, t, w, !1);
@@ -1839,14 +1839,14 @@ function Qo(n, e, t, r, i) {
     if (h !== null) {
       if (a != null || l != null) {
         const v = new Oe(a, l, u);
-        return qr(r, m, p, h, f, v);
+        return qr(r, m, d, h, f, v);
       }
-      return qr(r, m, p, h, f);
+      return qr(r, m, d, h, f);
     }
-    return d === null ? (
+    return p === null ? (
       /* Currently only 2D coordinates (Vec2) are implemented in the encoder  */
       Xo(r, m, new Oe(a, l, u), c, f)
-    ) : Yo(r, m, new Oe(a, l, u), c, f, d);
+    ) : Yo(r, m, new Oe(a, l, u), c, f, p);
   }
   const y = Z(n, t, s, !1);
   for (let m = 0; m < e - 1; m++) {
@@ -1864,7 +1864,7 @@ function Qo(n, e, t, r, i) {
             u = Z(n, t, v, !1);
             break;
           case K.TRIANGLES:
-            p = we(n, t, v);
+            d = we(n, t, v);
         }
         break;
       case U.OFFSET:
@@ -1882,7 +1882,7 @@ function Qo(n, e, t, r, i) {
           f = Z(n, t, v, !0);
         else {
           const w = v;
-          d = {
+          p = {
             numBits: w.numBits,
             coordinateShift: w.coordinateShift
           }, f = Z(n, t, v, !1);
@@ -1890,7 +1890,7 @@ function Qo(n, e, t, r, i) {
         break;
     }
   }
-  return h !== null && l === null ? Gr(y, p, h, f) : (a !== null ? (a = xn(y, a, 2), l !== null && u !== null ? (l = Ur(y, a, l, !1), u = ta(y, a, l, u)) : l !== null && (l = ea(y, a, l))) : l !== null && u !== null ? (l = xn(y, l, 1), u = Ur(y, l, u, !0)) : l !== null && (l = xn(y, l, 0)), h !== null ? Gr(y, p, h, f, new Oe(a, l, u)) : d === null ? Wo(y, new Oe(a, l, u), c, f) : Ho(y, new Oe(a, l, u), c, f, d));
+  return h !== null && l === null ? Gr(y, d, h, f) : (a !== null ? (a = xn(y, a, 2), l !== null && u !== null ? (l = Ur(y, a, l, !1), u = ta(y, a, l, u)) : l !== null && (l = ea(y, a, l))) : l !== null && u !== null ? (l = xn(y, l, 1), u = Ur(y, l, u, !0)) : l !== null && (l = xn(y, l, 0)), h !== null ? Gr(y, d, h, f, new Oe(a, l, u)) : p === null ? Wo(y, new Oe(a, l, u), c, f) : Ho(y, new Oe(a, l, u), c, f, p));
 }
 function xn(n, e, t) {
   const r = new Int32Array(n.length + 1);
@@ -1941,14 +1941,14 @@ function ta(n, e, t, r) {
   for (let u = 0; u < n.length; u++) {
     const c = n[u], f = e[u + 1] - e[u];
     if (c !== 0 && c !== 3)
-      for (let d = 0; d < f; d++) {
-        const p = t[o] - t[o - 1];
+      for (let p = 0; p < f; p++) {
+        const d = t[o] - t[o - 1];
         o++;
-        for (let h = 0; h < p; h++)
+        for (let h = 0; h < d; h++)
           s = i[a++] = s + r[l++];
       }
     else
-      for (let d = 0; d < f; d++)
+      for (let p = 0; p < f; p++)
         i[a++] = ++s, o++;
   }
   return i;
@@ -2118,8 +2118,8 @@ class Qi extends ur {
 }
 const pa = "default", da = ":";
 function ya(n, e, t, r, i) {
-  let s = null, o = null, a = null, l = null, u = null, c = null, f = null, d = null;
-  for (let p = 0; p < r; p++) {
+  let s = null, o = null, a = null, l = null, u = null, c = null, f = null, p = null;
+  for (let d = 0; d < r; d++) {
     const h = Y(e, t);
     if (h.byteLength !== 0)
       switch (h.physicalStreamType) {
@@ -2141,12 +2141,12 @@ function ya(n, e, t, r, i) {
           const y = e.subarray(t.get(), t.get() + h.byteLength);
           t.add(h.byteLength);
           const m = h.logicalStreamType.dictionaryType;
-          le.FSST === m ? u = y : le.SINGLE === m || le.SHARED === m ? a = y : le.NONE === m && (d = y);
+          le.FSST === m ? u = y : le.SINGLE === m || le.SHARED === m ? a = y : le.NONE === m && (p = y);
           break;
         }
       }
   }
-  return ma(n, u, o, s, a, l, i ?? c) ?? ga(n, a, o, s, i ?? c) ?? xa(n, f, d, o, i ?? c);
+  return ma(n, u, o, s, a, l, i ?? c) ?? ga(n, a, o, s, i ?? c) ?? xa(n, f, p, o, i ?? c);
 }
 function ma(n, e, t, r, i, s, o) {
   return e ? new Qi(n, t, r, i, s, e, o) : null;
@@ -2171,27 +2171,27 @@ function xa(n, e, t, r, i) {
 function va(n, e, t, r, i) {
   let s = null, o = null, a = null, l = null, u = !1;
   for (; !u; ) {
-    const p = Y(n, e);
-    switch (p.physicalStreamType) {
+    const d = Y(n, e);
+    switch (d.physicalStreamType) {
       case U.LENGTH:
-        K.DICTIONARY === p.logicalStreamType.lengthType ? s = we(n, e, p) : a = we(n, e, p);
+        K.DICTIONARY === d.logicalStreamType.lengthType ? s = we(n, e, d) : a = we(n, e, d);
         break;
       case U.DATA:
-        le.SINGLE === p.logicalStreamType.dictionaryType || le.SHARED === p.logicalStreamType.dictionaryType ? (o = n.subarray(e.get(), e.get() + p.byteLength), u = !0) : l = n.subarray(e.get(), e.get() + p.byteLength), e.add(p.byteLength);
+        le.SINGLE === d.logicalStreamType.dictionaryType || le.SHARED === d.logicalStreamType.dictionaryType ? (o = n.subarray(e.get(), e.get() + d.byteLength), u = !0) : l = n.subarray(e.get(), e.get() + d.byteLength), e.add(d.byteLength);
         break;
     }
   }
   const c = t.complexType.children, f = [];
-  let d = 0;
-  for (const p of c) {
+  let p = 0;
+  for (const d of c) {
     const h = q(n, e, 1)[0];
     if (h == 0)
       continue;
-    const y = `${t.name}${p.name === pa ? "" : da + p.name}`;
-    if (h !== 2 || p.type !== "scalarField" || p.scalarField.physicalType !== A.STRING)
+    const y = `${t.name}${d.name === pa ? "" : da + d.name}`;
+    if (h !== 2 || d.type !== "scalarField" || d.scalarField.physicalType !== z.STRING)
       throw new Error("Currently only optional string fields are implemented for a struct.");
     const m = Y(n, e), v = dt(n, m.numValues, e), w = Y(n, e), b = w.decompressedCount !== r ? or(n, e, w, !1, new ue(v, m.numValues)) : Z(n, e, w, !1);
-    f[d++] = l ? new Qi(y, b, s, o, a, l, new ue(v, m.numValues)) : new qe(y, b, s, o, new ue(v, m.numValues));
+    f[p++] = l ? new Qi(y, b, s, o, a, l, new ue(v, m.numValues)) : new qe(y, b, s, o, new ue(v, m.numValues));
   }
   return f;
 }
@@ -2205,37 +2205,37 @@ function wa(n, e, t, r, i, s) {
   if (s.nullable) {
     const c = Y(e, t);
     a = c.numValues;
-    const f = t.get(), d = dt(e, a, t);
-    t.set(f + c.byteLength), o = new ue(d, c.numValues);
+    const f = t.get(), p = dt(e, a, t);
+    t.set(f + c.byteLength), o = new ue(p, c.numValues);
   }
   const l = o ?? r;
   switch (i.physicalType) {
-    case A.UINT_32:
-    case A.INT_32:
+    case z.UINT_32:
+    case z.INT_32:
       return La(e, t, s, i, l);
-    case A.STRING:
+    case z.STRING:
       const c = s.nullable ? n - 1 : n;
       return ya(s.name, e, t, c, o);
-    case A.BOOLEAN:
-      return Ta(e, t, s, r, l);
-    case A.UINT_64:
-    case A.INT_64:
+    case z.BOOLEAN:
+      return Ca(e, t, s, r, l);
+    case z.UINT_64:
+    case z.INT_64:
       return Ia(e, t, s, l, i);
-    case A.FLOAT:
-      return Ca(e, t, s, l);
-    case A.DOUBLE:
+    case z.FLOAT:
+      return Ta(e, t, s, l);
+    case z.DOUBLE:
       return _a(e, t, s, l);
     default:
       throw new Error(`The specified data type for the field is currently not supported: ${i}`);
   }
 }
-function Ta(n, e, t, r, i) {
+function Ca(n, e, t, r, i) {
   const s = Y(n, e), o = s.numValues, a = e.get(), l = yt(i) ? ia(n, o, e, i) : dt(n, o, e);
   e.set(a + s.byteLength);
   const u = new ue(l, o);
   return new na(t.name, u, i);
 }
-function Ca(n, e, t, r) {
+function Ta(n, e, t, r) {
   const i = Y(n, e), s = yt(r) ? aa(n, e, r, i.numValues) : sa(n, e, i.numValues);
   return new ra(t.name, s, r);
 }
@@ -2244,7 +2244,7 @@ function _a(n, e, t, r) {
   return new tr(t.name, s, r);
 }
 function Ia(n, e, t, r, i) {
-  const s = Y(n, e), o = Kt(s, r, n, e), a = i.physicalType === A.INT_64;
+  const s = Y(n, e), o = Kt(s, r, n, e), a = i.physicalType === z.INT_64;
   if (o === N.FLAT) {
     const l = yt(r) ? Uo(n, e, s, a, r) : Ui(n, e, s, a);
     return new ji(t.name, l, r);
@@ -2257,7 +2257,7 @@ function Ia(n, e, t, r, i) {
   }
 }
 function La(n, e, t, r, i) {
-  const s = Y(n, e), o = Kt(s, i, n, e), a = r.physicalType === A.INT_32;
+  const s = Y(n, e), o = Kt(s, i, n, e), a = r.physicalType === z.INT_32;
   if (o === N.FLAT) {
     const l = yt(i) ? or(n, e, s, a, i) : Z(n, e, s, a);
     return new er(t.name, l, i);
@@ -2280,7 +2280,7 @@ function Sa(n) {
     case 3: {
       const e = {};
       e.nullable = (n & 1) !== 0, e.columnScope = Mt.FEATURE;
-      const t = {}, r = n > 1 ? A.UINT_64 : A.UINT_32;
+      const t = {}, r = n > 1 ? z.UINT_64 : z.UINT_32;
       return t.physicalType = r, t.type = "physicalType", e.scalarType = t, e.type = "scalarType", e;
     }
     case 4: {
@@ -2296,33 +2296,33 @@ function Sa(n) {
       return t.type = "physicalType", t.physicalType = Dt.STRUCT, e.type = "complexType", e.complexType = t, e;
     }
     default:
-      return ka(n);
+      return Fa(n);
   }
 }
 function Ea(n) {
   return n >= 10;
 }
-function za(n) {
+function Aa(n) {
   return n === 30;
 }
-function Aa(n) {
+function za(n) {
   if (n.name === "id")
     return !1;
   if (n.type === "scalarType") {
     const e = n.scalarType;
     if (e.type === "physicalType")
       switch (e.physicalType) {
-        case A.BOOLEAN:
-        case A.INT_8:
-        case A.UINT_8:
-        case A.INT_32:
-        case A.UINT_32:
-        case A.INT_64:
-        case A.UINT_64:
-        case A.FLOAT:
-        case A.DOUBLE:
+        case z.BOOLEAN:
+        case z.INT_8:
+        case z.UINT_8:
+        case z.INT_32:
+        case z.UINT_32:
+        case z.INT_64:
+        case z.UINT_64:
+        case z.FLOAT:
+        case z.DOUBLE:
           return !1;
-        case A.STRING:
+        case z.STRING:
           return !0;
         default:
           return !1;
@@ -2342,48 +2342,48 @@ function Aa(n) {
   }
   return console.warn("Unexpected column type in hasStreamCount", n), !1;
 }
-function ka(n) {
+function Fa(n) {
   let e = null;
   switch (n) {
     case 10:
     case 11:
-      e = A.BOOLEAN;
+      e = z.BOOLEAN;
       break;
     case 12:
     case 13:
-      e = A.INT_8;
+      e = z.INT_8;
       break;
     case 14:
     case 15:
-      e = A.UINT_8;
+      e = z.UINT_8;
       break;
     case 16:
     case 17:
-      e = A.INT_32;
+      e = z.INT_32;
       break;
     case 18:
     case 19:
-      e = A.UINT_32;
+      e = z.UINT_32;
       break;
     case 20:
     case 21:
-      e = A.INT_64;
+      e = z.INT_64;
       break;
     case 22:
     case 23:
-      e = A.UINT_64;
+      e = z.UINT_64;
       break;
     case 24:
     case 25:
-      e = A.FLOAT;
+      e = z.FLOAT;
       break;
     case 26:
     case 27:
-      e = A.DOUBLE;
+      e = z.DOUBLE;
       break;
     case 28:
     case 29:
-      e = A.STRING;
+      e = z.STRING;
       break;
     default:
       return null;
@@ -2393,13 +2393,13 @@ function ka(n) {
   const r = {};
   return r.type = "physicalType", r.physicalType = e, t.type = "scalarType", t.scalarType = r, t;
 }
-const Fa = new TextDecoder();
+const ka = new TextDecoder();
 function es(n, e) {
   const t = q(n, e, 1)[0];
   if (t === 0)
     return "";
   const r = e.get(), i = r + t, s = n.subarray(r, i);
-  return e.add(t), Fa.decode(s);
+  return e.add(t), ka.decode(s);
 }
 function ts(n, e) {
   const t = q(n, e, 1)[0] >>> 0, r = (t & 4) !== 0, i = (t & 2) !== 0, s = q(n, e, 1)[0] >>> 0, o = {};
@@ -2422,7 +2422,7 @@ function Pa(n, e) {
   const t = q(n, e, 1)[0] >>> 0, r = Sa(t);
   if (!r)
     throw new Error(`Unsupported column type code: ${t}`);
-  if (Ea(t) ? r.name = es(n, e) : t >= 0 && t <= 3 ? r.name = "id" : t === 4 && (r.name = "geometry"), za(t)) {
+  if (Ea(t) ? r.name = es(n, e) : t >= 0 && t <= 3 ? r.name = "id" : t === 4 && (r.name = "geometry"), Aa(t)) {
     const i = q(n, e, 1)[0] >>> 0, s = r.complexType;
     s.children = new Array(i);
     for (let o = 0; o < i; o++)
@@ -2452,20 +2452,20 @@ function Da(n, e, t = !0) {
       r.set(a);
       continue;
     }
-    const u = Ma(n, r), c = u[0], f = u[1], d = c.featureTables[0];
-    let p = null, h = null;
+    const u = Ma(n, r), c = u[0], f = u[1], p = c.featureTables[0];
+    let d = null, h = null;
     const y = [];
     let m = 0;
-    for (const w of d.columns) {
+    for (const w of p.columns) {
       const g = w.name;
       if (g === Oa) {
         let x = null;
         if (w.nullable) {
-          const C = Y(n, r), _ = r.get(), I = dt(n, C.numValues, r);
-          r.set(_ + C.byteLength), x = new ue(I, C.numValues);
+          const T = Y(n, r), _ = r.get(), I = dt(n, T.numValues, r);
+          r.set(_ + T.byteLength), x = new ue(I, T.numValues);
         }
         const b = Y(n, r);
-        m = b.decompressedCount, p = Na(n, w, r, g, b, x ?? m, t);
+        m = b.decompressedCount, d = Na(n, w, r, g, b, x ?? m, t);
       } else if (g === Va) {
         const x = q(n, r, 1)[0];
         if (m === 0) {
@@ -2474,26 +2474,26 @@ function Da(n, e, t = !0) {
         }
         h = Qo(n, x, r, m);
       } else {
-        const b = Aa(w) ? q(n, r, 1)[0] : 1;
+        const b = za(w) ? q(n, r, 1)[0] : 1;
         if (b === 0 && w.type === "scalarType")
           continue;
-        const C = ba(n, r, w, b, m);
-        if (C)
-          if (Array.isArray(C))
-            for (const _ of C)
+        const T = ba(n, r, w, b, m);
+        if (T)
+          if (Array.isArray(T))
+            for (const _ of T)
               y.push(_);
           else
-            y.push(C);
+            y.push(T);
       }
     }
-    const v = new Xs(d.name, h, p, y, f);
+    const v = new Xs(p.name, h, d, y, f);
     i.push(v), r.set(a);
   }
   return i;
 }
 function Na(n, e, t, r, i, s, o = !1) {
   const a = e.scalarType.physicalType, l = Kt(i, s, n, t);
-  if (a === A.UINT_32)
+  if (a === z.UINT_32)
     switch (l) {
       case N.FLAT: {
         const u = Z(n, t, i, !1);
@@ -3046,7 +3046,7 @@ function il(n, e, t) {
   }
   return t;
 }
-class sl extends Fi {
+class sl extends ki {
   constructor(e, t) {
     super(e, t), this.tilingScheme = new Cesium.WebMercatorTilingScheme();
   }
@@ -3105,13 +3105,13 @@ function qn(n, e, t, r) {
   const s = e + (t - e >> 1);
   let o = t - e, a;
   const l = n[e], u = n[e + 1], c = n[t], f = n[t + 1];
-  for (let d = e + 3; d < t; d += 3) {
-    const p = ol(n[d], n[d + 1], l, u, c, f);
-    if (p > i)
-      a = d, i = p;
-    else if (p === i) {
-      const h = Math.abs(d - s);
-      h < o && (a = d, o = h);
+  for (let p = e + 3; p < t; p += 3) {
+    const d = ol(n[p], n[p + 1], l, u, c, f);
+    if (d > i)
+      a = p, i = d;
+    else if (d === i) {
+      const h = Math.abs(p - s);
+      h < o && (a = p, o = h);
     }
   }
   i > r && (a - e > 3 && qn(n, e, a, r), n[a + 2] = i, t - a > 3 && qn(n, a, t, r));
@@ -3230,11 +3230,11 @@ function ye(n, e, t, r, i, s, o, a) {
   for (const u of n) {
     const c = u.geometry;
     let f = u.type;
-    const d = i === 0 ? u.minX : u.minY, p = i === 0 ? u.maxX : u.maxY;
-    if (d >= t && p < r) {
+    const p = i === 0 ? u.minX : u.minY, d = i === 0 ? u.maxX : u.maxY;
+    if (p >= t && d < r) {
       l.push(u);
       continue;
-    } else if (p < t || d >= r)
+    } else if (d < t || p >= r)
       continue;
     let h = [];
     if (f === "Point" || f === "MultiPoint")
@@ -3272,13 +3272,13 @@ function is(n, e, t, r, i, s, o) {
   const l = i === 0 ? ul : cl;
   let u = n.start, c, f;
   for (let v = 0; v < n.length - 3; v += 3) {
-    const w = n[v], g = n[v + 1], x = n[v + 2], b = n[v + 3], C = n[v + 4], _ = i === 0 ? w : g, I = i === 0 ? b : C;
-    let F = !1;
-    o && (c = Math.sqrt(Math.pow(w - b, 2) + Math.pow(g - C, 2))), _ < t ? I > t && (f = l(a, w, g, b, C, t), o && (a.start = u + c * f)) : _ > r ? I < r && (f = l(a, w, g, b, C, r), o && (a.start = u + c * f)) : Ge(a, w, g, x), I < t && _ >= t && (f = l(a, w, g, b, C, t), F = !0), I > r && _ <= r && (f = l(a, w, g, b, C, r), F = !0), !s && F && (o && (a.end = u + c * f), e.push(a), a = Wr(n)), o && (u += c);
+    const w = n[v], g = n[v + 1], x = n[v + 2], b = n[v + 3], T = n[v + 4], _ = i === 0 ? w : g, I = i === 0 ? b : T;
+    let k = !1;
+    o && (c = Math.sqrt(Math.pow(w - b, 2) + Math.pow(g - T, 2))), _ < t ? I > t && (f = l(a, w, g, b, T, t), o && (a.start = u + c * f)) : _ > r ? I < r && (f = l(a, w, g, b, T, r), o && (a.start = u + c * f)) : Ge(a, w, g, x), I < t && _ >= t && (f = l(a, w, g, b, T, t), k = !0), I > r && _ <= r && (f = l(a, w, g, b, T, r), k = !0), !s && k && (o && (a.end = u + c * f), e.push(a), a = Wr(n)), o && (u += c);
   }
-  let d = n.length - 3;
-  const p = n[d], h = n[d + 1], y = n[d + 2], m = i === 0 ? p : h;
-  m >= t && m <= r && Ge(a, p, h, y), d = a.length - 3, s && d >= 3 && (a[d] !== a[0] || a[d + 1] !== a[1]) && Ge(a, a[0], a[1], a[2]), a.length && e.push(a);
+  let p = n.length - 3;
+  const d = n[p], h = n[p + 1], y = n[p + 2], m = i === 0 ? d : h;
+  m >= t && m <= r && Ge(a, d, h, y), p = a.length - 3, s && p >= 3 && (a[p] !== a[0] || a[p + 1] !== a[1]) && Ge(a, a[0], a[1], a[2]), a.length && e.push(a);
 }
 function Wr(n) {
   const e = [];
@@ -3311,17 +3311,17 @@ function Hr(n, e) {
     const i = n[r], s = i.type;
     let o;
     if (s === "Point" || s === "MultiPoint" || s === "LineString")
-      o = Tn(i.geometry, e);
+      o = Cn(i.geometry, e);
     else if (s === "MultiLineString" || s === "Polygon") {
       o = [];
       for (const a of i.geometry)
-        o.push(Tn(a, e));
+        o.push(Cn(a, e));
     } else if (s === "MultiPolygon") {
       o = [];
       for (const a of i.geometry) {
         const l = [];
         for (const u of a)
-          l.push(Tn(u, e));
+          l.push(Cn(u, e));
         o.push(l);
       }
     }
@@ -3329,7 +3329,7 @@ function Hr(n, e) {
   }
   return t;
 }
-function Tn(n, e) {
+function Cn(n, e) {
   const t = [];
   t.size = n.size, n.start !== void 0 && (t.start = n.start, t.end = n.end);
   for (let r = 0; r < n.length; r += 3)
@@ -3386,15 +3386,15 @@ function pl(n, e, t, r) {
     for (let a = 0; a < i.length; a += 3)
       o.push(i[a], i[a + 1]), n.numPoints++, n.numSimplified++;
   else if (s === "LineString")
-    Cn(o, i, n, t, !1, !1);
+    Tn(o, i, n, t, !1, !1);
   else if (s === "MultiLineString" || s === "Polygon")
     for (let a = 0; a < i.length; a++)
-      Cn(o, i[a], n, t, s === "Polygon", a === 0);
+      Tn(o, i[a], n, t, s === "Polygon", a === 0);
   else if (s === "MultiPolygon")
     for (let a = 0; a < i.length; a++) {
       const l = i[a];
       for (let u = 0; u < l.length; u++)
-        Cn(o, l[u], n, t, !0, u === 0);
+        Tn(o, l[u], n, t, !0, u === 0);
     }
   if (o.length) {
     let a = e.tags || null;
@@ -3411,7 +3411,7 @@ function pl(n, e, t, r) {
     e.id !== null && (l.id = e.id), n.features.push(l);
   }
 }
-function Cn(n, e, t, r, i, s) {
+function Tn(n, e, t, r, i, s) {
   const o = r * r;
   if (r > 0 && e.size < (i ? o : r)) {
     t.numPoints += e.length / 3;
@@ -3473,23 +3473,23 @@ class ml {
     const l = [e, t, r, i], u = this.options, c = u.debug;
     for (; l.length; ) {
       i = l.pop(), r = l.pop(), t = l.pop(), e = l.pop();
-      const f = 1 << t, d = _n(t, r, i);
-      let p = this.tiles[d];
-      if (!p && (c > 1 && console.time("creation"), p = this.tiles[d] = hl(e, t, r, i, u), this.tileCoords.push({ z: t, x: r, y: i }), c)) {
+      const f = 1 << t, p = _n(t, r, i);
+      let d = this.tiles[p];
+      if (!d && (c > 1 && console.time("creation"), d = this.tiles[p] = hl(e, t, r, i, u), this.tileCoords.push({ z: t, x: r, y: i }), c)) {
         c > 1 && (console.log(
           "tile z%d-%d-%d (features: %d, points: %d, simplified: %d)",
           t,
           r,
           i,
-          p.numFeatures,
-          p.numPoints,
-          p.numSimplified
+          d.numFeatures,
+          d.numPoints,
+          d.numSimplified
         ), console.timeEnd("creation"));
         const I = `z${t}`;
         this.stats[I] = (this.stats[I] || 0) + 1, this.total++;
       }
-      if (p.source = e, s == null) {
-        if (t === u.indexMaxZoom || p.numPoints <= u.indexMaxPoints) continue;
+      if (d.source = e, s == null) {
+        if (t === u.indexMaxZoom || d.numPoints <= u.indexMaxPoints) continue;
       } else {
         if (t === u.maxZoom || t === s)
           continue;
@@ -3498,11 +3498,11 @@ class ml {
           if (r !== o >> I || i !== a >> I) continue;
         }
       }
-      if (p.source = null, e.length === 0) continue;
+      if (d.source = null, e.length === 0) continue;
       c > 1 && console.time("clipping");
       const h = 0.5 * u.buffer / u.extent, y = 0.5 - h, m = 0.5 + h, v = 1 + h;
-      let w = null, g = null, x = null, b = null, C = ye(e, f, r - h, r + m, 0, p.minX, p.maxX, u), _ = ye(e, f, r + y, r + v, 0, p.minX, p.maxX, u);
-      e = null, C && (w = ye(C, f, i - h, i + m, 1, p.minY, p.maxY, u), g = ye(C, f, i + y, i + v, 1, p.minY, p.maxY, u), C = null), _ && (x = ye(_, f, i - h, i + m, 1, p.minY, p.maxY, u), b = ye(_, f, i + y, i + v, 1, p.minY, p.maxY, u), _ = null), c > 1 && console.timeEnd("clipping"), l.push(w || [], t + 1, r * 2, i * 2), l.push(g || [], t + 1, r * 2, i * 2 + 1), l.push(x || [], t + 1, r * 2 + 1, i * 2), l.push(b || [], t + 1, r * 2 + 1, i * 2 + 1);
+      let w = null, g = null, x = null, b = null, T = ye(e, f, r - h, r + m, 0, d.minX, d.maxX, u), _ = ye(e, f, r + y, r + v, 0, d.minX, d.maxX, u);
+      e = null, T && (w = ye(T, f, i - h, i + m, 1, d.minY, d.maxY, u), g = ye(T, f, i + y, i + v, 1, d.minY, d.maxY, u), T = null), _ && (x = ye(_, f, i - h, i + m, 1, d.minY, d.maxY, u), b = ye(_, f, i + y, i + v, 1, d.minY, d.maxY, u), _ = null), c > 1 && console.timeEnd("clipping"), l.push(w || [], t + 1, r * 2, i * 2), l.push(g || [], t + 1, r * 2, i * 2 + 1), l.push(x || [], t + 1, r * 2 + 1, i * 2), l.push(b || [], t + 1, r * 2 + 1, i * 2 + 1);
     }
   }
   getTile(e, t, r) {
@@ -3514,10 +3514,10 @@ class ml {
     const l = _n(e, t, r);
     if (this.tiles[l]) return Jr(this.tiles[l], s);
     o > 1 && console.log("drilling down to z%d-%d-%d", e, t, r);
-    let u = e, c = t, f = r, d;
-    for (; !d && u > 0; )
-      u--, c = c >> 1, f = f >> 1, d = this.tiles[_n(u, c, f)];
-    return !d || !d.source ? null : (o > 1 && (console.log("found parent tile z%d-%d-%d", u, c, f), console.time("drilling down")), this.splitTile(d.source, u, c, f, e, t, r), o > 1 && console.timeEnd("drilling down"), this.tiles[l] ? Jr(this.tiles[l], s) : null);
+    let u = e, c = t, f = r, p;
+    for (; !p && u > 0; )
+      u--, c = c >> 1, f = f >> 1, p = this.tiles[_n(u, c, f)];
+    return !p || !p.source ? null : (o > 1 && (console.log("found parent tile z%d-%d-%d", u, c, f), console.time("drilling down")), this.splitTile(p.source, u, c, f, e, t, r), o > 1 && console.timeEnd("drilling down"), this.tiles[l] ? Jr(this.tiles[l], s) : null);
   }
 }
 function _n(n, e, t) {
@@ -3554,7 +3554,7 @@ class bl {
   }
 }
 const te = 8192;
-class wl extends Fi {
+class wl extends ki {
   constructor(e, t) {
     super(e, t);
   }
@@ -3588,7 +3588,7 @@ class wl extends Fi {
   }
 }
 Mi("geojson", wl);
-var Tl = 8, Cl = {
+var Cl = 8, Tl = {
   version: {
     required: !0,
     type: "enum",
@@ -3871,7 +3871,7 @@ var Tl = 8, Cl = {
   "*": {
     type: "*"
   }
-}, zl = {
+}, Al = {
   type: {
     required: !0,
     type: "enum",
@@ -3932,7 +3932,7 @@ var Tl = 8, Cl = {
   promoteId: {
     type: "promoteId"
   }
-}, Al = {
+}, zl = {
   type: {
     required: !0,
     type: "enum",
@@ -3955,7 +3955,7 @@ var Tl = 8, Cl = {
       value: "number"
     }
   }
-}, kl = {
+}, Fl = {
   type: {
     required: !0,
     type: "enum",
@@ -3977,7 +3977,7 @@ var Tl = 8, Cl = {
       value: "number"
     }
   }
-}, Fl = {
+}, kl = {
   id: {
     type: "string",
     required: !0
@@ -6508,17 +6508,17 @@ var Tl = 8, Cl = {
     }
   }
 }, cu = {
-  $version: Tl,
-  $root: Cl,
+  $version: Cl,
+  $root: Tl,
   sources: _l,
   source: Il,
   source_vector: Ll,
   source_raster: Sl,
   source_raster_dem: El,
-  source_geojson: zl,
-  source_video: Al,
-  source_image: kl,
-  layer: Fl,
+  source_geojson: Al,
+  source_video: zl,
+  source_image: Fl,
+  layer: kl,
   layout: Pl,
   layout_background: Ml,
   layout_fill: Ol,
@@ -6834,9 +6834,9 @@ class cr {
     return this.bindings[e] ? !0 : this.parent ? this.parent.has(e) : !1;
   }
 }
-const Qt = { kind: "null" }, T = { kind: "number" }, z = { kind: "string" }, S = { kind: "boolean" }, fe = { kind: "color" }, en = {
+const Qt = { kind: "null" }, C = { kind: "number" }, A = { kind: "string" }, S = { kind: "boolean" }, fe = { kind: "color" }, en = {
   kind: "projectionDefinition"
-}, ze = { kind: "object" }, L = { kind: "value" }, fu = { kind: "error" }, tn = { kind: "collator" }, nn = { kind: "formatted" }, rn = { kind: "padding" }, ot = { kind: "colorArray" }, sn = { kind: "numberArray" }, mt = { kind: "resolvedImage" }, on = {
+}, Ae = { kind: "object" }, L = { kind: "value" }, fu = { kind: "error" }, tn = { kind: "collator" }, nn = { kind: "formatted" }, rn = { kind: "padding" }, ot = { kind: "colorArray" }, sn = { kind: "numberArray" }, mt = { kind: "resolvedImage" }, on = {
   kind: "variableAnchorOffsetCollection"
 };
 function ee(n, e) {
@@ -6855,13 +6855,13 @@ function O(n) {
 }
 const hu = [
   Qt,
-  T,
-  z,
+  C,
+  A,
   S,
   fe,
   en,
   nn,
-  ze,
+  Ae,
   ee(L),
   rn,
   sn,
@@ -6889,7 +6889,7 @@ function at(n, e) {
 function fr(n, e) {
   return e.some((t) => t.kind === n.kind);
 }
-function Ae(n, e) {
+function ze(n, e) {
   return e.some((t) => t === "null" ? n === null : t === "array" ? Array.isArray(n) : t === "object" ? n && !Array.isArray(n) && typeof n == "object" : t === typeof n);
 }
 function ve(n, e) {
@@ -6984,9 +6984,9 @@ function bu(n) {
         // <numeric>
         f,
         // %         (optional)
-        d,
-        // ,         (optional)
         p,
+        // ,         (optional)
+        d,
         // <numeric>
         h,
         // %         (optional)
@@ -6996,14 +6996,14 @@ function bu(n) {
         // <numeric> (optional)
         v
         // %         (optional)
-      ] = s, w = [u || " ", d || " ", y].join("");
+      ] = s, w = [u || " ", p || " ", y].join("");
       if (w === "  " || w === "  /" || w === ",," || w === ",,,") {
         const g = [l, f, h].join(""), x = g === "%%%" ? 100 : g === "" ? 255 : 0;
         if (x) {
           const b = [
             Ne(+a / x, 0, 1),
             Ne(+c / x, 0, 1),
-            Ne(+p / x, 0, 1),
+            Ne(+d / x, 0, 1),
             m ? ei(+m, v) : 1
           ];
           if (ti(b))
@@ -7032,15 +7032,15 @@ function bu(n) {
       // ,|/       (optional)
       f,
       // <numeric> (optional)
-      d
+      p
       // %         (optional)
-    ] = r, p = [o || " ", l || " ", c].join("");
-    if (p === "  " || p === "  /" || p === ",," || p === ",,,") {
+    ] = r, d = [o || " ", l || " ", c].join("");
+    if (d === "  " || d === "  /" || d === ",," || d === ",,,") {
       const h = [
         +s,
         Ne(+a, 0, 100),
         Ne(+u, 0, 100),
-        f ? ei(+f, d) : 1
+        f ? ei(+f, p) : 1
       ];
       if (ti(h))
         return xu(h);
@@ -7209,16 +7209,16 @@ const wu = {
   yellow: [255, 255, 0],
   yellowgreen: [154, 205, 50]
 };
-function Ce(n, e, t) {
+function Te(n, e, t) {
   return n + t * (e - n);
 }
 function je(n, e, t) {
-  return n.map((r, i) => Ce(r, e[i], t));
+  return n.map((r, i) => Te(r, e[i], t));
 }
-function Tu(n) {
+function Cu(n) {
   return n === "rgb" || n === "hcl" || n === "lab";
 }
-class k {
+class F {
   /**
    * @param r Red component premultiplied by `alpha` 0..1
    * @param g Green component premultiplied by `alpha` 0..1
@@ -7243,13 +7243,13 @@ class k {
    * @returns A `Color` instance, or `undefined` if the input is not a valid color string.
    */
   static parse(e) {
-    if (e instanceof k)
+    if (e instanceof F)
       return e;
     if (typeof e != "string")
       return;
     const t = bu(e);
     if (t)
-      return new k(...t, !1);
+      return new F(...t, !1);
   }
   /**
    * Used in color interpolation and by 'to-rgba' expression.
@@ -7318,34 +7318,34 @@ class k {
     switch (i) {
       case "rgb": {
         const [s, o, a, l] = je(e.rgb, t.rgb, r);
-        return new k(s, o, a, l, !1);
+        return new F(s, o, a, l, !1);
       }
       case "hcl": {
-        const [s, o, a, l] = e.hcl, [u, c, f, d] = t.hcl;
-        let p, h;
+        const [s, o, a, l] = e.hcl, [u, c, f, p] = t.hcl;
+        let d, h;
         if (!isNaN(s) && !isNaN(u)) {
           let g = u - s;
-          u > s && g > 180 ? g -= 360 : u < s && s - u > 180 && (g += 360), p = s + r * g;
-        } else isNaN(s) ? isNaN(u) ? p = NaN : (p = u, (a === 1 || a === 0) && (h = c)) : (p = s, (f === 1 || f === 0) && (h = o));
+          u > s && g > 180 ? g -= 360 : u < s && s - u > 180 && (g += 360), d = s + r * g;
+        } else isNaN(s) ? isNaN(u) ? d = NaN : (d = u, (a === 1 || a === 0) && (h = c)) : (d = s, (f === 1 || f === 0) && (h = o));
         const [y, m, v, w] = gu([
-          p,
-          h ?? Ce(o, c, r),
-          Ce(a, f, r),
-          Ce(l, d, r)
+          d,
+          h ?? Te(o, c, r),
+          Te(a, f, r),
+          Te(l, p, r)
         ]);
-        return new k(y, m, v, w, !1);
+        return new F(y, m, v, w, !1);
       }
       case "lab": {
         const [s, o, a, l] = ps(je(e.lab, t.lab, r));
-        return new k(s, o, a, l, !1);
+        return new F(s, o, a, l, !1);
       }
     }
   }
 }
-k.black = new k(0, 0, 0, 1);
-k.white = new k(1, 1, 1, 1);
-k.transparent = new k(0, 0, 0, 0);
-k.red = new k(1, 0, 0, 1);
+F.black = new F(0, 0, 0, 1);
+F.white = new F(1, 1, 1, 1);
+F.transparent = new F(0, 0, 0, 0);
+F.red = new F(1, 0, 0, 1);
 class hr {
   constructor(e, t, r) {
     e ? this.sensitivity = t ? "variant" : "case" : this.sensitivity = t ? "accent" : "base", this.locale = r, this.collator = new Intl.Collator(this.locale ? this.locale : [], {
@@ -7360,7 +7360,7 @@ class hr {
     return new Intl.Collator(this.locale ? this.locale : []).resolvedOptions().locale;
   }
 }
-const Cu = ["bottom", "center", "top"];
+const Tu = ["bottom", "center", "top"];
 class Un {
   constructor(e, t, r, i, s, o) {
     this.text = e, this.image = t, this.scale = r, this.fontStack = i, this.textColor = s, this.verticalAlign = o;
@@ -7463,7 +7463,7 @@ class $ {
     if (e instanceof $)
       return e;
     if (typeof e == "string") {
-      const r = k.parse(e);
+      const r = F.parse(e);
       return r ? new $([r]) : void 0;
     }
     if (!Array.isArray(e))
@@ -7472,7 +7472,7 @@ class $ {
     for (const r of e) {
       if (typeof r != "string")
         return;
-      const i = k.parse(r);
+      const i = F.parse(r);
       if (!i)
         return;
       t.push(i);
@@ -7487,7 +7487,7 @@ class $ {
     if (e.values.length != t.values.length)
       throw new Error(`colorArray: Arrays have mismatched length (${e.values.length} vs. ${t.values.length}), cannot interpolate.`);
     for (let o = 0; o < e.values.length; o++)
-      s.push(k.interpolate(e.values[o], t.values[o], r, i));
+      s.push(F.interpolate(e.values[o], t.values[o], r, i));
     return new $(s);
   }
 }
@@ -7539,7 +7539,7 @@ class ie {
         throw new V(`Cannot interpolate values containing mismatched anchors. from[${a}]: ${i[a]}, to[${a}]: ${s[a]}`);
       o.push(i[a]);
       const [l, u] = i[a + 1], [c, f] = s[a + 1];
-      o.push([Ce(l, c, r), Ce(u, f, r)]);
+      o.push([Te(l, c, r), Te(u, f, r)]);
     }
     return new ie(o);
   }
@@ -7577,7 +7577,7 @@ function ys(n, e, t, r) {
   return typeof n == "number" && n >= 0 && n <= 255 && typeof e == "number" && e >= 0 && e <= 255 && typeof t == "number" && t >= 0 && t <= 255 ? typeof r > "u" || typeof r == "number" && r >= 0 && r <= 1 ? null : `Invalid rgba value [${[n, e, t, r].join(", ")}]: 'a' must be between 0 and 1.` : `Invalid rgba value [${(typeof r == "number" ? [n, e, t, r] : [n, e, t]).join(", ")}]: 'r', 'g', and 'b' must be between 0 and 255.`;
 }
 function lt(n) {
-  if (n === null || typeof n == "string" || typeof n == "boolean" || typeof n == "number" || n instanceof ne || n instanceof k || n instanceof hr || n instanceof he || n instanceof W || n instanceof H || n instanceof $ || n instanceof ie || n instanceof de)
+  if (n === null || typeof n == "string" || typeof n == "boolean" || typeof n == "number" || n instanceof ne || n instanceof F || n instanceof hr || n instanceof he || n instanceof W || n instanceof H || n instanceof $ || n instanceof ie || n instanceof de)
     return !0;
   if (Array.isArray(n)) {
     for (const e of n)
@@ -7596,12 +7596,12 @@ function R(n) {
   if (n === null)
     return Qt;
   if (typeof n == "string")
-    return z;
+    return A;
   if (typeof n == "boolean")
     return S;
   if (typeof n == "number")
-    return T;
-  if (n instanceof k)
+    return C;
+  if (n instanceof F)
     return fe;
   if (n instanceof ne)
     return en;
@@ -7635,11 +7635,11 @@ function R(n) {
     }
     return ee(t || L, e);
   } else
-    return ze;
+    return Ae;
 }
 function it(n) {
   const e = typeof n;
-  return n === null ? "" : e === "string" || e === "number" || e === "boolean" ? String(n) : n instanceof k || n instanceof ne || n instanceof he || n instanceof W || n instanceof H || n instanceof $ || n instanceof ie || n instanceof de ? n.toString() : JSON.stringify(n);
+  return n === null ? "" : e === "string" || e === "number" || e === "boolean" ? String(n) : n instanceof F || n instanceof ne || n instanceof he || n instanceof W || n instanceof H || n instanceof $ || n instanceof ie || n instanceof de ? n.toString() : JSON.stringify(n);
 }
 class Ze {
   constructor(e, t) {
@@ -7665,10 +7665,10 @@ class Ze {
   }
 }
 const Et = {
-  string: z,
-  number: T,
+  string: A,
+  number: C,
   boolean: S,
-  object: ze
+  object: Ae
 };
 class ae {
   constructor(e, t) {
@@ -7729,10 +7729,10 @@ class ae {
 const ni = {
   "to-boolean": S,
   "to-color": fe,
-  "to-number": T,
-  "to-string": z
+  "to-number": C,
+  "to-string": A
 };
-class Te {
+class Ce {
   constructor(e, t) {
     this.type = e, this.args = t;
   }
@@ -7751,7 +7751,7 @@ class Te {
         return null;
       s.push(a);
     }
-    return new Te(i, s);
+    return new Ce(i, s);
   }
   evaluate(e) {
     switch (this.type.kind) {
@@ -7760,14 +7760,14 @@ class Te {
       case "color": {
         let t, r;
         for (const i of this.args) {
-          if (t = i.evaluate(e), r = null, t instanceof k)
+          if (t = i.evaluate(e), r = null, t instanceof F)
             return t;
           if (typeof t == "string") {
             const s = e.parseColor(t);
             if (s)
               return s;
           } else if (Array.isArray(t) && (t.length < 3 || t.length > 4 ? r = `Invalid rgba value ${JSON.stringify(t)}: expected an array containing either three or four numeric values.` : r = ys(t[0], t[1], t[2], t[3]), !r))
-            return new k(t[0] / 255, t[1] / 255, t[2] / 255, t[3]);
+            return new F(t[0] / 255, t[1] / 255, t[2] / 255, t[3]);
         }
         throw new V(r || `Could not parse color from value '${typeof t == "string" ? t : JSON.stringify(t)}'`);
       }
@@ -7861,7 +7861,7 @@ class ms {
   }
   parseColor(e) {
     let t = this._parseColorCache.get(e);
-    return t || (t = k.parse(e), this._parseColorCache.set(e, t)), t;
+    return t || (t = F.parse(e), this._parseColorCache.set(e, t)), t;
   }
 }
 class an {
@@ -7881,7 +7881,7 @@ class an {
   _parse(e, t) {
     (e === null || typeof e == "string" || typeof e == "boolean" || typeof e == "number") && (e = ["literal", e]);
     function r(i, s, o) {
-      return o === "assert" ? new ae(s, [i]) : o === "coerce" ? new Te(s, [i]) : i;
+      return o === "assert" ? new ae(s, [i]) : o === "coerce" ? new Ce(s, [i]) : i;
     }
     if (Array.isArray(e)) {
       if (e.length === 0)
@@ -8011,7 +8011,7 @@ class pr {
   static parse(e, t) {
     if (e.length !== 3)
       return t.error(`Expected 2 arguments, but found ${e.length - 1} instead.`);
-    const r = t.parse(e[1], 1, T), i = t.parse(e[2], 2, ee(t.expectedType || L));
+    const r = t.parse(e[1], 1, C), i = t.parse(e[2], 2, ee(t.expectedType || L));
     if (!r || !i)
       return null;
     const s = i.type;
@@ -8042,15 +8042,15 @@ class dr {
     if (e.length !== 3)
       return t.error(`Expected 2 arguments, but found ${e.length - 1} instead.`);
     const r = t.parse(e[1], 1, L), i = t.parse(e[2], 2, L);
-    return !r || !i ? null : fr(r.type, [S, z, T, Qt, L]) ? new dr(r, i) : t.error(`Expected first argument to be of type boolean, string, number or null, but found ${O(r.type)} instead`);
+    return !r || !i ? null : fr(r.type, [S, A, C, Qt, L]) ? new dr(r, i) : t.error(`Expected first argument to be of type boolean, string, number or null, but found ${O(r.type)} instead`);
   }
   evaluate(e) {
     const t = this.needle.evaluate(e), r = this.haystack.evaluate(e);
     if (!r)
       return !1;
-    if (!Ae(t, ["boolean", "string", "number", "null"]))
+    if (!ze(t, ["boolean", "string", "number", "null"]))
       throw new V(`Expected first argument to be of type boolean, string, number or null, but found ${O(R(t))} instead.`);
-    if (!Ae(r, ["string", "array"]))
+    if (!ze(r, ["string", "array"]))
       throw new V(`Expected second argument to be of type array or string, but found ${O(R(r))} instead.`);
     return r.indexOf(t) >= 0;
   }
@@ -8063,7 +8063,7 @@ class dr {
 }
 class Nt {
   constructor(e, t, r) {
-    this.type = T, this.needle = e, this.haystack = t, this.fromIndex = r;
+    this.type = C, this.needle = e, this.haystack = t, this.fromIndex = r;
   }
   static parse(e, t) {
     if (e.length <= 2 || e.length >= 5)
@@ -8071,24 +8071,24 @@ class Nt {
     const r = t.parse(e[1], 1, L), i = t.parse(e[2], 2, L);
     if (!r || !i)
       return null;
-    if (!fr(r.type, [S, z, T, Qt, L]))
+    if (!fr(r.type, [S, A, C, Qt, L]))
       return t.error(`Expected first argument to be of type boolean, string, number or null, but found ${O(r.type)} instead`);
     if (e.length === 4) {
-      const s = t.parse(e[3], 3, T);
+      const s = t.parse(e[3], 3, C);
       return s ? new Nt(r, i, s) : null;
     } else
       return new Nt(r, i);
   }
   evaluate(e) {
     const t = this.needle.evaluate(e), r = this.haystack.evaluate(e);
-    if (!Ae(t, ["boolean", "string", "number", "null"]))
+    if (!ze(t, ["boolean", "string", "number", "null"]))
       throw new V(`Expected first argument to be of type boolean, string, number or null, but found ${O(R(t))} instead.`);
     let i;
-    if (this.fromIndex && (i = this.fromIndex.evaluate(e)), Ae(r, ["string"])) {
+    if (this.fromIndex && (i = this.fromIndex.evaluate(e)), ze(r, ["string"])) {
       const s = r.indexOf(t, i);
       return s === -1 ? -1 : [...r.slice(0, s)].length;
     } else {
-      if (Ae(r, ["array"]))
+      if (ze(r, ["array"]))
         return r.indexOf(t, i);
       throw new V(`Expected second argument to be of type array or string, but found ${O(R(r))} instead.`);
     }
@@ -8116,28 +8116,28 @@ class yr {
       let c = e[u];
       const f = e[u + 1];
       Array.isArray(c) || (c = [c]);
-      const d = t.concat(u);
+      const p = t.concat(u);
       if (c.length === 0)
-        return d.error("Expected at least one branch label.");
+        return p.error("Expected at least one branch label.");
       for (const h of c) {
         if (typeof h != "number" && typeof h != "string")
-          return d.error("Branch labels must be numbers or strings.");
+          return p.error("Branch labels must be numbers or strings.");
         if (typeof h == "number" && Math.abs(h) > Number.MAX_SAFE_INTEGER)
-          return d.error(`Branch labels must be integers no larger than ${Number.MAX_SAFE_INTEGER}.`);
+          return p.error(`Branch labels must be integers no larger than ${Number.MAX_SAFE_INTEGER}.`);
         if (typeof h == "number" && Math.floor(h) !== h)
-          return d.error("Numeric branch labels must be integer values.");
+          return p.error("Numeric branch labels must be integer values.");
         if (!r)
           r = R(h);
-        else if (d.checkSubtype(r, R(h)))
+        else if (p.checkSubtype(r, R(h)))
           return null;
         if (typeof s[String(h)] < "u")
-          return d.error("Branch labels must be unique.");
+          return p.error("Branch labels must be unique.");
         s[String(h)] = o.length;
       }
-      const p = t.parse(f, u, i);
-      if (!p)
+      const d = t.parse(f, u, i);
+      if (!d)
         return null;
-      i = i || p.type, o.push(p);
+      i = i || d.type, o.push(d);
     }
     const a = t.parse(e[1], 1, L);
     if (!a)
@@ -8206,13 +8206,13 @@ class Bt {
   static parse(e, t) {
     if (e.length <= 2 || e.length >= 5)
       return t.error(`Expected 2 or 3 arguments, but found ${e.length - 1} instead.`);
-    const r = t.parse(e[1], 1, L), i = t.parse(e[2], 2, T);
+    const r = t.parse(e[1], 1, L), i = t.parse(e[2], 2, C);
     if (!r || !i)
       return null;
-    if (!fr(r.type, [ee(L), z, L]))
+    if (!fr(r.type, [ee(L), A, L]))
       return t.error(`Expected first argument to be of type array or string, but found ${O(r.type)} instead`);
     if (e.length === 4) {
-      const s = t.parse(e[3], 3, T);
+      const s = t.parse(e[3], 3, C);
       return s ? new Bt(r.type, r, i, s) : null;
     } else
       return new Bt(r.type, r, i);
@@ -8220,9 +8220,9 @@ class Bt {
   evaluate(e) {
     const t = this.input.evaluate(e), r = this.beginIndex.evaluate(e);
     let i;
-    if (this.endIndex && (i = this.endIndex.evaluate(e)), Ae(t, ["string"]))
+    if (this.endIndex && (i = this.endIndex.evaluate(e)), ze(t, ["string"]))
       return [...t].slice(r, i).join("");
-    if (Ae(t, ["array"]))
+    if (ze(t, ["array"]))
       return t.slice(r, i);
     throw new V(`Expected first argument to be of type array or string, but found ${O(R(t))} instead.`);
   }
@@ -8258,7 +8258,7 @@ class fn {
       return t.error(`Expected at least 4 arguments, but found only ${e.length - 1}.`);
     if ((e.length - 1) % 2 !== 0)
       return t.error("Expected an even number of arguments.");
-    const r = t.parse(e[1], 1, T);
+    const r = t.parse(e[1], 1, C);
     if (!r)
       return null;
     const i = [];
@@ -8302,10 +8302,10 @@ class fn {
 function Lu(n) {
   return n && n.__esModule && Object.prototype.hasOwnProperty.call(n, "default") ? n.default : n;
 }
-var zn, ri;
+var An, ri;
 function Su() {
-  if (ri) return zn;
-  ri = 1, zn = n;
+  if (ri) return An;
+  ri = 1, An = n;
   function n(e, t, r, i) {
     this.cx = 3 * e, this.bx = 3 * (r - e) - this.cx, this.ax = 1 - this.cx - this.bx, this.cy = 3 * t, this.by = 3 * (i - t) - this.cy, this.ay = 1 - this.cy - this.by, this.p1x = e, this.p1y = t, this.p2x = r, this.p2y = i;
   }
@@ -8337,9 +8337,9 @@ function Su() {
     solve: function(e, t) {
       return this.sampleCurveY(this.solveCurveX(e, t));
     }
-  }, zn;
+  }, An;
 }
-var Eu = Su(), zu = /* @__PURE__ */ Lu(Eu);
+var Eu = Su(), Au = /* @__PURE__ */ Lu(Eu);
 class se {
   constructor(e, t, r, i, s) {
     this.type = e, this.operator = t, this.interpolation = r, this.input = i, this.labels = [], this.outputs = [];
@@ -8349,12 +8349,12 @@ class se {
   static interpolationFactor(e, t, r, i) {
     let s = 0;
     if (e.name === "exponential")
-      s = An(t, e.base, r, i);
+      s = zn(t, e.base, r, i);
     else if (e.name === "linear")
-      s = An(t, 1, r, i);
+      s = zn(t, 1, r, i);
     else if (e.name === "cubic-bezier") {
       const o = e.controlPoints;
-      s = new zu(o[0], o[1], o[2], o[3]).solve(An(t, 1, r, i));
+      s = new Au(o[0], o[1], o[2], o[3]).solve(zn(t, 1, r, i));
     }
     return s;
   }
@@ -8386,23 +8386,23 @@ class se {
       return t.error(`Expected at least 4 arguments, but found only ${e.length - 1}.`);
     if ((e.length - 1) % 2 !== 0)
       return t.error("Expected an even number of arguments.");
-    if (s = t.parse(s, 2, T), !s)
+    if (s = t.parse(s, 2, C), !s)
       return null;
     const a = [];
     let l = null;
     (r === "interpolate-hcl" || r === "interpolate-lab") && t.expectedType != ot ? l = fe : t.expectedType && t.expectedType.kind !== "value" && (l = t.expectedType);
     for (let u = 0; u < o.length; u += 2) {
-      const c = o[u], f = o[u + 1], d = u + 3, p = u + 4;
+      const c = o[u], f = o[u + 1], p = u + 3, d = u + 4;
       if (typeof c != "number")
-        return t.error('Input/output pairs for "interpolate" expressions must be defined using literal numeric values (not computed expressions) for the input values.', d);
+        return t.error('Input/output pairs for "interpolate" expressions must be defined using literal numeric values (not computed expressions) for the input values.', p);
       if (a.length && a[a.length - 1][0] >= c)
-        return t.error('Input/output pairs for "interpolate" expressions must be arranged with input values in strictly ascending order.', d);
-      const h = t.parse(f, p, l);
+        return t.error('Input/output pairs for "interpolate" expressions must be arranged with input values in strictly ascending order.', p);
+      const h = t.parse(f, d, l);
       if (!h)
         return null;
       l = l || h.type, a.push([c, h]);
     }
-    return !ve(l, T) && !ve(l, en) && !ve(l, fe) && !ve(l, rn) && !ve(l, sn) && !ve(l, ot) && !ve(l, on) && !ve(l, ee(T)) ? t.error(`Type ${O(l)} is not interpolatable.`) : new se(l, r, i, s, a);
+    return !ve(l, C) && !ve(l, en) && !ve(l, fe) && !ve(l, rn) && !ve(l, sn) && !ve(l, ot) && !ve(l, on) && !ve(l, ee(C)) ? t.error(`Type ${O(l)} is not interpolatable.`) : new se(l, r, i, s, a);
   }
   evaluate(e) {
     const t = this.labels, r = this.outputs;
@@ -8419,9 +8419,9 @@ class se {
       case "interpolate":
         switch (this.type.kind) {
           case "number":
-            return Ce(c, f, u);
+            return Te(c, f, u);
           case "color":
-            return k.interpolate(c, f, u);
+            return F.interpolate(c, f, u);
           case "padding":
             return W.interpolate(c, f, u);
           case "colorArray":
@@ -8438,14 +8438,14 @@ class se {
       case "interpolate-hcl":
         switch (this.type.kind) {
           case "color":
-            return k.interpolate(c, f, u, "hcl");
+            return F.interpolate(c, f, u, "hcl");
           case "colorArray":
             return $.interpolate(c, f, u, "hcl");
         }
       case "interpolate-lab":
         switch (this.type.kind) {
           case "color":
-            return k.interpolate(c, f, u, "lab");
+            return F.interpolate(c, f, u, "lab");
           case "colorArray":
             return $.interpolate(c, f, u, "lab");
         }
@@ -8460,13 +8460,13 @@ class se {
     return this.outputs.every((e) => e.outputDefined());
   }
 }
-function An(n, e, t, r) {
+function zn(n, e, t, r) {
   const i = r - t, s = n - t;
   return i === 0 ? 0 : e === 1 ? s / i : (Math.pow(e, s) - 1) / (Math.pow(e, i) - 1);
 }
-const Au = {
-  color: k.interpolate,
-  number: Ce,
+const zu = {
+  color: F.interpolate,
+  number: Te,
   padding: W.interpolate,
   numberArray: H.interpolate,
   colorArray: $.interpolate,
@@ -8513,10 +8513,10 @@ class ut {
 function ii(n, e) {
   return n === "==" || n === "!=" ? e.kind === "boolean" || e.kind === "string" || e.kind === "number" || e.kind === "null" || e.kind === "value" : e.kind === "string" || e.kind === "number" || e.kind === "value";
 }
-function ku(n, e, t) {
+function Fu(n, e, t) {
   return e === t;
 }
-function Fu(n, e, t) {
+function ku(n, e, t) {
   return e !== t;
 }
 function Pu(n, e, t) {
@@ -8603,7 +8603,7 @@ function Je(n, e, t) {
     }
   };
 }
-const Gu = Je("==", ku, gs), Uu = Je("!=", Fu, Du), $u = Je("<", Pu, Nu), ju = Je(">", Mu, Bu), Zu = Je("<=", Ou, Ru), Xu = Je(">=", Vu, qu);
+const Gu = Je("==", Fu, gs), Uu = Je("!=", ku, Du), $u = Je("<", Pu, Nu), ju = Je(">", Mu, Bu), Zu = Je("<=", Ou, Ru), Xu = Je(">=", Vu, qu);
 class hn {
   constructor(e, t, r) {
     this.type = tn, this.locale = r, this.caseSensitive = e, this.diacriticSensitive = t;
@@ -8621,7 +8621,7 @@ class hn {
     if (!s)
       return null;
     let o = null;
-    return r.locale && (o = t.parse(r.locale, 1, z), !o) ? null : new hn(i, s, o);
+    return r.locale && (o = t.parse(r.locale, 1, A), !o) ? null : new hn(i, s, o);
   }
   evaluate(e) {
     return new hr(this.caseSensitive.evaluate(e), this.diacriticSensitive.evaluate(e), this.locale ? this.locale.evaluate(e) : null);
@@ -8635,28 +8635,28 @@ class hn {
 }
 class gr {
   constructor(e, t, r, i, s) {
-    this.type = z, this.number = e, this.locale = t, this.currency = r, this.minFractionDigits = i, this.maxFractionDigits = s;
+    this.type = A, this.number = e, this.locale = t, this.currency = r, this.minFractionDigits = i, this.maxFractionDigits = s;
   }
   static parse(e, t) {
     if (e.length !== 3)
       return t.error("Expected two arguments.");
-    const r = t.parse(e[1], 1, T);
+    const r = t.parse(e[1], 1, C);
     if (!r)
       return null;
     const i = e[2];
     if (typeof i != "object" || Array.isArray(i))
       return t.error("NumberFormat options argument must be an object.");
     let s = null;
-    if (i.locale && (s = t.parse(i.locale, 1, z), !s))
+    if (i.locale && (s = t.parse(i.locale, 1, A), !s))
       return null;
     let o = null;
-    if (i.currency && (o = t.parse(i.currency, 1, z), !o))
+    if (i.currency && (o = t.parse(i.currency, 1, A), !o))
       return null;
     let a = null;
-    if (i["min-fraction-digits"] && (a = t.parse(i["min-fraction-digits"], 1, T), !a))
+    if (i["min-fraction-digits"] && (a = t.parse(i["min-fraction-digits"], 1, C), !a))
       return null;
     let l = null;
-    return i["max-fraction-digits"] && (l = t.parse(i["max-fraction-digits"], 1, T), !l) ? null : new gr(r, s, o, a, l);
+    return i["max-fraction-digits"] && (l = t.parse(i["max-fraction-digits"], 1, C), !l) ? null : new gr(r, s, o, a, l);
   }
   evaluate(e) {
     return new Intl.NumberFormat(this.locale ? this.locale.evaluate(e) : [], {
@@ -8690,23 +8690,23 @@ class xr {
       if (s && typeof a == "object" && !Array.isArray(a)) {
         s = !1;
         let l = null;
-        if (a["font-scale"] && (l = t.parse(a["font-scale"], 1, T), !l))
+        if (a["font-scale"] && (l = t.parse(a["font-scale"], 1, C), !l))
           return null;
         let u = null;
-        if (a["text-font"] && (u = t.parse(a["text-font"], 1, ee(z)), !u))
+        if (a["text-font"] && (u = t.parse(a["text-font"], 1, ee(A)), !u))
           return null;
         let c = null;
         if (a["text-color"] && (c = t.parse(a["text-color"], 1, fe), !c))
           return null;
         let f = null;
         if (a["vertical-align"]) {
-          if (typeof a["vertical-align"] == "string" && !Cu.includes(a["vertical-align"]))
+          if (typeof a["vertical-align"] == "string" && !Tu.includes(a["vertical-align"]))
             return t.error(`'vertical-align' must be one of: 'bottom', 'center', 'top' but found '${a["vertical-align"]}' instead.`);
-          if (f = t.parse(a["vertical-align"], 1, z), !f)
+          if (f = t.parse(a["vertical-align"], 1, A), !f)
             return null;
         }
-        const d = i[i.length - 1];
-        d.scale = l, d.font = u, d.textColor = c, d.verticalAlign = f;
+        const p = i[i.length - 1];
+        p.scale = l, p.font = u, p.textColor = c, p.verticalAlign = f;
       } else {
         const l = t.parse(e[o], 1, L);
         if (!l)
@@ -8747,7 +8747,7 @@ class vr {
   static parse(e, t) {
     if (e.length !== 2)
       return t.error("Expected two arguments.");
-    const r = t.parse(e[1], 1, z);
+    const r = t.parse(e[1], 1, A);
     return r ? new vr(r) : t.error("No image name provided.");
   }
   evaluate(e) {
@@ -8763,7 +8763,7 @@ class vr {
 }
 class br {
   constructor(e) {
-    this.type = T, this.input = e;
+    this.type = C, this.input = e;
   }
   static parse(e, t) {
     if (e.length !== 2)
@@ -8869,7 +8869,7 @@ function si(n, e, t, r) {
   const i = n[0] - t[0], s = n[1] - t[1], o = e[0] - t[0], a = e[1] - t[1], l = r[0] - t[0], u = r[1] - t[1], c = i * u - l * s, f = o * u - l * a;
   return c > 0 && f < 0 || c < 0 && f > 0;
 }
-function Tr(n, e, t) {
+function Cr(n, e, t) {
   const r = [];
   for (let i = 0; i < n.length; i++) {
     const s = [];
@@ -8884,7 +8884,7 @@ function Tr(n, e, t) {
 function bs(n, e, t) {
   const r = [];
   for (let i = 0; i < n.length; i++) {
-    const s = Tr(n[i], e, t);
+    const s = Cr(n[i], e, t);
     r.push(s);
   }
   return r;
@@ -8930,7 +8930,7 @@ function ai(n, e, t, r) {
 function oc(n, e) {
   const t = [1 / 0, 1 / 0, -1 / 0, -1 / 0], r = [1 / 0, 1 / 0, -1 / 0, -1 / 0], i = n.canonicalID();
   if (e.type === "Polygon") {
-    const s = Tr(e.coordinates, r, i), o = oi(n.geometry(), t, r, i);
+    const s = Cr(e.coordinates, r, i), o = oi(n.geometry(), t, r, i);
     if (!ct(t, r))
       return !1;
     for (const a of o)
@@ -8950,7 +8950,7 @@ function oc(n, e) {
 function ac(n, e) {
   const t = [1 / 0, 1 / 0, -1 / 0, -1 / 0], r = [1 / 0, 1 / 0, -1 / 0, -1 / 0], i = n.canonicalID();
   if (e.type === "Polygon") {
-    const s = Tr(e.coordinates, r, i), o = ai(n.geometry(), t, r, i);
+    const s = Cr(e.coordinates, r, i), o = ai(n.geometry(), t, r, i);
     if (!ct(t, r))
       return !1;
     for (const a of o)
@@ -8967,7 +8967,7 @@ function ac(n, e) {
   }
   return !0;
 }
-class ke {
+class Fe {
   constructor(e, t) {
     this.type = S, this.geojson = e, this.geometries = t;
   }
@@ -8987,14 +8987,14 @@ class ke {
             type: "MultiPolygon",
             coordinates: i
           };
-          return new ke(r, s);
+          return new Fe(r, s);
         }
       } else if (r.type === "Feature") {
         const i = r.geometry.type;
         if (i === "Polygon" || i === "MultiPolygon")
-          return new ke(r, r.geometry);
+          return new Fe(r, r.geometry);
       } else if (r.type === "Polygon" || r.type === "MultiPolygon")
-        return new ke(r, r);
+        return new Fe(r, r);
     }
     return t.error("'within' expression requires valid geojson object that contains polygon geometry type.");
   }
@@ -9013,7 +9013,7 @@ class ke {
     return !0;
   }
 }
-class Ts {
+class Cs {
   constructor(e = [], t = (r, i) => r < i ? -1 : r > i ? 1 : 0) {
     if (this.data = e, this.length = this.data.length, this.compare = t, this.length > 0)
       for (let r = (this.length >> 1) - 1; r >= 0; r--) this._down(r);
@@ -9067,7 +9067,7 @@ function uc(n) {
   return e;
 }
 const cc = 6378.137, li = 1 / 298.257223563, ui = li * (2 - li), ci = Math.PI / 180;
-class Cr {
+class Tr {
   constructor(e) {
     const t = ci * cc * 1e3, r = Math.cos(e * ci), i = 1 / (1 - ui * (1 - r * r)), s = Math.sqrt(i);
     this.kx = t * s * r, this.ky = t * s * i * (1 - ui);
@@ -9101,10 +9101,10 @@ class Cr {
   pointOnLine(e, t) {
     let r = 1 / 0, i, s, o, a;
     for (let l = 0; l < e.length - 1; l++) {
-      let u = e[l][0], c = e[l][1], f = this.wrap(e[l + 1][0] - u) * this.kx, d = (e[l + 1][1] - c) * this.ky, p = 0;
-      (f !== 0 || d !== 0) && (p = (this.wrap(t[0] - u) * this.kx * f + (t[1] - c) * this.ky * d) / (f * f + d * d), p > 1 ? (u = e[l + 1][0], c = e[l + 1][1]) : p > 0 && (u += f / this.kx * p, c += d / this.ky * p)), f = this.wrap(t[0] - u) * this.kx, d = (t[1] - c) * this.ky;
-      const h = f * f + d * d;
-      h < r && (r = h, i = u, s = c, o = l, a = p);
+      let u = e[l][0], c = e[l][1], f = this.wrap(e[l + 1][0] - u) * this.kx, p = (e[l + 1][1] - c) * this.ky, d = 0;
+      (f !== 0 || p !== 0) && (d = (this.wrap(t[0] - u) * this.kx * f + (t[1] - c) * this.ky * p) / (f * f + p * p), d > 1 ? (u = e[l + 1][0], c = e[l + 1][1]) : d > 0 && (u += f / this.kx * d, c += p / this.ky * d)), f = this.wrap(t[0] - u) * this.kx, p = (t[1] - c) * this.ky;
+      const h = f * f + p * p;
+      h < r && (r = h, i = u, s = c, o = l, a = d);
     }
     return {
       point: [i, s],
@@ -9121,7 +9121,7 @@ class Cr {
   }
 }
 const $n = 100, jn = 50;
-function Cs(n, e) {
+function Ts(n, e) {
   return e[0] - n[0];
 }
 function Rt(n) {
@@ -9190,10 +9190,10 @@ function fc(n, e, t, r, i) {
   for (let a = e[0]; a < e[1]; ++a) {
     const l = n[a], u = n[a + 1];
     for (let c = r[0]; c < r[1]; ++c) {
-      const f = t[c], d = t[c + 1];
-      if (pn(l, u, f, d))
+      const f = t[c], p = t[c + 1];
+      if (pn(l, u, f, p))
         return 0;
-      o = Math.min(o, Ir(l, u, f, d, i));
+      o = Math.min(o, Ir(l, u, f, p, i));
     }
   }
   return o;
@@ -9233,10 +9233,10 @@ function dc(n, e, t, r) {
     const o = n[s], a = n[s + 1];
     for (const l of t)
       for (let u = 0, c = l.length, f = c - 1; u < c; f = u++) {
-        const d = l[f], p = l[u];
-        if (pn(o, a, d, p))
+        const p = l[f], d = l[u];
+        if (pn(o, a, p, d))
           return 0;
-        i = Math.min(i, Ir(o, a, d, p, r));
+        i = Math.min(i, Ir(o, a, p, d, r));
       }
   }
   return i;
@@ -9260,13 +9260,13 @@ function yc(n, e, t, r = 1 / 0) {
   let o = 1 / 0;
   for (const a of n)
     for (let l = 0, u = a.length, c = u - 1; l < u; c = l++) {
-      const f = a[c], d = a[l];
-      for (const p of e)
-        for (let h = 0, y = p.length, m = y - 1; h < y; m = h++) {
-          const v = p[m], w = p[h];
-          if (pn(f, d, v, w))
+      const f = a[c], p = a[l];
+      for (const d of e)
+        for (let h = 0, y = d.length, m = y - 1; h < y; m = h++) {
+          const v = d[m], w = d[h];
+          if (pn(f, p, v, w))
             return 0;
-          o = Math.min(o, Ir(f, d, v, w, t));
+          o = Math.min(o, Ir(f, p, v, w, t));
         }
     }
   return o;
@@ -9277,7 +9277,7 @@ function pi(n, e, t, r, i, s) {
   const o = _r(Xn(r, s), i, t);
   o < e && n.push([o, s, [0, 0]]);
 }
-function zt(n, e, t, r, i, s, o) {
+function At(n, e, t, r, i, s, o) {
   if (!s || !o)
     return;
   const a = _r(Xn(r, s), Xn(i, o), t);
@@ -9287,7 +9287,7 @@ function qt(n, e, t, r, i = 1 / 0) {
   let s = Math.min(r.distance(n[0], t[0][0]), i);
   if (s === 0)
     return s;
-  const o = new Ts([[0, [0, n.length - 1], [0, 0]]], Cs), a = Yn(t);
+  const o = new Cs([[0, [0, n.length - 1], [0, 0]]], Ts), a = Yn(t);
   for (; o.length > 0; ) {
     const l = o.pop();
     if (l[0] >= s)
@@ -9303,8 +9303,8 @@ function qt(n, e, t, r, i = 1 / 0) {
         s = Math.min(s, f);
       } else
         for (let f = u[0]; f <= u[1]; ++f) {
-          const d = pc(n[f], t, r);
-          if (s = Math.min(s, d), s === 0)
+          const p = pc(n[f], t, r);
+          if (s = Math.min(s, p), s === 0)
             return 0;
         }
     } else {
@@ -9318,33 +9318,33 @@ function Gt(n, e, t, r, i, s = 1 / 0) {
   let o = Math.min(s, i.distance(n[0], t[0]));
   if (o === 0)
     return o;
-  const a = new Ts([[0, [0, n.length - 1], [0, t.length - 1]]], Cs);
+  const a = new Cs([[0, [0, n.length - 1], [0, t.length - 1]]], Ts);
   for (; a.length > 0; ) {
     const l = a.pop();
     if (l[0] >= o)
       continue;
-    const u = l[1], c = l[2], f = e ? jn : $n, d = r ? jn : $n;
-    if (Rt(u) <= f && Rt(c) <= d) {
+    const u = l[1], c = l[2], f = e ? jn : $n, p = r ? jn : $n;
+    if (Rt(u) <= f && Rt(c) <= p) {
       if (!xe(u, n.length) && xe(c, t.length))
         return NaN;
-      let p;
+      let d;
       if (e && r)
-        p = fc(n, u, t, c, i), o = Math.min(o, p);
+        d = fc(n, u, t, c, i), o = Math.min(o, d);
       else if (e && !r) {
         const h = n.slice(u[0], u[1] + 1);
         for (let y = c[0]; y <= c[1]; ++y)
-          if (p = Se(t[y], h, i), o = Math.min(o, p), o === 0)
+          if (d = Se(t[y], h, i), o = Math.min(o, d), o === 0)
             return o;
       } else if (!e && r) {
         const h = t.slice(c[0], c[1] + 1);
         for (let y = u[0]; y <= u[1]; ++y)
-          if (p = Se(n[y], h, i), o = Math.min(o, p), o === 0)
+          if (d = Se(n[y], h, i), o = Math.min(o, d), o === 0)
             return o;
       } else
-        p = hc(n, u, t, c, i), o = Math.min(o, p);
+        d = hc(n, u, t, c, i), o = Math.min(o, d);
     } else {
-      const p = Zn(u, e), h = Zn(c, r);
-      zt(a, o, i, n, t, p[0], h[0]), zt(a, o, i, n, t, p[0], h[1]), zt(a, o, i, n, t, p[1], h[0]), zt(a, o, i, n, t, p[1], h[1]);
+      const d = Zn(u, e), h = Zn(c, r);
+      At(a, o, i, n, t, d[0], h[0]), At(a, o, i, n, t, d[0], h[1]), At(a, o, i, n, t, d[1], h[0]), At(a, o, i, n, t, d[1], h[1]);
     }
   }
   return o;
@@ -9353,7 +9353,7 @@ function mc(n, e) {
   const t = n.geometry(), r = t.flat().map((o) => wr([o.x, o.y], n.canonical));
   if (t.length === 0)
     return NaN;
-  const i = new Cr(r[0][1]);
+  const i = new Tr(r[0][1]);
   let s = 1 / 0;
   for (const o of e) {
     switch (o.type) {
@@ -9376,7 +9376,7 @@ function gc(n, e) {
   const t = n.geometry(), r = t.flat().map((o) => wr([o.x, o.y], n.canonical));
   if (t.length === 0)
     return NaN;
-  const i = new Cr(r[0][1]);
+  const i = new Tr(r[0][1]);
   let s = 1 / 0;
   for (const o of e) {
     switch (o.type) {
@@ -9399,7 +9399,7 @@ function xc(n, e) {
   const t = n.geometry();
   if (t.length === 0 || t[0].length === 0)
     return NaN;
-  const r = lc(t).map((o) => o.map((a) => a.map((l) => wr([l.x, l.y], n.canonical)))), i = new Cr(r[0][0][0][1]);
+  const r = lc(t).map((o) => o.map((a) => a.map((l) => wr([l.x, l.y], n.canonical)))), i = new Tr(r[0][0][0][1]);
   let s = 1 / 0;
   for (const o of e)
     for (const a of r) {
@@ -9419,7 +9419,7 @@ function xc(n, e) {
     }
   return s;
 }
-function kn(n) {
+function Fn(n) {
   return n.type === "MultiPolygon" ? n.coordinates.map((e) => ({
     type: "Polygon",
     coordinates: e
@@ -9431,9 +9431,9 @@ function kn(n) {
     coordinates: e
   })) : [n];
 }
-class Fe {
+class ke {
   constructor(e, t) {
-    this.type = T, this.geojson = e, this.geometries = t;
+    this.type = C, this.geojson = e, this.geometries = t;
   }
   static parse(e, t) {
     if (e.length !== 2)
@@ -9441,11 +9441,11 @@ class Fe {
     if (lt(e[1])) {
       const r = e[1];
       if (r.type === "FeatureCollection")
-        return new Fe(r, r.features.map((i) => kn(i.geometry)).flat());
+        return new ke(r, r.features.map((i) => Fn(i.geometry)).flat());
       if (r.type === "Feature")
-        return new Fe(r, kn(r.geometry));
+        return new ke(r, Fn(r.geometry));
       if ("type" in r && "coordinates" in r)
-        return new Fe(r, kn(r));
+        return new ke(r, Fn(r));
     }
     return t.error("'distance' expression requires valid geojson object that contains polygon geometry type.");
   }
@@ -9518,13 +9518,13 @@ const $e = {
   slice: Bt,
   step: fn,
   string: ae,
-  "to-boolean": Te,
-  "to-color": Te,
-  "to-number": Te,
-  "to-string": Te,
+  "to-boolean": Ce,
+  "to-color": Ce,
+  "to-number": Ce,
+  "to-string": Ce,
   var: un,
-  within: ke,
-  distance: Fe,
+  within: Fe,
+  distance: ke,
   "global-state": xt
 };
 class re {
@@ -9553,23 +9553,23 @@ class re {
     for (const [u, c] of a) {
       l = new an(t.registry, Ut, t.path, null, t.scope);
       const f = [];
-      let d = !1;
-      for (let p = 1; p < e.length; p++) {
-        const h = e[p], y = Array.isArray(u) ? u[p - 1] : u.type, m = l.parse(h, 1 + f.length, y);
+      let p = !1;
+      for (let d = 1; d < e.length; d++) {
+        const h = e[d], y = Array.isArray(u) ? u[d - 1] : u.type, m = l.parse(h, 1 + f.length, y);
         if (!m) {
-          d = !0;
+          p = !0;
           break;
         }
         f.push(m);
       }
-      if (!d) {
+      if (!p) {
         if (Array.isArray(u) && u.length !== f.length) {
           l.error(`Expected ${u.length} arguments, but found ${f.length} instead.`);
           continue;
         }
-        for (let p = 0; p < f.length; p++) {
-          const h = Array.isArray(u) ? u[p] : u.type, y = f[p];
-          l.concat(p + 1).checkSubtype(h, y.type);
+        for (let d = 0; d < f.length; d++) {
+          const h = Array.isArray(u) ? u[d] : u.type, y = f[d];
+          l.concat(d + 1).checkSubtype(h, y.type);
         }
         if (l.errors.length === 0)
           return new re(r, s, c, f);
@@ -9578,12 +9578,12 @@ class re {
     if (a.length === 1)
       t.errors.push(...l.errors);
     else {
-      const c = (a.length ? a : o).map(([d]) => bc(d)).join(" | "), f = [];
-      for (let d = 1; d < e.length; d++) {
-        const p = t.parse(e[d], 1 + f.length);
-        if (!p)
+      const c = (a.length ? a : o).map(([p]) => bc(p)).join(" | "), f = [];
+      for (let p = 1; p < e.length; p++) {
+        const d = t.parse(e[p], 1 + f.length);
+        if (!d)
           return null;
-        f.push(O(p.type));
+        f.push(O(d.type));
       }
       t.error(`Expected arguments of type ${c}, but found (${f.join(", ")}) instead.`);
     }
@@ -9600,12 +9600,12 @@ function di(n, [e, t, r, i]) {
   const s = i ? i.evaluate(n) : 1, o = ys(e, t, r, s);
   if (o)
     throw new V(o);
-  return new k(e / 255, t / 255, r / 255, s, !1);
+  return new F(e / 255, t / 255, r / 255, s, !1);
 }
 function yi(n, e) {
   return n in e;
 }
-function Fn(n, e) {
+function kn(n, e) {
   const t = e[n];
   return typeof t > "u" ? null : t;
 }
@@ -9624,28 +9624,28 @@ function Ie(n) {
 re.register($e, {
   error: [
     fu,
-    [z],
+    [A],
     (n, [e]) => {
       throw new V(e.evaluate(n));
     }
   ],
-  typeof: [z, [L], (n, [e]) => O(R(e.evaluate(n)))],
+  typeof: [A, [L], (n, [e]) => O(R(e.evaluate(n)))],
   "to-rgba": [
-    ee(T, 4),
+    ee(C, 4),
     [fe],
     (n, [e]) => {
       const [t, r, i, s] = e.evaluate(n).rgb;
       return [t * 255, r * 255, i * 255, s];
     }
   ],
-  rgb: [fe, [T, T, T], di],
-  rgba: [fe, [T, T, T, T], di],
+  rgb: [fe, [C, C, C], di],
+  rgba: [fe, [C, C, C, C], di],
   has: {
     type: S,
     overloads: [
-      [[z], (n, [e]) => yi(e.evaluate(n), n.properties())],
+      [[A], (n, [e]) => yi(e.evaluate(n), n.properties())],
       [
-        [z, ze],
+        [A, Ae],
         (n, [e, t]) => yi(e.evaluate(n), t.evaluate(n))
       ]
     ]
@@ -9653,33 +9653,33 @@ re.register($e, {
   get: {
     type: L,
     overloads: [
-      [[z], (n, [e]) => Fn(e.evaluate(n), n.properties())],
+      [[A], (n, [e]) => kn(e.evaluate(n), n.properties())],
       [
-        [z, ze],
-        (n, [e, t]) => Fn(e.evaluate(n), t.evaluate(n))
+        [A, Ae],
+        (n, [e, t]) => kn(e.evaluate(n), t.evaluate(n))
       ]
     ]
   },
   "feature-state": [
     L,
-    [z],
-    (n, [e]) => Fn(e.evaluate(n), n.featureState || {})
+    [A],
+    (n, [e]) => kn(e.evaluate(n), n.featureState || {})
   ],
-  properties: [ze, [], (n) => n.properties()],
-  "geometry-type": [z, [], (n) => n.geometryType()],
+  properties: [Ae, [], (n) => n.properties()],
+  "geometry-type": [A, [], (n) => n.geometryType()],
   id: [L, [], (n) => n.id()],
-  zoom: [T, [], (n) => n.globals.zoom],
-  "heatmap-density": [T, [], (n) => n.globals.heatmapDensity || 0],
-  elevation: [T, [], (n) => n.globals.elevation || 0],
-  "line-progress": [T, [], (n) => n.globals.lineProgress || 0],
+  zoom: [C, [], (n) => n.globals.zoom],
+  "heatmap-density": [C, [], (n) => n.globals.heatmapDensity || 0],
+  elevation: [C, [], (n) => n.globals.elevation || 0],
+  "line-progress": [C, [], (n) => n.globals.lineProgress || 0],
   accumulated: [
     L,
     [],
     (n) => n.globals.accumulated === void 0 ? null : n.globals.accumulated
   ],
   "+": [
-    T,
-    Ie(T),
+    C,
+    Ie(C),
     (n, e) => {
       let t = 0;
       for (const r of e)
@@ -9688,8 +9688,8 @@ re.register($e, {
     }
   ],
   "*": [
-    T,
-    Ie(T),
+    C,
+    Ie(C),
     (n, e) => {
       let t = 1;
       for (const r of e)
@@ -9698,67 +9698,67 @@ re.register($e, {
     }
   ],
   "-": {
-    type: T,
+    type: C,
     overloads: [
-      [[T, T], (n, [e, t]) => e.evaluate(n) - t.evaluate(n)],
-      [[T], (n, [e]) => -e.evaluate(n)]
+      [[C, C], (n, [e, t]) => e.evaluate(n) - t.evaluate(n)],
+      [[C], (n, [e]) => -e.evaluate(n)]
     ]
   },
-  "/": [T, [T, T], (n, [e, t]) => e.evaluate(n) / t.evaluate(n)],
-  "%": [T, [T, T], (n, [e, t]) => e.evaluate(n) % t.evaluate(n)],
-  ln2: [T, [], () => Math.LN2],
-  pi: [T, [], () => Math.PI],
-  e: [T, [], () => Math.E],
+  "/": [C, [C, C], (n, [e, t]) => e.evaluate(n) / t.evaluate(n)],
+  "%": [C, [C, C], (n, [e, t]) => e.evaluate(n) % t.evaluate(n)],
+  ln2: [C, [], () => Math.LN2],
+  pi: [C, [], () => Math.PI],
+  e: [C, [], () => Math.E],
   "^": [
-    T,
-    [T, T],
+    C,
+    [C, C],
     (n, [e, t]) => Math.pow(e.evaluate(n), t.evaluate(n))
   ],
-  sqrt: [T, [T], (n, [e]) => Math.sqrt(e.evaluate(n))],
-  log10: [T, [T], (n, [e]) => Math.log(e.evaluate(n)) / Math.LN10],
-  ln: [T, [T], (n, [e]) => Math.log(e.evaluate(n))],
-  log2: [T, [T], (n, [e]) => Math.log(e.evaluate(n)) / Math.LN2],
-  sin: [T, [T], (n, [e]) => Math.sin(e.evaluate(n))],
-  cos: [T, [T], (n, [e]) => Math.cos(e.evaluate(n))],
-  tan: [T, [T], (n, [e]) => Math.tan(e.evaluate(n))],
-  asin: [T, [T], (n, [e]) => Math.asin(e.evaluate(n))],
-  acos: [T, [T], (n, [e]) => Math.acos(e.evaluate(n))],
-  atan: [T, [T], (n, [e]) => Math.atan(e.evaluate(n))],
+  sqrt: [C, [C], (n, [e]) => Math.sqrt(e.evaluate(n))],
+  log10: [C, [C], (n, [e]) => Math.log(e.evaluate(n)) / Math.LN10],
+  ln: [C, [C], (n, [e]) => Math.log(e.evaluate(n))],
+  log2: [C, [C], (n, [e]) => Math.log(e.evaluate(n)) / Math.LN2],
+  sin: [C, [C], (n, [e]) => Math.sin(e.evaluate(n))],
+  cos: [C, [C], (n, [e]) => Math.cos(e.evaluate(n))],
+  tan: [C, [C], (n, [e]) => Math.tan(e.evaluate(n))],
+  asin: [C, [C], (n, [e]) => Math.asin(e.evaluate(n))],
+  acos: [C, [C], (n, [e]) => Math.acos(e.evaluate(n))],
+  atan: [C, [C], (n, [e]) => Math.atan(e.evaluate(n))],
   min: [
-    T,
-    Ie(T),
+    C,
+    Ie(C),
     (n, e) => Math.min(...e.map((t) => t.evaluate(n)))
   ],
   max: [
-    T,
-    Ie(T),
+    C,
+    Ie(C),
     (n, e) => Math.max(...e.map((t) => t.evaluate(n)))
   ],
-  abs: [T, [T], (n, [e]) => Math.abs(e.evaluate(n))],
+  abs: [C, [C], (n, [e]) => Math.abs(e.evaluate(n))],
   round: [
-    T,
-    [T],
+    C,
+    [C],
     (n, [e]) => {
       const t = e.evaluate(n);
       return t < 0 ? -Math.round(-t) : Math.round(t);
     }
   ],
-  floor: [T, [T], (n, [e]) => Math.floor(e.evaluate(n))],
-  ceil: [T, [T], (n, [e]) => Math.ceil(e.evaluate(n))],
+  floor: [C, [C], (n, [e]) => Math.floor(e.evaluate(n))],
+  ceil: [C, [C], (n, [e]) => Math.ceil(e.evaluate(n))],
   "filter-==": [
     S,
-    [z, L],
+    [A, L],
     (n, [e, t]) => n.properties()[e.value] === t.value
   ],
   "filter-id-==": [S, [L], (n, [e]) => n.id() === e.value],
   "filter-type-==": [
     S,
-    [z],
+    [A],
     (n, [e]) => n.geometryType() === e.value
   ],
   "filter-<": [
     S,
-    [z, L],
+    [A, L],
     (n, [e, t]) => {
       const r = n.properties()[e.value], i = t.value;
       return typeof r == typeof i && r < i;
@@ -9774,7 +9774,7 @@ re.register($e, {
   ],
   "filter->": [
     S,
-    [z, L],
+    [A, L],
     (n, [e, t]) => {
       const r = n.properties()[e.value], i = t.value;
       return typeof r == typeof i && r > i;
@@ -9790,7 +9790,7 @@ re.register($e, {
   ],
   "filter-<=": [
     S,
-    [z, L],
+    [A, L],
     (n, [e, t]) => {
       const r = n.properties()[e.value], i = t.value;
       return typeof r == typeof i && r <= i;
@@ -9806,7 +9806,7 @@ re.register($e, {
   ],
   "filter->=": [
     S,
-    [z, L],
+    [A, L],
     (n, [e, t]) => {
       const r = n.properties()[e.value], i = t.value;
       return typeof r == typeof i && r >= i;
@@ -9824,7 +9824,7 @@ re.register($e, {
   "filter-has-id": [S, [], (n) => n.id() !== null && n.id() !== void 0],
   "filter-type-in": [
     S,
-    [ee(z)],
+    [ee(A)],
     (n, [e]) => e.value.indexOf(n.geometryType()) >= 0
   ],
   "filter-id-in": [
@@ -9834,13 +9834,13 @@ re.register($e, {
   ],
   "filter-in-small": [
     S,
-    [z, ee(L)],
+    [A, ee(L)],
     // assumes v is an array literal
     (n, [e, t]) => t.value.indexOf(n.properties()[e.value]) >= 0
   ],
   "filter-in-large": [
     S,
-    [z, ee(L)],
+    [A, ee(L)],
     // assumes v is a array literal with values sorted in ascending order and of a single type
     (n, [e, t]) => vc(n.properties()[e.value], t.value, 0, t.value.length - 1)
   ],
@@ -9877,22 +9877,22 @@ re.register($e, {
   "!": [S, [S], (n, [e]) => !e.evaluate(n)],
   "is-supported-script": [
     S,
-    [z],
+    [A],
     // At parse time this will always return true, so we need to exclude this expression with isGlobalPropertyConstant
     (n, [e]) => {
       const t = n.globals && n.globals.isSupportedScript;
       return t ? t(e.evaluate(n)) : !0;
     }
   ],
-  upcase: [z, [z], (n, [e]) => e.evaluate(n).toUpperCase()],
-  downcase: [z, [z], (n, [e]) => e.evaluate(n).toLowerCase()],
+  upcase: [A, [A], (n, [e]) => e.evaluate(n).toUpperCase()],
+  downcase: [A, [A], (n, [e]) => e.evaluate(n).toLowerCase()],
   concat: [
-    z,
+    A,
     Ie(L),
     (n, e) => e.map((t) => it(t.evaluate(n))).join("")
   ],
   "resolved-locale": [
-    z,
+    A,
     [tn],
     (n, [e]) => e.evaluate(n).resolvedLocale()
   ]
@@ -9907,13 +9907,13 @@ function Ut(n) {
     return !1;
   if (n instanceof hn)
     return !1;
-  if (n instanceof ke)
-    return !1;
   if (n instanceof Fe)
     return !1;
+  if (n instanceof ke)
+    return !1;
   if (n instanceof xt)
     return !1;
-  const e = n instanceof Te || n instanceof ae;
+  const e = n instanceof Ce || n instanceof ae;
   let t = !0;
   return n.eachChild((r) => {
     e ? t = t && Ut(r) : t = t && r instanceof Ze;
@@ -9939,7 +9939,7 @@ function Lr(n) {
     if (/^filter-/.test(n.name))
       return !1;
   }
-  if (n instanceof ke || n instanceof Fe)
+  if (n instanceof Fe || n instanceof ke)
     return !1;
   let e = !0;
   return n.eachChild((t) => {
@@ -9971,25 +9971,25 @@ function Be(n) {
 function wc(n) {
   return n["property-type"] === "data-driven" || n["property-type"] === "cross-faded-data-driven";
 }
-function Tc(n) {
+function Cc(n) {
   return !!n.expression && n.expression.parameters.indexOf("zoom") > -1;
 }
 function _s(n) {
   return !!n.expression && n.expression.interpolated;
 }
-function zr(n) {
+function Ar(n) {
   return n instanceof Number ? "number" : n instanceof String ? "string" : n instanceof Boolean ? "boolean" : Array.isArray(n) ? "array" : n === null ? "null" : typeof n;
 }
 function Is(n) {
-  return typeof n == "object" && n !== null && !Array.isArray(n) && R(n) === ze;
+  return typeof n == "object" && n !== null && !Array.isArray(n) && R(n) === Ae;
 }
-function Cc(n) {
+function Tc(n) {
   return n;
 }
 function _c(n) {
   switch (n.type) {
     case "color":
-      return k.parse;
+      return F.parse;
     case "padding":
       return W.parse;
     case "numberArray":
@@ -10016,7 +10016,7 @@ function Ic(n) {
 }
 function Ls(n, e) {
   const t = n.stops && typeof n.stops[0][0] == "object", r = t || n.property !== void 0, i = t || !r, s = n.type || (_s(e) ? "exponential" : "interval"), o = _c(e);
-  if (o && (n = ss({}, n), n.stops && (n.stops = n.stops.map((c) => [c[0], o(c[1])])), n.default ? n.default = o(n.default) : n.default = o(e.default)), n.colorSpace && !Tu(n.colorSpace))
+  if (o && (n = ss({}, n), n.stops && (n.stops = n.stops.map((c) => [c[0], o(c[1])])), n.default ? n.default = o(n.default) : n.default = o(e.default)), n.colorSpace && !Cu(n.colorSpace))
     throw new Error(`Unknown color space: "${n.colorSpace}"`);
   const a = Ic(s);
   let l, u;
@@ -10038,21 +10038,21 @@ function Ls(n, e) {
         stops: []
       }, f.push(m)), c[m].stops.push([y[0].value, y[1]]);
     }
-    const d = [];
+    const p = [];
     for (const h of f)
-      d.push([
+      p.push([
         c[h].zoom,
         Ls(c[h], e)
       ]);
-    const p = { name: "linear" };
+    const d = { name: "linear" };
     return {
       kind: "composite",
-      interpolationType: p,
-      interpolationFactor: se.interpolationFactor.bind(void 0, p),
-      zoomStops: d.map((h) => h[0]),
+      interpolationType: d,
+      interpolationFactor: se.interpolationFactor.bind(void 0, d),
+      zoomStops: p.map((h) => h[0]),
       evaluate({ zoom: h }, y) {
         return Ss({
-          stops: d,
+          stops: p,
           base: n.base
         }, e, h).evaluate(h, y);
       }
@@ -10070,8 +10070,8 @@ function Ls(n, e) {
     return {
       kind: "source",
       evaluate(c, f) {
-        const d = f && f.properties ? f.properties[n.property] : void 0;
-        return d === void 0 ? vt(n.default, e.default) : a(n, e, d, l, u);
+        const p = f && f.properties ? f.properties[n.property] : void 0;
+        return p === void 0 ? vt(n.default, e.default) : a(n, e, p, l, u);
       }
     };
 }
@@ -10088,7 +10088,7 @@ function Lc(n, e, t, r, i) {
   return vt(s, n.default, e.default);
 }
 function Sc(n, e, t) {
-  if (zr(t) !== "number")
+  if (Ar(t) !== "number")
     return vt(n.default, e.default);
   const r = n.stops.length;
   if (r === 1 || t <= n.stops[0][0])
@@ -10100,26 +10100,26 @@ function Sc(n, e, t) {
 }
 function Ss(n, e, t) {
   const r = n.base !== void 0 ? n.base : 1;
-  if (zr(t) !== "number")
+  if (Ar(t) !== "number")
     return vt(n.default, e.default);
   const i = n.stops.length;
   if (i === 1 || t <= n.stops[0][0])
     return n.stops[0][1];
   if (t >= n.stops[i - 1][0])
     return n.stops[i - 1][1];
-  const s = cn(n.stops.map((c) => c[0]), t), o = zc(t, r, n.stops[s][0], n.stops[s + 1][0]), a = n.stops[s][1], l = n.stops[s + 1][1], u = Au[e.type] || Cc;
+  const s = cn(n.stops.map((c) => c[0]), t), o = Ac(t, r, n.stops[s][0], n.stops[s + 1][0]), a = n.stops[s][1], l = n.stops[s + 1][1], u = zu[e.type] || Tc;
   return typeof a.evaluate == "function" ? {
     evaluate(...c) {
-      const f = a.evaluate.apply(void 0, c), d = l.evaluate.apply(void 0, c);
-      if (!(f === void 0 || d === void 0))
-        return u(f, d, o, n.colorSpace);
+      const f = a.evaluate.apply(void 0, c), p = l.evaluate.apply(void 0, c);
+      if (!(f === void 0 || p === void 0))
+        return u(f, p, o, n.colorSpace);
     }
   } : u(a, l, o, n.colorSpace);
 }
 function Ec(n, e, t) {
   switch (e.type) {
     case "color":
-      t = k.parse(t);
+      t = F.parse(t);
       break;
     case "formatted":
       t = he.fromString(t.toString());
@@ -10137,15 +10137,15 @@ function Ec(n, e, t) {
       t = H.parse(t);
       break;
     default:
-      zr(t) !== e.type && (e.type !== "enum" || !e.values[t]) && (t = void 0);
+      Ar(t) !== e.type && (e.type !== "enum" || !e.values[t]) && (t = void 0);
   }
   return vt(t, n.default, e.default);
 }
-function zc(n, e, t, r) {
+function Ac(n, e, t, r) {
   const i = r - t, s = n - t;
   return i === 0 ? 0 : e === 1 ? s / i : (Math.pow(e, s) - 1) / (Math.pow(e, i) - 1);
 }
-class Ar {
+class zr {
   constructor(e, t, r) {
     this.expression = e, this._warningHistory = {}, this._evaluator = new ms(), this._defaultValue = t ? Pc(t) : null, this._enumValues = t && t.type === "enum" ? t.values : null, this._globalState = r;
   }
@@ -10169,9 +10169,9 @@ class Ar {
 function Es(n) {
   return Array.isArray(n) && n.length > 0 && typeof n[0] == "string" && n[0] in $e;
 }
-function kr(n, e, t) {
-  const r = new an($e, Ut, [], e ? Fc(e) : void 0), i = r.parse(n, void 0, void 0, void 0, e && e.type === "string" ? { typeAnnotation: "coerce" } : void 0);
-  return i ? Wn(new Ar(i, e, t)) : Be(r.errors);
+function Fr(n, e, t) {
+  const r = new an($e, Ut, [], e ? kc(e) : void 0), i = r.parse(n, void 0, void 0, void 0, e && e.type === "string" ? { typeAnnotation: "coerce" } : void 0);
+  return i ? Wn(new zr(i, e, t)) : Be(r.errors);
 }
 class $t {
   constructor(e, t, r) {
@@ -10198,18 +10198,18 @@ class jt {
     return this.interpolationType ? se.interpolationFactor(this.interpolationType, e, t, r) : 0;
   }
 }
-function Ac(n) {
+function zc(n) {
   return n._styleExpression !== void 0;
 }
-function zs(n, e, t) {
-  const r = kr(n, e, t);
+function As(n, e, t) {
+  const r = Fr(n, e, t);
   if (r.result === "error")
     return r;
   const i = r.value.expression, s = Lr(i);
   if (!s && !wc(e))
     return Be([new ce("", "data expressions not supported")]);
   const o = Er(i, ["zoom"]);
-  if (!o && !Tc(e))
+  if (!o && !Cc(e))
     return Be([new ce("", "zoom expressions not supported")]);
   const a = Vt(i);
   if (!a && !o)
@@ -10241,17 +10241,17 @@ class bt {
     };
   }
 }
-function kc(n, e, t) {
+function Fc(n, e, t) {
   if (Is(n))
     return new bt(n, e);
   if (Es(n)) {
-    const r = zs(n, e, t);
+    const r = As(n, e, t);
     if (r.result === "error")
       throw new Error(r.value.map((i) => `${i.key}: ${i.message}`).join(", "));
     return r.value;
   } else {
     let r = n;
-    return e.type === "color" && typeof n == "string" ? r = k.parse(n) : e.type === "padding" && (typeof n == "number" || Array.isArray(n)) ? r = W.parse(n) : e.type === "numberArray" && (typeof n == "number" || Array.isArray(n)) ? r = H.parse(n) : e.type === "colorArray" && (typeof n == "string" || Array.isArray(n)) ? r = $.parse(n) : e.type === "variableAnchorOffsetCollection" && Array.isArray(n) ? r = ie.parse(n) : e.type === "projectionDefinition" && typeof n == "string" && (r = ne.parse(n)), {
+    return e.type === "color" && typeof n == "string" ? r = F.parse(n) : e.type === "padding" && (typeof n == "number" || Array.isArray(n)) ? r = W.parse(n) : e.type === "numberArray" && (typeof n == "number" || Array.isArray(n)) ? r = H.parse(n) : e.type === "colorArray" && (typeof n == "string" || Array.isArray(n)) ? r = $.parse(n) : e.type === "variableAnchorOffsetCollection" && Array.isArray(n) ? r = ie.parse(n) : e.type === "projectionDefinition" && typeof n == "string" && (r = ne.parse(n)), {
       globalStateRefs: /* @__PURE__ */ new Set(),
       _globalState: null,
       kind: "constant",
@@ -10278,12 +10278,12 @@ function dn(n, e = /* @__PURE__ */ new Set()) {
     dn(t, e);
   }), e;
 }
-function Fc(n) {
+function kc(n) {
   const e = {
     color: fe,
-    string: z,
-    number: T,
-    enum: z,
+    string: A,
+    number: C,
+    enum: A,
     boolean: S,
     formatted: nn,
     padding: rn,
@@ -10297,10 +10297,10 @@ function Fc(n) {
 }
 function Pc(n) {
   if (n.type === "color" && Is(n.default))
-    return new k(0, 0, 0, 0);
+    return new F(0, 0, 0, 0);
   switch (n.type) {
     case "color":
-      return k.parse(n.default) || null;
+      return F.parse(n.default) || null;
     case "padding":
       return W.parse(n.default) || null;
     case "numberArray":
@@ -10327,7 +10327,7 @@ function Xe(n, e) {
     globalState: e
   };
 }
-function Fr(n) {
+function kr(n) {
   if (n === !0 || n === !1)
     return !0;
   if (!Array.isArray(n) || n.length === 0)
@@ -10351,7 +10351,7 @@ function Fr(n) {
     case "any":
     case "all":
       for (const e of n.slice(1))
-        if (!Fr(e) && typeof e != "boolean")
+        if (!kr(e) && typeof e != "boolean")
           return !1;
       return !0;
     default:
@@ -10371,12 +10371,12 @@ const Mc = {
 function Oc(n, e) {
   if (n == null)
     return { filter: () => !0, needGeometry: !1, getGlobalStateRefs: () => /* @__PURE__ */ new Set() };
-  Fr(n) || (n = Zt(n));
-  const t = kr(n, Mc, e);
+  kr(n) || (n = Zt(n));
+  const t = Fr(n, Mc, e);
   if (t.result === "error")
     throw new Error(t.value.map((r) => `${r.key}: ${r.message}`).join(", "));
   {
-    const r = As(n);
+    const r = zs(n);
     return {
       filter: (i, s, o) => t.value.evaluate(i, s, {}, o),
       needGeometry: r,
@@ -10387,13 +10387,13 @@ function Oc(n, e) {
 function Vc(n, e) {
   return n < e ? -1 : n > e ? 1 : 0;
 }
-function As(n) {
+function zs(n) {
   if (!Array.isArray(n))
     return !1;
   if (n[0] === "within" || n[0] === "distance")
     return !0;
   for (let e = 1; e < n.length; e++)
-    if (As(n[e]))
+    if (zs(n[e]))
       return !0;
   return !1;
 }
@@ -10401,7 +10401,7 @@ function Zt(n) {
   if (!n)
     return !0;
   const e = n[0];
-  return n.length <= 1 ? e !== "any" : e === "==" ? Pn(n[1], n[2], "==") : e === "!=" ? At(Pn(n[1], n[2], "==")) : e === "<" || e === ">" || e === "<=" || e === ">=" ? Pn(n[1], n[2], e) : e === "any" ? Dc(n.slice(1)) : e === "all" ? ["all"].concat(n.slice(1).map(Zt)) : e === "none" ? ["all"].concat(n.slice(1).map(Zt).map(At)) : e === "in" ? mi(n[1], n.slice(2)) : e === "!in" ? At(mi(n[1], n.slice(2))) : e === "has" ? gi(n[1]) : e === "!has" ? At(gi(n[1])) : !0;
+  return n.length <= 1 ? e !== "any" : e === "==" ? Pn(n[1], n[2], "==") : e === "!=" ? zt(Pn(n[1], n[2], "==")) : e === "<" || e === ">" || e === "<=" || e === ">=" ? Pn(n[1], n[2], e) : e === "any" ? Dc(n.slice(1)) : e === "all" ? ["all"].concat(n.slice(1).map(Zt)) : e === "none" ? ["all"].concat(n.slice(1).map(Zt).map(zt)) : e === "in" ? mi(n[1], n.slice(2)) : e === "!in" ? zt(mi(n[1], n.slice(2))) : e === "has" ? gi(n[1]) : e === "!has" ? zt(gi(n[1])) : !0;
 }
 function Pn(n, e, t) {
   switch (n) {
@@ -10438,20 +10438,20 @@ function gi(n) {
       return ["filter-has", n];
   }
 }
-function At(n) {
+function zt(n) {
   return ["!", n];
 }
 const Nc = {
-  StyleExpression: Ar,
+  StyleExpression: zr,
   StylePropertyFunction: bt,
   ZoomConstantExpression: $t,
   ZoomDependentExpression: jt,
-  createExpression: kr,
-  createPropertyExpression: zs,
+  createExpression: Fr,
+  createPropertyExpression: As,
   isExpression: Es,
-  isExpressionFilter: Fr,
-  isZoomExpression: Ac,
-  normalizePropertyExpression: kc
+  isExpressionFilter: kr,
+  isZoomExpression: zc,
+  normalizePropertyExpression: Fc
 };
 class xi {
   constructor(e, t = {}) {
@@ -10542,22 +10542,22 @@ class Rc {
 }
 function qc(n, e, t = 2) {
   const r = e && e.length, i = r ? e[0] * t : n.length;
-  let s = ks(n, 0, i, t, !0);
+  let s = Fs(n, 0, i, t, !0);
   const o = [];
   if (!s || s.next === s.prev) return o;
   let a, l, u;
   if (r && (s = Zc(n, e, s, t)), n.length > 80 * t) {
     a = n[0], l = n[1];
     let c = a, f = l;
-    for (let d = t; d < i; d += t) {
-      const p = n[d], h = n[d + 1];
-      p < a && (a = p), h < l && (l = h), p > c && (c = p), h > f && (f = h);
+    for (let p = t; p < i; p += t) {
+      const d = n[p], h = n[p + 1];
+      d < a && (a = d), h < l && (l = h), d > c && (c = d), h > f && (f = h);
     }
     u = Math.max(c - a, f - l), u = u !== 0 ? 32767 / u : 0;
   }
   return ft(s, o, t, a, l, u, 0), o;
 }
-function ks(n, e, t, r, i) {
+function Fs(n, e, t, r, i) {
   let s;
   if (i === rf(n, e, t, r) > 0)
     for (let o = e; o < t; o += r) s = vi(o / r | 0, n[o], n[o + 1], s);
@@ -10597,10 +10597,10 @@ function ft(n, e, t, r, i, s, o) {
 function Gc(n) {
   const e = n.prev, t = n, r = n.next;
   if (D(e, t, r) >= 0) return !1;
-  const i = e.x, s = t.x, o = r.x, a = e.y, l = t.y, u = r.y, c = Math.min(i, s, o), f = Math.min(a, l, u), d = Math.max(i, s, o), p = Math.max(a, l, u);
+  const i = e.x, s = t.x, o = r.x, a = e.y, l = t.y, u = r.y, c = Math.min(i, s, o), f = Math.min(a, l, u), p = Math.max(i, s, o), d = Math.max(a, l, u);
   let h = r.next;
   for (; h !== e; ) {
-    if (h.x >= c && h.x <= d && h.y >= f && h.y <= p && tt(i, a, s, l, o, u, h.x, h.y) && D(h.prev, h, h.next) >= 0) return !1;
+    if (h.x >= c && h.x <= p && h.y >= f && h.y <= d && tt(i, a, s, l, o, u, h.x, h.y) && D(h.prev, h, h.next) >= 0) return !1;
     h = h.next;
   }
   return !0;
@@ -10608,18 +10608,18 @@ function Gc(n) {
 function Uc(n, e, t, r) {
   const i = n.prev, s = n, o = n.next;
   if (D(i, s, o) >= 0) return !1;
-  const a = i.x, l = s.x, u = o.x, c = i.y, f = s.y, d = o.y, p = Math.min(a, l, u), h = Math.min(c, f, d), y = Math.max(a, l, u), m = Math.max(c, f, d), v = Hn(p, h, e, t, r), w = Hn(y, m, e, t, r);
+  const a = i.x, l = s.x, u = o.x, c = i.y, f = s.y, p = o.y, d = Math.min(a, l, u), h = Math.min(c, f, p), y = Math.max(a, l, u), m = Math.max(c, f, p), v = Hn(d, h, e, t, r), w = Hn(y, m, e, t, r);
   let g = n.prevZ, x = n.nextZ;
   for (; g && g.z >= v && x && x.z <= w; ) {
-    if (g.x >= p && g.x <= y && g.y >= h && g.y <= m && g !== i && g !== o && tt(a, c, l, f, u, d, g.x, g.y) && D(g.prev, g, g.next) >= 0 || (g = g.prevZ, x.x >= p && x.x <= y && x.y >= h && x.y <= m && x !== i && x !== o && tt(a, c, l, f, u, d, x.x, x.y) && D(x.prev, x, x.next) >= 0)) return !1;
+    if (g.x >= d && g.x <= y && g.y >= h && g.y <= m && g !== i && g !== o && tt(a, c, l, f, u, p, g.x, g.y) && D(g.prev, g, g.next) >= 0 || (g = g.prevZ, x.x >= d && x.x <= y && x.y >= h && x.y <= m && x !== i && x !== o && tt(a, c, l, f, u, p, x.x, x.y) && D(x.prev, x, x.next) >= 0)) return !1;
     x = x.nextZ;
   }
   for (; g && g.z >= v; ) {
-    if (g.x >= p && g.x <= y && g.y >= h && g.y <= m && g !== i && g !== o && tt(a, c, l, f, u, d, g.x, g.y) && D(g.prev, g, g.next) >= 0) return !1;
+    if (g.x >= d && g.x <= y && g.y >= h && g.y <= m && g !== i && g !== o && tt(a, c, l, f, u, p, g.x, g.y) && D(g.prev, g, g.next) >= 0) return !1;
     g = g.prevZ;
   }
   for (; x && x.z <= w; ) {
-    if (x.x >= p && x.x <= y && x.y >= h && x.y <= m && x !== i && x !== o && tt(a, c, l, f, u, d, x.x, x.y) && D(x.prev, x, x.next) >= 0) return !1;
+    if (x.x >= d && x.x <= y && x.y >= h && x.y <= m && x !== i && x !== o && tt(a, c, l, f, u, p, x.x, x.y) && D(x.prev, x, x.next) >= 0) return !1;
     x = x.nextZ;
   }
   return !0;
@@ -10650,7 +10650,7 @@ function jc(n, e, t, r, i, s) {
 function Zc(n, e, t, r) {
   const i = [];
   for (let s = 0, o = e.length; s < o; s++) {
-    const a = e[s] * r, l = s < o - 1 ? e[s + 1] * r : n.length, u = ks(n, a, l, r, !1);
+    const a = e[s] * r, l = s < o - 1 ? e[s + 1] * r : n.length, u = Fs(n, a, l, r, !1);
     u === u.next && (u.steiner = !0), i.push(Qc(u));
   }
   i.sort(Xc);
@@ -10692,7 +10692,7 @@ function Wc(n, e) {
   let c = 1 / 0;
   t = o;
   do {
-    if (r >= t.x && t.x >= l && r !== t.x && Fs(i < u ? r : s, i, l, u, i < u ? s : r, i, t.x, t.y)) {
+    if (r >= t.x && t.x >= l && r !== t.x && ks(i < u ? r : s, i, l, u, i < u ? s : r, i, t.x, t.y)) {
       const f = Math.abs(i - t.y) / (r - t.x);
       ht(t, n) && (f < c || f === c && (t.x > o.x || t.x === o.x && Hc(o, t))) && (o = t, c = f);
     }
@@ -10740,11 +10740,11 @@ function Qc(n) {
   while (e !== n);
   return t;
 }
-function Fs(n, e, t, r, i, s, o, a) {
+function ks(n, e, t, r, i, s, o, a) {
   return (i - o) * (e - a) >= (n - o) * (s - a) && (n - o) * (r - a) >= (t - o) * (e - a) && (t - o) * (s - a) >= (i - o) * (r - a);
 }
 function tt(n, e, t, r, i, s, o, a) {
-  return !(n === o && e === a) && Fs(n, e, t, r, i, s, o, a);
+  return !(n === o && e === a) && ks(n, e, t, r, i, s, o, a);
 }
 function ef(n, e) {
   return n.next.i !== e.i && n.prev.i !== e.i && !tf(n, e) && // doesn't intersect other edges
@@ -10759,13 +10759,13 @@ function Ye(n, e) {
   return n.x === e.x && n.y === e.y;
 }
 function Ps(n, e, t, r) {
-  const i = Ft(D(n, e, t)), s = Ft(D(n, e, r)), o = Ft(D(t, r, n)), a = Ft(D(t, r, e));
-  return !!(i !== s && o !== a || i === 0 && kt(n, t, e) || s === 0 && kt(n, r, e) || o === 0 && kt(t, n, r) || a === 0 && kt(t, e, r));
+  const i = kt(D(n, e, t)), s = kt(D(n, e, r)), o = kt(D(t, r, n)), a = kt(D(t, r, e));
+  return !!(i !== s && o !== a || i === 0 && Ft(n, t, e) || s === 0 && Ft(n, r, e) || o === 0 && Ft(t, n, r) || a === 0 && Ft(t, e, r));
 }
-function kt(n, e, t) {
+function Ft(n, e, t) {
   return e.x <= Math.max(n.x, t.x) && e.x >= Math.min(n.x, t.x) && e.y <= Math.max(n.y, t.y) && e.y >= Math.min(n.y, t.y);
 }
-function Ft(n) {
+function kt(n) {
   return n > 0 ? 1 : n < 0 ? -1 : 0;
 }
 function tf(n, e) {
@@ -10893,24 +10893,24 @@ class Pr {
     const u = this.cells[s];
     if (u !== null) {
       const c = this.keys, f = this.bboxes;
-      for (let d = 0; d < u.length; d++) {
-        const p = u[d];
-        if (a[p] === void 0) {
-          const h = p * 4;
-          (l ? l(f[h + 0], f[h + 1], f[h + 2], f[h + 3]) : e <= f[h + 2] && t <= f[h + 3] && r >= f[h + 0] && i >= f[h + 1]) ? (a[p] = !0, o.push(c[p])) : a[p] = !1;
+      for (let p = 0; p < u.length; p++) {
+        const d = u[p];
+        if (a[d] === void 0) {
+          const h = d * 4;
+          (l ? l(f[h + 0], f[h + 1], f[h + 2], f[h + 3]) : e <= f[h + 2] && t <= f[h + 3] && r >= f[h + 0] && i >= f[h + 1]) ? (a[d] = !0, o.push(c[d])) : a[d] = !1;
         }
       }
     }
   }
   _forEachCell(e, t, r, i, s, o, a, l) {
-    const u = this._convertToCellCoord(e), c = this._convertToCellCoord(t), f = this._convertToCellCoord(r), d = this._convertToCellCoord(i);
-    for (let p = u; p <= f; p++)
-      for (let h = c; h <= d; h++) {
-        const y = this.d * h + p;
+    const u = this._convertToCellCoord(e), c = this._convertToCellCoord(t), f = this._convertToCellCoord(r), p = this._convertToCellCoord(i);
+    for (let d = u; d <= f; d++)
+      for (let h = c; h <= p; h++) {
+        const y = this.d * h + d;
         if (!(l && !l(
-          this._convertFromCellCoord(p),
+          this._convertFromCellCoord(d),
           this._convertFromCellCoord(h),
-          this._convertFromCellCoord(p + 1),
+          this._convertFromCellCoord(d + 1),
           this._convertFromCellCoord(h + 1)
         )) && s.call(this, e, t, r, i, y, o, a, l))
           return;
@@ -10995,9 +10995,9 @@ uf(0.25, 0.1, 0.25, 1);
 function wi(n, e, t) {
   return Math.min(t, Math.max(e, n));
 }
-const Ti = {};
+const Ci = {};
 function X(n) {
-  Ti[n] || (typeof console < "u" && console.warn(n), Ti[n] = !0);
+  Ci[n] || (typeof console < "u" && console.warn(n), Ci[n] = !0);
 }
 class cf extends Error {
   /**
@@ -11010,13 +11010,13 @@ class cf extends Error {
     super(`AJAXError: ${t} (${e}): ${r}`), this.status = e, this.statusText = t, this.url = r, this.body = i;
   }
 }
-const Ci = {};
+const Ti = {};
 function J(n, e, t = {}) {
-  if (Ci[n]) throw new Error(`${n} is already registered.`);
+  if (Ti[n]) throw new Error(`${n} is already registered.`);
   Object.defineProperty(e, "_classRegistryKey", {
     value: n,
     writeable: !1
-  }), Ci[n] = {
+  }), Ti[n] = {
     klass: e,
     omit: t.omit || [],
     shallow: t.shallow || []
@@ -11025,12 +11025,12 @@ function J(n, e, t = {}) {
 J("Object", Object);
 J("Set", Set);
 J("TransferableGridIndex", Pr);
-J("Color", k);
+J("Color", F);
 J("Error", Error);
 J("AJAXError", cf);
 J("ResolvedImage", de);
 J("StylePropertyFunction", bt);
-J("StyleExpression", Ar, { omit: ["_evaluator"] });
+J("StyleExpression", zr, { omit: ["_evaluator"] });
 J("ZoomDependentExpression", jt);
 J("ZoomConstantExpression", $t);
 J("CompoundExpression", re, { omit: ["_evaluate"] });
@@ -11097,12 +11097,12 @@ class ff {
       }
       if (a === u || l === c)
         continue;
-      const f = Math.floor(a / this._granularityCellSize), d = Math.ceil(u / this._granularityCellSize), p = Math.floor(l / this._granularityCellSize), h = Math.ceil(c / this._granularityCellSize);
-      if (f === d && p === h) {
+      const f = Math.floor(a / this._granularityCellSize), p = Math.ceil(u / this._granularityCellSize), d = Math.floor(l / this._granularityCellSize), h = Math.ceil(c / this._granularityCellSize);
+      if (f === p && d === h) {
         t.push(...s);
         continue;
       }
-      for (let y = p; y < h; y++) {
+      for (let y = d; y < h; y++) {
         const m = this._scanlineGenerateVertexRingForCellRow(y, o, s);
         yf(this._vertexBuffer, m, t);
       }
@@ -11119,19 +11119,19 @@ class ff {
   _scanlineGenerateVertexRingForCellRow(e, t, r) {
     const i = e * this._granularityCellSize, s = i + this._granularityCellSize, o = [];
     for (let a = 0; a < 3; a++) {
-      const l = t[a * 2], u = t[a * 2 + 1], c = t[(a + 1) * 2 % 6], f = t[((a + 1) * 2 + 1) % 6], d = t[(a + 2) * 2 % 6], p = t[((a + 2) * 2 + 1) % 6], h = c - l, y = f - u, m = h === 0, v = y === 0, w = (i - u) / y, g = (s - u) / y, x = Math.min(w, g), b = Math.max(w, g);
+      const l = t[a * 2], u = t[a * 2 + 1], c = t[(a + 1) * 2 % 6], f = t[((a + 1) * 2 + 1) % 6], p = t[(a + 2) * 2 % 6], d = t[((a + 2) * 2 + 1) % 6], h = c - l, y = f - u, m = h === 0, v = y === 0, w = (i - u) / y, g = (s - u) / y, x = Math.min(w, g), b = Math.max(w, g);
       if (!v && (x >= 1 || b <= 0) || v && (u < i || u > s)) {
         f >= i && f <= s && o.push(r[(a + 1) % 3]);
         continue;
       }
       if (!v && x > 0) {
-        const I = l + h * x, F = u + y * x;
-        o.push(this._vertexToIndex(I, F));
+        const I = l + h * x, k = u + y * x;
+        o.push(this._vertexToIndex(I, k));
       }
-      const C = l + h * Math.max(x, 0), _ = l + h * Math.min(b, 1);
-      if (m || this._generateIntraEdgeVertices(o, l, u, c, f, C, _), !v && b < 1) {
-        const I = l + h * b, F = u + y * b;
-        o.push(this._vertexToIndex(I, F));
+      const T = l + h * Math.max(x, 0), _ = l + h * Math.min(b, 1);
+      if (m || this._generateIntraEdgeVertices(o, l, u, c, f, T, _), !v && b < 1) {
+        const I = l + h * b, k = u + y * b;
+        o.push(this._vertexToIndex(I, k));
       }
       (v || f >= i && f <= s) && o.push(r[(a + 1) % 3]), !v && (f <= i || f >= s) && this._generateInterEdgeVertices(
         o,
@@ -11139,8 +11139,8 @@ class ff {
         u,
         c,
         f,
-        d,
         p,
+        d,
         _,
         i,
         s
@@ -11156,14 +11156,14 @@ class ff {
    * @param exitX - The X coordinate of the point where edge A-\>B exits the current cell row.
    */
   _generateIntraEdgeVertices(e, t, r, i, s, o, a) {
-    const l = i - t, u = s - r, c = u === 0, f = c ? Math.min(t, i) : Math.min(o, a), d = c ? Math.max(t, i) : Math.max(o, a), p = Math.floor(f / this._granularityCellSize) + 1, h = Math.ceil(d / this._granularityCellSize) - 1;
+    const l = i - t, u = s - r, c = u === 0, f = c ? Math.min(t, i) : Math.min(o, a), p = c ? Math.max(t, i) : Math.max(o, a), d = Math.floor(f / this._granularityCellSize) + 1, h = Math.ceil(p / this._granularityCellSize) - 1;
     if (c ? t < i : o < a)
-      for (let m = p; m <= h; m++) {
+      for (let m = d; m <= h; m++) {
         const v = m * this._granularityCellSize, w = r + u * (v - t) / l;
         e.push(this._vertexToIndex(v, w));
       }
     else
-      for (let m = h; m >= p; m--) {
+      for (let m = h; m >= d; m--) {
         const v = m * this._granularityCellSize, w = r + u * (v - t) / l;
         e.push(this._vertexToIndex(v, w));
       }
@@ -11180,25 +11180,25 @@ class ff {
    * @param cellRowYBottom - The current cell row bottom Y coordinate.
    */
   _generateInterEdgeVertices(e, t, r, i, s, o, a, l, u, c) {
-    const f = s - r, d = o - i, p = a - s, h = (u - s) / p, y = (c - s) / p, m = Math.min(h, y), v = Math.max(h, y), w = i + d * m;
+    const f = s - r, p = o - i, d = a - s, h = (u - s) / d, y = (c - s) / d, m = Math.min(h, y), v = Math.max(h, y), w = i + p * m;
     let g = Math.floor(Math.min(w, l) / this._granularityCellSize) + 1, x = Math.ceil(Math.max(w, l) / this._granularityCellSize) - 1, b = l < w;
-    const C = p === 0;
-    if (C && (a === u || a === c))
+    const T = d === 0;
+    if (T && (a === u || a === c))
       return;
-    if (C || m >= 1 || v <= 0) {
-      const I = t - o, F = r - a, P = (u - a) / F, G = (c - a) / F, j = Math.min(P, G), oe = o + I * j;
+    if (T || m >= 1 || v <= 0) {
+      const I = t - o, k = r - a, P = (u - a) / k, G = (c - a) / k, j = Math.min(P, G), oe = o + I * j;
       g = Math.floor(Math.min(oe, l) / this._granularityCellSize) + 1, x = Math.ceil(Math.max(oe, l) / this._granularityCellSize) - 1, b = l < oe;
     }
     const _ = f > 0 ? c : u;
     if (b)
       for (let I = g; I <= x; I++) {
-        const F = I * this._granularityCellSize;
-        e.push(this._vertexToIndex(F, _));
+        const k = I * this._granularityCellSize;
+        e.push(this._vertexToIndex(k, _));
       }
     else
       for (let I = x; I >= g; I--) {
-        const F = I * this._granularityCellSize;
-        e.push(this._vertexToIndex(F, _));
+        const k = I * this._granularityCellSize;
+        e.push(this._vertexToIndex(k, _));
       }
   }
   /**
@@ -11259,8 +11259,8 @@ class ff {
   _fillPoles(e, t, r) {
     const i = this._vertexBuffer, s = 0, o = te, a = e.length;
     for (let l = 2; l < a; l += 3) {
-      const u = e[l - 2], c = e[l - 1], f = e[l], d = i[u * 2], p = i[u * 2 + 1], h = i[c * 2], y = i[c * 2 + 1], m = i[f * 2], v = i[f * 2 + 1];
-      t && (p === s && y === s && this._generatePoleQuad(e, u, c, d, h, De), y === s && v === s && this._generatePoleQuad(e, c, f, h, m, De), v === s && p === s && this._generatePoleQuad(e, f, u, m, d, De)), r && (p === o && y === o && this._generatePoleQuad(e, u, c, d, h, et), y === o && v === o && this._generatePoleQuad(e, c, f, h, m, et), v === o && p === o && this._generatePoleQuad(e, f, u, m, d, et));
+      const u = e[l - 2], c = e[l - 1], f = e[l], p = i[u * 2], d = i[u * 2 + 1], h = i[c * 2], y = i[c * 2 + 1], m = i[f * 2], v = i[f * 2 + 1];
+      t && (d === s && y === s && this._generatePoleQuad(e, u, c, p, h, De), y === s && v === s && this._generatePoleQuad(e, c, f, h, m, De), v === s && d === s && this._generatePoleQuad(e, f, u, m, p, De)), r && (d === o && y === o && this._generatePoleQuad(e, u, c, p, h, et), y === o && v === o && this._generatePoleQuad(e, c, f, h, m, et), v === o && d === o && this._generatePoleQuad(e, f, u, m, p, et));
     }
   }
   /**
@@ -11341,13 +11341,13 @@ function Os(n, e, t = !1) {
   a.push(new M(n[0].x, n[0].y));
   const l = n.length, u = s ? l : l - 1;
   for (let c = 0; c < u; c++) {
-    const f = n[c], d = c < l - 1 ? n[c + 1] : n[0], p = f.x, h = f.y, y = d.x, m = d.y, v = p !== y, w = h !== m;
+    const f = n[c], p = c < l - 1 ? n[c + 1] : n[0], d = f.x, h = f.y, y = p.x, m = p.y, v = d !== y, w = h !== m;
     if (!v && !w)
       continue;
-    const g = y - p, x = m - h, b = Math.abs(g), C = Math.abs(x);
-    let _ = p, I = h;
+    const g = y - d, x = m - h, b = Math.abs(g), T = Math.abs(x);
+    let _ = d, I = h;
     for (; ; ) {
-      const P = g > 0 ? (Math.floor(_ / o) + 1) * o : (Math.ceil(_ / o) - 1) * o, G = x > 0 ? (Math.floor(I / o) + 1) * o : (Math.ceil(I / o) - 1) * o, j = Math.abs(_ - P), oe = Math.abs(I - G), Me = Math.abs(_ - y), Ns = Math.abs(I - m), Vr = v ? j / b : Number.POSITIVE_INFINITY, Dr = w ? oe / C : Number.POSITIVE_INFINITY;
+      const P = g > 0 ? (Math.floor(_ / o) + 1) * o : (Math.ceil(_ / o) - 1) * o, G = x > 0 ? (Math.floor(I / o) + 1) * o : (Math.ceil(I / o) - 1) * o, j = Math.abs(_ - P), oe = Math.abs(I - G), Me = Math.abs(_ - y), Ns = Math.abs(I - m), Vr = v ? j / b : Number.POSITIVE_INFINITY, Dr = w ? oe / T : Number.POSITIVE_INFINITY;
       if ((Me <= j || !v) && (Ns <= oe || !w))
         break;
       if (Vr < Dr && v || !w) {
@@ -11360,8 +11360,8 @@ function Os(n, e, t = !1) {
         (a[a.length - 1].x !== _e.x || a[a.length - 1].y !== _e.y) && a.push(_e);
       }
     }
-    const F = new M(y, m);
-    (a[a.length - 1].x !== F.x || a[a.length - 1].y !== F.y) && a.push(F);
+    const k = new M(y, m);
+    (a[a.length - 1].x !== k.x || a[a.length - 1].y !== k.y) && a.push(k);
   }
   return a;
 }
@@ -11381,8 +11381,8 @@ function pf(n) {
 function df(n, e) {
   const t = [];
   for (let r = 0; r < e.length; r += 3) {
-    const i = e[r], s = e[r + 1], o = e[r + 2], a = n[i * 2], l = n[i * 2 + 1], u = n[s * 2], c = n[s * 2 + 1], f = n[o * 2], d = n[o * 2 + 1], p = u - a, h = c - l, y = f - a, m = d - l;
-    p * m - h * y > 0 ? (t.push(i), t.push(o), t.push(s)) : (t.push(i), t.push(s), t.push(o));
+    const i = e[r], s = e[r + 1], o = e[r + 2], a = n[i * 2], l = n[i * 2 + 1], u = n[s * 2], c = n[s * 2 + 1], f = n[o * 2], p = n[o * 2 + 1], d = u - a, h = c - l, y = f - a, m = p - l;
+    d * m - h * y > 0 ? (t.push(i), t.push(o), t.push(s)) : (t.push(i), t.push(s), t.push(o));
   }
   return t;
 }
@@ -11397,15 +11397,15 @@ function yf(n, e, t) {
   const s = e.length;
   let o = r, a = (o + 1) % s;
   for (; ; ) {
-    const l = o - 1 >= 0 ? o - 1 : s - 1, u = (a + 1) % s, c = n[e[l] * 2], f = n[e[l] * 2 + 1], d = n[e[u] * 2], p = n[e[u] * 2 + 1], h = n[e[o] * 2], y = n[e[o] * 2 + 1], m = n[e[a] * 2], v = n[e[a] * 2 + 1];
+    const l = o - 1 >= 0 ? o - 1 : s - 1, u = (a + 1) % s, c = n[e[l] * 2], f = n[e[l] * 2 + 1], p = n[e[u] * 2], d = n[e[u] * 2 + 1], h = n[e[o] * 2], y = n[e[o] * 2 + 1], m = n[e[a] * 2], v = n[e[a] * 2 + 1];
     let w = !1;
-    if (c < d)
+    if (c < p)
       w = !0;
-    else if (c > d)
+    else if (c > p)
       w = !1;
     else {
-      const g = m - h, b = v - y, C = -g, _ = y < v ? 1 : -1, I = ((c - h) * b + (f - y) * C) * _, F = ((d - h) * b + (p - y) * C) * _;
-      I > F && (w = !0);
+      const g = m - h, b = v - y, T = -g, _ = y < v ? 1 : -1, I = ((c - h) * b + (f - y) * T) * _, k = ((p - h) * b + (d - y) * T) * _;
+      I > k && (w = !0);
     }
     if (w) {
       const g = e[l], x = e[o], b = e[a];
@@ -11595,23 +11595,23 @@ class Mr {
   async createRenderLayers(e, t) {
     const r = this.sources, i = t._styleLayers, s = this.layers, o = this.visualizers, a = {};
     for (const l of i) {
-      const u = r[l.source], c = nt[l.type], f = rt[l.type], d = l.type === "background";
-      if (c || X("不支持图层类型" + l.type), !d && !u || !c) continue;
-      const p = [];
-      if (!d) {
+      const u = r[l.source], c = nt[l.type], f = rt[l.type], p = l.type === "background";
+      if (c || X("不支持图层类型" + l.type), !p && !u || !c) continue;
+      const d = [];
+      if (!p) {
         const m = (l.source && t.sources[l.source].type) == "geojson" ? "_geojsonTileLayer" : l.sourceLayer, v = u.layers[m];
         if (!v) continue;
         const w = v.length;
         for (let g = 0; g < w; g++) {
           const x = v.feature(g);
-          l.filter && !l.filter.filter({ zoom: this.z }, x) || (x.toGeoJSON || (x.toGeoJSON = We.prototype.toGeoJSON), p.push(x));
+          l.filter && !l.filter.filter({ zoom: this.z }, x) || (x.toGeoJSON || (x.toGeoJSON = We.prototype.toGeoJSON), d.push(x));
         }
-        if (!p.length) continue;
+        if (!d.length) continue;
       }
-      const h = new c(p, l, this);
+      const h = new c(d, l, this);
       if (s.push(h), f) {
         let y = a[l.type];
-        y || (y = new f(this), a[l.type] = y, o.push(y)), y.addLayer(p, h, e, t);
+        y || (y = new f(this), a[l.type] = y, o.push(y)), y.addLayer(d, h, e, t);
       }
     }
     this.state = "ready";
@@ -11631,12 +11631,12 @@ class Mr {
     for (const l of e.fill || []) {
       const u = i.find((h) => h.id === l.layerId);
       if (!u) continue;
-      const c = nt.fill, f = rt.fill, d = new c([], u, this);
-      s.push(d);
-      let p = a.fill;
-      p || (p = new f(this), a.fill = p, o.push(p)), p.addLayerFromWorkerResult(
+      const c = nt.fill, f = rt.fill, p = new c([], u, this);
+      s.push(p);
+      let d = a.fill;
+      d || (d = new f(this), a.fill = d, o.push(d)), d.addLayerFromWorkerResult(
         l,
-        d,
+        p,
         t,
         r
       );
@@ -11644,12 +11644,12 @@ class Mr {
     for (const l of e.line || []) {
       const u = i.find((h) => h.id === l.layerId);
       if (!u) continue;
-      const c = nt.line, f = rt.line, d = new c([], u, this);
-      s.push(d);
-      let p = a.line;
-      p || (p = new f(this), a.line = p, o.push(p)), p.addLayerFromWorkerResult(
+      const c = nt.line, f = rt.line, p = new c([], u, this);
+      s.push(p);
+      let d = a.line;
+      d || (d = new f(this), a.line = d, o.push(d)), d.addLayerFromWorkerResult(
         l,
-        d,
+        p,
         t,
         r
       );
@@ -11657,12 +11657,12 @@ class Mr {
     for (const l of e.symbol || []) {
       const u = i.find((h) => h.id === l.layerId);
       if (!u) continue;
-      const c = nt.symbol, f = rt.symbol, d = new c([], u, this);
-      s.push(d);
-      let p = a.symbol;
-      p || (p = new f(this), a.symbol = p, o.push(p)), p.addLayerFromWorkerResult(
+      const c = nt.symbol, f = rt.symbol, p = new c([], u, this);
+      s.push(p);
+      let d = a.symbol;
+      d || (d = new f(this), a.symbol = d, o.push(d)), d.addLayerFromWorkerResult(
         l,
-        d,
+        p,
         t,
         r
       );
@@ -11867,13 +11867,13 @@ class vf {
           y2: this.bboxes[u * 4 + 3]
         });
       for (let u = 0; u < this.circleKeys.length; u++) {
-        const c = this.circles[u * 3], f = this.circles[u * 3 + 1], d = this.circles[u * 3 + 2];
+        const c = this.circles[u * 3], f = this.circles[u * 3 + 1], p = this.circles[u * 3 + 2];
         l.push({
           key: this.circleKeys[u],
-          x1: c - d,
-          y1: f - d,
-          x2: c + d,
-          y2: f + d
+          x1: c - p,
+          y1: f - p,
+          x2: c + p,
+          y2: f + p
         });
       }
     } else {
@@ -11905,10 +11905,10 @@ class vf {
     return this._forEachCell(o, l, a, u, this._queryCellCircle, c, f, s), c.length > 0;
   }
   _queryCell(e, t, r, i, s, o, a, l) {
-    const { seenUids: u, hitTest: c, overlapMode: f } = a, d = this.boxCells[s];
-    if (d !== null) {
+    const { seenUids: u, hitTest: c, overlapMode: f } = a, p = this.boxCells[s];
+    if (p !== null) {
       const h = this.bboxes;
-      for (const y of d)
+      for (const y of p)
         if (!u.box[y]) {
           u.box[y] = !0;
           const m = y * 4, v = this.boxKeys[y];
@@ -11922,10 +11922,10 @@ class vf {
             return !0;
         }
     }
-    const p = this.circleCells[s];
-    if (p !== null) {
+    const d = this.circleCells[s];
+    if (d !== null) {
       const h = this.circles;
-      for (const y of p)
+      for (const y of d)
         if (!u.circle[y]) {
           u.circle[y] = !0;
           const m = y * 3, v = this.circleKeys[y];
@@ -11953,10 +11953,10 @@ class vf {
     return !1;
   }
   _queryCellCircle(e, t, r, i, s, o, a, l) {
-    const { circle: u, seenUids: c, overlapMode: f } = a, d = this.boxCells[s];
-    if (d !== null) {
+    const { circle: u, seenUids: c, overlapMode: f } = a, p = this.boxCells[s];
+    if (p !== null) {
       const h = this.bboxes;
-      for (const y of d)
+      for (const y of p)
         if (!c.box[y]) {
           c.box[y] = !0;
           const m = y * 4, v = this.boxKeys[y];
@@ -11972,10 +11972,10 @@ class vf {
             return o.push(!0), !0;
         }
     }
-    const p = this.circleCells[s];
-    if (p !== null) {
+    const d = this.circleCells[s];
+    if (d !== null) {
       const h = this.circles;
-      for (const y of p)
+      for (const y of d)
         if (!c.circle[y]) {
           c.circle[y] = !0;
           const m = y * 3, v = this.circleKeys[y];
@@ -11992,10 +11992,10 @@ class vf {
     }
   }
   _forEachCell(e, t, r, i, s, o, a, l) {
-    const u = this._convertToXCellCoord(e), c = this._convertToYCellCoord(t), f = this._convertToXCellCoord(r), d = this._convertToYCellCoord(i);
-    for (let p = u; p <= f; p++)
-      for (let h = c; h <= d; h++) {
-        const y = this.xCellCount * h + p;
+    const u = this._convertToXCellCoord(e), c = this._convertToYCellCoord(t), f = this._convertToXCellCoord(r), p = this._convertToYCellCoord(i);
+    for (let d = u; d <= f; d++)
+      for (let h = c; h <= p; h++) {
+        const y = this.xCellCount * h + d;
         if (s.call(this, e, t, r, i, y, o, a, l)) return;
       }
   }
@@ -12018,8 +12018,8 @@ class vf {
       return !1;
     if (u <= l || f <= c)
       return !0;
-    const d = u - l, p = f - c;
-    return d * d + p * p <= r * r;
+    const p = u - l, d = f - c;
+    return p * p + d * d <= r * r;
   }
 }
 const Ii = 100;
@@ -12046,10 +12046,10 @@ class bf {
       const f = u.layout.getDataConstValue(
         "text-allow-overlap",
         l.tile.z
-      ), d = u.layout.getDataConstValue(
+      ), p = u.layout.getDataConstValue(
         "text-overlap",
         l.tile.z
-      ), p = wf(d, f), h = u.layout.getDataConstValue(
+      ), d = wf(p, f), h = u.layout.getDataConstValue(
         "text-padding",
         l.tile.z
       );
@@ -12067,11 +12067,11 @@ class bf {
           m,
           Si
         ), w = v.x - h, g = v.y - h, x = w + v.width + h, b = g + v.height + h;
-        if (a.hitTest(w, g, x, b, p, null))
+        if (a.hitTest(w, g, x, b, d, null))
           y.vtPlaceable = !1;
         else {
-          const C = { overlapMode: p };
-          a.insert(C, w, g, x, b), y.vtPlaceable = !0;
+          const T = { overlapMode: d };
+          a.insert(T, w, g, x, b), y.vtPlaceable = !0;
         }
       }
     }
@@ -12081,7 +12081,7 @@ function wf(n, e) {
   let t = "never";
   return n ? t = n : e && (t = "always"), t;
 }
-class Pf {
+class Mf {
   /**
    * @param {object} options
    * @param {string|import('@maplibre/maplibre-gl-style-spec').StyleSpecification} options.style
@@ -12164,11 +12164,11 @@ class Pf {
     t.beginFrame(), this.numInitializing = 0;
     const r = e.camera._scene, s = r.globe._surface._debug.suspendLodUpdate;
     this.scene = r;
-    const o = Tf(e, this);
+    const o = Cf(e, this);
     s || o.sort((c, f) => c.distanceToCamera - f.distanceToCamera);
     for (const c of o)
       c.lastVisitTime = e.frameNumber, c.expired = !1, c.update(e, t, this);
-    const a = s ? this._tilesToRender : Cf(o, this._tilesToRender);
+    const a = s ? this._tilesToRender : Tf(o, this._tilesToRender);
     s || a.sort((c, f) => c.distanceToCamera - f.distanceToCamera);
     for (const c of a)
       c.lastVisitTime = e.frameNumber, c.expired = !1, c.render(e, t, this);
@@ -12205,7 +12205,7 @@ class Pf {
     return !1;
   }
 }
-function Tf(n, e) {
+function Cf(n, e) {
   const t = [...e._rootTiles], r = e._tilesToUpdate;
   let i = 24, s = 1 / 0;
   const o = {
@@ -12232,7 +12232,7 @@ function Tf(n, e) {
   while (t.length > 0);
   return e.zoom = i, r;
 }
-function Cf(n, e) {
+function Tf(n, e) {
   const t = /* @__PURE__ */ new Map();
   for (const s of n)
     s.renderable && t.set(s, !0);
@@ -12250,11 +12250,11 @@ function Cf(n, e) {
       const u = l.z - o.z;
       if (u !== 0)
         if (u > 0) {
-          const c = Math.pow(2, u), f = Math.floor(l.x / c), d = Math.floor(l.y / c);
-          f === o.x && d === o.y && (a.total++, a.tiles.push(l), l.renderable && a.renderable++);
+          const c = Math.pow(2, u), f = Math.floor(l.x / c), p = Math.floor(l.y / c);
+          f === o.x && p === o.y && (a.total++, a.tiles.push(l), l.renderable && a.renderable++);
         } else {
-          const c = Math.pow(2, -u), f = Math.floor(o.x / c), d = Math.floor(o.y / c);
-          f === l.x && d === l.y && (o.renderable = !l.renderable);
+          const c = Math.pow(2, -u), f = Math.floor(o.x / c), p = Math.floor(o.y / c);
+          f === l.x && p === l.y && (o.renderable = !l.renderable);
         }
     }
   }
@@ -12482,28 +12482,28 @@ class Lf extends Or {
     const s = t.style, { tile: o, geometryInstances: a } = this, l = Vs.globe.line.getGranularityForZoomLevel(o.z) / 2, u = this;
     let c = 0;
     const f = i.sources[t.style.source].styleSource.promoteId;
-    for (const d of e) {
-      const p = We.types[d.type], h = d.properties;
-      if (p !== "Polygon") continue;
+    for (const p of e) {
+      const d = We.types[p.type], h = p.properties;
+      if (d !== "Polygon") continue;
       if (s.paint.getDataValue(
         "fill-pattern",
         o.z,
-        d
+        p
       )) {
         X("fill图层：不支持纹理填充（fill-pattern）");
         continue;
       }
-      const m = d.id || h[f], v = s.convertColor(
-        s.paint.getDataValue("fill-color", o.z, d)
+      const m = p.id || h[f], v = s.convertColor(
+        s.paint.getDataValue("fill-color", o.z, p)
       ), w = s.paint.getDataValue(
         "fill-opacity",
         o.z,
-        d
-      ), g = Ds(d), x = ki(g);
+        p
+      ), g = Ds(p), x = Fi(g);
       for (const b of x) {
         if (b.some((I) => I.length < 3)) continue;
-        const C = a.length;
-        c == 0 && (t.firstBatchId = C), t.lastBatchId = C;
+        const T = a.length;
+        c == 0 && (t.firstBatchId = T), t.lastBatchId = T;
         const _ = {
           coordinates: b,
           featureId: c,
@@ -12513,7 +12513,7 @@ class Lf extends Or {
           //保存原始数据的要素id，后续可以用来支持 featureState 表达式，这个表达式可以实现选定要素高亮显示
           id: m,
           //保存batchId，将矢量要素与几何顶点关联，后续可以实时更新图层样式
-          batchId: C
+          batchId: T
         };
         u.addFeature(_, l), c++;
       }
@@ -12530,7 +12530,7 @@ class Lf extends Or {
   addLayerFromWorkerResult(e, t, r, i) {
     const { batches: s, firstBatchId: o, lastBatchId: a } = e, l = this.geometryInstances, u = new Cesium.Cartesian3();
     for (const c of s) {
-      const { positions: f, normals: d, st: p, indices: h, colorBytes: y, id: m, properties: v } = c;
+      const { positions: f, normals: p, st: d, indices: h, colorBytes: y, id: m, properties: v } = c;
       f.length / 3;
       const w = new Cesium.Geometry({
         attributes: {
@@ -12544,13 +12544,13 @@ class Lf extends Or {
             componentDatatype: Cesium.ComponentDatatype.FLOAT,
             componentsPerAttribute: 3,
             normalize: !1,
-            values: d
+            values: p
           },
           st: {
             componentDatatype: Cesium.ComponentDatatype.FLOAT,
             componentsPerAttribute: 2,
             normalize: !1,
-            values: p
+            values: d
           }
         },
         primitiveType: Cesium.PrimitiveType.TRIANGLES,
@@ -12597,26 +12597,26 @@ class Lf extends Or {
       this.tile,
       t,
       !1
-    ), u = l.verticesFlattened, c = [0, 0], f = new Cesium.Cartesian3(), d = u.length / 2, p = new Float64Array(d * 3), h = new Float32Array(d * 3), y = new Float32Array(d * 2);
-    for (let b = 0, C = 0; b < u.length; b += 2, C++) {
-      const _ = u[b], I = u[b + 1], F = this.tile.transformPoint(_, I, c), P = Cesium.Cartesian3.fromDegrees(
-        F[0],
-        F[1],
+    ), u = l.verticesFlattened, c = [0, 0], f = new Cesium.Cartesian3(), p = u.length / 2, d = new Float64Array(p * 3), h = new Float32Array(p * 3), y = new Float32Array(p * 2);
+    for (let b = 0, T = 0; b < u.length; b += 2, T++) {
+      const _ = u[b], I = u[b + 1], k = this.tile.transformPoint(_, I, c), P = Cesium.Cartesian3.fromDegrees(
+        k[0],
+        k[1],
         0,
         null,
         f
       );
-      p[C * 3] = P.x, p[C * 3 + 1] = P.y, p[C * 3 + 2] = P.z;
+      d[T * 3] = P.x, d[T * 3 + 1] = P.y, d[T * 3 + 2] = P.z;
       const G = Cesium.Cartesian3.normalize(P, P);
-      h[C * 3] = G.x, h[C * 3 + 1] = G.y, h[C * 3 + 2] = G.z, y[C * 2] = _ / te, y[C * 2 + 1] = I / te;
+      h[T * 3] = G.x, h[T * 3 + 1] = G.y, h[T * 3 + 2] = G.z, y[T * 2] = _ / te, y[T * 2 + 1] = I / te;
     }
-    const m = new (d > 65535 ? Uint32Array : d > 255 ? Uint16Array : Uint8Array)(l.indicesTriangles), v = new Cesium.Geometry({
+    const m = new (p > 65535 ? Uint32Array : p > 255 ? Uint16Array : Uint8Array)(l.indicesTriangles), v = new Cesium.Geometry({
       attributes: {
         position: {
           componentDatatype: Cesium.ComponentDatatype.DOUBLE,
           componentsPerAttribute: 3,
           normalize: !1,
-          values: p
+          values: d
         },
         normal: {
           componentDatatype: Cesium.ComponentDatatype.FLOAT,
@@ -12633,7 +12633,7 @@ class Lf extends Or {
       },
       primitiveType: Cesium.PrimitiveType.TRIANGLES,
       indices: m,
-      boundingSphere: Cesium.BoundingSphere.fromVertices(p)
+      boundingSphere: Cesium.BoundingSphere.fromVertices(d)
     }), w = Cesium.Cartographic.fromCartesian(
       v.boundingSphere.center
     );
@@ -12734,12 +12734,12 @@ void main()
         const { firstBatchId: c, lastBatchId: f } = u;
         if (c === -1 || f === -1)
           continue;
-        let d = -1, p = -1;
+        let p = -1, d = -1;
         for (let h = c; h <= f; h++) {
           const y = r[h];
-          y && (d === -1 && (d = y.begin), p = y.end);
+          y && (p === -1 && (p = y.begin), d = y.end);
         }
-        d === -1 || p === -1 || (u.offsets[t] = d, u.counts[t] = p - d + 1);
+        p === -1 || d === -1 || (u.offsets[t] = p, u.counts[t] = d - p + 1);
       }
     }
   }
@@ -12780,8 +12780,8 @@ void main()
         }, f.uniformMap.tileId = function() {
           return i.color;
         }, f.pass = Cesium.Pass.CESIUM_3D_TILE;
-        const d = Cesium.DrawCommand.shallowClone(f);
-        d.pass = Cesium.Pass.CESIUM_3D_TILE, d.renderState = r, d.layerType = "fill", d.offset = u, d.count = c, a.push(d);
+        const p = Cesium.DrawCommand.shallowClone(f);
+        p.pass = Cesium.Pass.CESIUM_3D_TILE, p.renderState = r, p.layerType = "fill", p.offset = u, p.count = c, a.push(p);
       }
       o.state = "done";
     }
@@ -12817,7 +12817,7 @@ class Sf extends yn {
 }
 mn("fill", Sf, Lf);
 const Ef = We.prototype.toGeoJSON;
-class zf extends Or {
+class Af extends Or {
   constructor(e, t) {
     super(e, t), this.geometryInstances = [], this.primitive = null, this.commandsReady = !1;
   }
@@ -12830,14 +12830,14 @@ class zf extends Or {
   addLayer(e, t, r, i) {
     const s = t.style, { tile: o, geometryInstances: a } = this, l = Vs.globe.line.getGranularityForZoomLevel(o.z), u = this, c = i.sources[t.style.source].styleSource.promoteId;
     let f = 0;
-    const d = s.paint.getDataConstValue("line-dasharray", o.z);
-    if (d && d.length) {
-      d.length % 2 > 0 && d.push(0), t.dashLength = 0;
-      for (let h = 0; h < d.length; h++)
-        t.dashLength += d[h];
-      t.dasharray = d, d.length > 8 && X("line图层：line-dasharray 超过最大长度（8）");
-    }
-    function p(h, y, m, v, w, g) {
+    const p = s.paint.getDataConstValue("line-dasharray", o.z);
+    if (p && p.length) {
+      p.length % 2 > 0 && p.push(0), t.dashLength = 0;
+      for (let h = 0; h < p.length; h++)
+        t.dashLength += p[h];
+      t.dasharray = p, p.length > 8 && X("line图层：line-dasharray 超过最大长度（8）");
+    }
+    function d(h, y, m, v, w, g) {
       if (h.length < 2) return;
       const x = a.length;
       f == 0 && (t.firstBatchId = x), t.lastBatchId = x;
@@ -12881,7 +12881,7 @@ class zf extends Or {
         h
       ), b = s.convertColor(
         s.paint.getDataValue("line-color", o.z, h)
-      ), C = s.paint.getDataValue(
+      ), T = s.paint.getDataValue(
         "line-opacity",
         o.z,
         h
@@ -12898,40 +12898,40 @@ class zf extends Or {
         "line-join",
         o.z,
         h
-      ), F = s.paint.getDataValue(
+      ), k = s.paint.getDataValue(
         "line-cap",
         o.z,
         h
       );
-      I !== "miter" && X("line图层：line-join 仅支持 miter 模式"), F !== "butt" && X("line图层：line-cap 仅支持 butt 模式");
+      I !== "miter" && X("line图层：line-join 仅支持 miter 模式"), k !== "butt" && X("line图层：line-cap 仅支持 butt 模式");
       const P = w.geometry.type, G = w.geometry.coordinates;
       if (P == "LineString")
-        p(
+        d(
           G,
           x,
           b,
-          C,
+          T,
           g,
           m
         );
       else if (P == "MultiLineString" || P == "Polygon")
         for (const j of G)
-          p(
+          d(
             j,
             x,
             b,
-            C,
+            T,
             g,
             m
           );
       else if (P == "MultiPolygon")
         for (const j of G)
           for (const oe of j)
-            p(
+            d(
               oe,
               x,
               b,
-              C,
+              T,
               g,
               m
             );
@@ -12950,7 +12950,7 @@ class zf extends Or {
   addLayerFromWorkerResult(e, t, r, i) {
     const { batches: s, firstBatchId: o, lastBatchId: a } = e, l = this.geometryInstances;
     for (const u of s) {
-      const { positions: c, colorBytes: f, lineWidth: d, id: p, properties: h } = u, y = [];
+      const { positions: c, colorBytes: f, lineWidth: p, id: d, properties: h } = u, y = [];
       for (let x = 0; x < c.length; x += 3)
         y.push(
           new Cesium.Cartesian3(
@@ -12970,7 +12970,7 @@ class zf extends Or {
       ), g = new Cesium.GeometryInstance({
         geometry: new Cesium.PolylineGeometry({
           positions: y,
-          width: d
+          width: p
         }),
         attributes: {
           color: new Cesium.GeometryInstanceAttribute({
@@ -12982,7 +12982,7 @@ class zf extends Or {
         },
         id: new Cesium.Entity({
           position: w,
-          id: p,
+          id: d,
           properties: h
         })
       });
@@ -12997,7 +12997,7 @@ class zf extends Or {
     const t = this.geometryInstances, { coordinates: r, lineColor: i, lineWidth: s, lineOpacity: o } = e, a = i.toBytes();
     a[3] = Math.floor(a[3] * o);
     const l = r.map(
-      (p) => Cesium.Cartesian3.fromDegrees(p[0], p[1])
+      (d) => Cesium.Cartesian3.fromDegrees(d[0], d[1])
     ), u = Cesium.BoundingSphere.fromPoints(l), c = Cesium.Cartographic.fromCartesian(
       u.center
     );
@@ -13006,7 +13006,7 @@ class zf extends Or {
       c,
       null,
       new Cesium.Cartesian3()
-    ), d = new Cesium.GeometryInstance({
+    ), p = new Cesium.GeometryInstance({
       geometry: new Cesium.PolylineGeometry({
         positions: l,
         width: s
@@ -13026,7 +13026,7 @@ class zf extends Or {
         properties: e.properties
       })
     });
-    t.push(d);
+    t.push(p);
   }
   createPrimitive() {
     const e = new Cesium.Primitive({
@@ -13215,12 +13215,12 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
         const { firstBatchId: c, lastBatchId: f } = u;
         if (c === -1 || f === -1)
           continue;
-        let d = -1, p = -1;
+        let p = -1, d = -1;
         for (let h = c; h <= f; h++) {
           const y = r[h];
-          y && (d === -1 && (d = y.begin), p = y.end);
+          y && (p === -1 && (p = y.begin), d = y.end);
         }
-        d === -1 || p === -1 || (u.offsets[t] = d, u.counts[t] = p - d + 1);
+        p === -1 || d === -1 || (u.offsets[t] = p, u.counts[t] = d - p + 1);
       }
     }
   }
@@ -13275,11 +13275,11 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
         const c = a.offsets[u], f = a.counts[u];
         if (typeof c != "number" || typeof f != "number")
           continue;
-        const d = e[u], p = Cesium.DrawCommand.shallowClone(d);
-        p.pass = Cesium.Pass.CESIUM_3D_TILE, p.uniformMap = s(
-          p.uniformMap,
+        const p = e[u], d = Cesium.DrawCommand.shallowClone(p);
+        d.pass = Cesium.Pass.CESIUM_3D_TILE, d.uniformMap = s(
+          d.uniformMap,
           a
-        ), p.renderState = r, p.offset = c, p.count = f, l.push(p);
+        ), d.renderState = r, d.offset = c, d.count = f, l.push(d);
       }
       a.state = "done";
     }
@@ -13307,7 +13307,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
     return !1;
   }
 }
-class Af extends yn {
+class zf extends yn {
   /**
    * @param {MVT.VectorTileFeature[]} sourceFeatures
    * @param {StyleLayer} styleLayer
@@ -13321,7 +13321,7 @@ class Af extends yn {
     function a(l, u, c) {
       if (l.length < 2) return;
       const f = l.map(
-        (d) => Cesium.Cartesian3.fromDegrees(d[0], d[1])
+        (p) => Cesium.Cartesian3.fromDegrees(p[0], p[1])
       );
       r.add({
         positions: f,
@@ -13342,18 +13342,18 @@ class Af extends yn {
         "line-color",
         o.z,
         l
-      ), d = u.geometry.type, p = u.geometry.coordinates;
-      if (d == "LineString")
-        a(p, c, f);
-      else if (d == "MultiLineString" || d == "Polygon")
-        for (const h of p)
+      ), p = u.geometry.type, d = u.geometry.coordinates;
+      if (p == "LineString")
+        a(d, c, f);
+      else if (p == "MultiLineString" || p == "Polygon")
+        for (const h of d)
           a(h, c, f);
-      else if (d == "MultiPolygon")
-        for (const h of p)
+      else if (p == "MultiPolygon")
+        for (const h of d)
           for (const y of h)
             a(y, c, f);
       else
-        console.log("暂不支持几何类型：" + d);
+        console.log("暂不支持几何类型：" + p);
     }
     this.primitive = r;
   }
@@ -13368,11 +13368,12 @@ class Af extends yn {
     this.primitive = this.primitive && this.primitive.destroy(), super.destroy();
   }
 }
-mn("line", Af, zf);
-let Vn = null, zi = null;
+mn("line", zf, Af);
+let Vn = null, Ai = null;
+const Ff = 0.1;
 class kf extends Or {
   constructor(e, t) {
-    Vn === null && (Vn = new Cesium.Cartesian3(), zi = new Cesium.Cartesian3()), super(e, t), this.labels = [], this.primitive = null, this.dotCutOff = 35e-4;
+    Vn === null && (Vn = new Cesium.Cartesian3(), Ai = new Cesium.Cartesian3()), super(e, t), this.labels = [], this.primitive = null, this.dotCutOff = 35e-4;
   }
   /**
    * 对符号进行地平线剔除
@@ -13386,7 +13387,7 @@ class kf extends Or {
       Vn
     );
     Cesium.Cartesian3.normalize(r, r);
-    const i = Cesium.Cartesian3.normalize(t, zi);
+    const i = Cesium.Cartesian3.normalize(t, Ai);
     return Cesium.Cartesian3.dot(r, i) < this.dotCutOff;
   }
   /**
@@ -13397,35 +13398,35 @@ class kf extends Or {
    */
   addLayer(e, t, r, i) {
     const s = t.style, { tile: o, labels: a } = this, l = o.rectangle;
-    function u(c, f, d, p, h, y, m, v, w) {
+    function u(c, f, p, d, h, y, m, v, w) {
       if (!Cesium.Rectangle.contains(
         l,
         Cesium.Cartographic.fromDegrees(c[0], c[1])
-      ))
+      ) || !f)
         return;
       const g = new Cesium.Label({
         position: Cesium.Cartesian3.fromDegrees(c[0], c[1]),
         text: f,
-        font: p + "px " + d,
+        font: d + "px " + p,
         fillColor: h,
         style: y && Cesium.LabelStyle.FILL_AND_OUTLINE,
-        outlineWidth: y * p,
+        outlineWidth: y * d,
         outlineColor: m,
         //禁用深度测试
         disableDepthTestDistance: 1 / 0,
         pixelOffset: new Cesium.Cartesian2(
-          v[0] * p,
-          v[1] * p
+          v[0] * d,
+          v[1] * d
         ),
         horizontalOrigin: w.horizontal,
         verticalOrigin: w.vertical
       });
-      g.batchId = a.length, a.push(g), t.labels.push(g);
+      g._baseFillColor = g.fillColor.clone(), g._baseOutlineColor = g.outlineColor.clone(), g.vtAlpha = 0, g.batchId = a.length, a.push(g), t.labels.push(g);
     }
     for (const c of e) {
       const f = c.toGeoJSON(o.x, o.y, o.z);
       if (!f.geometry) continue;
-      const d = c.properties, p = s.layout.getDataValue(
+      const p = c.properties, d = s.layout.getDataValue(
         "icon-image",
         o.z,
         c
@@ -13436,13 +13437,13 @@ class kf extends Or {
       );
       let y = h;
       if (typeof y == "string")
-        y = s.layout.resolveTokens(d, h);
+        y = s.layout.resolveTokens(p, h);
       else if (y && y.sections) {
         for (const Me of y.sections)
-          Me.text = s.layout.resolveTokens(d, Me.text);
+          Me.text = s.layout.resolveTokens(p, Me.text);
         y = y.toString();
       }
-      if (p) {
+      if (d) {
         X("symbol图层：不支持图标");
         continue;
       }
@@ -13468,15 +13469,15 @@ class kf extends Or {
         "text-size",
         o.z,
         c
-      ), C = s.layout.getDataValue(
+      ), T = s.layout.getDataValue(
         "text-anchor",
         o.z,
         c
-      ), _ = Ai(C), I = s.layout.getDataValue(
+      ), _ = zi(T), I = s.layout.getDataValue(
         "text-offset",
         o.z,
         c
-      ), F = s.convertColor(
+      ), k = s.convertColor(
         s.paint.getDataValue("text-color", o.z, c)
       ), P = s.convertColor(
         s.paint.getDataValue("text-halo-color", o.z, c)
@@ -13493,7 +13494,7 @@ class kf extends Or {
         y,
         x,
         b,
-        F,
+        k,
         G,
         P,
         I,
@@ -13504,7 +13505,7 @@ class kf extends Or {
           y,
           x,
           b,
-          F,
+          k,
           G,
           P,
           I,
@@ -13539,7 +13540,7 @@ class kf extends Or {
         l.outlineColorBytes[1],
         l.outlineColorBytes[2],
         l.outlineColorBytes[3]
-      ), f = Ai(l.textAnchor), d = new Cesium.Label({
+      ), f = zi(l.textAnchor), p = new Cesium.Label({
         position: Cesium.Cartesian3.fromDegrees(l.coord[0], l.coord[1]),
         text: l.text,
         font: l.textSize + "px " + l.font,
@@ -13555,7 +13556,7 @@ class kf extends Or {
         horizontalOrigin: f.horizontal,
         verticalOrigin: f.vertical
       });
-      d.batchId = o.length, o.push(d), t.labels.push(d);
+      p._baseFillColor = p.fillColor.clone(), p._baseOutlineColor = p.outlineColor.clone(), p.vtAlpha = 0, p.batchId = o.length, o.push(p), t.labels.push(p);
     }
     this.layers.push(t);
   }
@@ -13574,7 +13575,19 @@ class kf extends Or {
       if (!this.primitive && this.labels?.length && this.createPrimitive(), this.primitive) {
         this.commandList.length = 0;
         const r = e.commandList;
-        e.commandList = this.commandList, this.primitive.update(e), e.commandList = r, this.state === "none" && r.length > 0 && this.setState("done"), this.primitive._state === Cesium.PrimitiveState.FAILED && this.setState("error");
+        e.commandList = this.commandList, this.primitive.update(e), e.commandList = r;
+        for (const i of this.labels) {
+          const s = i._glyphs;
+          if (s) {
+            let o = i.text, a = [], l = [], u = !1;
+            for (let c = 0; c < s.length; c++) {
+              const f = s[c], p = f.dimensions;
+              p && isFinite(p.width) && isFinite(p.height) ? (l.push(o[c]), a.push(f)) : u = !0;
+            }
+            u && (i._glyphs = a, i.text = l.join(""));
+          }
+        }
+        this.state === "none" && r.length > 0 && this.setState("done"), this.primitive._state === Cesium.PrimitiveState.FAILED && this.setState("error");
       } else this.state === "none" && this.labels.length === 0 && this.setState("done");
   }
   render(e, t) {
@@ -13583,7 +13596,22 @@ class kf extends Or {
     for (const s of i)
       for (let o = 0; o < s.labels.length; o++) {
         const a = s.style, l = t.zoom;
-        s.visibility === "none" || l < a.minzoom || l >= a.maxzoom ? s.labels[o].show = !1 : s.labels[o].show = !!s.labels[o].vtPlaceable;
+        if (s.visibility === "none" || l < a.minzoom || l >= a.maxzoom)
+          s.labels[o].show = !1;
+        else {
+          const u = s.labels[o];
+          u._baseFillColor || (u._baseFillColor = u.fillColor.clone(), u._baseOutlineColor = u.outlineColor.clone(), u.vtAlpha == null && (u.vtAlpha = u.vtPlaceable ? 1 : 0));
+          const c = u.vtPlaceable ? 1 : 0;
+          u.vtAlpha = Cesium.Math.lerp(
+            u.vtAlpha ?? 0,
+            c,
+            Ff
+          ), u.vtAlpha < 1e-3 ? (u.vtAlpha = 0, u.show = !1) : (u.show = !0, u.fillColor = u._baseFillColor.withAlpha(
+            u._baseFillColor.alpha * u.vtAlpha
+          ), u.outlineColor = u._baseOutlineColor.withAlpha(
+            u._baseOutlineColor.alpha * u.vtAlpha
+          ));
+        }
       }
     for (const s of this.labels)
       s.show && (s.show = !this.isOccluded(r, s.position));
@@ -13601,7 +13629,7 @@ class kf extends Or {
     return !1;
   }
 }
-function Ai(n) {
+function zi(n) {
   let e = Cesium.HorizontalOrigin.CENTER, t = Cesium.VerticalOrigin.CENTER;
   switch (n) {
     case "left":
@@ -13634,7 +13662,7 @@ function Ai(n) {
     vertical: t
   };
 }
-class Ff extends yn {
+class Pf extends yn {
   /**
    * @param {MVT.VectorTileFeature[]} sourceFeatures
    * @param {StyleLayer} style
@@ -13651,27 +13679,27 @@ class Ff extends yn {
     super.update(e, t);
   }
 }
-mn("symbol", Ff, kf);
-const Mf = "cvt-gl-worker.js";
+mn("symbol", Pf, kf);
+const Of = "cvt-gl-worker.js";
 export {
   _f as BackgroundRenderLayer,
-  Mf as DEFAULT_WORKER_FILENAME,
+  Of as DEFAULT_WORKER_FILENAME,
   Sf as FillRenderLayer,
   wl as GeoJSONSource,
   Or as ILayerVisualizer,
   yn as IRenderLayer,
-  Fi as ISource,
+  ki as ISource,
   rt as LayerVisualizers,
-  Af as LineRenderLayer,
+  zf as LineRenderLayer,
   nt as RenderLayers,
   Pi as Sources,
   Bc as StyleLayer,
   xi as StyleLayerProperties,
-  Ff as SymbolRenderLayer,
+  Pf as SymbolRenderLayer,
   sl as VectorSource,
   Mr as VectorTileLOD,
   Rc as VectorTileRenderList,
-  Pf as VectorTileset,
+  Mf as VectorTileset,
   mn as registerRenderLayer,
   Mi as registerSource
 };