@maptalks/vt 0.86.1 → 0.86.2

package/dist/maptalks.vt.es.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/vt v0.86.1
+ * @maptalks/vt v0.86.2
  * LICENSE : undefined
  * (c) 2016-2023 maptalks.org
  */
@@ -2296,6 +2296,12 @@ class ee extends t.OverlayLayer {
     static get3DPainterClass(t) {
         return ee.painters[t];
     }
+    onConfig(t) {
+        if (super.onConfig(t), void 0 !== t.enableBloom) {
+            const e = this.getRenderer();
+            e && e.updateBloom(t.enableBloom);
+        }
+    }
     updateSymbol(t, e) {
         if (!this.options.style) throw new Error("can't call update symbol when style is not set");
         const n = Array.isArray(this.options.style) ? this.options.style : this.options.style.style;
@@ -2382,17 +2388,17 @@ ee.mergeOptions({
 const ne = {
     markerFile: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerFile"
     },
     markerWidth: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerWidth"
     },
     markerHeight: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerHeight"
     },
     markerPathWidth: {
@@ -2407,62 +2413,62 @@ const ne = {
     },
     markerDx: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerDx"
     },
     markerDy: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerDy"
     },
     markerType: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerType"
     },
     markerPath: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerPath"
     },
     markerFill: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerFill"
     },
     markerFillPatternFile: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerFillPatternFile"
     },
     markerFillOpacity: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerFillOpacity"
     },
     markerLineColor: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerLineColor"
     },
     markerLineWidth: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerLineWidth"
     },
     markerLineOpacity: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerLineOpacity"
     },
     markerLineDasharray: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerLineDasharray"
     },
     markerLinePatternFile: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_markerLinePatternFile"
     },
     markerVerticalAlignment: {
@@ -2528,57 +2534,57 @@ const ne = {
 }, ie = {
     textName: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textName"
     },
     textFaceName: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textFaceName"
     },
     textWeight: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textWeight"
     },
     textStyle: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textStyle"
     },
     textWrapWidth: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textWrapWidth"
     },
     textHorizontalAlignment: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textHorizontalAlignment"
     },
     textVerticalAlignment: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textVerticalAlignment"
     },
     textFill: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textFill"
     },
     textSize: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textSize"
     },
     textHaloRadius: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textHaloRadius"
     },
     textHaloFill: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textHaloFill"
     },
     textHaloOpacity: {
@@ -2588,12 +2594,12 @@ const ne = {
     },
     textDx: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textDx"
     },
     textDy: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_textDy"
     },
     textOpacity: {
@@ -2669,7 +2675,7 @@ const ne = {
     },
     linePatternFile: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_linePatternFile"
     },
     linePatternAnimSpeed: {
@@ -2689,22 +2695,22 @@ const ne = {
     },
     lineJoin: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_lineJoin"
     },
     lineCap: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_lineCap"
     },
     lineDasharray: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_lineDasharray"
     },
     lineDashColor: {
         type: "identity",
-        default: void 0,
+        default: null,
         property: "_symbol_lineDashColor"
     }
 }, oe = new t.Point(0, 0), se = "_vector3dlayer_id", ae = "_line_gradient_property".trim();
@@ -2808,14 +2814,14 @@ class me extends t.renderer.CanvasRenderer {
         this.De = {}, this.Ne = {}, this.Le = {}, this.He = !0, this.Ve = {
             id: 0,
             pickingId: 0
-        }, this.Ue = Z({}, ne, ie), this.Ge = {};
+        }, this.Ue = {};
     }
     hasNoAARendering() {
         return !0;
     }
     needToRedraw() {
         const t = super.needToRedraw();
-        return t || (this.painter && this.painter.needToRedraw() || this.We && this.We.needToRedraw() || this.Be && this.Be.needToRedraw());
+        return t || (this.painter && this.painter.needToRedraw() || this.Ge && this.Ge.needToRedraw() || this.We && this.We.needToRedraw());
     }
     getAnalysisMeshes() {
         return pe;
@@ -2827,33 +2833,33 @@ class me extends t.renderer.CanvasRenderer {
         this.dt = t;
         const n = this.layer;
         this.prepareCanvas(), this.pt = this.yt(this.getMap().getGLRes()), this.gt = e || {};
-        const i = this.gt.renderMode, r = this.qe();
-        if (this.vt(r, i), this.He) this.buildMesh(), this.Xe(), this.$e(), this.Ge = {}, 
-        this.Ye = !1, this.He = !1, this.Je = !1; else if (this.Ye) {
-            const t = this.atlas, e = this.Ze, n = this.Ke;
-            delete this.atlas, delete this.Ze, delete this.Ke, this.buildMesh(t), this.Xe(e), 
-            this.$e(n), this.Ye = !1, this.Je = !1;
-        } else if (this.Je) {
-            const t = this.Ke;
-            delete this.Ke, this.$e(t), this.Je = !1;
-        }
-        if (!this.meshes && !this.Qe && !this.tn) return void this.completeRender();
-        this.en && (this.nn(), this.en = !1), this.in();
+        const i = this.gt.renderMode, r = this.Be();
+        if (this.vt(r, i), this.He) this.buildMesh(), this.qe(), this.Xe(), this.Ue = {}, 
+        this.$e = !1, this.He = !1, this.Ye = !1; else if (this.$e) {
+            const t = this.atlas, e = this.Je, n = this.Ze;
+            delete this.atlas, delete this.Je, delete this.Ze, this.buildMesh(t), this.qe(e), 
+            this.Xe(n), this.$e = !1, this.Ye = !1;
+        } else if (this.Ye) {
+            const t = this.Ze;
+            delete this.Ze, this.Xe(t), this.Ye = !1;
+        }
+        if (!this.meshes && !this.Ke && !this.Qe) return void this.completeRender();
+        this.tn && (this.en(), this.tn = !1), this.nn();
         const o = !i || "default" === i;
-        let s = this.tn && (o || this.Be.supportRenderMode(i)) ? 2 : 1;
-        if (0 === this.layer.options.meshRenderOrder && this.rn(r, s--, i), this.tn && (o || this.Be.supportRenderMode(i)) && (this.Be.startFrame(r), 
-        this.Be.addMesh(this.tn, null, {
+        let s = this.Qe && (o || this.We.supportRenderMode(i)) ? 2 : 1;
+        if (0 === this.layer.options.meshRenderOrder && this.in(r, s--, i), this.Qe && (o || this.We.supportRenderMode(i)) && (this.We.startFrame(r), 
+        this.We.addMesh(this.Qe, null, {
             bloom: this.gt.bloom
-        }), this.Be.prepareRender(r), r.polygonOffsetIndex = s--, this.Be.render(r)), 1 === this.layer.options.meshRenderOrder && this.rn(r, s--, i), 
-        this.Qe && (o || this.We.supportRenderMode(i))) {
-            const e = !this.gt.timestamp || this.gt.isFinalRender, i = !this.sn || this.sn !== t;
+        }), this.We.prepareRender(r), r.polygonOffsetIndex = s--, this.We.render(r)), 1 === this.layer.options.meshRenderOrder && this.in(r, s--, i), 
+        this.Ke && (o || this.Ge.supportRenderMode(i))) {
+            const e = !this.gt.timestamp || this.gt.isFinalRender, i = !this.rn || this.rn !== t;
             n.options.collision && i && n.clearCollisionIndex();
             const o = this.layer.options.sceneConfig;
-            this.We.sceneConfig.collision = !o || (!!et(o.collision) || o.collision), this.We.startFrame(r), 
-            this.We.addMesh(this.Qe, null, {
+            this.Ge.sceneConfig.collision = !o || (!!et(o.collision) || o.collision), this.Ge.startFrame(r), 
+            this.Ge.addMesh(this.Ke, null, {
                 bloom: this.gt.bloom
-            }), this.We.prepareRender(r), n.options.collision && i && (this.We.updateCollision(r), 
-            e && (this.sn = t)), this.We.render(r);
+            }), this.Ge.prepareRender(r), n.options.collision && i && (this.Ge.updateCollision(r), 
+            e && (this.rn = t)), this.Ge.render(r);
         }
         (o || e && e.isFinalRender) && (this.completeRender(), this.layer.fire("canvasisdirty"));
     }
@@ -2861,7 +2867,7 @@ class me extends t.renderer.CanvasRenderer {
         const n = !e || "default" === e;
         this.painter && (n || this.painter.supportRenderMode(e)) && this.painter.startFrame(t);
     }
-    rn(t, e, n) {
+    in(t, e, n) {
         const i = !n || "default" === n;
         this.painter && this.meshes && (i || this.painter.supportRenderMode(n)) && (this.painter.addMesh(this.meshes, null, {
             bloom: t && t.bloom
@@ -2873,11 +2879,11 @@ class me extends t.renderer.CanvasRenderer {
     isForeground() {
         return !0;
     }
-    qe() {
+    Be() {
         const t = {
             regl: this.regl,
             layer: this.layer,
-            symbol: this.an,
+            symbol: this.sn,
             gl: this.gl,
             sceneConfig: this.layer.options.sceneConfig,
             pluginIndex: 0,
@@ -2892,7 +2898,7 @@ class me extends t.renderer.CanvasRenderer {
     getFrameTimestamp() {
         return this.dt;
     }
-    ln(t, e) {
+    an(t, e) {
         (t = t || e) === e && (e = null);
         const n = [], i = [ 0, 0, 0, 0 ];
         this.layer._sortGeometries();
@@ -2903,18 +2909,18 @@ class me extends t.renderer.CanvasRenderer {
             const a = this.features[s];
             if (Array.isArray(a)) for (let r = 0; r < a.length; r++) {
                 const o = a[r], s = o[fe];
-                (!t || t[s] || e && (!e || e[s])) && (o.visible || (this.en = !0), this.hn(o.geometry, i), 
+                (!t || t[s] || e && (!e || e[s])) && (o.visible || (this.tn = !0), this.ln(o.geometry, i), 
                 n.push(o));
             } else {
-                a.visible || (this.en = !0);
+                a.visible || (this.tn = !0);
                 const r = a[fe];
                 if (t && !t[r] && (!e || e && !e[r])) continue;
-                this.hn(a.geometry, i), n.push(a);
+                this.ln(a.geometry, i), n.push(a);
             }
         }
         if (n.length || (this.meshes && this.painter && (this.painter.deleteMesh(this.meshes), 
-        delete this.meshes), this.Qe && (this.We.deleteMesh(this.Qe), delete this.Qe), this.tn && (this.Be.deleteMesh(this.tn), 
-        delete this.tn)), i[3] && (i[0] /= i[3], i[1] /= i[3]), isNaN(i[0]) || isNaN(i[1])) throw new Error("invalid geometry coordinates for " + this.layer.getJSONType());
+        delete this.meshes), this.Ke && (this.Ge.deleteMesh(this.Ke), delete this.Ke), this.Qe && (this.We.deleteMesh(this.Qe), 
+        delete this.Qe)), i[3] && (i[0] /= i[3], i[1] /= i[3]), isNaN(i[0]) || isNaN(i[1])) throw new Error("invalid geometry coordinates for " + this.layer.getJSONType());
         return {
             features: n,
             center: i
@@ -2933,12 +2939,12 @@ class me extends t.renderer.CanvasRenderer {
         }).load();
     }
     createMesh(t, e, n, i, r, o) {
-        return this.createVectorPacks(t, e, n, i, r, o).then(s => this.cn(s, t, e, n, i, r, o));
+        return this.createVectorPacks(t, e, n, i, r, o).then(s => this.hn(s, t, e, n, i, r, o));
     }
-    cn(t, e, n, o, s, a, l) {
+    hn(t, e, n, o, s, a, l) {
         if (!t) return null;
         const h = e.createGeometries([ t.data ], vt(s, null, 0, o, this.layer));
-        for (let t = 0; t < h.length; t++) h[t] && this.un(h[t].geometry);
+        for (let t = 0; t < h.length; t++) h[t] && this.cn(h[t].geometry);
         const c = r.identity([]);
         r.translate(c, c, i.set([], l[0], l[1], 0)), r.scale(c, c, i.set([], 1, 1, this.pt));
         const u = e.createMeshes(h, c, {
@@ -2957,13 +2963,13 @@ class me extends t.renderer.CanvasRenderer {
             }
         };
     }
-    hn(t, e) {
+    ln(t, e) {
         for (let n = 0; n < t.length; n++) if (Array.isArray(t[n][0])) for (let i = 0; i < t[n].length; i++) if (Array.isArray(t[n][i][0])) for (let r = 0; r < t[n][i].length; r++) isNaN(+t[n][i][r][0]) || isNaN(+t[n][i][r][1]) || (e[0] += t[n][i][r][0], 
         e[1] += t[n][i][r][1], e[3] += 1); else isNaN(+t[n][i][0]) || isNaN(+t[n][i][1]) || (e[0] += t[n][i][0], 
         e[1] += t[n][i][1], e[3] += 1); else isNaN(+t[n][0]) || isNaN(+t[n][1]) || (e[0] += t[n][0], 
         e[1] += t[n][1], e[3] += 1);
     }
-    un(t) {
+    cn(t) {
         const e = this.getMap(), n = t.properties;
         Object.defineProperty(n, "tileResolution", {
             enumerable: !0,
@@ -2972,7 +2978,7 @@ class me extends t.renderer.CanvasRenderer {
             }
         }), n.tileRatio = 1, n.z = 1, n.tileExtent = 1, n.elements = t.elements, n.aPickingId = t.data.aPickingId;
     }
-    dn(t) {
+    un(t) {
         return "win-intel-gpu-crash" === t && (this.layer.options.workarounds["win-intel-gpu-crash"] && ge(this.gl));
     }
     prepareRequestors() {
@@ -2981,12 +2987,12 @@ class me extends t.renderer.CanvasRenderer {
         this.h = new v({
             iconErrorUrl: t.options.iconErrorUrl
         });
-        const e = !this.dn("win-intel-gpu-crash");
+        const e = !this.un("win-intel-gpu-crash");
         this.u = new b(e => {
             t.getMap().getRenderer().callInNextFrame(e);
-        }, t.options.glyphSdfLimitPerFrame, e), this.requestor = this.pn.bind(this), this.mn = this.yn.bind(this);
+        }, t.options.glyphSdfLimitPerFrame, e), this.requestor = this.dn.bind(this), this.pn = this.mn.bind(this);
     }
-    pn(t, e, n) {
+    dn(t, e, n) {
         const i = [];
         this.h.getIcons(t, (t, e) => {
             if (t) throw t;
@@ -2995,7 +3001,7 @@ class me extends t.renderer.CanvasRenderer {
             }, i);
         });
     }
-    yn(t, e, n) {
+    mn(t, e, n) {
         this.u.getGlyphs(e, (e, i) => {
             if (e) throw e;
             const r = i.buffers || [];
@@ -3008,42 +3014,42 @@ class me extends t.renderer.CanvasRenderer {
             });
         });
     }
-    Xe(t) {
+    qe(t) {
         const e = Object.keys(this.De), n = Object.keys(this.Ne);
-        if (!e.length && !n.length) return void (this.Qe && (this.We.deleteMesh(this.Qe), 
-        delete this.Qe));
-        const {features: o, center: s} = this.ln(this.De, this.Ne), a = [], l = [];
+        if (!e.length && !n.length) return void (this.Ke && (this.Ge.deleteMesh(this.Ke), 
+        delete this.Ke));
+        const {features: o, center: s} = this.an(this.De, this.Ne), a = [], l = [];
         for (let t = 0; t < o.length; t++) {
             const e = o[t][fe];
             this.De[e] && a.push(o[t]), this.Ne[e] && l.push(o[t]);
         }
-        if (!a.length && !l.length) return void (this.Qe && (this.We.deleteMesh(this.Qe), 
-        delete this.Qe));
-        const h = this.en;
-        this.gn = s;
-        const c = this.vn(a, l, t, s);
-        this.Ze = {};
+        if (!a.length && !l.length) return void (this.Ke && (this.Ge.deleteMesh(this.Ke), 
+        delete this.Ke));
+        const h = this.tn;
+        this.yn = s;
+        const c = this.gn(a, l, t, s);
+        this.Je = {};
         const u = [], f = [];
-        this.bn = !0, Promise.all(c).then(t => {
-            if (this.Qe && (this.We.deleteMesh(this.Qe), delete this.Qe), !t || !t.length) return void this.setToRedraw();
-            const e = this.We.createGeometries(t.map(t => (t && t.data && (t.data.isIdUnique = !0), 
+        this.vn = !0, Promise.all(c).then(t => {
+            if (this.Ke && (this.Ge.deleteMesh(this.Ke), delete this.Ke), !t || !t.length) return void this.setToRedraw();
+            const e = this.Ge.createGeometries(t.map(t => (t && t.data && (t.data.isIdUnique = !0), 
             t && t.data)), this.je);
-            for (let n = 0; n < e.length; n++) this.un(e[n].geometry, t[n] && t[n].data);
+            for (let n = 0; n < e.length; n++) this.cn(e[n].geometry, t[n] && t[n].data);
             const n = t[0] && t[0].data.iconAtlas, o = t[0] && t[0].data.glyphAtlas || t[1] && t[1].data.glyphAtlas;
-            n && (this.Ze.iconAtlas = n), o && (this.Ze.glyphAtlas = o);
+            n && (this.Je.iconAtlas = n), o && (this.Je.glyphAtlas = o);
             const a = r.identity([]);
             r.translate(a, a, i.set(f, s[0], s[1], 0)), r.scale(a, a, i.set(u, 1, 1, this.pt));
-            const l = this.We.createMeshes(e, a);
+            const l = this.Ge.createMeshes(e, a);
             for (let t = 0; t < l.length; t++) l[t].geometry.properties.originElements = l[t].geometry.properties.elements.slice(), 
             l[t].properties.level = 0, l[t].material.set("flipY", 1), l[t].properties.meshKey = ce++;
-            this.Qe = l, h && (this.en = !0), this.bn = !1, this.setToRedraw(), this.layer.fire("buildmarkermesh");
+            this.Ke = l, h && (this.tn = !0), this.vn = !1, this.setToRedraw(), this.layer.fire("buildmarkermesh");
         });
     }
-    nn() {
-        if (this.Qe && (this.xn(this.Qe[0], this.De), this.xn(this.Qe[1], this.Ne)), this.tn) for (let t = 0; t < this.tn.length; t++) this.xn(this.tn[t], this.Le);
-        if (this.meshes) for (let t = 0; t < this.meshes.length; t++) this.xn(this.meshes[t], this.je);
+    en() {
+        if (this.Ke && (this.bn(this.Ke[0], this.De), this.bn(this.Ke[1], this.Ne)), this.Qe) for (let t = 0; t < this.Qe.length; t++) this.bn(this.Qe[t], this.Le);
+        if (this.meshes) for (let t = 0; t < this.meshes.length; t++) this.bn(this.meshes[t], this.je);
     }
-    xn(t, e) {
+    bn(t, e) {
         if (!t) return;
         const {aPickingId: n, originElements: i} = t.geometry.properties, r = [];
         for (let t = 0; t < i.length; t++) {
@@ -3053,11 +3059,11 @@ class me extends t.renderer.CanvasRenderer {
         const o = t.geometry.properties.elements = new i.constructor(r);
         t.geometry.setElements(o);
     }
-    vn(t, e, n, i) {
+    gn(t, e, n, i) {
         const r = {
             zoom: this.getMap().getZoom(),
             EXTENT: 1 / 0,
-            requestor: this.mn,
+            requestor: this.pn,
             atlas: n,
             center: i,
             positionType: Float32Array,
@@ -3067,14 +3073,14 @@ class me extends t.renderer.CanvasRenderer {
             markerHeightType: Uint16Array
         }, o = Z({}, r);
         r.allowEmptyPack = 1;
-        return A.splitPointSymbol(this.Ue).map((n, i) => new A(0 === i ? t : e, n, 0 === i ? r : o).load());
+        return A.splitPointSymbol(this.xn).map((n, i) => new A(0 === i ? t : e, n, 0 === i ? r : o).load());
     }
     updateMesh() {}
     wn(t) {
         const e = t._getInternalSymbol(), n = {
             zoom: this.getMap().getZoom()
         }, i = this.An(t);
-        if (!this.Qe) return !1;
+        if (!this.Ke) return !1;
         let r = this.features[i];
         Array.isArray(r) || (r = [ r ]);
         const o = [], s = [], a = [], l = this.getMap().getZoom();
@@ -3084,14 +3090,14 @@ class me extends t.renderer.CanvasRenderer {
         for (let t = 0; t < r.length; t++) {
             if (!r[t]) continue;
             const i = Array.isArray(e) ? e[t] : e, o = Array.isArray(h) ? h[t] : h, s = Array.isArray(c) ? c[t] : c, a = new _(r, i, o, s, n).getIconAndGlyph();
-            if (!this.Ze || !A.isAtlasLoaded(a, this.Ze)) return this.kn(), this.setToRedraw(), 
+            if (!this.Je || !A.isAtlasLoaded(a, this.Je)) return this.kn(), this.setToRedraw(), 
             !1;
         }
         for (let t = 0; t < r.length; t++) {
             const e = r[t][fe];
             this.De[e] && s.push(r[t]), this.Ne[e] && a.push(r[t]);
         }
-        const u = r[0].id, f = this.vn(s, a, this.Ze, this.gn), d = this.Qe;
+        const u = r[0].id, f = this.gn(s, a, this.Je, this.yn), d = this.Ke;
         return Promise.all(f).then(t => {
             for (let e = 0; e < t.length; e++) {
                 if (!t[e]) continue;
@@ -3110,7 +3116,7 @@ class me extends t.renderer.CanvasRenderer {
         }), !0;
     }
     _n(t) {
-        return this.Tn(t, this.tn, this.Ke, this.Sn, this.Be, T, re, this.Mn);
+        return this.Tn(t, this.Qe, this.Ze, this.Sn, this.We, T, re, this.Mn);
     }
     Tn(t, e, n, i, r, o, s, a) {
         if (!e) return !1;
@@ -3167,16 +3173,16 @@ class me extends t.renderer.CanvasRenderer {
             this.layer.fire("updatemesh"), this.setToRedraw();
         }
     }
-    $e(t) {
-        if (!Object.keys(this.Le).length) return void (this.tn && (this.Be.deleteMesh(this.tn), 
-        delete this.tn));
-        const {features: e, center: n} = this.ln(this.Le);
+    Xe(t) {
+        if (!Object.keys(this.Le).length) return void (this.Qe && (this.We.deleteMesh(this.Qe), 
+        delete this.Qe));
+        const {features: e, center: n} = this.an(this.Le);
         if (!e.length) return;
-        const i = this.en;
+        const i = this.tn;
         this.Sn = n;
-        const r = this.Mn(e), o = Z({}, re), s = r.map((e, i) => this.createMesh(this.Be, T, o, e, t && t[i], n));
+        const r = this.Mn(e), o = Z({}, re), s = r.map((e, i) => this.createMesh(this.We, T, o, e, t && t[i], n));
         this.In = !0, Promise.all(s).then(t => {
-            this.tn && this.Be.deleteMesh(this.tn);
+            this.Qe && this.We.deleteMesh(this.Qe);
             const e = [], n = [];
             for (let i = 0; i < t.length; i++) {
                 const r = t[i] && t[i].meshes;
@@ -3188,7 +3194,7 @@ class me extends t.renderer.CanvasRenderer {
                     n[i] = t[i].atlas;
                 }
             }
-            this.tn = e, this.Ke = n, i && (this.en = i), this.In = !1, this.setToRedraw(), 
+            this.Qe = e, this.Ze = n, i && (this.tn = i), this.In = !1, this.setToRedraw(), 
             this.layer.fire("buildlinemesh");
         });
     }
@@ -3201,7 +3207,7 @@ class me extends t.renderer.CanvasRenderer {
         return [ i, r, o ];
     }
     On() {
-        this.Ye = !0, this.setToRedraw();
+        this.$e = !0, this.setToRedraw();
     }
     kn() {
         this.He = !0, this.setToRedraw();
@@ -3263,7 +3269,7 @@ class me extends t.renderer.CanvasRenderer {
     pick(t, e, n) {
         const i = [];
         if (!this.layer.isVisible()) return i;
-        return [ this.painter, this.We, this.Be ].forEach(r => {
+        return [ this.painter, this.Ge, this.We ].forEach(r => {
             if (!r) return;
             const o = r.pick(t, e, n.tolerance);
             if (o && o.data && o.data.feature) {
@@ -3276,11 +3282,11 @@ class me extends t.renderer.CanvasRenderer {
         const e = t[se], n = this.features[e];
         return Array.isArray(n) ? n[0][fe] : n[fe];
     }
-    in() {
+    nn() {
         let t = !1;
-        for (const e in this.Ge) {
-            const n = this.Ge[e], i = this.zn(n);
-            if (!this.bn && (this.De[i] || this.Ne[i])) {
+        for (const e in this.Ue) {
+            const n = this.Ue[e], i = this.zn(n);
+            if (!this.vn && (this.De[i] || this.Ne[i])) {
                 const e = this.wn(n);
                 t = t || e;
             }
@@ -3293,7 +3299,7 @@ class me extends t.renderer.CanvasRenderer {
                 t = t || e;
             }
         }
-        this.Ge = {}, t && (ye(this), this.layer.fire("partialupdate"));
+        this.Ue = {}, t && (ye(this), this.layer.fire("partialupdate"));
     }
     Rn(t) {
         this.An(t), this.kn(), ye(this);
@@ -3339,7 +3345,7 @@ class me extends t.renderer.CanvasRenderer {
     }
     onGeometryPositionChange(t) {
         const e = t.target._getParent() || t.target, n = e[se];
-        this.Cn([ e ]), this.Ge[n] = e, ye(this);
+        this.Cn([ e ]), this.Ue[n] = e, ye(this);
     }
     onGeometryZIndexChange() {
         this.kn();
@@ -3365,7 +3371,7 @@ class me extends t.renderer.CanvasRenderer {
         }
     }
     Nn() {
-        this.en = !0;
+        this.tn = !0;
     }
     onGeometryPropertiesChange(t) {
         const e = t.target, n = e[se];
@@ -3377,27 +3383,31 @@ class me extends t.renderer.CanvasRenderer {
         t && (this.canvas.pickingFBO = this.canvas.pickingFBO || this.regl.framebuffer(this.canvas.width, this.canvas.height)), 
         this.prepareRequestors(), this.pickingFBO = this.canvas.pickingFBO || this.regl.framebuffer(this.canvas.width, this.canvas.height), 
         this.painter = this.createPainter();
-        const e = ee.get3DPainterClass("icon"), n = Z({}, ne, ie);
-        n.markerPerspectiveRatio = this.layer.options.markerPerspectiveRatio || 0, this.Ln(n, "markerBloom"), 
-        this.Ln(n, "textBloom");
-        const i = Z({}, ht, this.layer.options.sceneConfig || {});
-        this.We = new e(this.regl, this.layer, n, i, 0), this.We.setTextShaderDefines({
+        const e = ee.get3DPainterClass("icon");
+        let n = e.getBloomSymbol();
+        const i = Z({}, ne, ie);
+        i.markerPerspectiveRatio = this.layer.options.markerPerspectiveRatio || 0, this.Ln(i, n), 
+        this.xn = i;
+        const r = Z({}, ht, this.layer.options.sceneConfig || {});
+        this.Ge = new e(this.regl, this.layer, i, r, 0), this.Ge.setTextShaderDefines({
             REVERSE_MAP_ROTATION_ON_PITCH: 1
         });
-        const r = ee.get3DPainterClass("line"), o = Z({}, re);
-        this.Ln(o, "lineBloom");
-        const s = Z({}, this.layer.options.sceneConfig || {});
-        void 0 === s.depthMask && (s.depthMask = !0), this.Be = new r(this.regl, this.layer, o, s, 0), 
+        const o = ee.get3DPainterClass("line"), s = Z({}, re);
+        n = o.getBloomSymbol(), this.Ln(s, n), this.Hn = s;
+        const a = Z({}, this.layer.options.sceneConfig || {});
+        void 0 === a.depthMask && (a.depthMask = !0), this.We = new o(this.regl, this.layer, s, a, 0), 
         this.layer.getGeometries() && this.onGeometryAdd(this.layer.getGeometries());
     }
     Ln(t, e) {
-        const n = this.layer;
-        Object.defineProperty(t, e, {
-            enumerable: !0,
-            get: function() {
-                return n && n.options.enableBloom;
-            }
-        });
+        for (let n = 0; n < e.length; n++) t[e[n]] = this.layer.options.enableBloom;
+    }
+    updateBloom(t) {
+        this.Ge && this.Vn(this.Ge, this.xn, t), this.We && this.Vn(this.We, this.Hn, t), 
+        this.painter && this.Vn(this.painter, this.painterSymbol, t);
+    }
+    Vn(t, e, n) {
+        const i = t.constructor.getBloomSymbol().reduce((t, i) => (t[i] = n, e[i] = n, t), {});
+        t.updateSymbol(i, e);
     }
     createPainter() {}
     ot() {
@@ -3441,18 +3451,18 @@ class me extends t.renderer.CanvasRenderer {
     }
     onRemove() {
         super.onRemove(), this.painter && (this.painter.delete(), delete this.painter), 
-        this.We && (this.We.delete(), delete this.We), this.Be && (this.Be.delete(), delete this.Be);
+        this.Ge && (this.Ge.delete(), delete this.Ge), this.We && (this.We.delete(), delete this.We);
     }
     drawOutline(t) {
-        if (this._t && (this.painter && this.painter.outlineAll(t), this.We.outlineAll(t), 
-        this.Be.outlineAll(t)), this.Hn) for (let e = 0; e < this.Hn.length; e++) this.painter && this.painter.outline(t, this.Hn[e]), 
-        this.We.outline(t, this.Hn[e]), this.Be.outline(t, this.Hn[e]);
+        if (this._t && (this.painter && this.painter.outlineAll(t), this.Ge.outlineAll(t), 
+        this.We.outlineAll(t)), this.Un) for (let e = 0; e < this.Un.length; e++) this.painter && this.painter.outline(t, this.Un[e]), 
+        this.Ge.outline(t, this.Un[e]), this.We.outline(t, this.Un[e]);
     }
     outlineAll() {
         this._t = !0, this.setToRedraw();
     }
     outline(t) {
-        this.Hn || (this.Hn = []);
+        this.Un || (this.Un = []);
         const e = [];
         for (let n = 0; n < t.length; n++) {
             const i = this.layer.getGeometryById(t[n]);
@@ -3461,10 +3471,10 @@ class me extends t.renderer.CanvasRenderer {
                 if (Array.isArray(t)) for (let n = 0; n < t.length; n++) e.push(t[n].id); else e.push(t.id);
             }
         }
-        this.Hn.push(e), this.setToRedraw();
+        this.Un.push(e), this.setToRedraw();
     }
     cancelOutline() {
-        delete this._t, delete this.Hn, this.setToRedraw();
+        delete this._t, delete this.Un, this.setToRedraw();
     }
     isEnableWorkAround(t) {
         return "win-intel-gpu-crash" === t && (this.layer.options.workarounds["win-intel-gpu-crash"] && ge(this.gl));
@@ -3578,16 +3588,16 @@ Me.registerRenderer("gl", class extends me {
         const t = ee.get3DPainterClass("line-gradient");
         this.painterSymbol = Z({}, {
             lineGradientProperty: Pe
-        }, re), this.Ln(this.painterSymbol, "lineBloom");
+        }, re), this.Ln(this.painterSymbol, t.getBloomSymbol());
         const e = Z({}, this.layer.options.sceneConfig || {});
         void 0 === e.depthMask && (e.depthMask = !0);
         return new t(this.regl, this.layer, this.painterSymbol, e, 0);
     }
     buildMesh() {
-        let {features: t, center: e} = this.ln();
+        let {features: t, center: e} = this.an();
         if (t = t.filter(t => !!t.properties[Pe]), !t.length) return;
-        const n = this.en;
-        this.Vn = e;
+        const n = this.tn;
+        this.Gn = e;
         const i = Z({}, this.painterSymbol), r = this.createMesh(this.painter, T, i, t, null, e);
         this.jn = !0, r.then(t => {
             this.meshes && this.painter.deleteMesh(this.meshes);
@@ -3596,7 +3606,7 @@ Me.registerRenderer("gl", class extends me {
                 e.push(...i);
                 for (let t = 0; t < i.length; t++) i[t].feaGroupIndex = 0, i[t].geometry.properties.originElements = i[t].geometry.properties.elements.slice();
             }
-            this.meshes = e, n && (this.en = n), this.jn = !1, this.setToRedraw();
+            this.meshes = e, n && (this.tn = n), this.jn = !1, this.setToRedraw();
         });
     }
 }), Me.registerRenderer("canvas", null);
@@ -3642,11 +3652,11 @@ class Ce extends me {
         super(...e), this.GeometryTypes = [ t.Polygon, t.MultiPolygon ];
     }
     buildMesh(t) {
-        const {features: e, center: n} = this.ln();
+        const {features: e, center: n} = this.an();
         if (!e.length) return;
-        const i = this.en;
-        this.Vn = n;
-        const r = this.Un(e), o = Z({}, Oe), s = r.map((e, i) => this.createMesh(this.painter, P, o, e, t && t[i], n));
+        const i = this.tn;
+        this.Gn = n;
+        const r = this.Wn(e), o = Z({}, Oe), s = r.map((e, i) => this.createMesh(this.painter, P, o, e, t && t[i], n));
         this.jn = !0, Promise.all(s).then(t => {
             this.meshes && this.painter.deleteMesh(this.meshes), t = function(t) {
                 const e = [];
@@ -3663,7 +3673,7 @@ class Ce extends me {
                     n[i] = t[i].atlas;
                 }
             }
-            this.meshes = e, this.atlas = n, i && (this.en = i), this.jn = !1, this.setToRedraw(), 
+            this.meshes = e, this.atlas = n, i && (this.tn = i), this.jn = !1, this.setToRedraw(), 
             this.layer.fire("buildmesh");
         });
     }
@@ -3676,7 +3686,7 @@ class Ce extends me {
         const i = n.feature[se];
         return this.ze[i];
     }
-    Un(t) {
+    Wn(t) {
         const e = [], n = [];
         for (let i = 0; i < t.length; i++) {
             const r = t[i];
@@ -3686,11 +3696,11 @@ class Ce extends me {
     }
     createPainter() {
         const t = ee.get3DPainterClass("fill"), e = Z({}, Oe);
-        this.Ln(e, "polygonBloom");
+        this.Ln(e, t.getBloomSymbol());
         return new t(this.regl, this.layer, e, this.layer.options.sceneConfig, 0);
     }
     updateMesh(t) {
-        return this.Tn(t, this.meshes, this.atlas, this.Vn, this.painter, P, Oe, this.Un);
+        return this.Tn(t, this.meshes, this.atlas, this.Gn, this.painter, P, Oe, this.Wn);
     }
 }
 
@@ -4038,20 +4048,20 @@ function qe(t, e) {
 
 class Xe {
     constructor(t = [], e = $e) {
-        if (this.data = t, this.length = this.data.length, this.compare = e, this.length > 0) for (let t = (this.length >> 1) - 1; t >= 0; t--) this.Gn(t);
+        if (this.data = t, this.length = this.data.length, this.compare = e, this.length > 0) for (let t = (this.length >> 1) - 1; t >= 0; t--) this.Bn(t);
     }
     push(t) {
-        this.data.push(t), this.length++, this.Wn(this.length - 1);
+        this.data.push(t), this.length++, this.qn(this.length - 1);
     }
     pop() {
         if (0 === this.length) return;
         const t = this.data[0], e = this.data.pop();
-        return this.length--, this.length > 0 && (this.data[0] = e, this.Gn(0)), t;
+        return this.length--, this.length > 0 && (this.data[0] = e, this.Bn(0)), t;
     }
     peek() {
         return this.data[0];
     }
-    Wn(t) {
+    qn(t) {
         const {data: e, compare: n} = this, i = e[t];
         for (;t > 0; ) {
             const r = t - 1 >> 1, o = e[r];
@@ -4060,7 +4070,7 @@ class Xe {
         }
         e[t] = i;
     }
-    Gn(t) {
+    Bn(t) {
         const {data: e, compare: n} = this, i = this.length >> 1, r = e[t];
         for (;t < i; ) {
             let i = 1 + (t << 1), o = e[i];
@@ -4500,7 +4510,7 @@ Sn.registerRenderer("gl", class extends Ce {
     constructor(...e) {
         super(...e), this.GeometryTypes = [ t.Polygon, t.MultiPolygon ];
     }
-    Un(t) {
+    Wn(t) {
         return [ t ];
     }
     onConfig(t) {
@@ -4509,15 +4519,18 @@ Sn.registerRenderer("gl", class extends Ce {
         }));
     }
     updateMaterial(t) {
-        this.painter && (this.painter.Bn(t), this.layer.options.sideMaterial || this.sidePainter.Bn(t), 
+        this.painter && (this.painter.Xn(t), this.layer.options.sideMaterial || this.sidePainter.Xn(t), 
         this.setToRedraw());
     }
     updateSideMaterial(t) {
-        this.sidePainter && (this.sidePainter.Bn(t), this.setToRedraw());
+        this.sidePainter && (this.sidePainter.Xn(t), this.setToRedraw());
     }
     updateDataConfig(t) {
         this.painter && (this.painter.updateDataConfig(t), this.kn());
     }
+    updateBloom(t) {
+        super.updateBloom(t), this.sidePainter && this.Vn(this.sidePainter, this.sidePainterSymbol, t);
+    }
     needCheckPointLineSymbols() {
         return !1;
     }
@@ -4526,7 +4539,7 @@ Sn.registerRenderer("gl", class extends Ce {
     }
     createPainter() {
         const t = ee.get3DPainterClass("lit");
-        this.painterSymbol = Z({}, Mn), this.sidePainterSymbol = Z({}, Mn), this.Ln(this.painterSymbol, "bloom");
+        this.painterSymbol = Z({}, Mn), this.sidePainterSymbol = Z({}, Mn), this.Ln(this.painterSymbol, t.getBloomSymbol());
         const e = Z({}, Pn, this.layer.options.dataConfig || {});
         this.layer.options.material && (this.painterSymbol.material = this.layer.options.material), 
         this.layer.options.sideMaterial ? this.sidePainterSymbol.material = this.layer.options.sideMaterial : this.sidePainterSymbol.material = this.layer.options.material;
@@ -4541,31 +4554,31 @@ Sn.registerRenderer("gl", class extends Ce {
         const e = this.painter;
         this.painter = this.sidePainter, super.vt(...t), this.painter = e;
     }
-    rn(...t) {
+    in(...t) {
         const e = t[0], n = e.sceneFilter;
-        e.sceneFilter = t => (!n || n(t)) && In(t), super.rn(...t), e.sceneFilter = t => (!n || n(t)) && In(t);
+        e.sceneFilter = t => (!n || n(t)) && In(t), super.in(...t), e.sceneFilter = t => (!n || n(t)) && In(t);
         const i = this.painter;
         this.painter = this.sidePainter, e.sceneFilter = t => (!n || n(t)) && (t => 1 === t.properties.side)(t), 
-        super.rn(...t), this.painter = i, e.sceneFilter = n;
+        super.in(...t), this.painter = i, e.sceneFilter = n;
     }
     createMesh(t, e, n, i, r, o) {
         const s = [];
-        this.qn = o;
-        const a = this.Xn(i, n, !0, !1), l = this.Xn(i, n, !1, !0);
+        this.$n = o;
+        const a = this.Yn(i, n, !0, !1), l = this.Yn(i, n, !1, !0);
         if (a) {
-            const r = this.cn(a, t, e, n, i, null, o);
+            const r = this.hn(a, t, e, n, i, null, o);
             r.meshes[0].properties.top = 1, s.push(r);
         }
         if (l) {
-            const r = this.cn(l, t, e, n, i, null, o);
+            const r = this.hn(l, t, e, n, i, null, o);
             r.meshes[0].properties.side = 1, s.push(r);
         }
         return s;
     }
-    Xn(e, n, i, r) {
+    Yn(e, n, i, r) {
         const o = this.getMap();
         n = Mn;
-        const s = this.qn, a = o.getZoom(), l = new t.Point(0, 0), h = Z({}, Pn, this.layer.options.dataConfig);
+        const s = this.$n, a = o.getZoom(), l = new t.Point(0, 0), h = Z({}, Pn, this.layer.options.dataConfig);
         if (h.tangent = 1, h.top && (h.top = i), h.side && (h.side = r), !1 === h.top && !1 === h.side) return null;
         if (!e.length) return null;
         const c = o.getProjection().code;
@@ -4575,10 +4588,10 @@ Sn.registerRenderer("gl", class extends Ce {
         const e = t[se];
         let n = this.features[e];
         if (!n) return;
-        const i = this.Xn([ n ], this.painterSymbol, !0, !1);
+        const i = this.Yn([ n ], this.painterSymbol, !0, !1);
         let r = 0;
         i && i.data && this.Pn(this.meshes[r++], n.id, i);
-        const o = this.Xn([ n ], this.painterSymbol, !1, !0);
+        const o = this.Yn([ n ], this.painterSymbol, !1, !0);
         o && o.data && this.Pn(this.meshes[r++], n.id, o);
     }
     An(e) {
@@ -4606,7 +4619,7 @@ Sn.registerRenderer("gl", class extends Ce {
     }
     drawOutline(t) {
         if (super.drawOutline(t), this._t && this.sidePainter && this.sidePainter.outlineAll(t), 
-        this.Hn) for (let e = 0; e < this.Hn.length; e++) this.sidePainter && this.sidePainter.outline(t, this.Hn[e]);
+        this.Un) for (let e = 0; e < this.Un.length; e++) this.sidePainter && this.sidePainter.outline(t, this.Un[e]);
     }
     getShadowMeshes() {
         return this.painter ? this.meshes : [];
@@ -4623,7 +4636,7 @@ let Fn = 1;
 function En(t, e) {
     return q.extend(t, {
         init: function() {
-            this.$n = {};
+            this.Jn = {};
         },
         isVisible() {
             return this.painter && this.painter.isVisible();
@@ -4638,10 +4651,10 @@ function En(t, e) {
                 const l = t.pluginIndex;
                 a = this.painter = new e(i, n, s, r, l, o);
             }
-            this.$n || (this.$n = {});
+            this.Jn || (this.Jn = {});
             const l = r.excludes;
-            this.Yn ? l !== this.Yn && (this.Jn = l ? B(l) : null, this.Yn = l) : l && (this.Yn = l), 
-            a.startFrame(t), this.Zn = {};
+            this.Zn ? l !== this.Zn && (this.Kn = l ? B(l) : null, this.Zn = l) : l && (this.Zn = l), 
+            a.startFrame(t), this.Qn = {};
         },
         updateCollision: function(t) {
             const e = this.painter;
@@ -4666,7 +4679,7 @@ function En(t, e) {
             if (!r) return {
                 retire: i
             };
-            const o = this.Kn(t);
+            const o = this.ti(t);
             let s = e.geometry;
             if (!s) {
                 const o = n.features, a = n.data;
@@ -4679,23 +4692,23 @@ function En(t, e) {
                     for (const e in t) return !1;
                     return !0;
                 }(o)) for (let t = 0; t < a.length; t++) {
-                    const e = this.Qn(o, a[t].data.aPickingId, a[t].indices, a[t].data.aPosition, a[t].positionSize);
+                    const e = this.ei(o, a[t].data.aPickingId, a[t].indices, a[t].data.aPosition, a[t].positionSize);
                     a[t].data.aColor = e;
                 }
                 s = e.geometry = r.createGeometries(l, o);
                 for (let e = 0; e < s.length; e++) s[e] && s[e].geometry && (i = !0, s[e].geometry.properties.features = o, 
-                this.un(s[e].geometry, t));
+                this.cn(s[e].geometry, t));
             }
             let a = this.L(o);
             if (!a) {
-                const {meshes: e, retire: n} = this.ti(s, t);
+                const {meshes: e, retire: n} = this.ni(s, t);
                 i || (i = n), a = e;
             }
             return {
                 retire: i
             };
         },
-        ti(t, e) {
+        ni(t, e) {
             const {layer: n, tileInfo: i, tileExtent: r, tileTransform: o, tileTranslationMatrix: s, tileVectorTransform: a, tileZoom: l, sceneConfig: h} = e;
             let c = !1;
             const u = this.painter, f = [ i.extent2d.xmin, i.extent2d.ymax ], d = u.createMeshes(t, o, {
@@ -4707,10 +4720,10 @@ function En(t, e) {
             }, e);
             if (d.length) {
                 const t = n.getRenderer().isEnableTileStencil();
-                for (let n = 0; n < d.length; n++) d[n] && (c = !0, this.ei(d[n], o, e.timestamp, Fn++, t));
-                h.animation && (d.ni = e.timestamp);
-                const i = this.Kn(e);
-                this.$n[i] = d;
+                for (let n = 0; n < d.length; n++) d[n] && (c = !0, this.ii(d[n], o, e.timestamp, Fn++, t));
+                h.animation && (d.ri = e.timestamp);
+                const i = this.ti(e);
+                this.Jn[i] = d;
             }
             return {
                 meshes: d,
@@ -4723,10 +4736,10 @@ function En(t, e) {
             let s = e.geometry;
             if (!s) return On;
             let a = !1;
-            const l = this.Kn(t);
+            const l = this.ti(t);
             let h = this.L(l);
             if (!h) {
-                const {meshes: e, retire: n} = this.ti(s, t);
+                const {meshes: e, retire: n} = this.ni(s, t);
                 a || (a = n), h = e;
             }
             if (!h.length) return On;
@@ -4735,21 +4748,21 @@ function En(t, e) {
                 t.properties.tile = n, t.properties.level = c;
             });
             let u = !1;
-            if (!this.Zn[l]) {
+            if (!this.Qn[l]) {
                 let e = null, n = r.animation;
                 if (n) {
-                    const i = t.sceneConfig.animationDuration || 800, r = (t.timestamp - h.ni) / i, o = h[0].properties.createTime;
-                    h.ni - o < i && r < 1 && (!0 !== n && 1 !== n || (n = "linear"), e = "linear" === n ? r : W(n, r), 
+                    const i = t.sceneConfig.animationDuration || 800, r = (t.timestamp - h.ri) / i, o = h[0].properties.createTime;
+                    h.ri - o < i && r < 1 && (!0 !== n && 1 !== n || (n = "linear"), e = "linear" === n ? r : W(n, r), 
                     u = !0);
                 }
-                o.addMesh(h, e, t), this.Zn[l] = 1;
+                o.addMesh(h, e, t), this.Qn[l] = 1;
             }
             return {
                 redraw: u,
                 retire: a
             };
         },
-        ei: function(t, e, n, i, r) {
+        ii: function(t, e, n, i, r) {
             if (t.properties.tileTransform = e, t.properties.createTime = n, t.properties.meshKey = i, 
             t.needUpdateShadow = !0, r) {
                 const e = t.defines || {};
@@ -4761,7 +4774,7 @@ function En(t, e) {
                 });
             }
         },
-        un: function(t, e) {
+        cn: function(t, e) {
             const {layer: n, tileInfo: i} = e, r = n.getMap(), o = (n.getSpatialReference ? n.getSpatialReference() : r.getSpatialReference()).getResolution(i.z), s = e.tileExtent / n.getTileSize().width;
             t.properties.tileResolution = o, t.properties.tileRatio = s, t.properties.z = i.z, 
             t.properties.tileExtent = e.tileExtent;
@@ -4778,8 +4791,8 @@ function En(t, e) {
             const n = this.painter;
             if (!n) return !1;
             if (n.shouldDeleteMeshOnUpdateSymbol(t)) {
-                if (this.$n) for (const t in this.$n) n.deleteMesh(this.$n[t], !0);
-                delete this.$n, delete this.Zn;
+                if (this.Jn) for (const t in this.Jn) n.deleteMesh(this.Jn[t], !0);
+                delete this.Jn, delete this.Qn;
             }
             return n.updateSymbol(t, e);
         },
@@ -4787,17 +4800,17 @@ function En(t, e) {
             return this.painter && this.painter.pick ? this.painter.pick(t, e, n) : null;
         },
         deleteTile: function(t) {
-            if (!this.$n) return;
-            const e = this.Kn(t), n = this.$n[e];
-            n && this.painter && this.painter.deleteMesh(n), delete this.$n[e], this.Zn && delete this.Zn[e];
+            if (!this.Jn) return;
+            const e = this.ti(t), n = this.Jn[e];
+            n && this.painter && this.painter.deleteMesh(n), delete this.Jn[e], this.Qn && delete this.Qn[e];
         },
         remove: function() {
             const t = this.painter;
-            if (t && this.$n) {
-                for (const e in this.$n) t.deleteMesh(this.$n[e]);
+            if (t && this.Jn) {
+                for (const e in this.Jn) t.deleteMesh(this.Jn[e]);
                 t.delete(), delete this.painter;
             }
-            delete this.$n, delete this.Zn;
+            delete this.Jn, delete this.Qn;
         },
         resize: function(t, e) {
             const n = this.painter;
@@ -4818,7 +4831,7 @@ function En(t, e) {
         isTerrainVector: function() {
             return !!this.painter && this.painter.isTerrainVector();
         },
-        Qn: function(t, e, n, i, r = 3) {
+        ei: function(t, e, n, i, r = 3) {
             if (!i || !t || !e.length) return null;
             const o = new Uint8Array(i.length / r * 4);
             let s, a;
@@ -4835,31 +4848,31 @@ function En(t, e) {
             }
             return o;
         },
-        Kn: function(t) {
+        ti: function(t) {
             const e = t.tileInfo;
             return e.meshKey || (e.meshKey = Fn++), e.meshKey;
         },
         L: function(t) {
-            return this.$n[t];
+            return this.Jn[t];
         },
-        ii(t, e) {
+        oi(t, e) {
             if (Array.isArray(t)) t.forEach((t, n) => {
                 const {features: i} = t.properties;
-                this.ri(t, e[n], i);
+                this.si(t, e[n], i);
             }); else {
                 const {features: n} = t.properties;
-                this.ri(t, Array.isArray(e) ? e[0] : e, n);
+                this.si(t, Array.isArray(e) ? e[0] : e, n);
             }
         },
-        ri(t, e, n) {
+        si(t, e, n) {
             const i = e.featureIndexes || e.data.featureIndexes;
-            if (i) if (this.Jn) {
+            if (i) if (this.Kn) {
                 const r = e.indices;
                 let o = null, s = !1;
                 const a = [];
                 for (let t = 0; t < r.length; t++) {
                     const e = n[i[r[t]]];
-                    null !== o && o === r[t] || (s = this.Jn(e.feature), o = r[t]), s || a.push(r[t]);
+                    null !== o && o === r[t] || (s = this.Kn(e.feature), o = r[t]), s || a.push(r[t]);
                 }
                 t.setElements(new e.indices.constructor(a));
             } else t.setElements(e.indices);
@@ -4899,15 +4912,15 @@ function En(t, e) {
 
 class zn {
     constructor() {
-        this.oi = 1;
+        this.ai = 1;
     }
     write(t, e) {
-        const n = t.gl, i = this.oi++;
+        const n = t.gl, i = this.ai++;
         return t.stencilFunc(n.ALWAYS, i, 255), t.draw(e), i;
     }
     start(t) {
         const e = t.gl;
-        e.clearStencil(255), e.clear(e.STENCIL_BUFFER_BIT), this.oi = 1, t.start();
+        e.clearStencil(255), e.clear(e.STENCIL_BUFFER_BIT), this.ai = 1, t.start();
     }
     end(t) {
         t.end();
@@ -5006,7 +5019,7 @@ const Zn = "_fn_type_";
 function Kn(t, e, n) {
     if (!Jn(t.properties.features)) for (let i = 0; i < n.length; i++) {
         const {symbolName: r} = n[i];
-        (t.si = t.si || {})[r] = e[r], Qn(t, e, n[i]);
+        (t.li = t.li || {})[r] = e[r], Qn(t, e, n[i]);
     }
 }
 
@@ -5067,7 +5080,7 @@ function ni(t, e, n, i, r) {
             const a = n[s], l = a.attrName;
             if (!ii(o, e, a)) {
                 const {aPickingId: t} = o.properties;
-                if (!t || o.ai === r) continue;
+                if (!t || o.hi === r) continue;
                 const e = (Zn + l + "Index").trim(), n = o.properties[e];
                 if (!n) continue;
                 si(o, n, a);
@@ -5086,13 +5099,13 @@ function ni(t, e, n, i, r) {
                 t[c] && (delete t[c], i.setDefines(t));
             }
         }
-        o.ai = r;
+        o.hi = r;
     }
 }
 
 function ii(t, e, n) {
-    const i = e[n.symbolName], r = t.si;
-    return i !== r[n.symbolName] && (r[n.symbolName] = i, !0);
+    const i = e[n.symbolName], r = t.li;
+    return !z(i, r[n.symbolName]) && (r[n.symbolName] = i, !0);
 }
 
 function ri(t, e, n) {
@@ -5166,40 +5179,40 @@ ci.prototype = {
         return new ci(this.x, this.y);
     },
     add: function(t) {
-        return this.clone().li(t);
+        return this.clone().ci(t);
     },
     sub: function(t) {
-        return this.clone().hi(t);
+        return this.clone().ui(t);
     },
     multByPoint: function(t) {
-        return this.clone().ci(t);
+        return this.clone().fi(t);
     },
     divByPoint: function(t) {
-        return this.clone().ui(t);
+        return this.clone().di(t);
     },
     mult: function(t) {
-        return this.clone().fi(t);
+        return this.clone().pi(t);
     },
     div: function(t) {
-        return this.clone().di(t);
+        return this.clone().mi(t);
     },
     rotate: function(t) {
-        return this.clone().pi(t);
+        return this.clone().yi(t);
     },
     rotateAround: function(t, e) {
-        return this.clone().mi(t, e);
+        return this.clone().gi(t, e);
     },
     matMult: function(t) {
-        return this.clone().yi(t);
+        return this.clone().vi(t);
     },
     unit: function() {
-        return this.clone().gi();
+        return this.clone().bi();
     },
     perp: function() {
-        return this.clone().vi();
+        return this.clone().xi();
     },
     round: function() {
-        return this.clone().bi();
+        return this.clone().wi();
     },
     mag: function() {
         return Math.sqrt(this.x * this.x + this.y * this.y);
@@ -5226,44 +5239,44 @@ ci.prototype = {
     angleWithSep: function(t, e) {
         return Math.atan2(this.x * e - this.y * t, this.x * t + this.y * e);
     },
-    yi: function(t) {
+    vi: function(t) {
         var e = t[0] * this.x + t[1] * this.y, n = t[2] * this.x + t[3] * this.y;
         return this.x = e, this.y = n, this;
     },
-    li: function(t) {
+    ci: function(t) {
         return this.x += t.x, this.y += t.y, this;
     },
-    hi: function(t) {
+    ui: function(t) {
         return this.x -= t.x, this.y -= t.y, this;
     },
-    fi: function(t) {
+    pi: function(t) {
         return this.x *= t, this.y *= t, this;
     },
-    di: function(t) {
+    mi: function(t) {
         return this.x /= t, this.y /= t, this;
     },
-    ci: function(t) {
+    fi: function(t) {
         return this.x *= t.x, this.y *= t.y, this;
     },
-    ui: function(t) {
+    di: function(t) {
         return this.x /= t.x, this.y /= t.y, this;
     },
-    gi: function() {
-        return this.di(this.mag()), this;
+    bi: function() {
+        return this.mi(this.mag()), this;
     },
-    vi: function() {
+    xi: function() {
         var t = this.y;
         return this.y = this.x, this.x = -t, this;
     },
-    pi: function(t) {
+    yi: function(t) {
         var e = Math.cos(t), n = Math.sin(t), i = e * this.x - n * this.y, r = n * this.x + e * this.y;
         return this.x = i, this.y = r, this;
     },
-    mi: function(t, e) {
+    gi: function(t, e) {
         var n = Math.cos(t), i = Math.sin(t), r = e.x + n * (this.x - e.x) - i * (this.y - e.y), o = e.y + i * (this.x - e.x) + n * (this.y - e.y);
         return this.x = r, this.y = o, this;
     },
-    bi: function() {
+    wi: function() {
         return this.x = Math.round(this.x), this.y = Math.round(this.y), this;
     }
 }, ci.convert = function(t) {
@@ -5306,16 +5319,19 @@ function xi(t, e, n, i) {
 const {loginIBLResOnCanvas: wi, logoutIBLResOnCanvas: Ai, getIBLResOnCanvas: ki} = n.pbr.PBRUtils, _i = [], Ti = [], Si = new t.Point(0, 0), Mi = new t.Point(0, 0), Pi = new Float32Array(1), Ii = [], Oi = t => 0 === t.properties.level, Ci = t => t.properties.level > 0;
 
 class Fi {
+    static getBloomSymbol() {
+        return "bloom";
+    }
     constructor(t, e, i, r, o, s) {
-        this.xi = !0, this.regl = t, this.layer = e, this.canvas = t._gl.canvas, this.sceneConfig = r || {}, 
+        this.Ai = !0, this.regl = t, this.layer = e, this.canvas = t._gl.canvas, this.sceneConfig = r || {}, 
         this.dataConfig = s || {}, this.pluginIndex = o, this.scene = new n.Scene, this.pickingFBO = e.getRenderer().pickingFBO, 
-        this.wi = new zn, this.level0Filter = Oi, this.levelNFilter = Ci, this.loginTextureCache(), 
-        this.symbolDef = Array.isArray(i) ? i.map(t => Ln(t)) : [ Ln(i) ], this.Ai(), this.pickingViewport = {
+        this.ki = new zn, this.level0Filter = Oi, this.levelNFilter = Ci, this.loginTextureCache(), 
+        this.symbolDef = Array.isArray(i) ? i.map(t => Ln(t)) : [ Ln(i) ], this._i(), this.pickingViewport = {
             x: 0,
             y: 0,
             width: () => this.canvas ? this.canvas.width : 1,
             height: () => this.canvas ? this.canvas.height : 1
-        }, this.sortByCommandKey = Ei.bind(this), this.colorCache = {}, this.ki = this.symbolDef.map(t => !(!t || !1 !== t.visible));
+        }, this.sortByCommandKey = Ei.bind(this), this.colorCache = {}, this.Ti = this.symbolDef.map(t => !(!t || !1 !== t.visible));
     }
     getMap() {
         return this.layer ? this.layer.getMap() : null;
@@ -5328,7 +5344,7 @@ class Fi {
         const {minZoom: t, maxZoom: e} = this.sceneConfig, n = this.getMap().getZoom();
         if (!Nn(t) && n < t) return !1;
         if (!Nn(e) && n > e) return !1;
-        const i = this._i;
+        const i = this.Si;
         if (i.length) for (let t = 0; t < i.length; t++) if (i[t] && !i[t].isFeatureConstant) return !0;
         const r = this.getSymbols();
         for (let t = 0; t < r.length; t++) {
@@ -5340,7 +5356,7 @@ class Fi {
     isMeshVisible(t) {
         const e = t && t.properties && t.properties.symbolIndex;
         if (!e) return !1;
-        const n = this._i, i = e.index;
+        const n = this.Si, i = e.index;
         let r;
         if (n[i]) {
             if (!n[i].isFeatureConstant) return !0;
@@ -5352,7 +5368,7 @@ class Fi {
         return !1;
     }
     needToRedraw() {
-        return this.isAnimating() || this.Ti;
+        return this.isAnimating() || this.Mi;
     }
     needToRetireFrames() {
         return this.J;
@@ -5368,16 +5384,16 @@ class Fi {
     }
     isShadowIncludeChanged(t) {
         const e = t && t.isRenderingTerrain && this.isTerrainSkin();
-        return t && t.states && t.states.includesChanged.shadow || e && this.Si;
+        return t && t.states && t.states.includesChanged.shadow || e && this.Pi;
     }
     fillIncludes(t, e, n) {
-        if (delete this.Si, n && n.isRenderingTerrain && this.isTerrainSkin()) return;
+        if (delete this.Pi, n && n.isRenderingTerrain && this.isTerrainSkin()) return;
         const i = n && n.includes;
         if (i) {
             let r = "";
             for (const o in i) i[o] && (r += o, n[o].uniformDeclares && e.push(...n[o].uniformDeclares), 
             n[o].defines && jn(t, n[o].defines));
-            this.Si = r;
+            this.Pi = r;
         }
     }
     setIncludeUniformValues(t, e) {
@@ -5393,10 +5409,10 @@ class Fi {
             symbolIndex: t[i].symbolIndex,
             ref: t[i].ref
         }) : n.push(null); else {
-            t[i] && !t[i].is2D && (this.xi = !1);
+            t[i] && !t[i].is2D && (this.Ai = !1);
             const r = this.createGeometry(t[i], e, i);
             if (r && r.geometry) {
-                const o = r.geometry.properties, {pickingIdMap: s, idPickingMap: a, hasFeaIds: l} = this.Mi(t[i]);
+                const o = r.geometry.properties, {pickingIdMap: s, idPickingMap: a, hasFeaIds: l} = this.Ii(t[i]);
                 l && (o.feaIdPickingMap = s, o.feaPickingIdMap = a), o.symbolIndex = r.symbolIndex, 
                 o.features = e, o.is2D = t[i].is2D, this.postCreateGeometry(r, n);
             }
@@ -5405,10 +5421,10 @@ class Fi {
         return n;
     }
     isOnly2D() {
-        return this.xi;
+        return this.Ai;
     }
     postCreateGeometry() {}
-    Mi(t) {
+    Ii(t) {
         if (!t) return {};
         if (Array.isArray(t) && !(t = t[0])) return {};
         const e = t.featureIds, n = {}, i = {}, r = e && e.length;
@@ -5431,7 +5447,7 @@ class Fi {
             if (!t[s]) continue;
             if (r && i && i.isRenderingTerrain && this.isTerrainVector()) {
                 const e = t[s], n = e && e.geometry;
-                this.Pi(n, n.data, n.properties, n.positionSize || n.desc.positionSize, i);
+                this.Oi(n, n.data, n.properties, n.positionSize || n.desc.positionSize, i);
             }
             let a = this.createMesh(t[s], e, n, i || {});
             Array.isArray(a) ? (a = a.filter(t => !!t), o.push(...a)) : a && o.push(a);
@@ -5467,13 +5483,13 @@ class Fi {
             if (!!a.HAS_BLOOM !== e && (s = !0, e ? a.HAS_BLOOM = 1 : delete a.HAS_BLOOM), i) {
                 if (t.geometry.data.aTerrainAltitude) {
                     const e = t.geometry;
-                    this.Pi(e, e.data, e.properties, e.desc.positionSize, n);
+                    this.Oi(e, e.data, e.properties, e.desc.positionSize, n);
                 }
                 t.geometry.data.aTerrainAltitude && !a.HAS_TERRAIN_ALTITUDE && (a.HAS_TERRAIN_ALTITUDE = 1, 
                 s = !0);
             } else a.HAS_TERRAIN_ALTITUDE && (delete a.HAS_TERRAIN_ALTITUDE, s = !0);
             s && t.setDefines(a), r ? t.setUniform("targetFramebuffer", r) : t.uniforms.targetFramebuffer && (t.uniforms.targetFramebuffer = null), 
-            this.Ii(t);
+            this.Ci(t);
         }), this.scene.addMesh(t);
     }
     updateCollision() {}
@@ -5483,17 +5499,18 @@ class Fi {
     }
     prepareRender(t) {
         if (this.ut === t.timestamp) return;
-        if (this.ut = t.timestamp, !this.createFnTypeConfig) return;
+        if (!this.createFnTypeConfig) return;
         const e = this.scene.getMeshes();
         if (!e || !e.length) return;
         const n = t && t.sceneFilter, i = this.getMap().getZoom();
-        for (let t = 0; t < e.length; t++) {
-            if (!e[t] || !e[t].geometry) continue;
-            if (n && !n(e[t])) continue;
-            const {symbolIndex: r} = e[t].properties, o = this.getSymbolDef(r);
-            if (!o) continue;
-            const s = this.getFnTypeConfig(r);
-            ni(this.regl, o, s, e[t], i);
+        for (let r = 0; r < e.length; r++) {
+            if (!e[r] || !e[r].geometry) continue;
+            if (n && !n(e[r])) continue;
+            const {symbolIndex: o} = e[r].properties, s = this.getSymbolDef(o);
+            if (!s) continue;
+            this.ut = t.timestamp;
+            const a = this.getFnTypeConfig(o);
+            ni(this.regl, s, a, e[r], i);
         }
     }
     paint(t) {
@@ -5501,14 +5518,14 @@ class Fi {
         if (!e) return {
             redraw: !1
         };
-        this.Oi = t;
+        this.Fi = t;
         const n = this.getUniformValues(e, t);
         return this.callShader(n, t), {
-            redraw: this.Ti
+            redraw: this.Mi
         };
     }
     setToRedraw(t) {
-        t && (this.J = t), this.Ti = !0;
+        t && (this.J = t), this.Mi = !0;
     }
     callShader(t, e) {
         this.callCurrentTileShader(t, e), this.callBackgroundTileShader(t, e);
@@ -5573,7 +5590,7 @@ class Fi {
             f.features || (f = u.properties), c && c.length && (c[0] = Math.round(1e5 * c[0]) / 1e5, 
             c[1] = Math.round(1e5 * c[1]) / 1e5, c[2] = Math.round(1e5 * c[2]) / 1e5);
             return {
-                data: this.Ci(f && f.features && f.features[h]),
+                data: this.Ei(f && f.features && f.features[h]),
                 point: c,
                 coordinate: a.coordinate,
                 plugin: this.pluginIndex
@@ -5581,7 +5598,7 @@ class Fi {
         }
         return null;
     }
-    Ci(t) {
+    Ei(t) {
         const e = t && t.feature;
         if (!e || !e.customProps) return t;
         const n = jn({}, t);
@@ -5605,7 +5622,7 @@ class Fi {
         }
     }
     startFrame(t) {
-        this.Fi || (this.init(t), this.Fi = !0), this.ut !== t.timestamp && (this.Ti = !1, 
+        this.zi || (this.init(t), this.zi = !0), this.ut !== t.timestamp && (this.Mi = !1, 
         this.J = !1), this.scene.clear();
     }
     resize() {}
@@ -5614,35 +5631,34 @@ class Fi {
             for (let t = 0; t < this.picking.length; t++) this.picking[t].dispose();
             delete this.picking;
         }
-        if (this.Ei) {
-            for (let t = 0; t < this.Ei.length; t++) this.Ei[t].dispose();
-            delete this.Ei;
+        if (this.ji) {
+            for (let t = 0; t < this.ji.length; t++) this.ji[t].dispose();
+            delete this.ji;
         }
-        delete this.zi, this.logoutTextureCache();
+        delete this.Ri, this.logoutTextureCache();
     }
     updateSymbol(t, e) {
-        const n = this.supportRenderMode("taa");
         Array.isArray(t) || (t = [ t ], e = [ e ]);
-        let i = !1;
-        for (let n = 0; n < t.length; n++) if (t[n]) {
-            const r = this.ji(n, t[n], e[n]);
-            r && (i = r);
+        let n = !1;
+        for (let i = 0; i < t.length; i++) if (t[i]) {
+            const r = this.Di(i, t[i], e[i]);
+            r && (n = r);
         }
-        return delete this.Ri, this.setToRedraw(n), i;
+        return delete this.Ni, this.setToRedraw(!1), n;
     }
-    Di(t, e) {
+    Li(t, e) {
         for (const n in e) if ($n(e, n)) {
             if (O.isFnTypeSymbol(e[n]) && !this.layer.options.features && (!t[n] || t[n].property !== e[n].property)) return !0;
             if (C[n] && !z(e[n], t[n])) return !0;
         }
         return !1;
     }
-    ji(t, e, n) {
-        if (!this.Ni) return !1;
-        const i = this.Di(this.symbolDef[t] || {}, n);
-        if (this.ki[t] && !1 !== n.visible) return this.ki[t] = !1, !0;
+    Di(t, e, n) {
+        if (!this.Hi) return !1;
+        const i = this.Li(this.symbolDef[t] || {}, n);
+        if (this.Ti[t] && !1 !== n.visible) return this.Ti[t] = !1, !0;
         this.symbolDef[t] = Ln(n);
-        const r = this.Ni[t];
+        const r = this.Hi[t];
         for (const t in r) delete r[t];
         const o = this.getMap(), s = [], a = F.loadSymbolFnTypes(this.symbolDef[t], () => (s[0] = o.getZoom(), 
         s));
@@ -5655,35 +5671,35 @@ class Fi {
                 enumerable: !0
             }) : r[t] = a[t];
         }
-        return p(n.visible) && (this._i[t] = g(n.visible)), i;
+        return p(n.visible) && (this.Si[t] = g(n.visible)), i;
     }
     getSymbolDef(t) {
         return this.symbolDef[t.index];
     }
     getSymbols() {
-        return this.Ni;
+        return this.Hi;
     }
     getSymbol(t) {
         const e = t.index;
-        return this.Ni[e];
+        return this.Hi[e];
     }
-    Ai() {
+    _i() {
         const t = this.getMap(), e = [], n = () => (e[0] = t.getZoom(), e);
-        this.Ni = [], this._i = [];
-        for (let t = 0; t < this.symbolDef.length; t++) this.Ni[t] = F.loadSymbolFnTypes(jn({}, this.symbolDef[t]), n), 
-        this.symbolDef[t] && p(this.symbolDef[t].visible) && (this._i[t] = g(this.symbolDef[t].visible));
+        this.Hi = [], this.Si = [];
+        for (let t = 0; t < this.symbolDef.length; t++) this.Hi[t] = F.loadSymbolFnTypes(jn({}, this.symbolDef[t]), n), 
+        this.symbolDef[t] && p(this.symbolDef[t].visible) && (this.Si[t] = g(this.symbolDef[t].visible));
     }
     getFnTypeConfig(t) {
-        this.Ri || (this.Ri = []);
+        this.Ni || (this.Ni = []);
         const e = t.index;
-        if (!this.Ri[e]) {
+        if (!this.Ni[e]) {
             const n = this.getSymbolDef(t), i = this.getMap();
-            this.Ri[e] = this.createFnTypeConfig(i, n);
+            this.Ni[e] = this.createFnTypeConfig(i, n);
         }
-        return this.Ri[e];
+        return this.Ni[e];
     }
-    Li() {
-        delete this.Ri;
+    Vi() {
+        delete this.Ni;
     }
     loginTextureCache() {
         const t = "__gl_textures".trim(), e = this.getMap();
@@ -5692,7 +5708,7 @@ class Fi {
         }), e[t].count++;
     }
     logoutTextureCache() {
-        const t = "__gl_textures".trim(), e = this.getMap(), n = this.Hi;
+        const t = "__gl_textures".trim(), e = this.getMap(), n = this.Ui;
         if (n) for (const i in n) $n(n, i) && e[t][i] && (e[t][i].count--, e[t][i].count <= 0 && delete e[t][i]);
         e[t].count--, e[t].count <= 0 && (e[t] = {});
     }
@@ -5706,13 +5722,13 @@ class Fi {
         r ? r.data = e : r = i[n][t] = {
             data: e,
             count: 0
-        }, this.Hi || (this.Hi = {}), r.data.then || this.Hi[t] || (r.count++, this.Hi[t] = 1);
+        }, this.Ui || (this.Ui = {}), r.data.then || this.Ui[t] || (r.count++, this.Ui[t] = 1);
     }
     disposeCachedTexture(t) {
         let e;
-        if (e = "string" == typeof t ? t : t.url, !this.Hi || !this.Hi[e]) return;
+        if (e = "string" == typeof t ? t : t.url, !this.Ui || !this.Ui[e]) return;
         const n = "__gl_textures".trim();
-        delete this.Hi[e];
+        delete this.Ui[e];
         const i = this.getMap();
         i[n][e] && (i[n][e].count--, i[n][e].count <= 0 && delete i[n][e]);
     }
@@ -5725,54 +5741,54 @@ class Fi {
     supportRenderMode(t) {
         return "taa" === t || "fxaa" === t;
     }
-    Vi(t) {
+    Gi(t) {
         const e = this.scene.getMeshes();
         if (!e.length) return;
         const n = e.map(t => ({
             transform: t.localTransform,
             level: t.properties.level,
             mesh: t
-        })).sort(this.Ui), i = this.getMap().projViewMatrix;
-        this.wi.start(t);
+        })).sort(this.Wi), i = this.getMap().projViewMatrix;
+        this.ki.start(t);
         const o = {};
         for (let e = 0; e < n.length; e++) {
             const s = n[e].mesh;
             let a = o[s.properties.tile.id];
-            void 0 === a && (r.multiply(_i, i, n[e].transform), a = this.wi.write(t, _i), o[s.properties.tile.id] = a), 
+            void 0 === a && (r.multiply(_i, i, n[e].transform), a = this.ki.write(t, _i), o[s.properties.tile.id] = a), 
             s.setUniform("ref", a);
         }
-        this.wi.end(t), this.regl.Gi();
+        this.ki.end(t), this.regl.Bi();
     }
-    Ui(t, e) {
+    Wi(t, e) {
         return e.level - t.level;
     }
     outline(t, e) {
         const n = {};
-        for (let i = 0; i < e.length; i++) Nn(e[i]) || n[e[i]] || (this.Wi(t, e[i]), n[e[i]] = 1);
+        for (let i = 0; i < e.length; i++) Nn(e[i]) || n[e[i]] || (this.qi(t, e[i]), n[e[i]] = 1);
     }
-    Wi(t, e) {
+    qi(t, e) {
         if (!this.picking) return;
-        if (this.Bi || (this.Bi = new n.Scene), !this.Ei && (this.qi(), !this.Ei)) return void console.warn(`Plugin at ${this.pluginIndex} doesn't support outline.`);
-        const i = this.getUniformValues(this.getMap(), this.Oi), r = this.Xi(e);
+        if (this.Xi || (this.Xi = new n.Scene), !this.ji && (this.$i(), !this.ji)) return void console.warn(`Plugin at ${this.pluginIndex} doesn't support outline.`);
+        const i = this.getUniformValues(this.getMap(), this.Fi), r = this.Yi(e);
         if (r.length) for (let n = 0; n < r.length; n++) {
             const o = r[n].geometry.properties.feaIdPickingMap;
             if (o) {
                 const s = o[e];
                 if (s) {
                     const e = {};
-                    this.Bi.setMeshes(r[n]);
+                    this.Xi.setMeshes(r[n]);
                     for (let n = 0; n < s.length; n++) {
                         const r = s[n];
                         if (!e[r]) {
                             e[r] = 1, i.highlightPickingId = r;
-                            for (let e = 0; e < this.Ei.length; e++) this.renderer.render(this.Ei[e], i, this.Bi, t);
+                            for (let e = 0; e < this.ji.length; e++) this.renderer.render(this.ji[e], i, this.Xi, t);
                         }
                     }
                 }
             }
         }
     }
-    Xi(t) {
+    Yi(t) {
         const e = [], n = this.scene.getMeshes();
         for (let i = 0; i < n.length; i++) {
             const r = n[i], o = r.geometry.properties.feaIdPickingMap;
@@ -5782,21 +5798,21 @@ class Fi {
     }
     outlineAll(t) {
         if (!this.picking) return;
-        if (!this.Ei && (this.qi(), !this.Ei)) return void console.warn(`Plugin at ${this.pluginIndex} doesn't support outline.`);
-        const e = this.getUniformValues(this.getMap(), this.Oi);
+        if (!this.ji && (this.$i(), !this.ji)) return void console.warn(`Plugin at ${this.pluginIndex} doesn't support outline.`);
+        const e = this.getUniformValues(this.getMap(), this.Fi);
         e.highlightPickingId = -1;
-        for (let n = 0; n < this.Ei.length; n++) this.renderer.render(this.Ei[n], e, this.scene, t);
+        for (let n = 0; n < this.ji.length; n++) this.renderer.render(this.ji[n], e, this.scene, t);
     }
-    qi() {
+    $i() {
         if (!this.picking) return;
         const t = this.layer.getRenderer().canvas;
-        this.Ei = [];
+        this.ji = [];
         for (let e = 0; e < this.picking.length; e++) {
             const i = this.picking[e].getPickingVert(), r = {
                 ENABLE_PICKING: 1,
                 HAS_PICKING_ID: 1
             }, o = this.picking[e].getUniformDeclares().slice(0);
-            void 0 !== o.uPickingId && (r.HAS_PICKING_ID = 2), this.Ei[e] = new n.MeshShader({
+            void 0 !== o.uPickingId && (r.HAS_PICKING_ID = 2), this.ji[e] = new n.MeshShader({
                 vert: i,
                 frag: "precision highp float;\nuniform float highlightPickingId;\nvarying float vPickingId;\nvoid main() {\n  if(highlightPickingId < .0 || floor(highlightPickingId + .5) == floor(vPickingId + .5)) {\n    gl_FragColor = vec4(1.);\n  } else {\n    discard;\n  }\n}",
                 uniforms: o,
@@ -5822,7 +5838,7 @@ class Fi {
                         equation: "add"
                     }
                 }
-            }), this.Ei[e].filter = this.picking[e].filter;
+            }), this.ji[e].filter = this.picking[e].filter;
         }
     }
     hasIBL() {
@@ -5848,8 +5864,8 @@ class Fi {
         Ai(t, this.getMap());
     }
     evaluateInFnTypeConfig(t, e, n, i, r) {
-        let o = this.$i;
-        o || (o = this.$i = {});
+        let o = this.Ji;
+        o || (o = this.Ji = {});
         const s = function(t) {
             let e = 0;
             const n = t && t.length || 0;
@@ -5862,16 +5878,16 @@ class Fi {
         return a || (a = o[s] = r ? y(t) : g(t)), a(n.getZoom(), i);
     }
     highlight(t) {
-        this.Kt = t, this.Yi = this.layer.getRenderer().getFrameTimestamp(), this.setToRedraw(!0);
+        this.Kt = t, this.Zi = this.layer.getRenderer().getFrameTimestamp(), this.setToRedraw(!0);
     }
     cancelAllHighlight() {
-        this.Kt = null, this.Yi = this.layer.getRenderer().getFrameTimestamp(), this.setToRedraw(!0);
+        this.Kt = null, this.Zi = this.layer.getRenderer().getFrameTimestamp(), this.setToRedraw(!0);
     }
-    Ji(t, e) {
+    Ki(t, e) {
         const {featureIds: n, pickingIdIndiceMap: i} = e;
         t.properties.aFeaIds = n, t.properties.pickingIdIndiceMap = i;
     }
-    Ii(t) {
+    Ci(t) {
         const {pickingIdIndiceMap: e} = t.geometry.properties, n = this.Kt ? function(t, e, n) {
             const {aPickingId: i, feaIdPickingMap: r, features: o} = t.geometry.properties, s = new Map, a = n.keys();
             for (const t of a) {
@@ -5893,27 +5909,27 @@ class Fi {
             }
             return s;
         }(t, this.layer, this.Kt) : null;
-        l.highlightMesh(this.regl, t, n, this.Yi, e);
+        l.highlightMesh(this.regl, t, n, this.Zi, e);
     }
-    Pi(t, e, n, i, r) {
+    Oi(t, e, n, i, r) {
         let o = n.aAnchor;
         if (!o) {
             const {aPosition: t} = e;
             o = n.aAnchor = t.slice(0);
         }
         let s = n.aTerrainAltitude;
-        s || (s = n.aTerrainAltitude = new Float32Array(o.length / i), s.fill(yt)), this.Zi(s, o, r.tileInfo, 0, s.length - 1), 
-        e.aTerrainAltitude ? s.dirty && this.Ki(t, s) : e.aTerrainAltitude = s, s.dirty = !1;
+        s || (s = n.aTerrainAltitude = new Float32Array(o.length / i), s.fill(yt)), this.Qi(s, o, r.tileInfo, 0, s.length - 1), 
+        e.aTerrainAltitude ? s.dirty && this.tr(t, s) : e.aTerrainAltitude = s, s.dirty = !1;
     }
-    Ki(t, e) {
+    tr(t, e) {
         t && t.updateData && t.updateData("aTerrainAltitude", e);
     }
-    Zi(e, n, i, r, o) {
+    Qi(e, n, i, r, o) {
         const {res: s, extent: a, extent2d: l, id: h} = i, c = this.pluginIndex, u = h + "-" + c;
         if (i.completeTerrainQuery || (i.completeTerrainQuery = []), i.completeTerrainQuery[c]) return;
-        if (!i.completeTerrainQuery[c] && this.zi && this.zi.has(u)) {
-            const t = this.zi.getAndRemove(u);
-            return this.zi.add(u, t), e.set(t.altitudeData), i.terrainTileInfos = t.terrainTileInfos, 
+        if (!i.completeTerrainQuery[c] && this.Ri && this.Ri.has(u)) {
+            const t = this.Ri.getAndRemove(u);
+            return this.Ri.add(u, t), e.set(t.altitudeData), i.terrainTileInfos = t.terrainTileInfos, 
             e.dirty = !0, void (i.completeTerrainQuery[c] = !0);
         }
         const f = this.layer, d = f.getMap(), p = f.getRenderer(), m = p && p.getTerrainHelper();
@@ -5957,8 +5973,8 @@ class Fi {
             }
         }
         b.altitudeQueryFrameTime = (b.altitudeQueryFrameTime || 0) + (performance.now() - x), 
-        i.completeTerrainQuery[c] = M, M && (this.zi || (this.zi = new t.LRUCache(4 * this.layer.options.maxCacheSize)), 
-        this.zi.add(u, {
+        i.completeTerrainQuery[c] = M, M && (this.Ri || (this.Ri = new t.LRUCache(4 * this.layer.options.maxCacheSize)), 
+        this.Ri.add(u, {
             altitudeData: e,
             terrainTileInfos: y
         }));
@@ -5992,7 +6008,7 @@ class ji extends Fi {
             features: e
         }, t.iconAtlas && (o.properties.iconAtlas = t.iconAtlas.image, o.properties.iconPositions = t.iconAtlas.positions), 
         t.glyphAtlas && (o.properties.glyphAtlas = t.glyphAtlas.image), Jn(e) || (o.properties.aFeaIds = t.featureIds, 
-        this.Ji(o, t)), t.markerPlacement && (o.properties.markerPlacement = t.markerPlacement), 
+        this.Ki(o, t)), t.markerPlacement && (o.properties.markerPlacement = t.markerPlacement), 
         t.textPlacement && (o.properties.textPlacement = t.textPlacement), jn(o.properties, t.properties), 
         {
             geometry: o,
@@ -6067,6 +6083,9 @@ const Vi = r.identity([]), Ui = {
 }, Gi = [];
 
 class Wi extends ji {
+    static getBloomSymbol() {
+        return [ "polygonBloom" ];
+    }
     prepareSymbol(t) {
         const e = t.polygonFill;
         Array.isArray(e) && (3 === e.length && e.push(1), t.polygonFill = e.map(t => 255 * t));
@@ -6075,7 +6094,7 @@ class Wi extends ji {
         return this.sceneConfig.antialias || void 0 === this.sceneConfig.antialias ? "fxaa" === t || "fxaaBeforeTaa" === t : super.supportRenderMode(t);
     }
     isBloom(t) {
-        return !!this.getSymbol(t.properties.symbolIndex).polygonBloom;
+        return !!this.getSymbol(t.properties.symbolIndex)[Wi.getBloomSymbol()[0]];
     }
     forbiddenTerrainUpscale() {
         return !0;
@@ -6164,7 +6183,7 @@ class Wi extends ji {
         } ];
     }
     paint(t) {
-        this.isShadowIncludeChanged(t) && (this.shader.dispose(), this.Qi(t)), super.paint(t);
+        this.isShadowIncludeChanged(t) && (this.shader.dispose(), this.er(t)), super.paint(t);
     }
     init(t) {
         const e = this.regl, i = this.canvas, o = {
@@ -6210,7 +6229,7 @@ class Wi extends ji {
                 offset: this.getPolygonOffset()
             }
         };
-        if (this.Qi(t, l), this.pickingFBO) {
+        if (this.er(t, l), this.pickingFBO) {
             const t = [];
             this.picking = [ new n.FBORayPicking(this.renderer, {
                 vert: Ri,
@@ -6225,7 +6244,7 @@ class Wi extends ji {
             }, this.pickingFBO, this.getMap()) ];
         }
     }
-    Qi(t, e) {
+    er(t, e) {
         const i = [], o = [ {
             name: "projViewModelMatrix",
             type: "function",
@@ -6257,6 +6276,9 @@ var Bi = "#define SHADER_NAME LINE\n#define AA_CLIP_LIMIT 2.0\n#define AA_LINE_W
 const qi = r.identity([]), Xi = [];
 
 class $i extends ji {
+    static getBloomSymbol() {
+        return [ "lineBloom" ];
+    }
     prepareSymbol(t) {
         const e = t.lineColor;
         Array.isArray(e) && (3 === e.length && e.push(1), t.lineColor = e.map(t => 255 * t));
@@ -6269,7 +6291,7 @@ class $i extends ji {
         return !0;
     }
     isAnimating() {
-        if (this.tr) return !0;
+        if (this.nr) return !0;
         const t = this.getSymbols(), e = this.sceneConfig.trailAnimation;
         if (e && e.enable) return !0;
         for (let e = 0; e < t.length; e++) if (t[e].linePatternFile && t[e].linePatternAnimSpeed) return !0;
@@ -6279,7 +6301,7 @@ class $i extends ji {
         return !!super.needToRedraw() || !!this.isAnimating();
     }
     isBloom(t) {
-        return !!this.getSymbol(t.properties.symbolIndex).lineBloom;
+        return !!this.getSymbol(t.properties.symbolIndex)[$i.getBloomSymbol()[0]];
     }
     needPolygonOffset() {
         return !0;
@@ -6315,23 +6337,23 @@ class $i extends ji {
         });
         f.setLocalTransform(e), f.positionMatrix = this.getAltitudeOffsetMatrix();
         const d = {};
-        return h && (d.HAS_PATTERN = 1), f.properties.symbolIndex = r, this.er(f, d), i.data.aColor && (d.HAS_COLOR = 1), 
+        return h && (d.HAS_PATTERN = 1), f.properties.symbolIndex = r, this.ir(f, d), i.data.aColor && (d.HAS_COLOR = 1), 
         i.data.aStrokeColor && (d.HAS_STROKE_COLOR = 1), this.setMeshDefines(d, i, s), i.data.aAltitude && (d.HAS_ALTITUDE = 1), 
         f.setDefines(d), f;
     }
     addMesh(...t) {
-        delete this.tr;
+        delete this.nr;
         const e = t[0];
         Array.isArray(e) && e.forEach(t => {
-            this.nr(t);
+            this.rr(t);
         }), super.addMesh(...t);
     }
-    nr(t) {
+    rr(t) {
         if (!t.geometry.aLineWidth && t.material.get("lineWidth") <= 0 || !t.geometry.aOpacity && t.material.get("lineOpacity") <= 0) return;
         const e = t.defines;
-        this.er(t, e), t.setDefines(e), t.geometry.properties.hasPatternAnim && (this.tr = 1);
+        this.ir(t, e), t.setDefines(e), t.geometry.properties.hasPatternAnim && (this.nr = 1);
     }
-    er(t, e) {
+    ir(t, e) {
         const n = t.geometry, i = this.getSymbol(t.properties.symbolIndex);
         n.data.aDasharray || Array.isArray(i.lineDasharray) && i.lineDasharray.reduce((t, e) => t + e, 0) > 0 ? (e.HAS_DASHARRAY = 1, 
         n.data.aDasharray && (e.HAS_DASHARRAY_ATTR = 1), n.data.aDashColor && (e.HAS_DASHARRAY_COLOR = 1)) : e.HAS_DASHARRAY && delete e.HAS_DASHARRAY;
@@ -6446,7 +6468,7 @@ class $i extends ji {
         } ];
     }
     updateSceneConfig(t) {
-        t.trailAnimation && this.createShader(this.ir);
+        t.trailAnimation && this.createShader(this.or);
     }
     init(t) {
         const e = this.regl;
@@ -6464,7 +6486,7 @@ class $i extends ji {
         }, this.pickingFBO, this.getMap()) ]);
     }
     createShader(t) {
-        this.ir = t;
+        this.or = t;
         const e = [], i = {};
         this.fillIncludes(i, e, t), this.sceneConfig.trailAnimation && this.sceneConfig.trailAnimation.enable && (i.HAS_TRAIL = 1);
         const o = [];
@@ -6598,7 +6620,7 @@ class Yi extends $i {
         return this.createShapeFnTypeConfigs(t, e);
     }
     createShader(t) {
-        this.ir = t;
+        this.or = t;
         const e = [], i = {};
         this.fillIncludes(i, e, t), this.sceneConfig.trailAnimation && this.sceneConfig.trailAnimation.enable && (i.HAS_TRAIL = 1);
         const o = [];
@@ -6685,61 +6707,61 @@ class ar extends ji {
         return super.addMesh(t, e, n);
     }
     startMeshCollision(t) {
-        const {meshKey: e} = t.properties, {renderer: n} = this.rr, i = n.isForeground(t instanceof Qi ? t.meshes[0] : t);
+        const {meshKey: e} = t.properties, {renderer: n} = this.sr, i = n.isForeground(t instanceof Qi ? t.meshes[0] : t);
         if (t.properties.isForeground = i, t instanceof Qi && t.meshes.length) for (let e = 0; e < t.meshes.length; e++) t.meshes[e].properties.isForeground = i;
-        this.or = performance.now(), this.sr = this.ar(), this.lr = this.hr(e);
+        this.ar = performance.now(), this.lr = this.hr(), this.cr = this.ur(e);
     }
     endMeshCollision(t) {
-        const e = this.cr.tags[t];
-        if (this.sr && e && this.lr) {
+        const e = this.dr.tags[t];
+        if (this.lr && e && this.cr) {
             const t = this.getMap();
-            e.anchor0 = t.containerPointToCoord(this.ur), e.anchor1 = t.containerPointToCoord(this.dr), 
+            e.anchor0 = t.containerPointToCoord(this.pr), e.anchor1 = t.containerPointToCoord(this.mr), 
             e.anchor0.z = t.getZoom(), e.anchor0.width = t.width, e.anchor0.height = t.height;
         }
-        this.getMap().collisionFrameTime += performance.now() - this.or;
+        this.getMap().collisionFrameTime += performance.now() - this.ar;
     }
-    hr(t) {
-        const e = this.getMap(), n = e.getZoom(), [i, r] = this.pr(t);
-        return !i || !r || i.z !== n || i.width !== e.width || i.height !== e.height || i.distanceTo(this.ur) > 2 || r.distanceTo(this.dr) > 2;
+    ur(t) {
+        const e = this.getMap(), n = e.getZoom(), [i, r] = this.yr(t);
+        return !i || !r || i.z !== n || i.width !== e.width || i.height !== e.height || i.distanceTo(this.pr) > 2 || r.distanceTo(this.mr) > 2;
     }
-    mr() {
+    gr() {
         const e = this.getMap();
-        this.yr = {}, this.ur = new t.Point(e.width / 2, e.height / 3), this.dr = new t.Point(e.width / 2, 2 * e.height / 3), 
-        delete this.sr, this.cr || (this.cr = {
+        this.vr = {}, this.pr = new t.Point(e.width / 2, e.height / 3), this.mr = new t.Point(e.width / 2, 2 * e.height / 3), 
+        delete this.lr, this.dr || (this.dr = {
             tags: {}
-        }), this.rr = {
+        }), this.sr = {
             layer: this.layer,
             renderer: this.layer.getRenderer(),
             frameTimestamp: this.layer.getRenderer().getFrameTimestamp(),
             map: this.getMap(),
             zoom: e.getZoom(),
-            collisionTags: this.cr.tags,
+            collisionTags: this.dr.tags,
             isEnableUniquePlacement: this.isEnableUniquePlacement()
         };
     }
-    gr() {}
-    vr(t, e) {
-        const n = this.cr;
+    br() {}
+    xr(t, e) {
+        const n = this.dr;
         return n.tags[t] && n.tags[t][e];
     }
-    br(t, e, n) {
-        const i = this.cr;
+    wr(t, e, n) {
+        const i = this.dr;
         i.tags[t] = i.tags[t] || [], i.tags[t][e] = n;
     }
-    ar() {
+    hr() {
         const t = this.getMap();
         if (!t.isInteracting()) return !0;
         const e = this.layer.options.collisionFrameLimit;
         return t.collisionFrameTime <= e;
     }
-    pr(t) {
-        const e = "__meshAnchorKey".trim(), n = this.cr.tags[t];
+    yr(t) {
+        const e = "__meshAnchorKey".trim(), n = this.dr.tags[t];
         if (n && n.anchor0) {
             const {anchor0: t, anchor1: i} = n, r = t[e] = t[e] || t.x + "," + t.y, o = i[e] = i[e] || i.x + "," + i.y;
-            let s = this.yr[r], a = this.yr[o];
+            let s = this.vr[r], a = this.vr[o];
             if (!s || !a) {
                 const e = this.getMap();
-                s = this.yr[r] = e.coordToContainerPoint(t), a = this.yr[o] = e.coordToContainerPoint(i);
+                s = this.vr[r] = e.coordToContainerPoint(t), a = this.vr[o] = e.coordToContainerPoint(i);
             }
             return s.z = t.z, rr[0] = s, rr[1] = a, s.width = t.width, s.height = t.height, 
             rr;
@@ -6747,14 +6769,14 @@ class ar extends ji {
         return rr[0] = rr[1] = null, rr;
     }
     updateBoxCollisionFading(t, e, n, i, r) {
-        const {layer: o, renderer: s, zoom: a, collisionTags: l, isEnableUniquePlacement: h} = this.rr, {meshKey: c, isForeground: u} = e.properties;
-        if (h && this.xr(c, r)) return !1;
+        const {layer: o, renderer: s, zoom: a, collisionTags: l, isEnableUniquePlacement: h} = this.sr, {meshKey: c, isForeground: u} = e.properties;
+        if (h && this.Ar(c, r)) return !1;
         const f = n.length;
         let d = l[c] && l[c][r];
-        const p = d, m = this.wr && d;
+        const p = d, m = this.kr && d;
         if (!(m && 0 !== d.collides) && t) {
             const t = m && 0 === d.collides;
-            if (this.sr || t) if ((this.lr || d && d.z !== a) && (d = null), d) {
+            if (this.lr || t) if ((this.cr || d && d.z !== a) && (d = null), d) {
                 if (d.boxes && d.boxes.length) {
                     const {boxes: t, isAllowOverlap: e} = d;
                     let n = 0;
@@ -6778,19 +6800,19 @@ class ar extends ji {
                 }, d.boxes.length = 0, d.z = a;
                 let t = 0;
                 for (let e = 0; e < f; e++) {
-                    const {mesh: o, allElements: s, boxCount: a, start: l, end: h} = n[e], c = this.Ar(o, s, a, l, h, i, r);
+                    const {mesh: o, allElements: s, boxCount: a, start: l, end: h} = n[e], c = this._r(o, s, a, l, h, i, r);
                     c.isAllowOverlap && (d.isAllowOverlap = 1), 0 === t && (t = c.collides), c.boxes && d.boxes.push(...c.boxes);
                 }
-                d.collides = t, this.br(c, r, d);
+                d.collides = t, this.wr(c, r, d);
             }
         }
         let y = t && d && 0 === d.collides, g = 1, v = !1;
         if (this.sceneConfig.fading) {
-            const t = this.kr(e);
-            if (this._r) t[r] = y ? 1 : -1; else if (u && delete e.Tr, g = this.Sr(u, y, t, r), 
-            u ? (g > 0 && (y = !0), v = this.isBoxFading(e, r), v && this.setToRedraw()) : y || (this.Mr(t, r), 
+            const t = this.Tr(e);
+            if (this.Sr) t[r] = y ? 1 : -1; else if (u && delete e.Mr, g = this.Pr(u, y, t, r), 
+            u ? (g > 0 && (y = !0), v = this.isBoxFading(e, r), v && this.setToRedraw()) : y || (this.Ir(t, r), 
             g = 0), y) {
-                const n = e.Tr;
+                const n = e.Mr;
                 if (n && 1 === g && t[r] > 0) {
                     let {fadeOutDelay: t, fadingDuration: e} = this.sceneConfig;
                     Nn(e) && (e = tr), Nn(t) && (t = nr);
@@ -6802,7 +6824,7 @@ class ar extends ji {
         if (d && o.options.debugCollision && this.addCollisionDebugBox(d.boxes, d.collides ? 0 : 1), 
         y || v) {
             const {mesh: t, start: e} = n[0], i = this.getSymbol(t.properties.symbolIndex);
-            !this.Pr(i, t, e) && d && d.boxes && this.Ir(d.boxes, t);
+            !this.Or(i, t, e) && d && d.boxes && this.Cr(d.boxes, t);
         }
         if (y) {
             const t = ir[0] = 255 * g;
@@ -6818,9 +6840,9 @@ class ar extends ji {
     }
     setCollisionOpacity(t, e, n, i, r) {
         const o = e[i], s = e[r - 1];
-        this.Or(t, n, o, s);
+        this.Fr(t, n, o, s);
     }
-    Or(t, e, n, i) {
+    Fr(t, e, n, i) {
         const {aOpacity: r} = t.geometry.properties;
         if (!r) return;
         const o = n;
@@ -6831,38 +6853,38 @@ class ar extends ji {
         }
     }
     isBoxFading(t, e) {
-        const {frameTimestamp: n} = this.rr;
+        const {frameTimestamp: n} = this.sr;
         let i = this.sceneConfig.fadingDuration;
         Nn(i) && (i = tr);
-        return n - Math.abs(this.kr(t)[e]) < i;
+        return n - Math.abs(this.Tr(t)[e]) < i;
     }
-    Ar(t, e, n, i, r, o, s) {
-        const a = this.getSymbol(t.properties.symbolIndex), l = this.Pr(a, t, e[i]), h = this.Cr(a, t, e[i]);
+    _r(t, e, n, i, r, o, s) {
+        const a = this.getSymbol(t.properties.symbolIndex), l = this.Or(a, t, e[i]), h = this.Er(a, t, e[i]);
         if (!this.isEnableCollision() || l && h) return or;
         const c = this.isBoxCollides(t, e, n, i, r, o, s);
         return h && (c.collides = 0, c.isAllowOverlap = 1), c;
     }
-    Pr(t, e, n) {
+    Or(t, e, n) {
         if (!this.isEnableCollision()) return !0;
         const i = e.geometry.properties.aOverlap;
         if (!i) return 1 == +t[this.propIgnorePlacement];
         const r = i[n], o = r % 8;
         return r < 2 ? 1 == +t[this.propIgnorePlacement] : o % 2;
     }
-    Cr(t, e, n) {
+    Er(t, e, n) {
         if (!this.isEnableCollision()) return !0;
         const i = e.geometry.properties.aOverlap;
         if (!i) return 1 == +t[this.propAllowOverlap];
         const r = i[n], o = r >> 2;
         return r < 2 ? 1 == +t[this.propAllowOverlap] : o % 2;
     }
-    Ir(t) {
+    Cr(t) {
         if (Array.isArray(t[0])) for (let e = 0; e < t.length; e++) this.insertCollisionBox(t[e]); else this.insertCollisionBox(t);
     }
-    Sr(t, e, n, i) {
+    Pr(t, e, n, i) {
         let {fadingDuration: r, fadeInDelay: o, fadeOutDelay: s} = this.sceneConfig;
         Nn(r) && (r = tr), Nn(o) && (o = er), Nn(s) && (s = nr);
-        const {frameTimestamp: a} = this.rr;
+        const {frameTimestamp: a} = this.sr;
         let l = n[i], h = e ? 1 : 0;
         if (!l) return e && t && (n[i] = a + o), 0;
         if (a < Math.abs(l) && (!e && l > 0 || e && l < 0)) {
@@ -6873,31 +6895,31 @@ class ar extends ji {
         h = (a - l) / r) : (l > 0 && (n[i] = l = -(a + s)), h = 1 - (a + l) / r), (h < 0 || h > 1) && (h = Rn(h, 0, 1)), 
         h;
     }
-    kr(t) {
-        this.Fr || (this.Fr = {});
+    Tr(t) {
+        this.zr || (this.zr = {});
         const {meshKey: e} = t.properties;
-        if (!this.Fr[e]) {
-            const {frameTimestamp: t} = this.rr;
-            this.Fr[e] = {
+        if (!this.zr[e]) {
+            const {frameTimestamp: t} = this.sr;
+            this.zr[e] = {
                 timestamp: t
             };
         }
-        return this.Fr[e];
+        return this.zr[e];
     }
-    Er(t) {
-        if (!this.zr) return void (this.zr = t);
+    jr(t) {
+        if (!this.Rr) return void (this.Rr = t);
         const e = this.scene.getMeshes();
         if (e && e.length) {
             for (let n = 0; n < e.length; n++) {
-                const i = this.kr(e[n]);
-                i.timestamp < this.zr ? delete e[n]._fading_timestamps : i.timestamp = t;
+                const i = this.Tr(e[n]);
+                i.timestamp < this.Rr ? delete e[n]._fading_timestamps : i.timestamp = t;
             }
-            this.zr = t;
+            this.Rr = t;
         }
     }
-    Mr(t, e) {
+    Ir(t, e) {
         if (!t) return;
-        const {frameTimestamp: n} = this.rr;
+        const {frameTimestamp: n} = this.sr;
         let {fadingDuration: i} = this.sceneConfig;
         Nn(i) && (i = tr), t[e] = -(n - i - 1);
     }
@@ -6905,17 +6927,17 @@ class ar extends ji {
         if (t) {
             if (Array.isArray(t)) for (let e = 0; e < t.length; e++) {
                 const n = t[e].properties.meshKey;
-                this.cr && delete this.cr.tags[n], this.Fr && delete this.Fr[n];
+                this.dr && delete this.dr.tags[n], this.zr && delete this.zr[n];
             } else {
                 const e = t.properties.meshKey;
-                this.cr && delete this.cr.tags[e], this.Fr && delete this.Fr[e];
+                this.dr && delete this.dr.tags[e], this.zr && delete this.zr[e];
             }
             super.deleteMesh(t, e);
         }
     }
     delete(t) {
-        this.jr && (this.jr.geometry.dispose(), this.Rr.dispose(), this.jr.dispose(), delete this.jr, 
-        delete this.Rr, delete this.Dr), delete this.cr, super.delete(t);
+        this.Dr && (this.Dr.geometry.dispose(), this.Nr.dispose(), this.Dr.dispose(), delete this.Dr, 
+        delete this.Nr, delete this.Lr), delete this.dr, super.delete(t);
     }
     isCollides(t) {
         const e = this.layer;
@@ -6928,12 +6950,12 @@ class ar extends ji {
     addCollisionDebugBox(t, e) {
         if (t && t.length) if (Array.isArray(t[0])) for (let n = 0; n < t.length; n++) {
             const i = t[n];
-            this.Nr(i, e);
-        } else this.Nr(t, e);
+            this.Hr(i, e);
+        } else this.Hr(t, e);
     }
-    Nr(t, e) {
+    Hr(t, e) {
         if (!t) return;
-        const n = this.Lr = this.Lr || {
+        const n = this.Vr = this.Vr || {
             aPosition: [],
             aVisible: [],
             indices: []
@@ -6944,36 +6966,36 @@ class ar extends ji {
         n.indices.push(i, i + 1, i + 1, i + 2, i + 2, i + 3, i + 3, i);
     }
     updateCollision(t) {
-        super.updateCollision(t), this.mr(), this.Hr(), this.Vr && this.Vr.length && (this.Ur(), 
-        this.Vr && (this.setToRedraw(), this.scene.addMesh(this.Vr)));
-        (this.getMap().isZooming() || this.Vr && this.Vr.length) && (this.Gr(), this.Wr(this.scene.getMeshes()));
+        super.updateCollision(t), this.gr(), this.Ur(), this.Gr && this.Gr.length && (this.Wr(), 
+        this.Gr && (this.setToRedraw(), this.scene.addMesh(this.Gr)));
+        (this.getMap().isZooming() || this.Gr && this.Gr.length) && (this.Br(), this.qr(this.scene.getMeshes()));
     }
     paint(t) {
         const e = super.paint(t);
-        return this.Br(t), !1 === this.sr && this.setToRedraw(), e;
+        return this.Xr(t), !1 === this.lr && this.setToRedraw(), e;
     }
     shouldIgnoreBackground() {
-        return !this.getMap().isZooming() && !this.Vr;
+        return !this.getMap().isZooming() && !this.Gr;
     }
-    Hr() {
+    Ur() {
         const t = this.getMap(), e = t.isZooming();
-        if (!e && this.wr) {
+        if (!e && this.kr) {
             const t = this.layer.getRenderer();
-            this.Vr = this.scene.getMeshes().filter(e => !t.isForeground(e) && !e.properties.isLinePlacement);
-        } else e && !this.wr && (this.qr = t.getResolution());
-        if (e) this.Xr && (clearTimeout(this.Xr), delete this._r, delete this.Xr), this._r = this.qr && t.getResolution() > this.qr; else if (this.wr && !this.Xr) {
+            this.Gr = this.scene.getMeshes().filter(e => !t.isForeground(e) && !e.properties.isLinePlacement);
+        } else e && !this.kr && (this.$r = t.getResolution());
+        if (e) this.Yr && (clearTimeout(this.Yr), delete this.Sr, delete this.Yr), this.Sr = this.$r && t.getResolution() > this.$r; else if (this.kr && !this.Yr) {
             let {fadeOutDelay: t, fadingDuration: e} = this.sceneConfig;
-            Nn(t) && (t = nr), Nn(e) && (e = tr), this.Xr = setTimeout(() => {
-                delete this._r, delete this.Xr;
+            Nn(t) && (t = nr), Nn(e) && (e = tr), this.Yr = setTimeout(() => {
+                delete this.Sr, delete this.Yr;
             }, t + e + 1);
         }
-        this.wr = e;
+        this.kr = e;
     }
-    Br(t) {
-        if (!this.Lr || !this.layer.options.debugCollision) return;
-        this.Dr || this.$r();
-        const {aPosition: e, aVisible: i, indices: r} = this.Lr;
-        if (!this.jr) {
+    Xr(t) {
+        if (!this.Vr || !this.layer.options.debugCollision) return;
+        this.Lr || this.Jr();
+        const {aPosition: e, aVisible: i, indices: r} = this.Vr;
+        if (!this.Dr) {
             const t = new n.Geometry({
                 aPosition: [],
                 aVisible: []
@@ -6981,24 +7003,24 @@ class ar extends ji {
                 positionSize: 2,
                 primitive: "lines"
             });
-            this.jr = new n.Mesh(t), this.Yr = new n.Scene, this.Yr.addMesh(this.jr);
+            this.Dr = new n.Mesh(t), this.Zr = new n.Scene, this.Zr.addMesh(this.Dr);
         }
-        const o = this.jr.geometry;
+        const o = this.Dr.geometry;
         o.updateData("aPosition", new Float32Array(e)), o.updateData("aVisible", new Uint8Array(i)), 
-        o.setElements(r), this.Dr.render(this.Rr, {
+        o.setElements(r), this.Lr.render(this.Nr, {
             size: [ this.canvas.width, this.canvas.height ]
-        }, this.Yr, this.getRenderFBO(t)), delete this.Lr;
+        }, this.Zr, this.getRenderFBO(t)), delete this.Vr;
     }
-    $r() {
+    Jr() {
         const t = this.regl;
-        this.Dr = new n.Renderer(t);
+        this.Lr = new n.Renderer(t);
         const e = this.canvas, i = {
             x: 0,
             y: 0,
             width: () => e ? e.width : 1,
             height: () => e ? e.height : 1
         };
-        this.Rr = new n.MeshShader({
+        this.Nr = new n.MeshShader({
             vert: "attribute vec2 aPosition;\nattribute float aVisible;\nuniform vec2 size;\nvarying vec4 vColor;\nvoid main() {\n  vec2 c = (aPosition / size - .5) * 2. * vec2(1., -1.);\n  gl_Position = vec4(c, .0, 1.);\n  vColor = mix(vec4(1., .0, .0, 1.5) * .5, vec4(.0, 1., .0, 1.) * .4, aVisible);\n}",
             frag: "precision mediump float;\nvarying vec4 vColor;\nvoid main() {\n  gl_FragColor = vec4(vColor.rgb, .5);\n}",
             uniforms: [ "size" ],
@@ -7018,17 +7040,17 @@ class ar extends ji {
             }
         });
     }
-    Ur() {
+    Wr() {
         let {fadeOutDelay: t, fadingDuration: e} = this.sceneConfig;
         Nn(t) && (t = nr), Nn(e) && (e = tr);
         const n = this.layer.getRenderer(), i = n.getCurrentTileZoom(), r = n.getFrameTimestamp(), o = [];
-        for (let s = 0; s < this.Vr.length; s++) {
-            const a = this.Vr[s], l = a.properties.tile;
-            !a.Tr && n.isBackTile(l.id) && (a.Tr = r);
+        for (let s = 0; s < this.Gr.length; s++) {
+            const a = this.Gr[s], l = a.properties.tile;
+            !a.Mr && n.isBackTile(l.id) && (a.Mr = r);
             const h = l.z - i > 0 ? 2 * (l.z - i) - 1 : 2 * (i - l.z);
-            a.properties.level = h, n.isForeground(a) || a.Tr && r - a.Tr > t + e ? delete a.Tr : o.push(a);
+            a.properties.level = h, n.isForeground(a) || a.Mr && r - a.Mr > t + e ? delete a.Mr : o.push(a);
         }
-        delete this.Vr, o.length && (this.Vr = o);
+        delete this.Gr, o.length && (this.Gr = o);
     }
     isEnableCollision() {
         return this.layer.options.collision && !!this.sceneConfig.collision;
@@ -7039,7 +7061,7 @@ class ar extends ji {
     isMeshUniquePlaced(t) {
         return this.isMeshIterable(t);
     }
-    Gr() {
+    Br() {
         if (!this.isEnableUniquePlacement()) return;
         const t = this.scene.getMeshes(), e = (t, e, n, i) => {
             const {start: r, end: o} = e[0], s = t.geometry.properties, a = s.elements;
@@ -7059,29 +7081,29 @@ class ar extends ji {
             this.isMeshUniquePlaced(i) && this.forEachBox(i, e);
         }
     }
-    Wr(t) {
+    qr(t) {
         if (!this.isEnableUniquePlacement()) return;
         const e = this.getMap().getZoom();
-        let n = !this.Jr || this.Zr !== e;
-        if (!n) for (let e = 0; e < t.length; e++) if (!this.Jr[t[e].properties.meshKey]) {
+        let n = !this.Kr || this.Qr !== e;
+        if (!n) for (let e = 0; e < t.length; e++) if (!this.Kr[t[e].properties.meshKey]) {
             n = !0;
             break;
         }
         if (!n) return;
-        this.Zr = e, this.Kr = {}, this.Jr = {}, t = t.sort(hr);
+        this.Qr = e, this.to = {}, this.Kr = {}, t = t.sort(hr);
         const i = this.getMap().getGLScale(), r = {};
         for (let e = 0; e < t.length; e++) {
             const n = t[e];
             if (!n.geometry) continue;
             const {meshKey: o} = n.properties;
-            this.Jr[o] = 1;
+            this.Kr[o] = 1;
             const {uniquePlacements: s} = n.geometry.properties;
             if (s) for (let t = 0; t < s.length; t++) {
                 if (!s[t]) continue;
-                const {key: e, index: o} = s[t], a = this.kr(n), l = lr(e, i), h = r[l];
+                const {key: e, index: o} = s[t], a = this.Tr(n), l = lr(e, i), h = r[l];
                 if (h) {
                     const t = h.length, e = h[t - 3].properties.meshKey, i = h[t - 2], r = h[t - 1];
-                    this.Kr[e] = this.Kr[e] || {}, this.Kr[e][r] = 1, this.Qr(a, o, i, r), h.push(n, a, o);
+                    this.to[e] = this.to[e] || {}, this.to[e][r] = 1, this.eo(a, o, i, r), h.push(n, a, o);
                 } else r[l] = [ n, a, o ];
             }
         }
@@ -7094,16 +7116,16 @@ class ar extends ji {
             }
         }
     }
-    Qr(t, e, n, i) {
+    eo(t, e, n, i) {
         if (void 0 !== n[i]) if (void 0 === t[e]) t[e] = n[i]; else {
             let r = t[e];
             Math.abs(n[i]) > Math.abs(r) ? t[e] = n[i] : n[i] = t[e];
         } else void 0 !== t[e] && (n[i] = t[e]);
     }
-    xr(t, e) {
-        return this.Kr && this.Kr[t] && this.Kr[t][e];
+    Ar(t, e) {
+        return this.to && this.to[t] && this.to[t][e];
     }
-    to(t, e) {
+    no(t, e) {
         const {symbolIndex: n} = t.properties, i = n.type || 0;
         let r = t.properties._collidesBoxes;
         r || (r = t.properties._collidesBoxes = []);
@@ -7121,15 +7143,15 @@ class ar extends ji {
         }
         return o[s];
     }
-    eo(t) {
-        let e = this.no;
-        if (e || (e = this.no = []), !e[t]) {
+    io(t) {
+        let e = this.ro;
+        if (e || (e = this.ro = []), !e[t]) {
             e[t] = [];
             for (let n = 0; n < t; n++) e[t][n] = {};
         }
         return e[t];
     }
-    io(t) {
+    oo(t) {
         if (!t || !t.geometry) return !0;
         if (!t.geometry.properties.glyphAtlas || !t.material.get("isHalo") || t.geometry.data.aTextHaloRadius && t.geometry.properties.hasHalo) return !1;
         if (t.geometry.data.aTextHaloRadius && !t.geometry.properties.hasHalo) return !0;
@@ -7613,7 +7635,7 @@ function Jr(t, e, n, i, r, o, s) {
     let v = Yr;
     const b = 3 * n[r];
     g && -999999 !== g[b] ? (Yr[0] = g[b], Yr[1] = g[b + 1], Yr[2] = g[b + 2]) : v = fi(Yr, y, s, a.width, a.height);
-    const x = i, {boxes: w, collision: A} = this.to(e, r);
+    const x = i, {boxes: w, collision: A} = this.no(e, r);
     let k = 0;
     if (c || 1 === e.material.uniforms.rotateWithMap || h.textRotation) {
         let i = 0;
@@ -7706,7 +7728,7 @@ function oo(t, e) {
     return [ {
         attrName: "aMarkerWidth",
         symbolName: "markerWidth",
-        type: Uint8Array,
+        type: Uint16Array,
         width: 1,
         define: "HAS_MARKER_WIDTH",
         evaluate: (i, r, o, s) => {
@@ -7718,7 +7740,7 @@ function oo(t, e) {
     }, {
         attrName: "aMarkerHeight",
         symbolName: "markerHeight",
-        type: Uint8Array,
+        type: Uint16Array,
         width: 1,
         define: "HAS_MARKER_HEIGHT",
         evaluate: (n, r, o, s) => {
@@ -7934,10 +7956,10 @@ function ho(t, e) {
     if (r.isFitConstant || !r.labelShape || !r.labelShape.length) return;
     const o = this.getSymbolDef(e.properties.symbolIndex), s = this.getSymbolDef(n.properties.symbolIndex).textSize;
     let a;
-    p(s) && (a = i.ro ? i.ro : i.ro = g(s));
+    p(s) && (a = i.so ? i.so : i.so = g(s));
     const l = o.markerTextFitPadding || lo;
     let h;
-    p(l) && (h = r.oo ? r.oo : r.oo = y(l));
+    p(l) && (h = r.ao ? r.ao : r.ao = y(l));
     const c = t.getZoom(), {fitIcons: u, fitWidthIcons: f, fitHeightIcons: d} = r, {aMarkerWidth: m, aMarkerHeight: v, labelShape: b} = r, x = r.elements || e.elements, {features: w, aPickingId: A} = r, k = (t, e, n, i) => {
         const o = b[4 * e], u = b[4 * e + 1], f = b[4 * e + 2], d = b[4 * e + 3];
         if (!(o || u || f || d)) return;
@@ -7993,25 +8015,28 @@ function ho(t, e) {
 
 const co = function(t) {
     const e = this.layer.getRenderer();
-    return !this.io(t) && e.isForeground(t) && !!t.geometry.properties.iconAtlas && !t.geometry.properties.isEmpty;
+    return !this.oo(t) && e.isForeground(t) && !!t.geometry.properties.iconAtlas && !t.geometry.properties.isEmpty;
 }, uo = function(t) {
     const e = this.layer.getRenderer();
-    return !(this.io(t) || e.isForeground(t) || !t.geometry.properties.iconAtlas || t.geometry.properties.isEmpty);
+    return !(this.oo(t) || e.isForeground(t) || !t.geometry.properties.iconAtlas || t.geometry.properties.isEmpty);
 }, fo = function(t) {
     const e = this.layer.getRenderer();
-    return !this.io(t) && e.isForeground(t) && !!t.geometry.properties.glyphAtlas;
+    return !this.oo(t) && e.isForeground(t) && !!t.geometry.properties.glyphAtlas;
 }, po = function(t) {
     const e = this.layer.getRenderer();
-    return !this.io(t) && !e.isForeground(t) && !!t.geometry.properties.glyphAtlas;
+    return !this.oo(t) && !e.isForeground(t) && !!t.geometry.properties.glyphAtlas;
 }, mo = [], yo = {
     collides: -1
 }, go = [ 2048, 2048 ], vo = r.identity([]), bo = [];
 
 class xo extends ar {
+    static getBloomSymbol() {
+        return [ "markerBloom", "textBloom" ];
+    }
     constructor(t, e, n, i, r, o) {
         super(t, e, n, i, r, o), this.propAllowOverlap = "markerAllowOverlap", this.propIgnorePlacement = "markerIgnorePlacement", 
-        this.Ri = {}, this.isLabelCollides = Jr.bind(this), this.so = co.bind(this), this.ao = uo.bind(this), 
-        this.lo = fo.bind(this), this.ho = po.bind(this), this.co = [];
+        this.Ni = {}, this.isLabelCollides = Jr.bind(this), this.lo = co.bind(this), this.ho = uo.bind(this), 
+        this.co = fo.bind(this), this.uo = po.bind(this), this.fo = [];
     }
     needToRefreshTerrainTile() {
         for (let t = 0; t < this.symbolDef.length; t++) {
@@ -8027,7 +8052,7 @@ class xo extends ar {
         return super.isTerrainSkin() && this.needToRefreshTerrainTile();
     }
     setTextShaderDefines(t) {
-        this.uo = t;
+        this.do = t;
     }
     createFnTypeConfig(t, e) {
         return {
@@ -8036,7 +8061,7 @@ class xo extends ar {
         };
     }
     startFrame(...t) {
-        return this.co.length = 0, super.startFrame(...t);
+        return this.fo.length = 0, super.startFrame(...t);
     }
     createGeometry(t, e) {
         return t && t.empty && (t.data = {
@@ -8046,8 +8071,8 @@ class xo extends ar {
     }
     postCreateGeometry(t, e) {
         const {geometry: n, symbolIndex: i} = t, r = this.getSymbolDef(i), o = this.getFnTypeConfig(i);
-        if (this.fo(n)) n.properties.iconAtlas ? this.drawDebugAtlas(n.properties.iconAtlas) : n.properties.isEmpty = !0, 
-        ro(n, r, o.icon); else if (this.do(n) && Xn(r)) {
+        if (this.po(n)) n.properties.iconAtlas ? this.drawDebugAtlas(n.properties.iconAtlas) : n.properties.isEmpty = !0, 
+        ro(n, r, o.icon); else if (this.mo(n) && Xn(r)) {
             const t = e[e.length - 1];
             if (t) {
                 const {geometry: e, symbolIndex: o} = t;
@@ -8058,7 +8083,7 @@ class xo extends ar {
             }
         }
     }
-    po(t) {
+    yo(t) {
         const {collideIds: e, elements: n, aCount: i} = t.properties;
         if (!e) return;
         const r = e, o = {};
@@ -8073,7 +8098,7 @@ class xo extends ar {
         const o = this.isEnableCollision(), s = 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.fo(a)) {
+        if (this.po(a)) {
             const t = function(t, e, i, r, o, s, a, l) {
                 if (e.isDisposed() || 0 === e.data.aPosition.length) return null;
                 const h = e.properties.iconAtlas;
@@ -8118,25 +8143,25 @@ class xo extends ar {
             }(this.regl, a, e, 0, c, u.icon, s.options.collision, !o, this.isEnableUniquePlacement());
             t && (t.positionMatrix = this.getAltitudeOffsetMatrix(), delete t.geometry.properties.glyphAtlas, 
             f.push(t));
-        } else if (this.do(a)) {
+        } else if (this.mo(a)) {
             const t = Vr.call(this, this.regl, a, e, h, c, u.text, s.options.collision, !o, this.isEnableUniquePlacement());
             t.length && (t.forEach(t => {
                 t.positionMatrix = this.getAltitudeOffsetMatrix(), delete t.geometry.properties.iconAtlas;
             }), f.push(...t));
         }
-        return "line" === a.properties.markerPlacement && this.mo(a, r), "line" === a.properties.markerPlacement && f.forEach(t => t.properties.isLinePlacement = !0), 
-        this.po(a), f;
+        return "line" === a.properties.markerPlacement && this.vo(a, r), "line" === a.properties.markerPlacement && f.forEach(t => t.properties.isLinePlacement = !0), 
+        this.yo(a), f;
     }
-    mo(t, e) {
+    vo(t, e) {
         const {collideIds: n} = t.properties, i = new Uint16Array(n.length);
-        if (this.fo(t)) {
+        if (this.po(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 = Yn(i), e.markerCollideMap = {
                 old: n,
                 new: i
             };
-        } else if (this.do(t)) {
+        } else if (this.mo(t)) {
             const {collideIds: n, aCount: i} = t.properties;
             if (!i) return;
             if (e.markerCollideMap) {
@@ -8163,7 +8188,7 @@ class xo extends ar {
         if (this.isEnableCollision() && t.length > 0) {
             const e = new Qi(t);
             e.properties.uniqueCollideIds = t[0].geometry.properties.uniqueCollideIds, e.properties.meshKey = t[0].properties.meshKey, 
-            e.properties.level = t[0].properties.level, this.co.push(e);
+            e.properties.level = t[0].properties.level, this.fo.push(e);
         }
         for (let e = 0; e < t.length; e++) {
             if (!this.isMeshIterable(t[e])) continue;
@@ -8186,31 +8211,31 @@ class xo extends ar {
         if (!this.isEnableCollision()) return;
         super.updateCollision(t);
         const e = this.scene.getMeshes();
-        e && e.length ? (this.yo(t.timestamp), this.co = [], this.gr()) : this.gr();
+        e && e.length ? (this.bo(t.timestamp), this.fo = [], this.br()) : this.br();
     }
     callCurrentTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.so, e.sceneFilter ] : this.so, this.callRenderer(this.shader, t, e), 
-        this.vo.filter = e.sceneFilter ? [ this.lo, e.sceneFilter ] : this.lo, this.callRenderer(this.vo, t, e);
+        this.shader.filter = e.sceneFilter ? [ this.lo, e.sceneFilter ] : this.lo, this.callRenderer(this.shader, t, e), 
+        this.xo.filter = e.sceneFilter ? [ this.co, e.sceneFilter ] : this.co, this.callRenderer(this.xo, t, e);
     }
     callBackgroundTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.ao, e.sceneFilter ] : this.ao, this.callRenderer(this.shader, t, e), 
-        this.vo.filter = e.sceneFilter ? [ this.ho, e.sceneFilter ] : this.ho, this.callRenderer(this.vo, t, e);
+        this.shader.filter = e.sceneFilter ? [ this.ho, e.sceneFilter ] : this.ho, this.callRenderer(this.shader, t, e), 
+        this.xo.filter = e.sceneFilter ? [ this.uo, e.sceneFilter ] : this.uo, this.callRenderer(this.xo, t, 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));
     }
-    yo() {
+    bo() {
         if (!this.isEnableCollision()) return;
-        let t = this.co;
-        t && t.length && this.bo(t);
+        let t = this.fo;
+        t && t.length && this.wo(t);
     }
-    xo(t, e, n, i) {
+    Ao(t, e, n, i) {
         return this.updateBoxCollisionFading(!0, t, e, n, i);
     }
     isEnableUniquePlacement() {
         return this.isEnableCollision() && !0 === this.sceneConfig.uniquePlacement;
     }
-    bo(t) {
+    wo(t) {
         const e = this.layer.getRenderer();
         t = t.sort(wo);
         for (let n = 0; n < t.length; n++) {
@@ -8225,12 +8250,12 @@ class xo extends ar {
             const o = e.isForeground(i.meshes[0]);
             if (this.shouldIgnoreBackground() && !o) continue;
             const s = i.properties.meshKey;
-            this.startMeshCollision(i), this.wo(i), this.forEachBox(i, this.xo), this.Ao(i), 
+            this.startMeshCollision(i), this.ko(i), this.forEachBox(i, this.Ao), this._o(i), 
             this.endMeshCollision(s);
-            for (let t = 0; t < i.meshes.length; t++) this.ko(i.meshes[t]);
+            for (let t = 0; t < i.meshes.length; t++) this.To(i.meshes[t]);
         }
     }
-    ko(t) {
+    To(t) {
         const e = t && t.geometry && t.geometry.properties.aOpacity;
         e && e.dirty && (t.geometry.updateData("aOpacity", e), e.dirty = !1);
     }
@@ -8240,9 +8265,9 @@ class xo extends ar {
         const i = {
             boxIndex: 0
         }, r = n.length;
-        for (let o = 0; o < r; o++) this._o(t, n[o], e, i);
+        for (let o = 0; o < r; o++) this.So(t, n[o], e, i);
     }
-    _o(t, e, n, i) {
+    So(t, e, n, i) {
         const o = this.getMap(), {collideBoxIndex: s} = t.meshes[0].geometry.properties;
         if (!(s && s[e])) return !1;
         const a = r.multiply(mo, o.projViewMatrix, t.meshes[0].localTransform);
@@ -8255,7 +8280,7 @@ class xo extends ar {
             n[e] && u++;
         }
         if (!u) return !1;
-        l = this.eo(u);
+        l = this.io(u);
         let f = 0;
         for (let t = 0; t < c.length; t++) {
             const n = c[t];
@@ -8271,16 +8296,16 @@ class xo extends ar {
             l[f].allElements = r, f++;
         }
         if (!h) return !1;
-        return n.call(this, t, l, a, i.boxIndex++) && this.To(t, e), !0;
+        return n.call(this, t, l, a, i.boxIndex++) && this.Mo(t, e), !0;
     }
-    wo(t) {
+    ko(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);
         }
     }
-    To(t, e) {
+    Mo(t, e) {
         const n = t.meshes;
         for (let t = 0; t < n.length; t++) {
             const i = n[t];
@@ -8295,7 +8320,7 @@ class xo extends ar {
             a.count = u;
         }
     }
-    Ao(t) {
+    _o(t) {
         const e = t.meshes;
         for (let t = 0; t < e.length; t++) {
             const n = e[t], i = n && n.geometry;
@@ -8305,13 +8330,13 @@ class xo extends ar {
         }
     }
     isBoxCollides(t, e, n, i, r, o) {
-        if (this.do(t.geometry)) return Jr.call(this, 0, t, e, n, i, r, o);
+        if (this.mo(t.geometry)) return Jr.call(this, 0, t, e, n, i, r, o);
         if (t.geometry.properties.isEmpty) return yo;
         const {aTerrainAltitude: s} = t.geometry.properties;
         if (s) {
             if (s[2 * e[i]] === yt) return yo;
         }
-        const a = this.getMap(), {boxes: l, collision: h} = this.to(t, i);
+        const a = this.getMap(), {boxes: l, collision: h} = this.no(t, i);
         let c = 0, u = 0, f = 0;
         for (let n = i; n < r; n += 6) {
             const i = l[f] = l[f] || [];
@@ -8377,8 +8402,8 @@ class xo extends ar {
             } ],
             extraCommandProps: i
         }), this.shader.version = 300;
-        const {uniforms: o, extraCommandProps: s} = Wr.call(this, e, this.sceneConfig), a = this.uo || {};
-        if (this.vo = new n.MeshShader({
+        const {uniforms: o, extraCommandProps: s} = Wr.call(this, e, this.sceneConfig), a = this.do || {};
+        if (this.xo = new n.MeshShader({
             vert: to,
             frag: eo,
             uniforms: o,
@@ -8438,15 +8463,15 @@ class xo extends ar {
         };
     }
     getUniqueEntryKey(t, e) {
-        if (!this.do(t.geometry)) return null;
+        if (!this.mo(t.geometry)) return null;
         const {elements: n} = t.geometry.properties;
         return Zr(t, n[e]);
     }
-    fo(t) {
+    po(t) {
         const {symbolIndex: e} = t.properties;
         return 0 === e.type;
     }
-    do(t) {
+    mo(t) {
         const {symbolIndex: e} = t.properties;
         return 1 === e.type;
     }
@@ -8475,13 +8500,13 @@ function To(t, e, n, r, o, s, a, l, c, u, f, d, p) {
         const F = (_ - O) / C, E = m && m.getRenderer(), z = E && E.getTerrainHelper(), j = e.properties.tile.terrainTileInfos;
         if (!g && z) {
             const {extent: n} = e.properties.tile, i = m.getTileSize().width / n, r = m.getMap();
-            let o = P.sub(I).mult(F).li(I);
+            let o = P.sub(I).mult(F).ci(I);
             S = bi(di, r, e, P, i, m, y, j), M = bi(pi, r, e, I, i, m, y, j), o = bi(mi, r, e, o, i, m, y, j);
             const s = A + Math.atan2(S[1] - M[1], S[0] - M[0]);
             return t[0] = (o[0] - p[0]) / d, t[1] = (o[1] - p[1]) / d, t[2] = s, t;
         }
-        const R = S.sub(M), D = R.mult(F).li(M);
-        D.li(R.gi().vi().fi(a * w));
+        const R = S.sub(M), D = R.mult(F).ci(M);
+        D.ci(R.bi().xi().pi(a * w));
         const N = A + Math.atan2(S.y - M.y, S.x - M.x);
         return t[0] = (D.x - i[0]) / d, t[1] = (D.y - i[1]) / d, t[2] = N, t;
     }(t, e, r, s, a, _, k[0], k[1], T[0], T[1], T[2], n / 24, c, l, u, f, d, p);
@@ -8506,23 +8531,26 @@ var Io = "#define SHADER_NAME TEXT_LINE\n#ifdef HAS_ALTITUDE\nattribute vec2 aPo
 
 const Oo = function(t) {
     const e = this.layer.getRenderer();
-    return !this.io(t) && e.isTileNearCamera(t) && "line" !== t.geometry.properties.textPlacement;
+    return !this.oo(t) && e.isTileNearCamera(t) && "line" !== t.geometry.properties.textPlacement;
 }, Co = function(t) {
     const e = this.layer.getRenderer();
-    return !this.io(t) && !e.isForeground(t) && "line" !== t.geometry.properties.textPlacement;
+    return !this.oo(t) && !e.isForeground(t) && "line" !== t.geometry.properties.textPlacement;
 }, Fo = function(t) {
     const e = this.layer.getRenderer();
-    return !this.io(t) && e.isTileNearCamera(t) && "line" === t.geometry.properties.textPlacement;
+    return !this.oo(t) && e.isTileNearCamera(t) && "line" === t.geometry.properties.textPlacement;
 }, Eo = function(t) {
     const e = this.layer.getRenderer(), n = t.properties.tile.z, i = e.getCurrentTileZoom();
-    return !this.io(t) && !e.isForeground(t) && "line" === t.geometry.properties.textPlacement && n < i;
+    return !this.oo(t) && !e.isForeground(t) && "line" === t.geometry.properties.textPlacement && n < i;
 }, zo = [ 0, 0, 3 ], jo = [], Ro = [], Do = [], No = [], Lo = [], Ho = [], Vo = [], Uo = [], Go = [ 1, -1 ], Wo = new Int16Array(3), Bo = [], qo = [], Xo = [], $o = [], Yo = [], Jo = [], Zo = [], Ko = {}, Qo = {}, ts = {}, es = [], ns = [], is = r.identity([]);
 
 class rs extends ar {
+    static getBloomSymbol() {
+        return [ "textBloom" ];
+    }
     constructor(t, e, n, i, r, o) {
         super(t, e, n, i, r, o), this.propAllowOverlap = "textAllowOverlap", this.propIgnorePlacement = "textIgnorePlacement", 
-        this.colorCache = {}, this.So = Oo.bind(this), this.Mo = Co.bind(this), this.Po = Fo.bind(this), 
-        this.Io = Eo.bind(this), this.isLabelCollides = Jr.bind(this), this.Oo();
+        this.colorCache = {}, this.Po = Oo.bind(this), this.Io = Co.bind(this), this.Oo = Fo.bind(this), 
+        this.Co = Eo.bind(this), this.isLabelCollides = Jr.bind(this), this.Fo();
     }
     prepareRender(...t) {
         super.prepareRender(...t);
@@ -8534,34 +8562,34 @@ class rs extends ar {
         }
     }
     updateSymbol(...t) {
-        this.Co = void 0, this.Fo = void 0;
+        this.Eo = void 0, this.zo = void 0;
         const e = super.updateSymbol(...t);
-        return this.Oo(), e;
+        return this.Fo(), e;
     }
     isTerrainVector() {
         if (!super.isTerrainSkin()) return !1;
-        if (void 0 !== this.Co) return this.Co;
+        if (void 0 !== this.Eo) return this.Eo;
         for (let t = 0; t < this.symbolDef.length; t++) {
-            if ("map" !== this.symbolDef[t].textPitchAlignment) return this.Co = !0, !0;
+            if ("map" !== this.symbolDef[t].textPitchAlignment) return this.Eo = !0, !0;
         }
-        return this.Co = !1, !1;
+        return this.Eo = !1, !1;
     }
     isTerrainSkin() {
         if (!super.isTerrainSkin()) return !1;
-        if (void 0 !== this.Fo) return this.Fo;
+        if (void 0 !== this.zo) return this.zo;
         for (let t = 0; t < this.symbolDef.length; t++) {
             const e = this.symbolDef[t].textPitchAlignment;
-            if ("map" === e || p(e) || x.isExpression(e)) return this.Fo = !0, !0;
+            if ("map" === e || p(e) || x.isExpression(e)) return this.zo = !0, !0;
         }
-        return this.Fo = !1, !1;
+        return this.zo = !1, !1;
     }
-    Oo() {
-        this.Eo = [];
+    Fo() {
+        this.jo = [];
         for (let t = 0; t < this.symbolDef.length; t++) {
             const e = this.symbolDef[t];
             if (x.isExpression(e.textName)) {
                 const n = x.createExpression(e.textName, "string");
-                this.Eo[t] = (t, e) => {
+                this.jo[t] = (t, e) => {
                     let i;
                     Ko.zoom = t, Qo.properties = e;
                     try {
@@ -8571,7 +8599,7 @@ class rs extends ar {
                     }
                     return i;
                 };
-            } else p(e.textName) && (this.Eo[t] = g(e.textName));
+            } else p(e.textName) && (this.jo[t] = g(e.textName));
         }
     }
     shouldDeleteMeshOnUpdateSymbol(t) {
@@ -8583,7 +8611,7 @@ class rs extends ar {
         return Br(t, e);
     }
     isBloom(t) {
-        return !!this.getSymbol(t.properties.symbolIndex).textBloom;
+        return !!this.getSymbol(t.properties.symbolIndex)[rs.getBloomSymbol()[0]];
     }
     createGeometry(t, e, n) {
         const i = t;
@@ -8600,7 +8628,7 @@ class rs extends ar {
         o.properties.symbolIndex = s;
         const a = this.getSymbol(s), l = this.getSymbolDef(s), h = this.getFnTypeConfig(s), c = Vr.call(this, this.regl, o, e, l, a, h, this.layer.options.collision, !i, r);
         if (c.length) {
-            "line" === o.properties.textPlacement ? this.zo = !0 : this.jo = !0;
+            "line" === o.properties.textPlacement ? this.Ro = !0 : this.Do = !0;
         }
         return c.forEach(t => {
             t.positionMatrix = this.getAltitudeOffsetMatrix(), t.properties.tileVectorTransform = n;
@@ -8609,21 +8637,21 @@ class rs extends ar {
     updateCollision(t) {
         super.updateCollision(t);
         const e = this.scene.getMeshes();
-        e && e.length ? (this.Ro = {}, this.Do(t.timestamp), this.gr()) : this.gr();
+        e && e.length ? (this.No = {}, this.Lo(t.timestamp), this.br()) : this.br();
     }
     callCurrentTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.So, e.sceneFilter ] : this.So, this.callRenderer(this.shader, t, e), 
-        this.No.filter = e.sceneFilter ? [ this.Po, e.sceneFilter ] : this.Po, this.callRenderer(this.No, t, e);
+        this.shader.filter = e.sceneFilter ? [ this.Po, e.sceneFilter ] : this.Po, this.callRenderer(this.shader, t, e), 
+        this.Ho.filter = e.sceneFilter ? [ this.Oo, e.sceneFilter ] : this.Oo, this.callRenderer(this.Ho, t, e);
     }
     callBackgroundTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.Mo, e.sceneFilter ] : this.Mo, this.callRenderer(this.shader, t, e), 
-        this.No.filter = e.sceneFilter ? [ this.Io, e.sceneFilter ] : this.Io, this.callRenderer(this.No, t, e);
+        this.shader.filter = e.sceneFilter ? [ this.Io, e.sceneFilter ] : this.Io, this.callRenderer(this.shader, t, e), 
+        this.Ho.filter = e.sceneFilter ? [ this.Co, e.sceneFilter ] : this.Co, this.callRenderer(this.Ho, t, e);
     }
     callRenderer(t, e, n) {
         n && n.isRenderingTerrain && p(this.symbolDef.textPitchAlignment) && (n.isRenderingTerrainSkin ? e.textPitchFilter = 1 : e.textPitchFilter = 2), 
         super.callRenderer(t, e, n);
     }
-    Do() {
+    Lo() {
         let t = this.scene.getMeshes();
         if (!t || !t.length) return;
         const e = -this.getMap().getBearing() * Math.PI / 180, n = c.fromRotation(Do, e), i = (t, e, n, i) => {
@@ -8648,7 +8676,7 @@ class rs extends ar {
             const h = s.properties.meshKey;
             if ("line" === a.properties.textPlacement) {
                 if (!a.properties.line) continue;
-                r && this.startMeshCollision(s), this.Lo(s, n);
+                r && this.startMeshCollision(s), this.Vo(s, n);
                 const {aOffset: t, aOpacity: e} = a.properties;
                 t.dirty && (a.updateData("aOffset", t), t.dirty = !1), e && e.dirty && (a.updateData("aOpacity", e), 
                 e.dirty = !1), r && this.endMeshCollision(h);
@@ -8673,7 +8701,7 @@ class rs extends ar {
     getUniqueEntryKey(t, e) {
         return Zr(t, e);
     }
-    Lo(t, e) {
+    Vo(t, e) {
         const n = this.getMap(), i = t.geometry, o = i.properties;
         let s = o.line;
         if (!s) return;
@@ -8681,13 +8709,13 @@ class rs extends ar {
         if (!a) {
             const e = r.multiply(jo, n.projViewMatrix, t.localTransform), i = s.id + "-" + e.join();
             let a;
-            this.Ro[i] ? s = this.Ro[i] : (a = o.projectedLine = o.projectedLine || new Array(s.length), 
-            s = this.Ho(a, s, e, n.width, n.height), this.Ro[i] = a);
+            this.No[i] ? s = this.No[i] : (a = o.projectedLine = o.projectedLine || new Array(s.length), 
+            s = this.Uo(a, s, e, n.width, n.height), this.No[i] = a);
         }
         const h = this.isEnableCollision(), c = i.properties.visElemts = i.properties.visElemts || new l.constructor(l.length);
         h && (c.count = 0), this.forEachBox(t, (t, n, i, r) => {
             const {start: o, end: u} = n[0];
-            let f = this.Vo(t, l, o, u, s, i, a ? e : null, r);
+            let f = this.Go(t, l, o, u, s, i, a ? e : null, r);
             if (h && (f = this.updateBoxCollisionFading(f, t, n, i, r), f)) {
                 let t = c.count;
                 for (let e = o; e < u; e++) c[t++] = l[e];
@@ -8697,7 +8725,7 @@ class rs extends ar {
         const u = t.geometry.properties.aAltitude;
         u && u.dirty && (i.updateData("aAltitude", u), u.dirty = !1), !h || c.count === l.length && i.count === c.count || i.setElements(c, c.count);
     }
-    Ho(t, e, n, i, r) {
+    Uo(t, e, n, i, r) {
         return function(t, e, n, i, r) {
             for (let o = 0; o < e.length; o += 3) a.set(ui, e[o], e[o + 1], e[o + 2], 1), fi(ui, ui, n, i, r), 
             t[o] = ui[0], t[o + 1] = ui[1], t[o + 2] = e[o + 2];
@@ -8707,7 +8735,7 @@ class rs extends ar {
     forEachBox(t, e) {
         const n = this.getMap(), i = r.multiply(jo, n.projViewMatrix, t.properties.tileVectorTransform), {collideIds: o, aCount: s, features: a, elements: l} = t.geometry.properties, h = o;
         if (!h) return;
-        const c = this.isEnableUniquePlacement(), u = this.eo(1);
+        const c = this.isEnableUniquePlacement(), u = this.io(1);
         u[0].allElements = l, u[0].mesh = t;
         let f = 0, d = l[0], p = 0, m = h[d];
         for (let n = 0; n <= l.length; n += 6) if (d = l[n], h[d] !== m || n === l.length) {
@@ -8715,7 +8743,7 @@ class rs extends ar {
             if (c && this.isMeshUniquePlaced(t) && r && !r.label) {
                 const e = r.properties || {};
                 e.$layer = r.layer, e.$type = r.type;
-                const {symbolIndex: n} = t.properties, i = n && this.Eo[n.index] ? this.Eo[n.index](t.properties.z, e) : this.getSymbol(t.properties.symbolIndex).textName, o = E.resolveText(i, e);
+                const {symbolIndex: n} = t.properties, i = n && this.jo[n.index] ? this.jo[n.index](t.properties.z, e) : this.getSymbol(t.properties.symbolIndex).textName, o = E.resolveText(i, e);
                 delete e.$layer, delete e.$type, r.label = o;
             }
             const o = n, y = s[l[p]];
@@ -8724,7 +8752,7 @@ class rs extends ar {
             m = h[d], p = n;
         }
     }
-    Vo(t, e, n, o, s, a, l) {
+    Go(t, e, n, o, s, a, l) {
         const c = this.layer.getRenderer(), f = t.material.uniforms, d = 1 === f.pitchWithMap, p = !d && c.getTerrainHelper && c.getTerrainHelper(), m = this.isEnableCollision(), y = this.getMap(), g = t.geometry, v = g.desc.positionSize, {aShape: b, aOffset: x, aAnchor: A, aAltitude: k, aPitchRotation: _} = g.properties;
         let {aProjectedAnchor: T} = g.properties;
         T || (T = g.properties.aProjectedAnchor = new Array(A.length / v * 3)), T.fill(-999999);
@@ -8742,7 +8770,7 @@ class rs extends ar {
         M && (O = C), T[3 * P] = E[0], T[3 * P + 1] = E[1], T[3 * P + 2] = E[2];
         const z = M ? 1 : g.properties.tileExtent / this.layer.getTileSize().width;
         let j = !0;
-        const R = e[n], D = e[o - 1], N = S ? S[R] : t.properties.textSize, L = this.Uo(t, N, s, R, D, O, No, z, l);
+        const R = e[n], D = e[o - 1], N = S ? S[R] : t.properties.textSize, L = this.Wo(t, N, s, R, D, O, No, z, l);
         if (null === L) return os(x, e, n, o), !1;
         const H = D - R <= 3, V = Math.floor(L / 2), U = L % 2;
         for (let l = n; l < o; l += 6) {
@@ -8777,7 +8805,7 @@ class rs extends ar {
         }
         return j;
     }
-    Uo(t, e, n, i, r, o, s, a, l) {
+    Wo(t, e, n, i, r, o, s, a, l) {
         const h = r - i <= 3, c = this.getMap();
         return h ? 0 : Po.call(this, Jo, Zo, t, e, n, i, r, o, s, a, c.width / c.height, l);
     }
@@ -8790,7 +8818,7 @@ class rs extends ar {
         }) : t.material && delete t.material.uniforms.texture), super.deleteMesh(t, e));
     }
     delete() {
-        super.delete(), this.No.dispose(), delete this.Ro, this.Go && this.Go.dispose();
+        super.delete(), this.Ho.dispose(), delete this.No, this.Bo && this.Bo.dispose();
     }
     needClearStencil() {
         return !0;
@@ -8812,7 +8840,7 @@ class rs extends ar {
         });
         let s = i;
         if (this.layer.getRenderer().isEnableWorkAround("win-intel-gpu-crash") && (s = jn({}, i), 
-        s.stencil = jn({}, i.stencil), s.stencil.enable = !0), this.No = new n.MeshShader({
+        s.stencil = jn({}, i.stencil), s.stencil.enable = !0), this.Ho = new n.MeshShader({
             vert: Io,
             frag: eo,
             uniforms: e,
@@ -9200,23 +9228,23 @@ class vs extends Fi {
         r;
     }
     needPolygonOffset() {
-        return this.Wo;
+        return this.qo;
     }
     startFrame(...t) {
-        return delete this.Wo, super.startFrame(...t);
+        return delete this.qo, super.startFrame(...t);
     }
     addMesh(t, e) {
         t.forEach(t => {
-            this.nr(t, e);
+            this.rr(t, e);
         }), super.addMesh(...arguments);
     }
-    nr(t, e) {
+    rr(t, e) {
         if (null !== e) {
             const n = t.localTransform;
             0 === e && (e = .01), ps[2] = e, r.fromScaling(n, ps), r.multiply(n, t.properties.tileTransform, n), 
             t.setLocalTransform(n);
         } else t.setLocalTransform(t.properties.tileTransform);
-        t.material !== this.material && t.setMaterial(this.material), t.geometry.properties.maxAltitude <= 0 && (this.Wo = !0), 
+        t.material !== this.material && t.setMaterial(this.material), t.geometry.properties.maxAltitude <= 0 && (this.qo = !0), 
         this.getSymbol(t.properties.symbolIndex).ssr ? t.ssr = 1 : t.ssr = 0;
     }
     deleteMesh(t, e) {
@@ -9274,9 +9302,9 @@ class vs extends Fi {
             return !1;
         }(this.symbolDef[0].material || {}, t.material));
         const i = super.updateSymbol(t, e);
-        return t && t.material && this.Bn(t.material), n || i;
+        return t && t.material && this.Xn(t.material), n || i;
     }
-    Di(t, e) {
+    Li(t, e) {
         return bs(t) !== bs(e);
     }
 }
@@ -9301,7 +9329,7 @@ class ws extends vs {
             e.aExtrusionOpacity = t;
         }
         const r = new n.Geometry(e, t.indices);
-        return jn(r.properties, t.properties), this.Ji(r, t), {
+        return jn(r.properties, t.properties), this.Ki(r, t), {
             geometry: r,
             symbolIndex: {
                 index: 0
@@ -9321,14 +9349,14 @@ class ws extends vs {
         return this.shader;
     }
     delete(t) {
-        this.getMap().off("updatelights", this.Bo, this), super.delete(t), this.material.dispose();
+        this.getMap().off("updatelights", this.Xo, this), super.delete(t), this.material.dispose();
     }
     init() {
-        this.getMap().on("updatelights", this.Bo, this);
+        this.getMap().on("updatelights", this.Xo, this);
         const t = this.regl;
         this.renderer = new n.Renderer(t);
         const e = this.getShaderConfig();
-        this.shader = new n.PhongShader(e), this.Bn();
+        this.shader = new n.PhongShader(e), this.Xn();
         const i = {
             vert: this.getPickingVert(),
             uniforms: [ "projViewMatrix", "modelMatrix", "positionMatrix", {
@@ -9344,7 +9372,7 @@ class ws extends vs {
         };
         this.picking = [ new n.FBORayPicking(this.renderer, i, this.layer.getRenderer().pickingFBO, this.getMap()) ];
     }
-    Bo() {
+    Xo() {
         this.setToRedraw();
     }
     getShaderConfig() {
@@ -9393,14 +9421,14 @@ class ws extends vs {
             }
         };
     }
-    Bn() {
+    Xn() {
         this.material && this.material.dispose();
         const t = this.getSymbols()[0].material, e = {};
         for (const n in t) $n(t, n) && (e[n] = t[n]);
         this.material = new n.PhongMaterial(e);
     }
     getUniformValues(t, e) {
-        const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, o = this.qo(), s = jn({
+        const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, o = this.$o(), s = jn({
             viewMatrix: n,
             projMatrix: i,
             cameraPosition: r,
@@ -9413,7 +9441,7 @@ class ws extends vs {
     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        ";
     }
-    qo() {
+    $o() {
         const t = this.getMap().getLightManager(), e = t && t.getAmbientLight() || {}, n = t && t.getDirectionalLight() || {};
         return {
             ambientColor: e.color || [ .2, .2, .2 ],
@@ -9513,20 +9541,20 @@ const {getPBRUniforms: _s} = n.pbr.PBRUtils;
 
 class Ts extends vs {
     constructor(...t) {
-        super(...t), this.Xo = new n.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
+        super(...t), this.Yo = new n.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
     }
     supportRenderMode(t) {
         return this.getSymbols()[0].ssr ? "fxaa" === t || "fxaaAfterTaa" === t : super.supportRenderMode(t);
     }
     isAnimating() {
-        const t = this.$o();
+        const t = this.Jo();
         if (t && (t[0] || t[1])) return !0;
     }
     needToRedraw() {
-        const t = this.$o();
+        const t = this.Jo();
         return !(!t || !t[0] && !t[1]) || super.needToRedraw();
     }
-    $o() {
+    Jo() {
         const t = this.getSymbols()[0];
         return t.material && t.material.uvOffsetAnim;
     }
@@ -9539,7 +9567,7 @@ class Ts extends vs {
         const i = new n.Geometry(t.data, t.indices, 0, e);
         return jn(i.properties, t.properties), t.vertexColors && (i.properties.vertexColors = t.vertexColors), 
         this.material.uniforms.normalTexture && !i.data[i.desc.tangentAttribute] && (i.data[i.desc.normalAttribute] || i.createNormal(), 
-        i.createTangent()), this.Ji(i, t), {
+        i.createTangent()), this.Ki(i, t), {
             geometry: i,
             symbolIndex: {
                 index: 0
@@ -9549,38 +9577,38 @@ class Ts extends vs {
     paint(t) {
         const e = !!t.shadow;
         t.states && t.states.includesChanged && (this.shader.dispose(), delete this.shader, 
-        this.Yo.dispose(), delete this.Yo, this.Qi(t));
+        this.Zo.dispose(), delete this.Zo, this.er(t));
         let n = !!t.ssr && this.getSymbols()[0].ssr;
         const i = this.shader, r = i.shaderDefines;
         if (n) {
             const e = jn({}, r, t.ssr.defines);
             i.shaderDefines = e;
         }
-        if (t.onlyUpdateDepthInTaa && (this.shader = this.Yo, !n && this.Jo && (this.shader = i, 
+        if (t.onlyUpdateDepthInTaa && (this.shader = this.Zo, !n && this.Ko && (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 o = this.$o();
+        const o = this.Jo();
         if (o && (o[0] || o[1])) this.material.set("uvOffset", [ 0, 0 ]); else {
             const t = this.getUVOffset(o);
             this.material.set("uvOffset", t);
         }
-        this.Jo = n;
+        this.Ko = n;
     }
     updateSceneConfig(t) {
         jn(this.sceneConfig, t), this.setToRedraw();
     }
     delete() {
-        super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.Yo && (this.Yo.dispose(), 
-        delete this.Yo);
+        super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.Zo && (this.Zo.dispose(), 
+        delete this.Zo);
     }
     init(t) {
-        this.getMap().on("updatelights", this.Zo, this), this.createIBLTextures(), this.ir = this.ir || t;
+        this.getMap().on("updatelights", this.Qo, this), this.createIBLTextures(), this.or = this.or || t;
         const e = this.regl;
-        this.renderer = new n.Renderer(e), this.Ko = this.Qo.bind(this), this.ts = this.disposeCachedTexture.bind(this), 
-        this.es = this.ns.bind(this), this.Bn(), this.Qi(t);
+        this.renderer = new n.Renderer(e), this.ts = this.es.bind(this), this.ns = this.disposeCachedTexture.bind(this), 
+        this.rs = this.os.bind(this), this.Xn(), this.er(t);
         const i = {
             vert: "\n                #include <gl2_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: [ {
@@ -9600,7 +9628,7 @@ class Ts extends vs {
         };
         this.picking = [ new n.FBORayPicking(this.renderer, i, this.layer.getRenderer().pickingFBO, this.getMap()) ];
     }
-    Qi(t) {
+    er(t) {
         const e = {
             x: 0,
             y: 0,
@@ -9642,20 +9670,20 @@ class Ts extends vs {
             polygonOffset: this.getPolygonOffset()
         }, s = {
             uniforms: r,
-            defines: this.rs(i),
+            defines: this.ss(i),
             extraCommandProps: o
         };
         this.shader = new n.pbr.StandardShader(s), s.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.Yo = new n.pbr.StandardShader(s);
+        this.Zo = new n.pbr.StandardShader(s);
     }
-    Qo({resources: t}) {
+    es({resources: t}) {
         for (let e = 0; e < t.length; e++) this.addCachedTexture(t[e].url, t[e].data);
         this.setToRedraw(!0);
     }
-    ns() {
+    os() {
         this.setToRedraw(!0);
     }
-    Bn(t) {
+    Xn(t) {
         if (t) {
             const e = this.getSymbols()[0].material;
             e && jn(e, t);
@@ -9679,15 +9707,15 @@ class Ts extends vs {
                 url: s,
                 wrap: "repeat"
             }), o.flipY = !0, //!dataConfig.side && !isNil(dataConfig.side) || this.dataConfig.textureYOrigin === 'bottom';
-            o.min = "linear mipmap linear", o.mag = "linear", i[t] = new n.Texture2D(o, this.Xo), 
-            i[t].once("complete", this.Ko), i[t].once("disposed", this.ts), i[t].promise && this.addCachedTexture(s, i[t].promise), 
+            o.min = "linear mipmap linear", o.mag = "linear", i[t] = new n.Texture2D(o, this.Yo), 
+            i[t].once("complete", this.ts), i[t].once("disposed", this.ns), i[t].promise && this.addCachedTexture(s, 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.pbr.StandardMaterial(i), this.material.once("complete", this.es);
-        r || this.ns();
+        } else this.material = new n.pbr.StandardMaterial(i), this.material.once("complete", this.rs);
+        r || this.os();
     }
     getShader() {
         return this.shader;
@@ -9696,13 +9724,13 @@ class Ts extends vs {
         const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = _s(t, n, i, e && e.ssr, e && e.jitter);
         return this.setIncludeUniformValues(r, e), r;
     }
-    rs(t) {
+    ss(t) {
         return this.hasIBL() ? t.HAS_IBL_LIGHTING = 1 : delete t.HAS_IBL_LIGHTING, t;
     }
-    Zo() {
+    Qo() {
         if (!this.shader) return;
         const t = this.shader.shaderDefines;
-        this.rs(t), this.shader.shaderDefines = t;
+        this.ss(t), this.shader.shaderDefines = t;
     }
 }
 
@@ -9718,7 +9746,7 @@ class Ps extends ji {
         return this.isAnimating() ? "fxaa" === t || "fxaaAfterTaa" === t : "taa" === t || "fxaa" === t;
     }
     isAnimating() {
-        if (this.tr) return !0;
+        if (this.nr) return !0;
         const t = this.getSymbols();
         for (let e = 0; e < t.length; e++) if (t[e].linePatternFile && t[e].linePatternAnimSpeed) return !0;
         return !1;
@@ -9768,7 +9796,7 @@ class Ps extends ji {
         super.paint(t);
     }
     init(t) {
-        this.getMap().on("updatelights", this.Zo, this), this.createIBLTextures();
+        this.getMap().on("updatelights", this.Qo, this), this.createIBLTextures();
         const e = this.regl;
         if (this.renderer = new n.Renderer(e), this.createShader(t), this.pickingFBO) {
             const t = [];
@@ -9791,7 +9819,7 @@ class Ps extends ji {
         }
     }
     createShader(t) {
-        this.ir = t;
+        this.or = t;
         const e = [], i = {};
         this.fillIncludes(i, e, t), e.push({
             name: "projViewModelMatrix",
@@ -9803,7 +9831,7 @@ class Ps extends ji {
         }), this.shader = new n.pbr.StandardShader({
             vert: Ss,
             uniforms: e,
-            defines: this.rs(i),
+            defines: this.ss(i),
             extraCommandProps: this.getExtraCommandProps()
         });
     }
@@ -9918,13 +9946,13 @@ class Ps extends ji {
             }
         } ];
     }
-    rs(t) {
+    ss(t) {
         return this.hasIBL() ? t.HAS_IBL_LIGHTING = 1 : delete t.HAS_IBL_LIGHTING, t;
     }
-    Zo() {
+    Qo() {
         if (!this.shader) return;
         const t = this.shader.shaderDefines;
-        this.rs(t), this.shader.shaderDefines = t;
+        this.ss(t), this.shader.shaderDefines = t;
     }
     delete() {
         super.delete(), this.disposeIBLTextures(), this.shader && (this.shader.dispose(), 
@@ -9934,13 +9962,13 @@ class Ps extends ji {
 
 const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0, 0 ], Rs = [ 1, 1, 1 ], Ds = [], Ns = [ 1, 1, 1, 1 ], Ls = [], Hs = [ 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], Vs = t => class extends t {
     constructor(t, e, i, r, o, s) {
-        super(t, e, i, r, o, s), this.os = !1, this.scene.sortFunction = this.sortByCommandKey, 
-        this.ss = [], this.as = new n.GLTFManager(t), this.ls(), this.hs();
+        super(t, e, i, r, o, s), this.as = !1, this.scene.sortFunction = this.sortByCommandKey, 
+        this.ls = [], this.hs = new n.GLTFManager(t), this.cs(), this.us();
     }
     isAnimating() {
         const t = this.getSymbols();
         for (let e = 0; e < t.length; e++) {
-            if (t[e] && this.cs[e] && this.us(e)) return !0;
+            if (t[e] && this.fs[e] && this.ds(e)) return !0;
         }
         return !1;
     }
@@ -9960,7 +9988,7 @@ const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0
         return Ds;
     }
     createMesh(t, e, {tileTranslationMatrix: o, tileExtent: s}) {
-        if (!this.os) return null;
+        if (!this.as) return null;
         const a = this.getMap(), {geometry: l} = t, {positionSize: h, features: c} = l, {aPosition: u, aPickingId: f, aXYRotation: d, aZRotation: p} = l.data, m = u.length / h;
         if (0 === m) return null;
         const y = {
@@ -9968,7 +9996,7 @@ const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0
             instance_vectorB: new Float32Array(4 * m),
             instance_vectorC: new Float32Array(4 * m),
             aPickingId: []
-        }, g = this.fs(y, o, s, l.properties.z, u, d, p, h, f, c);
+        }, g = this.ps(y, o, s, l.properties.z, u, d, p, h, f, c);
         l.data.aTerrainAltitude && (y.aTerrainAltitude = l.data.aTerrainAltitude);
         const v = {};
         for (const t in y) v[t] = {
@@ -9978,22 +10006,22 @@ const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0
             }),
             divisor: 1
         };
-        const b = this.ds(), x = this.ps(), w = r.identity([]);
+        const b = this.ms(), x = this.ys(), w = r.identity([]);
         r.scale(w, w, [ x, x, x ]);
         const A = [], k = this.getSymbols();
         for (let t = 0; t < k.length; t++) {
-            const e = k[t], s = this.ss[t];
+            const e = k[t], s = this.ls[t];
             if (!s) continue;
             const {fixSizeOnZoom: h} = e;
             let c = r.identity([]);
-            b || (c = this.ms(c));
+            b || (c = this.gs(c));
             let u = 0;
             s.forEach(t => {
                 const {geometry: n, nodeMatrix: i} = t;
                 r.multiply(Ls, Hs, i), r.multiply(Ls, c, Ls);
                 const o = r.multiply(Ls, w, Ls), s = n.boundingBox.copy();
                 s.transform(o);
-                const a = this.ys(s, e);
+                const a = this.vs(s, e);
                 Math.abs(a) > Math.abs(u) && (u = a);
             });
             const f = [ 0, 0, u ], d = s.map(s => {
@@ -10036,7 +10064,7 @@ const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0
             positionSize: h
         }, A;
     }
-    ys(t, e) {
+    vs(t, e) {
         const n = e.anchorZ || "center";
         let i = 0;
         const r = t.max[2] - t.min[2];
@@ -10047,13 +10075,13 @@ const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0
         if (t[0].properties.level > 2) return null;
         for (let e = 0; e < t.length; e++) {
             if (!t[e] || !t[e].geometry) continue;
-            t[e].instancedData.aTerrainAltitude && this.Pi(t[e], t[e].instancedData, t[e].properties, 3, n);
-            const i = this.us(t[e].properties.symbolIndex.index);
+            t[e].instancedData.aTerrainAltitude && this.Oi(t[e], t[e].instancedData, t[e].properties, 3, n);
+            const i = this.ds(t[e].properties.symbolIndex.index);
             t[e].setUniform("skinAnimation", +i);
         }
         return this.scene.addMesh(t), this;
     }
-    Ki(t, e) {
+    tr(t, e) {
         t && t.updateInstancedData && t.updateInstancedData("aTerrainAltitude", e);
     }
     prepareRender(t) {
@@ -10061,12 +10089,12 @@ const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0
         let n = !1;
         for (let i = 0; i < e.length; i++) {
             const r = e[i];
-            if (!r || !this.cs[i]) continue;
-            if (this.us(i) && this.cs[i]) {
+            if (!r || !this.fs[i]) continue;
+            if (this.ds(i) && this.fs[i]) {
                 n || (n = !0);
                 let e = r.speed;
                 const o = !!r.loop;
-                Nn(e) && (e = 1), this.cs[i].updateAnimation(t.timestamp, o, e);
+                Nn(e) && (e = 1), this.fs[i].updateAnimation(t.timestamp, o, e);
             }
         }
         n && this.setToRedraw(!0), super.prepareRender(t);
@@ -10076,11 +10104,11 @@ const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0
         this.shadowCount = this.scene.getMeshes().length;
         return this.scene.getMeshes().filter(t => 0 === t.properties.level);
     }
-    us(t) {
+    ds(t) {
         const e = this.getSymbols()[t];
-        return e && e.animation && this.cs[t] && this.cs[t].hasSkinAnimation();
+        return e && e.animation && this.fs[t] && this.fs[t].hasSkinAnimation();
     }
-    fs(t, e, n, o, s, a, l, h, c, u) {
+    ps(t, e, n, o, s, a, l, h, c, u) {
         function f(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];
         }
@@ -10092,7 +10120,7 @@ const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0
             e[0] < g && (g = e[0]), e[0] > x && (x = e[0]), e[1] < v && (v = e[1]), e[1] > w && (w = e[1]), 
             e[2] < b && (b = e[2]), e[2] > A && (A = e[2]);
         }
-        const _ = g + x / 2, T = v + w / 2, S = b + A / 2, M = [], P = this.ds(), I = [ 0, 0, 1 ];
+        const _ = g + x / 2, T = v + w / 2, S = b + A / 2, M = [], P = this.ms(), I = [ 0, 0, 1 ];
         for (let e = 0; e < d; e++) {
             const n = s[e * h], o = s[e * h + 1], d = i.set(k, n * p - _, -o * p - T, 2 === h ? 0 : (s[e * h + 2] + y) * m - S), g = a && a[e] || 0, v = l && l[e] || 0;
             if (g || v) {
@@ -10103,7 +10131,7 @@ const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0
                 r.multiply(M, s, M);
             } else r.fromTranslation(M, d);
             if (P) {
-                const t = this.ms(Ls, u, c, e);
+                const t = this.gs(Ls, u, c, e);
                 r.multiply(M, M, t);
             }
             f("instance_vectorA", e, M, 0), f("instance_vectorB", e, M, 1), f("instance_vectorC", e, M, 2), 
@@ -10111,63 +10139,63 @@ const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0
         }
         return i.set(k, _, T, S), k;
     }
-    ps() {
-        if (!this.gs) {
+    ys() {
+        if (!this.bs) {
             const t = this.getMap();
-            this.gs = 100 * ot(t.getGLRes(), t);
+            this.bs = 100 * ot(t.getGLRes(), t);
         }
-        return this.gs;
+        return this.bs;
     }
-    ms(t, e, n, r) {
-        const o = this.getMap(), s = this.symbolDef[0], a = this.ps();
+    gs(t, e, n, r) {
+        const o = this.getMap(), s = this.symbolDef[0], a = this.ys();
         let l = s.translationX || 0, h = s.translationY || 0, c = s.translationZ || 0, u = s.rotationX || 0, f = s.rotationY || 0, d = s.rotationZ || 0, p = s.scaleX || 0, m = s.scaleY || 0, y = s.scaleZ || 0;
         const g = n && n[r], v = e && e[g], b = o.getZoom(), x = v && v.feature && v.feature.properties;
-        this.vs && (l = this.vs(b, x)), this.bs && (h = this.bs(b, x)), this.xs && (c = this.xs(b, x));
+        this.xs && (l = this.xs(b, x)), this.ws && (h = this.ws(b, x)), this.As && (c = this.As(b, x));
         const w = i.set(Os, l * a, h * a, c * a);
-        this.ws && (u = this.ws(b, x)), this.As && (f = this.As(b, x)), this.ks && (d = this.ks(b, x));
+        this.ks && (u = this.ks(b, x)), this._s && (f = this._s(b, x)), this.Ts && (d = this.Ts(b, x));
         const A = i.set(Cs, u, f, d);
-        this._s && (p = this._s(b, x)), this.Ts && (m = this.Ts(b, x)), this.Ss && (y = this.Ss(b, x));
+        this.Ss && (p = this.Ss(b, x)), this.Ms && (m = this.Ms(b, x)), this.Ps && (y = this.Ps(b, x));
         const k = i.set(Fs, p, m, y);
-        return this.Ms(t, w, A, k);
+        return this.Is(t, w, A, k);
     }
     getShaderConfig() {
         const t = super.getShaderConfig();
         return t.positionAttribute = "POSITION", t.normalAttribute = "NORMAL", t;
     }
     init(t) {
-        super.init(t), this.hs();
+        super.init(t), this.us();
     }
-    ls() {
+    cs() {
         const t = this.symbolDef[0];
-        p(t.translationX) && (this.vs = g(t.translationX)), p(t.translationY) && (this.bs = g(t.translationY)), 
-        p(t.translationZ) && (this.xs = g(t.translationZ)), p(t.rotationX) && (this.ws = g(t.rotationX)), 
-        p(t.rotationY) && (this.As = g(t.rotationY)), p(t.rotationZ) && (this.ks = g(t.rotationZ)), 
-        p(t.scaleX) && (this._s = g(t.scaleX)), p(t.scaleY) && (this.Ts = g(t.scaleY)), 
-        p(t.scaleZ) && (this.Ss = g(t.scaleZ));
-    }
-    ds() {
-        return !!(this.vs && !this.vs.isFeatureConstant || this.bs && !this.bs.isFeatureConstant || this.xs && !this.xs.isFeatureConstant || this.ws && !this.ws.isFeatureConstant || this.As && !this.As.isFeatureConstant || this.ks && !this.ks.isFeatureConstant || this._s && !this._s.isFeatureConstant || this.Ts && !this.Ts.isFeatureConstant || this.Ss && !this.Ss.isFeatureConstant);
-    }
-    hs() {
-        if (this.cs) return;
-        this.cs = [];
+        p(t.translationX) && (this.xs = g(t.translationX)), p(t.translationY) && (this.ws = g(t.translationY)), 
+        p(t.translationZ) && (this.As = g(t.translationZ)), p(t.rotationX) && (this.ks = g(t.rotationX)), 
+        p(t.rotationY) && (this._s = g(t.rotationY)), p(t.rotationZ) && (this.Ts = g(t.rotationZ)), 
+        p(t.scaleX) && (this.Ss = g(t.scaleX)), p(t.scaleY) && (this.Ms = g(t.scaleY)), 
+        p(t.scaleZ) && (this.Ps = g(t.scaleZ));
+    }
+    ms() {
+        return !!(this.xs && !this.xs.isFeatureConstant || this.ws && !this.ws.isFeatureConstant || this.As && !this.As.isFeatureConstant || this.ks && !this.ks.isFeatureConstant || this._s && !this._s.isFeatureConstant || this.Ts && !this.Ts.isFeatureConstant || this.Ss && !this.Ss.isFeatureConstant || this.Ms && !this.Ms.isFeatureConstant || this.Ps && !this.Ps.isFeatureConstant);
+    }
+    us() {
+        if (this.fs) return;
+        this.fs = [];
         const t = this.getSymbols();
-        this.Ps = 0;
+        this.Os = 0;
         for (let e = 0; e < t.length; e++) {
             const n = t[e].url || "pyramid";
-            this.as.loginGLTF(n);
-            const i = this.as.getGLTF(n);
+            this.hs.loginGLTF(n);
+            const i = this.hs.getGLTF(n);
             if (i.then) i.then(n => {
-                if (!n.gltfPack) return this.Ps++, void (this.Ps >= t.length && (this.os = !0, this.setToRedraw(!0)));
+                if (!n.gltfPack) return this.Os++, void (this.Os >= t.length && (this.as = !0, this.setToRedraw(!0)));
                 const {gltfPack: i} = n;
-                this.cs[e] = [ i ], this.ss[e] = i.getMeshesInfo(), this.Ps++, this.Ps >= t.length && (this.os = !0), 
+                this.fs[e] = [ i ], this.ls[e] = i.getMeshesInfo(), this.Os++, this.Os >= t.length && (this.as = !0), 
                 this.setToRedraw(!0);
             }); else {
                 const {gltfPack: t} = i;
-                t && (this.cs[e] = [ t ], this.ss[e] = t.getMeshesInfo(), this.Ps++);
+                t && (this.fs[e] = [ t ], this.ls[e] = t.getMeshesInfo(), this.Os++);
             }
         }
-        this.Ps >= t.length && (this.os = !0);
+        this.Os >= t.length && (this.as = !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    }";
@@ -10183,10 +10211,10 @@ const Is = [], Os = [], Cs = [], Fs = [], Es = [], zs = [ 0, 0, 0 ], js = [ 0, 0
         const t = this.getSymbols();
         for (let e = 0; e < t.length; e++) {
             const n = t[e].url || "pyramid";
-            this.as.logoutGLTF(n);
+            this.hs.logoutGLTF(n);
         }
     }
-    Ms(t, e, n, o) {
+    Is(t, e, n, o) {
         const s = i.set(Is, ...e || zs), a = n || js, l = o || Rs, h = u.fromEuler(Es, a[0], a[1], a[2]);
         return r.fromRotationTranslationScale(t, h, s, l);
     }
@@ -10239,30 +10267,30 @@ class Ys extends ji {
     }
     callShader(t, e) {
         super.callShader(t, e), this.transformWater();
-        const n = this.Is(this.getMap(), e);
-        this.renderer.render(this.Os, n, this.Cs, this.getRenderFBO(e));
+        const n = this.Cs(this.getMap(), e);
+        this.renderer.render(this.Fs, n, this.Es, this.getRenderFBO(e));
     }
     addMesh(t, e) {
-        this.nr(t, e), super.addMesh(...arguments);
+        this.rr(t, e), super.addMesh(...arguments);
     }
-    nr(t) {
+    rr(t) {
         const e = this.getSymbol(qs).ssr;
         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.Os.dispose(), 
-        this.Qi(t));
-        const e = !!t.ssr && this.getSymbol(qs).ssr, n = this.Os, i = n.shaderDefines;
+        t.states && t.states.includesChanged && (this.shader.dispose(), this.Fs.dispose(), 
+        this.er(t));
+        const e = !!t.ssr && this.getSymbol(qs).ssr, n = this.Fs, i = n.shaderDefines;
         if (e) {
             const e = jn({}, i, t.ssr.defines);
             n.shaderDefines = e;
         }
-        this.updateIBLDefines(n), this.Fs.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
+        this.updateIBLDefines(n), this.zs.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
     }
     init(t) {
         this.createIBLTextures();
         const e = this.regl;
-        this.renderer = new n.Renderer(e), this.createGround(), this.Qi(t), this.pickingFBO && (this.picking = [ new n.FBORayPicking(this.renderer, {
+        this.renderer = new n.Renderer(e), this.createGround(), this.er(t), this.pickingFBO && (this.picking = [ new n.FBORayPicking(this.renderer, {
             vert: Ri,
             uniforms: [ {
                 name: "projViewModelMatrix",
@@ -10275,38 +10303,38 @@ class Ys extends ji {
             extraCommandProps: {
                 viewport: this.pickingViewport
             }
-        }, this.pickingFBO, this.getMap()) ]), this.Es();
+        }, this.pickingFBO, this.getMap()) ]), this.js();
     }
-    Es() {
+    js() {
         const t = this.regl;
-        this.zs || (this.zs = t.texture(2));
+        this.Rs || (this.Rs = t.texture(2));
         const e = this.getSymbol({
             index: 0
         }), n = e.texWaveNormal, i = this.getCachedTexture(n), r = this;
-        if (i) this.js || (i.isLoading ? setTimeout(() => {
-            this.shader && this.Es();
-        }, 20) : this.js = this.Rs(t, i)); else {
+        if (i) this.Ds || (i.isLoading ? setTimeout(() => {
+            this.shader && this.js();
+        }, 20) : this.Ds = this.Ns(t, i)); else {
             const e = new Image;
             e.isLoading = !0, e.onload = function() {
-                delete this.isLoading, r.js = r.Rs(t, this), r.setToRedraw();
+                delete this.isLoading, r.Ds = r.Ns(t, this), r.setToRedraw();
             }, e.onerror = () => {
                 console.error("invalid water wave normal texture:" + n);
             }, this.addCachedTexture(n, e), e.src = n;
         }
         const o = e.texWavePerturbation, s = this.getCachedTexture(o);
-        if (s) this.Ds || (s.isLoading ? setTimeout(() => {
-            this.Es(), this.shader;
-        }, 20) : this.Ds = this.Rs(t, s)); else {
+        if (s) this.Ls || (s.isLoading ? setTimeout(() => {
+            this.js(), this.shader;
+        }, 20) : this.Ls = this.Ns(t, s)); else {
             const e = new Image;
             e.isLoading = !0, e.onload = function() {
-                delete this.isLoading, r.Ds = r.Rs(t, this), r.setToRedraw();
+                delete this.isLoading, r.Ls = r.Ns(t, this), r.setToRedraw();
             }, e.onerror = () => {
                 console.error("invalid water wave perturbation texture:" + o);
             }, this.addCachedTexture(o, e), e.src = o;
         }
     }
-    Rs(t, e) {
-        return this.zs ? t.texture({
+    Ns(t, e) {
+        return this.Rs ? t.texture({
             width: e.width,
             height: e.height,
             mag: "linear",
@@ -10317,7 +10345,7 @@ class Ys extends ji {
             data: e
         }) : null;
     }
-    Qi(t) {
+    er(t) {
         const e = this.canvas, i = [], o = [ {
             name: "projViewModelMatrix",
             type: "function",
@@ -10412,7 +10440,7 @@ class Ys extends ji {
                 enable: !1
             }
         };
-        o.push(...n.SsrPass.getUniformDeclares()), this.Os = new n.MeshShader({
+        o.push(...n.SsrPass.getUniformDeclares()), this.Fs = new n.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\n#include <highlight_vert>\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\nhighlight_setVarying();\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#include <highlight_frag>\n#if defined(HAS_IBL_LIGHTING)\nuniform vec3 hdrHSV;\nuniform samplerCube prefilterMap;\nuniform sampler2D brdfLUT;\nuniform float rgbmRange;\nuniform mat3 uEnvironmentTransform;\nuniform vec3 diffuseSPH[9];\nvec3 c(const in vec3 d) {\n  vec3 e = uEnvironmentTransform * d;\n  float x = e.x;\n  float y = e.y;\n  float z = e.z;\n  vec3 f = (diffuseSPH[0] + diffuseSPH[1] * x + diffuseSPH[2] * y + diffuseSPH[3] * z + diffuseSPH[4] * z * x + diffuseSPH[5] * y * z + diffuseSPH[6] * y * x + diffuseSPH[7] * (3. * z * z - 1.) + diffuseSPH[8] * (x * x - y * y));\n  if(length(hdrHSV) > .0) {\n    f = hsv_apply(f, hdrHSV);\n  }\n  return max(f, vec3(.0));\n}\nvec3 h(const in vec3 i, const in float j, const in float k, const in float l) {\n  vec4 rgba = texture2D(brdfLUT, vec2(k, j));\n  float b = (rgba[3] * 65280.0 + rgba[2] * 255.);\n  float a = (rgba[1] * 65280.0 + rgba[0] * 255.);\n  const float m = 1. / 65535.;\n  return (i * a + b * l) * m;\n}\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 o(const in vec4 u, const in float v) {\n  if(v <= .0)\n    return u.rgb;\n  return v * u.rgb * u.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 A(const in vec4 B) {\n  return B.r + B.g / 255.;\n}\nfloat C(const in vec2 D, const in float E) {\n  vec3 F = vec3(.06711056, .00583715, 52.9829189);\n  return fract(F.z * fract(dot(D.xy + E * vec2(47., 17.) * .695, F.xy))) * .5;\n}\nvec3 G(const in float H, const in float I, const in vec2 J) {\n  float K = min(I - .01, H);\n  float L = floor(K);\n  float M = min(I, L + 1.);\n  float N = pow(2., M);\n  vec2 O = 2. * N / J;\n  if(K - L > .5)\n    N *= 2.;\n  return vec3(O, N);\n}\nvec2 P(const in vec2 Q, const in vec3 R) {\n  vec2 S = max(R.xy, min(1. - R.xy, Q));\n  return vec2(2. * S.x, R.z - 1. - S.y) / R.z;\n}\nvec3 T(const in mat4 U, const in vec3 V) {\n  vec4 W = U * vec4(V, 1.);\n  return vec3(.5 + .5 * W.xy / W.w, W.w);\n}\nvec3 X(const in float Y, const in vec2 S) {\n  return texture2D(TextureReflected, S).rgb;\n}\nfloat Z(float ba) {\n  highp mat4 U = projMatrix;\n  highp float z = ba * 2. - 1.;\n  return -U[3].z / (z + U[2].z);\n}\nfloat bb(const vec2 S) {\n  float ba = A(texture2D(TextureDepth, S));\n  return ba;\n}\nvec3 bc(const in float E, const in vec3 bd, const in vec3 be, const in vec3 bf, const in vec3 bg, const in float bh) {\n  vec2 bi;\n  bi.x = C(gl_FragCoord.yx, E);\n  bi.y = fract(bi.x * 52.9829189);\n  bi.y = mix(bi.y, 1., .7);\n  float bj = 2. * 3.14159 * bi.x;\n  float bk = pow(max(bi.y, .000001), bh / (2. - bh));\n  float bl = sqrt(1. - bk * bk);\n  vec3 bm = vec3(bl * cos(bj), bl * sin(bj), bk);\n  bm = bm.x * bd + bm.y * be + bm.z * bf;\n  return normalize((2. * dot(bg, bm)) * bm - bg);\n}\nfloat bn(const in float E) {\n  return (C(gl_FragCoord.xy, E) - .5);\n}\nvec3 bo(const in vec3 bp, const in float bq, const in vec3 br) {\n  vec3 bs = T(projMatrix, vViewVertex.xyz + br * bq);\n  bs.z = 1. / bs.z;\n  bs -= bp;\n  float bt = min(1., .99 * (1. - bp.x) / max(1e-5, bs.x));\n  float bu = min(1., .99 * (1. - bp.y) / max(1e-5, bs.y));\n  float bv = min(1., .99 * bp.x / max(1e-5, -bs.x));\n  float bw = min(1., .99 * bp.y / max(1e-5, -bs.y));\n  return bs * min(bt, bu) * min(bv, bw);\n}\nfloat bx(const in vec3 bp, const in vec3 bs, inout float by, inout float bz) {\n  float bA = (bz + by) * .5;\n  vec3 bB = bp + bs * bA;\n  float z = bb(bB.xy);\n  float ba = Z(z);\n  float bC = -1. / bB.z;\n  by = ba > bC ? by : bA;\n  bz = ba > bC ? bA : bz;\n  return bA;\n}\nvec4 bD(const in vec3 bp, const in float bq, in float bE, const in vec3 br, const in float j, const in float E) {\n  const int bF = 20;\n  float bG = 1. / float(bF);\n  bE *= bG;\n  vec3 bs = bo(bp, bq, br);\n  float bH = bG;\n  vec3 bI = vec3(.0, bH, 1.);\n  vec3 bB;\n  float z, ba, bC, bJ, bK, bL;\n  bool bM;\n  float bN = 1.;\n  float bA;\n  for(int bO = 0; bO < bF; bO++) {\n    bB = bp + bs * bI.y;\n    z = bb(bB.xy);\n    ba = Z(z);\n    bC = -1. / bB.z;\n    bJ = bC - ba;\n    bJ *= clamp(sign(abs(bJ) - bq * bG * bG), .0, 1.);\n    bM = abs(bJ + bE) < bE;\n    bK = clamp(bI.x / (bI.x - bJ), .0, 1.);\n    bL = bM ? bI.y + bK * bG - bG : 1.;\n    bI.z = min(bI.z, bL);\n    bI.x = bJ;\n    if(bM) {\n      float by = bI.y - bG;\n      float bz = bI.y;\n      bA = bx(bp, bs, by, bz);\n      bA = bx(bp, bs, by, bz);\n      bA = bx(bp, bs, by, bz);\n      bN = bA;\n      break;\n    }\n    bI.y += bG;\n  }\n  return vec4(bp + bs * bN, 1. - bN);\n}\nvec3 bP(in vec4 bQ, const in float bR, const in vec3 bS, const in vec3 bT, const in float j) {\n  vec4 bU = mix(outputFovInfo[0], outputFovInfo[1], bQ.x);\n  bQ.xyz = vec3(mix(bU.xy, bU.zw, bQ.y), 1.) * -1. / bQ.z;\n  bQ.xyz = (reprojViewProjMatrix * vec4(bQ.xyz, 1.)).xyw;\n  bQ.xy /= bQ.z;\n  float bV = clamp(6. - 6. * max(abs(bQ.x), abs(bQ.y)), .0, 1.);\n  bQ.xy = .5 + .5 * bQ.xy;\n  return vec3(bQ.xy, 1.);\n}\nvec3 ssr(const in vec3 bS, const in vec3 bT, const in float j, const in vec3 d, const in vec3 bg) {\n  float bW = .0;\n  vec4 f = vec4(.0);\n  float bh = j * j;\n  bh = bh * bh;\n  vec3 bX = abs(d.z) < .999 ? vec3(.0, .0, 1.) : vec3(1., .0, .0);\n  vec3 bd = normalize(cross(bX, d));\n  vec3 be = cross(d, bd);\n  float bR = ssrFactor * clamp(-4. * dot(bg, d) + 3.8, .0, 1.);\n  bR *= clamp(4.7 - j * 5., .0, 1.);\n  vec3 bp = T(projMatrix, vViewVertex.xyz);\n  bp.z = 1. / bp.z;\n  vec3 br = bc(bW, bd, be, d, bg, bh);\n  float bq = mix(cameraNearFar.y + vViewVertex.z, -vViewVertex.z - cameraNearFar.x, br.z * .5 + .5);\n  float bE = .5 * bq;\n  vec4 bQ;\n  if(dot(br, d) > .001 && bR > .0) {\n    bQ = bD(bp, bq, bE, br, j, bW);\n    if(bQ.w > .0)\n      return bP(bQ, bR, bS, bT, j);\n    \n  }\n  return vec3(.0);\n}\n#endif\nconst vec3 bY = 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 bZ(vec3 e, float ca) {\n  float cb = max(.015, ca);\n  return max((e.x + e.y) * .3303545 / cb + .3303545, .0);\n}\nconst vec2 cc = vec2(6. / 25., 5. / 24.);\nvec2 cd(sampler2D ce, vec2 S) {\n  return 2. * texture2D(ce, S).rg - 1.;\n}\nfloat cf(vec2 S) {\n  return texture2D(heightTexture, S).b;\n}\nvec3 cg(sampler2D ce, vec2 S) {\n  return 2. * texture2D(ce, S).rgb - 1.;\n}\nfloat ch(vec2 S, float ci) {\n  return fract(ci);\n}\nfloat cj(vec2 S, float ci) {\n  float ck = ch(S, ci);\n  return 1. - abs(1. - 2. * ck);\n}\nvec3 cl(sampler2D cm, vec2 S, float ci, float cn) {\n  float co = waveParams[2];\n  float cp = waveParams[3];\n  vec2 cq = cd(cm, S) * co;\n  float ck = ch(S, ci + cn);\n  float cr = cj(S, ci + cn);\n  vec2 f = S;\n  f -= cq * (ck + cp);\n  f += cn;\n  f += (ci - ck) * cc;\n  return vec3(f, cr);\n}\nconst float cs = 7.77;\nvec3 ct(sampler2D cu, sampler2D cv, vec2 cw, vec2 cx, float ci) {\n  float ca = waveParams[0];\n  vec2 cy = ci * -cx;\n  float cz = cf(vNoiseUv) * cs;\n  vec3 cA = cl(cv, cw + cy, ci + cz, .0);\n  vec3 cB = cl(cv, cw + cy, ci + cz, .5);\n  vec3 cC = cg(cu, cA.xy) * cA.z;\n  vec3 cD = cg(cu, cB.xy) * cB.z;\n  vec3 cE = normalize(cC + cD);\n  cE.xy *= ca;\n  cE.z = sqrt(1. - dot(cE.xy, cE.xy));\n  return cE;\n}\nvec4 cF(vec2 cw, float cG) {\n  float cH = waveParams[1];\n  vec3 d = ct(normalTexture, heightTexture, cw * cH, waterDir, cG);\n  float cI = bZ(d, waveParams[0]);\n  return vec4(d, cI);\n}\nconst float cJ = 3.141592653589793;\nconst float cK = 1. / cJ;\nconst float cL = .3183098861837907;\nconst float cM = 1.570796326794897;\nconst float cN = .4;\nfloat cO = 2.2;\nvec3 cP(float cQ, vec3 cR, float l) {\n  return cR + (l - cR) * pow(1. - cQ, 5.);\n}\nfloat cS(float cT, float j) {\n  float cU = j * j;\n  float cV = cT * cT;\n  float cW = pow((cV * (cU - 1.) + 1.), cO) * cJ;\n  return cU / cW;\n}\nfloat cX(float cY) {\n  return .25 / (cY * cY);\n}\nvec3 cZ(const vec3 x) {\n  return (x * (2.51 * x + .03)) / (x * (2.43 * x + .59) + .14);\n}\nconst float da = 2.2;\nconst float db = .4545454545;\nvec4 dc(vec4 u) {\n  return vec4(pow(u.rgb, vec3(db)), u.w);\n}\nvec3 dd(vec3 u) {\n  return pow(u, vec3(da));\n}\nconst vec3 de = vec3(.02, 1., 5.);\nconst vec2 df = vec2(.02, .1);\nconst float j = .06;\nconst float dg = 1.7;\nconst vec3 dh = vec3(0, .6, .9);\nconst vec3 di = vec3(.72, .92, 1.);\nconst float dj = .65;\nconst float dk = 300000.0;\nconst float dl = 500000.0;\nconst float dm = .775;\nconst float dn = .8;\nPBRShadingWater dp;\nvec3 dq(in PBRShadingWater dr, float j, vec3 ds, float dt) {\n  vec3 du = cP(dr.VdotH, ds, dt);\n  float dv = cS(dr.NdotH, j);\n  float dw = cX(dr.LdotH);\n  float dx = mix(j + .045, j + .385, 1. - dr.VdotH);\n  float dy = 1.2;\n  float dz = cS(dr.NdotH, dx) * dy;\n  return ((dv + dz) * dw) * du;\n}\nvec3 dA(float dg, float dB, vec3 dh, float dC) {\n  return dg * (.075 * dh * pow(dB, 4.) + 50. * pow(dB, 23.)) * dC;\n}\nvec3 dD(in float bk, in vec3 dE, in vec3 dF) {\n  float dG = pow((1. - bk), de[2]);\n  return mix(dF, dE, dG);\n}\nvec3 dH(in vec3 e, in vec3 dI, in float dJ, in float j) {\n  \n#ifdef HAS_IBL_LIGHTING\nvec3 dK = reflect(-dI, e);\n  vec4 dL = textureCube(prefilterMap, uEnvironmentTransform * dK);\n  float dM = clamp(1. + dot(dK, e), .0, 1.);\n  dL *= dM * dM;\n  vec3 i = o(dL, rgbmRange);\n  vec3 dN = c(e);\n  float l = clamp(50.0 * waterBaseColor.g, .0, 1.);\n  vec3 dO = h(waterBaseColor.rgb, j, dot(e, dI), l);\n  return i * dO + dN;\n#else\nvec3 dP = dd(di);\n  vec3 dQ = dd(dh);\n  vec3 di = dD(dJ, dP, dQ);\n  return di;\n#endif\n}\nvec3 dR(in vec3 e, in vec3 dI, in vec3 dS, vec3 u, in vec3 dT, in vec3 dU, in float dV, float dW, vec3 dX) {\n  float dY = 0.;\n  vec3 dZ = dd(u);\n  vec3 bm = normalize(dS + dI);\n  dp.NdotL = clamp(dot(e, dS), .0, 1.);\n  dp.NdotV = clamp(dot(e, dI), .001, 1.);\n  dp.VdotN = clamp(dot(dI, e), .001, 1.);\n  dp.NdotH = clamp(dot(e, bm), .0, 1.);\n  dp.VdotH = clamp(dot(dI, bm), .0, 1.);\n  dp.LdotH = clamp(dot(dS, bm), .0, 1.);\n  float dJ = max(dot(dU, dI), .0);\n  vec3 di = dH(e, dI, dJ, j);\n  float ea = max(dot(dU, dS), .0);\n  float eb = .1 + ea * .9;\n  di *= eb;\n  float ec = clamp(dV, .8, 1.);\n  vec3 ed = cP(dp.VdotN, vec3(de[0]), de[1]);\n  vec3 ee = ed * di * ec;\n  vec3 ef = dZ * mix(di, ea * dT * cK, 2. / 3.) * ec;\n  vec3 i = vec3(.0);\n  if(dJ > .0 && ea > .0) {\n    vec3 eg = dq(dp, j, vec3(df[0]), df[1]);\n    vec3 eh = dT * cK * dV;\n    i = dp.NdotL * eh * eg;\n  }\n  vec3 cI = vec3(.0);\n  if(dJ > .0) {\n    cI = dA(dg, dW, dh, eb);\n  }\n  vec3 ei = vec3(.0);\n#ifdef HAS_SSR\nfloat ej = smoothstep(dl, dk, -dX.z);\n  mat4 ek = viewMatrix;\n  vec4 el = vec4(dX.xyz, 1.);\n  vec3 em = normalize(el.xyz);\n  vec4 en = ek * vec4(e, .0);\n  vec3 eo = normalize(en.xyz);\n  vec4 ep = ek * vec4(dU, .0);\n  float eq = pow(max(dot(-em, ep.xyz), .0), cN);\n  vec3 er = mix(ep.xyz, eo, eq);\n  vec3 es = ssr(vec3(.0), vec3(1.), j, normalize(er), -normalize(vViewVertex.xyz));\n  if(es.z > .0) {\n    vec2 et = smoothstep(.3, .6, abs(vec2(.5) - es.xy));\n    dY = dm * clamp(1. - 1.3 * et.y, .0, 1.) * ej;\n    vec3 eu = X(.0, es.xy);\n    ei = dd(eu) * dY * ed.y * dj;\n  }\n#endif\nfloat ev = mix(dn, dn * .5, dY);\n  return cZ((1. - dY) * ee + ei + ef * ev + i + cI);\n}\nvoid main() {\n  vec3 dU = bY;\n  vec4 ew = cF(vUv, timeElapsed);\n  vec3 e = normalize(vTbnMatrix * ew.xyz);\n  vec3 dI = -normalize(vPos - camPos);\n  vec3 dS = normalize(-lightDirection);\n#if defined(HAS_SHADOWING)\nfloat dV = shadow_computeShadow();\n#else\nfloat dV = 1.;\n#endif\nvec4 ex = viewMatrix * vec4(vPos, 1.);\n  vec4 ey = vec4(dR(e, dI, dS, waterBaseColor.rgb, lightColor, dU, dV, ew.w, ex.xyz), waterBaseColor.a);\n  gl_FragColor = dc(ey);\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  gl_FragColor = highlight_blendColor(gl_FragColor);\n}",
             defines: s,
@@ -10428,10 +10456,10 @@ class Ys extends ji {
             projViewMatrix: t.projViewMatrix
         };
     }
-    Is(t, e) {
+    Cs(t, e) {
         const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = Ws(t, n, i, e && e.ssr, e && e.jitter), o = t.getLightManager();
         let s = o && o.getDirectionalLight() || {};
-        const l = o && o.getAmbientLight() || {}, h = this.getSymbol(qs), c = this.Ns = this.Ns || [], u = this.Ls = this.Ls || [];
+        const l = o && o.getAmbientLight() || {}, h = this.getSymbol(qs), c = this.Hs = this.Hs || [], u = this.Vs = this.Vs || [];
         a.set(u, .09, h.uvScale || 3, .03, -.5);
         return jn(r, {
             ambientColor: l.color || [ .2, .2, .2 ],
@@ -10440,8 +10468,8 @@ class Ys extends ji {
             lightColor: s.color || Bs.color,
             camPos: t.cameraPosition,
             timeElapsed: h.animation ? (this.layer.getRenderer().getFrameTimestamp() || 0) / (1 / (h.waterSpeed || 1) * 1e4) : 0,
-            normalTexture: this.js || this.zs,
-            heightTexture: this.Ds || this.zs,
+            normalTexture: this.Ds || this.Rs,
+            heightTexture: this.Ls || this.Rs,
             waveParams: u,
             waterDir: Js(c, h.waterDirection || 0),
             waterBaseColor: h.waterBaseColor || [ .1451, .2588, .4863, 1 ],
@@ -10451,24 +10479,24 @@ class Ys extends ji {
         r;
     }
     delete() {
-        super.delete(), this.zs && (this.zs.destroy(), delete this.zs), this.js && this.js.destroy(), 
-        this.Ds && this.Ds.destroy(), this.shader && (this.shader.dispose(), delete this.shader), 
-        this.Os && this.Os.dispose(), this.Fs && (this.Fs.geometry.dispose(), this.Fs.material && this.Fs.material.dispose(), 
-        this.Fs.dispose(), delete this.Fs), this.disposeIBLTextures();
+        super.delete(), this.Rs && (this.Rs.destroy(), delete this.Rs), this.Ds && this.Ds.destroy(), 
+        this.Ls && this.Ls.destroy(), this.shader && (this.shader.dispose(), delete this.shader), 
+        this.Fs && this.Fs.dispose(), this.zs && (this.zs.geometry.dispose(), this.zs.material && this.zs.material.dispose(), 
+        this.zs.dispose(), delete this.zs), this.disposeIBLTextures();
     }
     createGround() {
         const t = new n.Plane;
         t.data.aTexCoord = new Uint8Array([ 0, 1, 1, 1, 0, 0, 1, 0 ]), t.generateBuffers(this.renderer.regl), 
-        this.Fs = new n.Mesh(t, null, {
+        this.zs = new n.Mesh(t, null, {
             castShadow: !1
-        }), this.Cs = new n.Scene([ this.Fs ]);
+        }), this.Es = new n.Scene([ this.zs ]);
     }
     transformWater() {
-        const t = this.getMap(), e = o.getGroundTransform(this.Fs.localTransform, t);
-        this.Fs.setLocalTransform(e);
+        const t = this.getMap(), e = o.getGroundTransform(this.zs.localTransform, t);
+        this.zs.setLocalTransform(e);
         const n = t._get2DExtentAtRes(t.getGLRes()), i = n.getWidth(), r = n.getHeight(), s = t.cameraLookAt, a = s[0] - i, l = s[1] + r, h = a / $s[0], c = l / $s[1], u = h % 1, f = c % 1, d = .3737 * h % 1, p = .3737 * c % 1, m = i / $s[0] * 2, y = r / $s[1] * 2;
-        this.Fs.setUniform("uvOffset", [ u, f ]), this.Fs.setUniform("noiseUvOffset", [ d, p ]), 
-        this.Fs.setUniform("uvScale", [ m, -y ]);
+        this.zs.setUniform("uvOffset", [ u, f ]), this.zs.setUniform("noiseUvOffset", [ d, p ]), 
+        this.zs.setUniform("uvScale", [ m, -y ]);
     }
 }
 
@@ -10563,7 +10591,7 @@ const ha = En("heatmap", class extends ji {
     }
     callRenderer(t, e, n) {
         const i = this.getRenderFBO(n);
-        this.Hs.render(this.scene, e, i);
+        this.Us.render(this.scene, e, i);
     }
     getUniformValues(t) {
         const e = this.getSymbol({
@@ -10580,13 +10608,13 @@ const ha = En("heatmap", class extends ji {
         return this.scene.getMeshes();
     }
     delete() {
-        super.delete(...arguments), this.Hs.dispose(), delete this.Hs;
+        super.delete(...arguments), this.Us.dispose(), delete this.Us;
     }
     init() {
         const t = this.regl;
         this.renderer = new n.Renderer(t);
         const e = this.getPolygonOffset(), i = this.getSymbols()[0];
-        this.Hs = new d(this.regl, this.sceneConfig, this.layer, i.heatmapColor, null, e);
+        this.Us = new d(this.regl, this.sceneConfig, this.layer, i.heatmapColor, null, e);
     }
 });
 
@@ -10597,7 +10625,7 @@ const ca = En("water", Ys);
 ca.registerAt(Ut), ee.registerPainter("lit", Ts), ee.registerPainter("icon", xo), 
 ee.registerPainter("fill", Wi), ee.registerPainter("line", $i), ee.registerPainter("line-gradient", Yi), 
 ee.registerPainter("water", Ys), ee.registerPainter("tube", Ps), n.ShaderLib.register("vt_position_vert", "#ifdef HAS_TERRAIN_ALTITUDE\n    attribute float aTerrainAltitude;\n#endif\n#ifdef HAS_ALTITUDE\n    vec3 unpackVTPosition() {\n        float altitude = aAltitude;\n        #ifdef HAS_TERRAIN_ALTITUDE\n            altitude += aTerrainAltitude * 100.0;\n        #endif\n        return vec3(aPosition, altitude);\n    }\n#else\n    float position_modValue = 16384.0;\n    float position_delta = 0.00001;\n    vec3 unpackVTPosition() {\n        float z = aPosition.z;\n        vec2 pos = sign(aPosition.xy + position_delta) * mod(abs(aPosition.xy), position_modValue);\n        vec2 highs = floor(abs(aPosition.xy) / position_modValue);\n        float altitude = sign(z + position_delta) * (highs.x * 2.0 + highs.y) * pow(2.0, 15.0) + z;\n        #ifdef HAS_TERRAIN_ALTITUDE\n            altitude += aTerrainAltitude * 100.0;\n        #endif\n        return vec3(pos, altitude);\n    }\n#endif"), 
-Ut.VERSION = "0.86.1", ee.VERSION = "0.86.1";
+Ut.VERSION = "0.86.2", ee.VERSION = "0.86.2";
 
 if (e.mat4.create(), e.transcoders) {
     const n = t.Map.VERSION;
@@ -10611,4 +10639,4 @@ if (e.mat4.create(), e.transcoders) {
 
 export { Sn as ExtrudePolygonLayer, Wi as FillPainter, Zs as FillPlugin, aa as GLTFPhongPlugin, la as GLTFStandardPlugin, Zt as GeoJSONVectorTileLayer, ha as HeatmapPlugin, xo as IconPainter, ta as IconPlugin, Qs as LineGradientPlugin, $i as LinePainter, Ks as LinePlugin, Me as LineStringLayer, oa as LitPlugin, Yt as MapboxVectorTileLayer, fs as NativeLinePainter, na as NativeLinePlugin, hs as NativePointPainter, ws as PhongPainter, ia as PhongPlugin, Se as PointLayer, Ie as PolygonLayer, rs as TextPainter, ea as TextPlugin, sa as TubePlugin, ee as Vector3DLayer, Ut as VectorTileLayer, It as VectorTileLayerRenderer, ca as WaterPlugin, ks as WireframePainter, ra as WireframePlugin };
 
-"undefined" != typeof console && console.log("@maptalks/vt v0.86.1");
+"undefined" != typeof console && console.log("@maptalks/vt v0.86.2");