@maptalks/vt 0.105.3 → 0.106.1

package/dist/maptalks.vt.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/vt v0.105.3
+ * @maptalks/vt v0.106.1
  * LICENSE : undefined
  * (c) 2016-2025 maptalks.org
  */
@@ -395,10 +395,10 @@
                 height: h
             };
         }
-        function M(e, t) {
+        function S(e, t) {
             return t < 1 / 0 && (e.x < 0 || e.x > t || e.y < 0 || e.y > t);
         }
-        function S(e) {
+        function M(e) {
             return null == e;
         }
         function P(e, t, n) {
@@ -1065,7 +1065,7 @@
         };
         var Te = le.exports, we = {
             exports: {}
-        }, Me = {
+        }, Se = {
             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 ]
-        }, Se = {};
-        for (var Pe in Me) Me.hasOwnProperty(Pe) && (Se[Me[Pe]] = Pe);
+        }, Me = {};
+        for (var Pe in Se) Se.hasOwnProperty(Pe) && (Me[Se[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 = Se[e];
+            var t = Me[e];
             if (t) return t;
             var n, i, r, s = 1 / 0;
-            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));
+            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));
                 a < s && (s = a, n = o);
             }
             return n;
         }, Ie.keyword.rgb = function(e) {
-            return Me[e];
+            return Se[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 ? 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 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 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 Mt(e) {
+        function St(e) {
             return "$id" === e ? '"id" in f' : `${JSON.stringify(e)} in p`;
         }
-        function St(e) {
+        function Mt(e) {
             return `!(${e})`;
         }
         function Pt(e, t) {
@@ -2078,10 +2078,10 @@
                         t + _(e);
                     })).join("");
                 }
-                function M(e, t) {
+                function S(e, t) {
                     return e + 22 + 75 * (e < 26) - ((0 != t) << 5);
                 }
-                function S(e, t, n) {
+                function M(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 = S(y - s, t = g.length + 1, 0 == s), x(y / t) > l - _ && v("overflow"), _ += x(y / t), 
+                        b = M(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(_(M(d + b % y, 0))), u = x(b / y);
-                            A.push(_(M(u, 0))), s = S(n, m, i == r), n = 0, ++i;
+                            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;
                         }
                         ++n, ++t;
                     }
@@ -2807,8 +2807,8 @@
                 })), e;
             }
         }
-        var Mn = wn;
-        const Sn = [ "Unknown", "Point", "LineString", "Polygon" ];
+        var Sn = wn;
+        const Mn = [ "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 ? Sn[this.feature.type] : this.feature.type : null;
+                return this.feature ? "number" == typeof this.feature.type ? Mn[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 Mn(t, [ e ]) : e;
+                    return "assert" === n ? new vn(t, [ e ]) : "coerce" === n ? new Sn(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 Mn || e instanceof vn;
+            const t = e instanceof Sn || 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 Mi(e, t, n) {
+        function Si(e, t, n) {
             const i = t - e;
             return e + n * (i > 180 || i < -180 ? i - 360 * Math.round(i / 360) : i);
         }
-        const Si = {
+        const Mi = {
             forward: Ti,
             reverse: wi,
             interpolate: function(e, t, n) {
@@ -3388,7 +3388,7 @@
             },
             interpolate: function(e, t, n) {
                 return {
-                    h: Mi(e.h, t.h, n),
+                    h: Si(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: Si,
+            lab: Mi,
             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)) : Si.reverse(Si.interpolate(Si.forward(h), Si.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)) : Mi.reverse(Mi.interpolate(Mi.forward(h), Mi.forward(c), l));
             }
             eachChild(e) {
                 e(this.input);
@@ -3978,10 +3978,10 @@
             slice: Yi,
             step: oi,
             string: vn,
-            "to-boolean": Mn,
-            "to-color": Mn,
-            "to-number": Mn,
-            "to-string": Mn,
+            "to-boolean": Sn,
+            "to-color": Sn,
+            "to-number": Sn,
+            "to-string": Sn,
             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 Mr(e, t) {
+        function Sr(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 Sr {
+        class Mr {
             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 = Mr(e, t)).result) return e;
+            if ("error" === (e = Sr(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 Sr(i ? "constant" : "source", e.value));
+            if (!s) return ur(new Mr(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 = Mr(i, null);
+            const r = Sr(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 = Mr(n, null);
+                const e = Sr(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: Mr,
+            createExpression: Sr,
             createPropertyExpression: Ir,
             normalizePropertyExpression: function(e, t) {
                 if (gr(e)) return new Cr(e, t);
@@ -4526,7 +4526,7 @@
                     };
                 }
             },
-            ZoomConstantExpression: Sr,
+            ZoomConstantExpression: Mr,
             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 Ms(e, t) {
+        function Ss(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 = Ss(e);
+            const [i, r] = bs, s = Ms(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 Ss(e) {
+        function Ms(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: Ms,
+            resolveText: Ss,
             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: Ss
+            templateKeys: Ms
         });
         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, M = t ? t(null, T) : b.markerType, S = w || M || 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, S = t ? t(null, T) : b.markerType, M = w || S || b.markerPath, P = !Je(this.symbolDef.textName);
                 let I, C;
-                if (S) {
+                if (M) {
                     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 = Ms(n, T);
+                        const i = Ss(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, S && I[0] >= 0 && I[1] >= 0) {
+                C[1] = Math.ceil(C[1])), this.iconSize = I, this.textSize = C, M && I[0] >= 0 && I[1] >= 0) {
                     let e;
-                    if (M) {
+                    if (S) {
                         const t = {};
-                        if (t.markerType = M, "path" === M && (t.markerPath = n ? n(null, T) : b.markerPath, 
+                        if (t.markerType = S, "path" === S && (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 = Ms(e, T);
+                        let n = Ss(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++) 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)));
+                        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)));
                     } else if ("vertex-first" === t) {
                         const e = a[0];
-                        e && e[0] && !M(e[0], n) && (s.push(e[0]), i && xo(e[0], e[0], e[1], r));
+                        e && e[0] && !S(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] && !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)) {
+                        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)) {
                             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);
-                        M(e, n) || s.push(e);
+                        S(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++) M(a[e], n) || (s.push(a[e]), 
+                if ("vertex" === t) for (let e = 0; e < a.length; e++) S(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 || 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)) {
+                    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)) {
                         const e = a.length - 1;
                         s.push(a[e]), i && xo(a[e], a[e - 1], a[e], r);
                     }
-                } else M(a[0], n) || (s.push(a[0]), i && xo(a[0], a[0], a[1], r));
+                } else S(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];
-                    M(t, n) || (i && (t.xRotation = 0, t.yRotation = 0, t.zRotation = 0), s.push(t));
+                    S(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 (!S(o = t.mergeOnProperty) && ("string" == typeof o || null !== o.constructor && o.constructor === String)) return [ {
+                if (!M(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;
-                    S(c) ? h.push(e[n]) : (void 0 === l[c] && (l[c] = a.length, a.push({
+                    M(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]));
@@ -6352,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), S(J) && (J = 14)), v && (K = v(null, d), ie(K) ? this.dynamicAttrs.aTextHaloFill = 1 : K = ht([], K)), 
+                    _ && (J = _(this.options.zoom, d), M(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);
@@ -6390,8 +6390,8 @@
                         writingMode: void 0,
                         glyphOffset: [ 0, 0 ]
                     } ];
-                }(), 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))), 
+                }(), 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))), 
                 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), 
@@ -6425,7 +6425,7 @@
                 }, 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 && M(t, me)) continue;
+                    if (me !== 1 / 0 && S(t, me)) continue;
                     const i = t.x, r = t.y;
                     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));
                 }
@@ -6433,9 +6433,10 @@
             _fillPos(e, t, n, i, r, s, o, a, l, h) {
                 this.fillPosition(e, t, n, i);
                 let c = e.aShape.currentIndex;
-                e.aShape[c++] = r, e.aShape[c++] = s, e.aShape.currentIndex = c, c = e.aTexCoord.currentIndex, 
-                e.aTexCoord[c++] = o, e.aTexCoord[c++] = a, "text" !== this.options.pluginType && (e.aTexCoord[c++] = +!!l, 
-                e.aTexCoord[c++] = +!!h), e.aTexCoord.currentIndex = c;
+                e.aShape[c++] = r, e.aShape[c++] = s, e.aShape.currentIndex = c, e.aTexCoord ? (c = e.aTexCoord.currentIndex, 
+                e.aTexCoord[c++] = o, e.aTexCoord[c++] = a, e.aTexCoord.currentIndex = c) : (c = e.aShape.currentIndex, 
+                "text" !== this.options.pluginType ? (e.aShape[c++] = +!!l + (o << 1), e.aShape[c++] = +!!h + (a << 1)) : (e.aShape[c++] = o, 
+                e.aShape[c++] = a), e.aShape.currentIndex = c);
             }
             _fillTextData(e, t, n, i, r, s, o, a) {
                 let l = e.aCount.currentIndex;
@@ -6451,7 +6452,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: 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;
+                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;
                 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], 
@@ -6466,10 +6467,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 (M || D) {
+                if (S || D) {
                     let t = e.aTextHalo.currentIndex;
                     e.aTextHalo[t++] = r || 0, e.aTextHalo.currentIndex = t, t = e.aTextHalo.currentIndex, 
-                    e.aTextHalo[t++] = 255 * (S(s) ? 1 : s), e.aTextHalo.currentIndex = t;
+                    e.aTextHalo[t++] = 255 * (M(s) ? 1 : s), e.aTextHalo.currentIndex = t;
                 }
                 if (P) {
                     let t = e.aTextDx.currentIndex;
@@ -6541,7 +6542,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;
-                S(u) && (u = 80), u *= Math.PI / 180;
+                M(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);
             }
@@ -6555,12 +6556,8 @@
             getPackSDFFormat(e) {
                 if ("line" !== this._textPlacement || e.isIconText) return [ ...this.getPositionFormat(), {
                     type: Int16Array,
-                    width: 2,
+                    width: 4,
                     name: "aShape"
-                }, {
-                    type: Uint16Array,
-                    width: "text" === this.options.pluginType ? 2 : 4,
-                    name: "aTexCoord"
                 }, {
                     type: Uint8Array,
                     width: 1,
@@ -6599,17 +6596,6 @@
                     }), e;
                 }
             }
-            getPackMarkerFormat() {
-                return [ ...this.getPositionFormat(), {
-                    type: Int16Array,
-                    width: 2,
-                    name: "aShape"
-                }, {
-                    type: Uint16Array,
-                    width: 3,
-                    name: "aTexCoord"
-                } ];
-            }
         }
         class To {
             constructor(e) {
@@ -6667,8 +6653,8 @@
                 return Math.atan2(this.y - e.y, this.x - e.x);
             }
         }
-        var wo, Mo = "undefined" != typeof Float32Array ? Float32Array : Array;
-        function So(e, t, n, i) {
+        var wo, So = "undefined" != typeof Float32Array ? Float32Array : Array;
+        function Mo(e, t, n, i) {
             return e[0] = t, e[1] = n, e[2] = i, e;
         }
         function Po(e, t) {
@@ -6692,13 +6678,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 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);
+        }), 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);
         }();
         !function() {
-            var e = new Mo(2);
-            Mo != Float32Array && (e[0] = 0, e[1] = 0);
+            var e = new So(2);
+            So != 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 {
@@ -6906,22 +6892,22 @@
                             t.z = p.z, this.updateDistance(g, t), this.addCurrentVertex(t, y, 0, 0, d), g = t;
                         }
                     }
-                    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(), 
+                    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(), 
                     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" === S) {
+                    o && (d.currentNormal = x, d.dir = m.sub(p)._unit(), this.addCurrentVertex(p, l, 0, 0, d))); else if ("flipbevel" === M) {
                         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" === S || "fakeround" === S) {
+                    } else if ("bevel" === M || "fakeround" === M) {
                         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" === S) {
+                        if (g && this.addCurrentVertex(p, y, t, n, d), "fakeround" === M) {
                             const e = Math.round(180 * A / Math.PI / 20);
                             for (let t = 1; t < e; t++) {
                                 let n = t / e;
@@ -6934,10 +6920,10 @@
                             }
                         }
                         m && (d.currentNormal = x, d.dir = m.sub(p)._unit(), this.addCurrentVertex(p, x, -t, -n, d));
-                    } else if ("butt" === S) this.addCurrentVertex(p, l, 0, 0, d); else if ("square" === S) {
+                    } else if ("butt" === M) this.addCurrentVertex(p, l, 0, 0, d); else if ("square" === M) {
                         const e = g ? 1 : -1;
                         this.addCurrentVertex(p, l, e, e, d);
-                    } else "round" === S && (g && (this.addCurrentVertex(p, y, 0, 0, d), this.addCurrentVertex(p, y, 1, 1, d, !0)), 
+                    } else "round" === M && (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);
@@ -7315,13 +7301,13 @@
             return e.x === t.x && e.y === t.y;
         }
         function wa(e, t, n, 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));
+            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));
         }
-        function Ma(e, t, n) {
+        function Sa(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 Sa(e) {
+        function Ma(e) {
             return e > 0 ? 1 : e < 0 ? -1 : 0;
         }
         function Pa(e, t) {
@@ -7440,7 +7426,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) {
-                    So(Ua, n, i, r), So(Ba, s, o, 0), Io(Ga, Ua, Ba), Po(Ba, Ba), Po(Ga, Ga), ja[t] || (ja[t] = []);
+                    Mo(Ua, n, i, r), Mo(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);
@@ -7497,7 +7483,7 @@
         }
         const Xa = [], Ya = [], Za = [], qa = [], $a = [];
         function Ja(e, t, n, i, r, s, o, a) {
-            So(Ya, n, i, r), So(Za, s, o, 0), Io(qa, Ya, Za), Po(Za, Za), Po(qa, qa), Oo(Xa, e, t);
+            Mo(Ya, n, i, r), Mo(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);
@@ -8038,7 +8024,8 @@
                 this.addCurrentVertex(e, this.distance));
             }
             addLineVertex(e, t) {
-                this.fillPosition(e, t.x, t.y, t.z || 0), this.maxPos = Math.max(this.maxPos, Math.abs(t.x), Math.abs(t.y));
+                const n = this.needAltitudeAttribute();
+                this.fillPosition(e, t.x, t.y, t.z || 0), this.maxPos = n ? Math.max(this.maxPos, Math.abs(t.x), Math.abs(t.y)) : Math.max(this.maxPos, Math.abs(t.x), Math.abs(t.y), Math.abs(t.z || 0));
             }
             addElements(e, t) {
                 this.maxIndex = Math.max(this.maxIndex, this.offset + e, this.offset + t);
@@ -8436,7 +8423,7 @@
     function w(e, t, n) {
         return Math.min(Math.max(t, e), n);
     }
-    function M(e) {
+    function S(e) {
         var t = Math.round(e).toString(16).toUpperCase();
         return t.length < 2 ? "0" + t : t;
     }
@@ -8499,7 +8486,7 @@
         return null;
     }, T.to.hex = function() {
         var e = _(arguments);
-        return "#" + M(e[0]) + M(e[1]) + M(e[2]) + (e[3] < 1 ? M(Math.round(255 * e[3])) : "");
+        return "#" + S(e[0]) + S(e[1]) + S(e[2]) + (e[3] < 1 ? S(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] + ")";
@@ -8515,7 +8502,7 @@
     }, T.to.keyword = function(e) {
         return b[e.slice(0, 3)];
     };
-    var S = u.exports, P = {
+    var M = u.exports, P = {
         exports: {}
     }, I = {
         aliceblue: [ 240, 248, 255 ],
@@ -9031,7 +9018,7 @@
             }(i);
         }));
     }));
-    var G = S, j = B, W = [].slice, X = [ "keyword", "gray", "hex" ], Y = {};
+    var G = M, j = B, W = [].slice, X = [ "keyword", "gray", "hex" ], Y = {};
     Object.keys(j).forEach((function(e) {
         Y[W.call(j[e].labels).sort().join("")] = e;
     }));
@@ -9472,10 +9459,10 @@
     function we(e) {
         return e && "object" == typeof e && (e.stops || e.property && "identity" === e.type || e.expression && "calculate-expression" === e.type);
     }
-    function Me(e) {
+    function Se(e) {
         return Ie(e, "exponential");
     }
-    function Se(e) {
+    function Me(e) {
         return Ie(e, "interval");
     }
     function Pe(e, t) {
@@ -9493,7 +9480,7 @@
         const l = function(e) {
             Object.defineProperty(o, e, {
                 get: function() {
-                    return this["__fn_" + e] || (this["__fn_" + e] = Me(this["_" + e])), this["__fn_" + e].apply(this, t());
+                    return this["__fn_" + e] || (this["__fn_" + e] = Se(this["_" + e])), this["__fn_" + e].apply(this, t());
                 },
                 set: function(t) {
                     this["_" + e] = t;
@@ -10252,9 +10239,9 @@
         return 3 === e.length && (At[3] = 255), At;
     }
     function wt(e, t = 4) {
-        return Mt.bind(this, e, t);
+        return St.bind(this, e, t);
     }
-    function Mt(e, t, n) {
+    function St(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) {
@@ -10263,7 +10250,7 @@
         const i = Q(n).unitArray();
         return 3 === i.length && 4 === t && i.push(1), e && (e[n] = i), i;
     }
-    function St(e, t, n, i) {
+    function Mt(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) {
@@ -12377,7 +12364,7 @@
         if (!e) return "true";
         const t = e[0];
         if (e.length <= 1) return "any" === t ? "false" : "true";
-        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) {
+        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) {
             const i = wn(e);
             return void 0 !== n ? `(${i} + '').indexOf("${t}") === ${n}` : `(${i} + '').indexOf("${t}") >= 0`;
         }(e[1], e[2], e[3]) : "true"})`;
@@ -12385,17 +12372,17 @@
     function wn(e) {
         return "$" === e[0] ? "f." + e.substring(1) : "p[" + JSON.stringify(e) + "]";
     }
-    function Mn(e, t, n, i) {
+    function Sn(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)`, 
-            Sn(o, r, t, n, i));
+            Mn(o, r, t, n, i));
         }(e, t, n, i);
         var r;
-        return Sn(wn(e), e, t, n, i);
+        return Mn(wn(e), e, t, n, i);
     }
-    function Sn(e, t, n, i, r) {
+    function Mn(e, t, n, i, r) {
         const s = "$type" === t ? An.indexOf(n) : JSON.stringify(n);
         return (r ? `typeof ${e}=== typeof ${s}&&` : "") + e + i + s;
     }
@@ -12804,7 +12791,7 @@
         const l = function(e) {
             if (!e) return Jn;
             const t = [];
-            for (let n = 0; n < e.length; n++) we(e[n][1]) && !Me(e[n][1]).isZoomConstant && t.push(e[n][0]);
+            for (let n = 0; n < e.length; n++) we(e[n][1]) && !Se(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));
@@ -12916,7 +12903,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 && (St(e, c, i, r), e.dirty = !0);
+        e.dirty = !0); else e[i] !== c && (Mt(e, c, i, r), e.dirty = !0);
     }
     function ti(e) {
         return Un.isFnTypeSymbol(e);
@@ -13061,7 +13048,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), Mi = new Float32Array(1), Si = [], 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), Si = new Float32Array(1), Mi = [], Pi = e => 0 === e.properties.level, Ii = e => e.properties.level > 0;
     class Ci {
         static getBloomSymbol() {
             return [ "bloom" ];
@@ -13090,7 +13077,7 @@
             return n.getTileLevelValue && n.getTileLevelValue(e, t) || 0;
         }
         getAnalysisMeshes() {
-            return this.getShadowMeshes ? this.getShadowMeshes() : Si;
+            return this.getShadowMeshes ? this.getShadowMeshes() : Mi;
         }
         isVisible() {
             const {minZoom: e, maxZoom: t} = this.sceneConfig, n = this.getMap().getZoom();
@@ -13154,7 +13141,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 Si;
+            if (!e.length) return Mi;
             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,
@@ -13434,7 +13421,7 @@
                     enumerable: !0
                 }) : r[e] = a[e];
             }
-            return we(n.visible) && (this._visibleFn[e] = Me(n.visible)), i;
+            return we(n.visible) && (this._visibleFn[e] = Se(n.visible)), i;
         }
         getSymbolDef(e) {
             return this.symbolDef[e.index];
@@ -13450,7 +13437,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] = Me(this.symbolDef[e].visible));
+            this.symbolDef[e] && we(this.symbolDef[e].visible) && (this._visibleFn[e] = Se(this.symbolDef[e].visible));
         }
         getFnTypeConfig(e) {
             this._fnTypeConfigs || (this._fnTypeConfigs = []);
@@ -13625,7 +13612,7 @@
                 return t;
             }(JSON.stringify(e));
             let a = s[o];
-            return a || (a = s[o] = r ? Se(e) : Me(e)), a(n.getZoom(), i);
+            return a || (a = s[o] = r ? Me(e) : Se(e)), a(n.getZoom(), i);
         }
         highlight(e) {
             this._highlighted = e, this._highlightTimestamp = this.layer.getRenderer().getFrameTimestamp(), 
@@ -13705,25 +13692,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, M = t.length / e.length;
-            let S = e.queryResult;
-            S || (S = e.queryResult = new Map);
+            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);
             let P = !0;
             for (let n = i; n <= s; n++) {
-                let i = t[n * M];
+                let i = t[n * S];
                 i < 0 ? i = 0 : i > a && (i = a);
-                let r = t[n * M + 1];
+                let r = t[n * S + 1];
                 r < 0 ? r = 0 : r > a && (r = a);
                 const s = i + r * a;
-                let l, h, c = S.get(s);
+                let l, h, c = M.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], Mi[0] = c, c = Mi[0]), e[n] !== c && (e[n] = c, 
-                    e.dirty = !0), h && h[1] ? S.set(s, c) : P = !1;
+                    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;
                 }
             }
             _.altitudeQueryFrameTime = (_.altitudeQueryFrameTime || 0) + (performance.now() - v), 
@@ -13933,9 +13920,9 @@
             if (!(t = t && t.geometry)) return;
             const s = t.properties.features;
             if (Vn(s)) return;
-            const o = e.polygonPatternFileWidth, a = e.polygonPatternFileHeight, l = Me(e.polygonPatternFileOrigin);
+            const o = e.polygonPatternFileWidth, a = e.polygonPatternFileHeight, l = Se(e.polygonPatternFileOrigin);
             let h, c;
-            we(o) && (h = Me(o)), we(a) && (c = Me(a));
+            we(o) && (h = Se(o)), we(a) && (c = Se(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++) {
@@ -13963,8 +13950,8 @@
             const r = t.properties.features;
             if (Vn(r)) return;
             const s = this.getMap();
-            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 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 d, p, g;
             for (let e = 0, t = h.length; e < t; e++) {
                 if (h[e] === d) {
@@ -13989,7 +13976,7 @@
             if (!(t = t && t.geometry)) return;
             const r = t.properties.features;
             if (Vn(r)) return;
-            const s = this.getMap(), o = Me(e.polygonPatternFileOrigin), a = t.data.aPickingId, l = a.length, h = new Float32Array(2 * l);
+            const s = this.getMap(), o = Se(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) {
@@ -14004,7 +13991,7 @@
             t.data.aPatternOrigin = h;
         }
         createFnTypeConfig(e, t) {
-            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);
+            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);
             return [ {
                 attrName: "aColor",
                 symbolName: "polygonFill",
@@ -14260,7 +14247,7 @@
             super.paint(e);
         }
         createFnTypeConfig(e, t) {
-            const n = Se(t.lineColor), i = Se(t.aLinePatternAnimSpeed), r = Se(t.aLinePatternGap), s = this.createShapeFnTypeConfigs(e, t), o = new Int8Array(2);
+            const n = Me(t.lineColor), i = Me(t.aLinePatternAnimSpeed), r = Me(t.aLinePatternGap), s = this.createShapeFnTypeConfigs(e, t), o = new Int8Array(2);
             return [ {
                 attrName: "aColor",
                 symbolName: "lineColor",
@@ -14298,7 +14285,7 @@
             } ].concat(s);
         }
         createShapeFnTypeConfigs(e, t) {
-            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);
+            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);
             return [ {
                 attrName: "aLineWidth",
                 symbolName: "lineWidth",
@@ -15514,15 +15501,15 @@
     function Ar(e, t, n) {
         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 = [], Mr = [], Sr = [], Pr = [], Ir = [], Cr = [];
+    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 vec4 aShape;\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 = mod(aShape.z, 2.);\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.xy / 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  vec2 K = floor(aShape.zw / 2.);\n  if(l > .5) {\n    vTexCoord = K / glyphTexSize;\n  } else {\n    vTexCoord = K / iconTexSize;\n  }\n  vHalo = mod(aShape.w, 2.);\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 L = aOpacity == 255.;\n#else\nbool L = true;\n#endif\nfbo_picking_setData(gl_Position.w, L);\n#endif\n}";
+    const wr = [], Sr = [], Mr = [], 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(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), 
+        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), 
         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]);
@@ -15551,7 +15538,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, 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));
+        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));
         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));
@@ -15583,13 +15570,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 M, S, P;
-        w ? (M = w[4 * a + 2], S = w[4 * a + 3]) : (M = x ? x[a] : d.textDx, S = _ ? _[a] : d.textDy), 
+        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), 
         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, M || 0, -(S || 0));
+        const k = b ? C : c.textRotateWithMap, O = n.vec2.set(ns, S || 0, -(M || 0));
         if (p) {
             const {aOffset: r, aShape: s} = f, o = r.length !== s.length;
             let u, d, p, g;
@@ -15766,17 +15753,25 @@
     }
     function fs(e, t, n) {
         const i = e.properties, r = this.getSymbol(i.symbolIndex), s = "line" === i.textPlacement && !It(r), {aPosition: o, aShape: a} = e.data, l = o.length / e.desc.positionSize;
-        if (i.aPickingId = e.data.aPickingId, i.aCount || (i.aCount = e.data.aCount, delete e.data.aCount), 
-        (t || s) && (i.aAnchor = o, i.aShape = a), i.visElemts || (i.elements = e.elements, 
-        i.visElemts = new e.elements.constructor(e.elements.length)), s) {
+        if (i.vertexCount = l, i.aPickingId = e.data.aPickingId, i.aCount || (i.aCount = e.data.aCount, 
+        delete e.data.aCount), t || s) {
+            let e = a;
+            if (a.length === 4 * l) {
+                e = new a.constructor(2 * l);
+                for (let t = 0; t < l; t++) e[2 * t] = a[4 * t], e[2 * t + 1] = a[4 * t + 1];
+            }
+            i.aAnchor = o, i.aShape = e;
+        }
+        if (i.visElemts || (i.elements = e.elements, i.visElemts = new e.elements.constructor(e.elements.length)), 
+        s) {
             const {aVertical: t, aSegment: n, aGlyphOffset: r, aPitchRotation: s} = e.data, o = !!s;
             i.aGlyphOffset = r, i.aPitchRotation = s, i.aSegment = n, i.aVertical = t, delete e.data.aSegment, 
             delete e.data.aVertical, delete e.data.aGlyphOffset, delete e.data.aPitchRotation;
-            const l = a.length / 2 * (o ? 3 : 2);
+            const a = l * (o ? 3 : 2);
             e.data.aOffset = {
                 usage: "dynamic",
-                data: new Int16Array(l)
-            }, i.aOffset = new Int16Array(l);
+                data: new Int16Array(a)
+            }, i.aOffset = new Int16Array(a);
         }
         if (t) {
             e.data.aOpacity = {
@@ -15856,7 +15851,7 @@
         };
     }
     function gs(e, t) {
-        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);
+        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);
         return [ {
             attrName: "aTextFill",
             symbolName: "textFill",
@@ -16037,7 +16032,7 @@
         }(e, t, i) : null;
     }
     const As = [], Ts = [];
-    const ws = 6, Ms = 4, Ss = new Uint16Array(1), Ps = new Int8Array(1);
+    const ws = 6, Ss = 4, Ms = 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;
@@ -16049,7 +16044,10 @@
                 usage: "dynamic",
                 data: r
             }, t.properties.aOpacity = new Uint8Array(i), l && t.properties.aOpacity.fill(255, 0), 
-            t.properties.aAnchor = e, t.properties.aShape = n;
+            t.properties.aAnchor = e;
+            const s = n.length / 4, o = new n.constructor(2 * s);
+            for (let e = 0; e < s; e++) o[2 * e] = n[4 * e], o[2 * e + 1] = n[4 * e + 1];
+            t.properties.aShape = o;
         }
         t.properties.visElemts || (t.properties.elements = t.elements, t.properties.visElemts = new t.elements.constructor(t.elements.length)), 
         u && hs.call(this, t, r, o.text, a, l, h), t.properties.memorySize = t.getMemorySize(), 
@@ -16158,7 +16156,7 @@
         }(e);
     }
     function Rs(e, t) {
-        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);
+        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);
         return [ {
             attrName: "aMarkerWidth",
             symbolName: "markerWidth",
@@ -16348,7 +16346,7 @@
         }(t);
         const s = function(e, t) {
             let n = e.properties.textFitFn;
-            we(t) && (n = e.properties.textFitFn = Se(t));
+            we(t) && (n = e.properties.textFitFn = Me(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 = {
@@ -16398,7 +16396,7 @@
                         let n = 1 / 0, s = 1 / 0, l = -1 / 0, h = -1 / 0;
                         const c = e.properties.textElements;
                         for (let e = o; e < a; e++) {
-                            const t = c[e], r = i[2 * t], o = i[2 * t + 1];
+                            const t = c[e], r = i[4 * t], o = i[4 * t + 1];
                             r < n && (n = r), r > l && (l = r), o < s && (s = o), o > h && (h = o);
                         }
                         t.push(n, s, l, h);
@@ -16415,14 +16413,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 = Me(n.markerTextFit));
+            e || (e = t.properties.textFitFn = Se(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 || Me(s))(null, r);
+                    s = (r.textFitFn = r.textFitFn || Se(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));
@@ -16452,7 +16450,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 = Me(u.textSize);
+        const u = this.getSymbolDef(t.properties.symbolIndex), f = Se(u.textSize);
         Hs.call(this, e, t), (!we(u.textSize) || f.isZoomConstant && f.isFeatureConstant) && (r.isFitConstant = !0);
     }
     const Ls = [ 0, 0, 0, 0 ];
@@ -16463,40 +16461,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 = Me(s));
+        we(s) && (o = n._textSizeFn ? n._textSizeFn : n._textSizeFn = Se(s));
         const a = r.markerTextFitPadding || Ls;
         let l;
-        we(a) && (l = i._paddingFn ? i._paddingFn : i._paddingFn = Se(a));
+        we(a) && (l = i._paddingFn ? i._paddingFn : i._paddingFn = Me(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 || Me(A))(h, b);
+                A = (b.textSizeFn = b.textSizeFn || Se(A))(h, b);
             }
             A /= Lr;
             let T, w = l && l(h, b) || a;
             if (we(w)) {
-                w = (b.fitPaddingFn = b.fitPaddingFn || Se(w))(h, b);
+                w = (b.fitPaddingFn = b.fitPaddingFn || Me(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 (Ss[0] = t, d[e] !== Ss[0] && (St(d, Ss[0], e, e + Ms), d.dirty = !0), T) {
+                if (Ms[0] = t, d[e] !== Ms[0] && (Mt(d, Ms[0], e, e + Ss), 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 + Ms; n++) T[2 * n] = t;
+                        for (let n = e; n < e + Ss; 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 (Ss[0] = t, p[e] !== Ss[0] && (St(p, Ss[0], e, e + Ms), p.dirty = !0), T) {
+                if (Ms[0] = t, p[e] !== Ms[0] && (Mt(p, Ms[0], e, e + Ss), 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 + Ms; n++) T[2 * n + 1] = t;
+                        for (let n = e; n < e + Ss; n++) T[2 * n + 1] = t;
                         T.dirty = !0;
                     }
                 }
@@ -16583,14 +16581,11 @@
             } else t.properties.isEmpty = !0;
         }
         _prepareRequiredProps(e) {
-            const {aCount: t, aTexCoord: n} = e.data;
+            const {aCount: t, aShape: n} = e.data;
             e.properties.aCount = t, delete e.data.aCount;
-            const i = n.length / 4, r = new Uint8Array(i);
-            for (let e = 0; e < i; e++) r[e] = n[4 * e + 2];
-            e.properties.aType = r;
-            const s = new Uint8Array(i);
-            for (let e = 0; e < i; e++) s[e] = n[4 * e + 3];
-            e.properties.aHalo = s, Cs.call(this, e);
+            const i = n.length / 4, r = new Uint8Array(i), s = new Uint8Array(i);
+            for (let e = 0; e < i; e++) r[e] = n[4 * e + 2] % 2, s[e] = n[4 * e + 3] % 2;
+            e.properties.aType = r, e.properties.aHalo = s, Cs.call(this, e);
         }
         prepareCollideIndex(e) {
             const {collideIds: t, elements: n, aCount: i, aType: r} = e.properties;
@@ -16630,7 +16625,7 @@
                     i < n.length && o.fill(e++, i, n.length);
                 } else {
                     let e = 0;
-                    for (let t = 0; t < n.length; t += Ms) o.fill(e++, t, t + Ms);
+                    for (let t = 0; t < n.length; t += Ss) o.fill(e++, t, t + Ss);
                 }
                 e.properties.collideIds = o, e.properties.uniqueCollideIds = kt(o, !t);
             } else if (a) {
@@ -16638,8 +16633,8 @@
                 if (!i) return;
                 let r = 0, s = i[0];
                 for (let e = 0; e < n.length; ) {
-                    const t = e + s * Ms;
-                    n.fill(r++, e, t), e += s * Ms, t < n.length && (s = i[t]);
+                    const t = e + s * Ss;
+                    n.fill(r++, e, t), e += s * Ss, t < n.length && (s = i[t]);
                 }
                 e.properties.uniqueCollideIds = kt(n, !t);
             }
@@ -16929,32 +16924,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]), M = 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]), S = 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 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;
+            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;
             for (;k + O <= w; ) {
-                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;
+                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;
             }
             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);
-                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]);
+                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]);
                 return e[0] = (s[0] - p[0]) / d, e[1] = (s[1] - p[1]) / d, e[2] = o, e;
             }
-            const L = S.sub(P), H = L.mult(F)._add(P);
+            const L = M.sub(P), H = L.mult(F)._add(P);
             H._add(L._unit()._perp()._mult(a * b));
-            const N = A + Math.atan2(S.y - P.y, S.x - P.x);
+            const N = A + Math.atan2(M.y - P.y, M.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 M;
+        return S;
     }
     const $s = [], Js = [];
     function Ks(e, t, i, r, s, o, a, l, h, c, u, f, d) {
@@ -16970,7 +16965,7 @@
         } else m = 0, y = $s[0] > Js[0] ? 1 : 0;
         return 2 * y + m;
     }
-    var Qs = "#define SHADER_NAME TEXT_VERT\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 vec2 aTexCoord;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float textPitchWithMap;\n#endif\n#if defined(HAS_TEXT_ROTATION_ALIGN)\nattribute float aRotationAlign;\n#else\nuniform float textRotateWithMap;\n#endif\nuniform float flipY;\n#if defined(HAS_TEXT_ROTATION)\nattribute float aRotation;\n#else\nuniform float textRotation;\n#endif\nuniform float cameraToCenterDistance;\nuniform mat4 positionMatrix;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform vec2 glyphTexSize;\nuniform vec2 canvasSize;\nuniform float glyphSize;\nuniform float mapPitch;\nuniform float mapRotation;\nuniform float zoomScale;\nuniform float tileRatio;\nuniform float layerScale;\nuniform float isRenderingTerrain;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vTextSize;\nvarying float vOpacity;\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\n#include <vt_position_vert>\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 = aTextDx;\n#else\nfloat e = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat f = aTextDy;\n#else\nfloat f = textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nfloat h = aPitchAlign;\n#else\nfloat h = textPitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nfloat i = aRotationAlign;\n#else\nfloat i = textRotateWithMap;\n#endif\ngl_Position = projViewModelMatrix * positionMatrix * vec4(c, 1.);\n  float j = gl_Position.w;\n  float k;\n  if(isRenderingTerrain == 1. && h == 1.) {\n    k = 1.;\n  } else {\n    float l = (1. - cameraToCenterDistance / j) * textPerspectiveRatio;\n    k = clamp(.5 + .5 * (1. - l), .0, 4.);\n  }\n#ifdef HAS_TEXT_ROTATION\nfloat m = -aRotation / 9362. - mapRotation * i;\n#else\nfloat m = -textRotation - mapRotation * i;\n#endif\nif(h == 1.) {\n    \n#ifdef REVERSE_MAP_ROTATION_ON_PITCH\nm += mapRotation;\n#else\nm -= mapRotation;\n#endif\n  }\n  float n = sin(m);\n  float o = cos(m);\n  mat2 u = mat2(o, -1. * n, n, o);\n  vec2 v = aShape.xy / 10.0;\n  if(h == 1. && flipY == .0) {\n    v = v * vec2(1., -1.);\n  }\n  vec2 A = aTexCoord;\n  v = u * (v / glyphSize * d);\n  float B;\n  if(isRenderingTerrain == 1.) {\n    B = 1.;\n  } else {\n    B = j / cameraToCenterDistance;\n  }\n  if(h == .0) {\n    vec2 C = v * 2. / canvasSize;\n    gl_Position.xy += C * k * j;\n  } else {\n    float D;\n    if(isRenderingTerrain == 1.) {\n      D = tileRatio / zoomScale;\n    } else {\n      D = tileRatio / zoomScale * B * k;\n    }\n    vec2 C = v;\n    gl_Position = projViewModelMatrix * positionMatrix * vec4(c + vec3(C, .0) * D, 1.);\n  }\n  gl_Position.xy += vec2(e, -f) * 2. / canvasSize * j;\n#ifndef PICKING_MODE\nif(h == .0) {\n    vGammaScale = mix(1., B, textPerspectiveRatio);\n  } else {\n    vGammaScale = B + mapPitch / 4.;\n  }\n  vTexCoord = A / glyphTexSize;\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vTextSize = d;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\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 E = aOpacity == 255.;\n#else\nbool E = true;\n#endif\nfbo_picking_setData(gl_Position.w, E);\n#endif\n}", eo = "#define SHADER_NAME TEXT_LINE\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec2 aTexCoord;\n#ifdef HAS_OFFSET_Z\nattribute vec3 aOffset;\nuniform float altitudeScale;\n#else\nattribute vec2 aOffset;\n#endif\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float textPitchWithMap;\n#endif\nuniform float zoomScale;\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform float mapPitch;\nuniform vec2 glyphTexSize;\nuniform vec2 canvasSize;\nuniform float tileRatio;\nuniform float layerScale;\nuniform float isRenderingTerrain;\nuniform float textPitchFilter;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vTextSize;\nvarying float vOpacity;\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\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_TEXT_DX\nfloat d = aTextDx;\n#else\nfloat d = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat e = aTextDy;\n#else\nfloat e = textDy;\n#endif\n#ifdef HAS_TEXT_SIZE\nfloat f = aTextSize * layerScale;\n#else\nfloat f = textSize * layerScale;\n#endif\n#ifdef HAS_PITCH_ALIGN\nfloat h = aPitchAlign;\n#else\nfloat h = textPitchWithMap;\n#endif\ngl_Position = projViewModelMatrix * vec4(c, 1.);\n  float i = gl_Position.w;\n  float j = i / cameraToCenterDistance;\n  float k;\n  if(isRenderingTerrain == 1.) {\n    k = 1.;\n  } else {\n    float l = (1. - cameraToCenterDistance / i) * textPerspectiveRatio;\n    k = clamp(.5 + .5 * (1. - l), .0, 4.);\n  }\n#ifdef HAS_OFFSET_Z\nvec3 m = aOffset / 10.0;\n  m[2] /= altitudeScale;\n#else\nvec3 m = vec3(aOffset / 10.0, .0);\n#endif\nvec2 n = aTexCoord;\n  if(h == 1.) {\n    float o;\n    if(isRenderingTerrain == 1.) {\n      o = tileRatio;\n    } else {\n      o = tileRatio / zoomScale * j * k;\n    }\n    m.xy *= o;\n    gl_Position = projViewModelMatrix * vec4(c + m, 1.);\n  } else {\n    gl_Position.xy += m.xy * 2. / canvasSize * k * i;\n  }\n  gl_Position.xy += vec2(d, -e) * 2. / canvasSize * i;\n  if(textPitchFilter > .0) {\n    if(textPitchFilter == 1. && h == .0 || textPitchFilter == 2. && h == 1.) {\n      gl_Position = vec4(-9999., -9999., .0, 1.);\n    }\n  }\n#ifndef PICKING_MODE\nif(h == 1.) {\n    vGammaScale = j + mapPitch / 4.;\n  } else {\n    vGammaScale = mix(1., j, textPerspectiveRatio);\n  }\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vTexCoord = n / glyphTexSize;\n  vTextSize = f;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\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 u = aOpacity == 255.;\n#else\nbool u = true;\n#endif\nfbo_picking_setData(gl_Position.w, u);\n#endif\n}", to = "#define SHADER_NAME TEXT_FRAG\nprecision mediump float;\nuniform float layerOpacity;\nvarying vec2 vTexCoord;\nvarying float vOpacity;\nuniform float alphaTest;\n#include <text_render_frag>\n#include <highlight_frag>\nvoid main() {\n  gl_FragColor = renderText(vTexCoord) * vOpacity * layerOpacity;\n  if(gl_FragColor.a < alphaTest) {\n    discard;\n  }\n  gl_FragColor = highlight_blendColor(gl_FragColor);\n}";
+    var Qs = "#define SHADER_NAME TEXT_VERT\n#define RAD 0.0174532925\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec4 aShape;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float textPitchWithMap;\n#endif\n#if defined(HAS_TEXT_ROTATION_ALIGN)\nattribute float aRotationAlign;\n#else\nuniform float textRotateWithMap;\n#endif\nuniform float flipY;\n#if defined(HAS_TEXT_ROTATION)\nattribute float aRotation;\n#else\nuniform float textRotation;\n#endif\nuniform float cameraToCenterDistance;\nuniform mat4 positionMatrix;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform vec2 glyphTexSize;\nuniform vec2 canvasSize;\nuniform float glyphSize;\nuniform float mapPitch;\nuniform float mapRotation;\nuniform float zoomScale;\nuniform float tileRatio;\nuniform float layerScale;\nuniform float isRenderingTerrain;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vTextSize;\nvarying float vOpacity;\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\n#include <vt_position_vert>\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 = aTextDx;\n#else\nfloat e = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat f = aTextDy;\n#else\nfloat f = textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nfloat h = aPitchAlign;\n#else\nfloat h = textPitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nfloat i = aRotationAlign;\n#else\nfloat i = textRotateWithMap;\n#endif\ngl_Position = projViewModelMatrix * positionMatrix * vec4(c, 1.);\n  float j = gl_Position.w;\n  float k;\n  if(isRenderingTerrain == 1. && h == 1.) {\n    k = 1.;\n  } else {\n    float l = (1. - cameraToCenterDistance / j) * textPerspectiveRatio;\n    k = clamp(.5 + .5 * (1. - l), .0, 4.);\n  }\n#ifdef HAS_TEXT_ROTATION\nfloat m = -aRotation / 9362. - mapRotation * i;\n#else\nfloat m = -textRotation - mapRotation * i;\n#endif\nif(h == 1.) {\n    \n#ifdef REVERSE_MAP_ROTATION_ON_PITCH\nm += mapRotation;\n#else\nm -= mapRotation;\n#endif\n  }\n  float n = sin(m);\n  float o = cos(m);\n  mat2 u = mat2(o, -1. * n, n, o);\n  vec2 v = aShape.xy / 10.0;\n  if(h == 1. && flipY == .0) {\n    v = v * vec2(1., -1.);\n  }\n  vec2 A = aShape.zw;\n  v = u * (v / glyphSize * d);\n  float B;\n  if(isRenderingTerrain == 1.) {\n    B = 1.;\n  } else {\n    B = j / cameraToCenterDistance;\n  }\n  if(h == .0) {\n    vec2 C = v * 2. / canvasSize;\n    gl_Position.xy += C * k * j;\n  } else {\n    float D;\n    if(isRenderingTerrain == 1.) {\n      D = tileRatio / zoomScale;\n    } else {\n      D = tileRatio / zoomScale * B * k;\n    }\n    vec2 C = v;\n    gl_Position = projViewModelMatrix * positionMatrix * vec4(c + vec3(C, .0) * D, 1.);\n  }\n  gl_Position.xy += vec2(e, -f) * 2. / canvasSize * j;\n#ifndef PICKING_MODE\nif(h == .0) {\n    vGammaScale = mix(1., B, textPerspectiveRatio);\n  } else {\n    vGammaScale = B + mapPitch / 4.;\n  }\n  vTexCoord = A / glyphTexSize;\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vTextSize = d;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\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 E = aOpacity == 255.;\n#else\nbool E = true;\n#endif\nfbo_picking_setData(gl_Position.w, E);\n#endif\n}", eo = "#define SHADER_NAME TEXT_LINE\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec2 aTexCoord;\n#ifdef HAS_OFFSET_Z\nattribute vec3 aOffset;\nuniform float altitudeScale;\n#else\nattribute vec2 aOffset;\n#endif\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float textPitchWithMap;\n#endif\nuniform float zoomScale;\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform float mapPitch;\nuniform vec2 glyphTexSize;\nuniform vec2 canvasSize;\nuniform float tileRatio;\nuniform float layerScale;\nuniform float isRenderingTerrain;\nuniform float textPitchFilter;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vTextSize;\nvarying float vOpacity;\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\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_TEXT_DX\nfloat d = aTextDx;\n#else\nfloat d = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat e = aTextDy;\n#else\nfloat e = textDy;\n#endif\n#ifdef HAS_TEXT_SIZE\nfloat f = aTextSize * layerScale;\n#else\nfloat f = textSize * layerScale;\n#endif\n#ifdef HAS_PITCH_ALIGN\nfloat h = aPitchAlign;\n#else\nfloat h = textPitchWithMap;\n#endif\ngl_Position = projViewModelMatrix * vec4(c, 1.);\n  float i = gl_Position.w;\n  float j = i / cameraToCenterDistance;\n  float k;\n  if(isRenderingTerrain == 1.) {\n    k = 1.;\n  } else {\n    float l = (1. - cameraToCenterDistance / i) * textPerspectiveRatio;\n    k = clamp(.5 + .5 * (1. - l), .0, 4.);\n  }\n#ifdef HAS_OFFSET_Z\nvec3 m = aOffset / 10.0;\n  m[2] /= altitudeScale;\n#else\nvec3 m = vec3(aOffset / 10.0, .0);\n#endif\nvec2 n = aTexCoord;\n  if(h == 1.) {\n    float o;\n    if(isRenderingTerrain == 1.) {\n      o = tileRatio;\n    } else {\n      o = tileRatio / zoomScale * j * k;\n    }\n    m.xy *= o;\n    gl_Position = projViewModelMatrix * vec4(c + m, 1.);\n  } else {\n    gl_Position.xy += m.xy * 2. / canvasSize * k * i;\n  }\n  gl_Position.xy += vec2(d, -e) * 2. / canvasSize * i;\n  if(textPitchFilter > .0) {\n    if(textPitchFilter == 1. && h == .0 || textPitchFilter == 2. && h == 1.) {\n      gl_Position = vec4(-9999., -9999., .0, 1.);\n    }\n  }\n#ifndef PICKING_MODE\nif(h == 1.) {\n    vGammaScale = j + mapPitch / 4.;\n  } else {\n    vGammaScale = mix(1., j, textPerspectiveRatio);\n  }\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vTexCoord = n / glyphTexSize;\n  vTextSize = f;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\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 u = aOpacity == 255.;\n#else\nbool u = true;\n#endif\nfbo_picking_setData(gl_Position.w, u);\n#endif\n}", to = "#define SHADER_NAME TEXT_FRAG\nprecision mediump float;\nuniform float layerOpacity;\nvarying vec2 vTexCoord;\nvarying float vOpacity;\nuniform float alphaTest;\n#include <text_render_frag>\n#include <highlight_frag>\nvoid main() {\n  gl_FragColor = renderText(vTexCoord) * vOpacity * layerOpacity;\n  if(gl_FragColor.a < alphaTest) {\n    discard;\n  }\n  gl_FragColor = highlight_blendColor(gl_FragColor);\n}";
     const {TextUtil: no, PackUtil: io, FilterUtil: ro, TEXT_MAX_ANGLE: so} = h(), oo = function(e) {
         const t = this.layer.getRenderer();
         return !this._isHalo0(e) && t.isTileNearCamera(e) && "line" !== e.geometry.properties.textPlacement;
@@ -16983,7 +16978,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 = [], Mo = [], So = [], 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 = [], So = [], Mo = [], Po = [], Io = [], Co = {}, ko = {}, Oo = {}, Fo = [], Ro = [], Eo = n.mat4.identity([]), Do = [];
     class Lo extends xr {
         static getBloomSymbol() {
             return [ "textBloom" ];
@@ -17043,7 +17038,7 @@
                         }
                         return i;
                     };
-                } else we(t.textName) && (this._textNameFn[e] = Me(t.textName));
+                } else we(t.textName) && (this._textNameFn[e] = Se(t.textName));
             }
         }
         shouldDeleteMeshOnUpdateSymbol(e) {
@@ -17205,29 +17200,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], 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;
+            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;
             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, ...S), C[2] = 100 * e, C = oi(C, C, o, d.width, d.height)) : C = P;
+                e ? (C = n.vec3.set(Ro, ...M), 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 && (S = P), b[3 * w] = C[0], b[3 * w + 1] = C[1], b[3 * w + 2] = C[2];
+            T && (M = 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, S, 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, M, 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, S, 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, M, go, O, N, C, this.layer, o, c) : Io : Po, 
                 !d) {
                     F = !1, f || Ho(y, t, i, r);
                     break;
@@ -17237,8 +17232,8 @@
                 const g = Fr(yo, p, 0, h.textRotateWithMap, h.textPitchWithMap), x = y.length > m.length;
                 let _;
                 if (x) {
-                    n.vec3.set(Mo, v[3 * l], v[3 * l + 1], 0);
-                    const e = n.vec3.normalize(Mo, Mo), t = -v[3 * l + 2];
+                    n.vec3.set(So, v[3 * l], v[3 * l + 1], 0);
+                    const e = n.vec3.normalize(So, So), 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);
@@ -17324,7 +17319,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(So, 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(Mo, e.width, e.height);
             i && n.vec2.set(a, r, r);
             const l = Ue(e.getResolution(), e);
             return {
@@ -17399,7 +17394,7 @@
             h.properties.symbolIndex = r, h;
         }
         createFnTypeConfig(e, t) {
-            const n = Se(t.markerFill);
+            const n = Me(t.markerFill);
             return [ {
                 attrName: "aColor",
                 symbolName: "markerFill",
@@ -17475,7 +17470,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 = Se(this.symbolDef.lineColor);
+                const e = t.getMap(), n = Me(this.symbolDef.lineColor);
                 this.colorSymbol = t => n(e.getZoom(), t);
             }
         }
@@ -17747,7 +17742,7 @@
             return !("line-extrusion" === this.dataConfig.type && !e.altitudeProperty && !t.altitudeProperty);
         }
         createFnTypeConfig(e, t) {
-            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";
+            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";
             return [ {
                 attrName: "aColor",
                 type: Uint8Array,
@@ -18360,7 +18355,7 @@
             r;
         }
         createFnTypeConfig(e, t) {
-            const n = Se(t.lineColor), i = Se(t.aLinePatternAnimSpeed), r = Se(t.aLinePatternGap), s = this.createShapeFnTypeConfigs(e, t), o = new Int8Array(2);
+            const n = Me(t.lineColor), i = Me(t.aLinePatternAnimSpeed), r = Me(t.aLinePatternGap), s = this.createShapeFnTypeConfigs(e, t), o = new Int8Array(2);
             return [ {
                 attrName: "aColor",
                 symbolName: "lineColor",
@@ -18398,7 +18393,7 @@
             } ].concat(s);
         }
         createShapeFnTypeConfigs(e, t) {
-            const n = Me(t.lineWidth), i = Me(t.lineOpacity), r = new Uint16Array(1);
+            const n = Se(t.lineWidth), i = Se(t.lineOpacity), r = new Uint16Array(1);
             return [ {
                 attrName: "aLineWidth",
                 symbolName: "lineWidth",
@@ -18435,7 +18430,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 = [], Ma = [ 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], Sa = e => class extends e {
+    const {PackUtil: da} = h(), pa = [], ga = [], ma = [], ya = [], xa = [], _a = [], va = [ 0, 0, 0 ], ba = [ 0, 0, 0 ], Aa = [ 1, 1, 1 ], Ta = [], wa = [ 1, 1, 1, 1 ], Sa = [], Ma = [ 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], Pa = 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 || {};
@@ -18470,20 +18465,23 @@
             };
         }
         getFnTypeConfig() {
-            return Aa;
+            return Ta;
         }
-        createMesh(e, t, {tileTranslationMatrix: i, tileExtent: r}, {timestamp: s}) {
+        createMesh(e, t, {tileTranslationMatrix: i, tileExtent: r, tilePoint: s}, {timestamp: o}) {
             if (!this._ready) return null;
-            const o = this.getMap(), {geometry: a} = e, {positionSize: l, features: h} = a, {aPosition: c, aPickingId: u, aXYRotation: f, aZRotation: d, aAltitude: p} = a.data, g = c.length / l;
-            if (0 === g) return null;
-            const m = {
-                instance_vectorA: new Float32Array(4 * g),
-                instance_vectorB: new Float32Array(4 * g),
-                instance_vectorC: new Float32Array(4 * g),
+            const a = this.getMap(), {geometry: l} = e, {positionSize: h, features: c} = l;
+            if (!l.data.aPosition || 0 === l.data.aPosition.length) return null;
+            "native-line" === this.dataConfig.type && this._arrangeAlongLine(0, l, s);
+            const {aPosition: u, aPickingId: f, aXYRotation: d, aZRotation: p, aAltitude: g} = l.data;
+            let m = u.length / h;
+            const y = {
+                instance_vectorA: new Float32Array(4 * m),
+                instance_vectorB: new Float32Array(4 * m),
+                instance_vectorC: new Float32Array(4 * m),
                 aPickingId: []
-            }, y = this._updateInstanceData(m, i, r, a.properties.z, c, p, f, d, l, u, h);
-            a.data.aTerrainAltitude && (m.aTerrainAltitude = a.data.aTerrainAltitude);
-            const x = {}, _ = m.aPickingId, v = function(e) {
+            }, x = this._updateInstanceData(y, i, r, l.properties.z, u, g, d, p, h, f, c);
+            l.data.aTerrainAltitude && (y.aTerrainAltitude = l.data.aTerrainAltitude);
+            const _ = {}, v = y.aPickingId, b = function(e) {
                 const t = new Map;
                 for (let n = 0; n < e.length; n++) {
                     const i = e[n];
@@ -18491,54 +18489,54 @@
                     r || (r = [], t.set(i, r)), r.push(n);
                 }
                 return t;
-            }(_);
-            for (const e in m) x[e] = {
+            }(v);
+            for (const e in y) _[e] = {
                 buffer: this.regl.buffer({
-                    dimension: m[e].length / g,
-                    data: m[e]
+                    dimension: y[e].length / m,
+                    data: y[e]
                 }),
                 divisor: 1
             };
-            const b = this._hasFuncType(), A = this._getMeterScale(), T = n.mat4.identity([]);
-            n.mat4.scale(T, T, [ A, A, A ]);
-            const w = [], M = this.getSymbols();
+            const A = this._hasFuncType(), T = this._getMeterScale(), w = n.mat4.identity([]);
+            n.mat4.scale(w, w, [ T, T, T ]);
+            const S = [], 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;
+                const s = this._gltfPack[e][0], {fixSizeOnZoom: h} = t;
                 let c = n.mat4.identity([]);
-                b || (c = this._getSymbolTRSMatrix(c));
+                A || (c = this._getSymbolTRSMatrix(c));
                 let u = 0;
                 r.forEach((e => {
                     const {geometry: i, nodeMatrix: r} = e;
-                    n.mat4.multiply(wa, Ma, r), n.mat4.multiply(wa, c, wa);
-                    const s = n.mat4.multiply(wa, T, wa), o = i.boundingBox.copy();
+                    n.mat4.multiply(Sa, Ma, r), n.mat4.multiply(Sa, c, Sa);
+                    const s = n.mat4.multiply(Sa, w, Sa), 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: M} = r;
-                    t.alphaTest && (b.alphaTest = t.alphaTest);
-                    const S = new (this.getMaterialClazz(b))(b), P = {}, I = new n.reshader.InstancedMesh(x, g, p, S, {
+                    const {geometry: p, materialInfo: g, morphWeights: A, extraInfo: T, nodeIndex: S} = r;
+                    t.alphaTest && (g.alphaTest = t.alphaTest);
+                    const M = new (this.getMaterialClazz(g))(g), P = {}, I = new n.reshader.InstancedMesh(_, m, p, M, {
                         transparent: !1,
                         picking: !0
                     });
-                    if (l.hasSkinAnimation()) {
-                        const t = this._updateAnimation(I, e, 0)[M];
+                    if (s.hasSkinAnimation()) {
+                        const t = this._updateAnimation(I, e, 0)[S];
                         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;
+                        I.properties.startTime = o, P.HAS_SKIN = 1;
                     }
-                    A && (I.setUniform("morphWeights", A), P.HAS_MORPH = 1), I.setUniform("hasAlpha", w.alphaMode && "BLEND" === w.alphaMode.toUpperCase()), 
-                    bt(I.uniforms, "polygonFill", t, "markerFill", Ta, wt(this.colorCache)), bt(I.uniforms, "polygonOpacity", t, "markerOpacity", 1);
+                    A && (I.setUniform("morphWeights", A), P.HAS_MORPH = 1), I.setUniform("hasAlpha", T.alphaMode && "BLEND" === T.alphaMode.toUpperCase()), 
+                    bt(I.uniforms, "polygonFill", t, "markerFill", wa, wt(this.colorCache)), bt(I.uniforms, "polygonOpacity", t, "markerOpacity", 1);
                     const C = [];
                     I.setPositionMatrix((() => {
-                        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);
+                        const t = this._getMeshNodeMatrix(e, d, S);
+                        n.mat4.multiply(C, Ma, t), n.mat4.multiply(C, c, C), n.mat4.multiply(C, w, C);
+                        const i = n.mat4.identity(Sa);
                         if (0 !== u && (n.mat4.fromTranslation(i, f), n.mat4.multiply(C, i, C)), Pt(h)) {
-                            const e = o.getGLScale() / o.getGLScale(h);
+                            const e = a.getGLScale() / a.getGLScale(h);
                             return n.vec3.set(pa, e, e, e), n.mat4.fromScaling(i, pa), n.mat4.multiply(i, i, C);
                         }
                         return C;
@@ -18546,26 +18544,70 @@
                     const k = this.layer.getRenderer().getZScale(), O = [], F = [];
                     return I.setLocalTransform((() => {
                         const e = this.layer.options.altitude || 0;
-                        return n.vec3.copy(F, y), F[2] += 100 * e * k, n.mat4.translate(O, i, F), O;
+                        return n.vec3.copy(F, x), F[2] += 100 * e * k, n.mat4.translate(O, i, F), O;
                     })), p.generateBuffers(this.regl, {
                         excludeElementsInVAO: !0
-                    }), m.instance_color && (P.HAS_INSTANCE_COLOR = 1), m.aTerrainAltitude && (P.HAS_INSTANCE_TERRAIN_ALTITUDE = 1, 
+                    }), y.instance_color && (P.HAS_INSTANCE_COLOR = 1), y.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 = M, I.properties.pickingIdIndiceMap = v, I.setDefines(P), 
+                    P.HAS_LAYER_OPACITY = 1, mt(I.properties, l.properties), I.properties.aPickingId = v, 
+                    I.properties.nodeIndex = S, I.properties.pickingIdIndiceMap = b, I.setDefines(P), 
                     I.properties.symbolIndex = {
                         index: e
                     }, I;
                 }));
-                w.push(...d);
+                S.push(...d);
             }
-            return w.insContext = {
-                instanceData: m,
+            return S.insContext = {
+                instanceData: y,
                 tileTranslationMatrix: i,
                 tileExtent: r,
-                aPosition: c,
-                positionSize: l
-            }, w;
+                aPosition: u,
+                positionSize: h
+            }, S;
+        }
+        _arrangeAlongLine(e, i) {
+            const {tileExtent: r, z: s} = i.properties, {data: o, positionSize: a} = i;
+            let l = this._calGLTFScale(e);
+            const h = this._getMeterScale();
+            l = n.vec3.scale([], l, h);
+            const c = {
+                gapLength: this.dataConfig.gapLength || 0,
+                direction: this.dataConfig.direction || 0,
+                scaleVertex: !0
+            }, u = this._gltfPack[0][0], {aPosition: f, aAltitude: d, aPickingId: p} = o, g = new t.Coordinate(0, 0, 0), m = new t.Coordinate(0, 0, 0), y = [], x = d ? [] : y, _ = [], v = [], b = [], A = [], T = [], w = this.layer.getTileSize().width / r * this.layer.getRenderer().getTileGLScale(s), S = this.layer.getRenderer().getZScale();
+            let M = p[0];
+            for (let e = 0; e < f.length - a; e += a) {
+                const t = p[e / a + 1];
+                if (t !== M) {
+                    M = t;
+                    continue;
+                }
+                d ? n.vec3.set(A, f[e], f[e + 1], d[e / a]) : da.unpackPosition(A, f[e], f[e + 1], f[e + 2]);
+                const [i, r, s] = A;
+                let o = e + a;
+                d ? n.vec3.set(T, f[o], f[o + 1], d[o / a]) : da.unpackPosition(T, f[o], f[o + 1], f[o + 2]);
+                const [h, P, I] = T, C = p[e / a], k = g.set(i * w, r * w, s * S), O = m.set(h * w, P * w, I * S), F = k.distanceTo(O), R = u.arrangeAlongLine(k, O, F, l, 1, c);
+                for (let e = 0; e < R.length; e++) {
+                    const t = R[e];
+                    g.set(i, r, s), m.set(h, P, I);
+                    const n = Ia(g, m, t.t);
+                    y.push(n.x, n.y), x.push(n.z), _.push(C), v.push(-t.rotationZ * Math.PI / 180), 
+                    b.push(t.rotationXY * Math.PI / 180);
+                }
+            }
+            i.data = {
+                aPosition: new f.constructor(y),
+                aPickingId: new p.constructor(_),
+                aZRotation: v,
+                aXYRotation: b
+            }, d && (i.data.aAltitude = new d.constructor(x));
+        }
+        _calGLTFScale(e) {
+            const t = this.getSymbols()[e], i = [ 1, 1, 1 ], r = t.modelHeight;
+            if (r) {
+                this._gltfPack[e][0].calModelHeightScale(i, r);
+            }
+            return n.vec3.set(xa, t.scaleX || 1, t.scaleY || 1, t.scaleZ || 1), n.vec3.multiply(i, i, xa);
         }
         _getMeshNodeMatrix(e, t, n) {
             const i = e, r = this._gltfMeshInfos[i][t];
@@ -18613,7 +18655,7 @@
             n && this.setToRedraw(!0), super.prepareRender(e);
         }
         getShadowMeshes() {
-            if (!this.isVisible()) return Aa;
+            if (!this.isVisible()) return Ta;
             this.shadowCount = this.scene.getMeshes().length;
             return this.scene.getMeshes().filter((e => 0 === e.properties.level));
         }
@@ -18634,25 +18676,25 @@
                 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 M = (y + v) / 2, S = (x + b) / 2, P = (_ + A) / 2, I = [], C = this._hasFuncType(), k = [ 0, 0, 1 ];
+            const S = (y + v) / 2, M = (x + b) / 2, P = (_ + A) / 2, I = [], C = this._hasFuncType(), k = [ 0, 0, 1 ], O = [ 0, 0, 0 ];
             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 - M, -r * p - S, (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 - S, -r * p - M, (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));
+                    const e = n.vec3.set(pa, Math.cos(x), Math.sin(x), 0), t = n.vec3.rotateZ(e, e, O, 90 * Math.PI / 180);
                     n.mat4.rotate(I, I, y, t);
-                    const s = n.mat4.fromTranslation(wa, d);
-                    n.mat4.multiply(I, s, I);
+                    const i = n.mat4.fromTranslation(Sa, d);
+                    n.mat4.multiply(I, i, I);
                 } else n.mat4.fromTranslation(I, d);
                 if (C) {
-                    const e = this._getSymbolTRSMatrix(wa, u, c, t);
+                    const e = this._getSymbolTRSMatrix(Sa, u, c, t);
                     n.mat4.multiply(I, I, e);
                 }
                 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, M, S, P), T;
+            return n.vec3.set(T, S, M, P), T;
         }
         _getMeterScale() {
             if (!this._meterScale) {
@@ -18689,11 +18731,11 @@
         }
         _initTRSFuncType() {
             const e = this.symbolDef[0];
-            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));
+            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));
         }
         _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);
@@ -18755,27 +18797,34 @@
             delete this._nodeMatrixMap;
         }
         _getGLTFMatrix(e, t, i, r) {
-            const s = n.vec3.set(pa, ...t || _a), o = i || va, a = r || ba, l = n.quat.fromEuler(xa, o[0], o[1], o[2]);
+            const s = n.vec3.set(pa, ...t || va), o = i || ba, a = r || Aa, l = n.quat.fromEuler(_a, o[0], o[1], o[2]);
             return n.mat4.fromRotationTranslationScale(e, l, s, a);
         }
     };
-    class Pa extends(Sa(ra)){
+    function Ia(e, t, n) {
+        const i = Ca(e.x, t.x, n), r = Ca(e.y, t.y, n), s = Ca(e.z || 0, t.z || 0, n);
+        return new e.constructor(i, r, s);
+    }
+    function Ca(e, t, n) {
+        return e + n * (t - e);
+    }
+    class ka extends(Pa(ra)){
         getMaterialClazz(e) {
             return e.diffuseFactor ? n.reshader.PhongSpecularGlossinessMaterial : n.reshader.PhongMaterial;
         }
     }
-    class Ia extends(Sa(la)){
+    class Oa extends(Pa(la)){
         getMaterialClazz(e) {
             return e.specularGlossinessTexture || e.diffuseTexture ? n.reshader.pbr.StandardSpecularGlossinessMaterial : n.reshader.pbr.StandardMaterial;
         }
     }
-    const {getPBRUniforms: Ca} = n.reshader.pbr.PBRUtils, ka = {
+    const {getPBRUniforms: Fa} = n.reshader.pbr.PBRUtils, Ra = {
         color: [ 2.0303, 2.028, 2.028 ],
         direction: [ 0, -.2717, -1 ]
-    }, Oa = .3737, Fa = {
+    }, Ea = .3737, Da = {
         index: 0
-    }, Ra = [ 0, 0, 0 ], Ea = [ 2, 2 ];
-    class Da extends Fi {
+    }, La = [ 0, 0, 0 ], Ha = [ 2, 2 ];
+    class Na extends Fi {
         supportRenderMode(e) {
             return "fxaa" === e || "fxaaBeforeTaa" === e;
         }
@@ -18790,7 +18839,7 @@
         }
         needToRedraw() {
             if (super.needToRedraw()) return !0;
-            return this.getSymbol(Fa).animation;
+            return this.getSymbol(Da).animation;
         }
         createMesh(e, t) {
             const {geometry: i} = e;
@@ -18799,7 +18848,7 @@
                 castShadow: !1,
                 picking: !0
             });
-            return r.properties.symbolIndex = Fa, r.setLocalTransform(t), r;
+            return r.properties.symbolIndex = Da, r.setLocalTransform(t), r;
         }
         callShader(e, t) {
             super.callShader(e, t), this.transformWater();
@@ -18810,13 +18859,13 @@
             this._prepareMesh(e, t), super.addMesh(...arguments);
         }
         _prepareMesh(e) {
-            const t = this.getSymbol(Fa).ssr;
+            const t = this.getSymbol(Da).ssr;
             for (let n = 0; n < e.length; n++) e[n].ssr = t ? 1 : 0;
         }
         paint(e) {
             e.states && e.states.includesChanged && (this.shader.dispose(), this._waterShader.dispose(), 
             this._createShader(e));
-            const t = !!e.ssr && this.getSymbol(Fa).ssr, n = this._waterShader, i = n.shaderDefines;
+            const t = !!e.ssr && this.getSymbol(Da).ssr, n = this._waterShader, i = n.shaderDefines;
             if (t) {
                 const t = mt({}, i, e.ssr.defines);
                 n.shaderDefines = t;
@@ -18912,7 +18961,7 @@
                     return n.mat3.fromRotation(i, Math.PI * r / 180);
                 }
             } ], s = {
-                TIME_NOISE_TEXTURE_REPEAT: Oa
+                TIME_NOISE_TEXTURE_REPEAT: Ea
             };
             this.fillIncludes(s, r, e);
             const o = {
@@ -18995,24 +19044,24 @@
             };
         }
         _getWaterUniform(e, t) {
-            const {iblTexes: i, dfgLUT: r} = this.getIBLRes(), s = Ca(e, i, r, t && t.ssr, t && t.jitter), o = e.getLightManager();
+            const {iblTexes: i, dfgLUT: r} = this.getIBLRes(), s = Fa(e, i, r, t && t.ssr, t && t.jitter), o = e.getLightManager();
             let a = o && o.getDirectionalLight() || {};
-            const l = o && o.getAmbientLight() || {}, h = this.getSymbol(Fa), c = this._waterDir = this._waterDir || [], u = this._waveParams = this._waveParams || [];
+            const l = o && o.getAmbientLight() || {}, h = this.getSymbol(Da), c = this._waterDir = this._waterDir || [], u = this._waveParams = this._waveParams || [];
             n.vec4.set(u, .09, h.uvScale || 3, .03, -.5);
             mt(s, {
                 ambientColor: l.color || [ .2, .2, .2 ],
                 viewMatrix: e.viewMatrix,
-                lightDirection: a.direction || ka.direction,
-                lightColor: a.color || ka.color,
+                lightDirection: a.direction || Ra.direction,
+                lightColor: a.color || Ra.color,
                 camPos: e.cameraPosition,
                 timeElapsed: h.animation ? (this.layer.getRenderer().getFrameTimestamp() || 0) / (1 / (h.waterSpeed || 1) * 1e4) : 0,
                 normalTexture: this._normalTex || this._emptyTex,
                 heightTexture: this._pertTex || this._emptyTex,
                 waveParams: u,
-                waterDir: La(c, h.waterDirection || 0),
+                waterDir: za(c, h.waterDirection || 0),
                 waterBaseColor: h.waterBaseColor || [ .1451, .2588, .4863, 1 ],
                 contrast: h.contrast || 1,
-                hsv: h.hsv || Ra
+                hsv: h.hsv || La
             });
             const f = this.layer.getRenderer();
             return s.layerOpacity = f._getLayerOpacity(), this.setIncludeUniformValues(s, t), 
@@ -19035,43 +19084,43 @@
         transformWater() {
             const e = this.getMap(), t = n.GroundPainter.getGroundTransform(this._water.localTransform, e);
             this._water.setLocalTransform(t);
-            const i = e._get2DExtentAtRes(e.getGLRes()), r = i.getWidth(), s = i.getHeight(), o = e.cameraLookAt, a = o[0] - r, l = o[1] + s, h = a / Ea[0], c = l / Ea[1], u = h % 1, f = c % 1, d = h * Oa % 1, p = c * Oa % 1, g = r / Ea[0] * 2, m = s / Ea[1] * 2;
+            const i = e._get2DExtentAtRes(e.getGLRes()), r = i.getWidth(), s = i.getHeight(), o = e.cameraLookAt, a = o[0] - r, l = o[1] + s, h = a / Ha[0], c = l / Ha[1], u = h % 1, f = c % 1, d = h * Ea % 1, p = c * Ea % 1, g = r / Ha[0] * 2, m = s / Ha[1] * 2;
             this._water.setUniform("uvOffset", [ u, f ]), this._water.setUniform("noiseUvOffset", [ d, p ]), 
             this._water.setUniform("uvScale", [ g, -m ]);
         }
     }
-    function La(e, t) {
+    function za(e, t) {
         var n;
         return n = t, t = Math.PI * n / 180, e[0] = Math.sin(t), e[1] = Math.cos(t), e;
     }
-    const Ha = zn("fill", Xi);
-    Ha.registerAt(en);
-    const Na = zn("line", $i);
-    Na.registerAt(en);
-    const za = zn("line-gradient", ar);
-    za.registerAt(en);
-    const Va = zn("icon", js);
+    const Va = zn("fill", Xi);
     Va.registerAt(en);
-    const Ua = zn("text", Lo);
+    const Ua = zn("line", $i);
     Ua.registerAt(en);
-    const Ba = zn("native-line", jo);
+    const Ba = zn("line-gradient", ar);
     Ba.registerAt(en);
-    zn("native-point", Uo).registerAt(en);
-    const Ga = zn("phong", ra);
+    const Ga = zn("icon", js);
     Ga.registerAt(en);
-    const ja = zn("wireframe", oa);
+    const ja = zn("text", Lo);
     ja.registerAt(en);
-    const Wa = zn("lit", la);
+    const Wa = zn("native-line", jo);
     Wa.registerAt(en);
-    const Xa = zn("tube", fa);
+    zn("native-point", Uo).registerAt(en);
+    const Xa = zn("phong", ra);
     Xa.registerAt(en);
-    const Ya = zn("gltf-phong", Pa);
+    const Ya = zn("wireframe", oa);
     Ya.registerAt(en);
-    const Za = zn("gltf-lit", Ia);
+    const Za = zn("lit", la);
     Za.registerAt(en);
-    const qa = zn("heatmap", class extends Fi {
+    const qa = zn("tube", fa);
+    qa.registerAt(en);
+    const $a = zn("gltf-phong", ka);
+    $a.registerAt(en);
+    const Ja = zn("gltf-lit", Oa);
+    Ja.registerAt(en);
+    const Ka = zn("heatmap", class extends Fi {
         createFnTypeConfig(e, t) {
-            const n = Me(t.heatmapWeight), i = new Int16Array(1);
+            const n = Se(t.heatmapWeight), i = new Int16Array(1);
             return [ {
                 attrName: "aWeight",
                 symbolName: "heatmapWeight",
@@ -19132,25 +19181,25 @@
             this._process = new n.HeatmapProcess(this.regl, this.sceneConfig, this.layer, i.heatmapColor, null, t);
         }
     });
-    qa.registerAt(en);
-    const $a = zn("water", Da);
-    $a.registerAt(en), ln.registerPainter("lit", la), ln.registerPainter("icon", js), 
+    Ka.registerAt(en);
+    const Qa = zn("water", Na);
+    Qa.registerAt(en), ln.registerPainter("lit", la), ln.registerPainter("icon", js), 
     ln.registerPainter("fill", Xi), ln.registerPainter("line", $i), ln.registerPainter("line-gradient", ar), 
-    ln.registerPainter("water", Da), ln.registerPainter("tube", fa);
-    class Ja extends en {
+    ln.registerPainter("water", Na), ln.registerPainter("tube", fa);
+    class el extends en {
         getTileUrl(e, t, n) {
             const i = this.getMap().getResolution(n);
             return super.getTileUrl(e, t, function(e) {
-                return 19 - Math.log(e / Ka) / Math.LN2;
+                return 19 - Math.log(e / tl) / Math.LN2;
             }(i));
         }
         static fromJSON(e) {
-            return e && "MapboxVectorTileLayer" === e.type ? new Ja(e.id, e.options) : null;
+            return e && "MapboxVectorTileLayer" === e.type ? new el(e.id, e.options) : null;
         }
     }
-    Ja.registerJSONType("MapboxVectorTileLayer");
-    const Ka = 12756274 * Math.PI / (256 * Math.pow(2, 20));
-    class Qa extends en {
+    el.registerJSONType("MapboxVectorTileLayer");
+    const tl = 12756274 * Math.PI / (256 * Math.pow(2, 20));
+    class nl extends en {
         constructor(e, t) {
             (t = t || {}).spatialReference = null, super(e, t), this.setData(t.data);
         }
@@ -19193,7 +19242,7 @@
         getWorkerOptions() {
             const e = super.getWorkerOptions();
             let t = this.options.data;
-            return Re(t) || t && t.url ? (t.url && (t = JSON.parse(JSON.stringify(t))), t = tl(t, this.getURLModifier())) : t = this.features, 
+            return Re(t) || t && t.url ? (t.url && (t = JSON.parse(JSON.stringify(t))), t = rl(t, this.getURLModifier())) : t = this.features, 
             e.data = t, e.tileBuffer = this.options.tileBuffer, e.extent = this.options.extent, 
             e.hasAltitude = this.options.enableAltitude, e.simplifyTolerance = this.options.simplifyTolerance, 
             e.projection = this.getSpatialReference().getProjection().code, e.generateOMBB = this.options.generateOMBB, 
@@ -19217,7 +19266,7 @@
                 const t = e.getWorkerConnection();
                 if (t) {
                     let n = this.options.data;
-                    Re(n) || n && n.url ? (n.url && (n = JSON.parse(JSON.stringify(n))), n = tl(n, this.getURLModifier())) : n = this.features, 
+                    Re(n) || n && n.url ? (n.url && (n = JSON.parse(JSON.stringify(n))), n = rl(n, this.getURLModifier())) : n = this.features, 
                     t.setData(n, ((t, n) => {
                         e.clear(), this.onWorkerReady(null, n), e.setToRedraw(), setTimeout((() => {
                             e.setToRedraw();
@@ -19253,7 +19302,7 @@
             return this._idMaps[e];
         }
         static fromJSON(e) {
-            return e && "GeoJSONVectorTileLayer" === e.type ? new Qa(e.id, e.options) : null;
+            return e && "GeoJSONVectorTileLayer" === e.type ? new nl(e.id, e.options) : null;
         }
         getGeometryById(e) {
             return this._idMaps ? this._idMaps[e] : null;
@@ -19283,14 +19332,14 @@
             }));
         }
     }
-    function el(e) {
+    function il(e) {
         let t = document.createElement("a");
         return t.href = e, e = t.href, t = null, e;
     }
-    function tl(e, t) {
-        return e.url ? e.url = t ? t(e.url) : el(e.url) : e = t ? t(e) : el(e), e;
+    function rl(e, t) {
+        return e.url ? e.url = t ? t(e.url) : il(e.url) : e = t ? t(e) : il(e), e;
     }
-    Qa.registerJSONType("GeoJSONVectorTileLayer"), Qa.mergeOptions({
+    nl.registerJSONType("GeoJSONVectorTileLayer"), nl.mergeOptions({
         features: "id",
         tileBuffer: 64,
         extent: 8192,
@@ -19299,12 +19348,12 @@
         tileStackDepth: 0,
         generateOMBB: !0
     });
-    const {SYMBOLS_NEED_REBUILD_IN_VECTOR: nl, GlyphRequestor: il, PointPack: rl, LinePack: sl, StyledPoint: ol, VectorPack: al, StyledVector: ll} = h();
-    let hl = !1, cl = 1;
-    const ul = "_symbol_".trim(), fl = (st + "").trim();
-    let dl = new Float32Array(1);
-    const pl = [];
-    class gl extends r.renderer.CanvasRenderer {
+    const {SYMBOLS_NEED_REBUILD_IN_VECTOR: sl, GlyphRequestor: ol, PointPack: al, LinePack: ll, StyledPoint: hl, VectorPack: cl, StyledVector: ul} = h();
+    let fl = !1, dl = 1;
+    const pl = "_symbol_".trim(), gl = (st + "").trim();
+    let ml = new Float32Array(1);
+    const yl = [];
+    class xl extends r.renderer.CanvasRenderer {
         constructor(...e) {
             super(...e), this.features = {}, this._geometries = {}, this._counter = 0, this._allFeatures = {}, 
             this._featureMapping = {}, this._markerFeatures = {}, this._textFeatures = {}, this._lineFeatures = {}, 
@@ -19324,7 +19373,7 @@
             return e || (this.painter && this.painter.needToRedraw() || this._markerPainter && this._markerPainter.needToRedraw() || this._linePainter && this._linePainter.needToRedraw());
         }
         getAnalysisMeshes() {
-            return this.painter && this.painter.getAnalysisMeshes() || pl;
+            return this.painter && this.painter.getAnalysisMeshes() || yl;
         }
         getRayCastData() {
             return null;
@@ -19425,12 +19474,12 @@
                 if (!this.features[o]) continue;
                 const a = this.features[o];
                 if (Array.isArray(a)) for (let r = 0; r < a.length; r++) {
-                    const s = a[r], o = s[fl];
+                    const s = a[r], o = s[gl];
                     (!e || e[o] || t && (!t || t[o])) && (s.visible || (this._showHideUpdated = !0), 
                     this._addCoordsToCenter(s.geometry, i, s.coordinates), n.push(s));
                 } else {
                     a.visible || (this._showHideUpdated = !0);
-                    const r = a[fl];
+                    const r = a[gl];
                     if (e && !e[r] && (!t || t && !t[r])) continue;
                     this._addCoordsToCenter(a.geometry, i, a.coordinates), n.push(a);
                 }
@@ -19487,8 +19536,8 @@
         _addCoord(e, t, n, i, r, s) {
             const o = this.getMap().getProjection().isSphere();
             let a = !1;
-            (s[0] > 180 || s[0] < -180) && (a = !0, o && !hl && (hl = !0, console.warn(`Layer(${this.layer.getId()}) has invalid longitude value: ${s[0]}`))), 
-            (s[1] > 90 || s[1] < -90) && (a = !0, o && !hl && (hl = !0, console.warn(`Layer(${this.layer.getId()}) has invalid latitude value: ${s[1]}`))), 
+            (s[0] > 180 || s[0] < -180) && (a = !0, o && !fl && (fl = !0, console.warn(`Layer(${this.layer.getId()}) has invalid longitude value: ${s[0]}`))), 
+            (s[1] > 90 || s[1] < -90) && (a = !0, o && !fl && (fl = !0, console.warn(`Layer(${this.layer.getId()}) has invalid latitude value: ${s[1]}`))), 
             a || (e[0] += t, e[1] += n, e[2] += i || 0, e[3] += r);
         }
         _fillCommonProps(e) {
@@ -19497,7 +19546,7 @@
             n.aPickingId = e.data.aPickingId;
         }
         _isEnableWorkAround(e) {
-            return "win-intel-gpu-crash" === e && (this.layer.options.workarounds["win-intel-gpu-crash"] && yl(this.gl));
+            return "win-intel-gpu-crash" === e && (this.layer.options.workarounds["win-intel-gpu-crash"] && vl(this.gl));
         }
         prepareRequestors() {
             if (this._iconRequestor) return;
@@ -19510,7 +19559,7 @@
                 }
             });
             const t = !this._isEnableWorkAround("win-intel-gpu-crash");
-            this._glyphRequestor = new il((t => {
+            this._glyphRequestor = new ol((t => {
                 e.getMap().getRenderer().callInNextFrame(t);
             }), e.options.glyphSdfLimitPerFrame, t), this.requestor = this._fetchPattern.bind(this), 
             this._markerRequestor = this._fetchIconGlyphs.bind(this);
@@ -19543,7 +19592,7 @@
             delete this._markerMeshes));
             const {features: r, center: s} = this._getFeaturesToRender(this._markerFeatures, this._textFeatures), o = [], a = [];
             for (let e = 0; e < r.length; e++) {
-                const t = r[e][fl];
+                const t = r[e][gl];
                 this._markerFeatures[t] && o.push(r[e]), this._textFeatures[t] && a.push(r[e]);
             }
             if (!o.length && !a.length) return void (this._markerMeshes && (this._markerPainter.deleteMesh(this._markerMeshes), 
@@ -19565,7 +19614,7 @@
                 n.mat4.translate(o, o, n.vec3.set(u, s[0], s[1], 0)), n.mat4.scale(o, o, n.vec3.set(c, 1, 1, this._zScale));
                 const a = this._markerPainter.createMeshes(t, o);
                 for (let e = 0; e < a.length; e++) a[e].geometry.properties.originElements = a[e].geometry.properties.elements.slice(), 
-                a[e].properties.level = 0, a[e].material.set("flipY", 1), a[e].properties.meshKey = cl++;
+                a[e].properties.level = 0, a[e].material.set("flipY", 1), a[e].properties.meshKey = dl++;
                 this._markerMeshes = a, l && (this._showHideUpdated = !0), this._isCreatingMarkerMesh = !1, 
                 this.setToRedraw(), this.layer.fire("buildmarkermesh");
             }));
@@ -19601,7 +19650,7 @@
                 markerHeightType: Uint16Array,
                 allowEmptyPack: 1
             };
-            return [ this._markerSymbol ].map(((n, i) => new rl(0 === i ? e : t, n, r).load()));
+            return [ this._markerSymbol ].map(((n, i) => new al(0 === i ? e : t, n, r).load()));
         }
         updateMesh() {}
         _updateMarkerMesh(e) {
@@ -19615,15 +19664,15 @@
             const s = [], o = [], a = [], l = this.getMap().getZoom();
             let h, c;
             h = Array.isArray(t) ? t.map((e => e ? Pe(e, (() => (s[0] = l, s))) : e)) : Pe(t, (() => (s[0] = l, 
-            s))), c = Array.isArray(t) ? t.map((e => e ? al.genFnTypes(e) : e)) : al.genFnTypes(t);
+            s))), c = Array.isArray(t) ? t.map((e => e ? cl.genFnTypes(e) : e)) : cl.genFnTypes(t);
             for (let e = 0; e < r.length; e++) {
                 if (!r[e]) continue;
-                const i = Array.isArray(t) ? t[e] : t, s = Array.isArray(h) ? h[e] : h, o = Array.isArray(c) ? c[e] : c, a = new ol(r, i, s, o, n).getIconAndGlyph();
-                if (!this._markerAtlas || !rl.isAtlasLoaded(a, this._markerAtlas)) return this._markRebuild(), 
+                const i = Array.isArray(t) ? t[e] : t, s = Array.isArray(h) ? h[e] : h, o = Array.isArray(c) ? c[e] : c, a = new hl(r, i, s, o, n).getIconAndGlyph();
+                if (!this._markerAtlas || !al.isAtlasLoaded(a, this._markerAtlas)) return this._markRebuild(), 
                 this.setToRedraw(), !1;
             }
             for (let e = 0; e < r.length; e++) {
-                const t = r[e][fl];
+                const t = r[e][gl];
                 this._markerFeatures[t] && o.push(r[e]), this._textFeatures[t] && a.push(r[e]);
             }
             const u = r[0].id, f = this._createPointPacks(o, a, this._markerAtlas, this._markerCenter), d = this._markerMeshes;
@@ -19645,7 +19694,7 @@
             })), !0;
         }
         _updateLineMesh(e) {
-            return this._updateMesh(e, this._lineMeshes, this._lineAtlas, this._lineCenter, this._linePainter, sl, Qi, this._groupLineFeas);
+            return this._updateMesh(e, this._lineMeshes, this._lineAtlas, this._lineCenter, this._linePainter, ll, Qi, this._groupLineFeas);
         }
         _updateMesh(e, t, n, i, r, s, o, a) {
             if (!t) return !1;
@@ -19659,8 +19708,8 @@
             for (let e = 0; e < u.length; e++) {
                 const t = u[e];
                 if (!t) continue;
-                const i = Array.isArray(l) ? l[e] : l, r = al.genFnTypes(i), o = new ll(u, i, r, h), a = s === sl ? o.getLineResource() : o.getPolygonResource();
-                if (!al.isAtlasLoaded(a, n[e])) return this._markRebuild(), this.setToRedraw(), 
+                const i = Array.isArray(l) ? l[e] : l, r = cl.genFnTypes(i), o = new ul(u, i, r, h), a = s === ll ? o.getLineResource() : o.getPolygonResource();
+                if (!cl.isAtlasLoaded(a, n[e])) return this._markRebuild(), this.setToRedraw(), 
                 !1;
                 f.push(t);
             }
@@ -19698,7 +19747,7 @@
                     let n = r + 1;
                     for (;i[n] === t; ) n++;
                     const s = n - r, o = e.geometry.desc.positionSize;
-                    dl.length !== 3 * s && (dl = new Float32Array(s * o), dl.fill(-1 / 0, 0)), e.geometry.updateSubData(e.geometry.desc.positionAttribute, dl, r * o);
+                    ml.length !== 3 * s && (ml = new Float32Array(s * o), ml.fill(-1 / 0, 0)), e.geometry.updateSubData(e.geometry.desc.positionAttribute, ml, r * o);
                 }
                 this.layer.fire("updatemesh"), this.setToRedraw();
             }
@@ -19710,7 +19759,7 @@
             if (!t.length) return;
             const i = this._showHideUpdated;
             this._lineCenter = n;
-            const r = this._groupLineFeas(t), s = Fe({}, Qi), o = r.map(((t, i) => this.createMesh(this._linePainter, sl, s, t, e && e[i], n)));
+            const r = this._groupLineFeas(t), s = Fe({}, Qi), o = r.map(((t, i) => this.createMesh(this._linePainter, ll, s, t, e && e[i], n)));
             this._isCreatingLineMesh = !0, Promise.all(o).then((e => {
                 this._lineMeshes && this._linePainter.deleteMesh(this._lineMeshes);
                 const t = [], n = [];
@@ -19729,10 +19778,10 @@
             }));
         }
         _groupLineFeas(e) {
-            const t = (ul + "lineDasharray").trim(), n = (ul + "linePatternFile").trim(), i = [], r = [], s = [];
+            const t = (pl + "lineDasharray").trim(), n = (pl + "linePatternFile").trim(), i = [], r = [], s = [];
             for (let o = 0; o < e.length; o++) {
                 const a = e[o], l = a.properties && a.properties[t];
-                l && Tl(l) ? s.push(a) : a.properties && a.properties[n] ? r.push(a) : i.push(a);
+                l && Ml(l) ? s.push(a) : a.properties && a.properties[n] ? r.push(a) : i.push(a);
             }
             return [ i, r, s ];
         }
@@ -19766,23 +19815,23 @@
             if (!e) return;
             const n = Array.isArray(e) ? e[0].id : e.id;
             if (this._featureMapping[n] = e, Array.isArray(e)) for (let n = 0; n < e.length; n++) {
-                const i = e[n][fl];
+                const i = e[n][gl];
                 if (e[n][ir] = t, this._allFeatures[i] = {
                     feature: e[n]
                 }, this._allFeatures[i][ir] = t, !this.needCheckPointLineSymbols()) continue;
                 const r = {
                     feature: e[n]
                 };
-                (xl(e[n]) || _l(e[n])) && (this._markerFeatures[i] = r), _l(e[n]) && (this._textFeatures[i] = r), 
-                Al(e[n]) && (this._lineFeatures[i] = r);
+                (bl(e[n]) || Al(e[n])) && (this._markerFeatures[i] = r), Al(e[n]) && (this._textFeatures[i] = r), 
+                Sl(e[n]) && (this._lineFeatures[i] = r);
             } else {
                 e[ir] = t;
                 const n = {
                     feature: e
-                }, i = e[fl];
+                }, i = e[gl];
                 if (this._allFeatures[i] = n, !this.needCheckPointLineSymbols()) return;
-                (xl(e) || _l(e)) && (this._markerFeatures[i] = n), _l(e) && (this._textFeatures[i] = n), 
-                Al(e) && (this._lineFeatures[i] = n);
+                (bl(e) || Al(e)) && (this._markerFeatures[i] = n), Al(e) && (this._textFeatures[i] = n), 
+                Sl(e) && (this._lineFeatures[i] = n);
             }
         }
         needCheckPointLineSymbols() {
@@ -19791,11 +19840,11 @@
         _removeFeatures(e) {
             const t = this.features[e];
             if (t) if (Array.isArray(t)) for (let e = 0; e < t.length; e++) {
-                const n = t[e][fl], i = t[e].id;
+                const n = t[e][gl], i = t[e].id;
                 delete this._featureMapping[i], delete this._allFeatures[n], delete this._markerFeatures[n], 
                 delete this._textFeatures[n], delete this._lineFeatures[n];
             } else {
-                const e = t[fl], n = t.id;
+                const e = t[gl], n = t.id;
                 delete this._featureMapping[n], delete this._allFeatures[e], delete this._markerFeatures[e], 
                 delete this._textFeatures[e], delete this._lineFeatures[e];
             }
@@ -19815,7 +19864,7 @@
         }
         _getFeaKeyId(e) {
             const t = e[ir], n = this.features[t];
-            return Array.isArray(n) ? n[0][fl] : n[fl];
+            return Array.isArray(n) ? n[0][gl] : n[gl];
         }
         _updateDirtyTargets() {
             let e = !1;
@@ -19834,14 +19883,14 @@
                     e = e || t;
                 }
             }
-            this._dirtyTargetsInCurrentFrame = {}, e && (ml(this), this.layer.fire("partialupdate"));
+            this._dirtyTargetsInCurrentFrame = {}, e && (_l(this), this.layer.fire("partialupdate"));
         }
         _convertAndRebuild(e) {
-            this._convertGeo(e), this._markRebuild(), ml(this);
+            this._convertGeo(e), this._markRebuild(), _l(this);
         }
         onGeometryAdd(e) {
             this.setToRedraw(), this.canvas && e && e.length && (this._convertGeometries(e), 
-            this._markRebuild(), ml(this));
+            this._markRebuild(), _l(this));
         }
         onGeometryRemove(e) {
             if (e && e.length) {
@@ -19849,7 +19898,7 @@
                     const n = e[t][ir];
                     void 0 !== n && (delete this._geometries[n], this._removeFeatures(n), delete this.features[n]);
                 }
-                this._markRebuild(), ml(this);
+                this._markRebuild(), _l(this);
             }
         }
         onGeometrySymbolChange(e) {
@@ -19865,26 +19914,26 @@
                 for (const t in i) i[t] && Fe(e, i[t]);
                 i = e;
             }
-            for (const e in i) if (Ve(i, e) && nl[e]) return void this._convertAndRebuild(t);
+            for (const e in i) if (Ve(i, e) && sl[e]) return void this._convertAndRebuild(t);
             const r = t._getInternalSymbol(), s = this.features[n];
             if (this._convertGeo(t), s) if (function(e, t) {
                 return Array.isArray(e) ? !!Array.isArray(t) && e.length === t.length : !Array.isArray(t);
             }(r, s)) {
                 if (Array.isArray(r)) for (let e = 0; e < r.length; e++) {
-                    if (!wl(r[e], s[e])) return void this._convertAndRebuild(t);
-                } else if (!wl(r, s)) return void this._convertAndRebuild(t);
+                    if (!Pl(r[e], s[e])) return void this._convertAndRebuild(t);
+                } else if (!Pl(r, s)) return void this._convertAndRebuild(t);
                 this.onGeometryPositionChange(e);
             } else this._convertAndRebuild(t); else this._convertAndRebuild(t);
         }
         onGeometryShapeChange(e) {
             const t = e.target._getParent() || e.target;
             void 0 !== t[ir] && (this._convertGeometries([ t ]), this._markRebuildGeometry(), 
-            ml(this));
+            _l(this));
         }
         onGeometryPositionChange(e) {
             const t = e.target._getParent() || e.target, n = t[ir];
             void 0 !== n && (this._convertGeometries([ t ]), this._dirtyTargetsInCurrentFrame[n] = t, 
-            ml(this));
+            _l(this));
         }
         onGeometryZIndexChange(e) {
             void 0 !== (e.target._getParent() || e.target)[ir] && this._markRebuild();
@@ -19906,7 +19955,7 @@
                     if (e === i.visible) return;
                     i.visible = e;
                 }
-                this._markShowHide(), ml(this);
+                this._markShowHide(), _l(this);
             }
         }
         _markShowHide() {
@@ -19916,7 +19965,7 @@
             const t = e.target._getParent() || e.target, n = t[ir];
             void 0 !== n && this.painter && (this.features[n] = sr(t, this._kidGen), this._refreshFeatures(this.features[n], n), 
             this._markerMeshes && this._markerMeshes.length && this._markerPainter.needRebuildOnGometryPropertiesChanged() || this._lineMeshes && this._lineMeshes.length && this._linePainter.needRebuildOnGometryPropertiesChanged() || this.meshes && this.meshes.length && this.painter.needRebuildOnGometryPropertiesChanged() ? this._markRebuild() : this.painter.onFeatureChange(this.features[n], this.meshes), 
-            ml(this));
+            _l(this));
         }
         createContext() {
             const e = this.canvas.gl && this.canvas.gl.wrap;
@@ -20024,7 +20073,7 @@
             delete this._outlineAll, delete this._outlineFeatures, this.setToRedraw();
         }
         isEnableWorkAround(e) {
-            return "win-intel-gpu-crash" === e && (this.layer.options.workarounds["win-intel-gpu-crash"] && yl(this.gl));
+            return "win-intel-gpu-crash" === e && (this.layer.options.workarounds["win-intel-gpu-crash"] && vl(this.gl));
         }
         _getCentiMeterScale(e) {
             return Ue(e, this.getMap());
@@ -20038,10 +20087,10 @@
             return this._isInGroupGLLayer() ? He(e) ? 1 : e : 1;
         }
     }
-    function ml(e) {
+    function _l(e) {
         e.setToRedraw();
     }
-    function yl(e) {
+    function vl(e) {
         const t = e.getExtension("WEBGL_debug_renderer_info");
         if (t && "undefined" != typeof navigator) {
             const n = e.getParameter(t.UNMASKED_RENDERER_WEBGL), i = "Win32" === navigator.platform || "Win64" === navigator.platform;
@@ -20049,32 +20098,32 @@
         }
         return !1;
     }
-    function xl({properties: e}) {
-        const t = (ul + "markerFile").trim(), n = (ul + "markerType").trim();
+    function bl({properties: e}) {
+        const t = (pl + "markerFile").trim(), n = (pl + "markerType").trim();
         return e[t] || e[n];
     }
-    function _l({properties: e}) {
-        return e[(ul + "textName").trim()];
+    function Al({properties: e}) {
+        return e[(pl + "textName").trim()];
     }
-    const vl = (ul + "lineWidth").trim(), bl = (er + "").trim();
-    function Al(e) {
-        return 2 === e.type && !e.properties[bl] || 3 === e.type && void 0 !== e.properties[vl];
+    const Tl = (pl + "lineWidth").trim(), wl = (er + "").trim();
+    function Sl(e) {
+        return 2 === e.type && !e.properties[wl] || 3 === e.type && void 0 !== e.properties[Tl];
     }
-    function Tl(e) {
+    function Ml(e) {
         if (!Array.isArray(e)) return 0;
         let t = 0;
         for (let n = 0; n < e.length; n++) t += e[n];
         return t;
     }
-    function wl(e, t) {
-        if (Object.keys(e).sort().join() !== Object.keys(t.properties || {}).filter((e => 0 === e.indexOf(ul))).map((e => e.substring(ul.length))).sort().join()) return !1;
+    function Pl(e, t) {
+        if (Object.keys(e).sort().join() !== Object.keys(t.properties || {}).filter((e => 0 === e.indexOf(pl))).map((e => e.substring(pl.length))).sort().join()) return !1;
         for (const n in e) if (Ve(e, n)) {
-            const i = (ul + n).trim();
+            const i = (pl + n).trim();
             if (we(e[n]) !== we(t.properties[i])) return !1;
         }
         return !0;
     }
-    function Ml(e, t, n) {
+    function Il(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++) {
@@ -20083,9 +20132,9 @@
         }
         return i.addGeometry(o), i;
     }
-    class Sl extends ln {
+    class Cl extends ln {
         static fromJSON(e) {
-            return Ml(e, "PointLayer", Sl);
+            return Il(e, "PointLayer", Cl);
         }
         constructor(...e) {
             super(...e), this.options.sceneConfig || (this.options.sceneConfig = Fe({}, Ke));
@@ -20097,7 +20146,7 @@
             return 0;
         }
     }
-    Sl.mergeOptions({
+    Cl.mergeOptions({
         glyphSdfLimitPerFrame: 15,
         iconErrorUrl: null,
         workarounds: {
@@ -20105,8 +20154,8 @@
         },
         collision: !1,
         collisionFrameLimit: 1
-    }), Sl.registerJSONType("PointLayer"), Sl.registerRenderer("canvas", null);
-    Sl.registerRenderer("gl", class extends gl {
+    }), Cl.registerJSONType("PointLayer"), Cl.registerRenderer("canvas", null);
+    Cl.registerRenderer("gl", class extends xl {
         constructor(...e) {
             super(...e), this.GeometryTypes = [ r.Marker, r.MultiPoint ];
         }
@@ -20116,24 +20165,24 @@
             })) : e.options.maxMarkerWidth = e.options.maxMarkerHeight = 255, super.onGeometryAdd(e));
         }
     });
-    const {LinePack: Pl} = h();
-    class Il extends ln {
+    const {LinePack: kl} = h();
+    class Ol extends ln {
         static fromJSON(e) {
-            return Ml(e, "LineStringLayer", Il);
+            return Il(e, "LineStringLayer", Ol);
         }
     }
-    Il.mergeOptions({
+    Ol.mergeOptions({
         meshRenderOrder: 1
-    }), Il.registerJSONType("LineStringLayer");
-    const Cl = (er + "").trim();
-    Il.registerRenderer("gl", class extends gl {
+    }), Ol.registerJSONType("LineStringLayer");
+    const Fl = (er + "").trim();
+    Ol.registerRenderer("gl", class extends xl {
         constructor(...e) {
             super(...e), this.GeometryTypes = [ r.LineString, r.MultiLineString ];
         }
         createPainter() {
             const e = ln.get3DPainterClass("line-gradient");
             this.painterSymbol = Fe({}, {
-                lineGradientProperty: Cl
+                lineGradientProperty: Fl
             }, Qi), this._defineSymbolBloom(this.painterSymbol, e.getBloomSymbol());
             const t = Fe({}, this.layer.options.sceneConfig || {});
             void 0 === t.depthMask && (t.depthMask = !0);
@@ -20141,10 +20190,10 @@
         }
         buildMesh() {
             let {features: e, center: t} = this._getFeaturesToRender();
-            if (e = e.filter((e => !!e.properties[Cl])), !e.length) return;
+            if (e = e.filter((e => !!e.properties[Fl])), !e.length) return;
             const n = this._showHideUpdated;
             this._meshCenter = t;
-            const i = Fe({}, this.painterSymbol), r = this.createMesh(this.painter, Pl, i, e, null, t);
+            const i = Fe({}, this.painterSymbol), r = this.createMesh(this.painter, kl, i, e, null, t);
             this._isCreatingMesh = !0, r.then((e => {
                 this.meshes && this.painter.deleteMesh(this.meshes);
                 const t = [], i = e && e.meshes;
@@ -20155,15 +20204,15 @@
                 this.meshes = t, n && (this._showHideUpdated = n), this._isCreatingMesh = !1, this.setToRedraw();
             }));
         }
-    }), Il.registerRenderer("canvas", null);
-    const {PolygonPack: kl} = h();
-    class Ol extends ln {
+    }), Ol.registerRenderer("canvas", null);
+    const {PolygonPack: Rl} = h();
+    class El extends ln {
         static fromJSON(e) {
-            return Ml(e, "PolygonLayer", Ol);
+            return Il(e, "PolygonLayer", El);
         }
     }
-    Ol.registerJSONType("PolygonLayer");
-    const Fl = {
+    El.registerJSONType("PolygonLayer");
+    const Dl = {
         polygonFill: {
             type: "identity",
             default: [ 1, 1, 1, 1 ],
@@ -20215,7 +20264,7 @@
             property: "_symbol_polygonPatternUV"
         }
     };
-    class Rl extends gl {
+    class Ll extends xl {
         constructor() {
             super(...arguments), this.GeometryTypes = [ r.Polygon, r.MultiPolygon ];
         }
@@ -20227,7 +20276,7 @@
             if (!t.length) return;
             const i = this._showHideUpdated;
             this._meshCenter = n;
-            const r = this._groupPolygonFeatures(t), s = Fe({}, Fl), o = r.map(((t, i) => this.createMesh(this.painter, kl, s, t, e && e[i], n)));
+            const r = this._groupPolygonFeatures(t), s = Fe({}, Dl), o = r.map(((t, i) => this.createMesh(this.painter, Rl, s, t, e && e[i], n)));
             this._isCreatingMesh = !0, Promise.all(o).then((e => {
                 this.meshes && this.painter.deleteMesh(this.meshes), e = function(e) {
                     const t = [];
@@ -20263,15 +20312,15 @@
             return [ t, n ];
         }
         createPainter() {
-            const e = ln.get3DPainterClass("fill"), t = this.painterSymbol = Fe({}, Fl);
+            const e = ln.get3DPainterClass("fill"), t = this.painterSymbol = Fe({}, Dl);
             this._defineSymbolBloom(t, e.getBloomSymbol());
             return new e(this.regl, this.layer, t, this.layer.options.sceneConfig, 0);
         }
         updateMesh(e) {
-            return this._updateMesh(e, this.meshes, this.atlas, this._meshCenter, this.painter, kl, Fl, this._groupPolygonFeatures);
+            return this._updateMesh(e, this.meshes, this.atlas, this._meshCenter, this.painter, Rl, Dl, this._groupPolygonFeatures);
         }
     }
-    function El(e, t, n, i, r, s, o) {
+    function Hl(e, t, n, i, r, s, o) {
         const a = n && Array.isArray(n[0]);
         for (let s = 0, l = n.length; s < l; s++) {
             e[t] = (a ? n[s][0] : n[s].x) * i, e[t + 1] = (a ? n[s][1] : n[s].y) * i, o !== Float32Array && (e[t] = Math.round(e[t]), 
@@ -20281,29 +20330,29 @@
         }
         return e.trySetLength && e.trySetLength(t), t;
     }
-    function Dl(e, t, n, i) {
+    function Nl(e, t, n, i) {
         const r = e[3 * t], s = e[3 * t + 1], o = e[3 * n], a = e[3 * n + 1];
         return r === o && (r < 0 || r > i) || s === a && (s < 0 || s > i);
     }
-    Ol.registerRenderer("gl", Rl), Ol.registerRenderer("canvas", null);
-    var Ll = "undefined" != typeof Float32Array ? Float32Array : Array;
-    function Hl(e, t, n, i) {
+    El.registerRenderer("gl", Ll), El.registerRenderer("canvas", null);
+    var zl = "undefined" != typeof Float32Array ? Float32Array : Array;
+    function Vl(e, t, n, i) {
         return e[0] = t, e[1] = n, e[2] = i, e;
     }
-    function Nl(e, t) {
+    function Ul(e, t) {
         return e[0] = t[0], e[1] = t[1], e[2] = t[2], e[3] = t[3], e;
     }
-    function zl(e, t, n, i, r) {
+    function Bl(e, t, n, i, r) {
         return e[0] = t, e[1] = n, e[2] = i, e[3] = r, e;
     }
-    function Vl(e, t, n) {
+    function Gl(e, t, n) {
         return e[0] = t[0] / n[0], e[1] = t[1] / n[1], e[2] = t[2] / n[2], e[3] = t[3] / n[3], 
         e;
     }
-    function Ul(e, t, n) {
+    function jl(e, t, n) {
         return e[0] = t, e[1] = n, e;
     }
-    function Bl(e, t) {
+    function Wl(e, t) {
         var n = t[0] - e[0], i = t[1] - e[1];
         return Math.hypot(n, i);
     }
@@ -20311,24 +20360,24 @@
         for (var e = 0, t = arguments.length; t--; ) e += arguments[t] * arguments[t];
         return Math.sqrt(e);
     }), function() {
-        var e, t = (e = new Ll(3), Ll != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0), 
+        var e, t = (e = new zl(3), zl != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0), 
         e);
     }(), function() {
-        var e, t = (e = new Ll(4), Ll != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0, 
+        var e, t = (e = new zl(4), zl != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0, 
         e[3] = 0), e);
     }(), function() {
-        var e, t = (e = new Ll(2), Ll != Float32Array && (e[0] = 0, e[1] = 0), e);
+        var e, t = (e = new zl(2), zl != Float32Array && (e[0] = 0, e[1] = 0), e);
     }();
-    const Gl = Math.PI / 180, jl = 6378137 * Math.PI / 180, Wl = 85.0511287798;
-    function Xl(e, t, n) {
+    const Xl = Math.PI / 180, Yl = 6378137 * Math.PI / 180, Zl = 85.0511287798;
+    function ql(e, t, n) {
         return function(e, t) {
-            const n = Wl, i = t[0], r = Math.max(Math.min(n, t[1]), -n);
+            const n = Zl, i = t[0], r = Math.max(Math.min(n, t[1]), -n);
             let s;
-            s = 0 === r ? 0 : Math.log(Math.tan((90 + r) * Gl / 2)) / Gl;
-            return e[0] = i * jl, e[1] = s * jl, e;
+            s = 0 === r ? 0 : Math.log(Math.tan((90 + r) * Xl / 2)) / Xl;
+            return e[0] = i * Yl, e[1] = s * Yl, e;
         }(e, t);
     }
-    function Yl(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p) {
+    function $l(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p) {
         0 === e ? function(e, t, n, i, r, s, o, a, l, h) {
             const c = 1 / (100 * s[0]), u = 1 / (100 * s[1]), f = h && h[0] || 0, d = h && h[1] || 0, p = [ 0, 0 ];
             for (let r = e; r < t; r += 3) {
@@ -20340,39 +20389,39 @@
             let u, f, d, p;
             0 === e[4] ? (u = e[0], f = e[1], d = e[2], p = e[3]) : (u = e[1], f = e[2], d = e[3], 
             p = e[0]);
-            const g = Bl(u, f), m = Bl(f, d), y = [], x = [], _ = [];
+            const g = Wl(u, f), m = Wl(f, d), y = [], x = [], _ = [];
             for (let e = t; e < n; e += 3) {
                 const t = e / 3 * 2;
-                Ul(y, (s.x / l + r[e] / o) * a, s.y / l * a + (c ? r[e + 1] : -r[e + 1]) / o * a), 
-                "EPSG:4326" !== h && "EPSG:4490" !== h || Xl(y, y), Zl(x, y, u, f), Zl(_, y, p, u), 
-                i[t] = Bl(u, x) / g, i[t + 1] = Bl(u, _) / m;
+                jl(y, (s.x / l + r[e] / o) * a, s.y / l * a + (c ? r[e + 1] : -r[e + 1]) / o * a), 
+                "EPSG:4326" !== h && "EPSG:4490" !== h || ql(y, y), Jl(x, y, u, f), Jl(_, y, p, u), 
+                i[t] = Wl(u, x) / g, i[t + 1] = Wl(u, _) / m;
             }
         }(c, t, n, i, r, s, a, u, f, d, !!p);
     }
-    function Zl(e, t, n, i) {
+    function Jl(e, t, n, i) {
         const r = n[0] - i[0], s = n[1] - i[1];
         let o = (t[0] - n[0]) * (n[0] - i[0]) + (t[1] - n[1]) * (n[1] - i[1]);
         return o /= r * r + s * s, e[0] = n[0] + o * r, e[1] = n[1] + o * s, e;
     }
-    function ql(e, t, n, i, r) {
+    function Kl(e, t, n, i, r) {
         const s = 3 * t[n - 1], o = 3 * t[n - 1] + 1, a = e[s], l = e[o];
         return h = i, c = r, u = a, f = l, Math.sqrt((u - h) * (u - h) + (f - c) * (f - c));
         var h, c, u, f;
     }
-    function $l(e, t, n = 2) {
+    function Ql(e, t, n = 2) {
         const i = t && t.length, r = i ? t[0] * n : e.length;
-        let s = Jl(e, 0, r, n, !0);
+        let s = eh(e, 0, r, n, !0);
         const o = [];
         if (!s || s.next === s.prev) return o;
         let a, l, h;
         if (i && (s = function(e, t, n, i) {
             const r = [];
             for (let n = 0, s = t.length; n < s; n++) {
-                const o = Jl(e, t[n] * i, n < s - 1 ? t[n + 1] * i : e.length, i, !1);
-                o === o.next && (o.steiner = !0), r.push(lh(o));
+                const o = eh(e, t[n] * i, n < s - 1 ? t[n + 1] * i : e.length, i, !1);
+                o === o.next && (o.steiner = !0), r.push(uh(o));
             }
-            r.sort(rh);
-            for (let e = 0; e < r.length; e++) n = sh(r[e], n);
+            r.sort(ah);
+            for (let e = 0; e < r.length; e++) n = lh(r[e], n);
             return n;
         }(e, t, s, n)), e.length > 80 * n) {
             a = 1 / 0, l = 1 / 0;
@@ -20383,36 +20432,36 @@
             }
             h = Math.max(t - a, i - l), h = 0 !== h ? 32767 / h : 0;
         }
-        return Ql(s, o, n, a, l, h, 0), o;
+        return nh(s, o, n, a, l, h, 0), o;
     }
-    function Jl(e, t, n, i, r) {
+    function eh(e, t, n, i, r) {
         let s;
         if (r === function(e, t, n, i) {
             let r = 0;
             for (let s = t, o = n - i; s < n; s += i) r += (e[o] - e[s]) * (e[s + 1] + e[o + 1]), 
             o = s;
             return r;
-        }(e, t, n, i) > 0) for (let r = t; r < n; r += i) s = _h(r / i | 0, e[r], e[r + 1], s); else for (let r = n - i; r >= t; r -= i) s = _h(r / i | 0, e[r], e[r + 1], s);
-        return s && dh(s, s.next) && (vh(s), s = s.next), s;
+        }(e, t, n, i) > 0) for (let r = t; r < n; r += i) s = Ah(r / i | 0, e[r], e[r + 1], s); else for (let r = n - i; r >= t; r -= i) s = Ah(r / i | 0, e[r], e[r + 1], s);
+        return s && mh(s, s.next) && (Th(s), s = s.next), s;
     }
-    function Kl(e, t) {
+    function th(e, t) {
         if (!e) return e;
         t || (t = e);
         let n, i = e;
         do {
-            if (n = !1, i.steiner || !dh(i, i.next) && 0 !== fh(i.prev, i, i.next)) i = i.next; else {
-                if (vh(i), i = t = i.prev, i === i.next) break;
+            if (n = !1, i.steiner || !mh(i, i.next) && 0 !== gh(i.prev, i, i.next)) i = i.next; else {
+                if (Th(i), i = t = i.prev, i === i.next) break;
                 n = !0;
             }
         } while (n || i !== t);
         return t;
     }
-    function Ql(e, t, n, i, r, s, o) {
+    function nh(e, t, n, i, r, s, o) {
         if (!e) return;
         !o && s && function(e, t, n, i) {
             let r = e;
             do {
-                0 === r.z && (r.z = ah(r.x, r.y, t, n, i)), r.prevZ = r.prev, r.nextZ = r.next, 
+                0 === r.z && (r.z = ch(r.x, r.y, t, n, i)), r.prevZ = r.prev, r.nextZ = r.next, 
                 r = r.next;
             } while (r !== e);
             r.prevZ.nextZ = null, r.prevZ = null, function(e) {
@@ -20438,81 +20487,81 @@
         let a = e;
         for (;e.prev !== e.next; ) {
             const l = e.prev, h = e.next;
-            if (s ? th(e, i, r, s) : eh(e)) t.push(l.i, e.i, h.i), vh(e), e = h.next, a = h.next; else if ((e = h) === a) {
-                o ? 1 === o ? Ql(e = nh(Kl(e), t), t, n, i, r, s, 2) : 2 === o && ih(e, t, n, i, r, s) : Ql(Kl(e), t, n, i, r, s, 1);
+            if (s ? rh(e, i, r, s) : ih(e)) t.push(l.i, e.i, h.i), Th(e), e = h.next, a = h.next; else if ((e = h) === a) {
+                o ? 1 === o ? nh(e = sh(th(e), t), t, n, i, r, s, 2) : 2 === o && oh(e, t, n, i, r, s) : nh(th(e), t, n, i, r, s, 1);
                 break;
             }
         }
     }
-    function eh(e) {
+    function ih(e) {
         const t = e.prev, n = e, i = e.next;
-        if (fh(t, n, i) >= 0) return !1;
+        if (gh(t, n, i) >= 0) return !1;
         const r = t.x, s = n.x, o = i.x, a = t.y, l = n.y, h = i.y, c = Math.min(r, s, o), u = Math.min(a, l, h), f = Math.max(r, s, o), d = Math.max(a, l, h);
         let p = i.next;
         for (;p !== t; ) {
-            if (p.x >= c && p.x <= f && p.y >= u && p.y <= d && ch(r, a, s, l, o, h, p.x, p.y) && fh(p.prev, p, p.next) >= 0) return !1;
+            if (p.x >= c && p.x <= f && p.y >= u && p.y <= d && dh(r, a, s, l, o, h, p.x, p.y) && gh(p.prev, p, p.next) >= 0) return !1;
             p = p.next;
         }
         return !0;
     }
-    function th(e, t, n, i) {
+    function rh(e, t, n, i) {
         const r = e.prev, s = e, o = e.next;
-        if (fh(r, s, o) >= 0) return !1;
-        const a = r.x, l = s.x, h = o.x, c = r.y, u = s.y, f = o.y, d = Math.min(a, l, h), p = Math.min(c, u, f), g = Math.max(a, l, h), m = Math.max(c, u, f), y = ah(d, p, t, n, i), x = ah(g, m, t, n, i);
+        if (gh(r, s, o) >= 0) return !1;
+        const a = r.x, l = s.x, h = o.x, c = r.y, u = s.y, f = o.y, d = Math.min(a, l, h), p = Math.min(c, u, f), g = Math.max(a, l, h), m = Math.max(c, u, f), y = ch(d, p, t, n, i), x = ch(g, m, t, n, i);
         let _ = e.prevZ, v = e.nextZ;
         for (;_ && _.z >= y && v && v.z <= x; ) {
-            if (_.x >= d && _.x <= g && _.y >= p && _.y <= m && _ !== r && _ !== o && ch(a, c, l, u, h, f, _.x, _.y) && fh(_.prev, _, _.next) >= 0) return !1;
-            if (_ = _.prevZ, v.x >= d && v.x <= g && v.y >= p && v.y <= m && v !== r && v !== o && ch(a, c, l, u, h, f, v.x, v.y) && fh(v.prev, v, v.next) >= 0) return !1;
+            if (_.x >= d && _.x <= g && _.y >= p && _.y <= m && _ !== r && _ !== o && dh(a, c, l, u, h, f, _.x, _.y) && gh(_.prev, _, _.next) >= 0) return !1;
+            if (_ = _.prevZ, v.x >= d && v.x <= g && v.y >= p && v.y <= m && v !== r && v !== o && dh(a, c, l, u, h, f, v.x, v.y) && gh(v.prev, v, v.next) >= 0) return !1;
             v = v.nextZ;
         }
         for (;_ && _.z >= y; ) {
-            if (_.x >= d && _.x <= g && _.y >= p && _.y <= m && _ !== r && _ !== o && ch(a, c, l, u, h, f, _.x, _.y) && fh(_.prev, _, _.next) >= 0) return !1;
+            if (_.x >= d && _.x <= g && _.y >= p && _.y <= m && _ !== r && _ !== o && dh(a, c, l, u, h, f, _.x, _.y) && gh(_.prev, _, _.next) >= 0) return !1;
             _ = _.prevZ;
         }
         for (;v && v.z <= x; ) {
-            if (v.x >= d && v.x <= g && v.y >= p && v.y <= m && v !== r && v !== o && ch(a, c, l, u, h, f, v.x, v.y) && fh(v.prev, v, v.next) >= 0) return !1;
+            if (v.x >= d && v.x <= g && v.y >= p && v.y <= m && v !== r && v !== o && dh(a, c, l, u, h, f, v.x, v.y) && gh(v.prev, v, v.next) >= 0) return !1;
             v = v.nextZ;
         }
         return !0;
     }
-    function nh(e, t) {
+    function sh(e, t) {
         let n = e;
         do {
             const i = n.prev, r = n.next.next;
-            !dh(i, r) && ph(i, n, n.next, r) && yh(i, r) && yh(r, i) && (t.push(i.i, n.i, r.i), 
-            vh(n), vh(n.next), n = e = r), n = n.next;
+            !mh(i, r) && yh(i, n, n.next, r) && vh(i, r) && vh(r, i) && (t.push(i.i, n.i, r.i), 
+            Th(n), Th(n.next), n = e = r), n = n.next;
         } while (n !== e);
-        return Kl(n);
+        return th(n);
     }
-    function ih(e, t, n, i, r, s) {
+    function oh(e, t, n, i, r, s) {
         let o = e;
         do {
             let e = o.next.next;
             for (;e !== o.prev; ) {
-                if (o.i !== e.i && uh(o, e)) {
-                    let a = xh(o, e);
-                    return o = Kl(o, o.next), a = Kl(a, a.next), Ql(o, t, n, i, r, s, 0), void Ql(a, t, n, i, r, s, 0);
+                if (o.i !== e.i && ph(o, e)) {
+                    let a = bh(o, e);
+                    return o = th(o, o.next), a = th(a, a.next), nh(o, t, n, i, r, s, 0), void nh(a, t, n, i, r, s, 0);
                 }
                 e = e.next;
             }
             o = o.next;
         } while (o !== e);
     }
-    function rh(e, t) {
+    function ah(e, t) {
         let n = e.x - t.x;
         if (0 === n && (n = e.y - t.y, 0 === n)) {
             n = (e.next.y - e.y) / (e.next.x - e.x) - (t.next.y - t.y) / (t.next.x - t.x);
         }
         return n;
     }
-    function sh(e, t) {
+    function lh(e, t) {
         const n = function(e, t) {
             let n = t;
             const i = e.x, r = e.y;
             let s, o = -1 / 0;
-            if (dh(e, n)) return n;
+            if (mh(e, n)) return n;
             do {
-                if (dh(e, n.next)) return n.next;
+                if (mh(e, n.next)) return n.next;
                 if (r <= n.y && r >= n.next.y && n.next.y !== n.y) {
                     const e = n.x + (r - n.y) * (n.next.x - n.x) / (n.next.y - n.y);
                     if (e <= i && e > o && (o = e, s = n.x < n.next.x ? n : n.next, e === i)) return s;
@@ -20524,9 +20573,9 @@
             let c = 1 / 0;
             n = s;
             do {
-                if (i >= n.x && n.x >= l && i !== n.x && hh(r < h ? i : o, r, l, h, r < h ? o : i, r, n.x, n.y)) {
+                if (i >= n.x && n.x >= l && i !== n.x && fh(r < h ? i : o, r, l, h, r < h ? o : i, r, n.x, n.y)) {
                     const t = Math.abs(r - n.y) / (i - n.x);
-                    yh(n, e) && (t < c || t === c && (n.x > s.x || n.x === s.x && oh(s, n))) && (s = n, 
+                    vh(n, e) && (t < c || t === c && (n.x > s.x || n.x === s.x && hh(s, n))) && (s = n, 
                     c = t);
                 }
                 n = n.next;
@@ -20534,37 +20583,37 @@
             return s;
         }(e, t);
         if (!n) return t;
-        const i = xh(n, e);
-        return Kl(i, i.next), Kl(n, n.next);
+        const i = bh(n, e);
+        return th(i, i.next), th(n, n.next);
     }
-    function oh(e, t) {
-        return fh(e.prev, e, t.prev) < 0 && fh(t.next, e, e.next) < 0;
+    function hh(e, t) {
+        return gh(e.prev, e, t.prev) < 0 && gh(t.next, e, e.next) < 0;
     }
-    function ah(e, t, n, i, r) {
+    function ch(e, t, n, i, r) {
         return (e = 1431655765 & ((e = 858993459 & ((e = 252645135 & ((e = 16711935 & ((e = (e - n) * r | 0) | e << 8)) | e << 4)) | e << 2)) | e << 1)) | (t = 1431655765 & ((t = 858993459 & ((t = 252645135 & ((t = 16711935 & ((t = (t - i) * r | 0) | t << 8)) | t << 4)) | t << 2)) | t << 1)) << 1;
     }
-    function lh(e) {
+    function uh(e) {
         let t = e, n = e;
         do {
             (t.x < n.x || t.x === n.x && t.y < n.y) && (n = t), t = t.next;
         } while (t !== e);
         return n;
     }
-    function hh(e, t, n, i, r, s, o, a) {
+    function fh(e, t, n, i, r, s, o, a) {
         return (r - o) * (t - a) >= (e - o) * (s - a) && (e - o) * (i - a) >= (n - o) * (t - a) && (n - o) * (s - a) >= (r - o) * (i - a);
     }
-    function ch(e, t, n, i, r, s, o, a) {
-        return !(e === o && t === a) && hh(e, t, n, i, r, s, o, a);
+    function dh(e, t, n, i, r, s, o, a) {
+        return !(e === o && t === a) && fh(e, t, n, i, r, s, o, a);
     }
-    function uh(e, t) {
+    function ph(e, t) {
         return e.next.i !== t.i && e.prev.i !== t.i && !function(e, t) {
             let n = e;
             do {
-                if (n.i !== e.i && n.next.i !== e.i && n.i !== t.i && n.next.i !== t.i && ph(n, n.next, e, t)) return !0;
+                if (n.i !== e.i && n.next.i !== e.i && n.i !== t.i && n.next.i !== t.i && yh(n, n.next, e, t)) return !0;
                 n = n.next;
             } while (n !== e);
             return !1;
-        }(e, t) && (yh(e, t) && yh(t, e) && function(e, t) {
+        }(e, t) && (vh(e, t) && vh(t, e) && function(e, t) {
             let n = e, i = !1;
             const r = (e.x + t.x) / 2, s = (e.y + t.y) / 2;
             do {
@@ -20572,42 +20621,42 @@
                 n = n.next;
             } while (n !== e);
             return i;
-        }(e, t) && (fh(e.prev, e, t.prev) || fh(e, t.prev, t)) || dh(e, t) && fh(e.prev, e, e.next) > 0 && fh(t.prev, t, t.next) > 0);
+        }(e, t) && (gh(e.prev, e, t.prev) || gh(e, t.prev, t)) || mh(e, t) && gh(e.prev, e, e.next) > 0 && gh(t.prev, t, t.next) > 0);
     }
-    function fh(e, t, n) {
+    function gh(e, t, n) {
         return (t.y - e.y) * (n.x - t.x) - (t.x - e.x) * (n.y - t.y);
     }
-    function dh(e, t) {
+    function mh(e, t) {
         return e.x === t.x && e.y === t.y;
     }
-    function ph(e, t, n, i) {
-        const r = mh(fh(e, t, n)), s = mh(fh(e, t, i)), o = mh(fh(n, i, e)), a = mh(fh(n, i, t));
-        return r !== s && o !== a || (!(0 !== r || !gh(e, n, t)) || (!(0 !== s || !gh(e, i, t)) || (!(0 !== o || !gh(n, e, i)) || !(0 !== a || !gh(n, t, i)))));
+    function yh(e, t, n, i) {
+        const r = _h(gh(e, t, n)), s = _h(gh(e, t, i)), o = _h(gh(n, i, e)), a = _h(gh(n, i, t));
+        return r !== s && o !== a || (!(0 !== r || !xh(e, n, t)) || (!(0 !== s || !xh(e, i, t)) || (!(0 !== o || !xh(n, e, i)) || !(0 !== a || !xh(n, t, i)))));
     }
-    function gh(e, t, n) {
+    function xh(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 mh(e) {
+    function _h(e) {
         return e > 0 ? 1 : e < 0 ? -1 : 0;
     }
-    function yh(e, t) {
-        return fh(e.prev, e, e.next) < 0 ? fh(e, t, e.next) >= 0 && fh(e, e.prev, t) >= 0 : fh(e, t, e.prev) < 0 || fh(e, e.next, t) < 0;
+    function vh(e, t) {
+        return gh(e.prev, e, e.next) < 0 ? gh(e, t, e.next) >= 0 && gh(e, e.prev, t) >= 0 : gh(e, t, e.prev) < 0 || gh(e, e.next, t) < 0;
     }
-    function xh(e, t) {
-        const n = bh(e.i, e.x, e.y), i = bh(t.i, t.x, t.y), r = e.next, s = t.prev;
+    function bh(e, t) {
+        const n = wh(e.i, e.x, e.y), i = wh(t.i, t.x, t.y), r = e.next, s = t.prev;
         return e.next = t, t.prev = e, n.next = r, r.prev = n, i.next = n, n.prev = i, s.next = i, 
         i.prev = s, i;
     }
-    function _h(e, t, n, i) {
-        const r = bh(e, t, n);
+    function Ah(e, t, n, i) {
+        const r = wh(e, t, n);
         return i ? (r.next = i.next, r.prev = i, i.next.prev = r, i.next = r) : (r.prev = r, 
         r.next = r), r;
     }
-    function vh(e) {
+    function Th(e) {
         e.next.prev = e.prev, e.prev.next = e.next, e.prevZ && (e.prevZ.nextZ = e.nextZ), 
         e.nextZ && (e.nextZ.prevZ = e.prevZ);
     }
-    function bh(e, t, n) {
+    function wh(e, t, n) {
         return {
             i: e,
             x: t,
@@ -20620,8 +20669,8 @@
             steiner: !1
         };
     }
-    const {PackUtil: Ah, ArrayPool: Th} = h();
-    function wh(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p, g, m) {
+    const {PackUtil: Sh, ArrayPool: Mh} = h();
+    function Ph(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p, g, m) {
         const y = t.getLength(), x = r / 3;
         for (let n = 2, i = y; n < i; n += 3) e[r + n - 2] = t[n - 2], e[r + n - 1] = t[n - 1], 
         e[r + n - 0] = t[n] - o;
@@ -20632,14 +20681,14 @@
         e.copyWithin(r, r - 2 * y, r - y), r += y, (n = n || []).push(y / 3);
         const _ = n.getLength();
         for (let t = 0; t < _; t++) {
-            Mh(x + (n[t - 1] || 0), x + n[t], e, y / 3, l, i, h, c, u, f, s, d, p, g, m);
+            Ih(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 Mh(e, t, n, i, r, s, o, a, l, h, c, u, f, d, p) {
+    function Ih(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, 
+        for (let o = e, a = t; o < a - 1; o++) if (m = o, y = o + 1, r === 1 / 0 || !Nl(n, m, y, r)) if ((o - e) % 2 == 1 && (m += 2 * i, 
         y += 2 * i), p) {
             let e = s.currentIndex;
             s[e++] = m + i, s[e++] = y, s[e++] = m, s[e++] = y + i, s[e++] = y, s[e++] = m + i, 
@@ -20658,60 +20707,60 @@
                 f = d - p);
                 let T = g;
                 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), 
+                0 === e ? (5 === w && (m = Kl(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 = Kl(r, s, u, v, b), 
                 T = m) : T = 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);
+                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);
             }
         }(a, l, h, c, n, s, g, u[0], u[1], f, d, p);
     }
-    function Sh(e) {
+    function Ch(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]), 
         n = e[i];
         return t;
     }
-    var Ph = "undefined" != typeof Float32Array ? Float32Array : Array;
-    function Ih() {
-        var e = new Ph(3);
-        return Ph != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0), e;
+    var kh = "undefined" != typeof Float32Array ? Float32Array : Array;
+    function Oh() {
+        var e = new kh(3);
+        return kh != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0), e;
     }
-    function Ch(e, t, n) {
-        var i = new Ph(3);
+    function Fh(e, t, n) {
+        var i = new kh(3);
         return i[0] = e, i[1] = t, i[2] = n, i;
     }
-    function kh(e, t) {
+    function Rh(e, t) {
         return e[0] = t[0], e[1] = t[1], e[2] = t[2], e;
     }
-    function Oh(e, t, n, i) {
+    function Eh(e, t, n, i) {
         return e[0] = t, e[1] = n, e[2] = i, e;
     }
-    function Fh(e, t, n) {
+    function Dh(e, t, n) {
         return e[0] = t[0] + n[0], e[1] = t[1] + n[1], e[2] = t[2] + n[2], e;
     }
-    function Rh(e, t) {
+    function Lh(e, t) {
         var n = t[0], i = t[1], r = t[2], s = n * n + i * i + r * r;
         return s > 0 && (s = 1 / Math.sqrt(s), e[0] = t[0] * s, e[1] = t[1] * s, e[2] = t[2] * s), 
         e;
     }
-    function Eh(e, t) {
+    function Hh(e, t) {
         return e[0] * t[0] + e[1] * t[1] + e[2] * t[2];
     }
-    function Dh(e, t, n) {
+    function Nh(e, t, n) {
         var i = t[0], r = t[1], s = t[2], o = n[0], a = n[1], l = n[2];
         return e[0] = r * l - s * a, e[1] = s * o - i * l, e[2] = i * a - r * o, e;
     }
-    var Lh = function(e, t, n) {
+    var zh = function(e, t, n) {
         return e[0] = t[0] - n[0], e[1] = t[1] - n[1], e[2] = t[2] - n[2], e;
     };
-    function Hh() {
-        var e = new Ph(4);
-        return Ph != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0), e[3] = 1, e;
+    function Vh() {
+        var e = new kh(4);
+        return kh != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0), e[3] = 1, e;
     }
-    function Nh(e, t) {
+    function Uh(e, t) {
         var n = t[0] + t[4] + t[8], i = void 0;
         if (n > 0) i = Math.sqrt(n + 1), e[3] = .5 * i, i = .5 / i, e[0] = (t[5] - t[7]) * i, 
         e[1] = (t[6] - t[2]) * i, e[2] = (t[1] - t[3]) * i; else {
@@ -20725,55 +20774,55 @@
         return e;
     }
     !function() {
-        var e = Ih();
+        var e = Oh();
     }(), function() {
-        var e, t = (e = new Ph(4), Ph != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0, 
+        var e, t = (e = new kh(4), kh != Float32Array && (e[0] = 0, e[1] = 0, e[2] = 0, 
         e[3] = 0), e);
     }();
-    var zh, Vh = function(e, t, n) {
+    var Bh, Gh = function(e, t, n) {
         return e[0] = t[0] * n, e[1] = t[1] * n, e[2] = t[2] * n, e[3] = t[3] * n, e;
-    }, Uh = function(e, t) {
+    }, jh = function(e, t) {
         var n = t[0], i = t[1], r = t[2], s = t[3], o = n * n + i * i + r * r + s * s;
         return o > 0 && (o = 1 / Math.sqrt(o), e[0] = n * o, e[1] = i * o, e[2] = r * o, 
         e[3] = s * o), e;
     };
-    Ih(), Ch(1, 0, 0), Ch(0, 1, 0), Hh(), Hh(), zh = new Ph(9), Ph != Float32Array && (zh[1] = 0, 
-    zh[2] = 0, zh[3] = 0, zh[5] = 0, zh[6] = 0, zh[7] = 0), zh[0] = 1, zh[4] = 1, zh[8] = 1;
+    Oh(), Fh(1, 0, 0), Fh(0, 1, 0), Vh(), Vh(), Bh = new kh(9), kh != Float32Array && (Bh[1] = 0, 
+    Bh[2] = 0, Bh[3] = 0, Bh[5] = 0, Bh[6] = 0, Bh[7] = 0), Bh[0] = 1, Bh[4] = 1, Bh[8] = 1;
     /*!
      * Contains code from google filament
      * https://github.com/google/filament/
      * License Apache-2.0
      */
-    const Bh = 8, Gh = [], jh = [], Wh = [], Xh = [];
-    function Yh(e, t, n) {
-        const i = Dh(jh, t, n), r = function(e, t, n, i, r, s, o, a, l, h) {
+    const Wh = 8, Xh = [], Yh = [], Zh = [], qh = [];
+    function $h(e, t, n) {
+        const i = Nh(Yh, t, n), r = function(e, t, n, i, r, s, o, a, l, h) {
             return e[0] = t, e[1] = n, e[2] = i, e[3] = r, e[4] = s, e[5] = o, e[6] = a, e[7] = l, 
             e[8] = h, e;
-        }(Gh, n[0], n[1], n[2], ...i, ...t);
-        e = Nh(e, r), e = function(e) {
-            return e[3] < 0 ? Vh(e, e, -1) : e;
-        }(e = Uh(e, e));
-        const s = 1 / ((1 << 2 * Bh - 1) - 1);
+        }(Xh, n[0], n[1], n[2], ...i, ...t);
+        e = Uh(e, r), e = function(e) {
+            return e[3] < 0 ? Gh(e, e, -1) : e;
+        }(e = jh(e, e));
+        const s = 1 / ((1 << 2 * Wh - 1) - 1);
         if (e[3] < s) {
             e[3] = s;
             const t = Math.sqrt(1 - s * s);
             e[0] *= t, e[1] *= t, e[2] *= t;
         }
-        const o = n[3] > 0 ? Dh(Wh, n, t) : Dh(Wh, t, n);
-        return Eh(Dh(Xh, n, t), o) < 0 && Vh(e, e, -1), e;
+        const o = n[3] > 0 ? Nh(Zh, n, t) : Nh(Zh, t, n);
+        return Hh(Nh(qh, n, t), o) < 0 && Gh(e, e, -1), e;
     }
-    const Zh = [];
-    const qh = [], $h = [], Jh = [], Kh = [], Qh = [], ec = [], tc = [];
-    function nc(e, t, n, i, r, s) {
-        Oh(Kh, e[3 * t], e[3 * t + 1], e[3 * t + 2]), Oh(Qh, e[3 * n], e[3 * n + 1], e[3 * n + 2]), 
-        Oh(ec, e[3 * i], e[3 * i + 1], e[3 * i + 2]);
-        const o = Lh(qh, ec, Qh), a = Lh($h, Kh, Qh), l = Dh(Jh, o, a);
-        Rh(tc, l), r[3 * t] = r[3 * t] || 0, r[3 * n] = r[3 * n] || 0, r[3 * i] = r[3 * i] || 0, 
+    const Jh = [];
+    const Kh = [], Qh = [], ec = [], tc = [], nc = [], ic = [], rc = [];
+    function sc(e, t, n, i, r, s) {
+        Eh(tc, e[3 * t], e[3 * t + 1], e[3 * t + 2]), Eh(nc, e[3 * n], e[3 * n + 1], e[3 * n + 2]), 
+        Eh(ic, e[3 * i], e[3 * i + 1], e[3 * i + 2]);
+        const o = zh(Kh, ic, nc), a = zh(Qh, tc, nc), l = Nh(ec, o, a);
+        Lh(rc, l), r[3 * t] = r[3 * t] || 0, r[3 * n] = r[3 * n] || 0, r[3 * i] = r[3 * i] || 0, 
         r[3 * t + 1] = r[3 * t + 1] || 0, r[3 * n + 1] = r[3 * n + 1] || 0, r[3 * i + 1] = r[3 * i + 1] || 0, 
         r[3 * t + 2] = r[3 * t + 2] || 0, r[3 * n + 2] = r[3 * n + 2] || 0, r[3 * i + 2] = r[3 * i + 2] || 0, 
-        r[3 * t] += tc[0], r[3 * n] += tc[0], r[3 * i] += tc[0], r[3 * t + 1] += tc[1], 
-        r[3 * n + 1] += tc[1], r[3 * i + 1] += tc[1], r[3 * t + 2] += tc[2], r[3 * n + 2] += tc[2], 
-        r[3 * i + 2] += tc[2], s[t] += 1, s[n] += 1, s[i] += 1;
+        r[3 * t] += rc[0], r[3 * n] += rc[0], r[3 * i] += rc[0], r[3 * t + 1] += rc[1], 
+        r[3 * n + 1] += rc[1], r[3 * i + 1] += rc[1], r[3 * t + 2] += rc[2], r[3 * n + 2] += rc[2], 
+        r[3 * i + 2] += rc[2], s[t] += 1, s[n] += 1, s[i] += 1;
     }
     /*!
      * Contains code from THREE.JS
@@ -20781,23 +20830,23 @@
      * License MIT
      * 
      * Generate tangents per vertex.
-     */    function ic(e, t, n) {
+     */    function oc(e, t, n) {
         return e[0] = t[n], e[1] = t[n + 1], e[2] = t[n + 2], e;
     }
-    function rc(e, t, n) {
+    function ac(e, t, n) {
         return e[0] = t[n], e[1] = t[n + 1], e;
     }
-    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: 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) {
+    const {StyleUtil: lc, PackUtil: hc, ArrayPool: cc} = h(), uc = cc.getInstance();
+    function fc(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), uc.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) {
             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;
             function U(e, n, i, r, s, o) {
                 let a = n;
                 if (N) {
-                    const h = $l(R, i, 3);
+                    const h = Ql(R, i, 3);
                     if (0 === h.length) return n;
                     let c = R.getLength(), d = E.currentIndex;
                     for (let e = 0; e < c; e++) E[d++] = R[e];
@@ -20809,12 +20858,12 @@
                     }
                     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, 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)), 
+                    D.currentIndex = d, H && $l(g || 0, e, n, V, E, f, v, _, p[0], p[1], s, T, w, S, l), 
+                    u > 0 && !z && (n = Ph(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);
                 }
                 if (z) {
-                    N && (u = 0), a = n, n = wh(E, R, i, D, n, V, u, r, t, H, m || 0, y || 0, x, p, _, b, r < 0 ? !o : o), 
+                    N && (u = 0), a = n, n = Ph(E, R, i, D, n, V, u, r, t, H, m || 0, y || 0, x, p, _, b, r < 0 ? !o : o), 
                     L.setLength(n / 3);
                     const e = R.getLength() / 3;
                     L.fill(1, a / 3, a / 3 + e), L.fill(0, a / 3 + e, a / 3 + 2 * e), L.fill(1, a / 3 + 2 * e, a / 3 + 3 * e), 
@@ -20825,7 +20874,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(S) && (X = S, Y = S + 1);
+            Ee(M) && (X = M, Y = M + 1);
             let Z = 0, q = !1;
             const $ = P.getProxy();
             let J = !1;
@@ -20834,19 +20883,19 @@
                 Ee(h) && (Math.abs(h) > Z && (Z = Math.abs(h)), h < 0 && (q = !0));
                 const c = l.geometry, u = l.properties[lt];
                 let f = Array.isArray(u && u[0] && u[0][0]) ? u[0] : u;
-                const {altitude: d, height: p} = Ah.getFeaAltitudeAndHeight(l, n, i, r, s, a, o);
+                const {altitude: d, height: p} = Sh.getFeaAltitudeAndHeight(l, n, i, r, s, a, o);
                 p < 0 ? (J = !0, G = Math.min(d, G), B = Math.max(d - p, B)) : (B = Math.max(d, B), 
                 G = Math.min(d - p, G));
                 const g = E.getLength();
                 let m = 0, y = j;
                 $.setLength(0), R.setLength(0);
-                const x = Ah.calculateSignedArea(c[0]) < 0;
+                const x = Sh.calculateSignedArea(c[0]) < 0;
                 for (let e = 0, n = c.length; e < n; e++) {
                     let i = c[e];
-                    x && (i = i.reverse()), i = Sh(i);
-                    const r = Ah.calculateSignedArea(i) < 0;
+                    x && (i = i.reverse()), i = Ch(i);
+                    const r = Sh.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) {
+                    $.setLength(0), y = j), t !== 1 / 0 && (i = Sh.clipPolygon(i, W)), !i.length) {
                         e === n - 1 && (j = U(y, j, $, p * I, f, C));
                         continue;
                     }
@@ -20856,7 +20905,7 @@
                         let e = $.currentIndex;
                         $[e++] = R.getLength() / 3, $.currentIndex = e;
                     }
-                    El(R, R.getLength(), i, I, d, 0, A), e === n - 1 && (j = U(y, j, $, p * I, f, C));
+                    Hl(R, R.getLength(), i, I, d, 0, A), e === n - 1 && (j = U(y, j, $, p * I, f, C));
                 }
                 const _ = E.getLength() - g, v = (st + "").trim();
                 for (let e = 0; e < _ / 3; e++) {
@@ -20865,19 +20914,19 @@
                     k.currentIndex = e, Ee(h) && (e = F.currentIndex, F[e++] = h, F.currentIndex = e);
                 }
             }
-            const K = Ah.getUnsignedArrayType(O.getLength() ? O[O.getLength() - 1] : 0), Q = {
+            const K = Sh.getUnsignedArrayType(O.getLength() ? O[O.getLength() - 1] : 0), Q = {
                 hasNegativeHeight: J,
                 maxAltitude: B === -1 / 0 ? 0 : B,
                 minAltitude: G === 1 / 0 ? 0 : G,
                 vertices: E,
                 verticeTypes: L,
                 indices: D,
-                pickingIds: Th.createTypedArray(O, K),
+                pickingIds: Mh.createTypedArray(O, K),
                 featureIndexes: k
             };
             if (F.getLength()) {
-                const e = q ? Ah.getPosArrayType(Z) : Ah.getUnsignedArrayType(Z);
-                Q.featureIds = Th.createTypedArray(F, e);
+                const e = q ? Sh.getPosArrayType(Z) : Sh.getUnsignedArrayType(Z);
+                Q.featureIds = Mh.createTypedArray(F, e);
             } else Q.featureIds = [];
             return V && (V.setLength(E.getLength() / 3 * 2), Q.uvs = V), Q;
         }(e, n, {
@@ -20896,8 +20945,8 @@
             uvSize: [ r, r ],
             uvOrigin: i,
             topUVMode: w,
-            sideUVMode: M,
-            sideVerticalUVMode: S,
+            sideUVMode: S,
+            sideVerticalUVMode: M,
             textureYOrigin: C,
             tileRatio: a,
             centimeterToPoint: l,
@@ -20906,19 +20955,19 @@
             res: s,
             glScale: o,
             projectionCode: f
-        }, d, lc), R = [], E = F.vertices.getLength() / 3, D = oc.getIndexArrayType(E), L = ac.createTypedArray(F.indices, D);
+        }, d, uc), R = [], E = F.vertices.getLength() / 3, D = hc.getIndexArrayType(E), L = cc.createTypedArray(F.indices, D);
         delete F.indices, R.push(L.buffer, F.pickingIds.buffer);
-        const H = Math.max(Math.abs(F.maxAltitude), Math.abs(F.minAltitude)), N = p || oc.getPosArrayType(Math.max(512, H));
-        F.vertices = ac.createTypedArray(F.vertices, N);
-        const z = A ? lc.getProxy() : new Float32Array(3 * E);
+        const H = Math.max(Math.abs(F.maxAltitude), Math.abs(F.minAltitude)), N = p || hc.getPosArrayType(Math.max(512, H));
+        F.vertices = cc.createTypedArray(F.vertices, N);
+        const z = A ? uc.getProxy() : new Float32Array(3 * E);
         z.setLength && z.setLength(3 * E);
         const V = function(e, t, n) {
             const i = n || [];
             i.setLength && i.setLength(e.length);
-            const r = Zh;
+            const r = Jh;
             r.length < e.length / 3 && (r.length = e.length / 3), r.fill(0, 0, e.length / 3);
             const s = void 0 === t.length ? t : t.length;
-            for (let n = 0; n < s / 3; n++) void 0 === t.length ? nc(e, 3 * n, 3 * n + 1, 3 * n + 2, i, r) : nc(e, t[3 * n], t[3 * n + 1], t[3 * n + 2], i, r);
+            for (let n = 0; n < s / 3; n++) void 0 === t.length ? sc(e, 3 * n, 3 * n + 1, 3 * n + 2, i, r) : sc(e, t[3 * n], t[3 * n + 1], t[3 * n + 2], i, r);
             for (let e = 0; e < i.length; e += 3) {
                 const t = r[e / 3];
                 0 !== t ? (i[e] /= t, i[e + 1] /= t, i[e + 2] /= t) : (i[e] = 0, i[e + 1] = 0, i[e + 2] = 0);
@@ -20933,44 +20982,44 @@
             1 - Math.abs(t) > 1e-6 ? U = !1 : 0 !== t && (V[e] = Math.round(V[e]));
         }
         if (F.normals = V, A) {
-            let e = lc.get();
+            let e = uc.get();
             e.setLength(4 * E), e = function(e, t, n, i, r) {
                 const s = e.length / 3, o = r || new Array(4 * s), a = [], l = [];
                 for (let e = 0; e < s; e++) a[e] = [ 0, 0, 0 ], l[e] = [ 0, 0, 0 ];
                 const h = [ 0, 0, 0 ], c = [ 0, 0, 0 ], u = [ 0, 0, 0 ], f = [ 0, 0 ], d = [ 0, 0 ], p = [ 0, 0 ], g = [ 0, 0, 0 ], m = [ 0, 0, 0 ];
                 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], 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);
+                    oc(h, e, 3 * t), oc(c, e, 3 * i), oc(u, e, 3 * r), ac(f, n, 2 * t), ac(d, n, 2 * i), 
+                    ac(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);
+                    Eh(g, (w * s - T * o) * S, (w * y - T * x) * S, (w * _ - T * v) * S), Eh(m, (b * o - A * s) * S, (b * x - A * y) * S, (b * v - A * _) * S), 
+                    Dh(a[t], a[t], g), Dh(a[i], a[i], g), Dh(a[r], a[r], g), Dh(l[t], l[t], m), Dh(l[i], l[i], m), 
+                    Dh(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 M(e) {
-                    ic(v, t, 3 * e), kh(b, v), T = a[e], kh(x, T), Lh(x, x, function(e, t, n) {
+                function S(e) {
+                    oc(v, t, 3 * e), Rh(b, v), T = a[e], Rh(x, T), zh(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, 
+                    }(v, v, Hh(v, T))), Lh(x, x), Nh(_, b, T), w = Hh(_, 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) M(i[e + 0]), M(i[e + 1]), M(i[e + 2]);
+                for (let e = 0, t = i.length; e < t; e += 3) S(i[e + 0]), S(i[e + 1]), S(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 = [];
                 for (let a = 0; a < n; a += 4) {
                     const n = a / 4 * 3;
-                    Hl(s, e[n] || 0, e[n + 1] || 0, e[n + 2] || 0), zl(r, t[a] || 0, t[a + 1] || 0, t[a + 2] || 0, t[a + 3] || 0), 
-                    Yh(o, s, r), Nl(i.subarray(a, a + 4), o);
+                    Vl(s, e[n] || 0, e[n + 1] || 0, e[n + 2] || 0), Bl(r, t[a] || 0, t[a + 1] || 0, t[a + 2] || 0, t[a + 3] || 0), 
+                    $h(o, s, r), Ul(i.subarray(a, a + 4), o);
                 }
                 return i;
             }(F.normals, e), F.tangents = e, R.push(e.buffer), delete F.normals;
         }
-        if (F.normals && (U && (F.normals = ac.createTypedArray(F.normals, Int8Array)), 
+        if (F.normals && (U && (F.normals = cc.createTypedArray(F.normals, Int8Array)), 
         R.push(F.normals.buffer)), F.uvs) {
             const e = F.uvs;
-            F.uvs = ac.createTypedArray(e, Float32Array), R.push(F.uvs.buffer);
+            F.uvs = cc.createTypedArray(e, Float32Array), R.push(F.uvs.buffer);
         }
         if (g) {
             const e = F.vertices, t = e.length;
@@ -20979,28 +21028,28 @@
         const G = function(e, t, n, i) {
             const r = {}, s = {}, o = i.getLength();
             if (ze(t.polygonFill)) {
-                let a = Se(t.polygonFill);
+                let a = Me(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 = 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];
+                    we(h) && (r.aColor = 1, a = Me(h), h = a(n, o)), delete o.$layer, delete o.$type, 
+                    lc.normalizeColor(dc, h), l[4 * t] = dc[0], l[4 * t + 1] = dc[1], l[4 * t + 2] = dc[2], 
+                    l[4 * t + 3] = dc[3];
                 }
                 s.aColor = l;
             }
             if (ze(t.polygonOpacity)) {
-                let a = Me(t.polygonOpacity);
+                let a = Se(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 = Se(h), h = a(n, o)), delete o.$layer, delete o.$type, 
+                    we(h) && (r.aOpacity = 1, a = Me(h), h = a(n, o)), delete o.$layer, delete o.$type, 
                     l[t] = 255 * h;
                 }
                 s.aOpacity = l;
@@ -21009,7 +21058,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 && Se(i.topPolygonFill), u = a && Se(i.bottomPolygonFill), f = null, d = null, p = null, g = null;
+                let c = o && Me(i.topPolygonFill), u = a && Me(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];
@@ -21024,10 +21073,10 @@
                     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 = 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], 
+                    we(_) && (x = Me(_), _ = x(r, y)), delete y.$layer, delete y.$type, lc.normalizeColor(dc, _), 
+                    Gl(dc, dc, l);
+                    let v = pc(s, dc);
+                    v < 0 && (v = s.length, s.push(Ul([], dc))), e[i] = v, h ? (f = t[i], p = v) : (d = t[i], 
                     g = v);
                 }
             }
@@ -21035,7 +21084,7 @@
         }(F.verticeTypes, F.featureIndexes, e, c, u), W = {
             data: {
                 data: {
-                    aVertexColorType: j.length <= 252 ? ac.createTypedArray(F.verticeTypes, Uint8Array) : ac.createTypedArray(F.verticeTypes, Uint16Array),
+                    aVertexColorType: j.length <= 252 ? cc.createTypedArray(F.verticeTypes, Uint8Array) : cc.createTypedArray(F.verticeTypes, Uint16Array),
                     aPosition: F.vertices,
                     aNormal: F.normals,
                     aTexCoord0: F.uvs,
@@ -21056,41 +21105,41 @@
         return F.featureIds.length ? (W.data.featureIds = F.featureIds, R.push(W.data.featureIds.buffer)) : W.data.featureIds = [], 
         G.aColor && (W.data.data.aColor = G.aColor, W.buffers.push(G.aColor.buffer)), G.aOpacity && (W.data.data.aOpacity = G.aOpacity, 
         W.buffers.push(G.aOpacity.buffer)), W.buffers.push(W.data.data.aPosition.buffer), 
-        W.data.pickingIdIndiceMap = oc.generatePickingIndiceIndex(W.data.data.aPickingId, W.data.indices), 
+        W.data.pickingIdIndiceMap = hc.generatePickingIndiceIndex(W.data.data.aPickingId, W.data.indices), 
         W;
     }
-    const cc = [];
-    function uc(e, t) {
+    const dc = [];
+    function pc(e, t) {
         for (let r = 0; r < e.length; r++) if (n = t, i = e[r], n[0] === i[0] && n[1] === i[1] && n[2] === i[2] && n[3] === i[3]) return r;
         var n, i;
         return -1;
     }
-    function fc(e, t, n, i, r) {
-        dc(e, t, n || 0, i || e.length - 1, r || gc);
+    function gc(e, t, n, i, r) {
+        mc(e, t, n || 0, i || e.length - 1, r || xc);
     }
-    function dc(e, t, n, i, r) {
+    function mc(e, t, n, i, r) {
         for (;i > n; ) {
             if (i - n > 600) {
                 var s = i - n + 1, o = t - n + 1, a = Math.log(s), l = .5 * Math.exp(2 * a / 3), h = .5 * Math.sqrt(a * l * (s - l) / s) * (o - s / 2 < 0 ? -1 : 1);
-                dc(e, t, Math.max(n, Math.floor(t - o * l / s + h)), Math.min(i, Math.floor(t + (s - o) * l / s + h)), r);
+                mc(e, t, Math.max(n, Math.floor(t - o * l / s + h)), Math.min(i, Math.floor(t + (s - o) * l / s + h)), r);
             }
             var c = e[t], u = n, f = i;
-            for (pc(e, n, t), r(e[i], c) > 0 && pc(e, n, i); u < f; ) {
-                for (pc(e, u, f), u++, f--; r(e[u], c) < 0; ) u++;
+            for (yc(e, n, t), r(e[i], c) > 0 && yc(e, n, i); u < f; ) {
+                for (yc(e, u, f), u++, f--; r(e[u], c) < 0; ) u++;
                 for (;r(e[f], c) > 0; ) f--;
             }
-            0 === r(e[n], c) ? pc(e, n, f) : pc(e, ++f, i), f <= t && (n = f + 1), t <= f && (i = f - 1);
+            0 === r(e[n], c) ? yc(e, n, f) : yc(e, ++f, i), f <= t && (n = f + 1), t <= f && (i = f - 1);
         }
     }
-    function pc(e, t, n) {
+    function yc(e, t, n) {
         var i = e[t];
         e[t] = e[n], e[n] = i;
     }
-    function gc(e, t) {
+    function xc(e, t) {
         return e < t ? -1 : e > t ? 1 : 0;
     }
     h();
-    class mc {
+    class _c {
         constructor(e = 9) {
             this._maxEntries = Math.max(4, e), this._minEntries = Math.max(2, Math.ceil(.4 * this._maxEntries)), 
             this.clear();
@@ -21101,12 +21150,12 @@
         search(e) {
             let t = this.data;
             const n = [];
-            if (!Pc(e, t)) return n;
+            if (!kc(e, t)) return n;
             const i = this.toBBox, r = [];
             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) : Sc(e, a) ? this._all(o, n) : r.push(o));
+                    kc(e, a) && (t.leaf ? n.push(o) : Cc(e, a) ? this._all(o, n) : r.push(o));
                 }
                 t = r.pop();
             }
@@ -21114,13 +21163,13 @@
         }
         collides(e) {
             let t = this.data;
-            if (!Pc(e, t)) return !1;
+            if (!kc(e, t)) return !1;
             const n = [];
             for (;t; ) {
                 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 || Sc(e, s)) return !0;
+                    if (kc(e, s)) {
+                        if (t.leaf || Cc(e, s)) return !0;
                         n.push(r);
                     }
                 }
@@ -21148,7 +21197,7 @@
             return e && this._insert(e, this.data.height - 1), this;
         }
         clear() {
-            return this.data = Ic([]), this;
+            return this.data = Oc([]), this;
         }
         remove(e, t) {
             if (!e) return this;
@@ -21157,10 +21206,10 @@
             let o, a, l;
             for (;n || r.length; ) {
                 if (n || (n = r.pop(), a = r[r.length - 1], o = s.pop(), l = !0), n.leaf) {
-                    const i = yc(e, n.children, t);
+                    const i = vc(e, n.children, t);
                     if (-1 !== i) return n.children.splice(i, 1), r.push(n), this._condense(r), this;
                 }
-                l || n.leaf || !Sc(n, i) ? a ? (o++, n = a.children[o], l = !1) : n = null : (r.push(n), 
+                l || n.leaf || !Cc(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;
@@ -21188,26 +21237,26 @@
         _build(e, t, n, i) {
             const r = n - t + 1;
             let s, o = this._maxEntries;
-            if (r <= o) return s = Ic(e.slice(t, n + 1)), xc(s, this.toBBox), s;
+            if (r <= o) return s = Oc(e.slice(t, n + 1)), bc(s, this.toBBox), s;
             i || (i = Math.ceil(Math.log(r) / Math.log(o)), o = Math.ceil(r / Math.pow(o, i - 1))), 
-            s = Ic([]), s.leaf = !1, s.height = i;
+            s = Oc([]), s.leaf = !1, s.height = i;
             const a = Math.ceil(r / o), l = a * Math.ceil(Math.sqrt(o));
-            Cc(e, t, n, l, this.compareMinX);
+            Fc(e, t, n, l, this.compareMinX);
             for (let r = t; r <= n; r += l) {
                 const t = Math.min(r + l - 1, n);
-                Cc(e, r, t, a, this.compareMinY);
+                Fc(e, r, t, a, this.compareMinY);
                 for (let n = r; n <= t; n += a) {
                     const r = Math.min(n + a - 1, t);
                     s.children.push(this._build(e, n, r, i - 1));
                 }
             }
-            return xc(s, this.toBBox), s;
+            return bc(s, this.toBBox), s;
         }
         _chooseSubtree(e, t, n, i) {
             for (;i.push(t), !t.leaf && i.length - 1 !== n; ) {
                 let n, i = 1 / 0, o = 1 / 0;
                 for (let a = 0; a < t.children.length; a++) {
-                    const l = t.children[a], h = Tc(l), c = (r = e, s = l, (Math.max(s.maxX, r.maxX) - Math.min(s.minX, r.minX)) * (Math.max(s.maxY, r.maxY) - Math.min(s.minY, r.minY)) - h);
+                    const l = t.children[a], h = Mc(l), c = (r = e, s = l, (Math.max(s.maxX, r.maxX) - Math.min(s.minX, r.minX)) * (Math.max(s.maxY, r.maxY) - Math.min(s.minY, r.minY)) - h);
                     c < o ? (o = c, i = h < i ? h : i, n = l) : c === o && h < i && (i = h, n = l);
                 }
                 t = n || t.children[0];
@@ -21217,97 +21266,97 @@
         }
         _insert(e, t, n) {
             const i = n ? e : this.toBBox(e), r = [], s = this._chooseSubtree(i, this.data, t, r);
-            for (s.children.push(e), vc(s, i); t >= 0 && r[t].children.length > this._maxEntries; ) this._split(r, t), 
+            for (s.children.push(e), Tc(s, i); t >= 0 && r[t].children.length > this._maxEntries; ) this._split(r, t), 
             t--;
             this._adjustParentBBoxes(i, r, t);
         }
         _split(e, t) {
             const n = e[t], i = n.children.length, r = this._minEntries;
             this._chooseSplitAxis(n, r, i);
-            const s = this._chooseSplitIndex(n, r, i), o = Ic(n.children.splice(s, n.children.length - s));
-            o.height = n.height, o.leaf = n.leaf, xc(n, this.toBBox), xc(o, this.toBBox), t ? e[t - 1].children.push(o) : this._splitRoot(n, o);
+            const s = this._chooseSplitIndex(n, r, i), o = Oc(n.children.splice(s, n.children.length - s));
+            o.height = n.height, o.leaf = n.leaf, bc(n, this.toBBox), bc(o, this.toBBox), t ? e[t - 1].children.push(o) : this._splitRoot(n, o);
         }
         _splitRoot(e, t) {
-            this.data = Ic([ e, t ]), this.data.height = e.height + 1, this.data.leaf = !1, 
-            xc(this.data, this.toBBox);
+            this.data = Oc([ e, t ]), this.data.height = e.height + 1, this.data.leaf = !1, 
+            bc(this.data, this.toBBox);
         }
         _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 = Mc(t, a), h = Tc(t) + Tc(a);
+                const t = Ac(e, 0, o, this.toBBox), a = Ac(e, o, n, this.toBBox), l = Ic(t, a), h = Mc(t) + Mc(a);
                 l < r ? (r = l, i = o, s = h < s ? h : s) : l === r && h < s && (s = h, i = o);
             }
             return i || n - t;
         }
         _chooseSplitAxis(e, t, n) {
-            const i = e.leaf ? this.compareMinX : bc, r = e.leaf ? this.compareMinY : Ac;
+            const i = e.leaf ? this.compareMinX : wc, r = e.leaf ? this.compareMinY : Sc;
             this._allDistMargin(e, t, n, i) < this._allDistMargin(e, t, n, r) && e.children.sort(i);
         }
         _allDistMargin(e, t, n, i) {
             e.children.sort(i);
-            const r = this.toBBox, s = _c(e, 0, t, r), o = _c(e, n - t, n, r);
-            let a = wc(s) + wc(o);
+            const r = this.toBBox, s = Ac(e, 0, t, r), o = Ac(e, n - t, n, r);
+            let a = Pc(s) + Pc(o);
             for (let i = t; i < n - t; i++) {
                 const t = e.children[i];
-                vc(s, e.leaf ? r(t) : t), a += wc(s);
+                Tc(s, e.leaf ? r(t) : t), a += Pc(s);
             }
             for (let i = n - t - 1; i >= t; i--) {
                 const t = e.children[i];
-                vc(o, e.leaf ? r(t) : t), a += wc(o);
+                Tc(o, e.leaf ? r(t) : t), a += Pc(o);
             }
             return a;
         }
         _adjustParentBBoxes(e, t, n) {
-            for (let i = n; i >= 0; i--) vc(t[i], e);
+            for (let i = n; i >= 0; i--) Tc(t[i], e);
         }
         _condense(e) {
             for (let t, n = e.length - 1; n >= 0; n--) 0 === e[n].children.length ? n > 0 ? (t = e[n - 1].children, 
-            t.splice(t.indexOf(e[n]), 1)) : this.clear() : xc(e[n], this.toBBox);
+            t.splice(t.indexOf(e[n]), 1)) : this.clear() : bc(e[n], this.toBBox);
         }
     }
-    function yc(e, t, n) {
+    function vc(e, t, n) {
         if (!n) return t.indexOf(e);
         for (let i = 0; i < t.length; i++) if (n(e, t[i])) return i;
         return -1;
     }
-    function xc(e, t) {
-        _c(e, 0, e.children.length, t, e);
+    function bc(e, t) {
+        Ac(e, 0, e.children.length, t, e);
     }
-    function _c(e, t, n, i, r) {
-        r || (r = Ic(null)), r.minX = 1 / 0, r.minY = 1 / 0, r.maxX = -1 / 0, r.maxY = -1 / 0;
+    function Ac(e, t, n, i, r) {
+        r || (r = Oc(null)), r.minX = 1 / 0, r.minY = 1 / 0, r.maxX = -1 / 0, r.maxY = -1 / 0;
         for (let s = t; s < n; s++) {
             const t = e.children[s];
-            vc(r, e.leaf ? i(t) : t);
+            Tc(r, e.leaf ? i(t) : t);
         }
         return r;
     }
-    function vc(e, t) {
+    function Tc(e, t) {
         return e.minX = Math.min(e.minX, t.minX), e.minY = Math.min(e.minY, t.minY), e.maxX = Math.max(e.maxX, t.maxX), 
         e.maxY = Math.max(e.maxY, t.maxY), e;
     }
-    function bc(e, t) {
+    function wc(e, t) {
         return e.minX - t.minX;
     }
-    function Ac(e, t) {
+    function Sc(e, t) {
         return e.minY - t.minY;
     }
-    function Tc(e) {
+    function Mc(e) {
         return (e.maxX - e.minX) * (e.maxY - e.minY);
     }
-    function wc(e) {
+    function Pc(e) {
         return e.maxX - e.minX + (e.maxY - e.minY);
     }
-    function Mc(e, t) {
+    function Ic(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 Sc(e, t) {
+    function Cc(e, t) {
         return e.minX <= t.minX && e.minY <= t.minY && t.maxX <= e.maxX && t.maxY <= e.maxY;
     }
-    function Pc(e, t) {
+    function kc(e, t) {
         return t.minX <= e.maxX && t.minY <= e.maxY && t.maxX >= e.minX && t.maxY >= e.minY;
     }
-    function Ic(e) {
+    function Oc(e) {
         return {
             children: e,
             height: 1,
@@ -21318,16 +21367,16 @@
             maxY: -1 / 0
         };
     }
-    function Cc(e, t, n, i, r) {
+    function Fc(e, t, n, i, r) {
         const s = [ t, n ];
         for (;s.length; ) {
             if ((n = s.pop()) - (t = s.pop()) <= i) continue;
             const o = t + Math.ceil((n - t) / i / 2) * i;
-            fc(e, o, t, n, r), s.push(t, o, o, n);
+            gc(e, o, t, n, r), s.push(t, o, o, n);
         }
     }
-    class kc {
-        constructor(e = [], t = Oc) {
+    class Rc {
+        constructor(e = [], t = Ec) {
             if (this.data = e, this.length = this.data.length, this.compare = t, this.length > 0) for (let e = (this.length >> 1) - 1; e >= 0; e--) this._down(e);
         }
         push(e) {
@@ -21361,12 +21410,12 @@
             t[e] = r;
         }
     }
-    function Oc(e, t) {
+    function Ec(e, t) {
         return e < t ? -1 : e > t ? 1 : 0;
     }
-    var Fc = {
+    var Dc = {
         exports: {}
-    }, Rc = function(e, t, n, i) {
+    }, Lc = function(e, t, n, i) {
         var r = e[0], s = e[1], o = !1;
         void 0 === n && (n = 0), void 0 === i && (i = t.length);
         for (var a = (i - n) / 2, l = 0, h = a - 1; l < a; h = l++) {
@@ -21374,7 +21423,7 @@
             u > s != d > s && r < (f - c) * (s - u) / (d - u) + c && (o = !o);
         }
         return o;
-    }, Ec = function(e, t, n, i) {
+    }, Hc = function(e, t, n, i) {
         var r = e[0], s = e[1], o = !1;
         void 0 === n && (n = 0), void 0 === i && (i = t.length);
         for (var a = i - n, l = 0, h = a - 1; l < a; h = l++) {
@@ -21383,13 +21432,13 @@
         }
         return o;
     };
-    Fc.exports = function(e, t, n, i) {
-        return t.length > 0 && Array.isArray(t[0]) ? Ec(e, t, n, i) : Rc(e, t, n, i);
+    Dc.exports = function(e, t, n, i) {
+        return t.length > 0 && Array.isArray(t[0]) ? Hc(e, t, n, i) : Lc(e, t, n, i);
     };
-    var Dc = Fc.exports.nested = Ec;
-    Fc.exports.flat = Rc;
-    const Lc = 11102230246251565e-32, Hc = 134217729, Nc = (3 + 8 * Lc) * Lc;
-    function zc(e, t, n, i, r) {
+    var Nc = Dc.exports.nested = Hc;
+    Dc.exports.flat = Lc;
+    const zc = 11102230246251565e-32, Vc = 134217729, Uc = (3 + 8 * zc) * zc;
+    function Bc(e, t, n, i, r) {
         let s, o, a, l, h = t[0], c = i[0], u = 0, f = 0;
         c > h == c > -h ? (s = h, h = t[++u]) : (s = c, c = i[++f]);
         let d = 0;
@@ -21403,57 +21452,57 @@
         0 !== a && (r[d++] = a);
         return 0 === s && 0 !== d || (r[d++] = s), d;
     }
-    function Vc(e) {
+    function Gc(e) {
         return new Float64Array(e);
     }
-    const Uc = 33306690738754716e-32, Bc = 22204460492503146e-32, Gc = 11093356479670487e-47, jc = Vc(4), Wc = Vc(8), Xc = Vc(12), Yc = Vc(16), Zc = Vc(4);
-    function qc(e, t, n, i, r, s) {
+    const jc = 33306690738754716e-32, Wc = 22204460492503146e-32, Xc = 11093356479670487e-47, Yc = Gc(4), Zc = Gc(8), qc = Gc(12), $c = Gc(16), Jc = Gc(4);
+    function Kc(e, t, n, i, r, s) {
         const o = (t - s) * (n - r), a = (e - r) * (i - s), l = o - a;
         if (0 === o || 0 === a || o > 0 != a > 0) return l;
         const h = Math.abs(o + a);
-        return Math.abs(l) >= Uc * h ? l : -function(e, t, n, i, r, s, o) {
+        return Math.abs(l) >= jc * 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 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;
+            const S = e - r, M = n - r, P = t - s, I = i - s;
+            v = S * I, f = Vc * S, d = f - (f - S), p = S - d, f = Vc * I, g = f - (f - I), 
+            m = I - g, b = p * m - (v - d * g - p * g - d * m), A = P * M, f = Vc * P, d = f - (f - P), 
+            p = P - d, f = Vc * M, g = f - (f - M), m = M - g, T = p * m - (A - d * g - p * g - d * m), 
+            y = b - T, u = b - y, Yc[0] = b - (y + u) + (u - T), x = v + y, u = x - v, _ = v - (x - u) + (y - u), 
+            y = _ - A, u = _ - y, Yc[1] = _ - (y + u) + (u - A), w = x + y, u = w - x, Yc[2] = x - (w - u) + (y - u), 
+            Yc[3] = w;
             let C = function(e, t) {
                 let n = t[0];
                 for (let i = 1; i < e; i++) n += t[i];
                 return n;
-            }(4, jc), k = Bc * o;
+            }(4, Yc), k = Wc * o;
             if (C >= k || -C >= k) return C;
-            if (u = e - M, a = e - (M + u) + (u - r), u = n - S, h = n - (S + u) + (u - r), 
+            if (u = e - S, a = e - (S + u) + (u - r), u = n - M, h = n - (M + 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 += 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 * 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 = 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), 
-            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 F = zc(O, Wc, 4, Zc, Xc);
-            v = a * c, f = Hc * a, d = f - (f - a), p = a - d, f = Hc * c, g = f - (f - c), 
-            m = c - g, b = p * m - (v - d * g - p * g - d * m), A = l * h, f = Hc * l, d = f - (f - l), 
-            p = l - 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), 
-            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 R = zc(F, Xc, 4, Zc, Yc);
-            return Yc[R - 1];
+            if (k = Xc * o + Uc * Math.abs(C), C += S * c + I * a - (P * h + M * l), C >= k || -C >= k) return C;
+            v = a * I, f = Vc * a, d = f - (f - a), p = a - d, f = Vc * I, g = f - (f - I), 
+            m = I - g, b = p * m - (v - d * g - p * g - d * m), A = l * M, f = Vc * l, d = f - (f - l), 
+            p = l - d, f = Vc * M, g = f - (f - M), m = M - 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;
+            const O = Bc(4, Yc, 4, Jc, Zc);
+            v = S * c, f = Vc * S, d = f - (f - S), p = S - d, f = Vc * c, g = f - (f - c), 
+            m = c - g, b = p * m - (v - d * g - p * g - d * m), A = P * h, f = Vc * P, d = f - (f - P), 
+            p = P - d, f = Vc * h, g = f - (f - h), m = h - 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;
+            const F = Bc(O, Zc, 4, Jc, qc);
+            v = a * c, f = Vc * a, d = f - (f - a), p = a - d, f = Vc * c, g = f - (f - c), 
+            m = c - g, b = p * m - (v - d * g - p * g - d * m), A = l * h, f = Vc * l, d = f - (f - l), 
+            p = l - d, f = Vc * h, g = f - (f - h), m = h - 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;
+            const R = Bc(F, qc, 4, Jc, $c);
+            return $c[R - 1];
         }(e, t, n, i, r, s, h);
     }
-    function $c(e, t, n) {
+    function Qc(e, t, n) {
         t = Math.max(0, void 0 === t ? 2 : t), n = n || 0;
         var i = function(e) {
             for (var t = e[0], n = e[0], i = e[0], r = e[0], s = 0; s < e.length; s++) {
@@ -21461,20 +21510,20 @@
                 o[0] < t[0] && (t = o), o[0] > i[0] && (i = o), o[1] < n[1] && (n = o), o[1] > r[1] && (r = o);
             }
             var a = [ t, n, i, r ], l = a.slice();
-            for (s = 0; s < e.length; s++) Dc(e[s], a) || l.push(e[s]);
+            for (s = 0; s < e.length; s++) Nc(e[s], a) || l.push(e[s]);
             return function(e) {
-                e.sort(lu);
+                e.sort(uu);
                 for (var t = [], n = 0; n < e.length; n++) {
-                    for (;t.length >= 2 && nu(t[t.length - 2], t[t.length - 1], e[n]) <= 0; ) t.pop();
+                    for (;t.length >= 2 && su(t[t.length - 2], t[t.length - 1], e[n]) <= 0; ) t.pop();
                     t.push(e[n]);
                 }
                 for (var i = [], r = e.length - 1; r >= 0; r--) {
-                    for (;i.length >= 2 && nu(i[i.length - 2], i[i.length - 1], e[r]) <= 0; ) i.pop();
+                    for (;i.length >= 2 && su(i[i.length - 2], i[i.length - 1], e[r]) <= 0; ) i.pop();
                     i.push(e[r]);
                 }
                 return i.pop(), t.pop(), t.concat(i);
             }(l);
-        }(e), r = new mc(16);
+        }(e), r = new _c(16);
         r.toBBox = function(e) {
             return {
                 minX: e[0],
@@ -21489,16 +21538,16 @@
         }, r.load(e);
         for (var s, o = [], a = 0; a < i.length; a++) {
             var l = i[a];
-            r.remove(l), s = ru(l, s), o.push(s);
+            r.remove(l), s = au(l, s), o.push(s);
         }
-        var h = new mc(16);
-        for (a = 0; a < o.length; a++) h.insert(iu(o[a]));
+        var h = new _c(16);
+        for (a = 0; a < o.length; a++) h.insert(ou(o[a]));
         for (var c = t * t, u = n * n; o.length; ) {
-            var f = o.shift(), d = f.p, p = f.next.p, g = su(d, p);
+            var f = o.shift(), d = f.p, p = f.next.p, g = lu(d, p);
             if (!(g < u)) {
                 var m = g / c;
-                (l = Jc(r, f.prev.p, d, p, f.next.next.p, m, h)) && Math.min(su(l, d), su(l, p)) <= m && (o.push(f), 
-                o.push(ru(l, f)), r.remove(l), h.remove(f), h.insert(iu(f)), h.insert(iu(f.next)));
+                (l = eu(r, f.prev.p, d, p, f.next.next.p, m, h)) && Math.min(lu(l, d), lu(l, p)) <= m && (o.push(f), 
+                o.push(au(l, f)), r.remove(l), h.remove(f), h.insert(ou(f)), h.insert(ou(f.next)));
             }
         }
         f = s;
@@ -21508,58 +21557,58 @@
         } while (f !== s);
         return y.push(f.p), y;
     }
-    function Jc(e, t, n, i, r, s, o) {
-        for (var a = new kc([], Kc), l = e.data; l; ) {
+    function eu(e, t, n, i, r, s, o) {
+        for (var a = new Rc([], tu), l = e.data; l; ) {
             for (var h = 0; h < l.children.length; h++) {
-                var c = l.children[h], u = l.leaf ? ou(c, n, i) : Qc(n, i, c);
+                var c = l.children[h], u = l.leaf ? hu(c, n, i) : nu(n, i, c);
                 u > s || a.push({
                     node: c,
                     dist: u
                 });
             }
             for (;a.length && !a.peek().node.children; ) {
-                var f = a.pop(), d = f.node, p = ou(d, t, n), g = ou(d, i, r);
-                if (f.dist < p && f.dist < g && tu(n, d, o) && tu(i, d, o)) return d;
+                var f = a.pop(), d = f.node, p = hu(d, t, n), g = hu(d, i, r);
+                if (f.dist < p && f.dist < g && ru(n, d, o) && ru(i, d, o)) return d;
             }
             (l = a.pop()) && (l = l.node);
         }
         return null;
     }
-    function Kc(e, t) {
+    function tu(e, t) {
         return e.dist - t.dist;
     }
-    function Qc(e, t, n) {
-        if (eu(e, n) || eu(t, n)) return 0;
-        var i = au(e[0], e[1], t[0], t[1], n.minX, n.minY, n.maxX, n.minY);
+    function nu(e, t, n) {
+        if (iu(e, n) || iu(t, n)) return 0;
+        var i = cu(e[0], e[1], t[0], t[1], n.minX, n.minY, n.maxX, n.minY);
         if (0 === i) return 0;
-        var r = au(e[0], e[1], t[0], t[1], n.minX, n.minY, n.minX, n.maxY);
+        var r = cu(e[0], e[1], t[0], t[1], n.minX, n.minY, n.minX, n.maxY);
         if (0 === r) return 0;
-        var s = au(e[0], e[1], t[0], t[1], n.maxX, n.minY, n.maxX, n.maxY);
+        var s = cu(e[0], e[1], t[0], t[1], n.maxX, n.minY, n.maxX, n.maxY);
         if (0 === s) return 0;
-        var o = au(e[0], e[1], t[0], t[1], n.minX, n.maxY, n.maxX, n.maxY);
+        var o = cu(e[0], e[1], t[0], t[1], n.minX, n.maxY, n.maxX, n.maxY);
         return 0 === o ? 0 : Math.min(i, r, s, o);
     }
-    function eu(e, t) {
+    function iu(e, t) {
         return e[0] >= t.minX && e[0] <= t.maxX && e[1] >= t.minY && e[1] <= t.maxY;
     }
-    function tu(e, t, n) {
+    function ru(e, t, n) {
         for (var i, r, s, o, a = Math.min(e[0], t[0]), l = Math.min(e[1], t[1]), h = Math.max(e[0], t[0]), c = Math.max(e[1], t[1]), u = n.search({
             minX: a,
             minY: l,
             maxX: h,
             maxY: c
-        }), f = 0; f < u.length; f++) if (i = u[f].p, r = u[f].next.p, s = e, i !== (o = t) && r !== s && nu(i, r, s) > 0 != nu(i, r, o) > 0 && nu(s, o, i) > 0 != nu(s, o, r) > 0) return !1;
+        }), f = 0; f < u.length; f++) if (i = u[f].p, r = u[f].next.p, s = e, i !== (o = t) && r !== s && su(i, r, s) > 0 != su(i, r, o) > 0 && su(s, o, i) > 0 != su(s, o, r) > 0) return !1;
         return !0;
     }
-    function nu(e, t, n) {
-        return qc(e[0], e[1], t[0], t[1], n[0], n[1]);
+    function su(e, t, n) {
+        return Kc(e[0], e[1], t[0], t[1], n[0], n[1]);
     }
-    function iu(e) {
+    function ou(e) {
         var t = e.p, n = e.next.p;
         return e.minX = Math.min(t[0], n[0]), e.minY = Math.min(t[1], n[1]), e.maxX = Math.max(t[0], n[0]), 
         e.maxY = Math.max(t[1], n[1]), e;
     }
-    function ru(e, t) {
+    function au(e, t) {
         var n = {
             p: e,
             prev: null,
@@ -21572,11 +21621,11 @@
         return t ? (n.next = t.next, n.prev = t, t.next.prev = n, t.next = n) : (n.prev = n, 
         n.next = n), n;
     }
-    function su(e, t) {
+    function lu(e, t) {
         var n = e[0] - t[0], i = e[1] - t[1];
         return n * n + i * i;
     }
-    function ou(e, t, n) {
+    function hu(e, t, n) {
         var i = t[0], r = t[1], s = n[0] - i, o = n[1] - r;
         if (0 !== s || 0 !== o) {
             var a = ((e[0] - i) * s + (e[1] - r) * o) / (s * s + o * o);
@@ -21584,25 +21633,25 @@
         }
         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, 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 + _, 
+    function cu(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 + _, 
         w = x));
-        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;
+        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;
     }
-    function lu(e, t) {
+    function uu(e, t) {
         return e[0] === t[0] ? e[1] - t[1] : e[0] - t[0];
     }
-    const {PackUtil: hu} = h();
-    class cu {
+    const {PackUtil: fu} = h();
+    class du {
         constructor(e, t) {
             this.x = e, this.y = t;
         }
         clone() {
-            return new cu(this.x, this.y);
+            return new du(this.x, this.y);
         }
         normalize() {
             const e = this.length();
@@ -21615,7 +21664,7 @@
             return Math.sqrt(this.x * this.x + this.y * this.y);
         }
         diff(e) {
-            return new cu(this.x - e.x, this.y - e.y);
+            return new du(this.x - e.x, this.y - e.y);
         }
         distance(e) {
             const t = this.x - e.x, n = this.y - e.y;
@@ -21628,48 +21677,48 @@
             return this.x === e.x && this.y === e.y;
         }
         orthogonal() {
-            return new cu(this.y, -this.x);
+            return new du(this.y, -this.x);
         }
     }
-    function uu(e, t, n, i) {
+    function pu(e, t, n, i) {
         const r = t.x * i.y - t.y * i.x, s = n.x - e.x, o = n.y - e.y, a = (s * i.y - o * i.x) / r;
-        return new cu(e.x + a * t.x, e.y + a * t.y);
+        return new du(e.x + a * t.x, e.y + a * t.y);
     }
-    const fu = [], du = [];
-    function pu(e) {
+    const gu = [], mu = [];
+    function yu(e) {
         if (Ee(e[0] && e[0].x)) {
             const t = [];
             let n = 0;
-            for (let i = 0; i < e.length; i++) du[n] ? (du[n][0] = e[i].x, du[n][1] = e[i].y) : du[n] = [ e[i].x, e[i].y ], 
-            t.push(du[n]), n++;
+            for (let i = 0; i < e.length; i++) mu[n] ? (mu[n][0] = e[i].x, mu[n][1] = e[i].y) : mu[n] = [ e[i].x, e[i].y ], 
+            t.push(mu[n]), n++;
             e = t;
         }
         try {
-            const t = $c(e, 1 / 0);
+            const t = Qc(e, 1 / 0);
             let n = [ 1 / 0, 1 / 0 ], i = [ -1 / 0, -1 / 0 ];
             for (let e = 0; e < t.length; e++) t[e][0] < n[0] && (n[0] = t[e][0]), t[e][0] > i[0] && (i[0] = t[e][0]), 
             t[e][1] < n[1] && (n[1] = t[e][1]), t[e][1] > i[1] && (i[1] = t[e][1]);
             const r = [];
             let s = [], o = 0;
-            for (let e = 0; e < t.length; e++) e === t.length - 1 && t[e][0] === t[0][0] && t[e][1] === t[0][1] || (Xl(r, t[e]), 
-            fu[o] ? (fu[o].x = r[0], fu[o].y = r[1]) : fu[o] = new cu(r[0], r[1]), s.push(fu[o]), 
+            for (let e = 0; e < t.length; e++) e === t.length - 1 && t[e][0] === t[0][0] && t[e][1] === t[0][1] || (ql(r, t[e]), 
+            gu[o] ? (gu[o].x = r[0], gu[o].y = r[1]) : gu[o] = new du(r[0], r[1]), s.push(gu[o]), 
             o++);
-            hu.calculateSignedArea(s) < 0 && (s = s.reverse());
+            fu.calculateSignedArea(s) < 0 && (s = s.reverse());
             const a = function(e) {
                 let t, n = Number.MAX_VALUE;
                 const i = function(e, i, r, s, o, a, l, h) {
-                    var c = uu(e, i, o, a), u = uu(r, s, o, a), f = uu(l, h, e, i), d = uu(l, h, r, s), p = c.distance(u) * c.distance(f);
+                    var c = pu(e, i, o, a), u = pu(r, s, o, a), f = pu(l, h, e, i), d = pu(l, h, r, s), p = c.distance(u) * c.distance(f);
                     0 !== p && p < n && (t = [ c, f, d, u ], n = p);
                 };
                 var r = [];
                 for (let t = 0; t < e.length; t++) r.push(e[(t + 1) % e.length].diff(e[t])), r[t].normalize();
-                var s, o, a, l, h = new cu(Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY), c = new cu(Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY);
+                var s, o, a, l, h = new du(Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY), c = new du(Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY);
                 for (let t = 0; t < e.length; t++) {
                     var u = e[t];
                     u.x < h.x && (h.x = u.x, s = t), u.x > c.x && (c.x = u.x, o = t), u.y < h.y && (h.y = u.y, 
                     l = t), u.y > c.y && (c.y = u.y, a = t);
                 }
-                var f = new cu(0, -1), d = new cu(0, 1), p = new cu(-1, 0), g = new cu(1, 0);
+                var f = new du(0, -1), d = new du(0, 1), p = new du(-1, 0), g = new du(1, 0);
                 for (let t = 0; t < e.length; t++) {
                     var m = [ Math.acos(f.dot(r[s])), Math.acos(d.dot(r[o])), Math.acos(p.dot(r[a])), Math.acos(g.dot(r[l])) ];
                     switch (m.indexOf(Math.min.apply(Math, m))) {
@@ -21703,10 +21752,10 @@
             return null;
         }
     }
-    const {DEFAULT_TEX_WIDTH: gu} = h();
-    class mu extends ln {
+    const {DEFAULT_TEX_WIDTH: xu} = h();
+    class _u extends ln {
         static fromJSON(e) {
-            return Ml(e, "ExtrudePolygonLayer", mu);
+            return Il(e, "ExtrudePolygonLayer", _u);
         }
         getPolygonOffsetCount() {
             return 0;
@@ -21738,11 +21787,11 @@
             return n && n.updateDataConfig(e, t), this;
         }
     }
-    mu.registerJSONType("ExtrudePolygonLayer"), mu.mergeOptions({
+    _u.registerJSONType("ExtrudePolygonLayer"), _u.mergeOptions({
         cullFace: !1,
         castShadow: !0
     });
-    const yu = {
+    const vu = {
         polygonFill: {
             type: "identity",
             default: [ 1, 1, 1, 1 ],
@@ -21763,10 +21812,10 @@
             default: [ 1, 1, 1, 1 ],
             property: "_symbol_bottomPolygonFill"
         }
-    }, xu = {
+    }, bu = {
         defaultAltitude: 20
-    }, _u = e => 1 === e.properties.top;
-    mu.registerRenderer("gl", class extends Rl {
+    }, Au = e => 1 === e.properties.top;
+    _u.registerRenderer("gl", class extends Ll {
         constructor(...e) {
             super(...e), this.GeometryTypes = [ r.Polygon, r.MultiPolygon ];
         }
@@ -21803,8 +21852,8 @@
         }
         createPainter() {
             const e = ln.get3DPainterClass("lit");
-            this.painterSymbol = Fe({}, yu), this.sidePainterSymbol = Fe({}, yu), this._defineSymbolBloom(this.painterSymbol, e.getBloomSymbol());
-            const t = this.layer, n = Fe({}, xu, t.options.dataConfig || {});
+            this.painterSymbol = Fe({}, vu), this.sidePainterSymbol = Fe({}, vu), this._defineSymbolBloom(this.painterSymbol, e.getBloomSymbol());
+            const t = this.layer, n = Fe({}, bu, t.options.dataConfig || {});
             t.options.material && (this.painterSymbol.material = t.options.material), t.options.sideMaterial ? this.sidePainterSymbol.material = t.options.sideMaterial : this.sidePainterSymbol.material = t.options.material;
             const i = {
                 cullFace: t.options.cullFace
@@ -21829,9 +21878,9 @@
         }
         _renderMeshes(...e) {
             const t = e[0], n = t.sceneFilter;
-            t.sceneFilter = e => (!n || n(e)) && _u(e);
+            t.sceneFilter = e => (!n || n(e)) && Au(e);
             const i = super._renderMeshes(...e);
-            t.sceneFilter = e => (!n || n(e)) && _u(e);
+            t.sceneFilter = e => (!n || n(e)) && Au(e);
             const r = this.painter;
             this.painter = this.sidePainter;
             const s = t.sceneFilter = e => (!n || n(e)) && (e => 1 === e.properties.side)(e);
@@ -21856,12 +21905,12 @@
         }
         _createPackData(e, t, n, i) {
             const s = this.getMap();
-            t = yu;
-            const o = this._extrudeCenter, a = 1 / 0, l = s.getZoom(), h = new r.Point(0, 0), c = new r.Coordinate(0, 0), u = Fe({}, xu, this.layer.options.dataConfig);
+            t = vu;
+            const o = this._extrudeCenter, a = 1 / 0, l = s.getZoom(), h = new r.Point(0, 0), c = new r.Coordinate(0, 0), u = Fe({}, bu, this.layer.options.dataConfig);
             if (u.uv = !0, u.top && (u.top = n), u.side && (u.side = i), !1 === u.top && !1 === u.side) return null;
             if (!e.length) return null;
-            const f = s.getGLRes(), d = s.getProjection().code, p = n ? this.painterSymbol && this.painterSymbol.material : this.sidePainterSymbol && this.sidePainterSymbol.material, g = p && p.textureWidth || gu, m = [ Ft(s, 1, c, f) / 100, Ft(s, 1, c, f, 1) / 100 ];
-            return hc(e, u, a, h, g, s.getGLRes(), 1, 1, m, this._zScale, t, l, d, undefined, Float32Array, o);
+            const f = s.getGLRes(), d = s.getProjection().code, p = n ? this.painterSymbol && this.painterSymbol.material : this.sidePainterSymbol && this.sidePainterSymbol.material, g = p && p.textureWidth || xu, m = [ Ft(s, 1, c, f) / 100, Ft(s, 1, c, f, 1) / 100 ];
+            return fc(e, u, a, h, g, s.getGLRes(), 1, 1, m, this._zScale, t, l, d, undefined, Float32Array, o);
         }
         updateMesh(e) {
             const t = e[ir];
@@ -21880,11 +21929,11 @@
                     const n = [];
                     for (let e = 0; e < t.length; e++) {
                         const i = t[e] && t[e][0];
-                        n[e] = pu(i);
+                        n[e] = yu(i);
                     }
                     e.getProperties()[lt] = n;
                 } else {
-                    const n = pu(t[0]);
+                    const n = yu(t[0]);
                     e.getProperties()[lt] = n;
                 }
             }
@@ -21903,11 +21952,11 @@
         getShadowMeshes() {
             return this.painter ? this.painter.getShadowMeshes() : [];
         }
-    }), mu.registerRenderer("canvas", null);
-    const {PackUtil: vu, FilterUtil: bu, SYMBOLS_NEED_REBUILD_IN_VT: Au, SYMBOLS_NEED_REBUILD_IN_VECTOR: Tu} = h();
+    }), _u.registerRenderer("canvas", null);
+    const {PackUtil: Tu, FilterUtil: wu, SYMBOLS_NEED_REBUILD_IN_VT: Su, SYMBOLS_NEED_REBUILD_IN_VECTOR: Mu} = h();
     n.reshader.ShaderLib.register("vt_position_vert", "#ifdef HAS_TERRAIN_ALTITUDE\n    attribute float aTerrainAltitude;\n#endif\nuniform float minAltitude;\n#ifdef HAS_ALTITUDE\n    vec3 unpackVTPosition() {\n        float altitude = aAltitude;\n        #ifdef HAS_TERRAIN_ALTITUDE\n            altitude += aTerrainAltitude * 100.0;\n        #endif\n        altitude += minAltitude * 100.0;\n        return vec3(aPosition, altitude);\n    }\n#else\n    float position_modValue = 16384.0;\n    float position_delta = 0.00001;\n    vec3 unpackVTPosition() {\n        float z = aPosition.z;\n        vec2 pos = sign(aPosition.xy + position_delta) * mod(abs(aPosition.xy), position_modValue);\n        vec2 highs = floor(abs(aPosition.xy) / position_modValue);\n        float altitude = sign(z + position_delta) * (highs.x * 2.0 + highs.y) * pow(2.0, 15.0) + z;\n        #ifdef HAS_TERRAIN_ALTITUDE\n            altitude += aTerrainAltitude * 100.0;\n        #endif\n        altitude += minAltitude * 100.0;\n        return vec3(pos, altitude);\n    }\n#endif");
     s.mat4.create();
-    const wu = function(e, t) {
+    const Pu = function(e, t) {
         const n = e.toString(), i = n.indexOf("{") + 1, r = n.substring(0, i);
         let s = `${r}\n    (` + t.toString() + ")({});\n";
         return s += "\n" + n.substring(r.length), s;
@@ -21915,21 +21964,21 @@
     if (s.transcoders) {
         const e = r.Map.VERSION;
         if (e.indexOf("1.0.0-beta") >= 0 || e.indexOf("1.0.0-alpha") >= 0) {
-            const e = s.transcoders.inject(wu);
+            const e = s.transcoders.inject(Pu);
             r.registerWorkerAdapter("@maptalks/vt", e);
         } else r.registerWorkerAdapter("@maptalks/vt", (function() {
-            return s.transcoders.inject(wu);
+            return s.transcoders.inject(Pu);
         }));
-    } else r.registerWorkerAdapter("@maptalks/vt", wu);
-    e.ExtrudePolygonLayer = mu, e.FillPainter = Xi, e.FillPlugin = Ha, e.FilterUtil = bu, 
-    e.GLTFPhongPlugin = Ya, e.GLTFStandardPlugin = Za, e.GeoJSONVectorTileLayer = Qa, 
-    e.HeatmapPlugin = qa, e.IconPainter = js, e.IconPlugin = Va, e.LineGradientPlugin = za, 
-    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 = 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.3");
+    } else r.registerWorkerAdapter("@maptalks/vt", Pu);
+    e.ExtrudePolygonLayer = _u, e.FillPainter = Xi, e.FillPlugin = Va, e.FilterUtil = wu, 
+    e.GLTFPhongPlugin = $a, e.GLTFStandardPlugin = Ja, e.GeoJSONVectorTileLayer = nl, 
+    e.HeatmapPlugin = Ka, e.IconPainter = js, e.IconPlugin = Ga, e.LineGradientPlugin = Ba, 
+    e.LinePainter = $i, e.LinePlugin = Ua, e.LineStringLayer = Ol, e.LitPlugin = Za, 
+    e.MapboxVectorTileLayer = el, e.NativeLinePainter = jo, e.NativeLinePlugin = Wa, 
+    e.NativePointPainter = Uo, e.PackUtil = Tu, e.PhongPainter = ra, e.PhongPlugin = Xa, 
+    e.PointLayer = Cl, e.PolygonLayer = El, e.SYMBOLS_NEED_REBUILD_IN_VECTOR = Mu, e.SYMBOLS_NEED_REBUILD_IN_VT = Su, 
+    e.TextPainter = Lo, e.TextPlugin = ja, e.TubePlugin = qa, e.Vector3DLayer = ln, 
+    e.VectorTileLayer = en, e.VectorTileLayerRenderer = Ut, e.WaterPlugin = Qa, e.WireframePainter = oa, 
+    e.WireframePlugin = Ya, "undefined" != typeof console && console.log("@maptalks/vt v0.106.1");
 }));
 //# sourceMappingURL=maptalks.vt.js.map