@maptalks/vt 0.105.1 → 0.105.3

package/dist/maptalks.vt.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/vt v0.105.1
+ * @maptalks/vt v0.105.3
  * LICENSE : undefined
  * (c) 2016-2025 maptalks.org
  */
@@ -395,10 +395,10 @@
                 height: h
             };
         }
-        function S(e, t) {
+        function M(e, t) {
             return t < 1 / 0 && (e.x < 0 || e.x > t || e.y < 0 || e.y > t);
         }
-        function M(e) {
+        function S(e) {
             return null == e;
         }
         function P(e, t, n) {
@@ -1065,7 +1065,7 @@
         };
         var Te = le.exports, we = {
             exports: {}
-        }, Se = {
+        }, Me = {
             aliceblue: [ 240, 248, 255 ],
             antiquewhite: [ 250, 235, 215 ],
             aqua: [ 0, 255, 255 ],
@@ -1214,8 +1214,8 @@
             whitesmoke: [ 245, 245, 245 ],
             yellow: [ 255, 255, 0 ],
             yellowgreen: [ 154, 205, 50 ]
-        }, Me = {};
-        for (var Pe in Se) Se.hasOwnProperty(Pe) && (Me[Se[Pe]] = Pe);
+        }, Se = {};
+        for (var Pe in Me) Me.hasOwnProperty(Pe) && (Se[Me[Pe]] = Pe);
         var Ie = we.exports = {
             rgb: {
                 channels: 3,
@@ -1306,16 +1306,16 @@
             var t, n = e[0] / 255, i = e[1] / 255, r = e[2] / 255;
             return [ 100 * ((1 - n - (t = Math.min(1 - n, 1 - i, 1 - r))) / (1 - t) || 0), 100 * ((1 - i - t) / (1 - t) || 0), 100 * ((1 - r - t) / (1 - t) || 0), 100 * t ];
         }, Ie.rgb.keyword = function(e) {
-            var t = Me[e];
+            var t = Se[e];
             if (t) return t;
             var n, i, r, s = 1 / 0;
-            for (var o in Se) if (Se.hasOwnProperty(o)) {
-                var a = (i = e, r = Se[o], Math.pow(i[0] - r[0], 2) + Math.pow(i[1] - r[1], 2) + Math.pow(i[2] - r[2], 2));
+            for (var o in Me) if (Me.hasOwnProperty(o)) {
+                var a = (i = e, r = Me[o], Math.pow(i[0] - r[0], 2) + Math.pow(i[1] - r[1], 2) + Math.pow(i[2] - r[2], 2));
                 a < s && (s = a, n = o);
             }
             return n;
         }, Ie.keyword.rgb = function(e) {
-            return Se[e];
+            return Me[e];
         }, Ie.rgb.xyz = function(e) {
             var t = e[0] / 255, n = e[1] / 255, i = e[2] / 255;
             return [ 100 * (.4124 * (t = t > .04045 ? Math.pow((t + .055) / 1.055, 2.4) : t / 12.92) + .3576 * (n = n > .04045 ? Math.pow((n + .055) / 1.055, 2.4) : n / 12.92) + .1805 * (i = i > .04045 ? Math.pow((i + .055) / 1.055, 2.4) : i / 12.92)), 100 * (.2126 * t + .7152 * n + .0722 * i), 100 * (.0193 * t + .1192 * n + .9505 * i) ];
@@ -1995,7 +1995,7 @@
             if (!e) return "true";
             const t = e[0];
             if (e.length <= 1) return "any" === t ? "false" : "true";
-            const n = "==" === t ? bt(e[1], e[2], "===", !1) : "!=" === t ? bt(e[1], e[2], "!==", !1) : "<" === t || ">" === t || "<=" === t || ">=" === t ? bt(e[1], e[2], t, !0) : "any" === t ? Tt(e.slice(1), "||") : "all" === t ? Tt(e.slice(1), "&&") : "none" === t ? Mt(Tt(e.slice(1), "||")) : "in" === t ? wt(e[1], e.slice(2)) : "!in" === t ? Mt(wt(e[1], e.slice(2))) : "has" === t ? St(e[1]) : "!has" === t ? Mt(St(e[1])) : "contains" === t ? function(e, t, n) {
+            const n = "==" === t ? bt(e[1], e[2], "===", !1) : "!=" === t ? bt(e[1], e[2], "!==", !1) : "<" === t || ">" === t || "<=" === t || ">=" === t ? bt(e[1], e[2], t, !0) : "any" === t ? Tt(e.slice(1), "||") : "all" === t ? Tt(e.slice(1), "&&") : "none" === t ? St(Tt(e.slice(1), "||")) : "in" === t ? wt(e[1], e.slice(2)) : "!in" === t ? St(wt(e[1], e.slice(2))) : "has" === t ? Mt(e[1]) : "!has" === t ? St(Mt(e[1])) : "contains" === t ? function(e, t, n) {
                 const i = vt(e);
                 return void 0 !== n ? `(${i} + '').indexOf("${t}") === ${n}` : `(${i} + '').indexOf("${t}") >= 0`;
             }(e[1], e[2], e[3]) : "true";
@@ -2025,10 +2025,10 @@
             const n = JSON.stringify(t.sort(Pt)), i = vt(e);
             return t.length <= 200 ? `${n}.indexOf(${i}) !== -1` : `function(v, a, i, j) {\n        while (i <= j) { var m = (i + j) >> 1;\n            if (a[m] === v) return true; if (a[m] > v) j = m - 1; else i = m + 1;\n        }\n    return false; }(${i}, ${n},0,${t.length - 1})`;
         }
-        function St(e) {
+        function Mt(e) {
             return "$id" === e ? '"id" in f' : `${JSON.stringify(e)} in p`;
         }
-        function Mt(e) {
+        function St(e) {
             return `!(${e})`;
         }
         function Pt(e, t) {
@@ -2078,10 +2078,10 @@
                         t + _(e);
                     })).join("");
                 }
-                function S(e, t) {
+                function M(e, t) {
                     return e + 22 + 75 * (e < 26) - ((0 != t) << 5);
                 }
-                function M(e, t, n) {
+                function S(e, t, n) {
                     var i = 0;
                     for (e = n ? x(e / f) : e >> 1, e += x(e / t); e > y * c >> 1; i += h) e = x(e / y);
                     return x(i + (y + 1) * e / (e + u));
@@ -2094,7 +2094,7 @@
                         for (s = y, o = 1, a = h; r >= m && v("invalid-input"), ((u = (p = e.charCodeAt(r++)) - 48 < 10 ? p - 22 : p - 65 < 26 ? p - 65 : p - 97 < 26 ? p - 97 : h) >= h || u > x((l - y) / o)) && v("overflow"), 
                         y += u * o, !(u < (f = a <= b ? 1 : a >= b + c ? c : a - b)); a += h) o > x(l / (d = h - f)) && v("overflow"), 
                         o *= d;
-                        b = M(y - s, t = g.length + 1, 0 == s), x(y / t) > l - _ && v("overflow"), _ += x(y / t), 
+                        b = S(y - s, t = g.length + 1, 0 == s), x(y / t) > l - _ && v("overflow"), _ += x(y / t), 
                         y %= t, g.splice(y++, 0, _);
                     }
                     return w(g);
@@ -2107,8 +2107,8 @@
                         for (a - t > x((l - n) / (m = i + 1)) && v("overflow"), n += (a - t) * m, t = a, 
                         o = 0; o < g; ++o) if ((p = e[o]) < t && ++n > l && v("overflow"), p == t) {
                             for (u = n, f = h; !(u < (d = f <= s ? 1 : f >= s + c ? c : f - s)); f += h) b = u - d, 
-                            y = h - d, A.push(_(S(d + b % y, 0))), u = x(b / y);
-                            A.push(_(S(u, 0))), s = M(n, m, i == r), n = 0, ++i;
+                            y = h - d, A.push(_(M(d + b % y, 0))), u = x(b / y);
+                            A.push(_(M(u, 0))), s = S(n, m, i == r), n = 0, ++i;
                         }
                         ++n, ++t;
                     }
@@ -2807,8 +2807,8 @@
                 })), e;
             }
         }
-        var Sn = wn;
-        const Mn = [ "Unknown", "Point", "LineString", "Polygon" ];
+        var Mn = wn;
+        const Sn = [ "Unknown", "Point", "LineString", "Polygon" ];
         var Pn = class {
             constructor() {
                 this.globals = null, this.feature = null, this.featureState = null, this.formattedSection = null, 
@@ -2819,7 +2819,7 @@
                 return this.feature && void 0 !== this.feature.id ? this.feature.id : null;
             }
             geometryType() {
-                return this.feature ? "number" == typeof this.feature.type ? Mn[this.feature.type] : this.feature.type : null;
+                return this.feature ? "number" == typeof this.feature.type ? Sn[this.feature.type] : this.feature.type : null;
             }
             geometry() {
                 return this.feature && "geometry" in this.feature ? this.feature.geometry : null;
@@ -3165,7 +3165,7 @@
             }
             _parse(e, t) {
                 function n(e, t, n) {
-                    return "assert" === n ? new vn(t, [ e ]) : "coerce" === n ? new Sn(t, [ e ]) : e;
+                    return "assert" === n ? new vn(t, [ e ]) : "coerce" === n ? new Mn(t, [ e ]) : e;
                 }
                 if (null !== e && "string" != typeof e && "boolean" != typeof e && "number" != typeof e || (e = [ "literal", e ]), 
                 Array.isArray(e)) {
@@ -3216,7 +3216,7 @@
             if (e instanceof Cn && "error" === e.name) return !1;
             if (e instanceof kn) return !1;
             if (e instanceof qn) return !1;
-            const t = e instanceof Sn || e instanceof vn;
+            const t = e instanceof Mn || e instanceof vn;
             let n = !0;
             return e.eachChild((e => {
                 n = t ? n && ii(e) : n && e instanceof mn;
@@ -3352,11 +3352,11 @@
             let t = (e.l + 16) / 116, n = isNaN(e.a) ? t : t + e.a / 500, i = isNaN(e.b) ? t : t - e.b / 200;
             return t = 1 * vi(t), n = ui * vi(n), i = fi * vi(i), new on(bi(3.2404542 * n - 1.5371385 * t - .4985314 * i), bi(-.969266 * n + 1.8760108 * t + .041556 * i), bi(.0556434 * n - .2040259 * t + 1.0572252 * i), e.alpha);
         }
-        function Si(e, t, n) {
+        function Mi(e, t, n) {
             const i = t - e;
             return e + n * (i > 180 || i < -180 ? i - 360 * Math.round(i / 360) : i);
         }
-        const Mi = {
+        const Si = {
             forward: Ti,
             reverse: wi,
             interpolate: function(e, t, n) {
@@ -3388,7 +3388,7 @@
             },
             interpolate: function(e, t, n) {
                 return {
-                    h: Si(e.h, t.h, n),
+                    h: Mi(e.h, t.h, n),
                     c: hi(e.c, t.c, n),
                     l: hi(e.l, t.l, n),
                     alpha: hi(e.alpha, t.alpha, n)
@@ -3397,7 +3397,7 @@
         };
         var Ii = Object.freeze({
             __proto__: null,
-            lab: Mi,
+            lab: Si,
             hcl: Pi
         });
         class Ci {
@@ -3461,7 +3461,7 @@
                 const r = t.length;
                 if (i >= t[r - 1]) return n[r - 1].evaluate(e);
                 const s = ri(t, i), o = t[s], a = t[s + 1], l = Ci.interpolationFactor(this.interpolation, i, o, a), h = n[s].evaluate(e), c = n[s + 1].evaluate(e);
-                return "interpolate" === this.operator ? ci[this.type.kind.toLowerCase()](h, c, l) : "interpolate-hcl" === this.operator ? Pi.reverse(Pi.interpolate(Pi.forward(h), Pi.forward(c), l)) : Mi.reverse(Mi.interpolate(Mi.forward(h), Mi.forward(c), l));
+                return "interpolate" === this.operator ? ci[this.type.kind.toLowerCase()](h, c, l) : "interpolate-hcl" === this.operator ? Pi.reverse(Pi.interpolate(Pi.forward(h), Pi.forward(c), l)) : Si.reverse(Si.interpolate(Si.forward(h), Si.forward(c), l));
             }
             eachChild(e) {
                 e(this.input);
@@ -3978,10 +3978,10 @@
             slice: Yi,
             step: oi,
             string: vn,
-            "to-boolean": Sn,
-            "to-color": Sn,
-            "to-number": Sn,
-            "to-string": Sn,
+            "to-boolean": Mn,
+            "to-color": Mn,
+            "to-number": Mn,
+            "to-string": Mn,
             var: ei,
             within: qn
         };
@@ -4304,7 +4304,7 @@
         function wr(e) {
             return Array.isArray(e) && e.length > 0 && "string" == typeof e[0] && e[0] in cr;
         }
-        function Sr(e, t) {
+        function Mr(e, t) {
             const n = new ni(cr, [], t ? function(e) {
                 const t = {
                     color: zt,
@@ -4321,7 +4321,7 @@
             } : void 0);
             return i ? ur(new Tr(i, t)) : fr(n.errors);
         }
-        class Mr {
+        class Sr {
             constructor(e, t) {
                 this.kind = e, this._styleExpression = t, this.isStateDependent = "constant" !== e && !Jn(t.expression);
             }
@@ -4348,7 +4348,7 @@
             }
         }
         function Ir(e, t) {
-            if ("error" === (e = Sr(e, t)).result) return e;
+            if ("error" === (e = Mr(e, t)).result) return e;
             const n = e.value.expression, i = $n(n);
             if (!i && !function(e) {
                 return "data-driven" === e["property-type"];
@@ -4361,7 +4361,7 @@
             if (!s && !r) return fr([ new Ft("", '"zoom" expression may only be used as input to a top-level "step" or "interpolate" expression.') ]);
             if (s instanceof Ft) return fr([ s ]);
             if (s instanceof Oi && !dr(t)) return fr([ new Ft("", '"interpolate" expressions cannot be used with this property') ]);
-            if (!s) return ur(new Mr(i ? "constant" : "source", e.value));
+            if (!s) return ur(new Sr(i ? "constant" : "source", e.value));
             const o = s instanceof Oi ? s.interpolation : void 0;
             return ur(new Pr(i ? "camera" : "composite", e.value, s.labels, o));
         }
@@ -4417,13 +4417,13 @@
             } catch (e) {
                 console.warn(`Failed to extract static filter. Filter will continue working, but at higher memory usage and slower framerate.\nThis is most likely a bug, please report this via https://github.com/mapbox/mapbox-gl-js/issues/new?assignees=&labels=&template=Bug_report.md\nand paste the contents of this message in the report.\nThank you!\nFilter Expression:\n${JSON.stringify(n, null, 2)}\n        `);
             }
-            const r = Sr(i, null);
+            const r = Mr(i, null);
             let s = null;
             if ("error" === r.result) throw new Error(r.value.map((e => `${e.key}: ${e.message}`)).join(", "));
             s = (e, t, n) => r.value.evaluate(e, t, {}, n);
             let o = null, a = null;
             if (i !== n) {
-                const e = Sr(n, null);
+                const e = Mr(n, null);
                 if ("error" === e.result) throw new Error(e.value.map((e => `${e.key}: ${e.message}`)).join(", "));
                 o = (t, n, i, r, s) => e.value.evaluate(t, n, {}, i, void 0, void 0, r, s), a = !$n(e.value.expression);
             }
@@ -4509,7 +4509,7 @@
                     return !0;
                 }
             },
-            createExpression: Sr,
+            createExpression: Mr,
             createPropertyExpression: Ir,
             normalizePropertyExpression: function(e, t) {
                 if (gr(e)) return new Cr(e, t);
@@ -4526,7 +4526,7 @@
                     };
                 }
             },
-            ZoomConstantExpression: Mr,
+            ZoomConstantExpression: Sr,
             ZoomDependentExpression: Pr,
             StylePropertyFunction: Cr
         }, {isExpression: zr, createExpression: Vr} = Nr, Ur = {};
@@ -5163,14 +5163,14 @@
             return e || "Open Sans Regular";
         }
         const ws = /\{[\w-]+(?:\|[\w-]+)*\}/g;
-        function Ss(e, t) {
+        function Ms(e, t) {
             if (!et(e)) return e;
             function n(e) {
                 if (!t) return As;
                 const n = t[e];
                 return Je(n) ? As : Array.isArray(n) ? n.join() : n;
             }
-            const [i, r] = bs, s = Ms(e);
+            const [i, r] = bs, s = Ss(e);
             for (let t = 0, o = s.length; t < o; t++) {
                 const o = s[t], a = `${i}${o}${r}`;
                 if (o.indexOf("|") > 0) {
@@ -5188,7 +5188,7 @@
             }
             return e;
         }
-        function Ms(e) {
+        function Ss(e) {
             e += As;
             const [t, n] = bs, i = [];
             let r = !1, s = As;
@@ -5213,7 +5213,7 @@
             resolveExpVarNames: function e(t, n) {
                 if (2 !== n.length || "get" !== n[0]) for (let i = 0; i < n.length; i++) 2 === n[i].length && "get" === n[i][0] ? t.push(n[i][1]) : Array.isArray(n[i]) && e(t, n[i]); else t.push(n[1]);
             },
-            resolveText: Ss,
+            resolveText: Ms,
             resolveText_bak: function(e, t) {
                 return et(e) ? e.replace(ws, (function(e) {
                     if (!t) return "";
@@ -5232,7 +5232,7 @@
             resolveVarNames: function(e) {
                 return e.match(ws);
             },
-            templateKeys: Ms
+            templateKeys: Ss
         });
         const Cs = {
             "Latin-1 Supplement": e => e >= 128 && e <= 255,
@@ -5621,9 +5621,9 @@
             }
             getIconAndGlyph() {
                 if (this.iconGlyph) return this.iconGlyph;
-                const {markerFileFn: e, markerTypeFn: t, markerPathFn: n, markerWidthFn: i, markerHeightFn: r, markerFillFn: s, markerFillPatternFileFn: o, markerFillOpacityFn: a, markerTextFitFn: l, markerTextFitPaddingFn: h, markerLineColorFn: c, markerLineWidthFn: u, markerLineOpacityFn: f, markerLineDasharrayFn: d, markerLinePatternFileFn: p, markerPathWidthFn: g, markerPathHeightFn: m, textNameFn: y, textFaceNameFn: x} = this._fnTypes, {zoom: _} = this.options, v = {}, b = this.symbol, A = this.symbolDef, T = this.feature.properties, w = e ? e(null, T) : b.markerFile, S = t ? t(null, T) : b.markerType, M = w || S || b.markerPath, P = !Je(this.symbolDef.textName);
+                const {markerFileFn: e, markerTypeFn: t, markerPathFn: n, markerWidthFn: i, markerHeightFn: r, markerFillFn: s, markerFillPatternFileFn: o, markerFillOpacityFn: a, markerTextFitFn: l, markerTextFitPaddingFn: h, markerLineColorFn: c, markerLineWidthFn: u, markerLineOpacityFn: f, markerLineDasharrayFn: d, markerLinePatternFileFn: p, markerPathWidthFn: g, markerPathHeightFn: m, textNameFn: y, textFaceNameFn: x} = this._fnTypes, {zoom: _} = this.options, v = {}, b = this.symbol, A = this.symbolDef, T = this.feature.properties, w = e ? e(null, T) : b.markerFile, M = t ? t(null, T) : b.markerType, S = w || M || b.markerPath, P = !Je(this.symbolDef.textName);
                 let I, C;
-                if (M) {
+                if (S) {
                     I = function(e, t, n, i, r, s) {
                         if (Je(t.markerWidth) && Je(t.markerHeight)) return null;
                         const o = "__fn_markerWidth".trim(), a = "__fn_markerHeight".trim();
@@ -5638,7 +5638,7 @@
                         const t = A.textSize;
                         let n = A.textName;
                         ie(n) && (n = re(n)(_, T));
-                        const i = Ss(n, T);
+                        const i = Ms(n, T);
                         if (i) {
                             const n = "__fn_textSize".trim(), r = "__fn_textSize_0".trim();
                             ie(t) && !A[n] && (A[r] = re(t), A[n] = (e, t) => {
@@ -5656,11 +5656,11 @@
                 }
                 if (P && (C = _s(b, this.symbolDef, T, _)), !C && !I) return v;
                 if (I && (I[0] = Math.ceil(I[0]), I[1] = Math.ceil(I[1])), C && (C[0] = Math.ceil(C[0]), 
-                C[1] = Math.ceil(C[1])), this.iconSize = I, this.textSize = C, M && I[0] >= 0 && I[1] >= 0) {
+                C[1] = Math.ceil(C[1])), this.iconSize = I, this.textSize = C, S && I[0] >= 0 && I[1] >= 0) {
                     let e;
-                    if (S) {
+                    if (M) {
                         const t = {};
-                        if (t.markerType = S, "path" === S && (t.markerPath = n ? n(null, T) : b.markerPath, 
+                        if (t.markerType = M, "path" === M && (t.markerPath = n ? n(null, T) : b.markerPath, 
                         t.markerPathWidth = g ? g(null, T) : b.markerPathWidth, t.markerPathHeight = m ? m(null, T) : b.markerPathHeight), 
                         i) {
                             const e = i(null, T);
@@ -5756,7 +5756,7 @@
                     const e = y ? y(this.options.zoom, T) : b.textName;
                     if (e || 0 === e) {
                         const t = Ts(x ? x(null, T) : b.textFaceName);
-                        let n = Ss(e, T);
+                        let n = Ms(e, T);
                         n && n.length && (n = qs(n), v.glyph = {
                             font: t,
                             text: n
@@ -6036,37 +6036,37 @@
                     const a = o[e];
                     if ("vertex" === t) for (let e = 0; e < a.length; e++) {
                         const t = a[e];
-                        for (let o = 0; o < t.length; o++) S(t[o], n) || (s.push(t[o]), i && (0 === o ? xo(t[o], t[o], t[e + 1], r) : xo(t[o], t[o - 1], t[o], r)));
+                        for (let o = 0; o < t.length; o++) M(t[o], n) || (s.push(t[o]), i && (0 === o ? xo(t[o], t[o], t[e + 1], r) : xo(t[o], t[o - 1], t[o], r)));
                     } else if ("vertex-first" === t) {
                         const e = a[0];
-                        e && e[0] && !S(e[0], n) && (s.push(e[0]), i && xo(e[0], e[0], e[1], r));
+                        e && e[0] && !M(e[0], n) && (s.push(e[0]), i && xo(e[0], e[0], e[1], r));
                     } else if ("vertex-last" === t || "vertex-firstlast" === t) {
                         const e = a[0];
-                        if ("vertex-firstlast" === t && e && e[0] && !S(e[0], n) && (s.push(e[0]), i && xo(e[0], e[0], e[1], r)), 
-                        e && e[e.length - 1] && !S(e[e.length - 1], n)) {
+                        if ("vertex-firstlast" === t && e && e[0] && !M(e[0], n) && (s.push(e[0]), i && xo(e[0], e[0], e[1], r)), 
+                        e && e[e.length - 1] && !M(e[e.length - 1], n)) {
                             const t = e.length - 1;
                             s.push(e[t]), i && xo(e[t], e[t - 1], e[t], r);
                         }
                     } else {
                         const e = fo(a, 16);
-                        S(e, n) || s.push(e);
+                        M(e, n) || s.push(e);
                     }
                 }
             } else if (2 === e.type) for (let o = 0; o < e.geometry.length; o++) {
                 const a = e.geometry[o];
-                if ("vertex" === t) for (let e = 0; e < a.length; e++) S(a[e], n) || (s.push(a[e]), 
+                if ("vertex" === t) for (let e = 0; e < a.length; e++) M(a[e], n) || (s.push(a[e]), 
                 i && (0 === e ? xo(a[e], a[e], a[e + 1], r) : xo(a[e], a[e - 1], a[e], r))); else if ("vertex-last" === t || "vertex-firstlast" === t) {
-                    if ("vertex-firstlast" !== t || S(a[0], n) || (s.push(a[0]), i && xo(a[0], a[0], a[1], r)), 
-                    a && a[a.length - 1] && !S(a[a.length - 1], n)) {
+                    if ("vertex-firstlast" !== t || M(a[0], n) || (s.push(a[0]), i && xo(a[0], a[0], a[1], r)), 
+                    a && a[a.length - 1] && !M(a[a.length - 1], n)) {
                         const e = a.length - 1;
                         s.push(a[e]), i && xo(a[e], a[e - 1], a[e], r);
                     }
-                } else S(a[0], n) || (s.push(a[0]), i && xo(a[0], a[0], a[1], r));
+                } else M(a[0], n) || (s.push(a[0]), i && xo(a[0], a[0], a[1], r));
             } else if (1 === e.type) for (let t = 0; t < e.geometry.length; t++) {
                 const r = e.geometry[t];
                 for (let e = 0; e < r.length; e++) {
                     const t = r[e];
-                    S(t, n) || (i && (t.xRotation = 0, t.yRotation = 0, t.zRotation = 0), s.push(t));
+                    M(t, n) || (i && (t.xRotation = 0, t.yRotation = 0, t.zRotation = 0), s.push(t));
                 }
             }
             return s;
@@ -6119,7 +6119,7 @@
             const r = (vo + "").trim(), s = function(e, t, n, i) {
                 const r = (vo + "").trim(), {mergeOnPropertyFn: s} = n;
                 if (!t.mergeOnProperty) return [];
-                if (!M(o = t.mergeOnProperty) && ("string" == typeof o || null !== o.constructor && o.constructor === String)) return [ {
+                if (!S(o = t.mergeOnProperty) && ("string" == typeof o || null !== o.constructor && o.constructor === String)) return [ {
                     features: e,
                     property: t.mergeOnProperty
                 } ];
@@ -6130,7 +6130,7 @@
                     const o = e[n].properties = e[n].properties || {};
                     o.$layer = e[n].layer, o.$type = e[n].type;
                     const c = s ? s(i, o) : t.mergeOnProperty;
-                    M(c) ? h.push(e[n]) : (void 0 === l[c] && (l[c] = a.length, a.push({
+                    S(c) ? h.push(e[n]) : (void 0 === l[c] && (l[c] = a.length, a.push({
                         features: [],
                         property: c
                     })), a[l[c]].features.push(e[n]));
@@ -6295,12 +6295,16 @@
                     name: "aMarkerDy"
                 }), o;
             }
+            _prepareFnTypes() {
+                this.iconAtlas || (this._fnTypes.markerWidthFn = this._fnTypes.markerHeightFn = this._fnTypes.markerDxFn = this._fnTypes.markerDyFn = this._fnTypes.markerPitchAlignmentFn = this._fnTypes.markerRotationAlignmentFn = this._fnTypes.markerRotationFn = this._fnTypes.markerAllowOverlapFn = this._fnTypes.markerIgnorePlacementFn = this._fnTypes.markerOpacityFn = null), 
+                this.glyphAtlas || (this._fnTypes.textFillFn = this._fnTypes.textSizeFn = this._fnTypes.textHaloFillFn = this._fnTypes.textHaloRadiusFn = this._fnTypes.textHaloOpacityFn = this._fnTypes.textDxFn = this._fnTypes.textDyFn = this._fnTypes.textPitchAlignmentFn = this._fnTypes.textRotationAlignmentFn = this._fnTypes.textRotationFn = this._fnTypes.textAllowOverlapFn = this._fnTypes.textIgnorePlacementFn = this._fnTypes.textOpacityFn = null);
+            }
             createDataPack() {
                 if (!this.iconAtlas && !this.glyphAtlas) {
                     if (!this.options.allowEmptyPack) return null;
                     this.empty = !0;
                 }
-                this.countOutOfAngle = 0, this.lineVertex = [];
+                this._prepareFnTypes(), this.countOutOfAngle = 0, this.lineVertex = [];
                 const e = super.createDataPack.apply(this, arguments);
                 return e ? (e.lineVertex = new Int16Array(this.lineVertex), e.buffers.push(e.lineVertex.buffer), 
                 e) : null;
@@ -6348,7 +6352,7 @@
                         }
                         return r;
                     }(r.horizontal, p, this.glyphAtlas.positions[t]), x && ($ = x(null, d), ie($) ? this.dynamicAttrs.aTextFill = 1 : $ = ht([], $)), 
-                    _ && (J = _(this.options.zoom, d), M(J) && (J = 14)), v && (K = v(null, d), ie(K) ? this.dynamicAttrs.aTextHaloFill = 1 : K = ht([], K)), 
+                    _ && (J = _(this.options.zoom, d), S(J) && (J = 14)), v && (K = v(null, d), ie(K) ? this.dynamicAttrs.aTextHaloFill = 1 : K = ht([], K)), 
                     b && (Q = b(null, d)), A && (ee = 255 * A(null, d)), T && (te = T(null, d) || 0), 
                     I && (ne = I(null, d) || 0), C && (he = +("map" === C(null, d))), k && (ue = +("map" === k(null, d))), 
                     O && (de = P(O(null, d), 0, 360) * Math.PI / 180);
@@ -6386,8 +6390,8 @@
                         writingMode: void 0,
                         glyphOffset: [ 0, 0 ]
                     } ];
-                }(), D && (re = D(null, d)), M(re) && (re = Z[0].tex.w), L && (se = L(null, d)), 
-                M(se) && (se = Z[0].tex.h), H && (oe = H(null, d)), N && (ae = N(null, d)), z && (le = +("map" === z(null, d))), 
+                }(), D && (re = D(null, d)), S(re) && (re = Z[0].tex.w), L && (se = L(null, d)), 
+                S(se) && (se = Z[0].tex.h), H && (oe = H(null, d)), N && (ae = N(null, d)), z && (le = +("map" === z(null, d))), 
                 V && (ce = +("map" === V(null, d))), U && (fe = P(U(null, d), 0, 360) * Math.PI / 180)), 
                 ie(J) && (this.dynamicAttrs.aTextSize = 1), (ie(Q) || ie(ee)) && (this.dynamicAttrs.aTextHalo = 1), 
                 ie(re) && (this.dynamicAttrs.aMarkerWidth = 1), ie(se) && (this.dynamicAttrs.aMarkerHeight = 1), 
@@ -6400,11 +6404,12 @@
                 E && (pe = 255 * (E(this.options.zoom, d) || 0));
                 const ge = Y && Y.length || 0;
                 this.ensureDataCapacity(4 * (ge + (Z && Z.length || 0)), l.length);
-                const me = this.options.EXTENT, {altitudeScale: ye, altitudeProperty: xe, defaultAltitude: _e} = this.options, {altitude: ve} = w(e.feature, ye, xe, _e), be = (e, t, n, i, r, s, o) => {
+                const me = this.options.EXTENT, {altitudeScale: ye, altitudeProperty: xe, defaultAltitude: _e} = this.options, {altitude: ve} = w(e.feature, ye, xe, _e), be = this.needAltitudeAttribute(), Ae = (e, t, n, i, r, s, o) => {
                     if (!t) return;
                     const a = e ? ge : 1;
                     for (let l = 0; l < t.length; l++) {
                         const c = t[l], {tl: f, tr: d, bl: g, br: m, tex: x} = c;
+                        let _;
                         this._fillPos(h, n, i, r, 10 * f.x, 10 * f.y, x.x, x.y + x.h, e, o), this._fillTextData(h, p, a, c.glyphOffset, s, y, s.axis, s.angleR), 
                         this._fillFnTypeData(h, $, J, K, Q, ee, te, ne, re, se, oe, ae, q, pe, le, he, ce, ue, fe, de, W, X), 
                         this._fillPos(h, n, i, r, 10 * d.x, 10 * d.y, x.x + x.w, x.y + x.h, e, o), this._fillTextData(h, p, a, c.glyphOffset, s, y, s.axis, s.angleR), 
@@ -6413,16 +6418,16 @@
                         this._fillFnTypeData(h, $, J, K, Q, ee, te, ne, re, se, oe, ae, q, pe, le, he, ce, ue, fe, de, W, X), 
                         this._fillPos(h, n, i, r, 10 * m.x, 10 * m.y, x.x + x.w, x.y, e, o), this._fillTextData(h, p, a, c.glyphOffset, s, y, s.axis, s.angleR), 
                         this._fillFnTypeData(h, $, J, K, Q, ee, te, ne, re, se, oe, ae, q, pe, le, he, ce, ue, fe, de, W, X), 
-                        this.addElements(u, u + 1, u + 2), this.addElements(u + 1, u + 2, u + 3), u += 4;
-                        const _ = Math.max(Math.abs(n), Math.abs(i), Math.abs(r));
+                        this.addElements(u, u + 1, u + 2), this.addElements(u + 1, u + 2, u + 3), u += 4, 
+                        _ = be ? Math.max(Math.abs(n), Math.abs(i)) : Math.max(Math.abs(n), Math.abs(i), Math.abs(r)), 
                         _ > this.maxPos && (this.maxPos = _);
                     }
-                }, Ae = "text" === this.options.pluginType;
+                }, Te = "text" === this.options.pluginType;
                 for (let e = 0; e < l.length; e++) {
                     const t = l[e], n = t.z || ve || 0;
-                    if (me !== 1 / 0 && S(t, me)) continue;
+                    if (me !== 1 / 0 && M(t, me)) continue;
                     const i = t.x, r = t.y;
-                    m && be(!1, Z, i, r, n, t), g && (Ae || be(!0, Y, i, r, n, t, !0), be(!0, Y, i, r, n, t, !1));
+                    m && Ae(!1, Z, i, r, n, t), g && (Te || Ae(!0, Y, i, r, n, t, !0), Ae(!0, Y, i, r, n, t, !1));
                 }
             }
             _fillPos(e, t, n, i, r, s, o, a, l, h) {
@@ -6446,7 +6451,7 @@
                 }
             }
             _fillFnTypeData(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p, g, m, y, x, _, v, b) {
-                const {textFillFn: A, textSizeFn: T, textHaloFillFn: w, textHaloRadiusFn: S, textDxFn: P, textDyFn: I, textPitchAlignmentFn: C, textRotationAlignmentFn: k, textRotationFn: O, textAllowOverlapFn: F, textIgnorePlacementFn: R, textOpacityFn: E, textHaloOpacityFn: D, markerWidthFn: L, markerHeightFn: H, markerDxFn: N, markerDyFn: z, markerPitchAlignmentFn: V, markerRotationAlignmentFn: U, markerRotationFn: B, markerAllowOverlapFn: G, markerIgnorePlacementFn: j, markerOpacityFn: W} = this._fnTypes;
+                const {textFillFn: A, textSizeFn: T, textHaloFillFn: w, textHaloRadiusFn: M, textDxFn: P, textDyFn: I, textPitchAlignmentFn: C, textRotationAlignmentFn: k, textRotationFn: O, textAllowOverlapFn: F, textIgnorePlacementFn: R, textOpacityFn: E, textHaloOpacityFn: D, markerWidthFn: L, markerHeightFn: H, markerDxFn: N, markerDyFn: z, markerPitchAlignmentFn: V, markerRotationAlignmentFn: U, markerRotationFn: B, markerAllowOverlapFn: G, markerIgnorePlacementFn: j, markerOpacityFn: W} = this._fnTypes;
                 if (A) {
                     let n = e.aTextFill.currentIndex;
                     e.aTextFill[n++] = t[0], e.aTextFill[n++] = t[1], e.aTextFill[n++] = t[2], e.aTextFill[n++] = t[3], 
@@ -6461,10 +6466,10 @@
                     e.aTextHaloFill[t++] = i[0], e.aTextHaloFill[t++] = i[1], e.aTextHaloFill[t++] = i[2], 
                     e.aTextHaloFill[t++] = i[3], e.aTextHaloFill.currentIndex = t;
                 }
-                if (S || D) {
+                if (M || D) {
                     let t = e.aTextHalo.currentIndex;
                     e.aTextHalo[t++] = r || 0, e.aTextHalo.currentIndex = t, t = e.aTextHalo.currentIndex, 
-                    e.aTextHalo[t++] = 255 * (M(s) ? 1 : s), e.aTextHalo.currentIndex = t;
+                    e.aTextHalo[t++] = 255 * (S(s) ? 1 : s), e.aTextHalo.currentIndex = t;
                 }
                 if (P) {
                     let t = e.aTextDx.currentIndex;
@@ -6536,7 +6541,7 @@
             _getAnchors(e, t, n) {
                 const {feature: i, symbol: r} = e, s = this._getPlacement(e, r), o = i.properties, {markerSpacingFn: a, textSpacingFn: l, textMaxAngleFn: h} = this._fnTypes, c = ((a ? a(null, o) : r.markerSpacing) || (l ? l(null, o) : r.textSpacing) || 250) * n;
                 let u = h ? h(this.options.zoom, o) : r.textMaxAngle;
-                M(u) && (u = 80), u *= Math.PI / 180;
+                S(u) && (u = 80), u *= Math.PI / 180;
                 const f = this.options.EXTENT, d = this.options.altitudeToTileScale, p = this._is3DPitchText();
                 return mo(e, this.lineVertex, u, t, n, f, s, c, p, d);
             }
@@ -6662,8 +6667,8 @@
                 return Math.atan2(this.y - e.y, this.x - e.x);
             }
         }
-        var wo, So = "undefined" != typeof Float32Array ? Float32Array : Array;
-        function Mo(e, t, n, i) {
+        var wo, Mo = "undefined" != typeof Float32Array ? Float32Array : Array;
+        function So(e, t, n, i) {
             return e[0] = t, e[1] = n, e[2] = i, e;
         }
         function Po(e, t) {
@@ -6687,13 +6692,13 @@
         Math.hypot || (Math.hypot = function() {
             for (var e = 0, t = arguments.length; t--; ) e += arguments[t] * arguments[t];
             return Math.sqrt(e);
-        }), wo = new So(3), So != Float32Array && (wo[0] = 0, wo[1] = 0, wo[2] = 0), function() {
-            var e = new So(4);
-            So != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0, e[3] = 0);
+        }), wo = new Mo(3), Mo != Float32Array && (wo[0] = 0, wo[1] = 0, wo[2] = 0), function() {
+            var e = new Mo(4);
+            Mo != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0, e[3] = 0);
         }();
         !function() {
-            var e = new So(2);
-            So != Float32Array && (e[0] = 0, e[1] = 0);
+            var e = new Mo(2);
+            Mo != Float32Array && (e[0] = 0, e[1] = 0);
         }();
         const Fo = 63, Ro = Math.cos(Math.PI / 180 * 37.5), Eo = Math.pow(2, 16) / 1, Do = new s, Lo = new s, Ho = new s;
         class No extends gs {
@@ -6901,22 +6906,22 @@
                             t.z = p.z, this.updateDistance(g, t), this.addCurrentVertex(t, y, 0, 0, d), g = t;
                         }
                     }
-                    const S = g && m;
-                    d.middleVertex = S;
-                    let M = S ? n : h ? "butt" : i;
-                    if (S && "round" === M && (b < s ? M = "miter" : b <= 2 && (M = "fakeround")), "miter" === M && b > r && !a && (M = "bevel"), 
-                    "bevel" === M && (b > 2 && (M = "flipbevel"), b < r && (M = "miter")), g && this.updateDistance(g, p), 
-                    "miter" === M) a ? (this.addCurrentVertex(p, y, 0, 0, d), d.dir = m.sub(p)._unit(), 
+                    const M = g && m;
+                    d.middleVertex = M;
+                    let S = M ? n : h ? "butt" : i;
+                    if (M && "round" === S && (b < s ? S = "miter" : b <= 2 && (S = "fakeround")), "miter" === S && b > r && !a && (S = "bevel"), 
+                    "bevel" === S && (b > 2 && (S = "flipbevel"), b < r && (S = "miter")), g && this.updateDistance(g, p), 
+                    "miter" === S) a ? (this.addCurrentVertex(p, y, 0, 0, d), d.dir = m.sub(p)._unit(), 
                     this.addCurrentVertex(p, x, 0, 0, d)) : (l._mult(b), this.addCurrentVertex(p, l, 0, 0, d), 
-                    o && (d.currentNormal = x, d.dir = m.sub(p)._unit(), this.addCurrentVertex(p, l, 0, 0, d))); else if ("flipbevel" === M) {
+                    o && (d.currentNormal = x, d.dir = m.sub(p)._unit(), this.addCurrentVertex(p, l, 0, 0, d))); else if ("flipbevel" === S) {
                         if (b > 100) l = x.mult(-1); else {
                             const e = b * y.add(x).mag() / y.sub(x).mag();
                             l._perp()._mult(e * (w ? -1 : 1));
                         }
                         this.addCurrentVertex(p, l, 0, 0, d), this.addCurrentVertex(p, l.mult(-1), 0, 0, d);
-                    } else if ("bevel" === M || "fakeround" === M) {
+                    } else if ("bevel" === S || "fakeround" === S) {
                         const e = -Math.sqrt(b * b - 1), t = w ? e : 0, n = w ? 0 : e;
-                        if (g && this.addCurrentVertex(p, y, t, n, d), "fakeround" === M) {
+                        if (g && this.addCurrentVertex(p, y, t, n, d), "fakeround" === S) {
                             const e = Math.round(180 * A / Math.PI / 20);
                             for (let t = 1; t < e; t++) {
                                 let n = t / e;
@@ -6929,10 +6934,10 @@
                             }
                         }
                         m && (d.currentNormal = x, d.dir = m.sub(p)._unit(), this.addCurrentVertex(p, x, -t, -n, d));
-                    } else if ("butt" === M) this.addCurrentVertex(p, l, 0, 0, d); else if ("square" === M) {
+                    } else if ("butt" === S) this.addCurrentVertex(p, l, 0, 0, d); else if ("square" === S) {
                         const e = g ? 1 : -1;
                         this.addCurrentVertex(p, l, e, e, d);
-                    } else "round" === M && (g && (this.addCurrentVertex(p, y, 0, 0, d), this.addCurrentVertex(p, y, 1, 1, d, !0)), 
+                    } else "round" === S && (g && (this.addCurrentVertex(p, y, 0, 0, d), this.addCurrentVertex(p, y, 1, 1, d, !0)), 
                     m && (this.addCurrentVertex(p, x, -1, -1, d, !0), this.addCurrentVertex(p, x, 0, 0, d)));
                     if (!a && T && t < c - 1) {
                         const e = p.dist(m);
@@ -7310,13 +7315,13 @@
             return e.x === t.x && e.y === t.y;
         }
         function wa(e, t, n, i) {
-            const r = Ma(Aa(e, t, n)), s = Ma(Aa(e, t, i)), o = Ma(Aa(n, i, e)), a = Ma(Aa(n, i, t));
-            return r !== s && o !== a || !(0 !== r || !Sa(e, n, t)) || !(0 !== s || !Sa(e, i, t)) || !(0 !== o || !Sa(n, e, i)) || !(0 !== a || !Sa(n, t, i));
+            const r = Sa(Aa(e, t, n)), s = Sa(Aa(e, t, i)), o = Sa(Aa(n, i, e)), a = Sa(Aa(n, i, t));
+            return r !== s && o !== a || !(0 !== r || !Ma(e, n, t)) || !(0 !== s || !Ma(e, i, t)) || !(0 !== o || !Ma(n, e, i)) || !(0 !== a || !Ma(n, t, i));
         }
-        function Sa(e, t, n) {
+        function Ma(e, t, n) {
             return t.x <= Math.max(e.x, n.x) && t.x >= Math.min(e.x, n.x) && t.y <= Math.max(e.y, n.y) && t.y >= Math.min(e.y, n.y);
         }
-        function Ma(e) {
+        function Sa(e) {
             return e > 0 ? 1 : e < 0 ? -1 : 0;
         }
         function Pa(e, t) {
@@ -7435,7 +7440,7 @@
             }
             addHalfVertex(e, t, n, i, r, s, o, a) {
                 const {x: l, y: h, z: c} = e, u = 1 * this.scaledDistance, f = this.options.radialSegments / 2, {x: d, y: p, z: g} = o.dir, m = function(e, t, n, i, r, s, o, a) {
-                    Mo(Ua, n, i, r), Mo(Ba, s, o, 0), Io(Ga, Ua, Ba), Po(Ba, Ba), Po(Ga, Ga), ja[t] || (ja[t] = []);
+                    So(Ua, n, i, r), So(Ba, s, o, 0), Io(Ga, Ua, Ba), Po(Ba, Ba), Po(Ga, Ga), ja[t] || (ja[t] = []);
                     const l = ja[t];
                     for (var h = 0; h < t; h++) {
                         const e = Math.PI * h / t, n = 0, i = 1 - Math.abs(e - n) / (Math.PI / 2);
@@ -7492,7 +7497,7 @@
         }
         const Xa = [], Ya = [], Za = [], qa = [], $a = [];
         function Ja(e, t, n, i, r, s, o, a) {
-            Mo(Ya, n, i, r), Mo(Za, s, o, 0), Io(qa, Ya, Za), Po(Za, Za), Po(qa, qa), Oo(Xa, e, t);
+            So(Ya, n, i, r), So(Za, s, o, 0), Io(qa, Ya, Za), Po(Za, Za), Po(qa, qa), Oo(Xa, e, t);
             const l = function(e) {
                 var t = e[0], n = e[1];
                 return Math.hypot(t, n);
@@ -8070,7 +8075,7 @@
                 let i;
                 n && (i = n(this.options.zoom, t) || [ 255, 255, 255, 255 ], ie(i) ? (this.dynamicAttrs.aColor = 1, 
                 i = [ 0, 0, 0, 0 ]) : i = ht([], i));
-                const r = this.data, s = this.symbol.markerSpacing || 250, o = this.symbol.markerPlacement || "point", a = "line" === this.symbol.markerRotationAlignment, l = this._getAnchors(e, s, o, a);
+                const r = this.data, s = this.symbol.markerSpacing || 250, o = this.symbol.markerPlacement || "point", a = "line" === this.symbol.markerRotationAlignment, l = this._getAnchors(e, s, o, a), h = this.needAltitudeAttribute();
                 for (let e = 0; e < l.length; e++) {
                     const t = l[e];
                     if (this.fillPosition(this.data, t.x, t.y, t.z), a) {
@@ -8083,7 +8088,8 @@
                         r.aColor[e++] = i[0], r.aColor[e++] = i[1], r.aColor[e++] = i[2], r.aColor[e++] = i[3], 
                         r.aColor.currentIndex = e;
                     }
-                    const n = Math.max(Math.abs(t.x), Math.abs(t.y));
+                    let n;
+                    n = h ? Math.max(Math.abs(t.x), Math.abs(t.y)) : Math.max(Math.abs(t.x), Math.abs(t.y), Math.abs(t.z || 0)), 
                     n > this.maxPos && (this.maxPos = n);
                 }
             }
@@ -8430,7 +8436,7 @@
     function w(e, t, n) {
         return Math.min(Math.max(t, e), n);
     }
-    function S(e) {
+    function M(e) {
         var t = Math.round(e).toString(16).toUpperCase();
         return t.length < 2 ? "0" + t : t;
     }
@@ -8493,7 +8499,7 @@
         return null;
     }, T.to.hex = function() {
         var e = _(arguments);
-        return "#" + S(e[0]) + S(e[1]) + S(e[2]) + (e[3] < 1 ? S(Math.round(255 * e[3])) : "");
+        return "#" + M(e[0]) + M(e[1]) + M(e[2]) + (e[3] < 1 ? M(Math.round(255 * e[3])) : "");
     }, T.to.rgb = function() {
         var e = _(arguments);
         return e.length < 4 || 1 === e[3] ? "rgb(" + Math.round(e[0]) + ", " + Math.round(e[1]) + ", " + Math.round(e[2]) + ")" : "rgba(" + Math.round(e[0]) + ", " + Math.round(e[1]) + ", " + Math.round(e[2]) + ", " + e[3] + ")";
@@ -8509,7 +8515,7 @@
     }, T.to.keyword = function(e) {
         return b[e.slice(0, 3)];
     };
-    var M = u.exports, P = {
+    var S = u.exports, P = {
         exports: {}
     }, I = {
         aliceblue: [ 240, 248, 255 ],
@@ -9025,7 +9031,7 @@
             }(i);
         }));
     }));
-    var G = M, j = B, W = [].slice, X = [ "keyword", "gray", "hex" ], Y = {};
+    var G = S, j = B, W = [].slice, X = [ "keyword", "gray", "hex" ], Y = {};
     Object.keys(j).forEach((function(e) {
         Y[W.call(j[e].labels).sort().join("")] = e;
     }));
@@ -9466,10 +9472,10 @@
     function we(e) {
         return e && "object" == typeof e && (e.stops || e.property && "identity" === e.type || e.expression && "calculate-expression" === e.type);
     }
-    function Se(e) {
+    function Me(e) {
         return Ie(e, "exponential");
     }
-    function Me(e) {
+    function Se(e) {
         return Ie(e, "interval");
     }
     function Pe(e, t) {
@@ -9487,7 +9493,7 @@
         const l = function(e) {
             Object.defineProperty(o, e, {
                 get: function() {
-                    return this["__fn_" + e] || (this["__fn_" + e] = Se(this["_" + e])), this["__fn_" + e].apply(this, t());
+                    return this["__fn_" + e] || (this["__fn_" + e] = Me(this["_" + e])), this["__fn_" + e].apply(this, t());
                 },
                 set: function(t) {
                     this["_" + e] = t;
@@ -10246,9 +10252,9 @@
         return 3 === e.length && (At[3] = 255), At;
     }
     function wt(e, t = 4) {
-        return St.bind(this, e, t);
+        return Mt.bind(this, e, t);
     }
-    function St(e, t, n) {
+    function Mt(e, t, n) {
         if (Array.isArray(n)) return 3 === n.length && 4 === t && n.push(1), n;
         if (e && e[n]) return e[n];
         if (void 0 !== n.r && void 0 !== n.g && void 0 !== n.b && void 0 !== n.a) {
@@ -10257,7 +10263,7 @@
         const i = Q(n).unitArray();
         return 3 === i.length && 4 === t && i.push(1), e && (e[n] = i), i;
     }
-    function Mt(e, t, n, i) {
+    function St(e, t, n, i) {
         if (e.fill) e.fill(t, n, i); else for (let r = n; r < i; r++) e[r] = t;
     }
     function Pt(e) {
@@ -12371,7 +12377,7 @@
         if (!e) return "true";
         const t = e[0];
         if (e.length <= 1) return "any" === t ? "false" : "true";
-        return `(${"==" === t ? Sn(e[1], e[2], "===", !1) : "!=" === t ? Sn(e[1], e[2], "!==", !1) : "<" === t || ">" === t || "<=" === t || ">=" === t ? Sn(e[1], e[2], t, !0) : "any" === t ? Pn(e.slice(1), "||") : "all" === t ? Pn(e.slice(1), "&&") : "none" === t ? kn(Pn(e.slice(1), "||")) : "in" === t ? In(e[1], e.slice(2)) : "!in" === t ? kn(In(e[1], e.slice(2))) : "has" === t ? Cn(e[1]) : "!has" === t ? kn(Cn(e[1])) : "contains" === t ? function(e, t, n) {
+        return `(${"==" === t ? Mn(e[1], e[2], "===", !1) : "!=" === t ? Mn(e[1], e[2], "!==", !1) : "<" === t || ">" === t || "<=" === t || ">=" === t ? Mn(e[1], e[2], t, !0) : "any" === t ? Pn(e.slice(1), "||") : "all" === t ? Pn(e.slice(1), "&&") : "none" === t ? kn(Pn(e.slice(1), "||")) : "in" === t ? In(e[1], e.slice(2)) : "!in" === t ? kn(In(e[1], e.slice(2))) : "has" === t ? Cn(e[1]) : "!has" === t ? kn(Cn(e[1])) : "contains" === t ? function(e, t, n) {
             const i = wn(e);
             return void 0 !== n ? `(${i} + '').indexOf("${t}") === ${n}` : `(${i} + '').indexOf("${t}") >= 0`;
         }(e[1], e[2], e[3]) : "true"})`;
@@ -12379,17 +12385,17 @@
     function wn(e) {
         return "$" === e[0] ? "f." + e.substring(1) : "p[" + JSON.stringify(e) + "]";
     }
-    function Sn(e, t, n, i) {
+    function Mn(e, t, n, i) {
         if ("object" == typeof (r = e) && r && e.op) return function(e, t, n, i) {
             const r = e.property, s = e.op;
             let o = wn(r);
             return "length" !== s ? (console.error(`not support ${s} op`), "false") : (o = `((${o}+='').length)`, 
-            Mn(o, r, t, n, i));
+            Sn(o, r, t, n, i));
         }(e, t, n, i);
         var r;
-        return Mn(wn(e), e, t, n, i);
+        return Sn(wn(e), e, t, n, i);
     }
-    function Mn(e, t, n, i, r) {
+    function Sn(e, t, n, i, r) {
         const s = "$type" === t ? An.indexOf(n) : JSON.stringify(n);
         return (r ? `typeof ${e}=== typeof ${s}&&` : "") + e + i + s;
     }
@@ -12781,7 +12787,11 @@
             for (let n = 0; n < e.length; n++) if (ti(t[e[n]])) return !0;
             return !1;
         }(a, t) ? (ti(t[o]) && Xn(e, t, n), l) : (void 0 === n.index && (e.deleteData(s), 
-        Yn(e, s)), null) : ti(t[o]) ? (l = e.data[s] = new n.type(n.width * r.length), function(e, t, n, i, r) {
+        Yn(e, s)), null) : ti(t[o]) && function(e, t) {
+            if (e.startsWith("marker") && !t.properties.iconAtlas) return !1;
+            if (e.startsWith("text") && !t.properties.glyphAtlas) return !1;
+            return !0;
+        }(o, e) ? (l = e.data[s] = new n.type(n.width * r.length), function(e, t, n, i, r) {
             const {attrName: s} = i, o = (Bn + s + "Index").trim();
             Xn(t, n, i);
             const a = t.properties[o];
@@ -12794,7 +12804,7 @@
         const l = function(e) {
             if (!e) return Jn;
             const t = [];
-            for (let n = 0; n < e.length; n++) we(e[n][1]) && !Se(e[n][1]).isZoomConstant && t.push(e[n][0]);
+            for (let n = 0; n < e.length; n++) we(e[n][1]) && !Me(e[n][1]).isZoomConstant && t.push(e[n][0]);
             return t;
         }(t[r].stops), h = "identity" === t[r].type && Un.checkIfIdentityZoomDependent(r, t[r].property, s.features);
         if (!h && !l.length) return void (void 0 === n.index && Yn(e, i));
@@ -12829,7 +12839,7 @@
                     Kn(o, i, l, t);
                     continue;
                 }
-                const c = Wn(o, n, l), u = l.define;
+                const c = Wn(o, n, l, t), u = l.define;
                 if (c) {
                     const n = (Bn + h + "Index").trim();
                     if (Kn(o, o.properties[n], l, t), t._getFeatureStateStamp && (o._featureTimestamp = t._getFeatureStateStamp()), 
@@ -12906,7 +12916,7 @@
                 e.dirty = !0;
             }
         } else if (s > 1) for (let t = i * s; t < r * s; t += s) e[t + o] !== c && (e[t + o] = c, 
-        e.dirty = !0); else e[i] !== c && (Mt(e, c, i, r), e.dirty = !0);
+        e.dirty = !0); else e[i] !== c && (St(e, c, i, r), e.dirty = !0);
     }
     function ti(e) {
         return Un.isFnTypeSymbol(e);
@@ -13051,7 +13061,7 @@
         const r = ui.set(t, n)._multi(i / e.res);
         return e.extent2d.contains(r);
     }
-    const {SYMBOLS_NEED_REBUILD_IN_VT: gi, StyleUtil: mi, FuncTypeUtil: yi} = h(), {loginIBLResOnCanvas: xi, logoutIBLResOnCanvas: _i, getIBLResOnCanvas: vi} = n.reshader.pbr.PBRUtils, bi = "__gl_textures", Ai = [], Ti = new r.Point(0, 0), wi = new r.Point(0, 0), Si = new Float32Array(1), Mi = [], Pi = e => 0 === e.properties.level, Ii = e => e.properties.level > 0;
+    const {SYMBOLS_NEED_REBUILD_IN_VT: gi, StyleUtil: mi, FuncTypeUtil: yi} = h(), {loginIBLResOnCanvas: xi, logoutIBLResOnCanvas: _i, getIBLResOnCanvas: vi} = n.reshader.pbr.PBRUtils, bi = "__gl_textures", Ai = [], Ti = new r.Point(0, 0), wi = new r.Point(0, 0), Mi = new Float32Array(1), Si = [], Pi = e => 0 === e.properties.level, Ii = e => e.properties.level > 0;
     class Ci {
         static getBloomSymbol() {
             return [ "bloom" ];
@@ -13080,7 +13090,7 @@
             return n.getTileLevelValue && n.getTileLevelValue(e, t) || 0;
         }
         getAnalysisMeshes() {
-            return this.getShadowMeshes ? this.getShadowMeshes() : Mi;
+            return this.getShadowMeshes ? this.getShadowMeshes() : Si;
         }
         isVisible() {
             const {minZoom: e, maxZoom: t} = this.sceneConfig, n = this.getMap().getZoom();
@@ -13144,7 +13154,7 @@
             if (n) for (const i in n) n[i] && t[i].renderUniforms && mt(e, t[i].renderUniforms);
         }
         createGeometries(e, t) {
-            if (!e.length) return Mi;
+            if (!e.length) return Si;
             const n = [];
             for (let i = 0; i < e.length; i++) if (e[i]) if (void 0 !== e[i].ref) n[e[i].ref] ? n.push({
                 geometry: n[e[i].ref].geometry,
@@ -13424,7 +13434,7 @@
                     enumerable: !0
                 }) : r[e] = a[e];
             }
-            return we(n.visible) && (this._visibleFn[e] = Se(n.visible)), i;
+            return we(n.visible) && (this._visibleFn[e] = Me(n.visible)), i;
         }
         getSymbolDef(e) {
             return this.symbolDef[e.index];
@@ -13440,7 +13450,7 @@
             const e = this.getMap(), t = [], n = () => (t[0] = e.getZoom(), t);
             this._symbol = [], this._visibleFn = [];
             for (let e = 0; e < this.symbolDef.length; e++) this._symbol[e] = yi.loadSymbolFnTypes(mt({}, this.symbolDef[e]), n), 
-            this.symbolDef[e] && we(this.symbolDef[e].visible) && (this._visibleFn[e] = Se(this.symbolDef[e].visible));
+            this.symbolDef[e] && we(this.symbolDef[e].visible) && (this._visibleFn[e] = Me(this.symbolDef[e].visible));
         }
         getFnTypeConfig(e) {
             this._fnTypeConfigs || (this._fnTypeConfigs = []);
@@ -13615,7 +13625,7 @@
                 return t;
             }(JSON.stringify(e));
             let a = s[o];
-            return a || (a = s[o] = r ? Me(e) : Se(e)), a(n.getZoom(), i);
+            return a || (a = s[o] = r ? Se(e) : Me(e)), a(n.getZoom(), i);
         }
         highlight(e) {
             this._highlighted = e, this._highlightTimestamp = this.layer.getRenderer().getFrameTimestamp(), 
@@ -13695,25 +13705,25 @@
             }
             const v = performance.now();
             n.terrainQueryStatus[c] = x;
-            const {xmin: b, ymax: A} = l, T = Ti.set(b, A), w = this.layer.getTileSize().width / n.extent, S = t.length / e.length;
-            let M = e.queryResult;
-            M || (M = e.queryResult = new Map);
+            const {xmin: b, ymax: A} = l, T = Ti.set(b, A), w = this.layer.getTileSize().width / n.extent, M = t.length / e.length;
+            let S = e.queryResult;
+            S || (S = e.queryResult = new Map);
             let P = !0;
             for (let n = i; n <= s; n++) {
-                let i = t[n * S];
+                let i = t[n * M];
                 i < 0 ? i = 0 : i > a && (i = a);
-                let r = t[n * S + 1];
+                let r = t[n * M + 1];
                 r < 0 ? r = 0 : r > a && (r = a);
                 const s = i + r * a;
-                let l, h, c = M.get(s);
+                let l, h, c = S.get(s);
                 if (c || 0 === c) e[n] !== c && (e[n] = c, e.dirty = !0); else {
                     for (let e = 0; e < m.length; e++) if (pi(m[e], b + w * i, A - w * r, o)) {
                         l = m[e];
                         break;
                     }
                     l && (g.getRenderer().isTileCached(l.id) || e[n] === at) && (wi.set(i, r), h = this.layer.queryTilePointTerrain(wi, l, T, a, o)), 
-                    c = e[n], h && (c = null === h[0] ? at : h[0], Si[0] = c, c = Si[0]), e[n] !== c && (e[n] = c, 
-                    e.dirty = !0), h && h[1] ? M.set(s, c) : P = !1;
+                    c = e[n], h && (c = null === h[0] ? at : h[0], Mi[0] = c, c = Mi[0]), e[n] !== c && (e[n] = c, 
+                    e.dirty = !0), h && h[1] ? S.set(s, c) : P = !1;
                 }
             }
             _.altitudeQueryFrameTime = (_.altitudeQueryFrameTime || 0) + (performance.now() - v), 
@@ -13923,9 +13933,9 @@
             if (!(t = t && t.geometry)) return;
             const s = t.properties.features;
             if (Vn(s)) return;
-            const o = e.polygonPatternFileWidth, a = e.polygonPatternFileHeight, l = Se(e.polygonPatternFileOrigin);
+            const o = e.polygonPatternFileWidth, a = e.polygonPatternFileHeight, l = Me(e.polygonPatternFileOrigin);
             let h, c;
-            we(o) && (h = Se(o)), we(a) && (c = Se(a));
+            we(o) && (h = Me(o)), we(a) && (c = Me(a));
             const {aPickingId: u, aPatternOrigin: f} = t.data, d = u.length, p = new Float32Array(2 * d);
             let g, m, y;
             for (let e = 0, t = u.length; e < t; e++) {
@@ -13953,8 +13963,8 @@
             const r = t.properties.features;
             if (Vn(r)) return;
             const s = this.getMap();
-            let o = we(e.uvOffsetInMeter) && Me(e.uvOffsetInMeter);
-            const a = Se(e.uvOffset), l = Se(e.polygonPatternFileOrigin), {aPickingId: h, aPatternOrigin: c} = t.data, u = h.length, f = new Float32Array(2 * u);
+            let o = we(e.uvOffsetInMeter) && Se(e.uvOffsetInMeter);
+            const a = Me(e.uvOffset), l = Me(e.polygonPatternFileOrigin), {aPickingId: h, aPatternOrigin: c} = t.data, u = h.length, f = new Float32Array(2 * u);
             let d, p, g;
             for (let e = 0, t = h.length; e < t; e++) {
                 if (h[e] === d) {
@@ -13979,7 +13989,7 @@
             if (!(t = t && t.geometry)) return;
             const r = t.properties.features;
             if (Vn(r)) return;
-            const s = this.getMap(), o = Se(e.polygonPatternFileOrigin), a = t.data.aPickingId, l = a.length, h = new Float32Array(2 * l);
+            const s = this.getMap(), o = Me(e.polygonPatternFileOrigin), a = t.data.aPickingId, l = a.length, h = new Float32Array(2 * l);
             let c, u, f;
             for (let e = 0, t = a.length; e < t; e++) {
                 if (a[e] === c) {
@@ -13994,7 +14004,7 @@
             t.data.aPatternOrigin = h;
         }
         createFnTypeConfig(e, t) {
-            const n = Me(t.polygonFill), i = Se(t.polygonOpacity), r = Se(t.uvScale), s = Se(t.uvOffset), o = new Uint8Array(1), a = new Uint16Array(2), l = new Uint8Array(2);
+            const n = Se(t.polygonFill), i = Me(t.polygonOpacity), r = Me(t.uvScale), s = Me(t.uvOffset), o = new Uint8Array(1), a = new Uint16Array(2), l = new Uint8Array(2);
             return [ {
                 attrName: "aColor",
                 symbolName: "polygonFill",
@@ -14250,7 +14260,7 @@
             super.paint(e);
         }
         createFnTypeConfig(e, t) {
-            const n = Me(t.lineColor), i = Me(t.aLinePatternAnimSpeed), r = Me(t.aLinePatternGap), s = this.createShapeFnTypeConfigs(e, t), o = new Int8Array(2);
+            const n = Se(t.lineColor), i = Se(t.aLinePatternAnimSpeed), r = Se(t.aLinePatternGap), s = this.createShapeFnTypeConfigs(e, t), o = new Int8Array(2);
             return [ {
                 attrName: "aColor",
                 symbolName: "lineColor",
@@ -14288,7 +14298,7 @@
             } ].concat(s);
         }
         createShapeFnTypeConfigs(e, t) {
-            const n = Se(t.lineWidth), i = Se(t.lineOpacity), r = Se(t.lineStrokeWidth), s = Se(t.lineDx), o = Se(t.lineDy), a = new Uint16Array(1), l = new Int8Array(1);
+            const n = Me(t.lineWidth), i = Me(t.lineOpacity), r = Me(t.lineStrokeWidth), s = Me(t.lineDx), o = Me(t.lineDy), a = new Uint16Array(1), l = new Int8Array(1);
             return [ {
                 attrName: "aLineWidth",
                 symbolName: "lineWidth",
@@ -15505,14 +15515,14 @@
         return e[0] = t[0] - n, e[1] = t[1] - n, e[2] = t[2] + n, e[3] = t[3] + n, e;
     }
     var Tr = "#include <gl2_vert>\n#define SHADER_NAME MARKER\n#define RAD 0.0174532925\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec2 aShape;\nattribute vec4 aTexCoord;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute vec2 aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#if defined(HAS_TEXT_DX) || defined(HAS_TEXT_DY) || defined(HAS_MARKER_DX) || defined(HAS_MARKER_DY)\nattribute vec4 aDxDy;\n#endif\n#ifndef HAS_MARKER_DX\nuniform float markerDx;\n#endif\n#ifndef HAS_MARKER_DY\nuniform float markerDy;\n#endif\n#ifndef HAS_TEXT_DX\nuniform float textDx;\n#endif\n#ifndef HAS_TEXT_DY\nuniform float textDy;\n#endif\n#ifdef HAS_MARKER_WIDTH\nattribute float aMarkerWidth;\n#else\nuniform float markerWidth;\n#endif\n#ifdef HAS_MARKER_HEIGHT\nattribute float aMarkerHeight;\n#else\nuniform float markerHeight;\n#endif\n#if defined(HAS_MARKER_PITCH_ALIGN) || defined(HAS_TEXT_PITCH_ALIGN)\nattribute vec2 aPitchAlign;\n#endif\n#ifndef HAS_MARKER_PITCH_ALIGN\nuniform float markerPitchWithMap;\n#endif\n#ifndef HAS_TEXT_PITCH_ALIGN\nuniform float textPitchWithMap;\n#endif\n#if defined(HAS_MARKER_ROTATION_ALIGN) || defined(HAS_TEXT_ROTATION_ALIGN)\nattribute vec2 aRotationAlign;\n#endif\n#ifndef HAS_MARKER_ROTATION_ALIGN\nuniform float markerRotateWithMap;\n#endif\n#ifndef HAS_TEXT_ROTATION_ALIGN\nuniform float textRotateWithMap;\n#endif\nuniform float flipY;\n#if defined(HAS_MARKER_ROTATION) || defined(HAS_TEXT_ROTATION)\nattribute vec2 aRotation;\n#endif\n#ifndef HAS_MARKER_ROTATION\nuniform float markerRotation;\n#endif\n#ifndef HAS_TEXT_ROTATION\nuniform float textRotation;\n#endif\n#ifdef HAS_PAD_OFFSET\nattribute vec2 aPadOffset;\n#endif\nuniform float cameraToCenterDistance;\nuniform mat4 positionMatrix;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform float markerPerspectiveRatio;\nuniform float glyphSize;\nuniform vec2 iconSize;\nuniform vec2 canvasSize;\nuniform vec2 iconTexSize;\nuniform vec2 glyphTexSize;\nuniform float mapPitch;\nuniform float mapRotation;\nuniform float zoomScale;\nuniform float tileRatio;\nuniform float layerScale;\nuniform float isRenderingTerrain;\n#include <vt_position_vert>\nvarying float vIsText;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vOpacity;\nvarying float vGammaScale;\nvarying float vTextSize;\nvarying float vHalo;\n#ifdef HAS_TEXT_FILL\nattribute vec4 aTextFill;\nvarying vec4 vTextFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nattribute vec4 aTextHaloFill;\nvarying vec4 vTextHaloFill;\n#endif\n#if defined(HAS_TEXT_HALO_RADIUS) || defined(HAS_TEXT_HALO_OPACITY)\nattribute vec2 aTextHalo;\nvarying vec2 vTextHalo;\n#endif\n#include <highlight_vert>\n#else\n#include <fbo_picking_vert>\n#endif\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_TEXT_SIZE\nfloat d = aTextSize * layerScale;\n#else\nfloat d = textSize * layerScale;\n#endif\n#ifdef HAS_TEXT_DX\nfloat e = aDxDy.z;\n#else\nfloat e = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat f = aDxDy.w;\n#else\nfloat f = textDy;\n#endif\n#ifdef HAS_MARKER_WIDTH\nfloat h = aMarkerWidth;\n#else\nfloat h = markerWidth;\n#endif\n#ifdef HAS_MARKER_HEIGHT\nfloat i = aMarkerHeight;\n#else\nfloat i = markerHeight;\n#endif\n#ifdef HAS_MARKER_DX\nfloat j = aDxDy.x;\n#else\nfloat j = markerDx;\n#endif\n#ifdef HAS_MARKER_DY\nfloat k = aDxDy.y;\n#else\nfloat k = markerDy;\n#endif\nfloat l = aTexCoord.z;\n  float m;\n  if(l > .5) {\n    \n#ifdef HAS_TEXT_PITCH_ALIGN\nm = aPitchAlign.y;\n#else\nm = textPitchWithMap;\n#endif\n  } else {\n    \n#ifdef HAS_MARKER_PITCH_ALIGN\nm = aPitchAlign.x;\n#else\nm = markerPitchWithMap;\n#endif\n  }\n  float n;\n  if(l > .5) {\n    \n#ifdef HAS_TEXT_ROTATION_ALIGN\nn = aRotationAlign.y;\n#else\nn = textRotateWithMap;\n#endif\n  } else {\n    \n#ifdef HAS_MARKER_ROTATION_ALIGN\nn = aRotationAlign.x;\n#else\nn = markerRotateWithMap;\n#endif\n  }\n  gl_Position = projViewModelMatrix * positionMatrix * vec4(c, 1.);\n  float o = gl_Position.w;\n  float u;\n  if(isRenderingTerrain == 1. && m == 1.) {\n    u = 1.;\n  } else {\n    float v = (1. - cameraToCenterDistance / o) * markerPerspectiveRatio;\n    u = clamp(.5 + .5 * (1. - v), .0, 4.);\n  }\n  float A;\n  if(l > .5) {\n    \n#ifdef HAS_TEXT_ROTATION\nA = -aRotation.y / 9362. - mapRotation * n;\n#else\nA = -textRotation - mapRotation * n;\n#endif\n  } else {\n    \n#ifdef HAS_MARKER_ROTATION\nA = -aRotation.x / 9362. - mapRotation * n;\n#else\nA = -markerRotation - mapRotation * n;\n#endif\n  }\n  if(m == 1.) {\n    \n#ifdef REVERSE_MAP_ROTATION_ON_PITCH\nA += mapRotation;\n#else\nif(l > .5) {\n      A -= mapRotation;\n    } else {\n      A += mapRotation;\n    }\n#endif\n  }\n  float B = sin(A);\n  float C = cos(A);\n  mat2 D = mat2(C, -1. * B, B, C);\n  vec2 E = (aShape / 10.0);\n  if(m == 1. && flipY == .0) {\n    E *= vec2(1., -1.);\n  }\n  vIsText = l;\n  if(l > .5) {\n    E = E / glyphSize * d;\n  } else {\n    \n#ifdef HAS_PAD_OFFSET\nfloat F = aPadOffset.x - 1.;\n    float G = aPadOffset.y;\n#else\nfloat F = .0;\n    float G = .0;\n#endif\nE = (E / iconSize * vec2(h, i) + vec2(F, G)) * layerScale;\n  }\n  E = D * E;\n  float H;\n  if(isRenderingTerrain == 1.) {\n    H = 1.;\n  } else {\n    H = o / cameraToCenterDistance;\n  }\n  if(m == .0) {\n    vec2 I = E * 2. / canvasSize;\n    gl_Position.xy += I * u * o;\n  } else if(l > .5) {\n    float J;\n    if(isRenderingTerrain == 1.) {\n      J = tileRatio / zoomScale;\n    } else {\n      J = tileRatio / zoomScale * H * u;\n    }\n    vec2 I = E;\n    gl_Position = projViewModelMatrix * positionMatrix * vec4(c + vec3(I, .0) * J, 1.);\n  } else {\n    vec2 I = E;\n    gl_Position = projViewModelMatrix * positionMatrix * vec4(c + vec3(I, .0) * tileRatio / zoomScale * H * u, 1.);\n  }\n  if(l > .5) {\n    gl_Position.xy += vec2(e, -f) * 2. / canvasSize * o;\n  } else {\n    gl_Position.xy += vec2(j, -k) * 2. / canvasSize * o;\n  }\n#ifndef PICKING_MODE\nif(m == .0) {\n    vGammaScale = mix(1., H, textPerspectiveRatio);\n  } else {\n    vGammaScale = H + mapPitch / 4.;\n  }\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  if(l > .5) {\n    vTexCoord = aTexCoord.xy / glyphTexSize;\n  } else {\n    vTexCoord = aTexCoord.xy / iconTexSize;\n  }\n  vHalo = aTexCoord.w;\n  vTextSize = d;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nif(l > .5) {\n    vOpacity *= aColorOpacity.y / 255.;\n  } else {\n    vOpacity *= aColorOpacity.x / 255.;\n  }\n#endif\n#ifdef HAS_TEXT_FILL\nvTextFill = aTextFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvTextHaloFill = aTextHaloFill / 255.;\n#endif\n#if defined(HAS_TEXT_HALO_RADIUS) || defined(HAS_TEXT_HALO_OPACITY)\nvTextHalo = aTextHalo;\n#endif\nhighlight_setVarying();\n#else\n#ifdef ENABLE_COLLISION\nbool K = aOpacity == 255.;\n#else\nbool K = true;\n#endif\nfbo_picking_setData(gl_Position.w, K);\n#endif\n}";
-    const wr = [], Sr = [], Mr = [], Pr = [], Ir = [], Cr = [];
+    const wr = [], Mr = [], Sr = [], Pr = [], Ir = [], Cr = [];
     function kr(e, t, i, r, s, o, a, l, h, c, u, f, d, p) {
         const {tileRatio: g, tileResolution: m} = h, y = g / (m / c.getResolution()) * (u / c.cameraToCenterDistance) * f;
         n.vec2.scale(i, i, y), n.vec2.scale(r, r, y), n.vec2.scale(s, s, y), n.vec2.scale(o, o, y), 
-        n.vec3.set(wr, i[0], i[1], d ? i[2] / p : 0), n.vec3.set(Sr, r[0], r[1], d ? r[2] / p : 0), 
-        n.vec3.set(Mr, s[0], s[1], d ? s[2] / p : 0), n.vec3.set(Pr, o[0], o[1], d ? o[2] / p : 0), 
-        n.vec3.add(wr, wr, t), n.vec3.add(Sr, Sr, t), n.vec3.add(Mr, Mr, t), n.vec3.add(Pr, Pr, t), 
-        oi(i, wr, a, c.width, c.height), oi(r, Sr, a, c.width, c.height), oi(s, Mr, a, c.width, c.height), 
+        n.vec3.set(wr, i[0], i[1], d ? i[2] / p : 0), n.vec3.set(Mr, r[0], r[1], d ? r[2] / p : 0), 
+        n.vec3.set(Sr, s[0], s[1], d ? s[2] / p : 0), n.vec3.set(Pr, o[0], o[1], d ? o[2] / p : 0), 
+        n.vec3.add(wr, wr, t), n.vec3.add(Mr, Mr, t), n.vec3.add(Sr, Sr, t), n.vec3.add(Pr, Pr, t), 
+        oi(i, wr, a, c.width, c.height), oi(r, Mr, a, c.width, c.height), oi(s, Sr, a, c.width, c.height), 
         oi(o, Pr, a, c.width, c.height), n.vec2.set(Ir, Math.min(i[0], r[0], s[0], o[0]), Math.min(i[1], r[1], s[1], o[1])), 
         n.vec2.set(Cr, Math.max(i[0], r[0], s[0], o[0]), Math.max(i[1], r[1], s[1], o[1])), 
         n.vec4.set(e, Ir[0] + l[0], Ir[1] + l[1], Cr[0] + l[0], Cr[1] + l[1]);
@@ -15541,7 +15551,7 @@
         if (o.markerPerspectiveRatio) {
             m = yt(.5 + .5 * (1 - (1 - a / g) * o.markerPerspectiveRatio), 0, 4);
         }
-        const {aShape: y, aMarkerDx: x, aMarkerDy: _, aMarkerWidth: v, aMarkerHeight: b, aPitchAlign: A, aRotationAlign: T, aRotation: w} = l, S = x ? x[i] : h.markerDx, M = _ ? _[i] : h.markerDy, P = A ? A[2 * i] : o.markerPitchWithMap, I = T ? T[2 * i] : o.markerRotateWithMap, C = n.vec2.set(Wr, S || 0, -(M || 0));
+        const {aShape: y, aMarkerDx: x, aMarkerDy: _, aMarkerWidth: v, aMarkerHeight: b, aPitchAlign: A, aRotationAlign: T, aRotation: w} = l, M = x ? x[i] : h.markerDx, S = _ ? _[i] : h.markerDy, P = A ? A[2 * i] : o.markerPitchWithMap, I = T ? T[2 * i] : o.markerRotateWithMap, C = n.vec2.set(Wr, M || 0, -(S || 0));
         let k = n.vec2.set(Ur, y[2 * i] / 10, y[2 * i + 1] / 10), O = n.vec2.set(Br, y[2 * i + 2] / 10, y[2 * i + 3] / 10), F = n.vec2.set(Gr, y[2 * i + 4] / 10, y[2 * i + 5] / 10), R = n.vec2.set(jr, y[2 * i + 6] / 10, y[2 * i + 7] / 10);
         0 === o.flipY && 1 === P && (n.vec2.multiply(k, k, Xr), n.vec2.multiply(O, O, Xr), 
         n.vec2.multiply(F, F, Xr), n.vec2.multiply(R, R, Xr));
@@ -15573,13 +15583,13 @@
             y = yt(.5 + .5 * (1 - (1 - u / m) * c.textPerspectiveRatio), 0, 4);
         }
         const {aTextDx: x, aTextDy: _, aPitchAlign: v, aRotationAlign: b, aRotation: A, aType: T, aDxDy: w} = r.geometry.properties;
-        let S, M, P;
-        w ? (S = w[4 * a + 2], M = w[4 * a + 3]) : (S = x ? x[a] : d.textDx, M = _ ? _[a] : d.textDy), 
+        let M, S, P;
+        w ? (M = w[4 * a + 2], S = w[4 * a + 3]) : (M = x ? x[a] : d.textDx, S = _ ? _[a] : d.textDy), 
         v && (P = T ? v[2 * a + 1] : v[a]);
         const I = v ? P : c.textPitchWithMap;
         let C;
         b && (C = T ? b[2 * a + 1] : b[a]);
-        const k = b ? C : c.textRotateWithMap, O = n.vec2.set(ns, S || 0, -(M || 0));
+        const k = b ? C : c.textRotateWithMap, O = n.vec2.set(ns, M || 0, -(S || 0));
         if (p) {
             const {aOffset: r, aShape: s} = f, o = r.length !== s.length;
             let u, d, p, g;
@@ -15846,7 +15856,7 @@
         };
     }
     function gs(e, t) {
-        const n = Se(t.textFill), i = Se(t.textSize), r = Se(t.textHaloFill), s = Se(t.textHaloRadius), o = Se(t.textHaloOpacity), a = Se(t.textDx), l = Se(t.textDy), h = Se(t.textOpacity), c = Me(t.textPitchAlignment), u = Me(t.textRotationAlignment), f = Se(t.textRotation), d = Me(t.textAllowOverlapFn), p = Me(t.textIgnorePlacement), g = {}, m = new Int16Array(1), y = new Uint16Array(1);
+        const n = Me(t.textFill), i = Me(t.textSize), r = Me(t.textHaloFill), s = Me(t.textHaloRadius), o = Me(t.textHaloOpacity), a = Me(t.textDx), l = Me(t.textDy), h = Me(t.textOpacity), c = Se(t.textPitchAlignment), u = Se(t.textRotationAlignment), f = Me(t.textRotation), d = Se(t.textAllowOverlapFn), p = Se(t.textIgnorePlacement), g = {}, m = new Int16Array(1), y = new Uint16Array(1);
         return [ {
             attrName: "aTextFill",
             symbolName: "textFill",
@@ -16027,7 +16037,7 @@
         }(e, t, i) : null;
     }
     const As = [], Ts = [];
-    const ws = 6, Ss = 4, Ms = new Uint16Array(1), Ps = new Int8Array(1);
+    const ws = 6, Ms = 4, Ss = new Uint16Array(1), Ps = new Int8Array(1);
     function Is(e, t, i, r, s, o, a, l, h) {
         if (t.isDisposed() || 0 === t.data.aPosition.length) return null;
         const c = !!t.properties.iconAtlas, u = !!t.properties.glyphAtlas;
@@ -16148,7 +16158,7 @@
         }(e);
     }
     function Rs(e, t) {
-        const n = Se(t.markerWidth), i = Se(t.markerHeight), r = Se(t.markerDx), s = Se(t.markerDy), o = Se(t.markerOpacity), a = Se(t.markerTextFit), l = Me(t.markerPitchAlignment), h = Me(t.textPitchAlignment), c = Me(t.markerRotationAlignment), u = Me(t.textRotationAlignment), f = Se(t.markerRotation), d = Se(t.textRotation), p = Me(t.markerAllowOverlapFn), g = Me(t.markerIgnorePlacement), m = Se(t.textOpacity), y = Se(t.textDx), x = Se(t.textDy), _ = new Int16Array(1), v = new Uint16Array(1);
+        const n = Me(t.markerWidth), i = Me(t.markerHeight), r = Me(t.markerDx), s = Me(t.markerDy), o = Me(t.markerOpacity), a = Me(t.markerTextFit), l = Se(t.markerPitchAlignment), h = Se(t.textPitchAlignment), c = Se(t.markerRotationAlignment), u = Se(t.textRotationAlignment), f = Me(t.markerRotation), d = Me(t.textRotation), p = Se(t.markerAllowOverlapFn), g = Se(t.markerIgnorePlacement), m = Me(t.textOpacity), y = Me(t.textDx), x = Me(t.textDy), _ = new Int16Array(1), v = new Uint16Array(1);
         return [ {
             attrName: "aMarkerWidth",
             symbolName: "markerWidth",
@@ -16338,7 +16348,7 @@
         }(t);
         const s = function(e, t) {
             let n = e.properties.textFitFn;
-            we(t) && (n = e.properties.textFitFn = Me(t));
+            we(t) && (n = e.properties.textFitFn = Se(t));
             const i = "none" !== t, r = [], s = e.properties.iconElements, o = e.data.aPickingId, a = e.properties.textElements, l = e.data.aPickingId, h = e.properties.aCount, c = e.properties.features;
             let u, f = a[0];
             u = {
@@ -16405,14 +16415,14 @@
         let s = "both" === i || "width" === i, o = "both" === i || "height" === i;
         if (we(n.markerTextFit)) {
             let e = t.properties.textFitFn;
-            e || (e = t.properties.textFitFn = Se(n.markerTextFit));
+            e || (e = t.properties.textFitFn = Me(n.markerTextFit));
             const {features: i} = t.properties, a = t.properties.iconElements, {aPickingId: l} = t.data, h = [], c = [];
             let u = !0;
             for (let t = 0; t < a.length; t += ws) {
                 const n = i[l[a[t]]], r = (n && n.feature || {}).properties || {};
                 let s = e(null, r);
                 if (we(s)) {
-                    s = (r.textFitFn = r.textFitFn || Se(s))(null, r);
+                    s = (r.textFitFn = r.textFitFn || Me(s))(null, r);
                 }
                 "both" === s ? (h.push(t / ws), c.push(t / ws)) : "width" === s ? (u = !1, h.push(t / ws)) : "height" === s && (u = !1, 
                 c.push(t / ws));
@@ -16442,7 +16452,7 @@
             r.aMarkerHeight = new Uint16Array(c), r.aMarkerHeight.fill(e), e && (r.aMarkerHeight.dirty = !0), 
             t.data.aMarkerHeight = new Uint16Array(c);
         }
-        const u = this.getSymbolDef(t.properties.symbolIndex), f = Se(u.textSize);
+        const u = this.getSymbolDef(t.properties.symbolIndex), f = Me(u.textSize);
         Hs.call(this, e, t), (!we(u.textSize) || f.isZoomConstant && f.isFeatureConstant) && (r.isFitConstant = !0);
     }
     const Ls = [ 0, 0, 0, 0 ];
@@ -16453,40 +16463,40 @@
         if (i.isFitConstant || !i.labelShape || !i.labelShape.length) return;
         const r = this.getSymbolDef(t.properties.symbolIndex), s = r.textSize;
         let o;
-        we(s) && (o = n._textSizeFn ? n._textSizeFn : n._textSizeFn = Se(s));
+        we(s) && (o = n._textSizeFn ? n._textSizeFn : n._textSizeFn = Me(s));
         const a = r.markerTextFitPadding || Ls;
         let l;
-        we(a) && (l = i._paddingFn ? i._paddingFn : i._paddingFn = Me(a));
+        we(a) && (l = i._paddingFn ? i._paddingFn : i._paddingFn = Se(a));
         const h = e.getZoom(), {fitIcons: c, fitWidthIcons: u, fitHeightIcons: f} = i, {aMarkerWidth: d, aMarkerHeight: p, labelShape: g} = i, m = t.properties.iconElements, {features: y, aPickingId: x} = i, _ = (e, t, n, r) => {
             const c = g[4 * t], u = g[4 * t + 1], f = g[4 * t + 2], m = g[4 * t + 3];
             if (!(c || u || f || m)) return;
             const _ = x[e], v = y[_] && y[_].feature, b = v && v.properties || {};
             let A = o ? o(h, b) : s;
             if (we(A)) {
-                A = (b.textSizeFn = b.textSizeFn || Se(A))(h, b);
+                A = (b.textSizeFn = b.textSizeFn || Me(A))(h, b);
             }
             A /= Lr;
             let T, w = l && l(h, b) || a;
             if (we(w)) {
-                w = (b.fitPaddingFn = b.fitPaddingFn || Me(w))(h, b);
+                w = (b.fitPaddingFn = b.fitPaddingFn || Se(w))(h, b);
             }
             if (w = w || Ls, w[0] === w[2] && w[1] === w[3] || (T = i.aPadOffset, T || (T = i.aPadOffset = new Int8Array(2 * d.length))), 
             d && n) {
                 const t = Math.abs((f - c) / 10 * A) + (w[1] + w[3] || 0);
-                if (Ms[0] = t, d[e] !== Ms[0] && (Mt(d, Ms[0], e, e + Ss), d.dirty = !0), T) {
+                if (Ss[0] = t, d[e] !== Ss[0] && (St(d, Ss[0], e, e + Ms), d.dirty = !0), T) {
                     const t = (w[1] + w[3]) / 2 - w[3];
                     if (Ps[0] = t, T[2 * e] !== Ps[0]) {
-                        for (let n = e; n < e + Ss; n++) T[2 * n] = t;
+                        for (let n = e; n < e + Ms; n++) T[2 * n] = t;
                         T.dirty = !0;
                     }
                 }
             }
             if (p && r) {
                 const t = Math.abs((m - u) / 10 * A) + (w[0] + w[2] || 0);
-                if (Ms[0] = t, p[e] !== Ms[0] && (Mt(p, Ms[0], e, e + Ss), p.dirty = !0), T) {
+                if (Ss[0] = t, p[e] !== Ss[0] && (St(p, Ss[0], e, e + Ms), p.dirty = !0), T) {
                     const t = w[0] - (w[0] + w[2]) / 2;
                     if (Ps[0] = t, T[2 * e + 1] !== Ps[0]) {
-                        for (let n = e; n < e + Ss; n++) T[2 * n + 1] = t;
+                        for (let n = e; n < e + Ms; n++) T[2 * n + 1] = t;
                         T.dirty = !0;
                     }
                 }
@@ -16620,7 +16630,7 @@
                     i < n.length && o.fill(e++, i, n.length);
                 } else {
                     let e = 0;
-                    for (let t = 0; t < n.length; t += Ss) o.fill(e++, t, t + Ss);
+                    for (let t = 0; t < n.length; t += Ms) o.fill(e++, t, t + Ms);
                 }
                 e.properties.collideIds = o, e.properties.uniqueCollideIds = kt(o, !t);
             } else if (a) {
@@ -16628,8 +16638,8 @@
                 if (!i) return;
                 let r = 0, s = i[0];
                 for (let e = 0; e < n.length; ) {
-                    const t = e + s * Ss;
-                    n.fill(r++, e, t), e += s * Ss, t < n.length && (s = i[t]);
+                    const t = e + s * Ms;
+                    n.fill(r++, e, t), e += s * Ms, t < n.length && (s = i[t]);
                 }
                 e.properties.uniqueCollideIds = kt(n, !t);
             }
@@ -16919,32 +16929,32 @@
     }
     const Xs = [], Ys = [], Zs = [];
     function qs(e, t, i, r, s, o, a, l, h, c, u, f, d) {
-        const {aGlyphOffset: p, aSegment: g, aTextDx: m, aTextDy: y, symbolIndex: x} = t.geometry.properties, _ = this.getSymbol(x), v = m ? m[s] : _.textDx, b = y ? y[s] : _.textDy, A = n.vec2.set(Zs, v || 0, b || 0), T = n.vec2.set(Xs, p[2 * s], p[2 * s + 1]), w = n.vec3.set(Ys, g[3 * s], g[3 * s + 1], g[3 * s + 2]), S = function(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p, g, m, y) {
+        const {aGlyphOffset: p, aSegment: g, aTextDx: m, aTextDy: y, symbolIndex: x} = t.geometry.properties, _ = this.getSymbol(x), v = m ? m[s] : _.textDx, b = y ? y[s] : _.textDy, A = n.vec2.set(Zs, v || 0, b || 0), T = n.vec2.set(Xs, p[2 * s], p[2 * s + 1]), w = n.vec3.set(Ys, g[3 * s], g[3 * s + 1], g[3 * s + 2]), M = function(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p, g, m, y) {
             p || (p = i);
             const x = t.geometry.properties.line, _ = s[0] * u, v = f ? _ - o : _ + o;
             let b = v > 0 ? 1 : -1, A = 0;
             f && (b *= -1, A = Math.PI), b < 0 && (A += Math.PI);
             const T = h + c, w = Math.abs(v);
-            let S = b > 0 ? l : l + 1, M = ri.convert(i), P = ri.convert(i), I = ri.convert(r), C = ri.convert(r), k = 0, O = 0;
+            let M = b > 0 ? l : l + 1, S = ri.convert(i), P = ri.convert(i), I = ri.convert(r), C = ri.convert(r), k = 0, O = 0;
             for (;k + O <= w; ) {
-                if (S += b, S < h || S >= T) return null;
-                P.x = M.x, P.y = M.y, C.x = I.x, C.y = I.y, M.x = n[3 * S], M.y = n[3 * S + 1], 
-                I.x = x[3 * S], I.y = x[3 * S + 1], k += O, O = P.dist(M) / d;
+                if (M += b, M < h || M >= T) return null;
+                P.x = S.x, P.y = S.y, C.x = I.x, C.y = I.y, S.x = n[3 * M], S.y = n[3 * M + 1], 
+                I.x = x[3 * M], I.y = x[3 * M + 1], k += O, O = P.dist(S) / d;
             }
             const F = (w - k) / O, R = g && g.getRenderer(), E = R && R.getTerrainHelper(), D = t.properties.tile.terrainTileInfos;
             if (!y && E) {
                 const {extent: n} = t.properties.tile, i = g.getTileSize().width / n, r = g.getMap();
                 let s = I.sub(C).mult(F)._add(C);
-                M = di(ai, r, t, I, i, g, m, D), P = di(li, r, t, C, i, g, m, D), s = di(hi, r, t, s, i, g, m, D);
-                const o = A + Math.atan2(M[1] - P[1], M[0] - P[0]);
+                S = di(ai, r, t, I, i, g, m, D), P = di(li, r, t, C, i, g, m, D), s = di(hi, r, t, s, i, g, m, D);
+                const o = A + Math.atan2(S[1] - P[1], S[0] - P[0]);
                 return e[0] = (s[0] - p[0]) / d, e[1] = (s[1] - p[1]) / d, e[2] = o, e;
             }
-            const L = M.sub(P), H = L.mult(F)._add(P);
+            const L = S.sub(P), H = L.mult(F)._add(P);
             H._add(L._unit()._perp()._mult(a * b));
-            const N = A + Math.atan2(M.y - P.y, M.x - P.x);
+            const N = A + Math.atan2(S.y - P.y, S.x - P.x);
             return e[0] = (H.x - i[0]) / d, e[1] = (H.y - i[1]) / d, e[2] = N, e;
         }(e, t, r, o, a, T, A[0], A[1], w[0], w[1], w[2], i / 24, h, l, c, u, f, d);
-        return S;
+        return M;
     }
     const $s = [], Js = [];
     function Ks(e, t, i, r, s, o, a, l, h, c, u, f, d) {
@@ -16973,7 +16983,7 @@
     }, ho = function(e) {
         const t = this.layer.getRenderer(), n = e.properties.tile.z, i = t.getCurrentTileZoom();
         return !this._isHalo0(e) && !t.isForeground(e) && "line" === e.geometry.properties.textPlacement && n < i;
-    }, co = [ 0, 0, 3 ], uo = [], fo = [], po = [], go = [], mo = [], yo = [], xo = [], _o = [], vo = [ 1, -1 ], bo = new Int16Array(3), Ao = [], To = [], wo = [], So = [], Mo = [], Po = [], Io = [], Co = {}, ko = {}, Oo = {}, Fo = [], Ro = [], Eo = n.mat4.identity([]), Do = [];
+    }, co = [ 0, 0, 3 ], uo = [], fo = [], po = [], go = [], mo = [], yo = [], xo = [], _o = [], vo = [ 1, -1 ], bo = new Int16Array(3), Ao = [], To = [], wo = [], Mo = [], So = [], Po = [], Io = [], Co = {}, ko = {}, Oo = {}, Fo = [], Ro = [], Eo = n.mat4.identity([]), Do = [];
     class Lo extends xr {
         static getBloomSymbol() {
             return [ "textBloom" ];
@@ -17033,7 +17043,7 @@
                         }
                         return i;
                     };
-                } else we(t.textName) && (this._textNameFn[e] = Se(t.textName));
+                } else we(t.textName) && (this._textNameFn[e] = Me(t.textName));
             }
         }
         shouldDeleteMeshOnUpdateSymbol(e) {
@@ -17195,29 +17205,29 @@
             const l = this.layer.getRenderer(), h = e.material.uniforms, c = 1 === h.textPitchWithMap, u = !c && l.getTerrainHelper && l.getTerrainHelper(), f = this.isEnableCollision(), d = this.getMap(), p = e.geometry, g = p.desc.positionSize, {aShape: m, aOffset: y, aAnchor: x, aAltitude: _, aPitchRotation: v} = p.properties;
             let {aProjectedAnchor: b} = p.properties;
             b || (b = p.properties.aProjectedAnchor = new Array(x.length / g * 3));
-            const A = p.properties.aTextSize, T = !a, w = t[i], S = w * g;
-            let M;
-            M = p.data.aAltitude ? n.vec3.set(go, x[S], x[S + 1], _[w]) : io.unpackPosition(go, x[S], x[S + 1], x[S + 2]);
-            const P = oi(mo, M, o, d.width, d.height), I = p.properties.aTerrainAltitude;
+            const A = p.properties.aTextSize, T = !a, w = t[i], M = w * g;
+            let S;
+            S = p.data.aAltitude ? n.vec3.set(go, x[M], x[M + 1], _[w]) : io.unpackPosition(go, x[M], x[M + 1], x[M + 2]);
+            const P = oi(mo, S, o, d.width, d.height), I = p.properties.aTerrainAltitude;
             let C;
             if (I) {
                 const e = I[w];
                 if (e === at) return b[3 * w] = ot, b[3 * w + 1] = ot, b[3 * w + 2] = ot, !1;
-                e ? (C = n.vec3.set(Ro, ...M), C[2] = 100 * e, C = oi(C, C, o, d.width, d.height)) : C = P;
+                e ? (C = n.vec3.set(Ro, ...S), C[2] = 100 * e, C = oi(C, C, o, d.width, d.height)) : C = P;
             } else C = P;
             const k = d.getDevicePixelRatio();
             if (n.vec4.scale(Do, C, 1 / k), d.isOffscreen(Do)) return f || Ho(y, t, i, r), b[3 * w] = ot, 
             b[3 * w + 1] = ot, b[3 * w + 2] = ot, !1;
-            T && (M = P), b[3 * w] = C[0], b[3 * w + 1] = C[1], b[3 * w + 2] = C[2];
+            T && (S = P), b[3 * w] = C[0], b[3 * w + 1] = C[1], b[3 * w + 2] = C[2];
             const O = T ? 1 : p.properties.tileExtent / this.layer.getTileSize().width;
             let F = !0;
-            const R = t[i], E = t[r - 1], D = A ? A[R] : e.properties.textSize, L = this._updateNormal(e, D, s, R, E, M, go, O, a);
+            const R = t[i], E = t[r - 1], D = A ? A[R] : e.properties.textSize, L = this._updateNormal(e, D, s, R, E, S, go, O, a);
             if (null === L) return Ho(y, t, i, r), !1;
             const H = E - R <= 3, N = Math.floor(L / 2), z = L % 2;
             for (let a = i; a < r; a += 6) {
                 const l = t[a];
                 let d;
-                if (d = N || a !== i || H || u ? N || a !== r - 6 || H || u ? qs.call(this, fo, e, D, s, l, M, go, O, N, C, this.layer, o, c) : Io : Po, 
+                if (d = N || a !== i || H || u ? N || a !== r - 6 || H || u ? qs.call(this, fo, e, D, s, l, S, go, O, N, C, this.layer, o, c) : Io : Po, 
                 !d) {
                     F = !1, f || Ho(y, t, i, r);
                     break;
@@ -17227,8 +17237,8 @@
                 const g = Fr(yo, p, 0, h.textRotateWithMap, h.textPitchWithMap), x = y.length > m.length;
                 let _;
                 if (x) {
-                    n.vec3.set(So, v[3 * l], v[3 * l + 1], 0);
-                    const e = n.vec3.normalize(So, So), t = -v[3 * l + 2];
+                    n.vec3.set(Mo, v[3 * l], v[3 * l + 1], 0);
+                    const e = n.vec3.normalize(Mo, Mo), t = -v[3 * l + 2];
                     if (t) {
                         const i = n.quat.setAxisAngle(Ao, e, t);
                         n.mat4.fromTranslation(To, co), n.mat4.fromQuat(wo, i), _ = n.mat4.multiply(wo, wo, To);
@@ -17314,7 +17324,7 @@
             }
         }
         getUniformValues(e, t) {
-            const i = t && t.isRenderingTerrainSkin, r = this.layer.getTileSize().width, s = i ? Eo : e.projViewMatrix, o = e.cameraToCenterDistance, a = n.vec2.set(Mo, e.width, e.height);
+            const i = t && t.isRenderingTerrainSkin, r = this.layer.getTileSize().width, s = i ? Eo : e.projViewMatrix, o = e.cameraToCenterDistance, a = n.vec2.set(So, e.width, e.height);
             i && n.vec2.set(a, r, r);
             const l = Ue(e.getResolution(), e);
             return {
@@ -17389,7 +17399,7 @@
             h.properties.symbolIndex = r, h;
         }
         createFnTypeConfig(e, t) {
-            const n = Me(t.markerFill);
+            const n = Se(t.markerFill);
             return [ {
                 attrName: "aColor",
                 symbolName: "markerFill",
@@ -17465,7 +17475,7 @@
     class jo extends Fi {
         constructor(e, t, n, i, r, s) {
             if (super(e, t, n, i, r, s), this.primitive = "lines", we(this.symbolDef.lineColor)) {
-                const e = t.getMap(), n = Me(this.symbolDef.lineColor);
+                const e = t.getMap(), n = Se(this.symbolDef.lineColor);
                 this.colorSymbol = t => n(e.getZoom(), t);
             }
         }
@@ -17737,7 +17747,7 @@
             return !("line-extrusion" === this.dataConfig.type && !e.altitudeProperty && !t.altitudeProperty);
         }
         createFnTypeConfig(e, t) {
-            const n = Me(t.polygonFill || t.lineColor), i = Se(t.polygonOpacity || t.lineOpacity), r = Se(t.lineWidth), s = new Uint8Array(1), o = new Uint16Array(1), a = t.polygonFill ? "polygonFill" : t.lineColor ? "lineColor" : "polygonFill", l = t.polygonOpacity ? "polygonOpacity" : t.lineOpacity ? "lineOpacity" : "polygonOpacity";
+            const n = Se(t.polygonFill || t.lineColor), i = Me(t.polygonOpacity || t.lineOpacity), r = Me(t.lineWidth), s = new Uint8Array(1), o = new Uint16Array(1), a = t.polygonFill ? "polygonFill" : t.lineColor ? "lineColor" : "polygonFill", l = t.polygonOpacity ? "polygonOpacity" : t.lineOpacity ? "lineOpacity" : "polygonOpacity";
             return [ {
                 attrName: "aColor",
                 type: Uint8Array,
@@ -18350,7 +18360,7 @@
             r;
         }
         createFnTypeConfig(e, t) {
-            const n = Me(t.lineColor), i = Me(t.aLinePatternAnimSpeed), r = Me(t.aLinePatternGap), s = this.createShapeFnTypeConfigs(e, t), o = new Int8Array(2);
+            const n = Se(t.lineColor), i = Se(t.aLinePatternAnimSpeed), r = Se(t.aLinePatternGap), s = this.createShapeFnTypeConfigs(e, t), o = new Int8Array(2);
             return [ {
                 attrName: "aColor",
                 symbolName: "lineColor",
@@ -18388,7 +18398,7 @@
             } ].concat(s);
         }
         createShapeFnTypeConfigs(e, t) {
-            const n = Se(t.lineWidth), i = Se(t.lineOpacity), r = new Uint16Array(1);
+            const n = Me(t.lineWidth), i = Me(t.lineOpacity), r = new Uint16Array(1);
             return [ {
                 attrName: "aLineWidth",
                 symbolName: "lineWidth",
@@ -18425,7 +18435,7 @@
             delete this.shader);
         }
     }
-    const {PackUtil: da} = h(), pa = [], ga = [], ma = [], ya = [], xa = [], _a = [ 0, 0, 0 ], va = [ 0, 0, 0 ], ba = [ 1, 1, 1 ], Aa = [], Ta = [ 1, 1, 1, 1 ], wa = [], Sa = [ 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], Ma = e => class extends e {
+    const {PackUtil: da} = h(), pa = [], ga = [], ma = [], ya = [], xa = [], _a = [ 0, 0, 0 ], va = [ 0, 0, 0 ], ba = [ 1, 1, 1 ], Aa = [], Ta = [ 1, 1, 1, 1 ], wa = [], Ma = [ 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], Sa = e => class extends e {
         constructor(e, t, i, r, s, o) {
             super(e, t, i, r, s, o), this._ready = !1, this.scene.sortFunction = this.sortByCommandKey;
             const a = r.fetchOptions || {};
@@ -18491,9 +18501,9 @@
             };
             const b = this._hasFuncType(), A = this._getMeterScale(), T = n.mat4.identity([]);
             n.mat4.scale(T, T, [ A, A, A ]);
-            const w = [], S = this.getSymbols();
-            for (let e = 0; e < S.length; e++) {
-                const t = S[e], r = this._gltfMeshInfos[e];
+            const w = [], M = this.getSymbols();
+            for (let e = 0; e < M.length; e++) {
+                const t = M[e], r = this._gltfMeshInfos[e];
                 if (!r) continue;
                 const l = this._gltfPack[e][0], {fixSizeOnZoom: h} = t;
                 let c = n.mat4.identity([]);
@@ -18501,21 +18511,21 @@
                 let u = 0;
                 r.forEach((e => {
                     const {geometry: i, nodeMatrix: r} = e;
-                    n.mat4.multiply(wa, Sa, r), n.mat4.multiply(wa, c, wa);
+                    n.mat4.multiply(wa, Ma, r), n.mat4.multiply(wa, c, wa);
                     const s = n.mat4.multiply(wa, T, wa), o = i.boundingBox.copy();
                     o.transform(s);
                     const a = this._calAnchorTranslation(o, t);
                     Math.abs(a) > Math.abs(u) && (u = a);
                 }));
                 const f = [ 0, 0, u ], d = r.map(((r, d) => {
-                    const {geometry: p, materialInfo: b, morphWeights: A, extraInfo: w, nodeIndex: S} = r;
+                    const {geometry: p, materialInfo: b, morphWeights: A, extraInfo: w, nodeIndex: M} = r;
                     t.alphaTest && (b.alphaTest = t.alphaTest);
-                    const M = new (this.getMaterialClazz(b))(b), P = {}, I = new n.reshader.InstancedMesh(x, g, p, M, {
+                    const S = new (this.getMaterialClazz(b))(b), P = {}, I = new n.reshader.InstancedMesh(x, g, p, S, {
                         transparent: !1,
                         picking: !0
                     });
                     if (l.hasSkinAnimation()) {
-                        const t = this._updateAnimation(I, e, 0)[S];
+                        const t = this._updateAnimation(I, e, 0)[M];
                         I.setUniform("jointTexture", t.jointTexture), I.setUniform("jointTextureSize", t.jointTextureSize), 
                         I.setUniform("numJoints", t.numJoints), I.setUniform("skinAnimation", +this._isSkinAnimating(e)), 
                         I.properties.startTime = s, P.HAS_SKIN = 1;
@@ -18524,8 +18534,8 @@
                     bt(I.uniforms, "polygonFill", t, "markerFill", Ta, wt(this.colorCache)), bt(I.uniforms, "polygonOpacity", t, "markerOpacity", 1);
                     const C = [];
                     I.setPositionMatrix((() => {
-                        const t = this._getMeshNodeMatrix(e, d, S);
-                        n.mat4.multiply(C, Sa, t), n.mat4.multiply(C, c, C), n.mat4.multiply(C, T, C);
+                        const t = this._getMeshNodeMatrix(e, d, M);
+                        n.mat4.multiply(C, Ma, t), n.mat4.multiply(C, c, C), n.mat4.multiply(C, T, C);
                         const i = n.mat4.identity(wa);
                         if (0 !== u && (n.mat4.fromTranslation(i, f), n.mat4.multiply(C, i, C)), Pt(h)) {
                             const e = o.getGLScale() / o.getGLScale(h);
@@ -18542,7 +18552,7 @@
                     }), m.instance_color && (P.HAS_INSTANCE_COLOR = 1), m.aTerrainAltitude && (P.HAS_INSTANCE_TERRAIN_ALTITUDE = 1, 
                     I.setUniform("terrainAltitudeScale", 100 * this.layer.getRenderer().getZScale())), 
                     P.HAS_LAYER_OPACITY = 1, mt(I.properties, a.properties), I.properties.aPickingId = _, 
-                    I.properties.nodeIndex = S, I.properties.pickingIdIndiceMap = v, I.setDefines(P), 
+                    I.properties.nodeIndex = M, I.properties.pickingIdIndiceMap = v, I.setDefines(P), 
                     I.properties.symbolIndex = {
                         index: e
                     }, I;
@@ -18624,10 +18634,10 @@
                 t[0] < y && (y = t[0]), t[0] > v && (v = t[0]), t[1] < x && (x = t[1]), t[1] > b && (b = t[1]), 
                 t[2] < _ && (_ = t[2]), t[2] > A && (A = t[2]);
             }
-            const S = (y + v) / 2, M = (x + b) / 2, P = (_ + A) / 2, I = [], C = this._hasFuncType(), k = [ 0, 0, 1 ];
+            const M = (y + v) / 2, S = (x + b) / 2, P = (_ + A) / 2, I = [], C = this._hasFuncType(), k = [ 0, 0, 1 ];
             for (let t = 0; t < d; t++) {
                 o ? n.vec3.set(w, s[t * h], s[t * h + 1], o[t]) : da.unpackPosition(w, s[t * h], s[t * h + 1], s[t * h + 2]);
-                const i = w[0], r = w[1], d = n.vec3.set(T, i * p - S, -r * p - M, (w[2] + m) * g - P), y = a && a[t] || 0, x = l && l[t] || 0;
+                const i = w[0], r = w[1], d = n.vec3.set(T, i * p - M, -r * p - S, (w[2] + m) * g - P), y = a && a[t] || 0, x = l && l[t] || 0;
                 if (y || x) {
                     n.mat4.fromRotation(I, x, k);
                     const e = n.vec3.set(pa, i, r, 0), t = n.vec3.normalize(e, n.vec3.cross(e, e, k));
@@ -18642,7 +18652,7 @@
                 f("instance_vectorA", t, I, 0), f("instance_vectorB", t, I, 1), f("instance_vectorC", t, I, 2), 
                 e.aPickingId[t] = c[t];
             }
-            return n.vec3.set(T, S, M, P), T;
+            return n.vec3.set(T, M, S, P), T;
         }
         _getMeterScale() {
             if (!this._meterScale) {
@@ -18679,11 +18689,11 @@
         }
         _initTRSFuncType() {
             const e = this.symbolDef[0];
-            we(e.modelHeight) && (this._modelHeightFn = Se(e.modelHeight)), we(e.translationX) && (this._txFn = Se(e.translationX)), 
-            we(e.translationY) && (this._tyFn = Se(e.translationY)), we(e.translationZ) && (this._tzFn = Se(e.translationZ)), 
-            we(e.rotationX) && (this._rxFn = Se(e.rotationX)), we(e.rotationY) && (this._ryFn = Se(e.rotationY)), 
-            we(e.rotationZ) && (this._rzFn = Se(e.rotationZ)), we(e.scaleX) && (this._sxFn = Se(e.scaleX)), 
-            we(e.scaleY) && (this._syFn = Se(e.scaleY)), we(e.scaleZ) && (this._szFn = Se(e.scaleZ));
+            we(e.modelHeight) && (this._modelHeightFn = Me(e.modelHeight)), we(e.translationX) && (this._txFn = Me(e.translationX)), 
+            we(e.translationY) && (this._tyFn = Me(e.translationY)), we(e.translationZ) && (this._tzFn = Me(e.translationZ)), 
+            we(e.rotationX) && (this._rxFn = Me(e.rotationX)), we(e.rotationY) && (this._ryFn = Me(e.rotationY)), 
+            we(e.rotationZ) && (this._rzFn = Me(e.rotationZ)), we(e.scaleX) && (this._sxFn = Me(e.scaleX)), 
+            we(e.scaleY) && (this._syFn = Me(e.scaleY)), we(e.scaleZ) && (this._szFn = Me(e.scaleZ));
         }
         _hasFuncType() {
             return !!(this._modelHeightFn && !this._modelHeightFn.isFeatureConstant || this._txFn && !this._txFn.isFeatureConstant || this._tyFn && !this._tyFn.isFeatureConstant || this._tzFn && !this._tzFn.isFeatureConstant || this._rxFn && !this._rxFn.isFeatureConstant || this._ryFn && !this._ryFn.isFeatureConstant || this._rzFn && !this._rzFn.isFeatureConstant || this._sxFn && !this._sxFn.isFeatureConstant || this._syFn && !this._syFn.isFeatureConstant || this._szFn && !this._szFn.isFeatureConstant);
@@ -18749,12 +18759,12 @@
             return n.mat4.fromRotationTranslationScale(e, l, s, a);
         }
     };
-    class Pa extends(Ma(ra)){
+    class Pa extends(Sa(ra)){
         getMaterialClazz(e) {
             return e.diffuseFactor ? n.reshader.PhongSpecularGlossinessMaterial : n.reshader.PhongMaterial;
         }
     }
-    class Ia extends(Ma(la)){
+    class Ia extends(Sa(la)){
         getMaterialClazz(e) {
             return e.specularGlossinessTexture || e.diffuseTexture ? n.reshader.pbr.StandardSpecularGlossinessMaterial : n.reshader.pbr.StandardMaterial;
         }
@@ -19061,7 +19071,7 @@
     Za.registerAt(en);
     const qa = zn("heatmap", class extends Fi {
         createFnTypeConfig(e, t) {
-            const n = Se(t.heatmapWeight), i = new Int16Array(1);
+            const n = Me(t.heatmapWeight), i = new Int16Array(1);
             return [ {
                 attrName: "aWeight",
                 symbolName: "heatmapWeight",
@@ -20064,7 +20074,7 @@
         }
         return !0;
     }
-    function Sl(e, t, n) {
+    function Ml(e, t, n) {
         if (!e || e.type !== t) return null;
         const i = new n(e.id, e.options), s = e.geometries, o = [];
         for (let e = 0; e < s.length; e++) {
@@ -20073,9 +20083,9 @@
         }
         return i.addGeometry(o), i;
     }
-    class Ml extends ln {
+    class Sl extends ln {
         static fromJSON(e) {
-            return Sl(e, "PointLayer", Ml);
+            return Ml(e, "PointLayer", Sl);
         }
         constructor(...e) {
             super(...e), this.options.sceneConfig || (this.options.sceneConfig = Fe({}, Ke));
@@ -20087,7 +20097,7 @@
             return 0;
         }
     }
-    Ml.mergeOptions({
+    Sl.mergeOptions({
         glyphSdfLimitPerFrame: 15,
         iconErrorUrl: null,
         workarounds: {
@@ -20095,8 +20105,8 @@
         },
         collision: !1,
         collisionFrameLimit: 1
-    }), Ml.registerJSONType("PointLayer"), Ml.registerRenderer("canvas", null);
-    Ml.registerRenderer("gl", class extends gl {
+    }), Sl.registerJSONType("PointLayer"), Sl.registerRenderer("canvas", null);
+    Sl.registerRenderer("gl", class extends gl {
         constructor(...e) {
             super(...e), this.GeometryTypes = [ r.Marker, r.MultiPoint ];
         }
@@ -20109,7 +20119,7 @@
     const {LinePack: Pl} = h();
     class Il extends ln {
         static fromJSON(e) {
-            return Sl(e, "LineStringLayer", Il);
+            return Ml(e, "LineStringLayer", Il);
         }
     }
     Il.mergeOptions({
@@ -20149,7 +20159,7 @@
     const {PolygonPack: kl} = h();
     class Ol extends ln {
         static fromJSON(e) {
-            return Sl(e, "PolygonLayer", Ol);
+            return Ml(e, "PolygonLayer", Ol);
         }
     }
     Ol.registerJSONType("PolygonLayer");
@@ -20622,11 +20632,11 @@
         e.copyWithin(r, r - 2 * y, r - y), r += y, (n = n || []).push(y / 3);
         const _ = n.getLength();
         for (let t = 0; t < _; t++) {
-            Sh(x + (n[t - 1] || 0), x + n[t], e, y / 3, l, i, h, c, u, f, s, d, p, g, m);
+            Mh(x + (n[t - 1] || 0), x + n[t], e, y / 3, l, i, h, c, u, f, s, d, p, g, m);
         }
         return r;
     }
-    function Sh(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p) {
+    function Mh(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p) {
         const g = s.getLength();
         let m, y;
         for (let o = e, a = t; o < a - 1; o++) if (m = o, y = o + 1, r === 1 / 0 || !Dl(n, m, y, r)) if ((o - e) % 2 == 1 && (m += 2 * i, 
@@ -20650,14 +20660,14 @@
                 const w = u % 6;
                 0 === e ? (5 === w && (m = ql(r, s, u, v, b)), T = w === y[0] || w === y[1] || w === y[2] ? g : g + m) : 1 === e && (w === y[0] || w === y[1] || w === y[2] ? T = 0 : 5 === w ? (m = ql(r, s, u, v, b), 
                 T = m) : T = m);
-                const S = T / h * (1 / (100 * c)) / a;
-                let M;
-                M = 1 === t ? A === d ? 1 : 0 : "bottom" === n ? A === d ? f / 100 / l : 0 : A === d ? 0 : -f / 100 / l, 
-                i[2 * o] = S, i[2 * o + 1] = M, 0 === w && (g += m);
+                const M = T / h * (1 / (100 * c)) / a;
+                let S;
+                S = 1 === t ? A === d ? 1 : 0 : "bottom" === n ? A === d ? f / 100 / l : 0 : A === d ? 0 : -f / 100 / l, 
+                i[2 * o] = M, i[2 * o + 1] = S, 0 === w && (g += m);
             }
         }(a, l, h, c, n, s, g, u[0], u[1], f, d, p);
     }
-    function Mh(e) {
+    function Sh(e) {
         const t = [ e[0] ];
         let n = e[0];
         for (let i = 1; i < e.length; i++) Array.isArray(e[i]) ? e[i][0] === n[0] && e[i][1] === n[1] && e[i][2] === n[2] || t.push(e[i]) : e[i].x === n.x && e[i].y === n.y && e[i].z === n.z || t.push(e[i]), 
@@ -20780,7 +20790,7 @@
     const {StyleUtil: sc, PackUtil: oc, ArrayPool: ac} = h(), lc = ac.getInstance();
     function hc(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p, g) {
         void 0 === t.top && (t.top = !0), void 0 === t.side && (t.side = !0), lc.reset();
-        const {altitudeScale: m, altitudeProperty: y, defaultAltitude: x, heightProperty: _, minHeightProperty: v, defaultHeight: b, tangent: A, uv: T, topUVMode: w, sideUVMode: S, sideVerticalUVMode: M, top: P, side: I, textureYOrigin: C, topThickness: k} = t, O = !!g, F = function(e, t, {altitudeScale: n, altitudeProperty: i, defaultAltitude: r, heightProperty: s, minHeightProperty: o, defaultHeight: a}, {center: l, side: h, top: c, topThickness: u, uvOrigin: f, uv: d, uvSize: p, topUVMode: g, sideUVMode: m, sideVerticalUVMode: y, textureYOrigin: x, tileRatio: _, centimeterToPoint: v, verticalCentimeterToPoint: b, positionType: A, res: T, glScale: w, projectionCode: S}, M, P) {
+        const {altitudeScale: m, altitudeProperty: y, defaultAltitude: x, heightProperty: _, minHeightProperty: v, defaultHeight: b, tangent: A, uv: T, topUVMode: w, sideUVMode: M, sideVerticalUVMode: S, top: P, side: I, textureYOrigin: C, topThickness: k} = t, O = !!g, F = function(e, t, {altitudeScale: n, altitudeProperty: i, defaultAltitude: r, heightProperty: s, minHeightProperty: o, defaultHeight: a}, {center: l, side: h, top: c, topThickness: u, uvOrigin: f, uv: d, uvSize: p, topUVMode: g, sideUVMode: m, sideVerticalUVMode: y, textureYOrigin: x, tileRatio: _, centimeterToPoint: v, verticalCentimeterToPoint: b, positionType: A, res: T, glScale: w, projectionCode: M}, S, P) {
             let I = t / e[0].extent;
             t === 1 / 0 && (I = 1);
             const C = t === 1 / 0, k = P.get(), O = P.get(), F = P.get(), R = P.getProxy(), E = P.get(), D = P.get(), L = P.get(), H = !!d, N = !!c, z = !!h, V = H ? P.get() : null;
@@ -20799,7 +20809,7 @@
                     }
                     c = h.length, d = D.currentIndex;
                     for (let e = 0; e < c; e++) D[d++] = h[e];
-                    D.currentIndex = d, H && Yl(g || 0, e, n, V, E, f, v, _, p[0], p[1], s, T, w, S, l), 
+                    D.currentIndex = d, H && Yl(g || 0, e, n, V, E, f, v, _, p[0], p[1], s, T, w, M, l), 
                     u > 0 && !z && (n = wh(E, R, i, D, n, V, 0, u, t, H, m || 0, y || 0, x, p, _, b, r < 0 ? !o : o)), 
                     L.setLength(n / 3), L.fill(1, a / 3, n / 3);
                 }
@@ -20815,7 +20825,7 @@
             let B = -1 / 0, G = 1 / 0, j = 0;
             const W = [ -1, -1, t + 1, t + 1 ];
             let X = 0, Y = e.length;
-            Ee(M) && (X = M, Y = M + 1);
+            Ee(S) && (X = S, Y = S + 1);
             let Z = 0, q = !1;
             const $ = P.getProxy();
             let J = !1;
@@ -20833,7 +20843,7 @@
                 const x = Ah.calculateSignedArea(c[0]) < 0;
                 for (let e = 0, n = c.length; e < n; e++) {
                     let i = c[e];
-                    x && (i = i.reverse()), i = Mh(i);
+                    x && (i = i.reverse()), i = Sh(i);
                     const r = Ah.calculateSignedArea(i) < 0;
                     if (!r && e > 0 && (m++, f = u && u[m], j = U(y, j, $, p * I, f, C), R.setLength(0), 
                     $.setLength(0), y = j), t !== 1 / 0 && (i = Ah.clipPolygon(i, W)), !i.length) {
@@ -20886,8 +20896,8 @@
             uvSize: [ r, r ],
             uvOrigin: i,
             topUVMode: w,
-            sideUVMode: S,
-            sideVerticalUVMode: M,
+            sideUVMode: M,
+            sideVerticalUVMode: S,
             textureYOrigin: C,
             tileRatio: a,
             centimeterToPoint: l,
@@ -20931,21 +20941,21 @@
                 function y(t, i, r) {
                     ic(h, e, 3 * t), ic(c, e, 3 * i), ic(u, e, 3 * r), rc(f, n, 2 * t), rc(d, n, 2 * i), 
                     rc(p, n, 2 * r);
-                    const s = c[0] - h[0], o = u[0] - h[0], y = c[1] - h[1], x = u[1] - h[1], _ = c[2] - h[2], v = u[2] - h[2], b = d[0] - f[0], A = p[0] - f[0], T = d[1] - f[1], w = p[1] - f[1], S = 1 / (b * w - A * T);
-                    Oh(g, (w * s - T * o) * S, (w * y - T * x) * S, (w * _ - T * v) * S), Oh(m, (b * o - A * s) * S, (b * x - A * y) * S, (b * v - A * _) * S), 
+                    const s = c[0] - h[0], o = u[0] - h[0], y = c[1] - h[1], x = u[1] - h[1], _ = c[2] - h[2], v = u[2] - h[2], b = d[0] - f[0], A = p[0] - f[0], T = d[1] - f[1], w = p[1] - f[1], M = 1 / (b * w - A * T);
+                    Oh(g, (w * s - T * o) * M, (w * y - T * x) * M, (w * _ - T * v) * M), Oh(m, (b * o - A * s) * M, (b * x - A * y) * M, (b * v - A * _) * M), 
                     Fh(a[t], a[t], g), Fh(a[i], a[i], g), Fh(a[r], a[r], g), Fh(l[t], l[t], m), Fh(l[i], l[i], m), 
                     Fh(l[r], l[r], m);
                 }
                 for (let e = 0, t = i.length; e < t; e += 3) y(i[e + 0], i[e + 1], i[e + 2]);
                 const x = [], _ = [], v = [], b = [];
                 let A, T, w;
-                function S(e) {
+                function M(e) {
                     ic(v, t, 3 * e), kh(b, v), T = a[e], kh(x, T), Lh(x, x, function(e, t, n) {
                         return e[0] = t[0] * n, e[1] = t[1] * n, e[2] = t[2] * n, e;
                     }(v, v, Eh(v, T))), Rh(x, x), Dh(_, b, T), w = Eh(_, l[e]), A = w < 0 ? -1 : 1, 
                     o[4 * e] = x[0], o[4 * e + 1] = x[1], o[4 * e + 2] = x[2], o[4 * e + 3] = A;
                 }
-                for (let e = 0, t = i.length; e < t; e += 3) S(i[e + 0]), S(i[e + 1]), S(i[e + 2]);
+                for (let e = 0, t = i.length; e < t; e += 3) M(i[e + 0]), M(i[e + 1]), M(i[e + 2]);
                 return o;
             }(F.vertices, F.normals, F.uvs, L, e), e = function(e, t) {
                 const n = t.getLength(), i = new Float32Array(n), r = [], s = [], o = [];
@@ -20969,28 +20979,28 @@
         const G = function(e, t, n, i) {
             const r = {}, s = {}, o = i.getLength();
             if (ze(t.polygonFill)) {
-                let a = Me(t.polygonFill);
+                let a = Se(t.polygonFill);
                 const l = new Uint8Array(4 * o);
                 l.fill(255);
                 for (let t = 0; t < o; t++) {
                     const s = e[i[t]], o = s.properties || {};
                     o.$layer = s.layer, o.$type = s.type;
                     let h = a(n, o);
-                    we(h) && (r.aColor = 1, a = Me(h), h = a(n, o)), delete o.$layer, delete o.$type, 
+                    we(h) && (r.aColor = 1, a = Se(h), h = a(n, o)), delete o.$layer, delete o.$type, 
                     sc.normalizeColor(cc, h), l[4 * t] = cc[0], l[4 * t + 1] = cc[1], l[4 * t + 2] = cc[2], 
                     l[4 * t + 3] = cc[3];
                 }
                 s.aColor = l;
             }
             if (ze(t.polygonOpacity)) {
-                let a = Se(t.polygonOpacity);
+                let a = Me(t.polygonOpacity);
                 const l = new Uint8Array(o);
                 l.fill(255);
                 for (let t = 0; t < o; t++) {
                     const s = e[i[t]], o = s.properties || {};
                     o.$layer = s.layer, o.$type = s.type;
                     let h = a(n, o);
-                    we(h) && (r.aOpacity = 1, a = Me(h), h = a(n, o)), delete o.$layer, delete o.$type, 
+                    we(h) && (r.aOpacity = 1, a = Se(h), h = a(n, o)), delete o.$layer, delete o.$type, 
                     l[t] = 255 * h;
                 }
                 s.aOpacity = l;
@@ -20999,7 +21009,7 @@
         }(e, c, u, F.featureIndexes), j = function(e, t, n, i, r) {
             const s = [ [], [] ], o = ze(i.topPolygonFill), a = ze(i.bottomPolygonFill), l = [ 255, 255, 255, 255 ], h = t.getLength();
             if (o || a) {
-                let c = o && Me(i.topPolygonFill), u = a && Me(i.bottomPolygonFill), f = null, d = null, p = null, g = null;
+                let c = o && Se(i.topPolygonFill), u = a && Se(i.bottomPolygonFill), f = null, d = null, p = null, g = null;
                 for (let i = 0; i < h; i++) {
                     if (1 === e[i] && !o || 0 === e[i] && !a) continue;
                     const h = 1 === e[i];
@@ -21014,7 +21024,7 @@
                     const m = n[t[i]], y = m.properties || {};
                     y.$layer = m.layer, y.$type = m.type;
                     let x = h ? c : u, _ = x(r, y);
-                    we(_) && (x = Me(_), _ = x(r, y)), delete y.$layer, delete y.$type, sc.normalizeColor(cc, _), 
+                    we(_) && (x = Se(_), _ = x(r, y)), delete y.$layer, delete y.$type, sc.normalizeColor(cc, _), 
                     Vl(cc, cc, l);
                     let v = uc(s, cc);
                     v < 0 && (v = s.length, s.push(Nl([], cc))), e[i] = v, h ? (f = t[i], p = v) : (d = t[i], 
@@ -21096,7 +21106,7 @@
             for (;t; ) {
                 for (let s = 0; s < t.children.length; s++) {
                     const o = t.children[s], a = t.leaf ? i(o) : o;
-                    Pc(e, a) && (t.leaf ? n.push(o) : Mc(e, a) ? this._all(o, n) : r.push(o));
+                    Pc(e, a) && (t.leaf ? n.push(o) : Sc(e, a) ? this._all(o, n) : r.push(o));
                 }
                 t = r.pop();
             }
@@ -21110,7 +21120,7 @@
                 for (let i = 0; i < t.children.length; i++) {
                     const r = t.children[i], s = t.leaf ? this.toBBox(r) : r;
                     if (Pc(e, s)) {
-                        if (t.leaf || Mc(e, s)) return !0;
+                        if (t.leaf || Sc(e, s)) return !0;
                         n.push(r);
                     }
                 }
@@ -21150,7 +21160,7 @@
                     const i = yc(e, n.children, t);
                     if (-1 !== i) return n.children.splice(i, 1), r.push(n), this._condense(r), this;
                 }
-                l || n.leaf || !Mc(n, i) ? a ? (o++, n = a.children[o], l = !1) : n = null : (r.push(n), 
+                l || n.leaf || !Sc(n, i) ? a ? (o++, n = a.children[o], l = !1) : n = null : (r.push(n), 
                 s.push(o), o = 0, a = n, n = n.children[0]);
             }
             return this;
@@ -21224,7 +21234,7 @@
         _chooseSplitIndex(e, t, n) {
             let i, r = 1 / 0, s = 1 / 0;
             for (let o = t; o <= n - t; o++) {
-                const t = _c(e, 0, o, this.toBBox), a = _c(e, o, n, this.toBBox), l = Sc(t, a), h = Tc(t) + Tc(a);
+                const t = _c(e, 0, o, this.toBBox), a = _c(e, o, n, this.toBBox), l = Mc(t, a), h = Tc(t) + Tc(a);
                 l < r ? (r = l, i = o, s = h < s ? h : s) : l === r && h < s && (s = h, i = o);
             }
             return i || n - t;
@@ -21287,11 +21297,11 @@
     function wc(e) {
         return e.maxX - e.minX + (e.maxY - e.minY);
     }
-    function Sc(e, t) {
+    function Mc(e, t) {
         const n = Math.max(e.minX, t.minX), i = Math.max(e.minY, t.minY), r = Math.min(e.maxX, t.maxX), s = Math.min(e.maxY, t.maxY);
         return Math.max(0, r - n) * Math.max(0, s - i);
     }
-    function Mc(e, t) {
+    function Sc(e, t) {
         return e.minX <= t.minX && e.minY <= t.minY && t.maxX <= e.maxX && t.maxY <= e.maxY;
     }
     function Pc(e, t) {
@@ -21403,10 +21413,10 @@
         const h = Math.abs(o + a);
         return Math.abs(l) >= Uc * h ? l : -function(e, t, n, i, r, s, o) {
             let a, l, h, c, u, f, d, p, g, m, y, x, _, v, b, A, T, w;
-            const S = e - r, M = n - r, P = t - s, I = i - s;
-            v = S * I, f = Hc * S, d = f - (f - S), p = S - d, f = Hc * I, g = f - (f - I), 
-            m = I - g, b = p * m - (v - d * g - p * g - d * m), A = P * M, f = Hc * P, d = f - (f - P), 
-            p = P - d, f = Hc * M, g = f - (f - M), m = M - g, T = p * m - (A - d * g - p * g - d * m), 
+            const M = e - r, S = n - r, P = t - s, I = i - s;
+            v = M * I, f = Hc * M, d = f - (f - M), p = M - d, f = Hc * I, g = f - (f - I), 
+            m = I - g, b = p * m - (v - d * g - p * g - d * m), A = P * S, f = Hc * P, d = f - (f - P), 
+            p = P - d, f = Hc * S, g = f - (f - S), m = S - g, T = p * m - (A - d * g - p * g - d * m), 
             y = b - T, u = b - y, jc[0] = b - (y + u) + (u - T), x = v + y, u = x - v, _ = v - (x - u) + (y - u), 
             y = _ - A, u = _ - y, jc[1] = _ - (y + u) + (u - A), w = x + y, u = w - x, jc[2] = x - (w - u) + (y - u), 
             jc[3] = w;
@@ -21416,17 +21426,17 @@
                 return n;
             }(4, jc), k = Bc * o;
             if (C >= k || -C >= k) return C;
-            if (u = e - S, a = e - (S + u) + (u - r), u = n - M, h = n - (M + u) + (u - r), 
+            if (u = e - M, a = e - (M + u) + (u - r), u = n - S, h = n - (S + u) + (u - r), 
             u = t - P, l = t - (P + u) + (u - s), u = i - I, c = i - (I + u) + (u - s), 0 === a && 0 === l && 0 === h && 0 === c) return C;
-            if (k = Gc * o + Nc * Math.abs(C), C += S * c + I * a - (P * h + M * l), C >= k || -C >= k) return C;
+            if (k = Gc * o + Nc * Math.abs(C), C += M * c + I * a - (P * h + S * l), C >= k || -C >= k) return C;
             v = a * I, f = Hc * a, d = f - (f - a), p = a - d, f = Hc * I, g = f - (f - I), 
-            m = I - g, b = p * m - (v - d * g - p * g - d * m), A = l * M, f = Hc * l, d = f - (f - l), 
-            p = l - d, f = Hc * M, g = f - (f - M), m = M - g, T = p * m - (A - d * g - p * g - d * m), 
+            m = I - g, b = p * m - (v - d * g - p * g - d * m), A = l * S, f = Hc * l, d = f - (f - l), 
+            p = l - d, f = Hc * S, g = f - (f - S), m = S - g, T = p * m - (A - d * g - p * g - d * m), 
             y = b - T, u = b - y, Zc[0] = b - (y + u) + (u - T), x = v + y, u = x - v, _ = v - (x - u) + (y - u), 
             y = _ - A, u = _ - y, Zc[1] = _ - (y + u) + (u - A), w = x + y, u = w - x, Zc[2] = x - (w - u) + (y - u), 
             Zc[3] = w;
             const O = zc(4, jc, 4, Zc, Wc);
-            v = S * c, f = Hc * S, d = f - (f - S), p = S - d, f = Hc * c, g = f - (f - c), 
+            v = M * c, f = Hc * M, d = f - (f - M), p = M - d, f = Hc * c, g = f - (f - c), 
             m = c - g, b = p * m - (v - d * g - p * g - d * m), A = P * h, f = Hc * P, d = f - (f - P), 
             p = P - d, f = Hc * h, g = f - (f - h), m = h - g, T = p * m - (A - d * g - p * g - d * m), 
             y = b - T, u = b - y, Zc[0] = b - (y + u) + (u - T), x = v + y, u = x - v, _ = v - (x - u) + (y - u), 
@@ -21575,13 +21585,13 @@
         return (s = e[0] - i) * s + (o = e[1] - r) * o;
     }
     function au(e, t, n, i, r, s, o, a) {
-        var l, h, c, u, f = n - e, d = i - t, p = o - r, g = a - s, m = e - r, y = t - s, x = f * f + d * d, _ = f * p + d * g, v = p * p + g * g, b = f * m + d * y, A = p * m + g * y, T = x * v - _ * _, w = T, S = T;
-        0 === T ? (h = 0, w = 1, u = A, S = v) : (u = x * A - _ * b, (h = _ * A - v * b) < 0 ? (h = 0, 
-        u = A, S = v) : h > w && (h = w, u = A + _, S = v)), u < 0 ? (u = 0, -b < 0 ? h = 0 : -b > x ? h = w : (h = -b, 
-        w = x)) : u > S && (u = S, -b + _ < 0 ? h = 0 : -b + _ > x ? h = w : (h = -b + _, 
+        var l, h, c, u, f = n - e, d = i - t, p = o - r, g = a - s, m = e - r, y = t - s, x = f * f + d * d, _ = f * p + d * g, v = p * p + g * g, b = f * m + d * y, A = p * m + g * y, T = x * v - _ * _, w = T, M = T;
+        0 === T ? (h = 0, w = 1, u = A, M = v) : (u = x * A - _ * b, (h = _ * A - v * b) < 0 ? (h = 0, 
+        u = A, M = v) : h > w && (h = w, u = A + _, M = v)), u < 0 ? (u = 0, -b < 0 ? h = 0 : -b > x ? h = w : (h = -b, 
+        w = x)) : u > M && (u = M, -b + _ < 0 ? h = 0 : -b + _ > x ? h = w : (h = -b + _, 
         w = x));
-        var M = (1 - (c = 0 === u ? 0 : u / S)) * r + c * o - ((1 - (l = 0 === h ? 0 : h / w)) * e + l * n), P = (1 - c) * s + c * a - ((1 - l) * t + l * i);
-        return M * M + P * P;
+        var S = (1 - (c = 0 === u ? 0 : u / M)) * r + c * o - ((1 - (l = 0 === h ? 0 : h / w)) * e + l * n), P = (1 - c) * s + c * a - ((1 - l) * t + l * i);
+        return S * S + P * P;
     }
     function lu(e, t) {
         return e[0] === t[0] ? e[1] - t[1] : e[0] - t[0];
@@ -21696,7 +21706,7 @@
     const {DEFAULT_TEX_WIDTH: gu} = h();
     class mu extends ln {
         static fromJSON(e) {
-            return Sl(e, "ExtrudePolygonLayer", mu);
+            return Ml(e, "ExtrudePolygonLayer", mu);
         }
         getPolygonOffsetCount() {
             return 0;
@@ -21917,9 +21927,9 @@
     e.LinePainter = $i, e.LinePlugin = Na, e.LineStringLayer = Il, e.LitPlugin = Wa, 
     e.MapboxVectorTileLayer = Ja, e.NativeLinePainter = jo, e.NativeLinePlugin = Ba, 
     e.NativePointPainter = Uo, e.PackUtil = vu, e.PhongPainter = ra, e.PhongPlugin = Ga, 
-    e.PointLayer = Ml, e.PolygonLayer = Ol, e.SYMBOLS_NEED_REBUILD_IN_VECTOR = Tu, e.SYMBOLS_NEED_REBUILD_IN_VT = Au, 
+    e.PointLayer = Sl, e.PolygonLayer = Ol, e.SYMBOLS_NEED_REBUILD_IN_VECTOR = Tu, e.SYMBOLS_NEED_REBUILD_IN_VT = Au, 
     e.TextPainter = Lo, e.TextPlugin = Ua, e.TubePlugin = Xa, e.Vector3DLayer = ln, 
     e.VectorTileLayer = en, e.VectorTileLayerRenderer = Ut, e.WaterPlugin = $a, e.WireframePainter = oa, 
-    e.WireframePlugin = ja, "undefined" != typeof console && console.log("@maptalks/vt v0.105.1");
+    e.WireframePlugin = ja, "undefined" != typeof console && console.log("@maptalks/vt v0.105.3");
 }));
 //# sourceMappingURL=maptalks.vt.js.map