@maptalks/vt 0.63.7 → 0.63.8

package/dist/maptalks.vt.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/vt v0.63.7
+ * @maptalks/vt v0.63.8
  * LICENSE : undefined
  * (c) 2016-2022 maptalks.org
  */
@@ -220,12 +220,12 @@
         }
         return t.length;
     }
-    function R(t) {
+    function L(t) {
         const e = {};
         for (const n in t) void 0 !== t[n] && null !== t[n] && (t[n].toJSON ? e[n] = t[n].toJSON() : e[n] = t[n]);
         return e;
     }
-    function L(t) {
+    function R(t) {
         return function t(e) {
             if (!Array.isArray(e)) return t([ e ]);
             const n = [];
@@ -1183,12 +1183,12 @@
             n && (r = n(r)), r);
         };
     }
-    function Rt(t) {
+    function Lt(t) {
         return function(e) {
             return Math.max(0, Math.min(t, e));
         };
     }
-    function Lt(t) {
+    function Rt(t) {
         return Array.isArray(t) ? t : [ t ];
     }
     function Nt(t, e) {
@@ -1239,28 +1239,28 @@
         alpha: function(t) {
             return arguments.length ? new Ht(this.color.concat(Math.max(0, Math.min(1, t))), this.model) : this.valpha;
         },
-        red: Dt("rgb", 0, Rt(255)),
-        green: Dt("rgb", 1, Rt(255)),
-        blue: Dt("rgb", 2, Rt(255)),
+        red: Dt("rgb", 0, Lt(255)),
+        green: Dt("rgb", 1, Lt(255)),
+        blue: Dt("rgb", 2, Lt(255)),
         hue: Dt([ "hsl", "hsv", "hsl", "hwb", "hcg" ], 0, (function(t) {
             return (t % 360 + 360) % 360;
         })),
-        saturationl: Dt("hsl", 1, Rt(100)),
-        lightness: Dt("hsl", 2, Rt(100)),
-        saturationv: Dt("hsv", 1, Rt(100)),
-        value: Dt("hsv", 2, Rt(100)),
-        chroma: Dt("hcg", 1, Rt(100)),
-        gray: Dt("hcg", 2, Rt(100)),
-        white: Dt("hwb", 1, Rt(100)),
-        wblack: Dt("hwb", 2, Rt(100)),
-        cyan: Dt("cmyk", 0, Rt(100)),
-        magenta: Dt("cmyk", 1, Rt(100)),
-        yellow: Dt("cmyk", 2, Rt(100)),
-        black: Dt("cmyk", 3, Rt(100)),
-        x: Dt("xyz", 0, Rt(100)),
-        y: Dt("xyz", 1, Rt(100)),
-        z: Dt("xyz", 2, Rt(100)),
-        l: Dt("lab", 0, Rt(100)),
+        saturationl: Dt("hsl", 1, Lt(100)),
+        lightness: Dt("hsl", 2, Lt(100)),
+        saturationv: Dt("hsv", 1, Lt(100)),
+        value: Dt("hsv", 2, Lt(100)),
+        chroma: Dt("hcg", 1, Lt(100)),
+        gray: Dt("hcg", 2, Lt(100)),
+        white: Dt("hwb", 1, Lt(100)),
+        wblack: Dt("hwb", 2, Lt(100)),
+        cyan: Dt("cmyk", 0, Lt(100)),
+        magenta: Dt("cmyk", 1, Lt(100)),
+        yellow: Dt("cmyk", 2, Lt(100)),
+        black: Dt("cmyk", 3, Lt(100)),
+        x: Dt("xyz", 0, Lt(100)),
+        y: Dt("xyz", 1, Lt(100)),
+        z: Dt("xyz", 2, Lt(100)),
+        l: Dt("lab", 0, Lt(100)),
         a: Dt("lab", 1),
         b: Dt("lab", 2),
         keyword: function(t) {
@@ -1349,7 +1349,7 @@
                 if (this.model === t) return new Ht(this);
                 if (arguments.length) return new Ht(arguments, t);
                 var n = "number" == typeof arguments[e] ? e : this.valpha;
-                return new Ht(Lt(Ot[this.model][t].raw(this.color)).concat(n), t);
+                return new Ht(Rt(Ot[this.model][t].raw(this.color)).concat(n), t);
             }, Ht[t] = function(n) {
                 return "number" == typeof n && (n = Nt(Ft.call(arguments), e)), new Ht(n, t);
             };
@@ -1889,17 +1889,17 @@
         }
         return t;
     }
-    function Re(t) {
+    function Le(t) {
         return null == t;
     }
-    function Le(t) {
+    function Re(t) {
         return "number" == typeof t && !isNaN(t);
     }
     function Ne(t) {
         return "object" == typeof t && !!t;
     }
     function ze(t) {
-        return !Re(t) && ("string" == typeof t || null !== t.constructor && t.constructor === String);
+        return !Le(t) && ("string" == typeof t || null !== t.constructor && t.constructor === String);
     }
     const Ve = Object.prototype.hasOwnProperty;
     function je(t, e) {
@@ -1994,7 +1994,7 @@
         constructor(t, e, n) {
             this.options = n, this.features = this.H(t), this.symbolDef = e, this.symbol = k(e, () => [ n.zoom ]), 
             this.styledVectors = [], this.properties = {}, this.D = $e.genFnTypes(this.symbolDef), 
-            Ue(this.symbolDef.visible) && (this.R = M(this.symbolDef.visible)), n.atlas && (this.iconAtlas = n.atlas.iconAtlas, 
+            Ue(this.symbolDef.visible) && (this.L = M(this.symbolDef.visible)), n.atlas && (this.iconAtlas = n.atlas.iconAtlas, 
             this.glyphAtlas = n.atlas.glyphAtlas);
         }
         H(t) {
@@ -2132,11 +2132,11 @@
             for (let i = 0, r = t.length; i < r; i++) {
                 if (!t[i].feature.geometry) continue;
                 const r = Array.isArray(t[i]) ? t[i][0].feature.id : t[i].feature.id;
-                Le(r) && (Math.abs(r) > l && (l = Math.abs(r)), r < 0 && (h = !0));
+                Re(r) && (Math.abs(r) > l && (l = Math.abs(r)), r < 0 && (h = !0));
                 const c = this.data.aPosition.length;
-                if (Array.isArray(t[i])) for (let n = 0; n < t[i].length; n++) this.L(t[i][n], e); else this.L(t[i], e);
+                if (Array.isArray(t[i])) for (let n = 0; n < t[i].length; n++) this.R(t[i][n], e); else this.R(t[i], e);
                 const u = (n.aPosition.length - c) / 3;
-                for (let e = 0; e < u; e++) s.push(t[i].featureIdx), Le(r) && a.push(r);
+                for (let e = 0; e < u; e++) s.push(t[i].featureIdx), Re(r) && a.push(r);
                 o = Math.max(o, t[i].featureIdx);
             }
             if (this.hasElements() && !i.length) return null;
@@ -2174,8 +2174,8 @@
             } else d.featureIds = [];
             return d;
         }
-        L(t, e) {
-            this.R && this.R.isZoomConstant && !this.R(null, t.feature.properties) || this.placeVector(t, e, this.formatWidth);
+        R(t, e) {
+            this.L && this.L.isZoomConstant && !this.L(null, t.feature.properties) || this.placeVector(t, e, this.formatWidth);
         }
         addElements(...t) {
             this.maxIndex = Math.max(this.maxIndex, ...t), this.elements.push(...t);
@@ -2230,11 +2230,11 @@
     function Ke(t, e, n, i) {
         const r = "__fn_textSize".trim();
         let s = t.textSize;
-        if (Re(e.textSize)) return [ 16, 16 ];
+        if (Le(e.textSize)) return [ 16, 16 ];
         t[r] && (s = t[r]);
         const o = [];
         var a;
-        return o[0] = Re(a = s) || "function" != typeof a && (null === a.constructor || a.constructor !== Function) ? s : s(i, n), 
+        return o[0] = Le(a = s) || "function" != typeof a && (null === a.constructor || a.constructor !== Function) ? s : s(i, n), 
         o[1] = o[0], o;
     }
     function Qe(t) {
@@ -2251,7 +2251,7 @@
         return ze(t) ? t.replace(tn, (function(t, n) {
             if (!e) return "";
             const i = e[n];
-            return Re(i) ? "" : Array.isArray(i) ? i.join() : i;
+            return Le(i) ? "" : Array.isArray(i) ? i.join() : i;
         })) : t;
     }
     const nn = t => t >= 11904 && t <= 12031, rn = t => t >= 12032 && t <= 12255, sn = t => t >= 12272 && t <= 12287, on = t => t >= 12288 && t <= 12351, an = t => t >= 12352 && t <= 12447, ln = t => t >= 12448 && t <= 12543, hn = t => t >= 12544 && t <= 12591, cn = t => t >= 12704 && t <= 12735, un = t => t >= 12736 && t <= 12783, fn = t => t >= 12784 && t <= 12799, dn = t => t >= 12800 && t <= 13055, pn = t => t >= 13056 && t <= 13311, yn = t => t >= 13312 && t <= 19903, mn = t => t >= 19968 && t <= 40959, gn = t => t >= 40960 && t <= 42127, vn = t => t >= 42128 && t <= 42191, xn = t => t >= 63744 && t <= 64255, bn = t => t >= 64336 && t <= 65023, wn = t => t >= 65040 && t <= 65055, An = t => t >= 65072 && t <= 65103, _n = t => t >= 65104 && t <= 65135, Mn = t => t >= 65136 && t <= 65279, Sn = t => t >= 65280 && t <= 65519;
@@ -2401,7 +2401,7 @@
             let o = 0;
             for (let n = 0; n < t.length; n++) {
                 const l = t.charCodeAt(n), h = i[l];
-                h && !Hn[l] && (o += h.metrics.advance + e), n < t.length - 1 && (Dn[l] || !((a = l) < 11904) && (cn(a) || hn(a) || An(a) || xn(a) || pn(a) || nn(a) || un(a) || on(a) || yn(a) || mn(a) || dn(a) || Sn(a) || an(a) || sn(a) || rn(a) || fn(a) || ln(a) || wn(a) || vn(a) || gn(a))) && r.push(Nn(n + 1, o, s, r, Ln(l, t.charCodeAt(n + 1)), !1));
+                h && !Hn[l] && (o += h.metrics.advance + e), n < t.length - 1 && (Dn[l] || !((a = l) < 11904) && (cn(a) || hn(a) || An(a) || xn(a) || pn(a) || nn(a) || un(a) || on(a) || yn(a) || mn(a) || dn(a) || Sn(a) || an(a) || sn(a) || rn(a) || fn(a) || ln(a) || wn(a) || vn(a) || gn(a))) && r.push(Nn(n + 1, o, s, r, Rn(l, t.charCodeAt(n + 1)), !1));
             }
             var a;
             return function t(e) {
@@ -2466,19 +2466,19 @@
         8211: !0,
         8231: !0
     };
-    function Rn(t, e, n, i) {
+    function Ln(t, e, n, i) {
         const r = Math.pow(t - e, 2);
         return i ? t < e ? r / 2 : 2 * r : r + Math.abs(n) * n;
     }
-    function Ln(t, e) {
+    function Rn(t, e) {
         let n = 0;
         return 10 === t && (n -= 1e4), 40 !== t && 65288 !== t || (n += 50), 41 !== e && 65289 !== e || (n += 50), 
         n;
     }
     function Nn(t, e, n, i, r, s) {
-        let o = null, a = Rn(e, n, r, s);
+        let o = null, a = Ln(e, n, r, s);
         for (let t = 0; t < i.length; t++) {
-            const l = i[t], h = Rn(e - l.x, n, r, s) + l.badness;
+            const l = i[t], h = Ln(e - l.x, n, r, s) + l.badness;
             h <= a && (o = l, a = h);
         }
         return {
@@ -2584,11 +2584,11 @@
         }
         getIconAndGlyph() {
             if (this.iconGlyph) return this.iconGlyph;
-            const {markerFileFn: t, markerTypeFn: e, 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: y, markerPathHeightFn: m, textNameFn: g, textFaceNameFn: v, textStyleFn: x, textWeightFn: b} = this.D, {zoom: w} = this.options, A = {}, S = this.symbol, k = this.feature.properties, P = t ? t(null, k) : S.markerFile, T = e ? e(null, k) : S.markerType, O = P || T || S.markerPath, F = !Re(this.symbolDef.textName);
+            const {markerFileFn: t, markerTypeFn: e, 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: y, markerPathHeightFn: m, textNameFn: g, textFaceNameFn: v, textStyleFn: x, textWeightFn: b} = this.D, {zoom: w} = this.options, A = {}, S = this.symbol, k = this.feature.properties, P = t ? t(null, k) : S.markerFile, T = e ? e(null, k) : S.markerType, O = P || T || S.markerPath, F = !Le(this.symbolDef.textName);
             let I;
             if (O) {
                 I = function(t, e, n, i, r, s) {
-                    if (Re(e.markerWidth) && Re(e.markerHeight)) return null;
+                    if (Le(e.markerWidth) && Le(e.markerHeight)) return null;
                     const o = "__fn_markerWidth".trim(), a = "__fn_markerHeight".trim();
                     let l = e.markerWidth || 0, h = e.markerHeight || 0;
                     return Ne(l) && ("identity" !== l.type ? l = Qe(l) : (l = t.markerWidth, t[o] && (l = t[o](i, n)), 
@@ -2626,43 +2626,43 @@
                     e.markerPathWidth = y ? y(null, k) : S.markerPathWidth, e.markerPathHeight = m ? m(null, k) : S.markerPathHeight), 
                     i) {
                         const t = i(null, k);
-                        Re(t) || (e.markerWidth = t);
+                        Le(t) || (e.markerWidth = t);
                     } else S.markerWidth >= 0 && (e.markerWidth = S.markerWidth);
                     if (r) {
                         const t = r(null, k);
-                        Re(t) || (e.markerHeight = t);
+                        Le(t) || (e.markerHeight = t);
                     } else S.markerHeight >= 0 && (e.markerHeight = S.markerHeight);
                     if (s) {
                         const t = s(null, k);
-                        Re(t) || (e.markerFill = t);
+                        Le(t) || (e.markerFill = t);
                     } else S.markerFill && (e.markerFill = S.markerFill);
                     if (o) {
                         const t = o(null, k);
-                        Re(t) || (e.markerFillPatternFile = t);
+                        Le(t) || (e.markerFillPatternFile = t);
                     } else S.markerFillPatternFile && (e.markerFillPatternFile = S.markerFillPatternFile);
                     if (a) {
                         const t = a(null, k);
-                        Re(t) || (e.markerFillOpacity = t);
+                        Le(t) || (e.markerFillOpacity = t);
                     } else S.markerFillOpacity >= 0 && (e.markerFillOpacity = S.markerFillOpacity);
                     if (c) {
                         const t = c(null, k);
-                        Re(t) || (e.markerLineColor = t);
+                        Le(t) || (e.markerLineColor = t);
                     } else S.markerLineColor && (e.markerLineColor = S.markerLineColor);
                     if (u) {
                         const t = u(null, k);
-                        Re(t) || (e.markerLineWidth = t);
+                        Le(t) || (e.markerLineWidth = t);
                     } else S.markerLineWidth >= 0 && (e.markerLineWidth = S.markerLineWidth);
                     if (f) {
                         const t = f(null, k);
-                        Re(t) || (e.markerLineOpacity = t);
+                        Le(t) || (e.markerLineOpacity = t);
                     } else S.markerLineOpacity >= 0 && (e.markerLineOpacity = S.markerLineOpacity);
                     if (d) {
                         const t = d(null, k);
-                        Re(t) || (e.markerLineDasharray = t);
+                        Le(t) || (e.markerLineDasharray = t);
                     } else S.markerLineDasharray && (e.markerLineDasharray = S.markerLineDasharray);
                     if (p) {
                         const t = p(null, k);
-                        Re(t) || (e.markerLinePatternFile = t);
+                        Le(t) || (e.markerLinePatternFile = t);
                     } else S.markerLinePatternFile && (e.markerLinePatternFile = S.markerLinePatternFile);
                     t = "vector://" + JSON.stringify(e);
                 } else t = P ? P.replace(Un, this.V) : S.markerPath ? function(t, e, n) {
@@ -2685,11 +2685,11 @@
                         };
                         return 0 === e.stroke["stroke-width"] && (e.stroke["stroke-opacity"] = 0), e;
                     }(t);
-                    Le(t.markerOpacity) && (i = t.markerOpacity), Le(t.opacity) && (i *= t.opacity);
+                    Re(t.markerOpacity) && (i = t.markerOpacity), Re(t.opacity) && (i *= t.opacity);
                     const s = {};
                     if (r) {
-                        for (const t in r.stroke) je(r.stroke, t) && (Re(r.stroke[t]) || (s[t] = r.stroke[t]));
-                        for (const t in r.fill) je(r.fill, t) && (Re(r.fill[t]) || (s[t] = r.fill[t]));
+                        for (const t in r.stroke) je(r.stroke, t) && (Le(r.stroke[t]) || (s[t] = r.stroke[t]));
+                        for (const t in r.fill) je(r.fill, t) && (Le(r.fill[t]) || (s[t] = r.fill[t]));
                     }
                     const o = Array.isArray(t.markerPath) ? t.markerPath : [ t.markerPath ];
                     let a;
@@ -3181,7 +3181,7 @@
                 e >= 1) return !1;
                 return !0;
             }(t.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: u, textSizeFn: f, textHaloFillFn: d, textHaloRadiusFn: p, textHaloOpacityFn: y, textDxFn: m, textDyFn: g, textPitchAlignmentFn: v, textRotationAlignmentFn: x, textRotationFn: b, textAllowOverlapFn: w, textIgnorePlacementFn: A, textOpacityFn: M, markerWidthFn: S, markerHeightFn: k, markerDxFn: P, markerDyFn: T, markerPitchAlignmentFn: O, markerRotationAlignmentFn: F, markerRotationFn: I, markerAllowOverlapFn: C, markerIgnorePlacementFn: E, markerOpacityFn: H} = this.D;
-            let D, R, L, N, V, j, U, G, W, B, X, q, J, Y, $, Z, K;
+            let D, L, R, N, V, j, U, G, W, B, X, q, J, Y, $, Z, K;
             if (h) {
                 const e = t.getIconAndGlyph().glyph.font;
                 D = function(t, e, n) {
@@ -3207,8 +3207,8 @@
                         });
                     }
                     return r;
-                }(n.horizontal, l, this.glyphAtlas.positions[e]), u && (R = u(null, a), _(R) ? R = [ 0, 0, 0, 0 ] : (R = Array.isArray(R) ? R.map(t => 255 * t) : zt(R).array(), 
-                3 === R.length && R.push(255))), f && (L = f(this.options.zoom, a), Xe(L) && (L = 14)), 
+                }(n.horizontal, l, this.glyphAtlas.positions[e]), u && (L = u(null, a), _(L) ? L = [ 0, 0, 0, 0 ] : (L = Array.isArray(L) ? L.map(t => 255 * t) : zt(L).array(), 
+                3 === L.length && L.push(255))), f && (R = f(this.options.zoom, a), Xe(R) && (R = 14)), 
                 d && (N = d(null, a), N = Array.isArray(N) ? N.map(t => 255 * t) : zt(N).array(), 
                 3 === N.length && N.push(255)), p && (V = p(null, a)), y && (j = 255 * y(null, a)), 
                 m && (U = m(null, a) || 0), g && (G = g(null, a) || 0), v && (J = +("map" === v(null, a))), 
@@ -3263,11 +3263,11 @@
                 for (let t = 0; t < a; t++) {
                     const i = D[t], {tl: a, tr: u, bl: f, br: d, tex: p} = i;
                     this.X(r, n, o, st, 10 * a.x, 10 * a.y, p.x, p.y + p.h), h && this.q(r, l, rt, i.glyphOffset, e, c), 
-                    this.J(r, R, L, N, V, j, U, G, W, B, X, q, et, J, Y, $, Z, K), this.X(r, n, o, st, 10 * u.x, 10 * u.y, p.x + p.w, p.y + p.h), 
-                    h && this.q(r, l, rt, i.glyphOffset, e, c), this.J(r, R, L, N, V, j, U, G, W, B, X, q, et, J, Y, $, Z, K), 
+                    this.J(r, L, R, N, V, j, U, G, W, B, X, q, et, J, Y, $, Z, K), this.X(r, n, o, st, 10 * u.x, 10 * u.y, p.x + p.w, p.y + p.h), 
+                    h && this.q(r, l, rt, i.glyphOffset, e, c), this.J(r, L, R, N, V, j, U, G, W, B, X, q, et, J, Y, $, Z, K), 
                     this.X(r, n, o, st, 10 * f.x, 10 * f.y, p.x, p.y), h && this.q(r, l, rt, i.glyphOffset, e, c), 
-                    this.J(r, R, L, N, V, j, U, G, W, B, X, q, et, J, Y, $, Z, K), this.X(r, n, o, st, 10 * d.x, 10 * d.y, p.x + p.w, p.y), 
-                    h && this.q(r, l, rt, i.glyphOffset, e, c), this.J(r, R, L, N, V, j, U, G, W, B, X, q, et, J, Y, $, Z, K), 
+                    this.J(r, L, R, N, V, j, U, G, W, B, X, q, et, J, Y, $, Z, K), this.X(r, n, o, st, 10 * d.x, 10 * d.y, p.x + p.w, p.y), 
+                    h && this.q(r, l, rt, i.glyphOffset, e, c), this.J(r, L, R, N, V, j, U, G, W, B, X, q, et, J, Y, $, Z, K), 
                     this.addElements(s, s + 1, s + 2), this.addElements(s + 1, s + 2, s + 3), s += 4;
                     const y = Math.max(Math.abs(n), Math.abs(o), Math.abs(st));
                     y > this.maxPos && (this.maxPos = y);
@@ -3285,12 +3285,12 @@
             }
         }
         J(t, e, n, i, r, s, o, a, l, h, c, u, f, d, p, y, m, g) {
-            const {textFillFn: v, textSizeFn: x, textHaloFillFn: b, textHaloRadiusFn: w, textHaloOpacityFn: A, textDxFn: _, textDyFn: M, textPitchAlignmentFn: S, textRotationAlignmentFn: k, textRotationFn: P, textAllowOverlapFn: T, textIgnorePlacementFn: O, textOpacityFn: F, markerWidthFn: I, markerHeightFn: C, markerDxFn: E, markerDyFn: H, markerPitchAlignmentFn: D, markerRotationAlignmentFn: R, markerRotationFn: L, markerAllowOverlapFn: N, markerIgnorePlacementFn: z, markerOpacityFn: V} = this.D;
+            const {textFillFn: v, textSizeFn: x, textHaloFillFn: b, textHaloRadiusFn: w, textHaloOpacityFn: A, textDxFn: _, textDyFn: M, textPitchAlignmentFn: S, textRotationAlignmentFn: k, textRotationFn: P, textAllowOverlapFn: T, textIgnorePlacementFn: O, textOpacityFn: F, markerWidthFn: I, markerHeightFn: C, markerDxFn: E, markerDyFn: H, markerPitchAlignmentFn: D, markerRotationAlignmentFn: L, markerRotationFn: R, markerAllowOverlapFn: N, markerIgnorePlacementFn: z, markerOpacityFn: V} = this.D;
             v && t.aTextFill.push(...e), x && t.aTextSize.push(n), b && t.aTextHaloFill.push(...i), 
             w && t.aTextHaloRadius.push(r), A && t.aTextHaloOpacity.push(s), _ && t.aTextDx.push(o), 
             M && t.aTextDy.push(a), I && t.aMarkerWidth.push(l), C && t.aMarkerHeight.push(h), 
             E && t.aMarkerDx.push(c), H && t.aMarkerDy.push(u), (V || F) && t.aColorOpacity.push(f), 
-            (S || D) && t.aPitchAlign.push(d), (R || k) && t.aRotationAlign.push(p), (L || P) && t.aRotation.push(9362 * y);
+            (S || D) && t.aPitchAlign.push(d), (L || k) && t.aRotationAlign.push(p), (R || P) && t.aRotation.push(9362 * y);
             const j = N || T, U = z || O;
             (j || U) && t.aOverlap.push((j ? 8 : 0) + 4 * m + ((U ? 2 : 0) + g)), r > 0 && (this.properties.hasHalo = 1);
         }
@@ -3433,18 +3433,18 @@
             if (e && (v = e(this.options.zoom, m) || "miter"), n && (x = n(this.options.zoom, m) || "butt"), 
             i) {
                 let t = i(this.options.zoom, m);
-                Re(t) && (t = 4), this.feaLineWidth = t;
+                Le(t) && (t = 4), this.feaLineWidth = t;
             } else this.feaLineWidth = d.lineWidth;
             if (r) {
                 let t = r(this.options.zoom, m);
-                Re(t) && (t = 0), this.feaLineStrokeWidth = t;
+                Le(t) && (t = 0), this.feaLineStrokeWidth = t;
             } else this.feaLineStrokeWidth = d.lineStrokeWidth || 0;
             if (o && (this.feaColor = o(this.options.zoom, m) || [ 0, 0, 0, 255 ], _(this.feaColor) ? this.feaColor = [ 0, 0, 0, 0 ] : (this.feaColor = Array.isArray(this.feaColor) ? this.feaColor.map(t => 255 * t) : zt(this.feaColor).array(), 
             3 === this.feaColor.length && this.feaColor.push(255))), s && (this.feaStrokeColor = s(this.options.zoom, m) || [ 0, 0, 0, 255 ], 
             _(this.feaStrokeColor) ? this.feaStrokeColor = [ 0, 0, 0, 0 ] : (this.feaStrokeColor = Array.isArray(this.feaStrokeColor) ? this.feaStrokeColor.map(t => 255 * t) : zt(this.feaStrokeColor).array(), 
             3 === this.feaStrokeColor.length && this.feaStrokeColor.push(255))), a) {
                 let t = a(this.options.zoom, m);
-                Re(t) && (t = 1), this.feaOpacity = 255 * t;
+                Le(t) && (t = 1), this.feaOpacity = 255 * t;
             }
             if (this.dasharrayFn) {
                 let t = this.dasharrayFn(this.options.zoom, m) || [ 0, 0, 0, 0 ];
@@ -3470,19 +3470,19 @@
             }
             if (h) {
                 let t = h(this.options.zoom, m);
-                Re(t) && (t = 0), this.feaLineDx = t;
+                Le(t) && (t = 0), this.feaLineDx = t;
             }
             if (c) {
                 let t = c(this.options.zoom, m);
-                Re(t) && (t = 0), this.feaLineDy = t;
+                Le(t) && (t = 0), this.feaLineDy = t;
             }
             if (u) {
                 let t = u(this.options.zoom, m);
-                Re(t) && (t = 0), 0 !== t && (this.properties.hasPatternAnim = 1), this.feaPatternAnimSpeed = t;
+                Le(t) && (t = 0), 0 !== t && (this.properties.hasPatternAnim = 1), this.feaPatternAnimSpeed = t;
             }
             if (f) {
                 let t = f(this.options.zoom, m);
-                Re(t) && (t = 0), this.feaLinePatternGap = t;
+                Le(t) && (t = 0), this.feaLinePatternGap = t;
             }
             const b = this.options.EXTENT;
             let w = p.geometry;
@@ -3728,9 +3728,9 @@
             let n, i, r, s;
             const {polygonFillFn: o, polygonOpacityFn: a, uvScaleFn: l, uvOffsetFn: h} = this.D, c = e.properties;
             o && (n = o(this.options.zoom, c) || [ 255, 255, 255, 255 ], _(n) ? n = [ 0, 0, 0, 0 ] : (n = Array.isArray(n) ? n.map(t => 255 * t) : zt(n).array(), 
-            3 === n.length && n.push(255))), a && (i = a(this.options.zoom, c), Re(i) && (i = 1), 
-            i *= 255), l && (r = l(this.options.zoom, c), Re(r) && (r = [ 1, 1 ]), r = [ 255 * r[0], 255 * r[1] ]), 
-            h && (s = h(this.options.zoom, c), Re(s) && (s = [ 0, 0 ]), s = [ 255 * s[0], 255 * s[1] ]);
+            3 === n.length && n.push(255))), a && (i = a(this.options.zoom, c), Le(i) && (i = 1), 
+            i *= 255), l && (r = l(this.options.zoom, c), Le(r) && (r = [ 1, 1 ]), r = [ 255 * r[0], 255 * r[1] ]), 
+            h && (s = h(this.options.zoom, c), Le(s) && (s = [ 0, 0 ]), s = [ 255 * s[0], 255 * s[1] ]);
             const u = !!this.iconAtlas, f = $n(t, 500), d = this.getAltitude(c), p = [ 0, 0 ], y = [ 0, 0 ];
             if (u) {
                 const {polygonPatternFileFn: t} = this.D, e = t ? t(null, c) : this.symbol.polygonPatternFile;
@@ -4186,7 +4186,7 @@
                 layerId: n,
                 command: "loadTile",
                 params: {
-                    tileInfo: R(t.tileInfo),
+                    tileInfo: L(t.tileInfo),
                     glScale: t.glScale,
                     zScale: t.zScale
                 }
@@ -4319,25 +4319,25 @@
             });
         }
     }
-    const Di = new Uint8Array([ 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1 ]), Ri = [];
-    class Li {
+    const Di = new Uint8Array([ 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1 ]), Li = [];
+    class Ri {
         constructor(t, e, i) {
             this.Mt = t;
             (this.Ht = new n.reshader.Geometry({
                 aPosition: Di
             }, null, Di.length / 2, {
                 positionSize: 2
-            })).generateBuffers(t), this.Dt = new n.reshader.Scene, this.Rt = [], this.Lt = 0, 
+            })).generateBuffers(t), this.Dt = new n.reshader.Scene, this.Lt = [], this.Rt = 0, 
             this.Nt = e, this.St = i, this.Tt(t);
         }
         start() {
-            this.Lt = 0, this.Dt.clear();
+            this.Rt = 0, this.Dt.clear();
         }
         add(t, e, i) {
             const r = this.zt(i);
-            r.setUniform("ref", t), n.vec3.set(Ri, e, e, 1);
+            r.setUniform("ref", t), n.vec3.set(Li, e, e, 1);
             const s = r.localTransform;
-            n.mat4.fromScaling(s, Ri), n.mat4.mul(s, i, s), r.setLocalTransform(s), this.Dt.addMesh(r);
+            n.mat4.fromScaling(s, Li), n.mat4.mul(s, i, s), r.setLocalTransform(s), this.Dt.addMesh(r);
         }
         render(t) {
             this.Vt.render(this.jt, {
@@ -4345,8 +4345,8 @@
             }, this.Dt, t);
         }
         zt() {
-            const t = this.Lt++;
-            return this.Rt[t] || (this.Rt[t] = new n.reshader.Mesh(this.Ht)), this.Rt[t];
+            const t = this.Rt++;
+            return this.Lt[t] || (this.Lt[t] = new n.reshader.Mesh(this.Ht)), this.Lt[t];
         }
         Tt(t) {
             const e = this.Nt, i = {
@@ -4393,8 +4393,8 @@
         }
         remove() {
             this.Ht.dispose();
-            for (let t = 0; t < this.Rt.length; t++) this.Rt[t].dispose();
-            this.Rt.length = 0, this.jt.dispose();
+            for (let t = 0; t < this.Lt.length; t++) this.Lt[t].dispose();
+            this.Lt.length = 0, this.jt.dispose();
         }
     }
     const Ni = [], zi = [ 0, 0, 0, 0 ], Vi = new r.Point(0, 0);
@@ -4788,10 +4788,10 @@
         }
         Ee(t) {
             const e = this.isEnableTileStencil(), n = this.getCurrentTileZoom();
-            let i = this.Re;
-            i || (i = this.Re = new Li(this.regl, this.canvas, this.getMap())), i.start();
-            const {tiles: r} = this.Le;
-            let {parentTiles: s, childTiles: o} = this.Le, a = 1;
+            let i = this.Le;
+            i || (i = this.Le = new Ri(this.regl, this.canvas, this.getMap())), i.start();
+            const {tiles: r} = this.Re;
+            let {parentTiles: s, childTiles: o} = this.Re, a = 1;
             o = o.sort(Gi);
             for (let t = 0; t < o.length; t++) this.Ne(o[t].info, e ? a : this.getTileLevelValue(o[t].info.z, n)), 
             a++;
@@ -4805,7 +4805,7 @@
         }
         Ne(t, e) {
             const n = this.ze, i = Vi.set(t.extent2d.xmin, t.extent2d.ymax), r = t.transform = t.transform || this.calculateTileMatrix(i, t.z);
-            t.stencilRef = e, this.Re.add(e, n, r);
+            t.stencilRef = e, this.Le.add(e, n, r);
         }
         onDrawTileStart(t) {
             super.onDrawTileStart(t);
@@ -4814,7 +4814,7 @@
             for (let t = 0; t < e.length; t++) this.be[e[t].info.id] = 1;
             for (let t = 0; t < n.length; t++) this.we[n[t].info.id] = 1;
             for (let t = 0; t < i.length; t++) this.we[i[t].info.id] = 1;
-            this.Le = t;
+            this.Re = t;
         }
         isEnableTileStencil() {
             return this.layer.isOnly2D();
@@ -4925,7 +4925,7 @@
             }));
         }
         onRemove() {
-            this.Re && this.Re.remove(), this.qt && (this.qt.removeLayer(t => {
+            this.Le && this.Le.remove(), this.qt && (this.qt.removeLayer(t => {
                 if (t) throw t;
             }), this.qt.remove(), delete this.qt), this.pickingFBO && (this.canvas.pickingFBO || this.pickingFBO.destroy(), 
             delete this.pickingFBO), this.ne && this.ne.delete(), super.onRemove && super.onRemove(), 
@@ -5658,7 +5658,7 @@
             return t && "VectorTileLayer" === t.type ? new Qi(t.id, t.options) : null;
         }
         Se() {
-            this.Je && (this.sn = L(this.Je)), this.Xe && (this.an = L(this.Xe));
+            this.Je && (this.sn = R(this.Je)), this.Xe && (this.an = R(this.Xe));
         }
         static registerPlugin(t) {
             Qi.plugins || (Qi.plugins = {}), Qi.plugins[t.type] = t;
@@ -6290,7 +6290,7 @@
     let br = new Float32Array(1);
     class wr extends r.renderer.CanvasRenderer {
         constructor(...t) {
-            super(...t), this.features = {}, this.vn = {}, this.Lt = 1, this.xn = {}, this.bn = {}, 
+            super(...t), this.features = {}, this.vn = {}, this.Rt = 1, this.xn = {}, this.bn = {}, 
             this.wn = {}, this.An = {}, this._n = {}, this.Mn = !0, this.Sn = {
                 id: 0,
                 pickingId: 0
@@ -6314,7 +6314,7 @@
                 const t = this.Dn;
                 delete this.Dn, this.In(t), this.En = !1;
             }
-            if (!this.meshes && !this.Rn && !this.Ln) return void this.completeRender();
+            if (!this.meshes && !this.Ln && !this.Rn) return void this.completeRender();
             this.Nn && (this.zn(), this.Nn = !1), this.Vn(), n.options.collision && n.clearCollisionIndex(), 
             this.ae = t, this.ce = e || {};
             const i = this.jn();
@@ -6322,10 +6322,10 @@
             this.painter && this.meshes && (this.painter.startFrame(i), this.painter.addMesh(this.meshes, null, {
                 bloom: 1
             }), this.painter.prepareRender(i), i.polygonOffsetIndex = r++, this.painter.render(i)), 
-            this.Ln && (this.On.startFrame(i), this.On.addMesh(this.Ln, null, {
+            this.Rn && (this.On.startFrame(i), this.On.addMesh(this.Rn, null, {
                 bloom: 1
-            }), this.On.prepareRender(i), i.polygonOffsetIndex = r++, this.On.render(i)), this.Rn && (this.Tn.startFrame(i), 
-            this.Tn.addMesh(this.Rn, null, {
+            }), this.On.prepareRender(i), i.polygonOffsetIndex = r++, this.On.render(i)), this.Ln && (this.Tn.startFrame(i), 
+            this.Tn.addMesh(this.Ln, null, {
                 bloom: 1
             }), this.Tn.prepareRender(i), n.options.collision && this.Tn.updateCollision(i), 
             this.Tn.render(i)), this.completeRender(), this.layer.fire("canvasisdirty");
@@ -6369,8 +6369,8 @@
                 } else s.visible || (this.Nn = !0), this.Wn(s.geometry, e), t.push(s);
             }
             return t.length || (this.meshes && this.painter && (this.painter.deleteMesh(this.meshes), 
-            delete this.meshes), this.Rn && (this.Tn.deleteMesh(this.Rn), delete this.Rn), this.Ln && (this.On.deleteMesh(this.Ln), 
-            delete this.Ln)), e[3] && (e[0] /= e[3], e[1] /= e[3]), {
+            delete this.meshes), this.Ln && (this.Tn.deleteMesh(this.Ln), delete this.Ln), this.Rn && (this.On.deleteMesh(this.Rn), 
+            delete this.Rn)), e[3] && (e[0] /= e[3], e[1] /= e[3]), {
                 features: t,
                 center: e
             };
@@ -6467,22 +6467,22 @@
         }
         Fn(t) {
             const e = Object.keys(this.wn), i = Object.keys(this.An);
-            if (!e.length && !i.length) return void (this.Rn && (this.Tn.deleteMesh(this.Rn), 
-            delete this.Rn));
+            if (!e.length && !i.length) return void (this.Ln && (this.Tn.deleteMesh(this.Ln), 
+            delete this.Ln));
             const {features: r, center: s} = this.Gn(), o = [], a = [];
             for (let t = 0; t < r.length; t++) {
                 const e = r[t][xr];
                 this.wn[e] && o.push(r[t]), this.An[e] && a.push(r[t]);
             }
-            if (!o.length && !a.length) return void (this.Rn && (this.Tn.deleteMesh(this.Rn), 
-            delete this.Rn));
+            if (!o.length && !a.length) return void (this.Ln && (this.Tn.deleteMesh(this.Ln), 
+            delete this.Ln));
             const l = this.Nn;
             this.$n = s;
             const h = this.Zn(o, a, t, s);
             this.Hn = {};
             const c = [], u = [];
             this.Kn = !0, Promise.all(h).then(t => {
-                if (this.Rn && (this.Tn.deleteMesh(this.Rn), delete this.Rn), !t || !t.length) return void this.setToRedraw();
+                if (this.Ln && (this.Tn.deleteMesh(this.Ln), delete this.Ln), !t || !t.length) return void this.setToRedraw();
                 const e = this.Tn.createGeometries(t.map(t => t && t.data), this.xn);
                 for (let n = 0; n < e.length; n++) this.Bn(e[n].geometry, t[n] && t[n].data);
                 const i = t[0] && t[0].data.iconAtlas, r = t[0] && t[0].data.glyphAtlas || t[1] && t[1].data.glyphAtlas;
@@ -6492,11 +6492,11 @@
                 const a = this.Tn.createMeshes(e, o);
                 for (let t = 0; t < a.length; t++) a[t].geometry.properties.originElements = a[t].geometry.properties.elements.slice(), 
                 a[t].setUniform("level", 0), a[t].material.set("flipY", 1), a[t].properties.meshKey = gr++;
-                this.Rn = a, l && (this.Nn = !0), this.Kn = !1, this.setToRedraw();
+                this.Ln = a, l && (this.Nn = !0), this.Kn = !1, this.setToRedraw();
             });
         }
         zn() {
-            if (this.Rn && (this.Qn(this.Rn[0], this.wn), this.Qn(this.Rn[1], this.An)), this.Ln) for (let t = 0; t < this.Ln.length; t++) this.Qn(this.Ln[t], this._n);
+            if (this.Ln && (this.Qn(this.Ln[0], this.wn), this.Qn(this.Ln[1], this.An)), this.Rn) for (let t = 0; t < this.Rn.length; t++) this.Qn(this.Rn[t], this._n);
             if (this.meshes) for (let t = 0; t < this.meshes.length; t++) this.Qn(this.meshes[t], this.xn);
         }
         Qn(t, e) {
@@ -6528,7 +6528,7 @@
             const e = t._getInternalSymbol(), n = {
                 zoom: this.getMap().getZoom()
             }, i = this.ei(t);
-            if (!this.Rn) return !1;
+            if (!this.Ln) return !1;
             let r = this.features[i];
             Array.isArray(r) || (r = [ r ]);
             const s = [], o = [], a = this.getMap().getZoom();
@@ -6544,7 +6544,7 @@
                 const e = r[t][xr];
                 this.wn[e] && s.push(r[t]), this.An[e] && o.push(r[t]);
             }
-            const c = r[0].id, u = this.Zn(s, o, this.Hn, this.$n), f = this.Rn;
+            const c = r[0].id, u = this.Zn(s, o, this.Hn, this.$n), f = this.Ln;
             return Promise.all(u).then(t => {
                 for (let e = 0; e < t.length; e++) {
                     if (!t[e]) continue;
@@ -6561,7 +6561,7 @@
             }), !0;
         }
         ii(t) {
-            return this.ri(t, this.Ln, this.Dn, this.si, this.On, ai, mr, this.oi);
+            return this.ri(t, this.Rn, this.Dn, this.si, this.On, ai, mr, this.oi);
         }
         ri(t, e, n, i, r, s, o, a) {
             if (!e) return !1;
@@ -6617,15 +6617,15 @@
             }), !0;
         }
         In(t) {
-            if (!Object.keys(this._n).length) return void (this.Ln && (this.On.deleteMesh(this.Ln), 
-            delete this.Ln));
+            if (!Object.keys(this._n).length) return void (this.Rn && (this.On.deleteMesh(this.Rn), 
+            delete this.Rn));
             const {features: e, center: n} = this.Gn();
             if (!e.length) return;
             const i = this.Nn;
             this.si = n;
             const r = this.oi(e), s = F({}, mr), o = r.map((e, i) => this.createMesh(this.On, ai, s, e, t && t[i], n));
             this.ai = !0, Promise.all(o).then(t => {
-                this.Ln && this.On.deleteMesh(this.Ln);
+                this.Rn && this.On.deleteMesh(this.Rn);
                 const e = [], n = [];
                 for (let i = 0; i < t.length; i++) {
                     const r = t[i] && t[i].meshes;
@@ -6637,7 +6637,7 @@
                         n[i] = t[i].atlas;
                     }
                 }
-                this.Ln = e, this.Dn = n, i && (this.Nn = i), this.ai = !1, this.setToRedraw();
+                this.Rn = e, this.Dn = n, i && (this.Nn = i), this.ai = !1, this.setToRedraw();
             });
         }
         oi(t) {
@@ -6668,7 +6668,7 @@
             }
         }
         ei(t) {
-            t[fr] || (t[fr] = this.Lt++);
+            t[fr] || (t[fr] = this.Rt++);
             const e = t[fr];
             this.features[e] && this.ci(e), this.features[e] = dr(t, this.Sn, this.features[e]);
             const n = this.features[e];
@@ -6776,7 +6776,7 @@
                     for (let i = 0; i < e.length; i++) if (!t(e[0], n[0])) return !1;
                 } else if (Array.isArray(e[0]) || Array.isArray(n[0])) return !1;
                 return !0;
-            }(n, (Array.isArray(r) ? r[0] : r).geometry)) return this.Ln && (this.En = !0), 
+            }(n, (Array.isArray(r) ? r[0] : r).geometry)) return this.Rn && (this.En = !0), 
             void this.onGeometryPositionChange(t);
             this.hi([ e ]), this.li(), Ar(this);
         }
@@ -6825,7 +6825,9 @@
             this.prepareRequestors(), this.pickingFBO = this.canvas.pickingFBO || this.regl.framebuffer(this.canvas.width, this.canvas.height), 
             this.painter = this.createPainter();
             const e = cr.get3DPainterClass("icon"), n = F({}, pr, yr);
-            this.Tn = new e(this.regl, this.layer, n, this.layer.options.sceneConfig, 0);
+            this.Tn = new e(this.regl, this.layer, n, this.layer.options.sceneConfig, 0), this.Tn.setTextShaderDefines({
+                REVERSE_MAP_ROTATION_ON_PITCH: 1
+            });
             const i = cr.get3DPainterClass("line"), r = F({}, mr);
             this.On = new i(this.regl, this.layer, r, this.layer.options.sceneConfig, 0), this.layer.getGeometries() && this.onGeometryAdd(this.layer.getGeometries());
         }
@@ -7071,7 +7073,7 @@
     * BSD License
     * https://github.com/gdsmith/jquery.easing/
     */
-    var Hr = Math.pow, Dr = Math.sqrt, Rr = Math.sin, Lr = Math.cos, Nr = Math.PI, zr = 1.70158, Vr = 1.525 * zr, jr = 2 * Nr / 3, Ur = 2 * Nr / 4.5;
+    var Hr = Math.pow, Dr = Math.sqrt, Lr = Math.sin, Rr = Math.cos, Nr = Math.PI, zr = 1.70158, Vr = 1.525 * zr, jr = 2 * Nr / 3, Ur = 2 * Nr / 4.5;
     function Gr(t) {
         var e = 7.5625, n = 2.75;
         return t < 1 / n ? e * t * t : t < 2 / n ? e * (t -= 1.5 / n) * t + .75 : t < 2.5 / n ? e * (t -= 2.25 / n) * t + .9375 : e * (t -= 2.625 / n) * t + .984375;
@@ -7143,17 +7145,17 @@
 
           case "easeinsine":
             return function(t) {
-                return 1 - Lr(t * Nr / 2);
+                return 1 - Rr(t * Nr / 2);
             }(e);
 
           case "easeoutsine":
             return function(t) {
-                return Rr(t * Nr / 2);
+                return Lr(t * Nr / 2);
             }(e);
 
           case "easeinoutsine":
             return function(t) {
-                return -(Lr(Nr * t) - 1) / 2;
+                return -(Rr(Nr * t) - 1) / 2;
             }(e);
 
           case "easeinexpo":
@@ -7188,17 +7190,17 @@
 
           case "easeinelastic":
             return function(t) {
-                return 0 === t ? 0 : 1 === t ? 1 : -Hr(2, 10 * t - 10) * Rr((10 * t - 10.75) * jr);
+                return 0 === t ? 0 : 1 === t ? 1 : -Hr(2, 10 * t - 10) * Lr((10 * t - 10.75) * jr);
             }(e);
 
           case "easeoutelastic":
             return function(t) {
-                return 0 === t ? 0 : 1 === t ? 1 : Hr(2, -10 * t) * Rr((10 * t - .75) * jr) + 1;
+                return 0 === t ? 0 : 1 === t ? 1 : Hr(2, -10 * t) * Lr((10 * t - .75) * jr) + 1;
             }(e);
 
           case "easeinoutelastic":
             return function(t) {
-                return 0 === t ? 0 : 1 === t ? 1 : t < .5 ? -Hr(2, 20 * t - 10) * Rr((20 * t - 11.125) * Ur) / 2 : Hr(2, -20 * t + 10) * Rr((20 * t - 11.125) * Ur) / 2 + 1;
+                return 0 === t ? 0 : 1 === t ? 1 : t < .5 ? -Hr(2, 20 * t - 10) * Lr((20 * t - 11.125) * Ur) / 2 : Hr(2, -20 * t + 10) * Lr((20 * t - 11.125) * Ur) / 2 + 1;
             }(e);
 
           case "easeinback":
@@ -7784,13 +7786,13 @@
     function Os(t) {
         return t && _(t) && t.property;
     }
-    const {loginIBLResOnCanvas: Fs, logoutIBLResOnCanvas: Is, getIBLResOnCanvas: Cs} = n.reshader.pbr.PBRUtils, Es = [], Hs = [], Ds = t => 0 === t.getUniform("level"), Rs = t => t.getUniform("level") > 0;
-    class Ls {
+    const {loginIBLResOnCanvas: Fs, logoutIBLResOnCanvas: Is, getIBLResOnCanvas: Cs} = n.reshader.pbr.PBRUtils, Es = [], Hs = [], Ds = t => 0 === t.getUniform("level"), Ls = t => t.getUniform("level") > 0;
+    class Rs {
         constructor(t, e, i, r, s, o) {
             this.regl = t, this.layer = e, this.canvas = e.getRenderer().canvas, this.sceneConfig = r || {}, 
             this.dataConfig = o || {}, this.pluginIndex = s, this.scene = new n.reshader.Scene, 
             this.pickingFBO = e.getRenderer().pickingFBO, this.Hi = new es, this.level0Filter = Ds, 
-            this.levelNFilter = Rs, this.loginTextureCache(), this.symbolDef = Array.isArray(i) ? i.map(t => os(t)) : [ os(i) ], 
+            this.levelNFilter = Ls, this.loginTextureCache(), this.symbolDef = Array.isArray(i) ? i.map(t => os(t)) : [ os(i) ], 
             this.Di(), this.pickingViewport = {
                 x: 0,
                 y: 0,
@@ -7806,7 +7808,7 @@
             return n.getTileLevelValue && n.getTileLevelValue(t, e) || 0;
         }
         isVisible() {
-            const t = this.R;
+            const t = this.L;
             if (t.length) for (let e = 0; e < t.length; e++) if (t[e] && !t[e].isFeatureConstant) return !0;
             const e = this.getSymbols();
             for (let t = 0; t < e.length; t++) {
@@ -7818,7 +7820,7 @@
         isMeshVisible(t) {
             const e = t && t.properties && t.properties.symbolIndex;
             if (!e) return !1;
-            const n = this.R, i = e.index;
+            const n = this.L, i = e.index;
             let r;
             if (n[i]) {
                 if (!n[i].isFeatureConstant) return !0;
@@ -7827,7 +7829,7 @@
             return !1 !== r && 0 !== r;
         }
         needToRedraw() {
-            return this.Ri;
+            return this.Li;
         }
         needToRetireFrames() {
             return this.$t;
@@ -7851,7 +7853,7 @@
             }) : n.push(null); else {
                 const r = this.createGeometry(t[i], e, i);
                 if (r && r.geometry) {
-                    const {pickingIdMap: n, idPickingMap: s, hasFeaIds: o} = this.Li(t[i]), a = r.geometry.properties;
+                    const {pickingIdMap: n, idPickingMap: s, hasFeaIds: o} = this.Ri(t[i]), a = r.geometry.properties;
                     a.symbolIndex = r.symbolIndex, a.features = e, o && (a.feaIdPickingMap = n, a.feaPickingIdMap = s);
                 }
                 this.postCreateGeometry(r, n), n.push(r);
@@ -7859,7 +7861,7 @@
             return n;
         }
         postCreateGeometry() {}
-        Li(t) {
+        Ri(t) {
             if (!t) return {};
             if (Array.isArray(t) && !(t = t[0])) return {};
             const e = t.featureIds, n = {}, i = {}, r = e && e.length;
@@ -7924,11 +7926,11 @@
             this.Ni = t;
             const n = this.getUniformValues(e, t);
             return this.callShader(n, t), {
-                redraw: this.Ri
+                redraw: this.Li
             };
         }
         setToRedraw(t) {
-            t && (this.$t = t), this.Ri = !0;
+            t && (this.$t = t), this.Li = !0;
         }
         callShader(t, e) {
             this.callCurrentTileShader(t, e), this.callBackgroundTileShader(t, e);
@@ -8008,7 +8010,7 @@
             }
         }
         startFrame(t) {
-            this.zi || (this.init(t), this.zi = !0), this.se !== t.timestamp && (this.Ri = !1, 
+            this.zi || (this.init(t), this.zi = !0), this.se !== t.timestamp && (this.Li = !1, 
             this.$t = !1), this.scene.clear();
         }
         resize() {}
@@ -8053,7 +8055,7 @@
                     enumerable: !0
                 }) : r[t] = o[t];
             }
-            return _(n.visible) && (this.R[t] = M(n.visible)), i;
+            return _(n.visible) && (this.L[t] = M(n.visible)), i;
         }
         getSymbolDef(t) {
             return this.symbolDef[t.index];
@@ -8067,9 +8069,9 @@
         }
         Di() {
             const t = this.getMap(), e = () => [ t.getZoom() ];
-            this.Wi = [], this.R = [];
+            this.Wi = [], this.L = [];
             for (let t = 0; t < this.symbolDef.length; t++) this.Wi[t] = k(ns({}, this.symbolDef[t]), e), 
-            this.symbolDef[t] && _(this.symbolDef[t].visible) && (this.R[t] = M(this.symbolDef[t].visible));
+            this.symbolDef[t] && _(this.symbolDef[t].visible) && (this.L[t] = M(this.symbolDef[t].visible));
         }
         getFnTypeConfig(t) {
             this.Ui || (this.Ui = []);
@@ -8267,7 +8269,7 @@
     function zs(t, e) {
         return t.properties.level - e.properties.level;
     }
-    class Vs extends Ls {
+    class Vs extends Rs {
         constructor(t, e, n, i, r, s) {
             super(t, e, n, i, r, s);
         }
@@ -8904,13 +8906,13 @@
     }
     class Zs {
         constructor(t) {
-            this.Rt = t || [], this.properties = {};
+            this.Lt = t || [], this.properties = {};
         }
         set meshes(t) {
-            this.Rt = t;
+            this.Lt = t;
         }
         get meshes() {
-            return this.Rt;
+            return this.Lt;
         }
     }
     const Ks = 224, Qs = 600, to = 100, eo = new Uint8Array(1), no = [], io = {
@@ -9076,7 +9078,7 @@
             return n - Math.abs(this.Tr(t)[e]) < i;
         }
         Pr(t, e, n, i, r, s, o) {
-            const a = this.getSymbol(t.properties.symbolIndex), l = this.Er(a, t, e[i]), h = this.Rr(a, t, e[i]);
+            const a = this.getSymbol(t.properties.symbolIndex), l = this.Er(a, t, e[i]), h = this.Lr(a, t, e[i]);
             if (!1 === this.sceneConfig.collision || l && h) return io;
             const c = this.isBoxCollides(t, e, n, i, r, s, o);
             return h && (c.collides = 0, c.isAllowOverlap = 1), c;
@@ -9088,7 +9090,7 @@
             const r = i[n], s = r % 8;
             return r < 2 ? 1 == +t[this.propIgnorePlacement] : s % 2;
         }
-        Rr(t, e, n) {
+        Lr(t, e, n) {
             if (!1 === this.sceneConfig.collision) return !0;
             const i = e.geometry.properties.aOverlap;
             if (!i) return 1 == +t[this.propAllowOverlap];
@@ -9113,15 +9115,15 @@
             h;
         }
         Tr(t) {
-            this.Lr || (this.Lr = {});
+            this.Rr || (this.Rr = {});
             const {meshKey: e} = t.properties;
-            if (!this.Lr[e]) {
+            if (!this.Rr[e]) {
                 const {frameTimestamp: t} = this.ar;
-                this.Lr[e] = {
+                this.Rr[e] = {
                     timestamp: t
                 };
             }
-            return this.Lr[e];
+            return this.Rr[e];
         }
         Nr(t) {
             if (!this.zr) return void (this.zr = t);
@@ -9144,10 +9146,10 @@
             if (t) {
                 if (Array.isArray(t)) for (let e = 0; e < t.length; e++) {
                     const n = t[e].properties.meshKey;
-                    this.pr && delete this.pr.tags[n], this.Lr && delete this.Lr[n];
+                    this.pr && delete this.pr.tags[n], this.Rr && delete this.Rr[n];
                 } else {
                     const e = t.properties.meshKey;
-                    this.pr && delete this.pr.tags[e], this.Lr && delete this.Lr[e];
+                    this.pr && delete this.pr.tags[e], this.Rr && delete this.Rr[e];
                 }
                 super.deleteMesh(t, e);
             }
@@ -9436,10 +9438,10 @@
         ss(H) && (H = 15);
         const D = n.vec2.set(Oo, E / 24, H / 24);
         n.vec2.mul(O, O, D), n.vec2.mul(F, F, D), n.vec2.mul(I, I, D), n.vec2.mul(C, C, D);
-        let R = _ ? _[i] / 9362 : -(h.markerRotation || 0) * Math.PI / 180;
-        const L = s.getBearing() * Math.PI / 180;
-        if (L * P || R) {
-            const t = xo(Ao, R, L, P, k);
+        let L = _ ? _[i] / 9362 : -(h.markerRotation || 0) * Math.PI / 180;
+        const R = s.getBearing() * Math.PI / 180;
+        if (R * P || L) {
+            const t = xo(Ao, L, R, P, k);
             O = n.vec2.transformMat2(O, O, t), F = n.vec2.transformMat2(F, F, t), I = n.vec2.transformMat2(I, I, t), 
             C = n.vec2.transformMat2(C, C, t);
         }
@@ -9447,24 +9449,24 @@
         n.vec2.multiply(F, F, To), n.vec2.multiply(I, I, To), n.vec2.multiply(C, C, To), 
         vo(t, d, O, F, I, C, T, y)), t;
     }
-    const Io = [], Co = [], Eo = [], Ho = [], Do = [], Ro = [], Lo = [ 1, -1 ];
+    const Io = [], Co = [], Eo = [], Ho = [], Do = [], Lo = [], Ro = [ 1, -1 ];
     function No(t, e, i, r, s, o, a, l, h) {
         const c = r.material.uniforms, u = h.cameraToCenterDistance, f = r.geometry.properties, d = this.getSymbol(f.symbolIndex), p = "line" === d.textPlacement && !ps(d), y = i[2];
         let m = 1;
         if (c.textPerspectiveRatio) {
             m = is(.5 + .5 * (1 - (1 - u / y) * c.textPerspectiveRatio), 0, 4);
         }
-        const {aTextDx: g, aTextDy: v, aPitchAlign: x, aRotationAlign: b, aRotation: w} = r.geometry.properties, A = g ? g[a] : d.textDx, _ = v ? v[a] : d.textDy, M = x ? x[a] : c.pitchWithMap, S = b ? b[a] : c.rotateWithMap, k = n.vec2.set(Ro, A || 0, -(_ || 0));
+        const {aTextDx: g, aTextDy: v, aPitchAlign: x, aRotationAlign: b, aRotation: w} = r.geometry.properties, A = g ? g[a] : d.textDx, _ = v ? v[a] : d.textDy, M = x ? x[a] : c.pitchWithMap, S = b ? b[a] : c.rotateWithMap, k = n.vec2.set(Lo, A || 0, -(_ || 0));
         if (p) {
             const {aOffset: r} = f;
             let s = n.vec2.set(Co, r[2 * a] / 10, r[2 * a + 1] / 10), o = n.vec2.set(Eo, r[2 * a + 2] / 10, r[2 * a + 3] / 10), u = n.vec2.set(Ho, r[2 * a + 4] / 10, r[2 * a + 5] / 10), d = n.vec2.set(Do, r[2 * a + 6] / 10, r[2 * a + 7] / 10);
-            1 === M ? go(t, e, s, o, u, d, l, k, c, h, y, m) : (n.vec2.multiply(s, s, Lo), n.vec2.multiply(o, o, Lo), 
-            n.vec2.multiply(u, u, Lo), n.vec2.multiply(d, d, Lo), vo(t, i, s, o, u, d, k, m));
+            1 === M ? go(t, e, s, o, u, d, l, k, c, h, y, m) : (n.vec2.multiply(s, s, Ro), n.vec2.multiply(o, o, Ro), 
+            n.vec2.multiply(u, u, Ro), n.vec2.multiply(d, d, Ro), vo(t, i, s, o, u, d, k, m));
         } else {
             const {aShape: r} = f;
             let o = n.vec2.set(Co, r[2 * a] / 10, r[2 * a + 1] / 10), u = n.vec2.set(Eo, r[2 * a + 2] / 10, r[2 * a + 3] / 10), g = n.vec2.set(Ho, r[2 * a + 4] / 10, r[2 * a + 5] / 10), v = n.vec2.set(Do, r[2 * a + 6] / 10, r[2 * a + 7] / 10);
-            0 === c.flipY && 1 === M && (n.vec2.multiply(o, o, Lo), n.vec2.multiply(u, u, Lo), 
-            n.vec2.multiply(g, g, Lo), n.vec2.multiply(v, v, Lo));
+            0 === c.flipY && 1 === M && (n.vec2.multiply(o, o, Ro), n.vec2.multiply(u, u, Ro), 
+            n.vec2.multiply(g, g, Ro), n.vec2.multiply(v, v, Ro));
             let x = w ? -w[a] / 9362 : -(d.textRotation || 0) * Math.PI / 180;
             const b = p ? 0 : h.getBearing() * Math.PI / 180;
             if (x || b) {
@@ -9630,19 +9632,19 @@
     function Wo(t, e) {
         const i = t.getRenderer().canvas;
         return {
-            uniforms: [ "flipY", "textSize", "textDx", "textDy", "textRotation", "cameraToCenterDistance", {
+            uniforms: [ {
                 name: "projViewModelMatrix",
                 type: "function",
                 fn: function(t, e) {
                     return n.mat4.multiply([], e.projViewMatrix, e.modelMatrix);
                 }
-            }, "textPerspectiveRatio", "texSize", "canvasSize", "glyphSize", "pitchWithMap", "mapPitch", "texture", "gammaScale", "textFill", "textOpacity", "textHaloRadius", "textHaloFill", "textHaloBlur", "textHaloOpacity", "isHalo", {
+            }, {
                 name: "zoomScale",
                 type: "function",
                 fn: function(t, e) {
                     return e.tileResolution / e.resolution;
                 }
-            }, "rotateWithMap", "mapRotation", "tileRatio" ],
+            } ],
             extraCommandProps: {
                 viewport: {
                     x: 0,
@@ -9861,7 +9863,7 @@
         }(t, e, i) : null;
     }
     const Ko = [], Qo = [];
-    var ta = "#define SHADER_NAME TEXT\n#define RAD 0.0174532925\nattribute vec3 aPosition;\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 pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nattribute float aRotationAlign;\n#else\nuniform float rotateWithMap;\n#endif\nuniform float flipY;\n#if defined(HAS_ROTATION)\nattribute float aRotation;\n#else\nuniform float textRotation;\n#endif\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform vec2 texSize;\nuniform vec2 canvasSize;\nuniform float glyphSize;\nuniform float mapPitch;\nuniform float mapRotation;\nuniform float zoomScale;\nuniform float tileRatio;\nuniform float layerScale;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vSize;\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#ifdef HAS_TEXT_HALO_RADIUS\nattribute float aTextHaloRadius;\nvarying float vTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nattribute float aTextHaloOpacity;\nvarying float vTextHaloOpacity;\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\nvoid main() {\n  vec3 c = aPosition;\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 = pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nfloat i = aRotationAlign;\n#else\nfloat i = rotateWithMap;\n#endif\nvec2 j = aShape / 10.0;\n  if(h == 1. && flipY == .0) {\n    j = j * vec2(1., -1.);\n  }\n  vec2 k = aTexCoord;\n  gl_Position = projViewModelMatrix * vec4(c, 1.);\n  float l = gl_Position.w;\n  float m = (1. - cameraToCenterDistance / l) * textPerspectiveRatio;\n  float n = clamp(.5 + .5 * (1. - m), .0, 4.);\n#ifdef HAS_ROTATION\nfloat o = aRotation / 9362. - mapRotation * i;\n#else\nfloat o = textRotation - mapRotation * i;\n#endif\nif(h == 1.) {\n    o += mapRotation;\n  }\n  float u = sin(o);\n  float v = cos(o);\n  mat2 A = mat2(v, -1. * u, u, v);\n  j = A * (j / glyphSize * d);\n  float B = l / cameraToCenterDistance;\n  if(h == .0) {\n    vec2 C = j * 2. / canvasSize;\n    gl_Position.xy += C * n * l;\n  } else {\n    vec2 C = j;\n    gl_Position = projViewModelMatrix * vec4(c + vec3(C, .0) * tileRatio / zoomScale * B * n, 1.);\n  }\n  gl_Position.xy += vec2(e, -f) * 2. / canvasSize * l;\n#ifndef PICKING_MODE\nif(h == .0) {\n    vGammaScale = mix(1., B, textPerspectiveRatio);\n  } else {\n    vGammaScale = B + mapPitch / 4.;\n  }\n  vTexCoord = k / texSize;\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vSize = 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#ifdef HAS_TEXT_HALO_RADIUS\nvTextHaloRadius = aTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nvTextHaloOpacity = aTextHaloOpacity;\n#endif\n#else\n#ifdef ENABLE_COLLISION\nbool D = aOpacity == 255.;\n#else\nbool D = true;\n#endif\nfbo_picking_setData(gl_Position.w, D);\n#endif\n}", ea = "#define SHADER_NAME TEXT\n#define SDF_PX 8.0\n#define DEVICE_PIXEL_RATIO 1.0\n#define EDGE_GAMMA 0.105 / DEVICE_PIXEL_RATIO\nprecision mediump float;\nuniform sampler2D texture;\nuniform float textOpacity;\nuniform highp float gammaScale;\nuniform int isHalo;\nuniform highp float textHaloBlur;\n#ifdef HAS_TEXT_HALO_OPACITY\nvarying float vTextHaloOpacity;\n#else\nuniform float textHaloOpacity;\n#endif\nvarying vec2 vTexCoord;\nvarying float vSize;\nvarying float vGammaScale;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nvarying vec4 vTextFill;\n#else\nuniform vec4 textFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvarying vec4 vTextHaloFill;\n#else\nuniform vec4 textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvarying float vTextHaloRadius;\n#else\nuniform highp float textHaloRadius;\n#endif\nvoid main() {\n  \n#ifdef HAS_TEXT_FILL\nvec4 c = vTextFill;\n#else\nvec4 c = textFill;\n#endif\nfloat d = vSize / 24.;\n  lowp vec4 e = c;\n  highp float f = EDGE_GAMMA / (d * gammaScale);\n  lowp float h = 185. / 256.;\n  if(isHalo == 1) {\n    \n#ifdef HAS_TEXT_HALO_FILL\nvec4 i = vTextHaloFill;\n#else\nvec4 i = textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nfloat j = vTextHaloRadius;\n#else\nfloat j = textHaloRadius;\n#endif\ne = i;\n    f = (textHaloBlur * 1.19 / SDF_PX + EDGE_GAMMA) / (d * gammaScale);\n    h = (6. - j / d) / SDF_PX;\n#ifdef HAS_TEXT_HALO_OPACITY\nfloat k = vTextHaloOpacity / 255.;\n#else\nfloat k = textHaloOpacity;\n#endif\ne *= k * 1.25;\n  }\n  float l = texture2D(texture, vTexCoord).a;\n  highp float m = f * vGammaScale * .7;\n  float n = clamp(smoothstep(h - m, h + m, l), .0, 1.);\n  gl_FragColor = e * (n * textOpacity * vOpacity);\n}";
+    var ta = "#define SHADER_NAME TEXT\n#define RAD 0.0174532925\nattribute vec3 aPosition;\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 pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nattribute float aRotationAlign;\n#else\nuniform float rotateWithMap;\n#endif\nuniform float flipY;\n#if defined(HAS_ROTATION)\nattribute float aRotation;\n#else\nuniform float textRotation;\n#endif\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform vec2 texSize;\nuniform vec2 canvasSize;\nuniform float glyphSize;\nuniform float mapPitch;\nuniform float mapRotation;\nuniform float zoomScale;\nuniform float tileRatio;\nuniform float layerScale;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vSize;\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#ifdef HAS_TEXT_HALO_RADIUS\nattribute float aTextHaloRadius;\nvarying float vTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nattribute float aTextHaloOpacity;\nvarying float vTextHaloOpacity;\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\nvoid main() {\n  vec3 c = aPosition;\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 = pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nfloat i = aRotationAlign;\n#else\nfloat i = rotateWithMap;\n#endif\nvec2 j = aShape / 10.0;\n  if(h == 1. && flipY == .0) {\n    j = j * vec2(1., -1.);\n  }\n  vec2 k = aTexCoord;\n  gl_Position = projViewModelMatrix * vec4(c, 1.);\n  float l = gl_Position.w;\n  float m = (1. - cameraToCenterDistance / l) * textPerspectiveRatio;\n  float n = clamp(.5 + .5 * (1. - m), .0, 4.);\n#ifdef HAS_ROTATION\nfloat o = aRotation / 9362. - mapRotation * i;\n#else\nfloat o = textRotation - mapRotation * i;\n#endif\nif(h == 1.) {\n    \n#ifdef REVERSE_MAP_ROTATION_ON_PITCH\no += mapRotation;\n#else\no -= mapRotation;\n#endif\n  }\n  float u = sin(o);\n  float v = cos(o);\n  mat2 A = mat2(v, -1. * u, u, v);\n  j = A * (j / glyphSize * d);\n  float B = l / cameraToCenterDistance;\n  if(h == .0) {\n    vec2 C = j * 2. / canvasSize;\n    gl_Position.xy += C * n * l;\n  } else {\n    vec2 C = j;\n    gl_Position = projViewModelMatrix * vec4(c + vec3(C, .0) * tileRatio / zoomScale * B * n, 1.);\n  }\n  gl_Position.xy += vec2(e, -f) * 2. / canvasSize * l;\n#ifndef PICKING_MODE\nif(h == .0) {\n    vGammaScale = mix(1., B, textPerspectiveRatio);\n  } else {\n    vGammaScale = B + mapPitch / 4.;\n  }\n  vTexCoord = k / texSize;\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vSize = 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#ifdef HAS_TEXT_HALO_RADIUS\nvTextHaloRadius = aTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nvTextHaloOpacity = aTextHaloOpacity;\n#endif\n#else\n#ifdef ENABLE_COLLISION\nbool D = aOpacity == 255.;\n#else\nbool D = true;\n#endif\nfbo_picking_setData(gl_Position.w, D);\n#endif\n}", ea = "#define SHADER_NAME TEXT\n#define SDF_PX 8.0\n#define DEVICE_PIXEL_RATIO 1.0\n#define EDGE_GAMMA 0.105 / DEVICE_PIXEL_RATIO\nprecision mediump float;\nuniform sampler2D texture;\nuniform float textOpacity;\nuniform highp float gammaScale;\nuniform int isHalo;\nuniform highp float textHaloBlur;\n#ifdef HAS_TEXT_HALO_OPACITY\nvarying float vTextHaloOpacity;\n#else\nuniform float textHaloOpacity;\n#endif\nvarying vec2 vTexCoord;\nvarying float vSize;\nvarying float vGammaScale;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nvarying vec4 vTextFill;\n#else\nuniform vec4 textFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvarying vec4 vTextHaloFill;\n#else\nuniform vec4 textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvarying float vTextHaloRadius;\n#else\nuniform highp float textHaloRadius;\n#endif\nvoid main() {\n  \n#ifdef HAS_TEXT_FILL\nvec4 c = vTextFill;\n#else\nvec4 c = textFill;\n#endif\nfloat d = vSize / 24.;\n  lowp vec4 e = c;\n  highp float f = EDGE_GAMMA / (d * gammaScale);\n  lowp float h = 185. / 256.;\n  if(isHalo == 1) {\n    \n#ifdef HAS_TEXT_HALO_FILL\nvec4 i = vTextHaloFill;\n#else\nvec4 i = textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nfloat j = vTextHaloRadius;\n#else\nfloat j = textHaloRadius;\n#endif\ne = i;\n    f = (textHaloBlur * 1.19 / SDF_PX + EDGE_GAMMA) / (d * gammaScale);\n    h = (6. - j / d) / SDF_PX;\n#ifdef HAS_TEXT_HALO_OPACITY\nfloat k = vTextHaloOpacity / 255.;\n#else\nfloat k = textHaloOpacity;\n#endif\ne *= k * 1.25;\n  }\n  float l = texture2D(texture, vTexCoord).a;\n  highp float m = f * vGammaScale * .7;\n  float n = clamp(smoothstep(h - m, h + m, l), .0, 1.);\n  gl_FragColor = e * (n * textOpacity * vOpacity);\n}";
     const na = new Uint16Array(1), ia = new Int8Array(1);
     function ra(t, e, n) {
         xs(t, e, n), function(t) {
@@ -10205,6 +10207,9 @@
             this.Ui = {}, this.isLabelCollides = $o.bind(this), this.ds = ha.bind(this), this.ps = ca.bind(this), 
             this.ys = ua.bind(this), this.ms = fa.bind(this), this.gs = [];
         }
+        setTextShaderDefines(t) {
+            this.vs = t;
+        }
         createFnTypeConfig(t, e) {
             return {
                 icon: sa.call(this, t, e),
@@ -10222,8 +10227,8 @@
         }
         postCreateGeometry(t, e) {
             const {geometry: n, symbolIndex: i} = t, r = this.getSymbolDef(i), s = this.getFnTypeConfig(i);
-            if (this.vs(n)) n.properties.iconAtlas ? this.drawDebugAtlas(n.properties.iconAtlas) : n.properties.isEmpty = !0, 
-            ra(n, r, s.icon); else if (this.xs(n) && ps(r)) {
+            if (this.xs(n)) n.properties.iconAtlas ? this.drawDebugAtlas(n.properties.iconAtlas) : n.properties.isEmpty = !0, 
+            ra(n, r, s.icon); else if (this.bs(n) && ps(r)) {
                 const t = e[e.length - 1];
                 if (t) {
                     const {geometry: e, symbolIndex: s} = t;
@@ -10234,7 +10239,7 @@
                 }
             }
         }
-        bs(t) {
+        ws(t) {
             if (!this.layer.options.collision) return;
             const {collideIds: e, elements: n, aCount: i} = t.properties, r = e, s = {};
             if (!n) return void (t.properties.collideBoxIndex = s);
@@ -10248,7 +10253,7 @@
             const s = this.isEnableCollision(), o = this.layer, {geometry: a, symbolIndex: l} = t;
             a.properties.symbolIndex = l;
             const h = this.getSymbolDef(l), c = this.getSymbol(l), u = this.getFnTypeConfig(l), f = [];
-            if (this.vs(a)) {
+            if (this.xs(a)) {
                 const t = function(t, e, i, r, s, o, a, l, h) {
                     if (e.isDisposed() || 0 === e.data.aPosition.length) return null;
                     const c = e.properties.iconAtlas;
@@ -10291,25 +10296,25 @@
                     d;
                 }(this.regl, a, e, 0, c, u.icon, o.options.collision, !s, this.isEnableUniquePlacement());
                 t && (delete t.geometry.properties.glyphAtlas, f.push(t));
-            } else if (this.xs(a)) {
+            } else if (this.bs(a)) {
                 const t = jo.call(this, this.regl, a, e, h, c, u.text, o.options.collision, !s, this.isEnableUniquePlacement());
                 t.length && (t.forEach(t => {
                     delete t.geometry.properties.iconAtlas;
                 }), f.push(...t));
             }
-            return "line" === h.markerPlacement && this.ws(a, r), "line" !== h.markerPlacement && "line" !== h.textPlacement || f.forEach(t => t.properties.isLinePlacement = !0), 
-            this.bs(a), f;
+            return "line" === h.markerPlacement && this.As(a, r), "line" !== h.markerPlacement && "line" !== h.textPlacement || f.forEach(t => t.properties.isLinePlacement = !0), 
+            this.ws(a), f;
         }
-        ws(t, e) {
+        As(t, e) {
             const {collideIds: n} = t.properties, i = new Uint16Array(n.length);
-            if (this.vs(t)) {
+            if (this.xs(t)) {
                 let r = 0;
                 for (let t = 0; t < n.length; t += 4) i.fill(r++, t, t + 4);
                 t.properties.collideIds = i, t.properties.uniqueCollideIds = ms(i), e.markerCollideMap = {
                     old: n,
                     new: i
                 };
-            } else if (this.xs(t)) {
+            } else if (this.bs(t)) {
                 const {collideIds: n, aCount: i} = t.properties;
                 if (!i) return;
                 if (e.markerCollideMap) {
@@ -10359,31 +10364,31 @@
             if (!this.Br()) return;
             super.updateCollision(t);
             const e = this.scene.getMeshes();
-            e && e.length ? (this.As(t.timestamp), this.gs = [], this.wr()) : this.wr();
+            e && e.length ? (this._s(t.timestamp), this.gs = [], this.wr()) : this.wr();
         }
         callCurrentTileShader(t, e) {
             this.shader.filter = e.sceneFilter ? [ this.ds, e.sceneFilter ] : this.ds, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
-            this._s.filter = e.sceneFilter ? [ this.ys, e.sceneFilter ] : this.ys, this.renderer.render(this._s, t, this.scene, this.getRenderFBO(e));
+            this.Ms.filter = e.sceneFilter ? [ this.ys, e.sceneFilter ] : this.ys, this.renderer.render(this.Ms, t, this.scene, this.getRenderFBO(e));
         }
         callBackgroundTileShader(t, e) {
             this.shader.filter = e.sceneFilter ? [ this.ps, e.sceneFilter ] : this.ps, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
-            this._s.filter = e.sceneFilter ? [ this.ms, e.sceneFilter ] : this.ms, this.renderer.render(this._s, t, this.scene, this.getRenderFBO(e));
+            this.Ms.filter = e.sceneFilter ? [ this.ms, e.sceneFilter ] : this.ms, this.renderer.render(this.Ms, t, this.scene, this.getRenderFBO(e));
         }
         isMeshIterable(t) {
             return t && t.geometry && !t.geometry.properties.isEmpty && t.material && !t.material.get("isHalo") && this.isMeshVisible(t) && !(this.shouldIgnoreBackground() && !this.layer.getRenderer().isForeground(t));
         }
-        As() {
+        _s() {
             if (!this.Br()) return;
             let t = this.gs;
-            t && t.length && this.Ms(t);
+            t && t.length && this.Ss(t);
         }
-        Ss(t, e, n, i) {
+        ks(t, e, n, i) {
             return this.updateBoxCollisionFading(!0, t, e, n, i);
         }
         isEnableUniquePlacement() {
             return this.isEnableCollision() && !0 === this.sceneConfig.uniquePlacement;
         }
-        Ms(t) {
+        Ss(t) {
             const e = this.layer.getRenderer();
             t = t.sort(ma);
             for (let n = 0; n < t.length; n++) {
@@ -10398,12 +10403,12 @@
                 const s = e.isForeground(i.meshes[0]);
                 if (this.shouldIgnoreBackground() && !s) continue;
                 const o = i.properties.meshKey;
-                this.startMeshCollision(i), this.ks(i), this.forEachBox(i, this.Ss), this.Ps(i), 
+                this.startMeshCollision(i), this.Ps(i), this.forEachBox(i, this.ks), this.Ts(i), 
                 this.endMeshCollision(o);
-                for (let t = 0; t < i.meshes.length; t++) this.Ts(i.meshes[t]);
+                for (let t = 0; t < i.meshes.length; t++) this.Os(i.meshes[t]);
             }
         }
-        Ts(t) {
+        Os(t) {
             const e = t && t.geometry && t.geometry.properties.aOpacity;
             e && e.dirty && (t.geometry.updateData("aOpacity", e), e.dirty = !1);
         }
@@ -10413,9 +10418,9 @@
             const i = {
                 boxIndex: 0
             }, r = n.length;
-            for (let s = 0; s < r; s++) this.Os(t, n[s], e, i);
+            for (let s = 0; s < r; s++) this.Fs(t, n[s], e, i);
         }
-        Os(t, e, i, r) {
+        Fs(t, e, i, r) {
             const s = this.getMap(), {collideBoxIndex: o} = t.meshes[0].geometry.properties;
             if (!(o && o[e])) return !1;
             const a = n.mat4.multiply(da, s.projViewMatrix, t.meshes[0].localTransform);
@@ -10444,16 +10449,16 @@
                 f++;
             }
             if (!h) return !1;
-            return i.call(this, t, l, a, r.boxIndex++) && this.Fs(t, e), !0;
+            return i.call(this, t, l, a, r.boxIndex++) && this.Is(t, e), !0;
         }
-        ks(t) {
+        Ps(t) {
             const e = t.meshes;
             for (let t = 0; t < e.length; t++) {
                 const n = e[t], i = n && n.geometry;
                 i && (i.properties.visElemts.count = 0);
             }
         }
-        Fs(t, e) {
+        Is(t, e) {
             const n = t.meshes;
             for (let t = 0; t < n.length; t++) {
                 const i = n[t];
@@ -10468,7 +10473,7 @@
                 a.count = u;
             }
         }
-        Ps(t) {
+        Ts(t) {
             const e = t.meshes;
             for (let t = 0; t < e.length; t++) {
                 const n = e[t], i = n && n.geometry;
@@ -10478,7 +10483,7 @@
             }
         }
         isBoxCollides(t, e, n, i, r, s) {
-            if (this.xs(t.geometry)) return $o.call(this, 0, t, e, n, i, r, s);
+            if (this.bs(t.geometry)) return $o.call(this, 0, t, e, n, i, r, s);
             if (t.geometry.properties.isEmpty) return pa;
             const o = this.getMap(), {boxes: a, collision: l} = this.as(t, i);
             let h = 0, c = 0, u = 0;
@@ -10514,13 +10519,13 @@
             this.shader = new n.reshader.MeshShader({
                 vert: ao,
                 frag: "#define SHADER_NAME MARKER\nprecision mediump float;\nuniform sampler2D texture;\nuniform lowp float markerOpacity;\nuniform lowp float blendSrcIsOne;\nvarying vec2 vTexCoord;\nvarying float vOpacity;\nvoid main() {\n  gl_FragColor = texture2D(texture, vTexCoord) * markerOpacity * vOpacity;\n  if(blendSrcIsOne == 1.) {\n    gl_FragColor *= gl_FragColor.a;\n  }\n}",
-                uniforms: [ "flipY", "markerWidth", "markerHeight", "markerDx", "markerDy", "markerRotation", "cameraToCenterDistance", {
+                uniforms: [ {
                     name: "projViewModelMatrix",
                     type: "function",
                     fn: function(t, e) {
                         return n.mat4.multiply([], e.projViewMatrix, e.modelMatrix);
                     }
-                }, "texSize", "canvasSize", "iconSize", "pitchWithMap", "mapPitch", "markerPerspectiveRatio", "texture", "rotateWithMap", "mapRotation", "tileRatio", {
+                }, {
                     name: "zoomScale",
                     type: "function",
                     fn: function(t, e) {
@@ -10546,22 +10551,23 @@
                     }
                 }
             });
-            const {uniforms: r, extraCommandProps: s} = Wo.call(this, this.layer, this.sceneConfig);
-            if (this._s = new n.reshader.MeshShader({
+            const {uniforms: r, extraCommandProps: s} = Wo.call(this, this.layer, this.sceneConfig), o = this.vs || {};
+            if (this.Ms = new n.reshader.MeshShader({
                 vert: ta,
                 frag: ea,
                 uniforms: r,
-                extraCommandProps: s
+                extraCommandProps: s,
+                defines: o
             }), this.pickingFBO) {
                 const t = new n.reshader.FBORayPicking(this.renderer, {
                     vert: "#define PICKING_MODE 1\n" + ao,
-                    uniforms: [ "flipY", "markerWidth", "markerHeight", "markerDx", "markerDy", "markerRotation", "cameraToCenterDistance", {
+                    uniforms: [ {
                         name: "projViewModelMatrix",
                         type: "function",
                         fn: function(t, e) {
                             return n.mat4.multiply([], e.projViewMatrix, e.modelMatrix);
                         }
-                    }, "canvasSize", "iconSize", "pitchWithMap", "mapPitch", "markerPerspectiveRatio", "rotateWithMap", "mapRotation", "tileRatio", {
+                    }, {
                         name: "zoomScale",
                         type: "function",
                         fn: function(t, e) {
@@ -10600,15 +10606,15 @@
             };
         }
         getUniqueEntryKey(t, e) {
-            if (!this.xs(t.geometry)) return null;
+            if (!this.bs(t.geometry)) return null;
             const {elements: n} = t.geometry.properties;
             return Zo(t, n[e]);
         }
-        vs(t) {
+        xs(t) {
             const {symbolIndex: e} = t.properties;
             return 0 === e.type;
         }
-        xs(t) {
+        bs(t) {
             const {symbolIndex: e} = t.properties;
             return 1 === e.type;
         }
@@ -10661,14 +10667,14 @@
     }, Ta = function(t) {
         const e = this.layer.getRenderer(), n = this.getSymbol(t.properties.symbolIndex);
         return !this.cs(t) && !e.isForeground(t) && "line" === n.textPlacement;
-    }, Oa = [], Fa = [], Ia = [], Ca = [], Ea = [], Ha = [], Da = [], Ra = [], La = [], Na = [ 1, -1 ], za = new Int16Array(2), Va = [], ja = [];
+    }, Oa = [], Fa = [], Ia = [], Ca = [], Ea = [], Ha = [], Da = [], La = [], Ra = [], Na = [ 1, -1 ], za = new Int16Array(2), Va = [], ja = [];
     class Ua extends ro {
         constructor(t, e, n, i, r) {
             super(t, e, n, i, r), this.propAllowOverlap = "textAllowOverlap", this.propIgnorePlacement = "textIgnorePlacement", 
-            this.colorCache = {}, this.Is = Sa.bind(this), this.Cs = ka.bind(this), this.Es = Pa.bind(this), 
-            this.Hs = Ta.bind(this), this.isLabelCollides = $o.bind(this), this.Ds();
+            this.colorCache = {}, this.Cs = Sa.bind(this), this.Es = ka.bind(this), this.Hs = Pa.bind(this), 
+            this.Ds = Ta.bind(this), this.isLabelCollides = $o.bind(this), this.Ls();
         }
-        Ds() {
+        Ls() {
             this.Rs = [];
             for (let t = 0; t < this.symbolDef.length; t++) {
                 const e = this.symbolDef[t];
@@ -10677,7 +10683,7 @@
         }
         updateSymbol(...t) {
             const e = super.updateSymbol(...t);
-            return this.Ds(), e;
+            return this.Ls(), e;
         }
         shouldDeleteMeshOnUpdateSymbol(t) {
             if (!Array.isArray(t)) return (0 === t.textHaloRadius || 0 === this.symbolDef[0].textHaloRadius) && t.textHaloRadius !== this.symbolDef[0].textHaloRadius;
@@ -10705,24 +10711,24 @@
             r.properties.symbolIndex = s;
             const o = this.getSymbol(s), a = this.getSymbolDef(s), l = this.getFnTypeConfig(s), h = jo.call(this, this.regl, r, e, a, o, l, this.layer.options.collision, !n, i);
             if (h.length) {
-                "line" === o.textPlacement ? this.Ls = !0 : this.Ns = !0;
+                "line" === o.textPlacement ? this.Ns = !0 : this.zs = !0;
             }
             return h;
         }
         updateCollision(t) {
             super.updateCollision(t);
             const e = this.scene.getMeshes();
-            e && e.length ? (this.zs = {}, this.Vs(t.timestamp), this.wr()) : this.wr();
+            e && e.length ? (this.Vs = {}, this.js(t.timestamp), this.wr()) : this.wr();
         }
         callCurrentTileShader(t, e) {
-            this.shader.filter = e.sceneFilter ? [ this.Is, e.sceneFilter ] : this.Is, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
-            this.js.filter = e.sceneFilter ? [ this.Es, e.sceneFilter ] : this.Es, this.renderer.render(this.js, t, this.scene, this.getRenderFBO(e));
+            this.shader.filter = e.sceneFilter ? [ this.Cs, e.sceneFilter ] : this.Cs, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
+            this.Us.filter = e.sceneFilter ? [ this.Hs, e.sceneFilter ] : this.Hs, this.renderer.render(this.Us, t, this.scene, this.getRenderFBO(e));
         }
         callBackgroundTileShader(t, e) {
-            this.shader.filter = e.sceneFilter ? [ this.Cs, e.sceneFilter ] : this.Cs, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
-            this.js.filter = e.sceneFilter ? [ this.Hs, e.sceneFilter ] : this.Hs, this.renderer.render(this.js, t, this.scene, this.getRenderFBO(e));
+            this.shader.filter = e.sceneFilter ? [ this.Es, e.sceneFilter ] : this.Es, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
+            this.Us.filter = e.sceneFilter ? [ this.Ds, e.sceneFilter ] : this.Ds, this.renderer.render(this.Us, t, this.scene, this.getRenderFBO(e));
         }
-        Vs() {
+        js() {
             let t = this.scene.getMeshes();
             if (!t || !t.length) return;
             const e = -this.getMap().getBearing() * Math.PI / 180, i = n.mat2.fromRotation(Ia, e), r = (t, e, n, i) => {
@@ -10744,7 +10750,7 @@
                 const c = n.properties.meshKey;
                 if ("line" === h.textPlacement) {
                     if (!l.properties.line) continue;
-                    s && this.startMeshCollision(n), this.Us(n, i);
+                    s && this.startMeshCollision(n), this.Gs(n, i);
                     const {aOffset: t, aOpacity: e} = l.properties;
                     t.dirty && (l.updateData("aOffset", t), t.dirty = !1), e && e.dirty && (l.updateData("aOpacity", e), 
                     e.dirty = !1), s && this.endMeshCollision(c);
@@ -10769,7 +10775,7 @@
         getUniqueEntryKey(t, e) {
             return Zo(t, e);
         }
-        Us(t, e) {
+        Gs(t, e) {
             const i = this.getMap(), r = t.geometry, s = r.properties, o = this.layer.getRenderer().isForeground(t);
             if (this.shouldIgnoreBackground() && !o) return;
             let a = s.line;
@@ -10777,12 +10783,12 @@
             const l = 1 === t.material.uniforms.pitchWithMap, h = s.elements;
             if (!l) {
                 const e = n.mat4.multiply(Oa, i.projViewMatrix, t.localTransform), r = new Array(a.length);
-                a = this.Gs(r, a, e, i.width, i.height);
+                a = this.Ws(r, a, e, i.width, i.height);
             }
             const c = this.Br(), u = r.properties.visElemts = r.properties.visElemts || new h.constructor(h.length);
             c && (u.count = 0), this.forEachBox(t, (t, n, i, r) => {
                 const {start: s, end: o} = n[0];
-                let f = this.Ws(t, h, s, o, a, i, l ? e : null, r);
+                let f = this.Bs(t, h, s, o, a, i, l ? e : null, r);
                 if (c && (f = this.updateBoxCollisionFading(f, t, n, i, r), f)) {
                     let t = u.count;
                     for (let e = s; e < o; e++) u[t++] = h[e];
@@ -10790,16 +10796,16 @@
                 }
             }), !c || u.count === h.length && r.count === u.count || r.setElements(u, u.count);
         }
-        Gs(t, e, i, r, s) {
+        Ws(t, e, i, r, s) {
             const o = e.id + "-" + i.join();
-            if (this.zs[o]) return this.zs[o];
+            if (this.Vs[o]) return this.Vs[o];
             const a = function(t, e, i, r, s) {
                 const o = [];
                 for (let a = 0; a < e.length; a += 3) n.vec4.set(o, e[a], e[a + 1], e[a + 2], 1), 
                 ho(o, o, i, r, s), t[a] = o[0], t[a + 1] = o[1], t[a + 2] = e[a + 2];
                 return t;
             }(t, e, i, r, s);
-            return this.zs[o] = a, a;
+            return this.Vs[o] = a, a;
         }
         forEachBox(t, e) {
             const i = this.getMap(), r = n.mat4.multiply(Oa, i.projViewMatrix, t.localTransform), {collideIds: s, aCount: o, features: a, elements: l} = t.geometry.properties, h = s, c = this.isEnableUniquePlacement(), u = this.ls(1);
@@ -10819,7 +10825,7 @@
                 y = h[d], p = n;
             }
         }
-        Ws(t, e, i, r, s, o, a) {
+        Bs(t, e, i, r, s, o, a) {
             const l = this.Br(), h = this.getMap(), c = t.geometry, u = c.desc.positionSize, {aShape: f, aOffset: d, aAnchor: p} = c.properties, y = c.properties.aTextSize, m = !a, g = e[i] * u;
             let v = n.vec3.set(Ca, p[g], p[g + 1], 2 === u ? 0 : p[g + 2]);
             const x = ho(Ea, v, o, h.width, h.height);
@@ -10828,7 +10834,7 @@
             m && (v = x);
             const b = m ? 1 : c.properties.tileExtent / this.layer.options.tileSize[0];
             let w = !0;
-            const A = e[i], _ = e[r - 1], M = y ? y[A] : t.properties.textSize, S = this.Bs(t, M, s, A, _, v, b, a);
+            const A = e[i], _ = e[r - 1], M = y ? y[A] : t.properties.textSize, S = this.Xs(t, M, s, A, _, v, b, a);
             if (null === S) return Ba(d, e, i, r), !1;
             const k = _ - A <= 3, P = t.material.uniforms, T = 1 === P.pitchWithMap, O = Math.floor(S / 2), F = S % 2;
             for (let o = i; o < r; o += 6) {
@@ -10842,15 +10848,15 @@
                 let c = h[2];
                 F && (c -= Math.PI / 2);
                 const u = xo(Da, c, 0, P.rotateWithMap, P.pitchWithMap);
-                for (let t = 0; t < 4; t++) n.vec2.set(Ra, f[2 * (a + t)] / 10, f[2 * (a + t) + 1] / 10), 
-                n.vec2.scale(Ra, Ra, M / 24), n.vec2.transformMat2(Ra, Ra, u), T ? (n.vec2.multiply(Ra, Ra, Na), 
-                n.vec2.add(La, Ra, h)) : (n.vec2.multiply(La, h, Na), n.vec2.add(La, Ra, La)), za[0] = 10 * La[0], 
-                za[1] = 10 * La[1], d[2 * (a + t)] === za[0] && d[2 * (a + t) + 1] === za[1] || (d.dirty = !0, 
+                for (let t = 0; t < 4; t++) n.vec2.set(La, f[2 * (a + t)] / 10, f[2 * (a + t) + 1] / 10), 
+                n.vec2.scale(La, La, M / 24), n.vec2.transformMat2(La, La, u), T ? (n.vec2.multiply(La, La, Na), 
+                n.vec2.add(Ra, La, h)) : (n.vec2.multiply(Ra, h, Na), n.vec2.add(Ra, La, Ra)), za[0] = 10 * Ra[0], 
+                za[1] = 10 * Ra[1], d[2 * (a + t)] === za[0] && d[2 * (a + t) + 1] === za[1] || (d.dirty = !0, 
                 d[2 * (a + t)] = za[0], d[2 * (a + t) + 1] = za[1]);
             }
             return w;
         }
-        Bs(t, e, n, i, r, s, o, a) {
+        Xs(t, e, n, i, r, s, o, a) {
             const l = r - i <= 3, h = this.getMap();
             return l ? 0 : _a.call(this, Va, ja, t, e, n, i, r, s, o, h.width / h.height, a);
         }
@@ -10863,7 +10869,7 @@
             }) : t.material && delete t.material.uniforms.texture), super.deleteMesh(t, e));
         }
         delete() {
-            super.delete(), this.js.dispose(), delete this.zs, this.Xs && this.Xs.dispose();
+            super.delete(), this.Us.dispose(), delete this.Vs, this.qs && this.qs.dispose();
         }
         needClearStencil() {
             return !0;
@@ -10880,7 +10886,7 @@
             });
             let r = i;
             if (this.layer.getRenderer().isEnableWorkAround("win-intel-gpu-crash") && (r = ns({}, i), 
-            r.stencil = ns({}, i.stencil), r.stencil.enable = !0), this.js = new n.reshader.MeshShader({
+            r.stencil = ns({}, i.stencil), r.stencil.enable = !0), this.Us = new n.reshader.MeshShader({
                 vert: Ma,
                 frag: ea,
                 uniforms: e,
@@ -11136,7 +11142,7 @@
         }
     }
     const Ka = [ 1, 1, 1 ], Qa = [ 1, 1, 1, 1 ], tl = [ 0, 0 ];
-    class el extends Ls {
+    class el extends Rs {
         supportRenderMode(t) {
             return this.isAnimating() ? "fxaa" === t || "fxaaAfterTaa" === t : "taa" === t || "fxaa" === t;
         }
@@ -11199,7 +11205,7 @@
                 enumerable: !0,
                 get: () => {
                     const t = this.getSymbol(o);
-                    return s.properties.hasAlpha || t.polygonOpacity < 1;
+                    return s.properties.hasAlpha || t.polygonOpacity < 1 || t.lineOpacity < 1;
                 }
             }), a.properties.symbolIndex = o, a;
         }
@@ -11213,10 +11219,10 @@
             r;
         }
         needPolygonOffset() {
-            return this.qs;
+            return this.Js;
         }
         startFrame(...t) {
-            return delete this.qs, super.startFrame(...t);
+            return delete this.Js, super.startFrame(...t);
         }
         addMesh(t, e) {
             t.forEach(t => {
@@ -11229,7 +11235,7 @@
                 0 === e && (e = .01), Ka[2] = e, n.mat4.fromScaling(i, Ka), n.mat4.multiply(i, t.properties.tileTransform, i), 
                 t.setLocalTransform(i);
             } else t.setLocalTransform(t.properties.tileTransform);
-            t.material !== this.material && t.setMaterial(this.material), t.geometry.properties.maxAltitude <= 0 && (this.qs = !0), 
+            t.material !== this.material && t.setMaterial(this.material), t.geometry.properties.maxAltitude <= 0 && (this.Js = !0), 
             this.getSymbol(t.properties.symbolIndex).ssr ? t.ssr = 1 : t.ssr = 0;
         }
         deleteMesh(t, e) {
@@ -11281,7 +11287,7 @@
         }
         updateSymbol(t, e) {
             const n = super.updateSymbol(t, e);
-            return t.material && this.Js(t.material), n;
+            return t.material && this.Ys(t.material), n;
         }
         Gi(t, e) {
             return nl(t) !== nl(e);
@@ -11321,14 +11327,14 @@
             return this.shader;
         }
         delete(t) {
-            this.getMap().off("updatelights", this.Ys, this), super.delete(t), this.material.dispose();
+            this.getMap().off("updatelights", this.$s, this), super.delete(t), this.material.dispose();
         }
         init() {
-            this.getMap().on("updatelights", this.Ys, this);
+            this.getMap().on("updatelights", this.$s, this);
             const t = this.regl;
             this.renderer = new n.reshader.Renderer(t);
             const e = this.getShaderConfig();
-            this.shader = new n.reshader.PhongShader(e), this.Js();
+            this.shader = new n.reshader.PhongShader(e), this.Ys();
             const i = {
                 vert: this.getPickingVert(),
                 uniforms: [ "projViewMatrix", "modelMatrix", "positionMatrix", {
@@ -11344,7 +11350,7 @@
             };
             this.picking = [ new n.reshader.FBORayPicking(this.renderer, i, this.layer.getRenderer().pickingFBO) ];
         }
-        Ys() {
+        $s() {
             this.setToRedraw();
         }
         getShaderConfig() {
@@ -11393,14 +11399,14 @@
                 }
             };
         }
-        Js() {
+        Ys() {
             this.material && this.material.dispose();
             const t = this.getSymbols()[0].material, e = {};
             for (const n in t) ys(t, n) && (e[n] = t[n]);
             this.material = new n.reshader.PhongMaterial(e);
         }
         getUniformValues(t, e) {
-            const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, s = this.$s(), o = ns({
+            const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, s = this.Zs(), o = ns({
                 viewMatrix: n,
                 projMatrix: i,
                 cameraPosition: r,
@@ -11413,7 +11419,7 @@
         getPickingVert() {
             return "\n            attribute vec3 aPosition;\n            uniform mat4 projViewModelMatrix;\n            uniform mat4 modelMatrix;\n            uniform mat4 positionMatrix;\n            //引入fbo picking的vert相关函数\n            #include <fbo_picking_vert>\n            #include <get_output>\n            void main()\n            {\n                mat4 localPositionMatrix = getPositionMatrix();\n                vec4 localPosition = getPosition(aPosition);\n\n                gl_Position = projViewModelMatrix * localPositionMatrix * localPosition;\n                //传入gl_Position的depth值\n                fbo_picking_setData(gl_Position.w, true);\n            }\n        ";
         }
-        $s() {
+        Zs() {
             const t = this.getMap().getLightManager(), e = t && t.getAmbientLight() || {}, n = t && t.getDirectionalLight() || {};
             return {
                 ambientColor: e.color || [ .2, .2, .2 ],
@@ -11424,7 +11430,7 @@
         }
     }
     const rl = [ 1, 1, 1 ];
-    class sl extends Ls {
+    class sl extends Rs {
         constructor(t, e, n, i, r) {
             if (super(t, e, n, i, r), _(this.symbolDef[0].lineColor)) {
                 const t = e.getMap(), n = S(this.symbolDef.lineColor);
@@ -11481,7 +11487,7 @@
                         const i = [];
                         return n.mat4.multiply(i, e.projViewMatrix, e.modelMatrix), i;
                     }
-                }, "outSize", "opacity" ],
+                } ],
                 extraCommandProps: {
                     stencil: {
                         enable: !0,
@@ -11517,20 +11523,20 @@
     const {getPBRUniforms: ol} = n.reshader.pbr.PBRUtils, al = [];
     class ll extends el {
         constructor(...t) {
-            super(...t), this.Zs = new n.reshader.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
+            super(...t), this.Ks = new n.reshader.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
         }
         supportRenderMode(t) {
             return this.getSymbols()[0].ssr ? "fxaa" === t || "fxaaAfterTaa" === t : super.supportRenderMode(t);
         }
         isAnimating() {
-            const t = this.Ks();
+            const t = this.Qs();
             if (t && (t[0] || t[1])) return !0;
         }
         needToRedraw() {
-            const t = this.Ks();
+            const t = this.Qs();
             return !(!t || !t[0] && !t[1]) || super.needToRedraw();
         }
-        Ks() {
+        Qs() {
             const t = this.getSymbols()[0];
             return t.material && t.material.uvOffsetAnim;
         }
@@ -11556,18 +11562,18 @@
                 const e = ns({}, r, t.ssr.defines);
                 i.shaderDefines = e;
             }
-            if (t.onlyUpdateDepthInTaa && (this.shader = this.Qs, !n && this.eo && (this.shader = i, 
+            if (t.onlyUpdateDepthInTaa && (this.shader = this.eo, !n && this.no && (this.shader = i, 
             this.setToRedraw(!0))), this.updateIBLDefines(i), super.paint(t), void 0 !== this.shadowCount && e) {
                 const t = this.scene.getMeshes().length;
                 this.shadowCount !== t && this.setToRedraw();
             }
             this.shader = i, n && (i.shaderDefines = r), delete this.shadowCount;
-            const s = this.Ks();
+            const s = this.Qs();
             if (s && (s[0] || s[1])) this.material.set("uvOffset", [ 0, 0 ]); else {
                 const t = this.getUVOffset(s);
                 this.material.set("uvOffset", t);
             }
-            this.eo = n;
+            this.no = n;
         }
         getShadowMeshes() {
             if (!this.isVisible()) return al;
@@ -11583,15 +11589,15 @@
             ns(this.sceneConfig, t), this.setToRedraw();
         }
         delete() {
-            super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.no && this.no.dispose(), 
-            this.shader && (this.shader.dispose(), delete this.shader), this.Qs && (this.Qs.dispose(), 
-            delete this.Qs);
+            super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.io && this.io.dispose(), 
+            this.shader && (this.shader.dispose(), delete this.shader), this.eo && (this.eo.dispose(), 
+            delete this.eo);
         }
         init(t) {
-            this.getMap().on("updatelights", this.io, this), this.createIBLTextures(), this.or = this.or || t;
+            this.getMap().on("updatelights", this.ro, this), this.createIBLTextures(), this.or = this.or || t;
             const e = this.regl;
-            this.renderer = new n.reshader.Renderer(e), this.ro = this.so.bind(this), this.oo = this.disposeCachedTexture.bind(this), 
-            this.ao = this.lo.bind(this), this.Js(), this.nr(t);
+            this.renderer = new n.reshader.Renderer(e), this.so = this.oo.bind(this), this.ao = this.disposeCachedTexture.bind(this), 
+            this.lo = this.ho.bind(this), this.Ys(), this.nr(t);
             const i = {
                 vert: "\n                attribute vec3 aPosition;\n                uniform mat4 projViewModelMatrix;\n                uniform mat4 positionMatrix;\n                //引入fbo picking的vert相关函数\n                #include <line_extrusion_vert>\n                #include <get_output>\n                #include <fbo_picking_vert>\n                void main() {\n                    mat4 localPositionMatrix = getPositionMatrix();\n                    #ifdef IS_LINE_EXTRUSION\n                        vec3 linePosition = getLineExtrudePosition(aPosition);\n                        vec4 localVertex = getPosition(linePosition);\n                    #else\n                        vec4 localVertex = getPosition(aPosition);\n                    #endif\n\n                    gl_Position = projViewModelMatrix * localPositionMatrix * localVertex;\n                    fbo_picking_setData(gl_Position.w, true);\n                }\n            ",
                 uniforms: [ {
@@ -11647,20 +11653,20 @@
                 polygonOffset: this.getPolygonOffset()
             }, o = {
                 uniforms: r,
-                defines: this.ho(i),
+                defines: this.co(i),
                 extraCommandProps: s
             };
             this.shader = new n.reshader.pbr.StandardShader(o), o.frag = "\n            precision mediump float;\n            #include <gl2_frag>\n            void main() {\n                glFragColor = vec4(0.0);\n                #if __VERSION__ == 100\n                    gl_FragColor = glFragColor;\n                #endif\n            }\n        ", 
-            this.Qs = new n.reshader.pbr.StandardShader(o);
+            this.eo = new n.reshader.pbr.StandardShader(o);
         }
-        so({resources: t}) {
+        oo({resources: t}) {
             for (let e = 0; e < t.length; e++) this.addCachedTexture(t[e].url, t[e].data);
             this.setToRedraw(!0);
         }
-        lo() {
+        ho() {
             this.setToRedraw(!0);
         }
-        Js(t) {
+        Ys(t) {
             const e = t || this.getSymbols()[0].material, i = {};
             let r = !1;
             for (const t in e) if (ys(e, t)) if (t.indexOf("Texture") > 0) {
@@ -11679,15 +11685,15 @@
                 } : s.data = a : o === s && (s = {
                     url: o,
                     wrap: "repeat"
-                }), s.flipY = !0, i[t] = new n.reshader.Texture2D(s, this.Zs), i[t].once("complete", this.ro), 
-                i[t].once("disposed", this.oo), i[t].promise && this.addCachedTexture(o, i[t].promise), 
+                }), s.flipY = !0, i[t] = new n.reshader.Texture2D(s, this.Ks), i[t].once("complete", this.so), 
+                i[t].once("disposed", this.ao), i[t].promise && this.addCachedTexture(o, i[t].promise), 
                 r = !0;
             } else i[t] = e[t];
             if (this.material) {
                 for (let t in i) this.material.set(t, i[t]);
                 this.setToRedraw(!0);
-            } else this.material = new n.reshader.pbr.StandardMaterial(i), this.material.once("complete", this.ao);
-            r || this.lo();
+            } else this.material = new n.reshader.pbr.StandardMaterial(i), this.material.once("complete", this.lo);
+            r || this.ho();
         }
         getShader() {
             return this.shader;
@@ -11696,29 +11702,29 @@
             const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = ol(t, n, i, e && e.ssr, e && e.jitter);
             return this.setIncludeUniformValues(r, e), r;
         }
-        ho(t) {
+        co(t) {
             return this.hasIBL() ? t.HAS_IBL_LIGHTING = 1 : delete t.HAS_IBL_LIGHTING, t;
         }
-        io() {
+        ro() {
             if (!this.shader) return;
             const t = this.shader.shaderDefines;
-            this.ho(t), this.shader.shaderDefines = t;
+            this.co(t), this.shader.shaderDefines = t;
         }
     }
     const hl = [], cl = [], ul = [ 0, 0, 0 ], fl = [ 0, 0, 0 ], dl = [ 1, 1, 1 ], pl = [], yl = [ 1, 1, 1, 1 ], ml = [], gl = t => class extends t {
         constructor(t, e, n, i, r) {
-            super(t, e, n, i, r), this.co = !1, this.scene.sortFunction = this.sortByCommandKey, 
-            this.uo = [];
+            super(t, e, n, i, r), this.uo = !1, this.scene.sortFunction = this.sortByCommandKey, 
+            this.fo = [];
         }
         isAnimating() {
             const t = this.getSymbols();
             for (let e = 0; e < t.length; e++) {
-                if (t[e] && this.fo[e] && this.do(e)) return !0;
+                if (t[e] && this.do[e] && this.po(e)) return !0;
             }
             return !1;
         }
         createGeometry(t, e) {
-            if (this.po(), !this.co) return null;
+            if (this.yo(), !this.uo) return null;
             const {data: n, positionSize: i} = t;
             return {
                 geometry: {
@@ -11742,7 +11748,7 @@
                 instance_vectorC: new Float32Array(4 * c),
                 aPickingId: []
             };
-            this.yo(u, i, r, o.properties.z, h, a);
+            this.mo(u, i, r, o.properties.z, h, a);
             const f = {};
             for (const t in u) f[t] = {
                 buffer: this.regl.buffer({
@@ -11753,14 +11759,14 @@
             };
             const d = [], p = this.getSymbols();
             for (let t = 0; t < p.length; t++) {
-                const e = p[t], r = this.uo[t];
+                const e = p[t], r = this.fo[t];
                 if (!r) continue;
-                const {translation: o, rotation: a, scale: h, fixSizeOnZoom: y} = e, m = this.mo([], o, a, h);
+                const {translation: o, rotation: a, scale: h, fixSizeOnZoom: y} = e, m = this.vo([], o, a, h);
                 let g = 0;
                 r.forEach(t => {
                     const {geometry: i, nodeMatrix: r} = t, s = n.mat4.multiply(ml, m, r), o = i.boundingBox.copy();
                     o.transform(s);
-                    const a = this.vo(o, e);
+                    const a = this.xo(o, e);
                     a > g && (g = a);
                 });
                 const v = [ 0, 0, g ], x = r.map(r => {
@@ -11796,7 +11802,7 @@
                 positionSize: a
             }, d;
         }
-        vo(t, e) {
+        xo(t, e) {
             const n = e.anchorZ || "bottom";
             let i = 0;
             return "bottom" === n ? i = -t.min[2] : "top" === n ? i = -t.max[2] : "center" === n && (i = -(t.min[2] + t.max[2]) / 2), 
@@ -11807,7 +11813,7 @@
             if (t[0].properties.level > 2) return null;
             for (let e = 0; e < t.length; e++) {
                 if (!t[e] || !t[e].geometry) continue;
-                const n = this.do(t[e].properties.symbolIndex.index);
+                const n = this.po(t[e].properties.symbolIndex.index);
                 t[e].setUniform("skinAnimation", +n);
             }
             return this.scene.addMesh(t), this;
@@ -11817,12 +11823,12 @@
             let n = !1;
             for (let i = 0; i < e.length; i++) {
                 const r = e[i];
-                if (!r || !this.fo[i]) continue;
-                if (this.do(i) && this.fo[i]) {
+                if (!r || !this.do[i]) continue;
+                if (this.po(i) && this.do[i]) {
                     n || (n = !0);
                     let e = r.speed;
                     const s = !!r.loop;
-                    ss(e) && (e = 1), this.fo[i].updateAnimation(t.timestamp, s, e);
+                    ss(e) && (e = 1), this.do[i].updateAnimation(t.timestamp, s, e);
                 }
             }
             n && this.setToRedraw(!0), super.prepareRender(t);
@@ -11832,11 +11838,11 @@
             this.shadowCount = this.scene.getMeshes().length;
             return this.scene.getMeshes().filter(t => 0 === t.getUniform("level"));
         }
-        do(t) {
+        po(t) {
             const e = this.getSymbols()[t];
-            return e && e.animation && this.fo[t] && this.fo[t].hasSkinAnimation();
+            return e && e.animation && this.do[t] && this.do[t].hasSkinAnimation();
         }
-        yo(t, e, i, r, s, o) {
+        mo(t, e, i, r, s, o) {
             function a(e, n, i, r) {
                 t[e][4 * n] = i[r], t[e][4 * n + 1] = i[r + 4], t[e][4 * n + 2] = i[r + 8], t[e][4 * n + 3] = i[r + 12];
             }
@@ -11852,26 +11858,26 @@
             return t.positionAttribute = "POSITION", t.normalAttribute = "NORMAL", t;
         }
         init(t) {
-            super.init(t), this.po();
+            super.init(t), this.yo();
         }
-        po() {
-            if (this.fo) return;
-            this.fo = [];
+        yo() {
+            if (this.do) return;
+            this.do = [];
             const t = this.layer.getRenderer(), e = this.getSymbols();
-            this.xo = 0;
+            this.bo = 0;
             for (let i = 0; i < e.length; i++) {
                 const r = e[i].url;
                 if (t.isCachePlaced(r)) continue;
                 const s = t.fetchCache(r);
-                s ? (this.fo[i] = [ s ], this.uo[i] = s.getMeshesInfo(), this.xo++, t.addToCache(r)) : (t.placeCache(r), 
+                s ? (this.do[i] = [ s ], this.fo[i] = s.getMeshesInfo(), this.bo++, t.addToCache(r)) : (t.placeCache(r), 
                 n.reshader.GLTFHelper.load(r).then(s => {
                     const o = n.reshader.GLTFHelper.exportGLTFPack(s, this.regl);
-                    this.fo[i] = [ o ], this.uo[i] = o.getMeshesInfo(), t.addToCache(r, o, t => {
+                    this.do[i] = [ o ], this.fo[i] = o.getMeshesInfo(), t.addToCache(r, o, t => {
                         t.dispose();
-                    }), this.xo++, this.xo >= e.length && (this.co = !0), this.setToRedraw(!0);
+                    }), this.bo++, this.bo >= e.length && (this.uo = !0), this.setToRedraw(!0);
                 }));
             }
-            this.xo >= e.length && (this.co = !0);
+            this.bo >= e.length && (this.uo = !0);
         }
         getPickingVert() {
             return "\n    attribute vec3 aPosition;\n    uniform mat4 projViewModelMatrix;\n    uniform mat4 modelMatrix;\n    uniform mat4 positionMatrix;\n    //引入fbo picking的vert相关函数\n    #include <fbo_picking_vert>\n    #include <get_output>\n    void main()\n    {\n        mat4 localPositionMatrix = getPositionMatrix();\n        vec4 localPosition = getPosition(aPosition);\n\n        gl_Position = projViewModelMatrix * localPositionMatrix * localPosition;\n        //传入gl_Position的depth值\n        fbo_picking_setData(gl_Position.w, true);\n    }";
@@ -11885,15 +11891,15 @@
         delete() {
             super.delete();
             const t = this.getSymbols()[0].url;
-            if (this.layer.getRenderer().removeCache(t), this.uo) for (let t = 0; t < this.uo.length; t++) {
-                const e = this.uo[t];
+            if (this.layer.getRenderer().removeCache(t), this.fo) for (let t = 0; t < this.fo.length; t++) {
+                const e = this.fo[t];
                 for (let n = 0; n < e.length; n++) {
                     const n = e[t], {geometry: i, materialInfo: r} = n;
                     if (i && i.dispose(), r) for (const t in r) r[t] && r[t].destroy && r[t].destroy();
                 }
             }
         }
-        mo(t, e, i, r) {
+        vo(t, e, i, r) {
             const s = n.vec3.set(hl, ...e || ul), o = i || fl, a = r || dl, l = n.quat.fromEuler(cl, o[0], o[1], o[2]);
             return n.mat4.fromRotationTranslationScale(t, l, s, a);
         }
@@ -11935,8 +11941,8 @@
         }
         callShader(t, e) {
             super.callShader(t, e), this.transformWater();
-            const n = this.bo(this.getMap(), e);
-            this.renderer.render(this.wo, n, this.Ao, this.getRenderFBO(e));
+            const n = this.wo(this.getMap(), e);
+            this.renderer.render(this.Ao, n, this._o, this.getRenderFBO(e));
         }
         addMesh(t, e) {
             this.sr(t, e), super.addMesh(...arguments);
@@ -11946,14 +11952,14 @@
             for (let n = 0; n < t.length; n++) t[n].ssr = e ? 1 : 0;
         }
         paint(t) {
-            t.states && t.states.includesChanged && (this.shader.dispose(), this.wo.dispose(), 
+            t.states && t.states.includesChanged && (this.shader.dispose(), this.Ao.dispose(), 
             this.nr(t));
-            const e = !!t.ssr && this.getSymbol(wl).ssr, n = this.wo, i = n.shaderDefines;
+            const e = !!t.ssr && this.getSymbol(wl).ssr, n = this.Ao, i = n.shaderDefines;
             if (e) {
                 const e = ns({}, i, t.ssr.defines);
                 n.shaderDefines = e;
             }
-            this.updateIBLDefines(n), this._o.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
+            this.updateIBLDefines(n), this.Mo.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
         }
         init(t) {
             this.createIBLTextures();
@@ -11971,38 +11977,38 @@
                 extraCommandProps: {
                     viewport: this.pickingViewport
                 }
-            }, this.pickingFBO) ]), this.Mo();
+            }, this.pickingFBO) ]), this.So();
         }
-        Mo() {
+        So() {
             const t = this.regl;
-            this.So = t.texture(2), this.ko = [ 2, 2 ];
+            this.ko = t.texture(2), this.Po = [ 2, 2 ];
             const e = this.getSymbol({
                 index: 0
             }), n = e.texWaveNormal, i = this.getCachedTexture(n), r = this;
-            if (i) i.loading || (this.Po = this.To(t, i)); else {
+            if (i) i.loading || (this.To = this.Oo(t, i)); else {
                 const e = new Image;
                 e.loading = !0, e.onload = function() {
-                    delete this.loading, r.Po = r.To(t, this), this.ko = [ this.width, this.height ], 
+                    delete this.loading, r.To = r.Oo(t, this), this.Po = [ this.width, this.height ], 
                     r.setToRedraw();
                 }, e.onerror = () => {
                     console.error("invalid water wave normal texture:" + n);
                 }, this.addCachedTexture(n, e), e.src = n;
             }
             const s = e.texWavePerturbation, o = this.getCachedTexture(s);
-            if (o) o.loading || (this.Oo = this.To(t, o)); else {
+            if (o) o.loading || (this.Fo = this.Oo(t, o)); else {
                 const e = new Image;
                 e.loading = !0, e.onload = function() {
-                    delete this.loading, r.Oo = r.To(t, this), this.ko = [ this.width, this.height ], 
+                    delete this.loading, r.Fo = r.Oo(t, this), this.Po = [ this.width, this.height ], 
                     r.setToRedraw();
                 }, e.onerror = () => {
                     console.error("invalid water wave perturbation texture:" + s);
                 }, this.addCachedTexture(s, e), e.src = s;
             }
         }
-        To(t, e) {
-            return this.So ? t.texture({
-                width: this.ko[0],
-                height: this.ko[1],
+        Oo(t, e) {
+            return this.ko ? t.texture({
+                width: this.Po[0],
+                height: this.Po[1],
                 mag: "linear",
                 min: "linear mipmap linear",
                 wrapS: "repeat",
@@ -12099,7 +12105,7 @@
                     enable: !1
                 }
             };
-            i.push(...n.reshader.SsrPass.getUniformDeclares()), this.wo = new n.reshader.MeshShader({
+            i.push(...n.reshader.SsrPass.getUniformDeclares()), this.Ao = new n.reshader.MeshShader({
                 vert: "#define SHADER_NAME WATER\nuniform mat4 modelMatrix;\nuniform mat4 projViewModelMatrix;\nattribute vec3 aPosition;\nattribute vec2 aTexCoord;\nuniform vec2 uvOffset;\nuniform vec2 noiseUvOffset;\nuniform vec2 uvScale;\nvarying vec2 vUv;\nvarying vec2 vNoiseUv;\nvarying vec3 vPos;\nvarying mat3 vTbnMatrix;\n#ifdef HAS_SSR\nuniform mat4 modelViewMatrix;\nvarying vec4 vViewVertex;\n#endif\nmat3 c(in vec3 d) {\n  vec3 t = normalize(cross(d, vec3(.0, 1., .0)));\n  vec3 e = normalize(cross(d, t));\n  return mat3(t, e, d);\n}\n#if defined(HAS_SHADOWING)\n#include <vsm_shadow_vert>\n#endif\nconst vec3 f = vec3(0., 0., 1.);\nvoid main(void) {\n  vec4 h = vec4(aPosition, 1.);\n  vec4 i = modelMatrix * h;\n  vPos = i.xyz;\n  vTbnMatrix = c(f);\n  gl_Position = projViewModelMatrix * h;\n  vUv = aTexCoord * uvScale + uvOffset;\n  vNoiseUv = aTexCoord * uvScale * TIME_NOISE_TEXTURE_REPEAT + noiseUvOffset;\n#ifdef HAS_SSR\nvec4 j = modelViewMatrix * h;\n  vViewVertex = j;\n#endif\n#if defined(HAS_SHADOWING)\nshadow_computeShadowPars(h);\n#endif\n}",
                 frag: "#define SHADER_NAME WATER\nprecision highp float;\nprecision highp sampler2D;\n#include <hsv_frag>\nuniform vec3 hsv;\nuniform float contrast;\n#if defined(HAS_SHADOWING)\n#include <vsm_shadow_frag>\n#endif\n#if defined(HAS_IBL_LIGHTING)\nuniform vec3 hdrHsv;\nuniform samplerCube specularPBR;\nuniform float rgbmRange;\nuniform vec3 diffuseSPH[9];\n#else\nuniform vec3 ambientColor;\n#endif\nstruct PBRShadingWater {\n  float NdotL;\n  float NdotV;\n  float NdotH;\n  float VdotH;\n  float LdotH;\n  float VdotN;\n};\nvec3 c(const in vec4 d, const in float e) {\n  if(e <= .0)\n    return d.rgb;\n  return e * d.rgb * d.a;\n}\n#ifdef HAS_SSR\nvarying vec4 vViewVertex;\nuniform mat3 modelViewNormalMatrix;\nuniform sampler2D TextureDepth;\nuniform highp vec2 outSize;\nuniform float ssrFactor;\nuniform float ssrQuality;\nuniform sampler2D TextureReflected;\nuniform highp mat4 projMatrix;\nuniform mat4 invProjMatrix;\nuniform vec4 outputFovInfo[2];\nuniform mat4 reprojViewProjMatrix;\nuniform vec2 cameraNearFar;\nfloat f(const in vec4 h) {\n  return h.r + h.g / 255.;\n}\nfloat i(const in vec2 j, const in float k) {\n  vec3 l = vec3(.06711056, .00583715, 52.9829189);\n  return fract(l.z * fract(dot(j.xy + k * vec2(47., 17.) * .695, l.xy))) * .5;\n}\nvec3 m(const in float n, const in float o, const in vec2 u) {\n  float v = min(o - .01, n);\n  float A = floor(v);\n  float B = min(o, A + 1.);\n  float C = pow(2., B);\n  vec2 D = 2. * C / u;\n  if(v - A > .5)\n    C *= 2.;\n  return vec3(D, C);\n}\nvec2 E(const in vec2 F, const in vec3 G) {\n  vec2 H = max(G.xy, min(1. - G.xy, F));\n  return vec2(2. * H.x, G.z - 1. - H.y) / G.z;\n}\nvec3 I(const in mat4 J, const in vec3 K) {\n  vec4 L = J * vec4(K, 1.);\n  return vec3(.5 + .5 * L.xy / L.w, L.w);\n}\nvec3 M(const in float N, const in vec2 H) {\n  return texture2D(TextureReflected, H).rgb;\n}\nfloat O(float P) {\n  highp mat4 J = projMatrix;\n  highp float z = P * 2. - 1.;\n  return -J[3].z / (z + J[2].z);\n}\nfloat Q(const vec2 H) {\n  float P = f(texture2D(TextureDepth, H));\n  return P;\n}\nvec3 R(const in float k, const in vec3 S, const in vec3 T, const in vec3 U, const in vec3 V, const in float W) {\n  vec2 X;\n  X.x = i(gl_FragCoord.yx, k);\n  X.y = fract(X.x * 52.9829189);\n  X.y = mix(X.y, 1., .7);\n  float Y = 2. * 3.14159 * X.x;\n  float Z = pow(max(X.y, .000001), W / (2. - W));\n  float ba = sqrt(1. - Z * Z);\n  vec3 bb = vec3(ba * cos(Y), ba * sin(Y), Z);\n  bb = bb.x * S + bb.y * T + bb.z * U;\n  return normalize((2. * dot(V, bb)) * bb - V);\n}\nfloat bc(const in float k) {\n  return (i(gl_FragCoord.xy, k) - .5);\n}\nvec3 bd(const in vec3 be, const in float bf, const in vec3 bg) {\n  vec3 bh = I(projMatrix, vViewVertex.xyz + bg * bf);\n  bh.z = 1. / bh.z;\n  bh -= be;\n  float bi = min(1., .99 * (1. - be.x) / max(1e-5, bh.x));\n  float bj = min(1., .99 * (1. - be.y) / max(1e-5, bh.y));\n  float bk = min(1., .99 * be.x / max(1e-5, -bh.x));\n  float bl = min(1., .99 * be.y / max(1e-5, -bh.y));\n  return bh * min(bi, bj) * min(bk, bl);\n}\nfloat bm(const in vec3 be, const in vec3 bh, inout float bn, inout float bo) {\n  float bp = (bo + bn) * .5;\n  vec3 bq = be + bh * bp;\n  float z = Q(bq.xy);\n  float P = O(z);\n  float br = -1. / bq.z;\n  bn = P > br ? bn : bp;\n  bo = P > br ? bp : bo;\n  return bp;\n}\nvec4 bs(const in vec3 be, const in float bf, in float bt, const in vec3 bg, const in float bu, const in float k) {\n  const int bv = 20;\n  float bw = 1. / float(bv);\n  bt *= bw;\n  vec3 bh = bd(be, bf, bg);\n  float bx = bw;\n  vec3 by = vec3(.0, bx, 1.);\n  vec3 bq;\n  float z, P, br, bz, bA, bB;\n  bool bC;\n  float bD = 1.;\n  float bp;\n  for(int bE = 0; bE < bv; bE++) {\n    bq = be + bh * by.y;\n    z = Q(bq.xy);\n    P = O(z);\n    br = -1. / bq.z;\n    bz = br - P;\n    bz *= clamp(sign(abs(bz) - bf * bw * bw), .0, 1.);\n    bC = abs(bz + bt) < bt;\n    bA = clamp(by.x / (by.x - bz), .0, 1.);\n    bB = bC ? by.y + bA * bw - bw : 1.;\n    by.z = min(by.z, bB);\n    by.x = bz;\n    if(bC) {\n      float bn = by.y - bw;\n      float bo = by.y;\n      bp = bm(be, bh, bn, bo);\n      bp = bm(be, bh, bn, bo);\n      bp = bm(be, bh, bn, bo);\n      bD = bp;\n      break;\n    }\n    by.y += bw;\n  }\n  return vec4(be + bh * bD, 1. - bD);\n}\nvec3 bF(in vec4 bG, const in float bH, const in vec3 bI, const in vec3 bJ, const in float bu) {\n  vec4 bK = mix(outputFovInfo[0], outputFovInfo[1], bG.x);\n  bG.xyz = vec3(mix(bK.xy, bK.zw, bG.y), 1.) * -1. / bG.z;\n  bG.xyz = (reprojViewProjMatrix * vec4(bG.xyz, 1.)).xyw;\n  bG.xy /= bG.z;\n  float bL = clamp(6. - 6. * max(abs(bG.x), abs(bG.y)), .0, 1.);\n  bG.xy = .5 + .5 * bG.xy;\n  return vec3(bG.xy, 1.);\n}\nvec3 ssr(const in vec3 bI, const in vec3 bJ, const in float bu, const in vec3 bM, const in vec3 V) {\n  float bN = .0;\n  vec4 bO = vec4(.0);\n  float W = bu * bu;\n  W = W * W;\n  vec3 bP = abs(bM.z) < .999 ? vec3(.0, .0, 1.) : vec3(1., .0, .0);\n  vec3 S = normalize(cross(bP, bM));\n  vec3 T = cross(bM, S);\n  float bH = ssrFactor * clamp(-4. * dot(V, bM) + 3.8, .0, 1.);\n  bH *= clamp(4.7 - bu * 5., .0, 1.);\n  vec3 be = I(projMatrix, vViewVertex.xyz);\n  be.z = 1. / be.z;\n  vec3 bg = R(bN, S, T, bM, V, W);\n  float bf = mix(cameraNearFar.y + vViewVertex.z, -vViewVertex.z - cameraNearFar.x, bg.z * .5 + .5);\n  float bt = .5 * bf;\n  vec4 bG;\n  if(dot(bg, bM) > .001 && bH > .0) {\n    bG = bs(be, bf, bt, bg, bu, bN);\n    if(bG.w > .0)\n      return bF(bG, bH, bI, bJ, bu);\n    \n  }\n  return vec3(.0);\n}\n#endif\nconst vec3 bQ = vec3(0., 0., 1.);\nuniform mat4 viewMatrix;\nuniform sampler2D normalTexture;\nuniform sampler2D heightTexture;\nuniform vec4 waveParams;\nuniform vec2 waterDir;\nuniform vec4 waterBaseColor;\nuniform vec3 lightDirection;\nuniform vec3 lightColor;\nuniform vec3 camPos;\nuniform float timeElapsed;\nvarying vec2 vUv;\nvarying vec2 vNoiseUv;\nvarying vec3 vPos;\nvarying mat3 vTbnMatrix;\nfloat bR(vec3 bS, float bT) {\n  float bU = max(.015, bT);\n  return max((bS.x + bS.y) * .3303545 / bU + .3303545, .0);\n}\nconst vec2 bV = vec2(6. / 25., 5. / 24.);\nvec2 bW(sampler2D bX, vec2 H) {\n  return 2. * texture2D(bX, H).rg - 1.;\n}\nfloat bY(vec2 H) {\n  return texture2D(heightTexture, H).b;\n}\nvec3 bZ(sampler2D bX, vec2 H) {\n  return 2. * texture2D(bX, H).rgb - 1.;\n}\nfloat ca(vec2 H, float cb) {\n  return fract(cb);\n}\nfloat cc(vec2 H, float cb) {\n  float cd = ca(H, cb);\n  return 1. - abs(1. - 2. * cd);\n}\nvec3 ce(sampler2D cf, vec2 H, float cb, float cg) {\n  float ch = waveParams[2];\n  float ci = waveParams[3];\n  vec2 cj = bW(cf, H) * ch;\n  float cd = ca(H, cb + cg);\n  float ck = cc(H, cb + cg);\n  vec2 bO = H;\n  bO -= cj * (cd + ci);\n  bO += cg;\n  bO += (cb - cd) * bV;\n  return vec3(bO, ck);\n}\nconst float cl = 7.77;\nvec3 cm(sampler2D cn, sampler2D co, vec2 cp, vec2 cq, float cb) {\n  float bT = waveParams[0];\n  vec2 cr = cb * -cq;\n  float cs = bY(vNoiseUv) * cl;\n  vec3 ct = ce(co, cp + cr, cb + cs, .0);\n  vec3 cu = ce(co, cp + cr, cb + cs, .5);\n  vec3 cv = bZ(cn, ct.xy) * ct.z;\n  vec3 cw = bZ(cn, cu.xy) * cu.z;\n  vec3 cx = normalize(cv + cw);\n  cx.xy *= bT;\n  cx.z = sqrt(1. - dot(cx.xy, cx.xy));\n  return cx;\n}\nvec4 cy(vec2 cp, float cz) {\n  float cA = waveParams[1];\n  vec3 bM = cm(normalTexture, heightTexture, cp * cA, waterDir, cz);\n  float cB = bR(bM, waveParams[0]);\n  return vec4(bM, cB);\n}\nconst float cC = 3.141592653589793;\nconst float cD = 1. / cC;\nconst float cE = .3183098861837907;\nconst float cF = 1.570796326794897;\nconst float cG = .4;\nfloat cH = 2.2;\nvec3 cI(float cJ, vec3 cK, float cL) {\n  return cK + (cL - cK) * pow(1. - cJ, 5.);\n}\nfloat cM(float cN, float bu) {\n  float cO = bu * bu;\n  float cP = cN * cN;\n  float cQ = pow((cP * (cO - 1.) + 1.), cH) * cC;\n  return cO / cQ;\n}\nfloat cR(float cS) {\n  return .25 / (cS * cS);\n}\nvec3 cT(const vec3 x) {\n  return (x * (2.51 * x + .03)) / (x * (2.43 * x + .59) + .14);\n}\nconst float cU = 2.2;\nconst float cV = .4545454545;\nvec4 cW(vec4 d) {\n  return vec4(pow(d.rgb, vec3(cV)), d.w);\n}\nvec3 cX(vec3 d) {\n  return pow(d, vec3(cU));\n}\nconst vec3 cY = vec3(.02, 1., 5.);\nconst vec2 cZ = vec2(.02, .1);\nconst float bu = .06;\nconst float da = 1.7;\nconst vec3 db = vec3(0, .6, .9);\nconst vec3 dc = vec3(.72, .92, 1.);\nconst float dd = .65;\nconst float de = 300000.0;\nconst float df = 500000.0;\nconst float dg = .775;\nconst float dh = .8;\nvec3 di(in vec3 bS, in vec3 dj) {\n  \n#ifdef HAS_IBL_LIGHTING\nvec3 dk = reflect(-dj, bS);\n  return c(textureCube(specularPBR, dk), rgbmRange);\n#else\nreturn ambientColor;\n#endif\n}\nPBRShadingWater dl;\nvec3 dm(in PBRShadingWater dn, float bu, vec3 dp, float dq) {\n  vec3 dr = cI(dn.VdotH, dp, dq);\n  float ds = cM(dn.NdotH, bu);\n  float dt = cR(dn.LdotH);\n  float du = mix(bu + .045, bu + .385, 1. - dn.VdotH);\n  float dv = 1.2;\n  float dw = cM(dn.NdotH, du) * dv;\n  return ((ds + dw) * dt) * dr;\n}\nvec3 dx(float da, float dy, vec3 db, float dz) {\n  return da * (.075 * db * pow(dy, 4.) + 50. * pow(dy, 23.)) * dz;\n}\nvec3 dA(in float Z, in vec3 dB, in vec3 dC) {\n  float dD = pow((1. - Z), cY[2]);\n  return mix(dC, dB, dD);\n}\nvec3 dE(in vec3 bS, in vec3 dj, in vec3 dF, vec3 d, in vec3 dG, in vec3 dH, in float dI, float dJ, vec3 dK) {\n  float dL = 0.;\n  vec3 dM = cX(d);\n  vec3 bb = normalize(dF + dj);\n  dl.NdotL = clamp(dot(bS, dF), .0, 1.);\n  dl.NdotV = clamp(dot(bS, dj), .001, 1.);\n  dl.VdotN = clamp(dot(dj, bS), .001, 1.);\n  dl.NdotH = clamp(dot(bS, bb), .0, 1.);\n  dl.VdotH = clamp(dot(dj, bb), .0, 1.);\n  dl.LdotH = clamp(dot(dF, bb), .0, 1.);\n  float dN = max(dot(dH, dj), .0);\n  vec3 dO = cX(dc);\n  vec3 dP = cX(db);\n  vec3 dc = dA(dN, dO, dP);\n  float dQ = max(dot(dH, dF), .0);\n  float dR = .1 + dQ * .9;\n  dc *= dR;\n  float dS = clamp(dI, .8, 1.);\n  vec3 dT = cI(dl.VdotN, vec3(cY[0]), cY[1]);\n  vec3 dU = dT * dc * dS;\n  vec3 dV = dM * mix(dc, dQ * dG * cD, 2. / 3.) * dS;\n  vec3 dW = vec3(.0);\n  if(dN > .0 && dQ > .0) {\n    vec3 dX = dm(dl, bu, vec3(cZ[0]), cZ[1]);\n    vec3 dY = dG * cD * dI;\n    dW = dl.NdotL * dY * dX;\n  }\n  vec3 cB = vec3(.0);\n  if(dN > .0) {\n    cB = dx(da, dJ, db, dR);\n  }\n  vec3 dZ = vec3(.0);\n#ifdef HAS_SSR\nfloat ea = smoothstep(df, de, -dK.z);\n  mat4 eb = viewMatrix;\n  vec4 ec = vec4(dK.xyz, 1.);\n  vec3 ed = normalize(ec.xyz);\n  vec4 ee = eb * vec4(bS, .0);\n  vec3 ef = normalize(ee.xyz);\n  vec4 eg = eb * vec4(dH, .0);\n  float eh = pow(max(dot(-ed, eg.xyz), .0), cG);\n  vec3 ei = mix(eg.xyz, ef, eh);\n  vec3 ej = ssr(vec3(.0), vec3(1.), bu, normalize(ei), -normalize(vViewVertex.xyz));\n  if(ej.z > .0) {\n    vec2 ek = smoothstep(.3, .6, abs(vec2(.5) - ej.xy));\n    dL = dg * clamp(1. - 1.3 * ek.y, .0, 1.) * ea;\n    vec3 el = M(.0, ej.xy);\n    dZ = cX(el) * dL * dT.y * dd;\n  }\n#endif\nfloat em = mix(dh, dh * .5, dL);\n  return cT((1. - dL) * dU + dZ + dV * em + dW + cB);\n}\nvoid main() {\n  vec3 dH = bQ;\n  vec4 en = cy(vUv, timeElapsed);\n  vec3 bS = normalize(vTbnMatrix * en.xyz);\n  vec3 dj = -normalize(vPos - camPos);\n  vec3 dF = normalize(-lightDirection);\n#if defined(HAS_SHADOWING)\nfloat dI = shadow_computeShadow();\n#else\nfloat dI = 1.;\n#endif\nvec4 eo = viewMatrix * vec4(vPos, 1.);\n  vec4 ep = vec4(dE(bS, dj, dF, waterBaseColor.rgb, lightColor, dH, dI, en.w, eo.xyz), waterBaseColor.a);\n  gl_FragColor = cW(ep);\n  if(contrast != 1.) {\n    gl_FragColor = contrastMatrix(contrast) * gl_FragColor;\n  }\n  if(length(hsv) > .0) {\n    gl_FragColor = hsv_apply(gl_FragColor, hsv);\n  }\n}",
                 defines: r,
@@ -12120,10 +12126,10 @@
             };
             return this.setIncludeUniformValues(i, e), i;
         }
-        bo(t, e) {
+        wo(t, e) {
             const {iblTexes: n} = this.getIBLRes(), i = t.projViewMatrix, r = t.getLightManager();
             let s = r && r.getDirectionalLight() || {};
-            const o = r && r.getAmbientLight() || {}, a = this.getSymbol(wl), l = this.Fo = this.Fo || [], h = {
+            const o = r && r.getAmbientLight() || {}, a = this.getSymbol(wl), l = this.Io = this.Io || [], h = {
                 hdrHsv: o.hsv || [ 0, 0, 0 ],
                 specularPBR: n && n.prefilterMap,
                 rgbmRange: n && n.rgbmRange,
@@ -12137,8 +12143,8 @@
                 lightColor: s.color || bl.color,
                 camPos: t.cameraPosition,
                 timeElapsed: a.animation ? (this.layer.getRenderer().getFrameTimestamp() || 0) / (1 / (a.waterSpeed || 1) * 1e4) : 0,
-                normalTexture: this.Po || this.So,
-                heightTexture: this.Oo || this.So,
+                normalTexture: this.To || this.ko,
+                heightTexture: this.Fo || this.ko,
                 waveParams: [ .09, a.uvScale || 3, .03, -.5 ],
                 waterDir: Ml(l, a.waterDirection || 0),
                 waterBaseColor: a.waterBaseColor || [ .1451, .2588, .4863, 1 ],
@@ -12149,24 +12155,24 @@
             h;
         }
         delete() {
-            super.delete(), this.So && (this.So.destroy(), delete this.So), this.Po && this.Po.destroy(), 
-            this.Oo && this.Oo.destroy(), this.shader && this.shader.dispose(), this.wo && this.wo.dispose(), 
-            this._o && (this._o.geometry.dispose(), this._o.material && this._o.material.dispose(), 
-            this._o.dispose(), delete this._o), this.disposeIBLTextures();
+            super.delete(), this.ko && (this.ko.destroy(), delete this.ko), this.To && this.To.destroy(), 
+            this.Fo && this.Fo.destroy(), this.shader && this.shader.dispose(), this.Ao && this.Ao.dispose(), 
+            this.Mo && (this.Mo.geometry.dispose(), this.Mo.material && this.Mo.material.dispose(), 
+            this.Mo.dispose(), delete this.Mo), this.disposeIBLTextures();
         }
         createGround() {
             const t = new n.reshader.Plane;
             t.data.aTexCoord = new Uint8Array([ 0, 1, 1, 1, 0, 0, 1, 0 ]), t.generateBuffers(this.renderer.regl), 
-            this._o = new n.reshader.Mesh(t, null, {
+            this.Mo = new n.reshader.Mesh(t, null, {
                 castShadow: !1
-            }), this.Ao = new n.reshader.Scene([ this._o ]);
+            }), this._o = new n.reshader.Scene([ this.Mo ]);
         }
         transformWater() {
-            const t = this.getMap(), e = n.GroundPainter.getGroundTransform(this._o.localTransform, t);
-            this._o.setLocalTransform(e);
-            const i = t._get2DExtentAtRes(t.getGLRes()), r = i.getWidth(), s = i.getHeight(), o = t.cameraLookAt, a = o[0] - r, l = o[1] + s, h = this.ko, c = a / h[0], u = l / h[1], f = c % 1, d = u % 1, p = .3737 * c % 1, y = .3737 * u % 1, m = i.getWidth() / h[0] * 2, g = i.getHeight() / h[1] * 2;
-            this._o.setUniform("uvOffset", [ f, d ]), this._o.setUniform("noiseUvOffset", [ p, y ]), 
-            this._o.setUniform("uvScale", [ m, -g ]);
+            const t = this.getMap(), e = n.GroundPainter.getGroundTransform(this.Mo.localTransform, t);
+            this.Mo.setLocalTransform(e);
+            const i = t._get2DExtentAtRes(t.getGLRes()), r = i.getWidth(), s = i.getHeight(), o = t.cameraLookAt, a = o[0] - r, l = o[1] + s, h = this.Po, c = a / h[0], u = l / h[1], f = c % 1, d = u % 1, p = .3737 * c % 1, y = .3737 * u % 1, m = i.getWidth() / h[0] * 2, g = i.getHeight() / h[1] * 2;
+            this.Mo.setUniform("uvOffset", [ f, d ]), this.Mo.setUniform("noiseUvOffset", [ p, y ]), 
+            this.Mo.setUniform("uvScale", [ m, -g ]);
         }
     }
     function Ml(t, e) {
@@ -12197,7 +12203,7 @@
     Hl.registerAt(Qi);
     const Dl = ts("gltf-lit", xl);
     Dl.registerAt(Qi);
-    const Rl = ts("heatmap", class extends Vs {
+    const Ll = ts("heatmap", class extends Vs {
         createFnTypeConfig(t, e) {
             const n = M(e.heatWeight), i = new Int16Array(1);
             return [ {
@@ -12238,7 +12244,7 @@
             o;
         }
         callRenderer(t, e) {
-            this.Io.render(this.scene, t, this.getRenderFBO(e));
+            this.Co.render(this.scene, t, this.getRenderFBO(e));
         }
         getUniformValues(t) {
             const {projViewMatrix: e} = t;
@@ -12252,7 +12258,7 @@
             return this.scene.getMeshes();
         }
         delete() {
-            super.delete(...arguments), this.Io.dispose(), delete this.Io;
+            super.delete(...arguments), this.Co.dispose(), delete this.Co;
         }
         init() {
             const t = this.regl;
@@ -12271,14 +12277,14 @@
                     zpass: "replace"
                 }
             }, r = this.getPolygonOffset(), s = this.getSymbols()[0];
-            this.Io = new n.HeatmapProcess(this.regl, this.sceneConfig, this.layer, s.heatmapColor, i, r);
+            this.Co = new n.HeatmapProcess(this.regl, this.sceneConfig, this.layer, s.heatmapColor, i, r);
         }
     });
-    Rl.registerAt(Qi);
-    const Ll = ts("water", _l);
-    Ll.registerAt(Qi), cr.registerPainter("lit", ll), cr.registerPainter("icon", ya), 
+    Ll.registerAt(Qi);
+    const Rl = ts("water", _l);
+    Rl.registerAt(Qi), cr.registerPainter("lit", ll), cr.registerPainter("icon", ya), 
     cr.registerPainter("fill", Ws), cr.registerPainter("line", Xs), cr.registerPainter("line-gradient", qs), 
-    cr.registerPainter("water", _l), Qi.VERSION = "0.63.7", cr.VERSION = "0.63.7";
+    cr.registerPainter("water", _l), Qi.VERSION = "0.63.8", cr.VERSION = "0.63.8";
     if (s.mat4.create(), s.transcoders) {
         const t = r.Map.VERSION;
         if (t.indexOf("1.0.0-beta") >= 0 || t.indexOf("1.0.0-alpha") >= 0) {
@@ -12289,14 +12295,14 @@
         }));
     } else r.registerWorkerAdapter("@maptalks/vt", o);
     t.FillPainter = Ws, t.FillPlugin = Sl, t.GLTFPhongPlugin = Hl, t.GLTFStandardPlugin = Dl, 
-    t.GeoJSONVectorTileLayer = ar, t.HeatmapPlugin = Rl, t.IconPainter = ya, t.IconPlugin = Tl, 
+    t.GeoJSONVectorTileLayer = ar, t.HeatmapPlugin = Ll, t.IconPainter = ya, t.IconPlugin = Tl, 
     t.LineGradientPlugin = Pl, t.LinePainter = Xs, t.LinePlugin = kl, t.LineStringLayer = Ir, 
     t.LitPlugin = El, t.MapboxVectorTileLayer = sr, t.NativeLinePainter = Za, t.NativeLinePlugin = Fl, 
     t.NativePointPainter = Ya, t.PackUtil = Pi, t.PhongPainter = il, t.PhongPlugin = Il, 
     t.PointLayer = Fr, t.PolygonLayer = Cr, t.SYMBOLS_NEED_REBUILD_IN_VECTOR = Fi, t.SYMBOLS_NEED_REBUILD_IN_VT = Oi, 
     t.TextPainter = Ua, t.TextPlugin = Ol, t.Vector3DLayer = cr, t.VectorTileLayer = Qi, 
-    t.VectorTileLayerRenderer = ji, t.WaterPlugin = Ll, t.WireframePainter = sl, t.WireframePlugin = Cl, 
+    t.VectorTileLayerRenderer = ji, t.WaterPlugin = Rl, t.WireframePainter = sl, t.WireframePlugin = Cl, 
     Object.defineProperty(t, "t", {
         value: !0
-    }), "undefined" != typeof console && console.log("@maptalks/vt v0.63.7");
+    }), "undefined" != typeof console && console.log("@maptalks/vt v0.63.8");
 }));