@maptalks/vt 0.67.1 → 0.67.2

package/dist/maptalks.vt.mjs

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/vt v0.67.1
+ * @maptalks/vt v0.67.2
  * LICENSE : undefined
  * (c) 2016-2022 maptalks.org
  */
@@ -205,18 +205,22 @@ class Z {
         this.m = t, this.g = e, this.v = n || [ 0, 1, 0 ];
     }
     draw(t, e, n, i, r) {
-        this.A || this.k();
-        if (!this._) {
-            this._ = this.m.buffer(new Uint16Array([ 0, 0, 0, i, 0, i, i, i, i, i, i, 0, i, 0, 0, 0 ]));
+        if (this.A || this.k(), !this._) {
+            this._ = this.m.buffer(K(i));
             const t = i / n;
-            this.S = this.m.buffer(new Uint16Array([ 0, i - 64 * t, 0, i, 512 * t, i - 64 * t, 512 * t, i ]));
+            this.S = this.m.buffer(Q(i, t));
         }
-        let o = this.T;
+        if (i !== this.T) {
+            const t = i / n;
+            this._(K(i)), this.S(Q(i, t));
+        }
+        this.T = i;
+        let o = this.M;
         if (!o) {
             const t = this.g.getDevicePixelRatio() > 1 ? 2 : 1;
-            o = this.T = document.createElement("canvas"), o.width = 512 * t, o.height = 64 * t;
+            o = this.M = document.createElement("canvas"), o.width = 512 * t, o.height = 64 * t;
             const e = o.getContext("2d");
-            e.font = "36px monospace", e.scale(t, t), this.M = this.m.texture({
+            e.font = "36px monospace", e.scale(t, t), this.P = this.m.texture({
                 width: o.width,
                 height: o.height,
                 data: o
@@ -224,7 +228,7 @@ class Z {
         }
         const s = o.getContext("2d");
         s.clearRect(0, 0, o.width, o.height), s.fillStyle = `rgba(${this.v.map(t => 255 * t).join()})`, 
-        s.fillText(t, 20, 36), this.M({
+        s.fillText(t, 20, 36), this.P({
             width: o.width,
             height: o.height,
             data: o
@@ -234,7 +238,7 @@ class Z {
             debugLine: 1,
             primitive: "lines",
             framebuffer: r || null,
-            image: this.M,
+            image: this.P,
             count: 8
         }), this.A({
             transform: e,
@@ -242,23 +246,23 @@ class Z {
             debugLine: 0,
             primitive: "triangle strip",
             framebuffer: r || null,
-            image: this.M,
+            image: this.P,
             count: 4
         });
     }
     delete() {
-        this.M && (this.M.destroy(), delete this.M), this.P && (this.P.destroy(), delete this.P), 
+        this.P && (this.P.destroy(), delete this.P), this.I && (this.I.destroy(), delete this.I), 
         this._ && (this._.destroy(), this.S.destroy(), delete this._, delete this.S), this.A && (this.A.destroy(), 
         delete this.A);
     }
     k() {
-        this.P = this.m.buffer(new Uint8Array([ 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1 ])), 
+        this.I = this.m.buffer(new Uint8Array([ 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1 ])), 
         this.A = this.m({
             vert: "\n                attribute vec2 aPosition;\n                attribute vec2 aTexCoord;\n                uniform mat4 transform;\n\n                varying vec2 vTexCoord;\n                void main()\n                {\n                    gl_Position = transform * vec4(aPosition, 0.0, 1.0);\n                    vTexCoord = aTexCoord;\n                }\n            ",
             frag: "\n                precision mediump float;\n                uniform sampler2D uImage;\n                uniform vec3 uColor;\n                uniform float uOpacity;\n                uniform float uDebugLine;\n\n                varying vec2 vTexCoord;\n\n                void main()\n                {\n                    if (uDebugLine == 1.) {\n                        gl_FragColor = vec4(uColor, 1.0) * uOpacity;\n                    } else {\n                        gl_FragColor = texture2D(uImage, vTexCoord) * uOpacity;\n                    }\n                    gl_FragColor *= gl_FragColor.a;\n                }\n            ",
             attributes: {
                 aPosition: this.m.prop("data"),
-                aTexCoord: this.P
+                aTexCoord: this.I
             },
             uniforms: {
                 transform: this.m.prop("transform"),
@@ -295,38 +299,46 @@ class Z {
     }
 }
 
-const K = new Uint8Array([ 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1 ]), Q = [];
+function K(t) {
+    return new Uint16Array([ 0, 0, 0, t, 0, t, t, t, t, t, t, 0, t, 0, 0, 0 ]);
+}
+
+function Q(t, e) {
+    return new Uint16Array([ 0, t - 64 * e, 0, t, 512 * e, t - 64 * e, 512 * e, t ]);
+}
 
-class tt {
+const tt = new Uint8Array([ 0, 0, 0, 1, 1, 0, 1, 0, 0, 1, 1, 1 ]), et = [];
+
+class nt {
     constructor(t, e, i) {
         this.m = t;
-        (this.I = new n.Geometry({
-            aPosition: K
-        }, null, K.length / 2, {
+        (this.O = new n.Geometry({
+            aPosition: tt
+        }, null, tt.length / 2, {
             positionSize: 2
-        })).generateBuffers(t), this.O = new n.Scene, this.C = [], this.F = 0, this.j = e, 
+        })).generateBuffers(t), this.C = new n.Scene, this.F = [], this.j = 0, this.D = e, 
         this.g = i, this.k(t);
     }
     start() {
-        this.F = 0, this.O.clear();
+        this.j = 0, this.C.clear();
     }
     add(t, e, n) {
-        const o = this.D(n);
-        o.setUniform("ref", t), i.set(Q, e, e, 1);
+        const o = this.R(n);
+        o.setUniform("ref", t), i.set(et, e, e, 1);
         const s = o.localTransform;
-        r.fromScaling(s, Q), r.mul(s, n, s), o.setLocalTransform(s), this.O.addMesh(o);
+        r.fromScaling(s, et), r.mul(s, n, s), o.setLocalTransform(s), this.C.addMesh(o);
     }
     render(t) {
-        this.R.render(this.N, {
+        this.N.render(this.L, {
             projViewMatrix: this.g.projViewMatrix
-        }, this.O, t);
+        }, this.C, t);
     }
-    D() {
-        const t = this.F++;
-        return this.C[t] || (this.C[t] = new n.Mesh(this.I)), this.C[t];
+    R() {
+        const t = this.j++;
+        return this.F[t] || (this.F[t] = new n.Mesh(this.O)), this.F[t];
     }
     k(t) {
-        const e = this.j, i = {
+        const e = this.D, i = {
             viewport: {
                 x: 0,
                 y: 0,
@@ -354,7 +366,7 @@ class tt {
             },
             colorMask: [ !1, !1, !1, !1 ]
         };
-        this.N = new n.MeshShader({
+        this.L = new n.MeshShader({
             vert: "\n#define SHADER_NAME TILE_STENCIL_VERT\nattribute vec2 aPosition;\nuniform mat4 projViewModelMatrix;\n\nvoid main()\n{\n    gl_Position = projViewModelMatrix * vec4(aPosition, 0.0, 1.0);\n}\n",
             frag: "\n#define SHADER_NAME TILE_STENCIL_FRAG\nvoid main()\n{\n    gl_FragColor = vec4(1.0, 0.0, 0.0, 0.1);\n}\n",
             uniforms: [ {
@@ -366,18 +378,18 @@ class tt {
                 }
             } ],
             extraCommandProps: i
-        }), this.R = new n.Renderer(t);
+        }), this.N = new n.Renderer(t);
     }
     remove() {
-        this.I.dispose();
-        for (let t = 0; t < this.C.length; t++) this.C[t].dispose();
-        this.C.length = 0, this.N.dispose();
+        this.O.dispose();
+        for (let t = 0; t < this.F.length; t++) this.F[t].dispose();
+        this.F.length = 0, this.L.dispose();
     }
 }
 
-const et = "__fea_idx".trim();
+const it = "__fea_idx".trim();
 
-function nt(t, e, n, i, r) {
+function rt(t, e, n, i, r) {
     const o = {};
     if (function(t) {
         if (!t) return !1;
@@ -387,7 +399,7 @@ function nt(t, e, n, i, r) {
         for (let s = 0, a = (e || t).length; s < a; s++) {
             let a = e ? t[e[s]] : t[s];
             "id" === r.options.features && r.getFeature && (a = r.getFeature(a), a.layer = n);
-            o[e ? e[s] : a[et]] = {
+            o[e ? e[s] : a[it]] = {
                 feature: a,
                 symbol: i
             };
@@ -396,14 +408,14 @@ function nt(t, e, n, i, r) {
     return o;
 }
 
-const it = [], rt = [ 0, 0, 0, 0 ], ot = new t.Point(0, 0);
+const ot = [], st = [ 0, 0, 0, 0 ], at = new t.Point(0, 0);
 
-class st extends t.renderer.TileLayerCanvasRenderer {
+class lt extends t.renderer.TileLayerCanvasRenderer {
     supportRenderMode() {
         return !0;
     }
     constructor(t) {
-        super(t), this.ready = !1, this.L = 0, this.H = {}, this.V = {}, this.U = {}, this.q = [];
+        super(t), this.ready = !1, this.H = 0, this.V = {}, this.U = {}, this.q = {}, this.G = [];
     }
     getTileLevelValue(t, e) {
         if (this.isBackTile(t.id)) {
@@ -413,71 +425,71 @@ class st extends t.renderer.TileLayerCanvasRenderer {
         return 0;
     }
     getWorkerConnection() {
-        return this.G;
+        return this.W;
     }
     setStyle() {
-        this.W && this.W.update(), this.G ? (this.L++, this.G.updateStyle(this.layer.B(), t => {
+        this.B && this.B.update(), this.W ? (this.H++, this.W.updateStyle(this.layer.X(), t => {
             if (t) throw new Error(t);
-            this.X = !0, this.clear(), this.$(), this.J(), this.setToRedraw(), this.layer.fire("refreshstyle");
-        })) : this.J();
+            this.$ = !0, this.clear(), this.J(), this.Y(), this.setToRedraw(), this.layer.fire("refreshstyle");
+        })) : this.Y();
     }
     updateOptions(t) {
-        this.G && this.G.updateOptions(this.layer.getWorkerOptions(), e => {
+        this.W && this.W.updateOptions(this.layer.getWorkerOptions(), e => {
             if (e) throw new Error(e);
-            (t.features || t.pickingGeometry || t.altitudeProperty) && (this.clear(), this.$(), 
-            this.J()), this.setToRedraw();
+            (t.features || t.pickingGeometry || t.altitudeProperty) && (this.clear(), this.J(), 
+            this.Y()), this.setToRedraw();
         });
     }
     updateSceneConfig(t, e, n) {
         const i = 0 === t ? this.plugins : this.featurePlugins;
         if (!i || !i[e]) return;
-        this.X = !0;
-        const r = this.layer.B(), o = this.layer.Y(t, r);
+        this.$ = !0;
+        const r = this.layer.X(), o = this.layer.Z(t, r);
         i[e].config = o[e].renderPlugin, i[e].updateSceneConfig({
             sceneConfig: n
         }), this.setToRedraw();
     }
     updateDataConfig(t, e, n, i) {
         const r = 0 === t ? this.plugins : this.featurePlugins;
-        r && r[e] && (this.X = !0, r[e].updateDataConfig(n, i) ? this.setStyle() : this.setToRedraw());
+        r && r[e] && (this.$ = !0, r[e].updateDataConfig(n, i) ? this.setStyle() : this.setToRedraw());
     }
     updateSymbol(t, e, n) {
         const i = 0 === t ? this.plugins : this.featurePlugins;
         if (!i || !i[e]) return !1;
-        const r = this.layer.B(), o = this.layer.Y(t, r), s = i[e];
+        const r = this.layer.X(), o = this.layer.Z(t, r), s = i[e];
         s.style = o[e];
         const a = s.updateSymbol(n, o[e].symbol);
         return this.setToRedraw(), a;
     }
     needToRedraw() {
-        if (this.q.length) return !0;
+        if (this.G.length) return !0;
         const t = super.needToRedraw();
         if (!t) {
-            const t = this.Z();
+            const t = this.K();
             for (let e = 0; e < t.length; e++) if (t[e] && t[e].needToRedraw()) return !0;
         }
         return t;
     }
     needRetireFrames() {
-        if (this.X) return !0;
-        const t = this.Z();
+        if (this.$) return !0;
+        const t = this.K();
         for (let e = 0; e < t.length; e++) if (t[e] && t[e].needToRetireFrames()) return !0;
         return !1;
     }
     createContext() {
         const t = this.canvas.gl && this.canvas.gl.wrap;
-        t ? (this.gl = this.canvas.gl.wrap(), this.regl = this.canvas.gl.regl) : this.K(), 
+        t ? (this.gl = this.canvas.gl.wrap(), this.regl = this.canvas.gl.regl) : this.tt(), 
         t && (this.canvas.pickingFBO = this.canvas.pickingFBO || this.regl.framebuffer(this.canvas.width, this.canvas.height)), 
         this.pickingFBO = this.canvas.pickingFBO || this.regl.framebuffer(this.canvas.width, this.canvas.height), 
-        this.tt = new Z(this.regl, this.getMap()), this.et(), this.W = new o(this.regl, this.layer);
+        this.et = new Z(this.regl, this.getMap()), this.nt(), this.B = new o(this.regl, this.layer);
     }
-    K() {
+    tt() {
         const t = this.layer, e = t.options.glOptions || {
             alpha: !0,
             depth: !0,
             antialias: this.layer.options.antialias
         };
-        e.preserveDrawingBuffer = !0, e.stencil = !0, this.glOptions = e, this.gl = this.gl || this.nt(this.canvas, e), 
+        e.preserveDrawingBuffer = !0, e.stencil = !0, this.glOptions = e, this.gl = this.gl || this.it(this.canvas, e), 
         this.regl = s({
             gl: this.gl,
             attributes: e,
@@ -485,20 +497,20 @@ class st extends t.renderer.TileLayerCanvasRenderer {
             optionalExtensions: t.options.glExtensions || [ "OES_vertex_array_object", "OES_texture_half_float", "OES_texture_half_float_linear", "OES_texture_float", "OES_texture_float_linear", "WEBGL_draw_buffers", "EXT_shader_texture_lod" ]
         });
     }
-    et() {
-        this.G || (this.G = new J("@maptalks/vt", this.layer));
-        this.G.addLayer((t, e) => {
+    nt() {
+        this.W || (this.W = new J("@maptalks/vt", this.layer));
+        this.W.addLayer((t, e) => {
             this.layer && (this.ready = !0, this.layer.onWorkerReady(t, e), this.layer.fire("workerready"), 
             this.setToRedraw());
         });
     }
     clearCanvas() {
         super.clearCanvas(), this.regl && (this.glOptions.depth ? this.regl.clear({
-            color: rt,
+            color: st,
             depth: 1,
             stencil: 0
         }) : this.regl.clear({
-            color: rt,
+            color: st,
             stencil: 0
         }));
     }
@@ -506,67 +518,67 @@ class st extends t.renderer.TileLayerCanvasRenderer {
         return !0;
     }
     checkResources() {
-        return it;
+        return ot;
     }
     draw(t, e) {
-        this.it !== t && (this.X = !1, this.rt());
+        this.rt !== t && (this.$ = !1, this.ot());
         const n = this.layer;
-        this.prepareCanvas(), this.ready && n.ready ? (this.plugins || this.J(), n.isDefaultRender() || this.plugins.length || this.featurePlugins.length ? (n.options.collision && (n.clearCollisionIndex(), 
-        n.clearBackgroundCollisionIndex()), this.ot = t, this.st = this.at(this.getMap().getGLRes()), 
-        this.lt = e || {}, this.ct(t), (!e || e && e.isFinalRender) && this.ht(), super.draw(t), 
-        this.it !== t && this.ut(t), this.dt(t), this.completeRender(), this.it = t) : this.completeRender()) : this.completeRender();
+        this.prepareCanvas(), this.ready && n.ready ? (this.plugins || this.Y(), n.isDefaultRender() || this.plugins.length || this.featurePlugins.length ? (n.options.collision && (n.clearCollisionIndex(), 
+        n.clearBackgroundCollisionIndex()), this.st = t, this.at = this.lt(this.getMap().getGLRes()), 
+        this.ct = e || {}, this.ht(t), (!e || e && e.isFinalRender) && this.ut(), super.draw(t), 
+        this.rt !== t && this.dt(t), this.ft(t), this.completeRender(), this.rt = t) : this.completeRender()) : this.completeRender();
     }
-    rt() {
-        this.Z().forEach((t, e) => {
+    ot() {
+        this.K().forEach((t, e) => {
             t.renderIndex = e;
         });
     }
-    ut() {
-        const t = this.Z();
-        this.ft = [];
+    dt() {
+        const t = this.K();
+        this.pt = [];
         let e = +!!this.layer.getGroundConfig().enable;
         t.forEach((t, n) => {
-            t.isVisible() && ct(t) && (this.ft[n] = e, t.needPolygonOffset() && e++);
-        }), this.pt = e;
+            t.isVisible() && ut(t) && (this.pt[n] = e, t.needPolygonOffset() && e++);
+        }), this.yt = e;
     }
     getFrameTimestamp() {
-        return this.ot;
+        return this.st;
     }
     drawOnInteracting(t, e, n) {
         this.draw(e, n);
     }
     drawOutline(t) {
-        (this.yt || this.gt) && (this.gt ? this.paintOutlineAll(t) : this.yt.forEach(e => {
+        (this.gt || this.vt) && (this.vt ? this.paintOutlineAll(t) : this.gt.forEach(e => {
             this[e[0]](t, ...e[1]);
         }));
     }
     getShadowMeshes() {
         const t = [];
-        return this.Z().forEach((e, n) => {
+        return this.K().forEach((e, n) => {
             if (!e) return;
-            if (!this.vt(n)) return;
+            if (!this.bt(n)) return;
             const i = e.getShadowMeshes();
             if (Array.isArray(i)) for (let e = 0; e < i.length; e++) t.push(i[e]);
         }), t;
     }
     isForeground(t) {
-        return !(!this.bt || !this.bt[t.properties.tile.id]);
+        return !(!this.xt || !this.xt[t.properties.tile.id]);
     }
     isBackTile(t) {
-        return !(!this.xt || !this.xt[t]);
+        return !(!this.wt || !this.wt[t]);
     }
     loadTile(t) {
-        const {url: e} = t, n = this.H[e];
+        const {url: e} = t, n = this.V[e];
         if (n) n.keys[t.id] || (n.tiles.push(t), n.keys[t.id] = 1); else {
             const n = this.getTileGLScale(t.z);
-            this.H[e] = {
+            this.V[e] = {
                 keys: {},
                 tiles: [ t ]
-            }, this.H[e].keys[t.id] = 1, this.G.loadTile({
+            }, this.V[e].keys[t.id] = 1, this.W.loadTile({
                 tileInfo: t,
                 glScale: n,
-                zScale: this.st
-            }, this.wt.bind(this, e));
+                zScale: this.at
+            }, this.At.bind(this, e));
         }
         return {};
     }
@@ -574,11 +586,11 @@ class st extends t.renderer.TileLayerCanvasRenderer {
         const e = this.getMap();
         return this.layer.getSpatialReference().getResolution(t) / e.getGLRes();
     }
-    wt(t, e, n) {
-        if (!this.H[t]) return;
+    At(t, e, n) {
+        if (!this.V[t]) return;
         if (n && n.canceled) return;
-        const i = this.layer, r = i.isDefaultRender(), {tiles: o} = this.H[t];
-        if (delete this.H[t], e) {
+        const i = this.layer, r = i.isDefaultRender(), {tiles: o} = this.V[t];
+        if (delete this.V[t], e) {
             if (e.status && 404 === e.status) for (let t = 0; t < o.length; t++) {
                 const e = o[t];
                 this.onTileError(Y, e);
@@ -589,35 +601,35 @@ class st extends t.renderer.TileLayerCanvasRenderer {
             for (let t = 0; t < o.length; t++) {
                 const e = o[t];
                 this.onTileLoad({
-                    At: !0
+                    kt: !0
                 }, e);
             }
             return;
         }
-        if (n.style !== this.L) return;
+        if (n.style !== this.H) return;
         let s = !1;
         const a = n.features, l = [];
         for (let t = 0; t < n.data.length; t++) {
             const e = n.data[t];
             if (!e || !e.data || !e.styledFeatures.length) continue;
-            const {isUpdated: i, layer: r} = this.kt(0, t, e, a, l);
+            const {isUpdated: i, layer: r} = this._t(0, t, e, a, l);
             l.push(r), i && (s = i);
         }
         for (let t = 0; t < n.featureData.length; t++) {
             const e = n.featureData[t];
-            e && e.data && e.styledFeatures.length && this.kt(1, t, e, a);
+            e && e.data && e.styledFeatures.length && this._t(1, t, e, a);
         }
-        s && i._t();
+        s && i.St();
         const c = o[0].z, h = this.layer.getDataSchema(c);
-        if (this.St(h, n.schema), delete n.features, r && n.data.length !== l.length) {
+        if (this.Tt(h, n.schema), delete n.features, r && n.data.length !== l.length) {
             const t = n.data;
             n.data = [];
             for (let e = 0; e < t.length; e++) t[e] && t[e].features && n.data.push(t[e]);
         }
         n.layers = l;
         for (let t = 0; t < o.length; t++) {
-            const e = o[t], i = 0 === t ? n : at(n);
-            this.q.push({
+            const e = o[t], i = 0 === t ? n : ct(n);
+            e.extent = i && i.extent, this.G.push({
                 tileData: i,
                 tileInfo: e
             });
@@ -626,8 +638,8 @@ class st extends t.renderer.TileLayerCanvasRenderer {
             url: t
         });
     }
-    kt(t, e, n, i) {
-        const {style: r, isUpdated: o} = this.Tt(t, e, n.data), s = this.layer, a = s.isDefaultRender(), l = r.symbol, c = nt(i, n.styledFeatures, e, l, s);
+    _t(t, e, n, i) {
+        const {style: r, isUpdated: o} = this.Mt(t, e, n.data), s = this.layer, a = s.isDefaultRender(), l = r.symbol, c = rt(i, n.styledFeatures, e, l, s);
         delete n.styledFeatures, n.features = c;
         let h = n.data;
         return Array.isArray(h) && (h = h[0]), {
@@ -638,7 +650,7 @@ class st extends t.renderer.TileLayerCanvasRenderer {
             } : null
         };
     }
-    St(t, e) {
+    Tt(t, e) {
         for (const n in e) {
             t[n] || (t[n] = {
                 types: e[n].types,
@@ -648,23 +660,23 @@ class st extends t.renderer.TileLayerCanvasRenderer {
             for (const t in i) (!r[t] || r[t] && "object" !== i[t] && "object" === r[t]) && (r[t] = i[t]);
         }
     }
-    Tt(t, e, n) {
+    Mt(t, e, n) {
         Array.isArray(n) && (n = n[0]);
         const i = this.layer;
         let r, o = !1;
         if (i.isDefaultRender() && 0 === t) {
-            let t = this.Mt;
-            t || (t = this.Mt = {});
+            let t = this.Pt;
+            t || (t = this.Pt = {});
             const e = n.layer, i = n.type;
             t[e] || (t[e] = []);
             const s = ("plugin_" + i).trim();
-            t[e][s] ? r = t[e][s] : (r = this.Pt(i), r.filter = n.filter, t[e].push(r), t[e][s] = r, 
+            t[e][s] ? r = t[e][s] : (r = this.It(i), r.filter = n.filter, t[e].push(r), t[e][s] = r, 
             o = !0);
         } else {
-            const s = i.B();
-            if (r = i.Y(t, s)[e], !r.renderPlugin) {
+            const s = i.X();
+            if (r = i.Z(t, s)[e], !r.renderPlugin) {
                 o = !0;
-                const {plugin: t, symbol: i, renderPlugin: s} = this.Pt(n.type);
+                const {plugin: t, symbol: i, renderPlugin: s} = this.It(n.type);
                 this.plugins[e] = t, r.symbol = i, r.renderPlugin = s;
             }
         }
@@ -673,30 +685,30 @@ class st extends t.renderer.TileLayerCanvasRenderer {
             isUpdated: o
         };
     }
-    Z(t) {
+    K(t) {
         let e = this.plugins || [];
-        return this.layer.isDefaultRender() && this.Mt && (e = [], t ? t.layers && t.layers.forEach(t => {
+        return this.layer.isDefaultRender() && this.Pt && (e = [], t ? t.layers && t.layers.forEach(t => {
             const n = ("plugin_" + t.type).trim();
-            e.push(this.Mt[t.layer][n].plugin);
-        }) : Object.keys(this.Mt).forEach(t => {
-            for (let n = 0; n < this.Mt[t].length; n++) e.push(this.Mt[t][n].plugin);
+            e.push(this.Pt[t.layer][n].plugin);
+        }) : Object.keys(this.Pt).forEach(t => {
+            for (let n = 0; n < this.Pt[t].length; n++) e.push(this.Pt[t][n].plugin);
         })), this.featurePlugins && this.featurePlugins.length && (e = e.slice(), G(e, this.featurePlugins)), 
         e;
     }
-    It() {
-        if (this.layer.isDefaultRender() && this.Mt) {
+    Ot() {
+        if (this.layer.isDefaultRender() && this.Pt) {
             const t = [];
-            return Object.keys(this.Mt).forEach(e => {
-                for (let n = 0; n < this.Mt[e].length; n++) t.push(this.Mt[e][n].plugin);
+            return Object.keys(this.Pt).forEach(e => {
+                for (let n = 0; n < this.Pt[e].length; n++) t.push(this.Pt[e][n].plugin);
             }), t;
         }
         return this.plugins;
     }
-    ct(t) {
-        const e = this.layer.isDefaultRender() && this.Mt, n = this.lt;
-        this.Z().forEach((i, r) => {
+    ht(t) {
+        const e = this.layer.isDefaultRender() && this.Pt, n = this.ct;
+        this.K().forEach((i, r) => {
             if (!i) return;
-            if (!this.vt(r)) return;
+            if (!this.bt(r)) return;
             const o = e ? i.defaultSymbol : i.style && i.style.symbol, s = {
                 regl: this.regl,
                 layer: this.layer,
@@ -710,54 +722,57 @@ class st extends t.renderer.TileLayerCanvasRenderer {
             n && L(s, n), i.startFrame(s);
         });
     }
-    dt(t) {
-        const e = this.lt, n = e.renderMode, i = e && e.renderTarget && e.renderTarget.fbo, r = this.getMap().cameraPosition, o = this.Z();
+    ft(t) {
+        const e = this.ct, n = e.renderMode, i = e && e.renderTarget && e.renderTarget.fbo, r = this.getMap().cameraPosition, o = this.K();
         this.layer.options.collision ? o.forEach(e => {
-            if (!ct(e)) return;
+            if (!ut(e)) return;
             if (n && "default" !== n && !e.supportRenderMode(n)) return;
-            const i = this.Ot(e, 0, r, t);
+            const i = this.Ct(e, 0, r, t);
             e.prepareRender(i), e.updateCollision(i);
         }) : o.forEach(e => {
-            if (!ct(e)) return;
+            if (!ut(e)) return;
             if (n && "default" !== n && !e.supportRenderMode(n)) return;
-            const i = this.Ot(e, 0, r, t);
+            const i = this.Ct(e, 0, r, t);
             e.prepareRender(i);
         });
-        const s = !e.timestamp || e.isFinalRender, a = this.it !== e.timestamp;
+        const s = !e.timestamp || e.isFinalRender, a = this.rt !== e.timestamp;
         let l = !1;
         if (a) {
-            const e = -this.layer.getPolygonOffset(), n = this.Ot(null, e, r, t);
-            n.offsetFactor = n.offsetUnits = e, this.W.paint(n);
+            const e = -this.layer.getPolygonOffset(), n = this.Ct(null, e, r, t);
+            n.offsetFactor = n.offsetUnits = e, this.B.paint(n);
         }
         o.forEach((e, o) => {
-            if (!this.Ct(e)) return;
+            if (!this.Ft(e)) return;
             if (n && "default" !== n && !e.supportRenderMode(n)) return;
             this.regl.clear({
                 stencil: 255,
                 fbo: i
-            }), this.isEnableTileStencil() && e.painter && !e.painter.needClearStencil() && this.Ft(i);
-            const s = this.ft[o] || 0, a = this.Ot(e, s, r, t), c = e.endFrame(a);
+            }), this.isEnableTileStencil() && e.painter && !e.painter.needClearStencil() && this.zt(i);
+            const s = this.pt[o] || 0, a = this.Ct(e, s, r, t), c = e.endFrame(a);
             c && c.redraw && this.setToRedraw(), l = !0;
-        }), l && this.layer.fire("canvasisdirty"), s && this.zt();
+        }), l && this.layer.fire("canvasisdirty"), s && this.Et();
     }
     getPolygonOffsetCount() {
-        return this.pt || 0;
+        return this.yt || 0;
     }
-    zt() {
+    Et() {
         if (this.layer.options.debug) {
-            const t = this.lt, e = [], n = this.getMap().projViewMatrix;
+            const t = this.ct, e = [], n = this.getMap().projViewMatrix;
             for (const i in this.tilesInView) {
                 const o = this.tilesInView[i].info, s = o.transform, a = this.tilesInView[i].image.extent, l = t && t.renderTarget;
-                s && a && this.tt.draw(this.getDebugInfo(o.id), r.multiply(e, n, s), this.layer.getTileSize().width, a, l && l.fbo);
+                if (s && a) {
+                    const t = this.getDebugInfo(o.id), i = r.multiply(e, n, s), c = this.layer.getTileSize().width;
+                    this.et.draw(t, i, c, a, l && l.fbo);
+                }
             }
         }
     }
-    Ct(t) {
+    Ft(t) {
         if (!t) return !0;
-        const e = t.renderIndex, n = this.lt, i = this.vt(e), r = n && n.states && n.states.includesChanged, o = this.Et(t.painter.scene.getMeshes());
+        const e = t.renderIndex, n = this.ct, i = this.bt(e), r = n && n.states && n.states.includesChanged, o = this.jt(t.painter.scene.getMeshes());
         return !i || !r && !o ? 0 : o ? 2 : 1;
     }
-    Ot(t, e, n, i) {
+    Ct(t, e, n, i) {
         const r = {
             regl: this.regl,
             layer: this.layer,
@@ -767,54 +782,54 @@ class st extends t.renderer.TileLayerCanvasRenderer {
             polygonOffsetIndex: e,
             cameraPosition: n,
             timestamp: i
-        }, o = this.lt;
+        }, o = this.ct;
         return o && L(r, o), r;
     }
-    Et(t) {
+    jt(t) {
         if (!t) return !1;
-        const e = this.lt && this.lt.sceneFilter;
+        const e = this.ct && this.ct.sceneFilter;
         return e ? t.filter(e).length > 0 : t.length > 0;
     }
-    Ft(t) {
+    zt(t) {
         const e = this.isEnableTileStencil(), n = this.getCurrentTileZoom();
-        let i = this.jt;
-        i || (i = this.jt = new tt(this.regl, this.canvas, this.getMap())), i.start();
-        const {tiles: r} = this.Dt;
-        let {parentTiles: o, childTiles: s} = this.Dt, a = 1;
-        s = s.sort(lt);
-        for (let t = 0; t < s.length; t++) this.Rt(s[t].info, e ? a : this.getTileLevelValue(s[t].info.z, n)), 
+        let i = this.Dt;
+        i || (i = this.Dt = new nt(this.regl, this.canvas, this.getMap())), i.start();
+        const {tiles: r} = this.Rt;
+        let {parentTiles: o, childTiles: s} = this.Rt, a = 1;
+        s = s.sort(ht);
+        for (let t = 0; t < s.length; t++) this.Nt(s[t].info, e ? a : this.getTileLevelValue(s[t].info.z, n)), 
         a++;
-        o = o.sort(lt);
-        for (let t = 0; t < o.length; t++) this.Rt(o[t].info, e ? a : this.getTileLevelValue(o[t].info.z, n)), 
+        o = o.sort(ht);
+        for (let t = 0; t < o.length; t++) this.Nt(o[t].info, e ? a : this.getTileLevelValue(o[t].info.z, n)), 
         a++;
-        const l = r.sort(lt);
-        for (let t = l.length - 1; t >= 0; t--) this.Rt(l[t].info, e ? a : this.getTileLevelValue(l[t].info.z, n)), 
+        const l = r.sort(ht);
+        for (let t = l.length - 1; t >= 0; t--) this.Nt(l[t].info, e ? a : this.getTileLevelValue(l[t].info.z, n)), 
         a++;
         i.render(t);
     }
-    Rt(t, e) {
-        const n = this.Nt, i = ot.set(t.extent2d.xmin, t.extent2d.ymax), r = t.transform = t.transform || this.calculateTileMatrix(i, t.z);
-        t.stencilRef = e, this.jt.add(e, n, r);
+    Nt(t, e) {
+        const n = at.set(t.extent2d.xmin, t.extent2d.ymax), i = t.transform = t.transform || this.calculateTileMatrix(n, t.z, t.extent);
+        t.stencilRef = e, this.Dt.add(e, t.extent, i);
     }
     onDrawTileStart(t) {
         super.onDrawTileStart(t);
         const {tiles: e, childTiles: n, parentTiles: i} = t;
-        this.bt = {}, this.xt = {};
-        for (let t = 0; t < e.length; t++) this.bt[e[t].info.id] = 1;
-        for (let t = 0; t < n.length; t++) this.xt[n[t].info.id] = 1;
-        for (let t = 0; t < i.length; t++) this.xt[i[t].info.id] = 1;
-        this.Dt = t;
+        this.xt = {}, this.wt = {};
+        for (let t = 0; t < e.length; t++) this.xt[e[t].info.id] = 1;
+        for (let t = 0; t < n.length; t++) this.wt[n[t].info.id] = 1;
+        for (let t = 0; t < i.length; t++) this.wt[i[t].info.id] = 1;
+        this.Rt = t;
     }
     isEnableTileStencil() {
         return this.layer.isOnly2D();
     }
     drawTile(t, e) {
         if (!e.cache) return;
-        const n = e.cache, i = ot.set(t.extent2d.xmin, t.extent2d.ymax), r = t.transform = t.transform || this.calculateTileMatrix(i, t.z), o = t.tileTranslationMatrix = t.tileTranslationMatrix || this.calculateTileTranslationMatrix(i, t.z), s = [];
+        const n = e.cache, i = at.set(t.extent2d.xmin, t.extent2d.ymax), r = t.transform = t.transform || this.calculateTileMatrix(i, t.z, t.extent), o = t.tileTranslationMatrix = t.tileTranslationMatrix || this.calculateTileTranslationMatrix(i, t.z), s = [];
         G(s, e.data), G(s, e.featureData);
-        this.Z(e).forEach((i, a) => {
+        this.K(e).forEach((i, a) => {
             if (!i) return;
-            const l = this.vt(a);
+            const l = this.bt(a);
             if (!s[a] || !l) return;
             if (!n[a]) return;
             const c = {
@@ -828,24 +843,24 @@ class st extends t.renderer.TileLayerCanvasRenderer {
                 tileTransform: r,
                 tileTranslationMatrix: o,
                 tileExtent: e.extent,
-                timestamp: this.ot,
+                timestamp: this.st,
                 tileInfo: t,
                 tileZoom: this._tileZoom,
-                bloom: this.lt && this.lt.bloom
+                bloom: this.ct && this.ct.bloom
             }, h = i.paintTile(c);
-            !this.X && (h.retire || h.redraw) && i.supportRenderMode("taa") && (this.X = !0), 
+            !this.$ && (h.retire || h.redraw) && i.supportRenderMode("taa") && (this.$ = !0), 
             h.redraw && this.setToRedraw();
         }), this.setCanvasUpdated();
     }
     Lt(t, e) {
-        if (!e.loadTime || e.At) return;
+        if (!e.loadTime || e.kt) return;
         let n = e.cache;
-        n || (n = e.cache = {}), this.Nt || (this.Nt = e.extent);
-        const i = ot.set(t.extent2d.xmin, t.extent2d.ymax), r = t.transform = t.transform || this.calculateTileMatrix(i, t.z), o = t.tileTranslationMatrix = t.tileTranslationMatrix || this.calculateTileTranslationMatrix(i, t.z), s = [];
+        n || (n = e.cache = {});
+        const i = at.set(t.extent2d.xmin, t.extent2d.ymax), r = t.transform = t.transform || this.calculateTileMatrix(i, t.z, e.extent), o = t.tileTranslationMatrix = t.tileTranslationMatrix || this.calculateTileTranslationMatrix(i, t.z), s = [];
         G(s, e.data), G(s, e.featureData);
-        this.Z(e).forEach((i, a) => {
+        this.K(e).forEach((i, a) => {
             if (!i) return;
-            const l = this.vt(a);
+            const l = this.bt(a);
             if (!s[a] || !l) return;
             n[a] || (n[a] = {});
             const c = {
@@ -859,16 +874,16 @@ class st extends t.renderer.TileLayerCanvasRenderer {
                 tileTransform: r,
                 tileTranslationMatrix: o,
                 tileExtent: e.extent,
-                timestamp: this.ot,
+                timestamp: this.st,
                 tileInfo: t,
                 tileZoom: this._tileZoom
             }, h = i.createTile(c);
-            n[a].geometry && (s[a] = 1), !this.X && h.retire && i.supportRenderMode("taa") && (this.X = !0);
+            n[a].geometry && (s[a] = 1), !this.$ && h.retire && i.supportRenderMode("taa") && (this.$ = !0);
         });
     }
-    ht() {
+    ut() {
         let t = 0;
-        const e = this.layer.options.meshLimitPerFrame, n = this.q;
+        const e = this.layer.options.meshLimitPerFrame, n = this.G;
         for (;n.length && t < e; ) {
             const {tileData: e, tileInfo: i} = n.shift();
             this.onTileLoad(e, i), this.Lt(i, e), t++;
@@ -876,17 +891,17 @@ class st extends t.renderer.TileLayerCanvasRenderer {
     }
     pick(t, e, n) {
         const i = [];
-        return this.Z().forEach((r, o) => {
+        return this.K().forEach((r, o) => {
             if (!r) return;
-            if (!this.vt(o)) return;
+            if (!this.bt(o)) return;
             const s = r.pick(t, e, n.tolerance);
             s && (s.type = r.getType(), i.push(s));
         }), i;
     }
     deleteTile(t) {
         if (t) {
-            if (t.image && !t.image.At) {
-                const e = this.It();
+            if (t.image && !t.image.kt) {
+                const e = this.Ot();
                 e && e.forEach((e, n) => {
                     e && e.deleteTile({
                         pluginIndex: n,
@@ -903,25 +918,25 @@ class st extends t.renderer.TileLayerCanvasRenderer {
         }
     }
     abortTileLoading(t, e) {
-        e && e.url && (this.G && this.G.abortTile(e.url), delete this.H[e.url]), super.abortTileLoading(t, e);
+        e && e.url && (this.W && this.W.abortTile(e.url), delete this.V[e.url]), super.abortTileLoading(t, e);
     }
     resizeCanvas(t) {
         super.resizeCanvas(t);
         const e = this.canvas;
         e && (!this.pickingFBO || this.pickingFBO.width === e.width && this.pickingFBO.height === e.height || this.pickingFBO.resize(e.width, e.height), 
-        this.Z().forEach(t => {
+        this.K().forEach(t => {
             t && t.resize(e.width, e.height);
         }));
     }
     onRemove() {
-        this.jt && this.jt.remove(), this.G && (this.G.removeLayer(t => {
+        this.Dt && this.Dt.remove(), this.W && (this.W.removeLayer(t => {
             if (t) throw t;
-        }), this.G.remove(), delete this.G), this.pickingFBO && (this.canvas.pickingFBO || this.pickingFBO.destroy(), 
-        delete this.pickingFBO), this.tt && this.tt.delete(), super.onRemove && super.onRemove(), 
-        this.$();
+        }), this.W.remove(), delete this.W), this.pickingFBO && (this.canvas.pickingFBO || this.pickingFBO.destroy(), 
+        delete this.pickingFBO), this.et && this.et.delete(), super.onRemove && super.onRemove(), 
+        this.J();
     }
-    $() {
-        this.Z().forEach(t => {
+    J() {
+        this.K().forEach(t => {
             t.remove();
         }), this.plugins = [];
     }
@@ -930,8 +945,8 @@ class st extends t.renderer.TileLayerCanvasRenderer {
         const e = this.gl, n = new Uint8Array(4), i = this.canvas.height;
         return e.readPixels(t.x, i - t.y, 1, 1, e.RGBA, e.UNSIGNED_BYTE, n), n[3] > 0;
     }
-    J() {
-        const {style: t, featureStyle: e} = this.layer.B(), n = t.map((t, e) => {
+    Y() {
+        const {style: t, featureStyle: e} = this.layer.X(), n = t.map((t, e) => {
             const n = t.renderPlugin;
             if (!n) return null;
             if (!n.type) throw new Error("invalid plugin type for style at " + e);
@@ -953,7 +968,7 @@ class st extends t.renderer.TileLayerCanvasRenderer {
         const n = new e;
         return n.config = t, n.config.sceneConfig || (n.config.sceneConfig = {}), n;
     }
-    nt(t, e) {
+    it(t, e) {
         const n = [ "webgl", "experimental-webgl" ];
         let i = null;
         for (let r = 0; r < n.length; ++r) {
@@ -964,7 +979,7 @@ class st extends t.renderer.TileLayerCanvasRenderer {
         }
         return i;
     }
-    at(t) {
+    lt(t) {
         return X(t, this.getMap());
     }
     debugFBO(t, e) {
@@ -982,7 +997,7 @@ class st extends t.renderer.TileLayerCanvasRenderer {
         const h = new ImageData(i, r);
         h.data.set(s), o.putImageData(h, 0, 0);
     }
-    Pt(t) {
+    It(t) {
         let e;
         switch (t) {
           case "native-line":
@@ -1050,7 +1065,7 @@ class st extends t.renderer.TileLayerCanvasRenderer {
             renderPlugin: e
         };
     }
-    vt() {
+    bt() {
         return !0;
     }
     isEnableWorkAround(t) {
@@ -1064,76 +1079,76 @@ class st extends t.renderer.TileLayerCanvasRenderer {
         }(this.gl));
     }
     isCachePlaced(t) {
-        return 1 === this.U[t];
+        return 1 === this.q[t];
     }
     placeCache(t) {
-        this.U[t] = 1;
+        this.q[t] = 1;
     }
     fetchCache(t) {
-        return this.V[t] && this.V[t].resource;
+        return this.U[t] && this.U[t].resource;
     }
     removeCache(t) {
-        delete this.U[t];
-        const e = this.V[t];
-        e && (e.count--, e.count <= 0 && (e.onDelete && e.onDelete(e.resource), delete this.V[t]));
+        delete this.q[t];
+        const e = this.U[t];
+        e && (e.count--, e.count <= 0 && (e.onDelete && e.onDelete(e.resource), delete this.U[t]));
     }
     addToCache(t, e, n) {
-        delete this.U[t], this.V[t] ? this.V[t].count++ : this.V[t] = {
+        delete this.q[t], this.U[t] ? this.U[t].count++ : this.U[t] = {
             resource: e,
             onDelete: n,
             count: 1
         };
     }
     getZScale() {
-        return this.st;
+        return this.at;
     }
     outline(t, e) {
-        e && (Array.isArray(e) || (e = [ e ]), this.yt || (this.yt = []), this.yt.push([ "paintOutline", [ t, e ] ]), 
+        e && (Array.isArray(e) || (e = [ e ]), this.gt || (this.gt = []), this.gt.push([ "paintOutline", [ t, e ] ]), 
         this.setToRedraw());
     }
     outlineBatch(t) {
-        this.yt || (this.yt = []), this.yt.push([ "paintBatchOutline", [ t ] ]), this.setToRedraw();
+        this.gt || (this.gt = []), this.gt.push([ "paintBatchOutline", [ t ] ]), this.setToRedraw();
     }
     outlineAll() {
-        this.gt = !0, this.setToRedraw();
+        this.vt = !0, this.setToRedraw();
     }
     paintOutlineAll(t) {
-        const e = this.Z();
+        const e = this.K();
         for (let n = 0; n < e.length; n++) e[n].outlineAll(t);
     }
     paintOutline(t, e, n) {
-        const i = e, r = this.Z();
+        const i = e, r = this.K();
         !r[i] || r[i].painter && !r[i].painter.isVisible() || r[i].outline(t, n);
     }
     paintBatchOutline(t, e) {
-        const n = this.Z();
+        const n = this.K();
         !n[e] || n[e].painter && !n[e].painter.isVisible() || n[e].outlineAll(t);
     }
     cancelOutline() {
-        delete this.yt, delete this.gt, this.setToRedraw();
+        delete this.gt, delete this.vt, this.setToRedraw();
     }
     setZIndex() {
-        return this.setToRedraw(), this.X = !0, super.setZIndex.apply(this, arguments);
+        return this.setToRedraw(), this.$ = !0, super.setZIndex.apply(this, arguments);
     }
 }
 
-function at(t) {
+function ct(t) {
     let e;
     Array.isArray(t.data) ? (e = [], G(e, t.data)) : (e = {}, L(e, t.data));
     const n = L({}, t);
     return n.data = e, n;
 }
 
-function lt(t, e) {
+function ht(t, e) {
     return e.info.z - t.info.z;
 }
 
-function ct(t) {
+function ut(t) {
     const e = t.painter && t.painter.scene && t.painter.scene.getMeshes();
     return e && e.length;
 }
 
-function ht(t, e, n) {
+function dt(t, e, n) {
     for (let i = 0; i < t.length; i++) {
         const r = t[i], o = L({}, r), {renderPlugin: s} = r, a = L({}, s);
         a.sceneConfig && !Object.keys(a.sceneConfig).length && delete a.sceneConfig;
@@ -1146,12 +1161,12 @@ function ht(t, e, n) {
     }
 }
 
-st.include({
+lt.include({
     calculateTileMatrix: function() {
         const t = new Array(3), e = new Array(3), n = new Array(3);
-        return function(o, s) {
-            const a = this.Nt, l = this.getTileGLScale(s), c = o, h = this.layer.getTileSize(), u = r.identity([]);
-            return r.scale(u, u, i.set(t, l, l, this.st)), r.translate(u, u, i.set(e, c.x, c.y, 0)), 
+        return function(o, s, a) {
+            const l = this.getTileGLScale(s), c = o, h = this.layer.getTileSize(), u = r.identity([]);
+            return r.scale(u, u, i.set(t, l, l, this.at)), r.translate(u, u, i.set(e, c.x, c.y, 0)), 
             r.scale(u, u, i.set(n, h.width / a, -h.height / a, 1)), u;
         };
     }(),
@@ -1164,7 +1179,7 @@ st.include({
     }()
 });
 
-const ut = "function" == typeof fetch && "function" == typeof AbortController, dt = {
+const ft = "function" == typeof fetch && "function" == typeof AbortController, pt = {
     jsonp: function(t, e) {
         const n = "_maptalks_jsonp_" + R();
         t.match(/\?/) ? t += "&callback=" + n : t += "?callback=" + n;
@@ -1180,7 +1195,7 @@ const ut = "function" == typeof fetch && "function" == typeof AbortController, d
         }
         (e = e || {}).method && (e.method = e.method.toUpperCase());
         const i = "POST" === e.method;
-        if (ut) {
+        if (ft) {
             const r = new AbortController, o = {
                 signal: r.signal,
                 method: e.method || "GET",
@@ -1204,7 +1219,7 @@ const ut = "function" == typeof fetch && "function" == typeof AbortController, d
             }), r;
         }
         {
-            const r = dt.Ut(n);
+            const r = pt.Ut(n);
             if (r.open(e.method || "GET", t, !0), e) {
                 for (const t in e.headers) r.setRequestHeader(t, e.headers[t]);
                 r.withCredentials = "include" === e.credentials, e.responseType && (r.responseType = e.responseType);
@@ -1250,14 +1265,14 @@ const ut = "function" == typeof fetch && "function" == typeof AbortController, d
                 } catch (t) {}
             }
         }
-        return e.onreadystatechange = dt.qt(e, t), e;
+        return e.onreadystatechange = pt.qt(e, t), e;
     },
     getArrayBuffer(t, e, n) {
         if (U(e)) {
             const t = n;
             n = e, e = t;
         }
-        return e || (e = {}), e.responseType = "arraybuffer", dt.get(t, e, n);
+        return e || (e = {}), e.responseType = "arraybuffer", pt.get(t, e, n);
     },
     getJSON: function(t, e, n) {
         if (U(e)) {
@@ -1268,9 +1283,9 @@ const ut = "function" == typeof fetch && "function" == typeof AbortController, d
             const i = "string" == typeof e ? JSON.parse(e) : e || null;
             n(t, i);
         };
-        return e && e.jsonp ? dt.jsonp(t, i) : ((e = e || {}).returnJSON = !0, dt.get(t, e, i));
+        return e && e.jsonp ? pt.jsonp(t, i) : ((e = e || {}).returnJSON = !0, pt.get(t, e, i));
     }
-}, ft = {
+}, mt = {
     renderer: "gl",
     altitudeProperty: "altitude",
     forceRenderOnZooming: !0,
@@ -1303,9 +1318,9 @@ const ut = "function" == typeof fetch && "function" == typeof AbortController, d
     enableAltitude: !0
 };
 
-class pt extends t.TileLayer {
+class yt extends t.TileLayer {
     constructor(t, e) {
-        super(t, e), this.VERSION = pt.VERSION;
+        super(t, e), this.VERSION = yt.VERSION;
         const n = e && e.style;
         this.setStyle(n);
     }
@@ -1329,7 +1344,7 @@ class pt extends t.TileLayer {
             style: this.isDefaultRender() ? {
                 style: [],
                 featureStyle: []
-            } : this.B(),
+            } : this.X(),
             features: this.options.features,
             schema: this.options.schema,
             pickingGeometry: this.options.pickingGeometry
@@ -1338,7 +1353,7 @@ class pt extends t.TileLayer {
     setStyle(t) {
         if (t && (H(t) || t.url)) {
             const e = t, n = e.lastIndexOf("/"), i = n < 0 ? "." : e.substring(0, n);
-            return this.ready = !1, dt.getJSON(t.url ? t.url : t, t.url ? t : {}, (t, n) => {
+            return this.ready = !1, pt.getJSON(t.url ? t.url : t, t.url ? t : {}, (t, n) => {
                 if (t) throw this.setStyle([]), t;
                 let r;
                 n.style ? (r = n, r.$root || (r.$root = i)) : r = {
@@ -1386,11 +1401,11 @@ class pt extends t.TileLayer {
         const e = t.background || {};
         this.Jt = {
             enable: e.enable || !1,
-            color: yt(e.color) || [ 0, 0, 0, 0 ],
-            opacity: gt(e.opacity, 1),
+            color: vt(e.color) || [ 0, 0, 0, 0 ],
+            opacity: bt(e.opacity, 1),
             patternFile: e.patternFile,
             depthRange: e.depthRange
-        }, this.validateStyle(), this.Gt && this.Yt(), this._t();
+        }, this.validateStyle(), this.Gt && this.Yt(), this.St();
         const n = this.getRenderer();
         return n && n.setStyle(), this.fire("setstyle", {
             style: this.getStyle(),
@@ -1436,22 +1451,22 @@ class pt extends t.TileLayer {
         return this.Qt(1, t, n, e);
     }
     Qt(t, e, n, i) {
-        const r = this.Y(t);
+        const r = this.Z(t);
         if (!r) return this;
         let o, s = e;
         if (r[e].renderPlugin.sceneConfig || (r[e].renderPlugin.sceneConfig = {}), L(r[e].renderPlugin.sceneConfig, n), 
         void 0 !== i) {
-            vt(this.Wt, e, i), s = this.Wt[e].style[i].Xt;
+            xt(this.Wt, e, i), s = this.Wt[e].style[i].Xt;
             const t = r[s].renderPlugin;
             t.sceneConfig || (t.sceneConfig = {}), o = t.sceneConfig;
-        } else bt(r, e), o = r[e].renderPlugin.sceneConfig;
+        } else wt(r, e), o = r[e].renderPlugin.sceneConfig;
         if (L(o, n), Array.isArray(this.options.style)) {
             const t = this.options.style[e].renderPlugin;
             t.sceneConfig || (t.sceneConfig = {}), L(t.sceneConfig, n);
         } else {
-            const r = this.Y(t, this.options.style);
+            const r = this.Z(t, this.options.style);
             let o;
-            void 0 !== i ? (vt(r, e, i), o = r[e].style[i].renderPlugin) : (bt(r, e), o = r[e].renderPlugin), 
+            void 0 !== i ? (xt(r, e, i), o = r[e].style[i].renderPlugin) : (wt(r, e), o = r[e].renderPlugin), 
             o.sceneConfig || (o.sceneConfig = {}), L(o.sceneConfig, n);
         }
         const a = this.getRenderer();
@@ -1471,16 +1486,16 @@ class pt extends t.TileLayer {
         return this.te(1, t, n, e);
     }
     te(t, e, n, i) {
-        const r = this.Y(t);
+        const r = this.Z(t);
         if (!r) return this;
         let o, s = e;
-        void 0 !== i ? (vt(this.Wt, e, i), s = this.Wt[e].style[i].Xt, o = r[s].renderPlugin.dataConfig) : (bt(r, e), 
+        void 0 !== i ? (xt(this.Wt, e, i), s = this.Wt[e].style[i].Xt, o = r[s].renderPlugin.dataConfig) : (wt(r, e), 
         o = r[e].renderPlugin.dataConfig);
         const a = L({}, o);
         if (L(o, n), Array.isArray(this.options.style)) L(this.options.style[e].renderPlugin.dataConfig, n); else {
-            const r = this.Y(t, this.options.style);
+            const r = this.Z(t, this.options.style);
             let o;
-            void 0 !== i ? (vt(r, e, i), o = r[e].style[i].renderPlugin) : (bt(r, e), o = r[e].renderPlugin), 
+            void 0 !== i ? (xt(r, e, i), o = r[e].style[i].renderPlugin) : (wt(r, e), o = r[e].renderPlugin), 
             o.dataConfig || (o.dataConfig = {}), L(o.dataConfig, n);
         }
         const l = this.getRenderer();
@@ -1500,10 +1515,10 @@ class pt extends t.TileLayer {
         return this.ee(1, t, n, e);
     }
     ee(e, n, i, r) {
-        const o = this.Y(e);
+        const o = this.Z(e);
         if (!o) return this;
         let s = n;
-        void 0 !== r && (vt(this.Wt, n, r), s = this.Wt[n].style[r].Xt);
+        void 0 !== r && (xt(this.Wt, n, r), s = this.Wt[n].style[r].Xt);
         const a = o[s];
         if (!a) throw new Error("No style defined at " + n);
         const l = this, c = this.Gt;
@@ -1514,7 +1529,7 @@ class pt extends t.TileLayer {
             let h = !1;
             for (let t = 0; t < a.length; t++) {
                 const e = a[t];
-                if (mt(o[e]) || mt(i[e])) {
+                if (gt(o[e]) || gt(i[e])) {
                     h = !0;
                     break;
                 }
@@ -1522,20 +1537,20 @@ class pt extends t.TileLayer {
             for (const e in i) B(i, e) && (!t.Util.isObject(i[e]) || Array.isArray(i[e]) || i[e].stops ? o[e] = i[e] : (o[e] || (o[e] = {}), 
             L(o[e], i[e])));
             let u = l.options.style;
-            Array.isArray(u) || (u = l.Y(e, l.options.style));
+            Array.isArray(u) || (u = l.Z(e, l.options.style));
             const d = JSON.parse(JSON.stringify(o));
-            return void 0 !== r ? (vt(u, n, r), void 0 === s ? u[n].style[r].symbol = d : u[n].style[r].symbol[s] = d) : (bt(u, n), 
+            return void 0 !== r ? (xt(u, n, r), void 0 === s ? u[n].style[r].symbol = d : u[n].style[r].symbol[s] = d) : (wt(u, n), 
             void 0 === s ? u[n].symbol = d : u[n].symbol[s] = d), h;
         }
         const u = this.getRenderer();
-        if (!u) return h(), this._t(), this;
+        if (!u) return h(), this.St(), this;
         let d = !1;
         const f = a.symbol;
         if (Array.isArray(i)) for (let t = 0; t < i.length; t++) {
             const e = h(i[t], f[t], t);
             e && (d = e);
         } else h(i, f);
-        return this._t(), d ? u.setStyle() : (d = u.updateSymbol(e, s, i), d && u.setStyle()), 
+        return this.St(), d ? u.setStyle() : (d = u.updateSymbol(e, s, i), d && u.setStyle()), 
         0 === e ? this.fire("updatesymbol", {
             index: n,
             symbol: i
@@ -1545,7 +1560,7 @@ class pt extends t.TileLayer {
             symbol: i
         }), this;
     }
-    Y(t, e) {
+    Z(t, e) {
         if (e) {
             return 0 === t ? e.style : e.featureStyle;
         }
@@ -1579,15 +1594,15 @@ class pt extends t.TileLayer {
                 polygonOpacity: 1
             }
         });
-        const t = this.B().background || {};
+        const t = this.X().background || {};
         return this.re.enable = t.enable, this.re.symbol.polygonFill = t.color, this.re.symbol.polygonOpacity = t.opacity, 
         this.re.symbol.polygonPatternFile = t.patternFile, this.re.renderPlugin.sceneConfig.depthRange = t.depthRange, 
         this.re;
     }
     getComputedStyle() {
-        return JSON.parse(JSON.stringify(this.B()));
+        return JSON.parse(JSON.stringify(this.X()));
     }
-    B() {
+    X() {
         return {
             background: this.Jt,
             style: this.$t || [],
@@ -1622,14 +1637,14 @@ class pt extends t.TileLayer {
         super.onRemove();
     }
     static fromJSON(t) {
-        return t && "VectorTileLayer" === t.type ? new pt(t.id, t.options) : null;
+        return t && "VectorTileLayer" === t.type ? new yt(t.id, t.options) : null;
     }
-    _t() {}
+    St() {}
     static registerPlugin(t) {
-        pt.plugins || (pt.plugins = {}), pt.plugins[t.type] = t;
+        yt.plugins || (yt.plugins = {}), yt.plugins[t.type] = t;
     }
     static getPlugins() {
-        return pt.plugins || {};
+        return yt.plugins || {};
     }
     static compressStyleJSON(t) {
         return Array.isArray(t) && t.length ? function(t) {
@@ -1638,7 +1653,7 @@ class pt extends t.TileLayer {
                 featureStyle: []
             });
             const e = [], n = [], i = [];
-            ht(t.style, e, i), ht(t.featureStyle, n, i);
+            dt(t.style, e, i), dt(t.featureStyle, n, i);
             const r = {
                 plugins: i,
                 styles: {
@@ -1652,56 +1667,56 @@ class pt extends t.TileLayer {
     }
 }
 
-function mt(t) {
+function gt(t) {
     return !(!t || !t.properties);
 }
 
-function yt(t) {
+function vt(t) {
     return t ? (Array.isArray(t) || (t = C(t).unitArray()), 3 === t.length && t.push(1), 
     t) : null;
 }
 
-function gt(t, e) {
+function bt(t, e) {
     return null == t ? e : t;
 }
 
-function vt(t, e, n) {
+function xt(t, e, n) {
     if (!t[e] || !t[e].style || !t[e].style[n]) throw new Error(`No plugin defined at feature style of ${e} - ${n}`);
 }
 
-function bt(t, e) {
+function wt(t, e) {
     if (!t[e]) throw new Error("No plugin defined at style of " + e);
 }
 
-pt.prototype._getTileZoom = function(e) {
+yt.prototype._getTileZoom = function(e) {
     return e = Math.floor(e), t.TileLayer.prototype._getTileZoom.call(this, e);
-}, pt.registerJSONType("VectorTileLayer"), pt.mergeOptions(ft), pt.registerRenderer("gl", st), 
-pt.registerRenderer("canvas", null);
+}, yt.registerJSONType("VectorTileLayer"), yt.mergeOptions(mt), yt.registerRenderer("gl", lt), 
+yt.registerRenderer("canvas", null);
 
-class xt extends pt {
+class At extends yt {
     getTileUrl(t, e, n) {
         const i = this.getMap().getResolution(n);
         return super.getTileUrl(t, e, function(t) {
-            return 19 - Math.log(t / wt) / Math.LN2;
+            return 19 - Math.log(t / kt) / Math.LN2;
         }(i));
     }
     static fromJSON(t) {
-        return t && "MapboxVectorTileLayer" === t.type ? new xt(t.id, t.options) : null;
+        return t && "MapboxVectorTileLayer" === t.type ? new At(t.id, t.options) : null;
     }
 }
 
-xt.registerJSONType("MapboxVectorTileLayer");
+At.registerJSONType("MapboxVectorTileLayer");
 
-const wt = 12756274 * Math.PI / (256 * Math.pow(2, 20));
+const kt = 12756274 * Math.PI / (256 * Math.pow(2, 20));
 
-class At extends pt {
+class _t extends yt {
     constructor(t, e = {}) {
         e.spatialReference = null, super(t, e), this.setData(e.data);
     }
     getWorkerOptions() {
         const t = super.getWorkerOptions();
         let e = this.options.data;
-        return e = H(e) || e && e.url ? _t(e) : this.features, t.data = e, t.tileBuffer = this.options.tileBuffer, 
+        return e = H(e) || e && e.url ? Tt(e) : this.features, t.data = e, t.tileBuffer = this.options.tileBuffer, 
         t.extent = this.options.extent, t.hasAltitude = this.options.enableAltitude, t;
     }
     setData(t) {
@@ -1722,7 +1737,7 @@ class At extends pt {
             const e = t.getWorkerConnection();
             if (e) {
                 let n = this.options.data;
-                n = H(n) || n.url ? _t(n) : this.features, e.setData(n, (e, n) => {
+                n = H(n) || n.url ? Tt(n) : this.features, e.setData(n, (e, n) => {
                     t.clear(), this.onWorkerReady(null, n), t.setToRedraw();
                 });
             }
@@ -1742,7 +1757,7 @@ class At extends pt {
         this.he = new t.Extent(...e);
     }
     fe(t, e) {
-        H(t) ? dt.getJSON(t, e) : dt.getJSON(t.url, t, e);
+        H(t) ? pt.getJSON(t, e) : pt.getJSON(t.url, t, e);
     }
     getData() {
         return this.features || null;
@@ -1754,7 +1769,7 @@ class At extends pt {
         return this.de[t];
     }
     static fromJSON(t) {
-        return t && "GeoJSONVectorTileLayer" === t.type ? new At(t.id, t.options) : null;
+        return t && "GeoJSONVectorTileLayer" === t.type ? new _t(t.id, t.options) : null;
     }
     ce() {
         if (!this.features) return;
@@ -1770,28 +1785,28 @@ class At extends pt {
     }
 }
 
-function kt(t) {
+function St(t) {
     let e = document.createElement("a");
     return e.href = t, t = e.href, e = null, t;
 }
 
-function _t(t) {
-    return t.url ? t.url = kt(t.url) : t = kt(t), t;
+function Tt(t) {
+    return t.url ? t.url = St(t.url) : t = St(t), t;
 }
 
-At.registerJSONType("GeoJSONVectorTileLayer"), At.mergeOptions({
+_t.registerJSONType("GeoJSONVectorTileLayer"), _t.mergeOptions({
     features: "id",
     tileBuffer: 64,
     extent: 8192,
     pyramidMode: 1
 });
 
-class St extends t.OverlayLayer {
+class Mt extends t.OverlayLayer {
     static registerPainter(t, e) {
-        St.painters || (St.painters = {}), St.painters[t] = e;
+        Mt.painters || (Mt.painters = {}), Mt.painters[t] = e;
     }
     static get3DPainterClass(t) {
-        return St.painters[t];
+        return Mt.painters[t];
     }
     constructor(...t) {
         super(...t), this.options.sceneConfig || (this.options.sceneConfig = {});
@@ -1859,7 +1874,7 @@ class St extends t.OverlayLayer {
     }
 }
 
-St.mergeOptions({
+Mt.mergeOptions({
     picking: !0,
     renderer: "gl",
     collision: !1,
@@ -1875,7 +1890,7 @@ St.mergeOptions({
     }
 });
 
-const Tt = {
+const Pt = {
     markerFile: {
         type: "identity",
         default: void 0,
@@ -2021,7 +2036,7 @@ const Tt = {
         default: "point",
         property: "_symbol_markerPlacement"
     }
-}, Mt = {
+}, It = {
     textName: {
         type: "identity",
         default: void 0,
@@ -2132,7 +2147,7 @@ const Tt = {
         default: "point",
         property: "_symbol_textPlacement"
     }
-}, Pt = {
+}, Ot = {
     lineWidth: {
         type: "identity",
         default: 2,
@@ -2203,35 +2218,35 @@ const Tt = {
         default: void 0,
         property: "_symbol_lineDashColor"
     }
-}, It = new t.Point(0, 0), Ot = "_vector3dlayer_id", Ct = "_line_gradient_property".trim();
+}, Ct = new t.Point(0, 0), Ft = "_vector3dlayer_id", zt = "_line_gradient_property".trim();
 
-function Ft(e, n, i) {
+function Et(e, n, i) {
     const r = "__fea_idx".trim(), o = e.getMap(), s = o.getGLRes();
     let a = e.getCoordinates();
     const l = [];
     let c = 1;
     if (e instanceof t.Marker || e instanceof t.MultiPoint) {
         e instanceof t.Marker && (a = [ a ]);
-        for (let t = 0; t < a.length; t++) o.coordToPointAtRes(a[t], s, It), l.push([ It.x, It.y, a[t].z || 0 ]);
+        for (let t = 0; t < a.length; t++) o.coordToPointAtRes(a[t], s, Ct), l.push([ Ct.x, Ct.y, a[t].z || 0 ]);
     } else if (e instanceof t.LineString || e instanceof t.MultiLineString) {
         c = 2, e instanceof t.LineString && (a = [ a ]);
         for (let t = 0; t < a.length; t++) {
             l[t] = [];
-            for (let e = 0; e < a[t].length; e++) o.coordToPointAtRes(a[t][e], s, It), l[t].push([ It.x, It.y, a[t][e].z || 0 ]);
+            for (let e = 0; e < a[t].length; e++) o.coordToPointAtRes(a[t][e], s, Ct), l[t].push([ Ct.x, Ct.y, a[t][e].z || 0 ]);
         }
     } else if (e instanceof t.Polygon || e instanceof t.MultiPolygon) {
         c = 3, e instanceof t.Polygon && (a = [ a ]);
         let n = 0;
         for (let t = 0; t < a.length; t++) for (let e = 0; e < a[t].length; e++) {
             l[n] = [];
-            for (let i = 0; i < a[t][e].length; i++) o.coordToPointAtRes(a[t][e][i], s, It), 
-            l[n].push([ It.x, It.y, a[t][e][i].z || 0 ]);
+            for (let i = 0; i < a[t][e].length; i++) o.coordToPointAtRes(a[t][e][i], s, Ct), 
+            l[n].push([ Ct.x, Ct.y, a[t][e][i].z || 0 ]);
             n++;
         }
     }
     const h = e.getProperties() ? Object.assign({}, e.getProperties()) : {}, u = e._getInternalSymbol();
     let d = u.lineGradientProperty;
-    d && (h[Ct] = h[d], h.mapbox_clip_start = 0, h.mapbox_clip_end = 1, delete h[d]), 
+    d && (h[zt] = h[d], h.mapbox_clip_start = 0, h.mapbox_clip_end = 1, delete h[d]), 
     delete u.lineGradientProperty;
     const f = i ? Array.isArray(i) ? i[0][r] : i[r] : n.id++;
     if (Array.isArray(u) && u.length) {
@@ -2268,19 +2283,19 @@ function Ft(e, n, i) {
     return m[r] = p, m;
 }
 
-let zt = 1;
+let jt = 1;
 
-const Et = "_symbol_".trim(), jt = "__fea_idx".trim();
+const Dt = "_symbol_".trim(), Rt = "__fea_idx".trim();
 
-let Dt = new Float32Array(1);
+let Nt = new Float32Array(1);
 
-class Rt extends t.renderer.CanvasRenderer {
+class Lt extends t.renderer.CanvasRenderer {
     constructor(...t) {
-        super(...t), this.features = {}, this.pe = {}, this.F = 0, this.me = {}, this.ye = {}, 
+        super(...t), this.features = {}, this.pe = {}, this.j = 0, this.me = {}, this.ye = {}, 
         this.ge = {}, this.ve = {}, this.be = {}, this.xe = !0, this.we = {
             id: 0,
             pickingId: 0
-        }, this.Ae = L({}, Tt, Mt), this.ke = {};
+        }, this.Ae = L({}, Pt, It), this.ke = {};
     }
     hasNoAARendering() {
         return !0;
@@ -2291,7 +2306,7 @@ class Rt extends t.renderer.CanvasRenderer {
     }
     draw(t, e) {
         const n = this.layer;
-        if (this.prepareCanvas(), this.st = this.at(this.getMap().getGLRes()), this.xe) this.buildMesh(), 
+        if (this.prepareCanvas(), this.at = this.lt(this.getMap().getGLRes()), this.xe) this.buildMesh(), 
         this.Te(), this.Me(), this.ke = {}, this.Pe = !1, this.xe = !1, this.Ie = !1; else if (this.Pe) {
             const t = this.atlas, e = this.Oe, n = this.Ce;
             delete this.atlas, delete this.Oe, delete this.Ce, this.buildMesh(t), this.Te(e), 
@@ -2301,8 +2316,8 @@ class Rt extends t.renderer.CanvasRenderer {
             delete this.Ce, this.Me(t), this.Ie = !1;
         }
         if (!this.meshes && !this.Fe && !this.ze) return void this.completeRender();
-        this.Ee && (this.je(), this.Ee = !1), this.De(), this.ot = t, this.lt = e || {};
-        const i = this.lt.renderMode, r = !i || "default" === i, o = this.Re();
+        this.Ee && (this.je(), this.Ee = !1), this.De(), this.st = t, this.ct = e || {};
+        const i = this.ct.renderMode, r = !i || "default" === i, o = this.Re();
         let s = 0;
         0 === this.layer.options.meshRenderOrder && this.Ne(o, s, i), this.ze && (r || this.Se.supportRenderMode(i)) && (this.Se.startFrame(o), 
         this.Se.addMesh(this.ze, null, {
@@ -2338,20 +2353,20 @@ class Rt extends t.renderer.CanvasRenderer {
             cameraPosition: this.getMap().cameraPosition,
             timestamp: this.getFrameTimestamp()
         };
-        return this.lt && L(t, this.lt), t;
+        return this.ct && L(t, this.ct), t;
     }
     drawOnInteracting(t, e, n) {
         this.draw(e, n);
     }
     getFrameTimestamp() {
-        return this.ot;
+        return this.st;
     }
     He() {
         const t = [], e = [ 0, 0, 0, 0 ];
         this.layer._sortGeometries();
         const n = this.layer.getGeometries();
         for (let i = 0; i < n.length; i++) {
-            const r = n[i][Ot];
+            const r = n[i][Ft];
             if (!this.features[r]) continue;
             const o = this.features[r];
             if (Array.isArray(o)) for (let n = 0; n < o.length; n++) {
@@ -2382,10 +2397,10 @@ class Rt extends t.renderer.CanvasRenderer {
         const l = [], c = [];
         return this.createVectorPacks(t, e, n, o, s, a).then(e => {
             if (!e) return null;
-            const s = t.createGeometries([ e.data ], nt(o, null, 0, n, this.layer));
+            const s = t.createGeometries([ e.data ], rt(o, null, 0, n, this.layer));
             for (let t = 0; t < s.length; t++) this.Ue(s[t].geometry);
             const h = r.identity([]);
-            r.translate(h, h, i.set(c, a[0], a[1], 0)), r.scale(h, h, i.set(l, 1, 1, this.st));
+            r.translate(h, h, i.set(c, a[0], a[1], 0)), r.scale(h, h, i.set(l, 1, 1, this.at));
             const u = t.createMeshes(s, h, {
                 tilePoint: [ a[0], a[1] ]
             });
@@ -2419,7 +2434,7 @@ class Rt extends t.renderer.CanvasRenderer {
         }), n.tileRatio = 1, n.z = 1, n.tileExtent = 1;
     }
     qe(t) {
-        return "win-intel-gpu-crash" === t && (this.layer.options.workarounds["win-intel-gpu-crash"] && Lt(this.gl));
+        return "win-intel-gpu-crash" === t && (this.layer.options.workarounds["win-intel-gpu-crash"] && Vt(this.gl));
     }
     prepareRequestors() {
         if (this.h) return;
@@ -2460,7 +2475,7 @@ class Rt extends t.renderer.CanvasRenderer {
         delete this.Fe));
         const {features: o, center: s} = this.He(), a = [], l = [];
         for (let t = 0; t < o.length; t++) {
-            const e = o[t][jt];
+            const e = o[t][Rt];
             this.ge[e] && a.push(o[t]), this.ve[e] && l.push(o[t]);
         }
         if (!a.length && !l.length) return void (this.Fe && (this._e.deleteMesh(this.Fe), 
@@ -2477,10 +2492,10 @@ class Rt extends t.renderer.CanvasRenderer {
             const n = t[0] && t[0].data.iconAtlas, o = t[0] && t[0].data.glyphAtlas || t[1] && t[1].data.glyphAtlas;
             n && (this.Oe.iconAtlas = n), o && (this.Oe.glyphAtlas = o);
             const a = r.identity([]);
-            r.translate(a, a, i.set(d, s[0], s[1], 0)), r.scale(a, a, i.set(u, 1, 1, this.st));
+            r.translate(a, a, i.set(d, s[0], s[1], 0)), r.scale(a, a, i.set(u, 1, 1, this.at));
             const l = this._e.createMeshes(e, a);
             for (let t = 0; t < l.length; t++) l[t].geometry.properties.originElements = l[t].geometry.properties.elements.slice(), 
-            l[t].setUniform("level", 0), l[t].material.set("flipY", 1), l[t].properties.meshKey = zt++;
+            l[t].setUniform("level", 0), l[t].material.set("flipY", 1), l[t].properties.meshKey = jt++;
             this.Fe = l, c && (this.Ee = !0), this.Je = !1, this.setToRedraw();
         });
     }
@@ -2530,7 +2545,7 @@ class Rt extends t.renderer.CanvasRenderer {
             !1;
         }
         for (let t = 0; t < r.length; t++) {
-            const e = r[t][jt];
+            const e = r[t][Rt];
             this.ge[e] && o.push(r[t]), this.ve[e] && s.push(r[t]);
         }
         const h = r[0].id, u = this.$e(o, s, this.Oe, this.Xe), d = this.Fe;
@@ -2550,14 +2565,14 @@ class Rt extends t.renderer.CanvasRenderer {
         }), !0;
     }
     tn(t) {
-        return this.en(t, this.ze, this.Ce, this.nn, this.Se, A, Pt, this.in);
+        return this.en(t, this.ze, this.Ce, this.nn, this.Se, A, Ot, this.in);
     }
     en(t, e, n, i, r, o, s, a) {
         if (!e) return !1;
         if (!n) return this.Qe(), this.setToRedraw(), !1;
         const l = t._getInternalSymbol(), c = {
             zoom: this.getMap().getZoom()
-        }, h = t[Ot];
+        }, h = t[Ft];
         let u = this.features[h];
         Array.isArray(u) || (u = [ u ]);
         const d = [];
@@ -2598,7 +2613,7 @@ class Rt extends t.renderer.CanvasRenderer {
                         let t = o + 1;
                         for (;r[t] === f; ) t++;
                         const e = t - o;
-                        Dt.length !== 3 * e && (Dt = new Float32Array(3 * e), Dt.fill(-1 / 0, 0)), i.geometry.updateSubData(i.geometry.desc.positionAttribute, Dt, 3 * o);
+                        Nt.length !== 3 * e && (Nt = new Float32Array(3 * e), Nt.fill(-1 / 0, 0)), i.geometry.updateSubData(i.geometry.desc.positionAttribute, Nt, 3 * o);
                     }
                     this.setToRedraw();
                 }
@@ -2612,7 +2627,7 @@ class Rt extends t.renderer.CanvasRenderer {
         if (!e.length) return;
         const i = this.Ee;
         this.nn = n;
-        const r = this.in(e), o = L({}, Pt), s = r.map((e, i) => this.createMesh(this.Se, A, o, e, t && t[i], n));
+        const r = this.in(e), o = L({}, Ot), s = r.map((e, i) => this.createMesh(this.Se, A, o, e, t && t[i], n));
         this.rn = !0, Promise.all(s).then(t => {
             this.ze && this.Se.deleteMesh(this.ze);
             const e = [], n = [];
@@ -2630,10 +2645,10 @@ class Rt extends t.renderer.CanvasRenderer {
         });
     }
     in(t) {
-        const e = (Et + "lineDasharray").trim(), n = (Et + "linePatternFile").trim(), i = [], r = [], o = [];
+        const e = (Dt + "lineDasharray").trim(), n = (Dt + "linePatternFile").trim(), i = [], r = [], o = [];
         for (let s = 0; s < t.length; s++) {
             const a = t[s], l = a.properties && a.properties[e];
-            l && Wt(l) ? o.push(a) : a.properties && a.properties[n] ? r.push(a) : i.push(a);
+            l && Xt(l) ? o.push(a) : a.properties && a.properties[n] ? r.push(a) : i.push(a);
         }
         return [ r, o, i ];
     }
@@ -2657,9 +2672,9 @@ class Rt extends t.renderer.CanvasRenderer {
         }
     }
     Ke(t) {
-        void 0 === t[Ot] && (t[Ot] = this.F++);
-        const e = t[Ot];
-        this.features[e] && this.ln(e), this.features[e] = Ft(t, this.we, this.features[e]);
+        void 0 === t[Ft] && (t[Ft] = this.j++);
+        const e = t[Ft];
+        this.features[e] && this.ln(e), this.features[e] = Et(t, this.we, this.features[e]);
         const n = this.features[e];
         return this.cn(n, e), this.pe[e] = t, e;
     }
@@ -2667,30 +2682,30 @@ class Rt extends t.renderer.CanvasRenderer {
         if (!t) return;
         const n = Array.isArray(t) ? t[0].id : t.id;
         if (this.ye[n] = t, Array.isArray(t)) for (let n = 0; n < t.length; n++) {
-            const i = t[n][jt];
-            t[n][Ot] = e, this.me[i] = {
+            const i = t[n][Rt];
+            t[n][Ft] = e, this.me[i] = {
                 feature: t[n]
-            }, this.me[i][Ot] = e;
+            }, this.me[i][Ft] = e;
             const r = {
                 feature: t[n]
             };
-            Ht(t[n]) && (this.ge[i] = r), Vt(t[n]) && (this.ve[i] = r), Gt(t[n]) && (this.be[i] = r);
+            Ut(t[n]) && (this.ge[i] = r), qt(t[n]) && (this.ve[i] = r), Bt(t[n]) && (this.be[i] = r);
         } else {
-            t[Ot] = e;
+            t[Ft] = e;
             const n = {
                 feature: t
-            }, i = t[jt];
-            Ht(t) && (this.ge[i] = n), Vt(t) && (this.ve[i] = n), Gt(t) && (this.be[i] = n), 
+            }, i = t[Rt];
+            Ut(t) && (this.ge[i] = n), qt(t) && (this.ve[i] = n), Bt(t) && (this.be[i] = n), 
             this.me[i] = n;
         }
     }
     ln(t) {
         const e = this.features[t];
         if (Array.isArray(e)) for (let t = 0; t < e.length; t++) {
-            const n = e[t][jt], i = e[t].id;
+            const n = e[t][Rt], i = e[t].id;
             delete this.ye[i], delete this.me[n], delete this.ge[n], delete this.ve[n], delete this.be[n];
         } else {
-            const t = e[jt], n = e.id;
+            const t = e[Rt], n = e.id;
             delete this.ye[n], delete this.me[t], delete this.ge[t], delete this.ve[t], delete this.be[t];
         }
     }
@@ -2701,13 +2716,13 @@ class Rt extends t.renderer.CanvasRenderer {
             const o = r.pick(t, e, n.tolerance);
             if (o && o.data && o.data.feature) {
                 const t = o.data.feature;
-                i.push(this.pe[t[Ot]]);
+                i.push(this.pe[t[Ft]]);
             }
         }), i;
     }
     hn(t) {
-        const e = t[Ot], n = this.features[e];
-        return Array.isArray(n) ? n[0][jt] : n[jt];
+        const e = t[Ft], n = this.features[e];
+        return Array.isArray(n) ? n[0][Rt] : n[Rt];
     }
     De() {
         let t = !1;
@@ -2726,40 +2741,40 @@ class Rt extends t.renderer.CanvasRenderer {
                 t = t || e;
             }
         }
-        this.ke = {}, t && (Nt(this), this.layer.fire("partialupdate"));
+        this.ke = {}, t && (Ht(this), this.layer.fire("partialupdate"));
     }
     dn(t) {
-        this.Ke(t), this.Qe(), Nt(this);
+        this.Ke(t), this.Qe(), Ht(this);
     }
     onGeometryAdd(t) {
-        this.canvas && t && t.length && (this.an(t), this.Qe(), Nt(this));
+        this.canvas && t && t.length && (this.an(t), this.Qe(), Ht(this));
     }
     onGeometryRemove(t) {
         if (t && t.length) {
             for (let e = 0; e < t.length; e++) {
-                const n = t[e][Ot];
+                const n = t[e][Ft];
                 void 0 !== n && (delete this.pe[n], this.ln(n), delete this.features[n]);
             }
-            this.Qe(), Nt(this);
+            this.Qe(), Ht(this);
         }
     }
     onGeometrySymbolChange(t) {
         const e = t.target._getParent() || t.target, n = t.properties;
         for (const t in n) if (B(n, t) && _[t]) return void this.dn(e);
-        const i = e[Ot], r = e._getInternalSymbol(), o = this.features[i];
+        const i = e[Ft], r = e._getInternalSymbol(), o = this.features[i];
         if (this.Ke(e), o) if (function(t, e) {
             return Array.isArray(t) ? !!Array.isArray(e) && t.length === e.length : !Array.isArray(e);
         }(r, o)) {
             if (Array.isArray(r)) for (let t = 0; t < r.length; t++) {
-                if (!Bt(r[t], o[t])) return void this.dn(e);
-            } else if (!Bt(r, o)) return void this.dn(e);
+                if (!$t(r[t], o[t])) return void this.dn(e);
+            } else if (!$t(r, o)) return void this.dn(e);
             this.onGeometryPositionChange(t);
         } else this.dn(e); else this.dn(e);
     }
     onGeometryShapeChange(t) {
-        const e = t.target._getParent() || t.target, n = Ft(e, {
+        const e = t.target._getParent() || t.target, n = Et(e, {
             id: 0
-        }).geometry, i = e[Ot], r = this.features[i];
+        }).geometry, i = e[Ft], r = this.features[i];
         if (function t(e, n) {
             if (e.length !== n.length) return !1;
             if (Array.isArray(e[0]) && Array.isArray(n[0])) {
@@ -2768,11 +2783,11 @@ class Rt extends t.renderer.CanvasRenderer {
             return !0;
         }(n, (Array.isArray(r) ? r[0] : r).geometry)) return this.ze && (this.Ie = !0), 
         void this.onGeometryPositionChange(t);
-        this.an([ e ]), this.sn(), Nt(this);
+        this.an([ e ]), this.sn(), Ht(this);
     }
     onGeometryPositionChange(t) {
-        const e = t.target._getParent() || t.target, n = e[Ot];
-        this.an([ e ]), this.ke[n] = e, Nt(this);
+        const e = t.target._getParent() || t.target, n = e[Ft];
+        this.an([ e ]), this.ke[n] = e, Ht(this);
     }
     onGeometryZIndexChange() {
         this.Qe();
@@ -2784,7 +2799,7 @@ class Rt extends t.renderer.CanvasRenderer {
         this.pn(t);
     }
     pn(t) {
-        const e = t.target, n = e[Ot], i = this.features[n];
+        const e = t.target, n = e[Ft], i = this.features[n];
         if (i) {
             const t = e.isVisible();
             if (Array.isArray(i)) {
@@ -2794,37 +2809,37 @@ class Rt extends t.renderer.CanvasRenderer {
                 if (t === i.visible) return;
                 i.visible = t;
             }
-            this.mn(), Nt(this);
+            this.mn(), Ht(this);
         }
     }
     mn() {
         this.Ee = !0;
     }
     onGeometryPropertiesChange(t) {
-        const e = t.target, n = e[Ot];
-        this.features[n] = Ft(e, this.we), this.cn(this.features[n], n), this.Qe(), Nt(this);
+        const e = t.target, n = e[Ft];
+        this.features[n] = Et(e, this.we), this.cn(this.features[n], n), this.Qe(), Ht(this);
     }
     createContext() {
         const t = this.canvas.gl && this.canvas.gl.wrap;
-        t ? (this.gl = this.canvas.gl.wrap(), this.regl = this.canvas.gl.regl) : this.K(), 
+        t ? (this.gl = this.canvas.gl.wrap(), this.regl = this.canvas.gl.regl) : this.tt(), 
         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 = St.get3DPainterClass("icon"), n = L({}, Tt, Mt);
+        const e = Mt.get3DPainterClass("icon"), n = L({}, Pt, It);
         this._e = new e(this.regl, this.layer, n, this.layer.options.sceneConfig, 0), this._e.setTextShaderDefines({
             REVERSE_MAP_ROTATION_ON_PITCH: 1
         });
-        const i = St.get3DPainterClass("line"), r = L({}, Pt);
+        const i = Mt.get3DPainterClass("line"), r = L({}, Ot);
         this.Se = new i(this.regl, this.layer, r, this.layer.options.sceneConfig, 0), this.layer.getGeometries() && this.onGeometryAdd(this.layer.getGeometries());
     }
     createPainter() {}
-    K() {
+    tt() {
         const t = this.layer.options.glOptions || {
             alpha: !0,
             depth: !0,
             antialias: !1
         };
-        t.preserveDrawingBuffer = !0, t.stencil = !0, this.glOptions = t, this.gl = this.gl || this.nt(this.canvas, t), 
+        t.preserveDrawingBuffer = !0, t.stencil = !0, this.glOptions = t, this.gl = this.gl || this.it(this.canvas, t), 
         this.regl = s({
             gl: this.gl,
             attributes: t,
@@ -2832,7 +2847,7 @@ class Rt extends t.renderer.CanvasRenderer {
             optionalExtensions: n.Constants.WEBGL_OPTIONAL_EXTENSIONS
         });
     }
-    nt(t, e) {
+    it(t, e) {
         const n = [ "webgl", "experimental-webgl" ];
         let i = null;
         for (let r = 0; r < n.length; ++r) {
@@ -2861,12 +2876,12 @@ class Rt extends t.renderer.CanvasRenderer {
         this.Se && this.Se.delete();
     }
     drawOutline(t) {
-        if (this.gt && (this.painter && this.painter.outlineAll(t), this._e.outlineAll(t), 
+        if (this.vt && (this.painter && this.painter.outlineAll(t), this._e.outlineAll(t), 
         this.Se.outlineAll(t)), this.yn) for (let e = 0; e < this.yn.length; e++) this.painter && this.painter.outline(t, this.yn[e]), 
         this._e.outline(t, this.yn[e]), this.Se.outline(t, this.yn[e]);
     }
     outlineAll() {
-        this.gt = !0, this.setToRedraw();
+        this.vt = !0, this.setToRedraw();
     }
     outline(t) {
         this.yn || (this.yn = []);
@@ -2874,28 +2889,28 @@ class Rt extends t.renderer.CanvasRenderer {
         for (let n = 0; n < t.length; n++) {
             const i = this.layer.getGeometryById(t[n]);
             if (i) {
-                const t = this.features[i[Ot]];
+                const t = this.features[i[Ft]];
                 if (Array.isArray(t)) for (let n = 0; n < t.length; n++) e.push(t[n].id); else e.push(t.id);
             }
         }
         this.yn.push(e), this.setToRedraw();
     }
     cancelOutline() {
-        delete this.gt, delete this.yn, this.setToRedraw();
+        delete this.vt, delete this.yn, this.setToRedraw();
     }
     isEnableWorkAround(t) {
-        return "win-intel-gpu-crash" === t && (this.layer.options.workarounds["win-intel-gpu-crash"] && Lt(this.gl));
+        return "win-intel-gpu-crash" === t && (this.layer.options.workarounds["win-intel-gpu-crash"] && Vt(this.gl));
     }
-    at(t) {
+    lt(t) {
         return X(t, this.getMap());
     }
 }
 
-function Nt(t) {
+function Ht(t) {
     t.setToRedraw();
 }
 
-function Lt(t) {
+function Vt(t) {
     const e = t.getExtension("WEBGL_debug_renderer_info");
     if (e && "undefined" != typeof navigator) {
         const n = t.getParameter(e.UNMASKED_RENDERER_WEBGL), i = "Win32" === navigator.platform || "Win64" === navigator.platform;
@@ -2904,38 +2919,38 @@ function Lt(t) {
     return !1;
 }
 
-function Ht({properties: t}) {
-    const e = (Et + "markerFile").trim(), n = (Et + "markerType").trim();
+function Ut({properties: t}) {
+    const e = (Dt + "markerFile").trim(), n = (Dt + "markerType").trim();
     return t[e] || t[n];
 }
 
-function Vt({properties: t}) {
-    return t[(Et + "textName").trim()];
+function qt({properties: t}) {
+    return t[(Dt + "textName").trim()];
 }
 
-const Ut = (Et + "lineWidth").trim(), qt = "_line_gradient_property".trim();
+const Gt = (Dt + "lineWidth").trim(), Wt = "_line_gradient_property".trim();
 
-function Gt(t) {
-    return 2 === t.type && !t.properties[qt] || 3 === t.type && !!t.properties[Ut];
+function Bt(t) {
+    return 2 === t.type && !t.properties[Wt] || 3 === t.type && !!t.properties[Gt];
 }
 
-function Wt(t) {
+function Xt(t) {
     if (!Array.isArray(t)) return 0;
     let e = 0;
     for (let n = 0; n < t.length; n++) e += t[n];
     return e;
 }
 
-function Bt(t, e) {
-    if (Object.keys(t).sort().join() !== Object.keys(e.properties || {}).filter(t => 0 === t.indexOf(Et)).map(t => t.substring(Et.length)).sort().join()) return !1;
+function $t(t, e) {
+    if (Object.keys(t).sort().join() !== Object.keys(e.properties || {}).filter(t => 0 === t.indexOf(Dt)).map(t => t.substring(Dt.length)).sort().join()) return !1;
     for (const n in t) if (B(t, n)) {
-        const i = (Et + n).trim();
+        const i = (Dt + n).trim();
         if (p(t[n]) !== p(e.properties[i])) return !1;
     }
     return !0;
 }
 
-function Xt(e, n, i) {
+function Jt(e, n, i) {
     if (!e || e.type !== n) return null;
     const r = new i(e.id, e.options), o = e.geometries, s = [];
     for (let e = 0; e < o.length; e++) {
@@ -2945,13 +2960,13 @@ function Xt(e, n, i) {
     return r.addGeometry(s), r;
 }
 
-class $t extends St {
+class Yt extends Mt {
     static fromJSON(t) {
-        return Xt(t, "PointLayer", $t);
+        return Jt(t, "PointLayer", Yt);
     }
 }
 
-$t.mergeOptions({
+Yt.mergeOptions({
     glyphSdfLimitPerFrame: 15,
     iconErrorUrl: null,
     workarounds: {
@@ -2968,9 +2983,9 @@ $t.mergeOptions({
         uniquePlacement: !1,
         depthFunc: "always"
     }
-}), $t.registerJSONType("PointLayer"), $t.registerRenderer("canvas", null);
+}), Yt.registerJSONType("PointLayer"), Yt.registerRenderer("canvas", null);
 
-$t.registerRenderer("gl", class extends Rt {
+Yt.registerRenderer("gl", class extends Lt {
     constructor(...e) {
         super(...e), this.GeometryTypes = [ t.Marker, t.MultiPoint ];
     }
@@ -2981,32 +2996,32 @@ $t.registerRenderer("gl", class extends Rt {
     }
 });
 
-class Jt extends St {
+class Zt extends Mt {
     static fromJSON(t) {
-        return Xt(t, "LineStringLayer", Jt);
+        return Jt(t, "LineStringLayer", Zt);
     }
 }
 
-Jt.mergeOptions({
+Zt.mergeOptions({
     meshRenderOrder: 1
-}), Jt.registerJSONType("LineStringLayer");
+}), Zt.registerJSONType("LineStringLayer");
 
-const Yt = "_line_gradient_property".trim();
+const Kt = "_line_gradient_property".trim();
 
-Jt.registerRenderer("gl", class extends Rt {
+Zt.registerRenderer("gl", class extends Lt {
     constructor(...e) {
         super(...e), this.GeometryTypes = [ t.LineString, t.MultiLineString ];
     }
     createPainter() {
-        const t = St.get3DPainterClass("line-gradient");
+        const t = Mt.get3DPainterClass("line-gradient");
         this.painterSymbol = L({}, {
-            lineGradientProperty: Yt
-        }, Pt);
+            lineGradientProperty: Kt
+        }, Ot);
         return new t(this.regl, this.layer, this.painterSymbol, this.layer.options.sceneConfig, 0);
     }
     buildMesh() {
         let {features: t, center: e} = this.He();
-        if (t = t.filter(t => !!t.properties[Yt]), !t.length) return;
+        if (t = t.filter(t => !!t.properties[Kt]), !t.length) return;
         const n = this.Ee;
         this.gn = e;
         const i = L({}, this.painterSymbol), r = this.createMesh(this.painter, A, i, t, null, e);
@@ -3020,17 +3035,17 @@ Jt.registerRenderer("gl", class extends Rt {
             this.meshes = e, n && (this.Ee = n), this.un = !1, this.setToRedraw();
         });
     }
-}), Jt.registerRenderer("canvas", null);
+}), Zt.registerRenderer("canvas", null);
 
-class Zt extends St {
+class Qt extends Mt {
     static fromJSON(t) {
-        return Xt(t, "PolygonLayer", Zt);
+        return Jt(t, "PolygonLayer", Qt);
     }
 }
 
-Zt.registerJSONType("PolygonLayer");
+Qt.registerJSONType("PolygonLayer");
 
-const Kt = {
+const te = {
     polygonFill: {
         type: "identity",
         default: void 0,
@@ -3058,7 +3073,7 @@ const Kt = {
     }
 };
 
-Zt.registerRenderer("gl", class extends Rt {
+Qt.registerRenderer("gl", class extends Lt {
     constructor(...e) {
         super(...e), this.PackClass = S, this.GeometryTypes = [ t.Polygon, t.MultiPolygon ];
     }
@@ -3067,7 +3082,7 @@ Zt.registerRenderer("gl", class extends Rt {
         if (!e.length) return;
         const i = this.Ee;
         this.gn = n;
-        const r = this.vn(e), o = L({}, Kt), s = r.map((e, i) => this.createMesh(this.painter, S, o, e, t && t[i], n));
+        const r = this.vn(e), o = L({}, te), s = r.map((e, i) => this.createMesh(this.painter, S, o, e, t && t[i], n));
         this.un = !0, Promise.all(s).then(t => {
             this.meshes && this.painter.deleteMesh(this.meshes);
             const e = [], n = [];
@@ -3092,23 +3107,23 @@ Zt.registerRenderer("gl", class extends Rt {
         return [ e, n ];
     }
     createPainter() {
-        const t = St.get3DPainterClass("fill");
-        this.painterSymbol = L({}, Kt);
+        const t = Mt.get3DPainterClass("fill");
+        this.painterSymbol = L({}, te);
         return new t(this.regl, this.layer, this.painterSymbol, this.layer.options.sceneConfig, 0);
     }
     updateMesh(t) {
-        return this.en(t, this.meshes, this.atlas, this.gn, this.painter, S, Kt, this.vn);
+        return this.en(t, this.meshes, this.atlas, this.gn, this.painter, S, te, this.vn);
     }
-}), Zt.registerRenderer("canvas", null);
+}), Qt.registerRenderer("canvas", null);
 
-const Qt = {
+const ee = {
     redraw: !1,
     retire: !1
-}, te = [];
+}, ne = [];
 
-let ee = 1;
+let ie = 1;
 
-function ne(t, e) {
+function re(t, e) {
     return E.extend(t, {
         init: function() {
             this.bn = {};
@@ -3145,7 +3160,7 @@ function ne(t, e) {
         },
         getShadowMeshes() {
             const t = this.painter;
-            return t && t.getShadowMeshes && t.getShadowMeshes() || te;
+            return t && t.getShadowMeshes && t.getShadowMeshes() || ne;
         },
         createTile: function(t) {
             const {tileCache: e, tileData: n} = t;
@@ -3170,7 +3185,7 @@ function ne(t, e) {
                 for (let e = 0; e < s.length; e++) s[e] && s[e].geometry && (i = !0, s[e].geometry.properties.features = o, 
                 this.Ue(s[e].geometry, t));
             }
-            let a = this.D(o);
+            let a = this.R(o);
             if (!a) {
                 const {meshes: e, retire: n} = this.Sn(s, t);
                 i || (i = n), a = e;
@@ -3190,7 +3205,7 @@ function ne(t, e) {
             });
             if (d.length) {
                 const t = n.getRenderer().isEnableTileStencil();
-                for (let n = 0; n < d.length; n++) d[n] && (c = !0, this.Tn(d[n], o, e.timestamp, ee++, t));
+                for (let n = 0; n < d.length; n++) d[n] && (c = !0, this.Tn(d[n], o, e.timestamp, ie++, t));
                 l.animation && (d.Mn = e.timestamp);
                 const i = this.kn(e);
                 this.bn[i] = d;
@@ -3202,17 +3217,17 @@ function ne(t, e) {
         },
         paintTile: function(t) {
             const {tileCache: e, tileInfo: n, tileZoom: i, sceneConfig: r, bloom: o} = t, s = this.painter;
-            if (!s) return Qt;
+            if (!s) return ee;
             let a = e.geometry;
-            if (!a) return Qt;
+            if (!a) return ee;
             let l = !1;
             const c = this.kn(t);
-            let h = this.D(c);
+            let h = this.R(c);
             if (!h) {
                 const {meshes: e, retire: n} = this.Sn(a, t);
                 l || (l = n), h = e;
             }
-            if (!h.length) return Qt;
+            if (!h.length) return ee;
             const u = s.getTileLevelValue(n, i);
             h.forEach(t => {
                 t.properties.tile = n, t.properties.level = u, t.setUniform("level", u);
@@ -3314,9 +3329,9 @@ function ne(t, e) {
         },
         kn: function(t) {
             const e = t.tileInfo;
-            return e.meshKey || (e.meshKey = ee++), e.meshKey;
+            return e.meshKey || (e.meshKey = ie++), e.meshKey;
         },
-        D: function(t) {
+        R: function(t) {
             return this.bn[t];
         },
         Pn(t, e) {
@@ -3356,7 +3371,7 @@ function ne(t, e) {
     });
 }
 
-class ie {
+class oe {
     constructor() {
         this.On = 1;
     }
@@ -3373,7 +3388,7 @@ class ie {
     }
 }
 
-function re(t) {
+function se(t) {
     for (let e = 1; e < arguments.length; e++) {
         const n = arguments[e];
         for (const e in n) t[e] = n[e];
@@ -3381,76 +3396,76 @@ function re(t) {
     return t;
 }
 
-function oe(t, e, n) {
+function ae(t, e, n) {
     return Math.min(n, Math.max(e, t));
 }
 
-function se(t, e, n) {
+function le(t, e, n) {
     if (t === n || t === e) return t;
     const i = n - e;
     return ((t - e) % i + i) % i + e;
 }
 
-function ae(t) {
+function ce(t) {
     return null == t;
 }
 
-function le(t) {
+function he(t) {
     return JSON.parse(JSON.stringify(t));
 }
 
-function ce(t, e, n, i, r, o) {
+function ue(t, e, n, i, r, o) {
     Object.defineProperty(t, e, {
         enumerable: !0,
         get: function() {
-            const t = ae(n[i]) || p(n[i]) ? r : n[i];
+            const t = ce(n[i]) || p(n[i]) ? r : n[i];
             return o ? o(t) : t;
         }
     });
 }
 
-const he = [];
+const de = [];
 
-function ue(t) {
-    for (let e = 0; e < t.length; e++) he[e] = t[e], he[e] *= 255;
-    return 3 === t.length && (he[3] = 255), he;
+function fe(t) {
+    for (let e = 0; e < t.length; e++) de[e] = t[e], de[e] *= 255;
+    return 3 === t.length && (de[3] = 255), de;
 }
 
-function de(t, e = 4) {
-    return fe.bind(this, t, e);
+function pe(t, e = 4) {
+    return me.bind(this, t, e);
 }
 
-function fe(t, e, n) {
+function me(t, e, n) {
     if (Array.isArray(n)) return 3 === n.length && 4 === e && n.push(1), n;
     if (t && t[n]) return t[n];
     const i = C(n).unitArray();
     return 3 === i.length && 4 === e && i.push(1), t && (t[n] = i), i;
 }
 
-function pe(t, e, n, i) {
+function ye(t, e, n, i) {
     if (t.fill) t.fill(e, n, i); else for (let r = n; r < i; r++) t[r] = e;
 }
 
-function me(t) {
+function ge(t) {
     return "number" == typeof t && !isNaN(t);
 }
 
-function ye(t) {
+function ve(t) {
     return t && (t.markerFile || t.markerType) && void 0 !== t.textName;
 }
 
-function ge(t, e) {
+function be(t, e) {
     return Object.prototype.hasOwnProperty.call(t, e);
 }
 
-function ve(t) {
+function xe(t) {
     const e = [ t[0] ];
     let n = t[0];
     for (let i = 1; i < t.length; i++) t[i] !== n && (e.push(t[i]), n = t[i]);
     return e;
 }
 
-const be = "_fn_type_", xe = {
+const we = "_fn_type_", Ae = {
     textFill: 1,
     textSize: 1,
     textOpacity: 1,
@@ -3466,39 +3481,39 @@ const be = "_fn_type_", xe = {
     polygonOpacity: 1
 };
 
-function we(t, e, n) {
+function ke(t, e, n) {
     for (let i = 0; i < n.length; i++) {
         const {symbolName: r} = n[i];
-        (t.Cn = t.Cn || {})[r] = e[r], Ae(t, e, n[i]);
+        (t.Cn = t.Cn || {})[r] = e[r], _e(t, e, n[i]);
     }
 }
 
-function Ae(t, e, n) {
+function _e(t, e, n) {
     const i = t.properties;
     let r = i.aPickingId;
     r || (r = i.aPickingId = new t.data.aPickingId.constructor(t.data.aPickingId));
-    const {attrName: o, symbolName: s, evaluate: a, related: l} = n, c = (be + o + "Index").trim();
+    const {attrName: o, symbolName: s, evaluate: a, related: l} = n, c = (we + o + "Index").trim();
     let h = t.data[o];
     if (!h) {
-        if (Ce(e[s])) {
-            h = t.data[o] = new n.type(n.width * r.length), ke(t, e, n);
-            return Ie(o, t, t.properties[c], a), h;
+        if (ze(e[s])) {
+            h = t.data[o] = new n.type(n.width * r.length), Se(t, e, n);
+            return Ce(o, t, t.properties[c], a), h;
         }
         return null;
     }
-    return Ce(e[s]) || function(t, e) {
+    return ze(e[s]) || function(t, e) {
         if (!Array.isArray(t)) return !1;
-        for (let n = 0; n < t.length; n++) if (Ce(e[t[n]])) return !0;
+        for (let n = 0; n < t.length; n++) if (ze(e[t[n]])) return !0;
         return !1;
-    }(l, e) ? (Ce(e[s]) && ke(t, e, n), h) : (h && h.buffer && h.buffer.destroy && h.buffer.destroy(), 
-    delete t.data[o], _e(t, o), null);
+    }(l, e) ? (ze(e[s]) && Se(t, e, n), h) : (h && h.buffer && h.buffer.destroy && h.buffer.destroy(), 
+    delete t.data[o], Te(t, o), null);
 }
 
-function ke(t, e, n) {
-    const {attrName: i, symbolName: r} = n, o = t.properties, s = (be + i + "Index").trim(), a = (be + i).trim();
+function Se(t, e, n) {
+    const {attrName: i, symbolName: r} = n, o = t.properties, s = (we + i + "Index").trim(), a = (we + i).trim();
     if (o[s] && o[a]) return;
     const l = function(t) {
-        if (!t) return Pe;
+        if (!t) return Oe;
         const e = [];
         for (let n = 0; n < t.length; n++) p(t[n][1]) && !m(t[n][1]).isZoomConstant && e.push(t[n][0]);
         return e;
@@ -3507,7 +3522,7 @@ function ke(t, e, n) {
         Array.isArray(i) || (i = Object.values(i));
         if (!i || !i.length) return !1;
         const {symbolName: r} = t;
-        if (!xe[r]) return !1;
+        if (!Ae[r]) return !1;
         const o = e.property;
         for (let t = 0; t < i.length; t++) {
             const e = i[t] && i[t].feature;
@@ -3517,45 +3532,45 @@ function ke(t, e, n) {
         }
         return !1;
     }(n, e[r], t);
-    if (!c && !l.length) return void _e(t, i);
+    if (!c && !l.length) return void Te(t, i);
     const {features: h, aPickingId: u} = o, d = function(t, e, n, i, r) {
         const o = [];
         let s = 0, a = e[0];
-        for (let l = 1, c = e.length; l < c; l++) e[l] === a && l !== c - 1 || ((r || Me(t[a].feature, n, i)) && o.push(s, l === c - 1 ? c : l), 
+        for (let l = 1, c = e.length; l < c; l++) e[l] === a && l !== c - 1 || ((r || Ie(t[a].feature, n, i)) && o.push(s, l === c - 1 ? c : l), 
         a = e[l], s = l);
         return o;
     }(h, u, e[r].property, l, c);
-    if (!d.length) return void _e(t, i);
+    if (!d.length) return void Te(t, i);
     const f = t.data[i];
     o[s] = d, o[a] = f.BYTES_PER_ELEMENT ? new f.constructor(f) : new n.type(f.length);
 }
 
-function _e(t, e) {
-    const n = t.properties, i = (be + e + "Index").trim(), r = (be + e).trim();
+function Te(t, e) {
+    const n = t.properties, i = (we + e + "Index").trim(), r = (we + e).trim();
     delete n[i], delete n[r];
 }
 
-function Se(t, e, n, i, r) {
+function Me(t, e, n, i, r) {
     if (!i) return;
     const o = i.geometry;
     if (o) {
         for (let s = 0; s < n.length; s++) {
-            const a = n[s], l = a.attrName, c = (be + l + "Index").trim();
-            if (!Te(o, e, a)) {
+            const a = n[s], l = a.attrName, c = (we + l + "Index").trim();
+            if (!Pe(o, e, a)) {
                 const {aPickingId: t} = o.properties;
                 if (!t || o.Fn === r) continue;
                 const e = o.properties[c];
                 if (!e) continue;
-                Ie(l, o, e, a.evaluate);
+                Ce(l, o, e, a.evaluate);
                 continue;
             }
             if (o.data[l]) {
                 const t = o.data[l];
                 t && t.buffer && t.buffer.destroy && t.buffer.destroy(), delete o.data[l];
             }
-            const h = Ae(o, e, a), u = a.define;
+            const h = _e(o, e, a), u = a.define;
             if (h) {
-                if (Ie(l, o, o.properties[c], a.evaluate), u) {
+                if (Ce(l, o, o.properties[c], a.evaluate), u) {
                     const t = i.defines;
                     t[u] = 1, i.setDefines(t);
                 }
@@ -3569,29 +3584,29 @@ function Se(t, e, n, i, r) {
     }
 }
 
-function Te(t, e, n) {
+function Pe(t, e, n) {
     const i = e[n.symbolName], r = t.Cn;
     return i !== r[n.symbolName] && (r[n.symbolName] = i, !0);
 }
 
-function Me(t, e, n) {
+function Ie(t, e, n) {
     for (let i = 0; i < n.length; i++) if ("$" === e[0] && t[e.substring(1)] === n[i] || t.properties[e] === n[i]) return !0;
     return !1;
 }
 
-const Pe = [];
+const Oe = [];
 
-function Ie(t, e, n, i) {
+function Ce(t, e, n, i) {
     const {aPickingId: r, features: o} = e.properties;
     let s;
     if (n) {
-        const a = (be + t).trim();
+        const a = (we + t).trim();
         s = e.properties[a];
         const l = s.length / r.length, c = n.length;
         for (let t = 0; t < c; t += 2) {
             const a = n[t], c = n[t + 1];
             let h = o[r[a]];
-            h && h.feature && Oe(s, h, i, a, c, l, e);
+            h && h.feature && Fe(s, h, i, a, c, l, e);
         }
     } else {
         s = e.data[t], s.dirty = !0;
@@ -3600,13 +3615,13 @@ function Ie(t, e, n, i) {
         for (let t = 0; t < a; t++) {
             if (r[t] === r[l] && t < a - 1) continue;
             let c = o[r[l]];
-            c && c.feature && (Oe(s, c, i, l, t === a - 1 ? a : t, n, e), l = t);
+            c && c.feature && (Fe(s, c, i, l, t === a - 1 ? a : t, n, e), l = t);
         }
     }
     s.dirty && (e.updateData(t, s), s.dirty = !1);
 }
 
-function Oe(t, e, n, i, r, o, s) {
+function Fe(t, e, n, i, r, o, s) {
     const a = (e = e.feature).properties || {};
     void 0 === a.$layer && (e.properties || (e.properties = a), a.$layer = e.layer, 
     a.$type = e.type);
@@ -3621,26 +3636,26 @@ function Oe(t, e, n, i, r, o, s) {
             for (let e = i * o; e < r * o; e += o) t.set(l, e);
             t.dirty = !0;
         }
-    } else t[i] !== l && (pe(t, l, i, r), t.dirty = !0);
+    } else t[i] !== l && (ye(t, l, i, r), t.dirty = !0);
 }
 
-function Ce(t) {
+function ze(t) {
     return T.isFnTypeSymbol(t);
 }
 
-const {loginIBLResOnCanvas: Fe, logoutIBLResOnCanvas: ze, getIBLResOnCanvas: Ee} = n.pbr.PBRUtils, je = [], De = [], Re = t => 0 === t.getUniform("level"), Ne = t => t.getUniform("level") > 0;
+const {loginIBLResOnCanvas: Ee, logoutIBLResOnCanvas: je, getIBLResOnCanvas: De} = n.pbr.PBRUtils, Re = [], Ne = [], Le = t => 0 === t.getUniform("level"), He = t => t.getUniform("level") > 0;
 
-class Le {
+class Ve {
     constructor(t, e, i, r, o, s) {
         this.regl = t, this.layer = e, this.canvas = e.getRenderer().canvas, this.sceneConfig = r || {}, 
         this.dataConfig = s || {}, this.pluginIndex = o, this.scene = new n.Scene, this.pickingFBO = e.getRenderer().pickingFBO, 
-        this.zn = new ie, this.level0Filter = Re, this.levelNFilter = Ne, this.loginTextureCache(), 
-        this.symbolDef = Array.isArray(i) ? i.map(t => le(t)) : [ le(i) ], this.En(), this.pickingViewport = {
+        this.zn = new oe, this.level0Filter = Le, this.levelNFilter = He, this.loginTextureCache(), 
+        this.symbolDef = Array.isArray(i) ? i.map(t => he(t)) : [ he(i) ], this.En(), this.pickingViewport = {
             x: 0,
             y: 0,
             width: () => this.canvas ? this.canvas.width : 1,
             height: () => this.canvas ? this.canvas.height : 1
-        }, this.sortByCommandKey = He.bind(this), this.colorCache = {};
+        }, this.sortByCommandKey = Ue.bind(this), this.colorCache = {};
     }
     getMap() {
         return this.layer ? this.layer.getMap() : null;
@@ -3674,19 +3689,19 @@ class Le {
         return this.Dn;
     }
     needToRetireFrames() {
-        return this.X;
+        return this.$;
     }
     fillIncludes(t, e, n) {
         const i = n && n.includes;
         if (i) for (const r in i) i[r] && (n[r].uniformDeclares && e.push(...n[r].uniformDeclares), 
-        n[r].defines && re(t, n[r].defines));
+        n[r].defines && se(t, n[r].defines));
     }
     setIncludeUniformValues(t, e) {
         const n = e && e.includes;
-        if (n) for (const i in n) n[i] && e[i].renderUniforms && re(t, e[i].renderUniforms);
+        if (n) for (const i in n) n[i] && e[i].renderUniforms && se(t, e[i].renderUniforms);
     }
     createGeometries(t, e) {
-        if (!t.length) return De;
+        if (!t.length) return Ne;
         const n = [];
         for (let i = 0; i < t.length; i++) if (t[i]) if (void 0 !== t[i].ref) n[t[i].ref] ? n.push({
             geometry: n[t[i].ref].geometry,
@@ -3747,8 +3762,8 @@ class Le {
         this.paint(t);
     }
     prepareRender(t) {
-        if (this.it === t.timestamp) return;
-        if (this.it = t.timestamp, !this.createFnTypeConfig) return;
+        if (this.rt === t.timestamp) return;
+        if (this.rt = t.timestamp, !this.createFnTypeConfig) return;
         const e = this.scene.getMeshes();
         if (!e || !e.length) return;
         const n = this.getMap().getZoom();
@@ -3757,7 +3772,7 @@ class Le {
             const {symbolIndex: i} = e[t].properties, r = this.getSymbolDef(i);
             if (!r) continue;
             const o = this.getFnTypeConfig(i);
-            Se(this.regl, r, o, e[t], n);
+            Me(this.regl, r, o, e[t], n);
         }
     }
     paint(t) {
@@ -3772,7 +3787,7 @@ class Le {
         };
     }
     setToRedraw(t) {
-        t && (this.X = t), this.Dn = !0;
+        t && (this.$ = t), this.Dn = !0;
     }
     callShader(t, e) {
         this.callCurrentTileShader(t, e), this.callBackgroundTileShader(t, e);
@@ -3783,7 +3798,7 @@ class Le {
     }
     callBackgroundTileShader(t, e) {
         this.shader && (this.shader.filter = e.sceneFilter ? [ this.levelNFilter, e.sceneFilter ] : this.levelNFilter), 
-        this.scene.getMeshes().sort(Ve), this.callRenderer(t, e);
+        this.scene.getMeshes().sort(qe), this.callRenderer(t, e);
     }
     callRenderer(t, e) {
         this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e));
@@ -3852,8 +3867,8 @@ class Le {
         }
     }
     startFrame(t) {
-        this.Ln || (this.init(t), this.Ln = !0), this.it !== t.timestamp && (this.Dn = !1, 
-        this.X = !1), this.scene.clear();
+        this.Ln || (this.init(t), this.Ln = !0), this.rt !== t.timestamp && (this.Dn = !1, 
+        this.$ = !1), this.scene.clear();
     }
     resize() {}
     delete() {
@@ -3878,13 +3893,13 @@ class Le {
         return delete this.Un, this.setToRedraw(n), i;
     }
     qn(t, e) {
-        for (const n in e) if (ge(e, n) && M[n] && !O(e[n], t[n])) return !0;
+        for (const n in e) if (be(e, n) && M[n] && !O(e[n], t[n])) return !0;
         return !1;
     }
     Vn(t, e, n) {
         if (!this.Gn) return !1;
         const i = this.qn(this.symbolDef[t] || {}, n);
-        this.symbolDef[t] = le(n);
+        this.symbolDef[t] = he(n);
         const r = this.Gn[t];
         for (const t in r) delete r[t];
         const o = this.getMap(), s = f(this.symbolDef[t], () => [ o.getZoom() ]);
@@ -3912,7 +3927,7 @@ class Le {
     En() {
         const t = this.getMap(), e = () => [ t.getZoom() ];
         this.Gn = [], this.jn = [];
-        for (let t = 0; t < this.symbolDef.length; t++) this.Gn[t] = f(re({}, this.symbolDef[t]), e), 
+        for (let t = 0; t < this.symbolDef.length; t++) this.Gn[t] = f(se({}, this.symbolDef[t]), e), 
         this.symbolDef[t] && p(this.symbolDef[t].visible) && (this.jn[t] = m(this.symbolDef[t].visible));
     }
     getFnTypeConfig(t) {
@@ -3935,7 +3950,7 @@ class Le {
     }
     logoutTextureCache() {
         const t = "__gl_textures".trim(), e = this.getMap(), n = this.Bn;
-        if (n) for (const i in n) ge(n, i) && e[t][i] && (e[t][i].count--, e[t][i].count <= 0 && delete e[t][i]);
+        if (n) for (const i in n) be(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] = {});
     }
     getCachedTexture(t) {
@@ -3980,7 +3995,7 @@ class Le {
         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(je, i, n[e].transform), a = this.zn.write(t, je), o[s.properties.tile.id] = a), 
+            void 0 === a && (r.multiply(Re, i, n[e].transform), a = this.zn.write(t, Re), o[s.properties.tile.id] = a), 
             s.setUniform("ref", a);
         }
         this.zn.end(t), this.regl.Jn();
@@ -3990,7 +4005,7 @@ class Le {
     }
     outline(t, e) {
         const n = {};
-        for (let i = 0; i < e.length; i++) ae(e[i]) || n[e[i]] || (this.Yn(t, e[i]), n[e[i]] = 1);
+        for (let i = 0; i < e.length; i++) ce(e[i]) || n[e[i]] || (this.Yn(t, e[i]), n[e[i]] = 1);
     }
     Yn(t, e) {
         if (!this.picking) return;
@@ -4079,15 +4094,15 @@ class Le {
     }
     getIBLRes() {
         const t = this.layer.getRenderer().canvas;
-        return Ee(t);
+        return De(t);
     }
     createIBLTextures() {
         const t = this.layer.getRenderer().canvas;
-        Fe(t, this.regl, this.getMap()), this.setToRedraw(!0), this.layer.fire("iblupdated");
+        Ee(t, this.regl, this.getMap()), this.setToRedraw(!0), this.layer.fire("iblupdated");
     }
     disposeIBLTextures() {
         const t = this.layer.getRenderer().canvas;
-        ze(t, this.getMap());
+        je(t, this.getMap());
     }
     evaluateInFnTypeConfig(t, e, n, i, r) {
         let o = this.ti;
@@ -4105,16 +4120,16 @@ class Le {
     }
 }
 
-function He(t, e) {
+function Ue(t, e) {
     const n = t && t.getCommandKey(this.regl) || "", i = e && e.getCommandKey(this.regl) || "";
     return n.localeCompare(i);
 }
 
-function Ve(t, e) {
+function qe(t, e) {
     return t.properties.level - e.properties.level;
 }
 
-class Ue extends Le {
+class Ge extends Ve {
     createGeometry(t, e) {
         if (!t.data) return {
             geometry: null,
@@ -4122,7 +4137,7 @@ class Ue extends Le {
         };
         t.iconAtlas && t.iconAtlas.image && (t.iconAtlas.image.dataType = t.type, t.iconAtlas.image.type = "icon"), 
         t.glyphAtlas && t.glyphAtlas.image && (t.glyphAtlas.image.type = "glyph");
-        const i = re({}, t.data), r = new n.Geometry(i, t.indices, 0, {
+        const i = se({}, t.data), r = new n.Geometry(i, t.indices, 0, {
             primitive: this.getPrimitive(),
             positionSize: t.positionSize
         });
@@ -4131,7 +4146,7 @@ class Ue extends Le {
             elements: t.indices
         }, t.iconAtlas && (r.properties.iconAtlas = t.iconAtlas.image), t.glyphAtlas && (r.properties.glyphAtlas = t.glyphAtlas.image), 
         r.properties.aFeaIds = t.featureIds, r.properties.collideIds = t.featureIds && t.featureIds.length ? t.featureIds : t.data.aPickingId, 
-        r.properties.uniqueCollideIds = ve(r.properties.collideIds), re(r.properties, t.properties), 
+        r.properties.uniqueCollideIds = xe(r.properties.collideIds), se(r.properties, t.properties), 
         {
             geometry: r,
             symbolIndex: t.symbolIndex
@@ -4176,9 +4191,9 @@ class Ue extends Le {
     }
 }
 
-var qe = "attribute vec3 aPosition;\nuniform mat4 projViewModelMatrix;\n#include <fbo_picking_vert>\nvoid main() {\n  gl_Position = projViewModelMatrix * vec4(aPosition, 1.);\n  fbo_picking_setData(gl_Position.w, true);\n}";
+var We = "attribute vec3 aPosition;\nuniform mat4 projViewModelMatrix;\n#include <fbo_picking_vert>\nvoid main() {\n  gl_Position = projViewModelMatrix * vec4(aPosition, 1.);\n  fbo_picking_setData(gl_Position.w, true);\n}";
 
-function Ge(t, e, n) {
+function Be(t, e, n) {
     const i = e, r = {
         width: i.width,
         height: i.height,
@@ -4195,14 +4210,14 @@ function Ge(t, e, n) {
     return t.texture(r);
 }
 
-const We = {
+const Xe = {
     polygonFill: [ 1, 1, 1, 1 ],
     polygonOpacity: 1,
     uvScale: [ 1, 1 ],
     uvOffset: [ 0, 0 ]
 };
 
-class Be extends Ue {
+class $e extends Ge {
     prepareSymbol(t) {
         const e = t.polygonFill;
         Array.isArray(e) && (3 === e.length && e.push(1), t.polygonFill = e.map(t => 255 * t));
@@ -4221,11 +4236,11 @@ class Be extends Ue {
             tileExtent: o.properties.tileExtent,
             tileRatio: o.properties.tileRatio
         }, h = this.getSymbol(s);
-        if (ce(c, "polygonFill", h, "polygonFill", We.polygonFill, de(this.colorCache)), 
-        ce(c, "polygonOpacity", h, "polygonOpacity", We.polygonOpacity), ce(c, "uvScale", h, "uvScale", We.uvScale), 
-        ce(c, "uvOffset", h, "uvOffset", We.uvOffset), void 0 === a) {
+        if (ue(c, "polygonFill", h, "polygonFill", Xe.polygonFill, pe(this.colorCache)), 
+        ue(c, "polygonOpacity", h, "polygonOpacity", Xe.polygonOpacity), ue(c, "uvScale", h, "uvScale", Xe.uvScale), 
+        ue(c, "uvOffset", h, "uvOffset", Xe.uvOffset), void 0 === a) {
             const t = this.getSymbolDef(s), e = this.getFnTypeConfig(s);
-            we(o, t, e), o.generateBuffers(this.regl);
+            ke(o, t, e), o.generateBuffers(this.regl);
         }
         const u = o.properties.iconAtlas;
         if (u && o.data.aTexInfo) {
@@ -4235,10 +4250,10 @@ class Be extends Ue {
                 get: function() {
                     return o.properties.tileResolution / t.getResolution();
                 }
-            }), c.polygonPatternFile = Ge(this.regl, u, !1), c.atlasSize = [ u.width, u.height ], 
+            }), c.polygonPatternFile = Be(this.regl, u, !1), c.atlasSize = [ u.width, u.height ], 
             this.drawDebugAtlas(u);
         }
-        const d = new n.Material(c, We), f = new n.Mesh(o, d, {
+        const d = new n.Material(c, Xe), f = new n.Mesh(o, d, {
             disableVAO: !0,
             castShadow: !1,
             picking: !0
@@ -4259,7 +4274,7 @@ class Be extends Ue {
             evaluate: (e, i) => {
                 let r = n(t.getZoom(), e);
                 return p(r) && (r = this.evaluateInFnTypeConfig(r, i, t, e, !0)), Array.isArray(r) || (r = this.colorCache[r] = this.colorCache[r] || C(r).unitArray()), 
-                r = ue(r), r;
+                r = fe(r), r;
             }
         }, {
             attrName: "aOpacity",
@@ -4318,10 +4333,10 @@ class Be extends Ue {
                 enable: !0,
                 range: s || [ 0, 1 ],
                 mask: (t, e) => {
-                    if (!ae(this.sceneConfig.depthMask)) return !!this.sceneConfig.depthMask;
+                    if (!ce(this.sceneConfig.depthMask)) return !!this.sceneConfig.depthMask;
                     if (e.meshConfig.transparent) return !1;
                     const n = e.polygonOpacity;
-                    return !(me(n) && n < 1);
+                    return !(ge(n) && n < 1);
                 },
                 func: this.sceneConfig.depthFunc || "<="
             },
@@ -4336,7 +4351,7 @@ class Be extends Ue {
             }
         };
         this.ei(t, a), this.pickingFBO && (this.picking = [ new n.FBORayPicking(this.renderer, {
-            vert: qe,
+            vert: We,
             uniforms: [ {
                 name: "projViewModelMatrix",
                 type: "function",
@@ -4375,9 +4390,9 @@ class Be extends Ue {
     }
 }
 
-var Xe = "#define SHADER_NAME LINE\n#define AA_CLIP_LIMIT 2.0\n#define AA_LINE_WIDTH 16.0\n#define DEVICE_PIXEL_RATIO 1.0\n#define ANTIALIASING 1.0 / DEVICE_PIXEL_RATIO / 2.0\n#define EXTRUDE_SCALE 63.0\n#define EXTRUDE_MOD 64.0\n#define MAX_LINE_DISTANCE 65535.0\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY)\nattribute vec3 aExtrude;\n#else\nattribute vec2 aExtrude;\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY) || defined(HAS_GRADIENT) || defined(HAS_TRAIL)\nattribute float aLinesofar;\nvarying highp float vLinesofar;\n#endif\nuniform float cameraToCenterDistance;\n#if defined(HAS_STROKE_WIDTH)\nattribute float aLineStrokeWidth;\n#else\nuniform float lineStrokeWidth;\n#endif\nuniform mat4 projViewModelMatrix;\nuniform mat4 modelMatrix;\nuniform float tileResolution;\nuniform float resolution;\nuniform float tileRatio;\n#if defined(HAS_LINE_DX) || defined(HAS_LINE_DY)\nattribute vec2 aLineDxDy;\n#endif\n#ifndef HAS_LINE_DX\nuniform float lineDx;\n#endif\n#ifndef HAS_LINE_DY\nuniform float lineDy;\n#endif\nuniform vec2 canvasSize;\nuniform float layerScale;\nvarying vec2 vNormal;\nvarying vec2 vWidth;\nvarying float vGammaScale;\n#ifndef ENABLE_TILE_STENCIL\nvarying vec2 vPosition;\n#endif\n#ifdef USE_LINE_OFFSET\nattribute vec2 aExtrudeOffset;\n#endif\n#ifdef HAS_LINE_WIDTH\nattribute float aLineWidth;\n#else\nuniform float lineWidth;\n#endif\n#ifndef PICKING_MODE\n#ifndef HAS_GRADIENT\n#ifdef HAS_COLOR\nattribute vec4 aColor;\nvarying vec4 vColor;\n#endif\n#ifdef HAS_PATTERN\n#if defined(HAS_PATTERN_ANIM) || defined(HAS_PATTERN_GAP)\nattribute vec2 aLinePattern;\n#endif\n#ifdef HAS_PATTERN_ANIM\nvarying float vLinePatternAnimSpeed;\n#endif\n#ifdef HAS_PATTERN_GAP\nvarying float vLinePatternGap;\n#endif\nattribute vec4 aTexInfo;\nvarying vec4 vTexInfo;\n#endif\n#ifdef HAS_DASHARRAY\n#ifdef HAS_DASHARRAY_ATTR\nattribute vec4 aDasharray;\nvarying vec4 vDasharray;\n#endif\n#ifdef HAS_DASHARRAY_COLOR\nattribute vec4 aDashColor;\nvarying vec4 vDashColor;\n#endif\n#endif\n#endif\n#ifdef HAS_STROKE_COLOR\nattribute vec4 aStrokeColor;\nvarying vec4 vStrokeColor;\n#endif\n#ifdef HAS_OPACITY\nattribute float aOpacity;\nvarying float vOpacity;\n#endif\n#ifdef HAS_GRADIENT\nattribute float aGradIndex;\nvarying float vGradIndex;\n#endif\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\n#include <vsm_shadow_vert>\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\nvarying vec3 vVertex;\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n  float d = mod(abs(aExtrude.x), 2.);\n  float e = mod(abs(aExtrude.y), 2.);\n  vNormal = vec2(d, e * 2. - 1.);\n  vec4 f = vec4(c, 1.);\n  vec4 h = projViewModelMatrix * f;\n  vVertex = (modelMatrix * f).xyz;\n#ifdef HAS_STROKE_WIDTH\nfloat i = aLineStrokeWidth / 2. * layerScale;\n#else\nfloat i = lineStrokeWidth;\n#endif\n#ifdef HAS_LINE_WIDTH\nfloat j = aLineWidth / 2. * layerScale;\n#else\nfloat j = lineWidth * layerScale;\n#endif\nfloat k = j / 2. + i;\n  float l = sign(i) * j / 2.;\n  float m = l + sign(l) * ANTIALIASING;\n  float n = k + sign(k) * ANTIALIASING;\n#ifdef USE_LINE_OFFSET\nvec2 o = lineOffset * (vNormal.y * (aExtrude.xy - aExtrudeOffset) + aExtrudeOffset);\n  vec2 u = (n * aExtrude.xy + o) / EXTRUDE_SCALE;\n#else\nvec2 v = aExtrude.xy / EXTRUDE_SCALE;\n  vec2 u = n * v;\n#endif\nfloat A = tileResolution / resolution;\n  vec4 B = vec4(c + vec3(u, .0) * tileRatio / A, 1.);\n  gl_Position = projViewModelMatrix * B;\n  float C = min(AA_CLIP_LIMIT / canvasSize.x, AA_CLIP_LIMIT / canvasSize.y);\n  float D = distance(gl_Position.xy / gl_Position.w, h.xy / h.w) - C;\n  if(D * j < .0) {\n    float E = -D / C;\n    float F = E * E * E * E * AA_LINE_WIDTH;\n    u += F * v;\n    n += F / 6.;\n    B = vec4(c + vec3(u, .0) * tileRatio / A, 1.);\n    gl_Position = projViewModelMatrix * B;\n  }\n#ifdef HAS_LINE_DX\nfloat G = aLineDxDy[0];\n#else\nfloat G = lineDx;\n#endif\n#ifdef HAS_LINE_DY\nfloat H = aLineDxDy[1];\n#else\nfloat H = lineDy;\n#endif\nfloat I = gl_Position.w;\n  gl_Position.xy += vec2(G, H) * 2. / canvasSize * I;\n#ifndef PICKING_MODE\nvWidth = vec2(n, m);\n  vGammaScale = I / cameraToCenterDistance;\n#ifndef ENABLE_TILE_STENCIL\nvPosition = c.xy;\n#ifdef USE_LINE_OFFSET\nvPosition += tileRatio * o / EXTRUDE_SCALE;\n#endif\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY) || defined(HAS_GRADIENT)\n#ifdef HAS_GRADIENT\nvLinesofar = aLinesofar / MAX_LINE_DISTANCE;\n  vGradIndex = aGradIndex;\n#else\nfloat J = aLinesofar - k * aExtrude.z / EXTRUDE_SCALE / A * tileRatio;\n  vLinesofar = J / tileRatio * A;\n#endif\n#endif\n#ifndef HAS_GRADIENT\n#ifdef HAS_COLOR\nvColor = aColor;\n#endif\n#ifdef HAS_DASHARRAY\n#ifdef HAS_DASHARRAY_ATTR\nvDasharray = aDasharray;\n#endif\n#ifdef HAS_DASHARRAY_COLOR\nvDashColor = aDashColor / 255.;\n#endif\n#endif\n#ifdef HAS_PATTERN\nvTexInfo = vec4(aTexInfo.xy, aTexInfo.zw + 1.);\n#ifdef HAS_PATTERN_ANIM\nvLinePatternAnimSpeed = aLinePattern[0] / 127.;\n#endif\n#ifdef HAS_PATTERN_GAP\nvLinePatternGap = aLinePattern[1] / 10.0;\n#endif\n#endif\n#endif\n#ifdef HAS_STROKE_COLOR\nvStrokeColor = aStrokeColor;\n#endif\n#ifdef HAS_OPACITY\nvOpacity = aOpacity / 255.;\n#endif\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\nshadow_computeShadowPars(B);\n#endif\n#else\nfbo_picking_setData(I, true);\n#endif\n}";
+var Je = "#define SHADER_NAME LINE\n#define AA_CLIP_LIMIT 2.0\n#define AA_LINE_WIDTH 16.0\n#define DEVICE_PIXEL_RATIO 1.0\n#define ANTIALIASING 1.0 / DEVICE_PIXEL_RATIO / 2.0\n#define EXTRUDE_SCALE 63.0\n#define EXTRUDE_MOD 64.0\n#define MAX_LINE_DISTANCE 65535.0\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY)\nattribute vec3 aExtrude;\n#else\nattribute vec2 aExtrude;\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY) || defined(HAS_GRADIENT) || defined(HAS_TRAIL)\nattribute float aLinesofar;\nvarying highp float vLinesofar;\n#endif\nuniform float cameraToCenterDistance;\n#if defined(HAS_STROKE_WIDTH)\nattribute float aLineStrokeWidth;\n#else\nuniform float lineStrokeWidth;\n#endif\nuniform mat4 projViewModelMatrix;\nuniform mat4 modelMatrix;\nuniform float tileResolution;\nuniform float resolution;\nuniform float tileRatio;\n#if defined(HAS_LINE_DX) || defined(HAS_LINE_DY)\nattribute vec2 aLineDxDy;\n#endif\n#ifndef HAS_LINE_DX\nuniform float lineDx;\n#endif\n#ifndef HAS_LINE_DY\nuniform float lineDy;\n#endif\nuniform vec2 canvasSize;\nuniform float layerScale;\nvarying vec2 vNormal;\nvarying vec2 vWidth;\nvarying float vGammaScale;\n#ifndef ENABLE_TILE_STENCIL\nvarying vec2 vPosition;\n#endif\n#ifdef USE_LINE_OFFSET\nattribute vec2 aExtrudeOffset;\n#endif\n#ifdef HAS_LINE_WIDTH\nattribute float aLineWidth;\n#else\nuniform float lineWidth;\n#endif\n#ifndef PICKING_MODE\n#ifndef HAS_GRADIENT\n#ifdef HAS_COLOR\nattribute vec4 aColor;\nvarying vec4 vColor;\n#endif\n#ifdef HAS_PATTERN\n#if defined(HAS_PATTERN_ANIM) || defined(HAS_PATTERN_GAP)\nattribute vec2 aLinePattern;\n#endif\n#ifdef HAS_PATTERN_ANIM\nvarying float vLinePatternAnimSpeed;\n#endif\n#ifdef HAS_PATTERN_GAP\nvarying float vLinePatternGap;\n#endif\nattribute vec4 aTexInfo;\nvarying vec4 vTexInfo;\n#endif\n#ifdef HAS_DASHARRAY\n#ifdef HAS_DASHARRAY_ATTR\nattribute vec4 aDasharray;\nvarying vec4 vDasharray;\n#endif\n#ifdef HAS_DASHARRAY_COLOR\nattribute vec4 aDashColor;\nvarying vec4 vDashColor;\n#endif\n#endif\n#endif\n#ifdef HAS_STROKE_COLOR\nattribute vec4 aStrokeColor;\nvarying vec4 vStrokeColor;\n#endif\n#ifdef HAS_OPACITY\nattribute float aOpacity;\nvarying float vOpacity;\n#endif\n#ifdef HAS_GRADIENT\nattribute float aGradIndex;\nvarying float vGradIndex;\n#endif\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\n#include <vsm_shadow_vert>\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\nvarying vec3 vVertex;\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n  float d = mod(abs(aExtrude.x), 2.);\n  float e = mod(abs(aExtrude.y), 2.);\n  vNormal = vec2(d, e * 2. - 1.);\n  vec4 f = vec4(c, 1.);\n  vec4 h = projViewModelMatrix * f;\n  vVertex = (modelMatrix * f).xyz;\n#ifdef HAS_STROKE_WIDTH\nfloat i = aLineStrokeWidth / 2. * layerScale;\n#else\nfloat i = lineStrokeWidth;\n#endif\n#ifdef HAS_LINE_WIDTH\nfloat j = aLineWidth / 2. * layerScale;\n#else\nfloat j = lineWidth * layerScale;\n#endif\nfloat k = j / 2. + i;\n  float l = sign(i) * j / 2.;\n  float m = l + sign(l) * ANTIALIASING;\n  float n = k + sign(k) * ANTIALIASING;\n#ifdef USE_LINE_OFFSET\nvec2 o = lineOffset * (vNormal.y * (aExtrude.xy - aExtrudeOffset) + aExtrudeOffset);\n  vec2 u = (n * aExtrude.xy + o) / EXTRUDE_SCALE;\n#else\nvec2 v = aExtrude.xy / EXTRUDE_SCALE;\n  vec2 u = n * v;\n#endif\nfloat A = tileResolution / resolution;\n  vec4 B = vec4(c + vec3(u, .0) * tileRatio / A, 1.);\n  gl_Position = projViewModelMatrix * B;\n  float C = min(AA_CLIP_LIMIT / canvasSize.x, AA_CLIP_LIMIT / canvasSize.y);\n  float D = distance(gl_Position.xy / gl_Position.w, h.xy / h.w) - C;\n  if(D * j < .0) {\n    float E = -D / C;\n    float F = E * E * E * E * AA_LINE_WIDTH;\n    u += F * v;\n    n += F / 6.;\n    B = vec4(c + vec3(u, .0) * tileRatio / A, 1.);\n    gl_Position = projViewModelMatrix * B;\n  }\n#ifdef HAS_LINE_DX\nfloat G = aLineDxDy[0];\n#else\nfloat G = lineDx;\n#endif\n#ifdef HAS_LINE_DY\nfloat H = aLineDxDy[1];\n#else\nfloat H = lineDy;\n#endif\nfloat I = gl_Position.w;\n  gl_Position.xy += vec2(G, H) * 2. / canvasSize * I;\n#ifndef PICKING_MODE\nvWidth = vec2(n, m);\n  vGammaScale = I / cameraToCenterDistance;\n#ifndef ENABLE_TILE_STENCIL\nvPosition = c.xy;\n#ifdef USE_LINE_OFFSET\nvPosition += tileRatio * o / EXTRUDE_SCALE;\n#endif\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY) || defined(HAS_GRADIENT)\n#ifdef HAS_GRADIENT\nvLinesofar = aLinesofar / MAX_LINE_DISTANCE;\n  vGradIndex = aGradIndex;\n#else\nfloat J = aLinesofar - k * aExtrude.z / EXTRUDE_SCALE / A * tileRatio;\n  vLinesofar = J / tileRatio * A;\n#endif\n#endif\n#ifndef HAS_GRADIENT\n#ifdef HAS_COLOR\nvColor = aColor;\n#endif\n#ifdef HAS_DASHARRAY\n#ifdef HAS_DASHARRAY_ATTR\nvDasharray = aDasharray;\n#endif\n#ifdef HAS_DASHARRAY_COLOR\nvDashColor = aDashColor / 255.;\n#endif\n#endif\n#ifdef HAS_PATTERN\nvTexInfo = vec4(aTexInfo.xy, aTexInfo.zw + 1.);\n#ifdef HAS_PATTERN_ANIM\nvLinePatternAnimSpeed = aLinePattern[0] / 127.;\n#endif\n#ifdef HAS_PATTERN_GAP\nvLinePatternGap = aLinePattern[1] / 10.0;\n#endif\n#endif\n#endif\n#ifdef HAS_STROKE_COLOR\nvStrokeColor = aStrokeColor;\n#endif\n#ifdef HAS_OPACITY\nvOpacity = aOpacity / 255.;\n#endif\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\nshadow_computeShadowPars(B);\n#endif\n#else\nfbo_picking_setData(I, true);\n#endif\n}";
 
-class $e extends Ue {
+class Ye extends Ge {
     prepareSymbol(t) {
         const e = t.lineColor;
         Array.isArray(e) && (3 === e.length && e.push(1), t.lineColor = e.map(t => 255 * t));
@@ -4403,25 +4418,25 @@ class $e extends Ue {
         if (!t.geometry) return null;
         const {geometry: i, symbolIndex: r, ref: o} = t, s = this.getSymbolDef(r);
         if (void 0 === o) {
-            we(i, s, this.getFnTypeConfig(r));
+            ke(i, s, this.getFnTypeConfig(r));
         }
         const a = this.getSymbol(r), l = {
             tileResolution: i.properties.tileResolution,
             tileRatio: i.properties.tileRatio,
             tileExtent: i.properties.tileExtent
         };
-        this.setLineUniforms(a, l), ce(l, "lineColor", a, "lineColor", "#fff", de(this.colorCache)), 
-        ce(l, "lineStrokeColor", a, "lineStrokeColor", [ 0, 0, 0, 0 ], de(this.colorCache)), 
-        ce(l, "lineDasharray", a, "lineDasharray", [ 0, 0, 0, 0 ], t => {
+        this.setLineUniforms(a, l), ue(l, "lineColor", a, "lineColor", "#fff", pe(this.colorCache)), 
+        ue(l, "lineStrokeColor", a, "lineStrokeColor", [ 0, 0, 0, 0 ], pe(this.colorCache)), 
+        ue(l, "lineDasharray", a, "lineDasharray", [ 0, 0, 0, 0 ], t => {
             let e;
             if (t && t.length) {
                 const n = t;
                 1 === t.length ? e = [ n[0], n[0], n[0], n[0] ] : 2 === t.length ? e = [ n[0], n[1], n[0], n[1] ] : 3 === t.length ? e = [ n[0], n[1], n[2], n[2] ] : 4 === t.length && (e = t);
             }
             return e || [ 0, 0, 0, 0 ];
-        }), ce(l, "lineDashColor", a, "lineDashColor", [ 0, 0, 0, 0 ], de(this.colorCache));
+        }), ue(l, "lineDashColor", a, "lineDashColor", [ 0, 0, 0, 0 ], pe(this.colorCache));
         const c = i.properties.iconAtlas, h = i.data.aPosition instanceof Int16Array;
-        c && (l.linePatternFile = Ge(this.regl, c, !1), l.atlasSize = c ? [ c.width, c.height ] : [ 0, 0 ], 
+        c && (l.linePatternFile = Be(this.regl, c, !1), l.atlasSize = c ? [ c.width, c.height ] : [ 0, 0 ], 
         l.flipY = h ? -1 : 1, this.drawDebugAtlas(c)), void 0 === o && i.generateBuffers(this.regl);
         const u = new n.Material(l), d = new n.Mesh(i, u, {
             castShadow: !1,
@@ -4451,16 +4466,16 @@ class $e extends Ue {
         n.data.aDasharray && (e.HAS_DASHARRAY_ATTR = 1), n.data.aDashColor && (e.HAS_DASHARRAY_COLOR = 1)) : e.HAS_DASHARRAY && delete e.HAS_DASHARRAY;
     }
     setLineUniforms(t, e) {
-        ce(e, "lineWidth", t, "lineWidth", 2), ce(e, "lineOpacity", t, "lineOpacity", 1), 
-        ce(e, "lineStrokeWidth", t, "lineStrokeWidth", 0), ce(e, "lineBlur", t, "lineBlur", .7), 
-        ce(e, "lineOffset", t, "lineOffset", 0), ce(e, "lineDx", t, "lineDx", 0), ce(e, "lineDy", t, "lineDy", 0), 
-        ce(e, "linePatternAnimSpeed", t, "linePatternAnimSpeed", 0), ce(e, "linePatternGap", t, "linePatternGap", 0);
+        ue(e, "lineWidth", t, "lineWidth", 2), ue(e, "lineOpacity", t, "lineOpacity", 1), 
+        ue(e, "lineStrokeWidth", t, "lineStrokeWidth", 0), ue(e, "lineBlur", t, "lineBlur", .7), 
+        ue(e, "lineOffset", t, "lineOffset", 0), ue(e, "lineDx", t, "lineDx", 0), ue(e, "lineDy", t, "lineDy", 0), 
+        ue(e, "linePatternAnimSpeed", t, "linePatternAnimSpeed", 0), ue(e, "linePatternGap", t, "linePatternGap", 0);
     }
     setMeshDefines(t, e, n) {
         e.data.aOpacity && (t.HAS_OPACITY = 1), e.data.aLineWidth && (t.HAS_LINE_WIDTH = 1), 
-        e.data.aLineStrokeWidth && (t.HAS_STROKE_WIDTH = 1), Ce(n.lineDx) && (t.HAS_LINE_DX = 1), 
-        Ce(n.lineDy) && (t.HAS_LINE_DY = 1), Ce(n.linePatternAnimSpeed) && (t.HAS_PATTERN_ANIM = 1), 
-        Ce(n.linePatternGap) && (t.HAS_PATTERN_GAP = 1);
+        e.data.aLineStrokeWidth && (t.HAS_STROKE_WIDTH = 1), ze(n.lineDx) && (t.HAS_LINE_DX = 1), 
+        ze(n.lineDy) && (t.HAS_LINE_DY = 1), ze(n.linePatternAnimSpeed) && (t.HAS_PATTERN_ANIM = 1), 
+        ze(n.linePatternGap) && (t.HAS_PATTERN_GAP = 1);
     }
     paint(t) {
         t.states && t.states.includesChanged.shadow && (this.shader.dispose(), this.createShader(t)), 
@@ -4477,7 +4492,7 @@ class $e extends Ue {
             evaluate: (e, i) => {
                 let r = n(t.getZoom(), e);
                 return p(r) && (r = this.evaluateInFnTypeConfig(r, i, t, e, !0)), Array.isArray(r) || (r = this.colorCache[r] = this.colorCache[r] || C(r).unitArray()), 
-                r = ue(r), r;
+                r = fe(r), r;
             }
         }, {
             attrName: "aLinePattern",
@@ -4488,7 +4503,7 @@ class $e extends Ue {
             define: "HAS_LINE_PATTERN",
             evaluate: (e, n, r, o) => {
                 let a = i(t.getZoom(), e);
-                return ae(a) && (a = 0), 0 !== a && (n.properties.hasPatternAnim = 1), s[0] = a / 127, 
+                return ce(a) && (a = 0), 0 !== a && (n.properties.hasPatternAnim = 1), s[0] = a / 127, 
                 s[1] = r[o + 1], s[0];
             }
         }, {
@@ -4500,7 +4515,7 @@ class $e extends Ue {
             define: "HAS_LINE_PATTERN",
             evaluate: (e, n, i, o) => {
                 let a = r(t.getZoom(), e);
-                return ae(a) && (a = 0), s[1] = 10 * a, s[0] = i[o], s[0];
+                return ce(a) && (a = 0), s[1] = 10 * a, s[0] = i[o], s[0];
             }
         } ].concat(o);
     }
@@ -4565,7 +4580,7 @@ class $e extends Ue {
     init(t) {
         const e = this.regl;
         this.renderer = new n.Renderer(e), this.createShader(t), this.pickingFBO && (this.picking = [ new n.FBORayPicking(this.renderer, {
-            vert: "#define PICKING_MODE 1\n" + Xe,
+            vert: "#define PICKING_MODE 1\n" + Je,
             uniforms: [ {
                 name: "projViewModelMatrix",
                 type: "function",
@@ -4589,7 +4604,7 @@ class $e extends Ue {
                 return r.multiply(n, e.projViewMatrix, e.modelMatrix), n;
             }
         }), this.shader = new n.MeshShader({
-            vert: Xe,
+            vert: Je,
             frag: "#define SHADER_NAME LINE\n#define DEVICE_PIXEL_RATIO 1.0\nprecision highp float;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\n#include <vsm_shadow_frag>\n#endif\nuniform lowp float blendSrcIsOne;\nuniform lowp float lineBlur;\n#ifdef HAS_COLOR\nvarying vec4 vColor;\n#else\nuniform lowp vec4 lineColor;\n#endif\n#ifdef HAS_STROKE_COLOR\nvarying vec4 vStrokeColor;\n#else\nuniform lowp vec4 lineStrokeColor;\n#endif\n#ifdef HAS_OPACITY\nvarying float vOpacity;\n#else\nuniform lowp float lineOpacity;\n#endif\n#ifdef HAS_PATTERN\nuniform sampler2D linePatternFile;\nuniform vec2 atlasSize;\nuniform float flipY;\n#ifdef HAS_PATTERN_ANIM\nvarying float vLinePatternAnimSpeed;\n#else\nuniform float linePatternAnimSpeed;\n#endif\n#ifdef HAS_PATTERN_GAP\nvarying float vLinePatternGap;\n#else\nuniform float linePatternGap;\n#endif\nvarying vec4 vTexInfo;\nvarying float vJoin;\nvec2 c(vec2 d) {\n  vec2 e = mod(d, 1.);\n  vec2 f = vTexInfo.xy;\n  vec2 h = vTexInfo.zw;\n  return (f + e * h) / atlasSize;\n}\n#endif\nvarying vec2 vNormal;\nvarying vec2 vWidth;\nvarying float vGammaScale;\n#ifndef ENABLE_TILE_STENCIL\nvarying vec2 vPosition;\n#endif\nuniform float tileExtent;\n#ifdef HAS_DASHARRAY\n#ifdef HAS_DASHARRAY_ATTR\nvarying vec4 vDasharray;\n#else\nuniform vec4 lineDasharray;\n#endif\n#ifdef HAS_DASHARRAY_COLOR\nvarying vec4 vDashColor;\n#else\nuniform vec4 lineDashColor;\n#endif\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY) || defined(HAS_GRADIENT) || defined(HAS_TRAIL)\nvarying highp float vLinesofar;\n#endif\n#ifdef HAS_TRAIL\nuniform float trailSpeed;\nuniform float trailLength;\nuniform float trailCircle;\n#endif\n#if defined(HAS_TRAIL) || defined(HAS_PATTERN)\nuniform float currentTime;\n#endif\nfloat i(float j, float k) {\n  float l = k / 2.;\n  float m = abs(j - l);\n  float n = (.1 + 1. / DEVICE_PIXEL_RATIO) * vGammaScale;\n  return clamp(min(m + n, l - m) / n, .0, 1.);\n}\nvarying vec3 vVertex;\nuniform vec3 cameraPosition;\nuniform float cameraToCenterDistance;\nvoid main() {\n  \n#ifndef ENABLE_TILE_STENCIL\nfloat o = sign(tileExtent - min(tileExtent, abs(vPosition.x))) * sign(1. + sign(vPosition.x)) * sign(tileExtent - min(tileExtent, abs(vPosition.y))) * sign(1. + sign(vPosition.y));\n  if(o == .0) {\n    discard;\n  }\n#endif\n#if defined(HAS_PATTERN) || defined(HAS_DASHARRAY) || defined(HAS_GRADIENT) || defined(HAS_TRAIL)\nfloat u = vLinesofar;\n#endif\nfloat v = length(vNormal) * vWidth.s;\n#ifdef HAS_PATTERN\nvec2 h = vTexInfo.zw;\n  float A = sign(h.x * h.y);\n  float B = mix(lineBlur, .0, A);\n#else\nfloat B = lineBlur;\n#endif\nfloat n = (B + 1. / DEVICE_PIXEL_RATIO) * vGammaScale;\n  float C = clamp(min(v - (vWidth.t - n), vWidth.s - v) / n, .0, 1.);\n#ifdef HAS_COLOR\nvec4 D = vColor / 255.;\n#else\nvec4 D = lineColor;\n#endif\n#ifdef HAS_PATTERN\nif(A == 1.) {\n    \n#ifdef HAS_PATTERN_GAP\nfloat E = vLinePatternGap;\n#else\nfloat E = linePatternGap;\n#endif\n#ifdef HAS_PATTERN_ANIM\nfloat F = vLinePatternAnimSpeed;\n#else\nfloat F = linePatternAnimSpeed;\n#endif\nfloat G = ceil(h.x * vWidth.s * 2. / h.y);\n    float H = G * (1. + E);\n    u += mod(currentTime * -F * .2, H);\n    float I = mod(u / H, 1.);\n    float J = mod((flipY * vNormal.y + 1.) / 2., 1.);\n    D *= texture2D(linePatternFile, c(vec2(I * (1. + E), J)));\n    float K = clamp(sign(1. / (1. + E) - I) + .000001, .0, 1.);\n    D *= K;\n  }\n#endif\n#ifdef HAS_STROKE_COLOR\nvec4 L = vStrokeColor / 255.;\n#else\nvec4 L = lineStrokeColor;\n#endif\nL = mix(D, L, sign(vWidth.t));\n  D = L * C + max(sign(vWidth.t - v), .0) * D * (1. - C);\n#ifdef HAS_DASHARRAY\n#ifdef HAS_DASHARRAY_ATTR\nvec4 M = vDasharray;\n#else\nvec4 M = lineDasharray;\n#endif\n#ifdef HAS_DASHARRAY_COLOR\nvec4 N = vDashColor;\n#else\nvec4 N = lineDashColor;\n#endif\nfloat k = M[0] + M[1] + M[2] + M[3];\n  float j = mod(u, k);\n  float O = max(sign(M[0] - j), .0);\n  float P = j - M[0] - M[1];\n  float Q = max(sign(P), .0) * max(sign(M[2] - P), .0);\n  float R = O + Q;\n  float S = i(j, M[0]);\n  float T = i(P, M[2]);\n  float U = S * O + T * Q;\n  D = D * (1. - U) + C * N * U;\n#endif\n#ifdef HAS_TRAIL\nfloat V = mod(u - currentTime * trailSpeed * .1, trailCircle);\n  float W = V < trailLength ? mix(.0, 1., V / trailLength) : .0;\n  D *= W;\n#endif\n#ifdef HAS_OPACITY\nfloat X = vOpacity;\n#else\nfloat X = lineOpacity;\n#endif\ngl_FragColor = D * X;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\nfloat Y = shadow_computeShadow();\n  gl_FragColor.rgb = shadow_blend(gl_FragColor.rgb, Y);\n#endif\nfloat Z = clamp(cameraToCenterDistance * 1.5 / distance(vVertex, cameraPosition), .0, 1.);\n  if(blendSrcIsOne == 1.) {\n    gl_FragColor *= gl_FragColor.a;\n  }\n  gl_FragColor *= Z;\n}",
             uniforms: e,
             defines: i,
@@ -4653,7 +4668,7 @@ class $e extends Ue {
     }
 }
 
-class Je extends $e {
+class Ze extends Ye {
     postCreateGeometry(t) {
         const {symbolIndex: e, geometry: n} = t, {features: i} = n.properties, r = this.getSymbol(e).lineGradientProperty, o = n.data.aPickingId, s = new Uint8Array(o.length), a = [];
         let l = o[0];
@@ -4665,7 +4680,7 @@ class Je extends $e {
     createMesh(t, e) {
         const {geometry: i, symbolIndex: r, ref: o} = t, s = this.getSymbolDef(r);
         if (void 0 === o) {
-            we(i, s, this.getFnTypeConfig(r));
+            ke(i, s, this.getFnTypeConfig(r));
         }
         const a = {
             tileResolution: i.properties.tileResolution,
@@ -4675,11 +4690,11 @@ class Je extends $e {
         this.setLineUniforms(l, a);
         const c = i.properties.gradients;
         let h = 2 * c.length;
-        Ze(h) || (h = Ke(h));
+        Qe(h) || (h = tn(h));
         const u = this.regl.texture({
             width: 256,
             height: h,
-            data: Ye(c),
+            data: Ke(c),
             format: "rgba",
             mag: "linear",
             min: "linear",
@@ -4712,7 +4727,7 @@ class Je extends $e {
                 return r.multiply(n, e.projViewMatrix, e.modelMatrix), n;
             }
         }), this.shader = new n.MeshShader({
-            vert: Xe,
+            vert: Je,
             frag: "#define SHADER_NAME LINE_GRADIENT\n#define DEVICE_PIXEL_RATIO 1.0\n#define MAX_LINE_COUNT 128.0\nprecision mediump float;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\n#include <vsm_shadow_frag>\n#endif\n#ifdef HAS_OPACITY\nvarying float vOpacity;\n#else\nuniform lowp float lineOpacity;\n#endif\nuniform lowp float lineBlur;\nuniform float lineGradientTextureHeight;\nuniform float tileExtent;\nuniform sampler2D lineGradientTexture;\nvarying vec2 vNormal;\nvarying vec2 vWidth;\nvarying float vGammaScale;\nvarying highp float vLinesofar;\nvarying float vGradIndex;\n#ifndef ENABLE_TILE_STENCIL\nvarying vec2 vPosition;\n#endif\n#ifdef HAS_TRAIL\nuniform float trailSpeed;\nuniform float trailLength;\nuniform float trailCircle;\nuniform float currentTime;\n#endif\nvoid main() {\n  \n#ifndef ENABLE_TILE_STENCIL\nfloat c = sign(tileExtent - min(tileExtent, abs(vPosition.x))) * sign(1. + sign(vPosition.x)) * sign(tileExtent - min(tileExtent, abs(vPosition.y))) * sign(1. + sign(vPosition.y));\n  if(c == .0) {\n    discard;\n  }\n#endif\nfloat d = length(vNormal) * vWidth.s;\n  float e = (lineBlur + 1. / DEVICE_PIXEL_RATIO) * vGammaScale;\n  float f = clamp(min(d - (vWidth.t - e), vWidth.s - d) / e, .0, 1.);\n  float h = vLinesofar;\n  vec4 i = texture2D(lineGradientTexture, vec2(h, (vGradIndex * 2. + .5) / lineGradientTextureHeight)) * f;\n  i *= max(sign(MAX_LINE_COUNT - vGradIndex), .0);\n#ifdef HAS_TRAIL\nfloat j = mod(h - currentTime * trailSpeed * .1, trailCircle);\n  float k = j < trailLength ? mix(.0, 1., j / trailLength) : .0;\n  i *= k;\n#endif\n#ifdef HAS_OPACITY\nfloat l = vOpacity;\n#else\nfloat l = lineOpacity;\n#endif\ngl_FragColor = i * l;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\nfloat m = shadow_computeShadow();\n  gl_FragColor.rgb = shadow_blend(gl_FragColor.rgb, m);\n#endif\n}",
             uniforms: e,
             defines: i,
@@ -4721,11 +4736,11 @@ class Je extends $e {
     }
 }
 
-function Ye(t) {
+function Ke(t) {
     t.length > 128 && (console.warn("Line count in a tile exceeds maximum limit (128) for line-gradient render plugin."), 
     t = t.slice(0, 128));
     const e = document.createElement("canvas"), n = e.getContext("2d");
-    e.width = 256, e.height = 2 * t.length, Ze(e.height) || (e.height = Ke(2 * t.length));
+    e.width = 256, e.height = 2 * t.length, Qe(e.height) || (e.height = tn(2 * t.length));
     for (let e = 0; e < t.length; e++) {
         const i = t[e], r = n.createLinearGradient(0, 0, 256, 0);
         for (let t = 0; t < i.length; t += 2) r.addColorStop(+i[t], i[t + 1]);
@@ -4736,38 +4751,38 @@ function Ye(t) {
     return n.canvas;
 }
 
-function Ze(t) {
+function Qe(t) {
     return 0 == (t & t - 1) && 0 !== t;
 }
 
-function Ke(t) {
+function tn(t) {
     return Math.pow(2, Math.ceil(Math.log(t) / Math.LN2));
 }
 
-class Qe {
+class en {
     constructor(t) {
-        this.C = t || [], this.properties = {};
+        this.F = t || [], this.properties = {};
     }
     set meshes(t) {
-        this.C = t;
+        this.F = t;
     }
     get meshes() {
-        return this.C;
+        return this.F;
     }
 }
 
-const tn = 224, en = 600, nn = 100, rn = new Uint8Array(1), on = [], sn = {
+const nn = 224, rn = 600, on = 100, sn = new Uint8Array(1), an = [], ln = {
     collides: 0,
     boxes: []
 };
 
-class an extends Ue {
+class cn extends Ge {
     supportRenderMode(t) {
         return "point" === t;
     }
     startMeshCollision(t) {
-        const {meshKey: e} = t.properties, {renderer: n} = this.si, i = n.isForeground(t instanceof Qe ? t.meshes[0] : t);
-        if (t.properties.isForeground = i, t instanceof Qe && t.meshes.length) for (let e = 0; e < t.meshes.length; e++) t.meshes[e].properties.isForeground = i;
+        const {meshKey: e} = t.properties, {renderer: n} = this.si, i = n.isForeground(t instanceof en ? t.meshes[0] : t);
+        if (t.properties.isForeground = i, t instanceof en && t.meshes.length) for (let e = 0; e < t.meshes.length; e++) t.meshes[e].properties.isForeground = i;
         this.ai = performance.now(), this.li = this.ci(), this.hi = this.ui(e);
     }
     endMeshCollision(t) {
@@ -4824,10 +4839,10 @@ class an extends Ue {
                 const e = this.getMap();
                 s = this.gi[r] = e.coordToContainerPoint(t), a = this.gi[o] = e.coordToContainerPoint(i);
             }
-            return s.z = t.z, on[0] = s, on[1] = a, s.width = t.width, s.height = t.height, 
-            on;
+            return s.z = t.z, an[0] = s, an[1] = a, s.width = t.width, s.height = t.height, 
+            an;
         }
-        return on[0] = on[1] = null, on;
+        return an[0] = an[1] = null, an;
     }
     updateBoxCollisionFading(t, e, n, i, r) {
         const {layer: o, renderer: s, zoom: a, collisionTags: l, isEnableUniquePlacement: c} = this.si, {meshKey: h, isForeground: u} = e.properties;
@@ -4876,8 +4891,8 @@ class an extends Ue {
                 const n = e.Mi;
                 if (n && 1 === g && t[r] > 0) {
                     let {fadeOutDelay: t, fadingDuration: e} = this.sceneConfig;
-                    ae(e) && (e = tn), ae(t) && (t = nn);
-                    const i = oe(1 - (s.getFrameTimestamp() - n - t) / e, 0, 1);
+                    ce(e) && (e = nn), ce(t) && (t = on);
+                    const i = ae(1 - (s.getFrameTimestamp() - n - t) / e, 0, 1);
                     g *= i, i > 0 && this.setToRedraw();
                 }
             }
@@ -4888,7 +4903,7 @@ class an extends Ue {
             !this.Oi(i, t, e) && f && f.boxes && this.Ci(f.boxes, t);
         }
         if (y) {
-            const t = rn[0] = 255 * g;
+            const t = sn[0] = 255 * g;
             for (let e = 0; e < d; e++) {
                 const {mesh: i, allElements: r, start: o, end: s, boxIndex: a} = n[e];
                 this.setCollisionOpacity(i, r, t, o, s, a);
@@ -4916,12 +4931,12 @@ class an extends Ue {
     isBoxFading(t, e) {
         const {frameTimestamp: n} = this.si;
         let i = this.sceneConfig.fadingDuration;
-        ae(i) && (i = tn);
+        ce(i) && (i = nn);
         return n - Math.abs(this.Si(t)[e]) < i;
     }
     _i(t, e, n, i, r, o, s) {
         const a = this.getSymbol(t.properties.symbolIndex), l = this.Oi(a, t, e[i]), c = this.zi(a, t, e[i]);
-        if (!1 === this.sceneConfig.collision || l && c) return sn;
+        if (!1 === this.sceneConfig.collision || l && c) return ln;
         const h = this.isBoxCollides(t, e, n, i, r, o, s);
         return c && (h.collides = 0, h.isAllowOverlap = 1), h;
     }
@@ -4944,7 +4959,7 @@ class an extends Ue {
     }
     Pi(t, e, n, i) {
         let {fadingDuration: r, fadeInDelay: o, fadeOutDelay: s} = this.sceneConfig;
-        ae(r) && (r = tn), ae(o) && (o = en), ae(s) && (s = nn);
+        ce(r) && (r = nn), ce(o) && (o = rn), ce(s) && (s = on);
         const {frameTimestamp: a} = this.si;
         let l = n[i], c = e ? 1 : 0;
         if (!l) return e && t && (n[i] = a + o), 0;
@@ -4953,7 +4968,7 @@ class an extends Ue {
             n[i] = l = e ? t : -t;
         }
         return a - Math.abs(l) < r ? c = l > 0 ? (a - l) / r : 1 - (a + l) / r : e ? (l < 0 && (n[i] = l = a + o), 
-        c = (a - l) / r) : (l > 0 && (n[i] = l = -(a + s)), c = 1 - (a + l) / r), (c < 0 || c > 1) && (c = oe(c, 0, 1)), 
+        c = (a - l) / r) : (l > 0 && (n[i] = l = -(a + s)), c = 1 - (a + l) / r), (c < 0 || c > 1) && (c = ae(c, 0, 1)), 
         c;
     }
     Si(t) {
@@ -4982,7 +4997,7 @@ class an extends Ue {
         if (!t) return;
         const {frameTimestamp: n} = this.si;
         let {fadingDuration: i} = this.sceneConfig;
-        ae(i) && (i = tn), t[e] = -(n - i - 1);
+        ce(i) && (i = nn), t[e] = -(n - i - 1);
     }
     deleteMesh(t, e) {
         if (t) {
@@ -5052,7 +5067,7 @@ class an extends Ue {
         } else e && !this.ki && (this.Ji = t.getResolution());
         if (e) this.Yi && (clearTimeout(this.Yi), delete this.Ti, delete this.Yi), this.Ti = this.Ji && t.getResolution() > this.Ji; else if (this.ki && !this.Yi) {
             let {fadeOutDelay: t, fadingDuration: e} = this.sceneConfig;
-            ae(t) && (t = nn), ae(e) && (e = tn), this.Yi = setTimeout(() => {
+            ce(t) && (t = on), ce(e) && (e = nn), this.Yi = setTimeout(() => {
                 delete this.Ti, delete this.Yi;
             }, t + e + 1);
         }
@@ -5109,7 +5124,7 @@ class an extends Ue {
     }
     Wi() {
         let {fadeOutDelay: t, fadingDuration: e} = this.sceneConfig;
-        ae(t) && (t = nn), ae(e) && (e = tn);
+        ce(t) && (t = on), ce(e) && (e = nn);
         const n = this.layer.getRenderer(), i = n.getCurrentTileZoom(), r = n.getFrameTimestamp(), o = [];
         for (let s = 0; s < this.Gi.length; s++) {
             const a = this.Gi[s], l = a.properties.tile;
@@ -5157,7 +5172,7 @@ class an extends Ue {
             break;
         }
         if (!n) return;
-        this.tr = e, this.er = {}, this.Qi = {}, t = t.sort(cn);
+        this.tr = e, this.er = {}, this.Qi = {}, t = t.sort(un);
         const i = this.getMap().getGLScale(), r = {};
         for (let e = 0; e < t.length; e++) {
             const n = t[e];
@@ -5167,7 +5182,7 @@ class an extends Ue {
             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.Si(n), l = ln(e, i), c = r[l];
+                const {key: e, index: o} = s[t], a = this.Si(n), l = hn(e, i), c = r[l];
                 if (c) {
                     const t = c.length, e = c[t - 3].properties.meshKey, i = c[t - 2], r = c[t - 1];
                     this.er[e] = this.er[e] || {}, this.er[e][r] = 1, this.nr(a, o, i, r), c.push(n, a, o);
@@ -5226,125 +5241,125 @@ class an extends Ue {
     }
 }
 
-function ln(t, e) {
+function hn(t, e) {
     return Math.round(t[0] / e / 10) * Math.round(t[1] / e / 10) * (t[2] ? Math.round(t[2] / 10) : 1) + "-" + t[3];
 }
 
-function cn(t, e) {
+function un(t, e) {
     const n = e.uniforms.level - t.uniforms.level;
     return 0 === n ? t.properties.meshKey - e.properties.meshKey : n;
 }
 
-var hn = "#include <gl2_vert>\n#define SHADER_NAME MARKER\n#define RAD 0.0174532925\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec2 aShape;\nattribute vec2 aTexCoord;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_MARKER_WIDTH\nattribute float aMarkerWidth;\n#else\nuniform float markerWidth;\n#endif\n#ifdef HAS_MARKER_HEIGHT\nattribute float aMarkerHeight;\n#else\nuniform float markerHeight;\n#endif\n#ifdef HAS_MARKER_DX\nattribute float aMarkerDx;\n#else\nuniform float markerDx;\n#endif\n#ifdef HAS_MARKER_DY\nattribute float aMarkerDy;\n#else\nuniform float markerDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nattribute float aRotationAlign;\n#else\nuniform float rotateWithMap;\n#endif\nuniform float flipY;\n#ifdef HAS_ROTATION\nattribute float aRotation;\n#else\nuniform float markerRotation;\n#endif\n#ifdef HAS_PAD_OFFSET\nattribute float aPadOffsetX;\nattribute float aPadOffsetY;\n#endif\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float markerPerspectiveRatio;\nuniform vec2 iconSize;\nuniform vec2 texSize;\nuniform vec2 canvasSize;\nuniform float mapPitch;\nuniform float mapRotation;\nuniform float zoomScale;\nuniform float tileRatio;\nuniform float layerScale;\n#include <vt_position_vert>\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vOpacity;\n#else\n#include <fbo_picking_vert>\n#endif\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_MARKER_WIDTH\nfloat d = aMarkerWidth;\n#else\nfloat d = markerWidth;\n#endif\n#ifdef HAS_MARKER_HEIGHT\nfloat e = aMarkerHeight;\n#else\nfloat e = markerHeight;\n#endif\n#ifdef HAS_MARKER_DX\nfloat f = aMarkerDx;\n#else\nfloat f = markerDx;\n#endif\n#ifdef HAS_MARKER_DY\nfloat h = aMarkerDy;\n#else\nfloat h = markerDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nfloat i = aPitchAlign;\n#else\nfloat i = pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nfloat j = aRotationAlign;\n#else\nfloat j = rotateWithMap;\n#endif\ngl_Position = projViewModelMatrix * vec4(c, 1.);\n  float k = gl_Position.w;\n  float l = (1. - cameraToCenterDistance / k) * markerPerspectiveRatio;\n  float m = clamp(.5 + .5 * (1. - l), .0, 4.);\n#ifdef HAS_ROTATION\nfloat n = aRotation / 9362. - mapRotation * j;\n#else\nfloat n = markerRotation - mapRotation * j;\n#endif\nif(i == 1.) {\n    n += mapRotation;\n  }\n  float o = sin(n);\n  float u = cos(n);\n  mat2 v = mat2(u, -1. * o, o, u);\n  vec2 A = (aShape / 10.0);\n  if(i == 1. && flipY == .0) {\n    A *= vec2(1., -1.);\n  }\n#ifdef HAS_PAD_OFFSET\nA = (A / iconSize * vec2(d, e) + vec2(aPadOffsetX - 1., aPadOffsetY)) * layerScale;\n#else\nA = A / iconSize * vec2(d, e) * layerScale;\n#endif\nA = v * A;\n  if(i == .0) {\n    vec2 B = A * 2. / canvasSize;\n    gl_Position.xy += B * m * k;\n  } else {\n    float C = k / cameraToCenterDistance;\n    vec2 B = A;\n    gl_Position = projViewModelMatrix * vec4(c + vec3(B, .0) * tileRatio / zoomScale * C * m, 1.);\n  }\n  gl_Position.xy += vec2(f, -h) * 2. / canvasSize * k;\n#ifndef PICKING_MODE\nvTexCoord = aTexCoord / texSize;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\n#endif\n#else\n#ifdef ENABLE_COLLISION\nbool D = aOpacity == 255.;\n#else\nbool D = true;\n#endif\nfbo_picking_setData(gl_Position.w, D);\n#endif\n}";
+var dn = "#include <gl2_vert>\n#define SHADER_NAME MARKER\n#define RAD 0.0174532925\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec2 aShape;\nattribute vec2 aTexCoord;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_MARKER_WIDTH\nattribute float aMarkerWidth;\n#else\nuniform float markerWidth;\n#endif\n#ifdef HAS_MARKER_HEIGHT\nattribute float aMarkerHeight;\n#else\nuniform float markerHeight;\n#endif\n#ifdef HAS_MARKER_DX\nattribute float aMarkerDx;\n#else\nuniform float markerDx;\n#endif\n#ifdef HAS_MARKER_DY\nattribute float aMarkerDy;\n#else\nuniform float markerDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nattribute float aRotationAlign;\n#else\nuniform float rotateWithMap;\n#endif\nuniform float flipY;\n#ifdef HAS_ROTATION\nattribute float aRotation;\n#else\nuniform float markerRotation;\n#endif\n#ifdef HAS_PAD_OFFSET\nattribute float aPadOffsetX;\nattribute float aPadOffsetY;\n#endif\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float markerPerspectiveRatio;\nuniform vec2 iconSize;\nuniform vec2 texSize;\nuniform vec2 canvasSize;\nuniform float mapPitch;\nuniform float mapRotation;\nuniform float zoomScale;\nuniform float tileRatio;\nuniform float layerScale;\n#include <vt_position_vert>\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vOpacity;\n#else\n#include <fbo_picking_vert>\n#endif\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_MARKER_WIDTH\nfloat d = aMarkerWidth;\n#else\nfloat d = markerWidth;\n#endif\n#ifdef HAS_MARKER_HEIGHT\nfloat e = aMarkerHeight;\n#else\nfloat e = markerHeight;\n#endif\n#ifdef HAS_MARKER_DX\nfloat f = aMarkerDx;\n#else\nfloat f = markerDx;\n#endif\n#ifdef HAS_MARKER_DY\nfloat h = aMarkerDy;\n#else\nfloat h = markerDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nfloat i = aPitchAlign;\n#else\nfloat i = pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nfloat j = aRotationAlign;\n#else\nfloat j = rotateWithMap;\n#endif\ngl_Position = projViewModelMatrix * vec4(c, 1.);\n  float k = gl_Position.w;\n  float l = (1. - cameraToCenterDistance / k) * markerPerspectiveRatio;\n  float m = clamp(.5 + .5 * (1. - l), .0, 4.);\n#ifdef HAS_ROTATION\nfloat n = aRotation / 9362. - mapRotation * j;\n#else\nfloat n = markerRotation - mapRotation * j;\n#endif\nif(i == 1.) {\n    n += mapRotation;\n  }\n  float o = sin(n);\n  float u = cos(n);\n  mat2 v = mat2(u, -1. * o, o, u);\n  vec2 A = (aShape / 10.0);\n  if(i == 1. && flipY == .0) {\n    A *= vec2(1., -1.);\n  }\n#ifdef HAS_PAD_OFFSET\nA = (A / iconSize * vec2(d, e) + vec2(aPadOffsetX - 1., aPadOffsetY)) * layerScale;\n#else\nA = A / iconSize * vec2(d, e) * layerScale;\n#endif\nA = v * A;\n  if(i == .0) {\n    vec2 B = A * 2. / canvasSize;\n    gl_Position.xy += B * m * k;\n  } else {\n    float C = k / cameraToCenterDistance;\n    vec2 B = A;\n    gl_Position = projViewModelMatrix * vec4(c + vec3(B, .0) * tileRatio / zoomScale * C * m, 1.);\n  }\n  gl_Position.xy += vec2(f, -h) * 2. / canvasSize * k;\n#ifndef PICKING_MODE\nvTexCoord = aTexCoord / texSize;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\n#endif\n#else\n#ifdef ENABLE_COLLISION\nbool D = aOpacity == 255.;\n#else\nbool D = true;\n#endif\nfbo_picking_setData(gl_Position.w, D);\n#endif\n}";
 
-const un = [];
+const fn = [];
 
-function dn(t, e, n, i, r) {
-    return a.set(un, e[0], e[1], e[2], 1), a.transformMat4(un, un, n), t[2] = un[3], 
-    a.scale(un, un, 1 / un[3]), t[0] = (un[0] + 1) * i / 2, t[1] = (1 - un[1]) * r / 2, 
+function pn(t, e, n, i, r) {
+    return a.set(fn, e[0], e[1], e[2], 1), a.transformMat4(fn, fn, n), t[2] = fn[3], 
+    a.scale(fn, fn, 1 / fn[3]), t[0] = (fn[0] + 1) * i / 2, t[1] = (1 - fn[1]) * r / 2, 
     t;
 }
 
-const fn = [], pn = [], mn = [], yn = [], gn = [], vn = [];
+const mn = [], yn = [], gn = [], vn = [], bn = [], xn = [];
 
-function bn(t, e, n, r, o, s, l, h, u, d, f, p, m, y) {
+function wn(t, e, n, r, o, s, l, h, u, d, f, p, m, y) {
     const {tileRatio: g, tileResolution: v} = u, b = g / (v / d.getResolution()) * (f / d.cameraToCenterDistance) * p;
-    c.scale(n, n, b), c.scale(r, r, b), c.scale(o, o, b), c.scale(s, s, b), i.set(fn, n[0], n[1], m ? n[2] / y : 0), 
-    i.set(pn, r[0], r[1], m ? r[2] / y : 0), i.set(mn, o[0], o[1], m ? o[2] / y : 0), 
-    i.set(yn, s[0], s[1], m ? s[2] / y : 0), i.add(fn, fn, e), i.add(pn, pn, e), i.add(mn, mn, e), 
-    i.add(yn, yn, e), dn(n, fn, l, d.width, d.height), dn(r, pn, l, d.width, d.height), 
-    dn(o, mn, l, d.width, d.height), dn(s, yn, l, d.width, d.height), c.set(gn, Math.min(n[0], r[0], o[0], s[0]), Math.min(n[1], r[1], o[1], s[1])), 
-    c.set(vn, Math.max(n[0], r[0], o[0], s[0]), Math.max(n[1], r[1], o[1], s[1])), a.set(t, gn[0] + h[0], gn[1] + h[1], vn[0] + h[0], vn[1] + h[1]);
+    c.scale(n, n, b), c.scale(r, r, b), c.scale(o, o, b), c.scale(s, s, b), i.set(mn, n[0], n[1], m ? n[2] / y : 0), 
+    i.set(yn, r[0], r[1], m ? r[2] / y : 0), i.set(gn, o[0], o[1], m ? o[2] / y : 0), 
+    i.set(vn, s[0], s[1], m ? s[2] / y : 0), i.add(mn, mn, e), i.add(yn, yn, e), i.add(gn, gn, e), 
+    i.add(vn, vn, e), pn(n, mn, l, d.width, d.height), pn(r, yn, l, d.width, d.height), 
+    pn(o, gn, l, d.width, d.height), pn(s, vn, l, d.width, d.height), c.set(bn, Math.min(n[0], r[0], o[0], s[0]), Math.min(n[1], r[1], o[1], s[1])), 
+    c.set(xn, Math.max(n[0], r[0], o[0], s[0]), Math.max(n[1], r[1], o[1], s[1])), a.set(t, bn[0] + h[0], bn[1] + h[1], xn[0] + h[0], xn[1] + h[1]);
 }
 
-function xn(t, e, n, i, r, o, s, l) {
+function An(t, e, n, i, r, o, s, l) {
     1 !== l && (c.scale(n, n, l), c.scale(i, i, l), c.scale(r, r, l), c.scale(o, o, l)), 
-    c.set(gn, Math.min(n[0], i[0], r[0], o[0]), Math.min(n[1], i[1], r[1], o[1])), c.set(vn, Math.max(n[0], i[0], r[0], o[0]), Math.max(n[1], i[1], r[1], o[1])), 
-    a.set(t, e[0] + gn[0] + s[0], e[1] + gn[1] - s[1], e[0] + vn[0] + s[0], e[1] + vn[1] - s[1]);
+    c.set(bn, Math.min(n[0], i[0], r[0], o[0]), Math.min(n[1], i[1], r[1], o[1])), c.set(xn, Math.max(n[0], i[0], r[0], o[0]), Math.max(n[1], i[1], r[1], o[1])), 
+    a.set(t, e[0] + bn[0] + s[0], e[1] + bn[1] - s[1], e[0] + xn[0] + s[0], e[1] + xn[1] - s[1]);
 }
 
-function wn(t, e, n, i, r) {
+function kn(t, e, n, i, r) {
     e -= n * i, 1 === r && (e += n);
     const o = Math.sin(e), s = Math.cos(e);
     return l.set(t, s, -o, o, s);
 }
 
-const An = [], kn = [], _n = [], Sn = [], Tn = [], Mn = [], Pn = [], In = [], On = [ 1, -1 ], Cn = [ 1, 1 ];
+const _n = [], Sn = [], Tn = [], Mn = [], Pn = [], In = [], On = [], Cn = [], Fn = [ 1, -1 ], zn = [ 1, 1 ];
 
-function Fn(t, e, n, r, o) {
-    const s = e.material.uniforms, a = o.cameraToCenterDistance, l = e.geometry.properties, h = this.getSymbol(l.symbolIndex), u = e.geometry.desc.positionSize, d = l.aAnchor, f = i.set(An, d[n * u], d[n * u + 1], 2 === u ? 0 : d[n * u + 2]);
-    let p = dn(kn, f, r, o.width, o.height);
+function En(t, e, n, r, o) {
+    const s = e.material.uniforms, a = o.cameraToCenterDistance, l = e.geometry.properties, h = this.getSymbol(l.symbolIndex), u = e.geometry.desc.positionSize, d = l.aAnchor, f = i.set(_n, d[n * u], d[n * u + 1], 2 === u ? 0 : d[n * u + 2]);
+    let p = pn(Sn, f, r, o.width, o.height);
     const m = p[2];
     let y = 1;
     if (s.markerPerspectiveRatio) {
-        y = oe(.5 + .5 * (1 - (1 - a / m) * s.markerPerspectiveRatio), 0, 4);
+        y = ae(.5 + .5 * (1 - (1 - a / m) * s.markerPerspectiveRatio), 0, 4);
     }
-    const {aShape: g, aMarkerDx: v, aMarkerDy: b, aMarkerWidth: x, aMarkerHeight: w, aPitchAlign: A, aRotationAlign: k, aRotation: _} = l, S = v ? v[n] : h.markerDx, T = b ? b[n] : h.markerDy, M = A ? A[n] : s.pitchWithMap, P = k ? k[n] : s.rotateWithMap, I = c.set(In, S || 0, -(T || 0));
-    let O = c.set(Sn, g[2 * n] / 10, g[2 * n + 1] / 10), C = c.set(Tn, g[2 * n + 2] / 10, g[2 * n + 3] / 10), F = c.set(Mn, g[2 * n + 4] / 10, g[2 * n + 5] / 10), z = c.set(Pn, g[2 * n + 6] / 10, g[2 * n + 7] / 10);
-    0 === s.flipY && 1 === M && (c.multiply(O, O, On), c.multiply(C, C, On), c.multiply(F, F, On), 
-    c.multiply(z, z, On));
+    const {aShape: g, aMarkerDx: v, aMarkerDy: b, aMarkerWidth: x, aMarkerHeight: w, aPitchAlign: A, aRotationAlign: k, aRotation: _} = l, S = v ? v[n] : h.markerDx, T = b ? b[n] : h.markerDy, M = A ? A[n] : s.pitchWithMap, P = k ? k[n] : s.rotateWithMap, I = c.set(Cn, S || 0, -(T || 0));
+    let O = c.set(Mn, g[2 * n] / 10, g[2 * n + 1] / 10), C = c.set(Pn, g[2 * n + 2] / 10, g[2 * n + 3] / 10), F = c.set(In, g[2 * n + 4] / 10, g[2 * n + 5] / 10), z = c.set(On, g[2 * n + 6] / 10, g[2 * n + 7] / 10);
+    0 === s.flipY && 1 === M && (c.multiply(O, O, Fn), c.multiply(C, C, Fn), c.multiply(F, F, Fn), 
+    c.multiply(z, z, Fn));
     let E = x ? x[n] : h.markerWidth;
-    ae(E) && (E = 15);
+    ce(E) && (E = 15);
     let j = w ? w[n] : h.markerHeight;
-    ae(j) && (j = 15);
-    const D = c.set(Cn, E / 24, j / 24);
+    ce(j) && (j = 15);
+    const D = c.set(zn, E / 24, j / 24);
     c.mul(O, O, D), c.mul(C, C, D), c.mul(F, F, D), c.mul(z, z, D);
     let R = _ ? _[n] / 9362 : -(h.markerRotation || 0) * Math.PI / 180;
     const N = o.getBearing() * Math.PI / 180;
     if (N * P || R) {
-        const t = wn(_n, R, N, P, M);
+        const t = kn(Tn, R, N, P, M);
         O = c.transformMat2(O, O, t), C = c.transformMat2(C, C, t), F = c.transformMat2(F, F, t), 
         z = c.transformMat2(z, z, t);
     }
-    return 1 === M ? bn(t, f, O, C, F, z, r, I, s, o, m, y) : (c.multiply(O, O, On), 
-    c.multiply(C, C, On), c.multiply(F, F, On), c.multiply(z, z, On), xn(t, p, O, C, F, z, I, y)), 
+    return 1 === M ? wn(t, f, O, C, F, z, r, I, s, o, m, y) : (c.multiply(O, O, Fn), 
+    c.multiply(C, C, Fn), c.multiply(F, F, Fn), c.multiply(z, z, Fn), An(t, p, O, C, F, z, I, y)), 
     t;
 }
 
-const zn = [], En = [], jn = [], Dn = [], Rn = [], Nn = [], Ln = [ 1, -1 ];
+const jn = [], Dn = [], Rn = [], Nn = [], Ln = [], Hn = [], Vn = [ 1, -1 ];
 
-function Hn(t, e, n, r, o, s, a, l, h) {
-    const u = r.material.uniforms, d = h.cameraToCenterDistance, f = r.geometry.properties, p = this.getSymbol(f.symbolIndex), m = "line" === p.textPlacement && !ye(p), y = n[2];
+function Un(t, e, n, r, o, s, a, l, h) {
+    const u = r.material.uniforms, d = h.cameraToCenterDistance, f = r.geometry.properties, p = this.getSymbol(f.symbolIndex), m = "line" === p.textPlacement && !ve(p), y = n[2];
     let g = 1;
     if (u.textPerspectiveRatio) {
-        g = oe(.5 + .5 * (1 - (1 - d / y) * u.textPerspectiveRatio), 0, 4);
+        g = ae(.5 + .5 * (1 - (1 - d / y) * u.textPerspectiveRatio), 0, 4);
     }
-    const {aTextDx: v, aTextDy: b, aPitchAlign: x, aRotationAlign: w, aRotation: A} = r.geometry.properties, k = v ? v[a] : p.textDx, _ = b ? b[a] : p.textDy, S = x ? x[a] : u.pitchWithMap, T = w ? w[a] : u.rotateWithMap, M = c.set(Nn, k || 0, -(_ || 0));
+    const {aTextDx: v, aTextDy: b, aPitchAlign: x, aRotationAlign: w, aRotation: A} = r.geometry.properties, k = v ? v[a] : p.textDx, _ = b ? b[a] : p.textDy, S = x ? x[a] : u.pitchWithMap, T = w ? w[a] : u.rotateWithMap, M = c.set(Hn, k || 0, -(_ || 0));
     if (m) {
         const {aOffset: r, aShape: o} = f, s = r.length !== o.length;
         let d, p, m, v;
-        if (s ? (d = i.set(En, r[3 * a] / 10, r[3 * a + 1] / 10, r[3 * a + 2] / 10), p = i.set(jn, r[3 * a + 3] / 10, r[3 * a + 4] / 10, r[3 * a + 5] / 10), 
-        m = i.set(Dn, r[3 * a + 6] / 10, r[3 * a + 7] / 10, r[3 * a + 8] / 10), v = i.set(Rn, r[3 * a + 9] / 10, r[3 * a + 10] / 10, r[3 * a + 11] / 10)) : (d = c.set(En, r[2 * a] / 10, r[2 * a + 1] / 10), 
-        p = c.set(jn, r[2 * a + 2] / 10, r[2 * a + 3] / 10), m = c.set(Dn, r[2 * a + 4] / 10, r[2 * a + 5] / 10), 
-        v = c.set(Rn, r[2 * a + 6] / 10, r[2 * a + 7] / 10)), 1 === S) {
+        if (s ? (d = i.set(Dn, r[3 * a] / 10, r[3 * a + 1] / 10, r[3 * a + 2] / 10), p = i.set(Rn, r[3 * a + 3] / 10, r[3 * a + 4] / 10, r[3 * a + 5] / 10), 
+        m = i.set(Nn, r[3 * a + 6] / 10, r[3 * a + 7] / 10, r[3 * a + 8] / 10), v = i.set(Ln, r[3 * a + 9] / 10, r[3 * a + 10] / 10, r[3 * a + 11] / 10)) : (d = c.set(Dn, r[2 * a] / 10, r[2 * a + 1] / 10), 
+        p = c.set(Rn, r[2 * a + 2] / 10, r[2 * a + 3] / 10), m = c.set(Nn, r[2 * a + 4] / 10, r[2 * a + 5] / 10), 
+        v = c.set(Ln, r[2 * a + 6] / 10, r[2 * a + 7] / 10)), 1 === S) {
             const n = X(h.getResolution(), h);
-            bn(t, e, d, p, m, v, l, M, u, h, y, g, s, n);
-        } else c.multiply(d, d, Ln), c.multiply(p, p, Ln), c.multiply(m, m, Ln), c.multiply(v, v, Ln), 
-        xn(t, n, d, p, m, v, M, g);
+            wn(t, e, d, p, m, v, l, M, u, h, y, g, s, n);
+        } else c.multiply(d, d, Vn), c.multiply(p, p, Vn), c.multiply(m, m, Vn), c.multiply(v, v, Vn), 
+        An(t, n, d, p, m, v, M, g);
     } else {
         const {aShape: i} = f;
-        let r = c.set(En, i[2 * a] / 10, i[2 * a + 1] / 10), s = c.set(jn, i[2 * a + 2] / 10, i[2 * a + 3] / 10), d = c.set(Dn, i[2 * a + 4] / 10, i[2 * a + 5] / 10), v = c.set(Rn, i[2 * a + 6] / 10, i[2 * a + 7] / 10);
-        0 === u.flipY && 1 === S && (c.multiply(r, r, Ln), c.multiply(s, s, Ln), c.multiply(d, d, Ln), 
-        c.multiply(v, v, Ln));
+        let r = c.set(Dn, i[2 * a] / 10, i[2 * a + 1] / 10), s = c.set(Rn, i[2 * a + 2] / 10, i[2 * a + 3] / 10), d = c.set(Nn, i[2 * a + 4] / 10, i[2 * a + 5] / 10), v = c.set(Ln, i[2 * a + 6] / 10, i[2 * a + 7] / 10);
+        0 === u.flipY && 1 === S && (c.multiply(r, r, Vn), c.multiply(s, s, Vn), c.multiply(d, d, Vn), 
+        c.multiply(v, v, Vn));
         let b = A ? -A[a] / 9362 : -(p.textRotation || 0) * Math.PI / 180;
         const x = m ? 0 : h.getBearing() * Math.PI / 180;
         if (b || x) {
-            const t = wn(zn, b, x, T, S);
+            const t = kn(jn, b, x, T, S);
             r = c.transformMat2(r, r, t), s = c.transformMat2(s, s, t), d = c.transformMat2(d, d, t), 
             v = c.transformMat2(v, v, t);
         }
         const w = o / 24;
-        c.scale(r, r, w), c.scale(s, s, w), c.scale(d, d, w), c.scale(v, v, w), 1 === S ? bn(t, e, r, s, d, v, l, M, u, h, y, g) : xn(t, n, r, s, d, v, M, g);
+        c.scale(r, r, w), c.scale(s, s, w), c.scale(d, d, w), c.scale(v, v, w), 1 === S ? wn(t, e, r, s, d, v, l, M, u, h, y, g) : An(t, n, r, s, d, v, M, g);
     }
     return s = s || 0, t[0] -= s + 1, t[1] -= s + 1, t[2] += s + 1, t[3] += s + 1, t;
 }
 
-function Vn(t, e, n) {
+function qn(t, e, n) {
     const r = e.geometry.desc.positionSize, {aAnchor: o, aAltitude: s} = e.geometry.properties, a = n * r;
     return s ? i.set(t, o[a], o[a + 1], s[n]) : 3 === r ? P.unpackPosition(t, o[a], o[a + 1], o[a + 2]) : i.set(t, o[a], o[a + 1], 0);
 }
 
-const Un = {
+const Gn = {
     textFill: [ 0, 0, 0, 1 ],
     textOpacity: 1,
     textPitchAlignment: 0,
@@ -5360,61 +5375,61 @@ const Un = {
     textRotation: 0
 };
 
-function qn(t, e, i, r, o, s, a, l, c) {
+function Wn(t, e, i, r, o, s, a, l, c) {
     const h = [];
     if (e.isDisposed() || 0 === e.data.aPosition.length) return h;
     const u = e.properties.glyphAtlas;
     if (!u) return h;
     if (0 === r.textSize || 0 === r.textOpacity) return h;
-    if (we(e, r, s), !e.properties.aAnchor) {
-        Gn.call(this, e, a || c, l);
+    if (ke(e, r, s), !e.properties.aAnchor) {
+        Bn.call(this, e, a || c, l);
         const {aTextSize: t, aTextDx: n, aTextDy: i, aPitchAlign: r, aRotationAlign: o, aRotation: s, aOverlap: h, aAltitude: u} = e.data;
         if (t) {
-            const n = (be + "aTextSize").trim();
+            const n = (we + "aTextSize").trim();
             e.properties.aTextSize = e.properties[n] || new t.constructor(t);
         }
         if (n) {
-            const t = (be + "aTextDx").trim();
+            const t = (we + "aTextDx").trim();
             e.properties.aTextDx = e.properties[t] || new n.constructor(n);
         }
         if (i) {
-            const t = (be + "aTextDy").trim();
+            const t = (we + "aTextDy").trim();
             e.properties.aTextDy = e.properties[t] || new i.constructor(i);
         }
         if (r) {
-            const t = (be + "aPitchAlign").trim();
+            const t = (we + "aPitchAlign").trim();
             e.properties.aPitchAlign = e.properties[t] || new r.constructor(r);
         }
         if (o) {
-            const t = (be + "aRotationAlign").trim();
+            const t = (we + "aRotationAlign").trim();
             e.properties.aRotationAlign = e.properties[t] || new o.constructor(o);
         }
         if (s) {
-            const t = (be + "aRotation").trim();
+            const t = (we + "aRotation").trim();
             e.properties.aRotation = e.properties[t] || new s.constructor(s);
         }
         if (h) {
-            const t = (be + "aOverlap").trim();
+            const t = (we + "aOverlap").trim();
             e.properties.aOverlap = e.properties[t] || new h.constructor(h);
         }
         if (u) {
-            const t = (be + "aAltitude").trim();
+            const t = (we + "aAltitude").trim();
             e.properties.aAltitude = e.properties[t] || new u.constructor(u);
         }
     }
-    const d = Ge(t, u, !1), f = {
+    const d = Be(t, u, !1), f = {
         flipY: 0,
         tileResolution: e.properties.tileResolution,
         tileRatio: e.properties.tileRatio,
         texture: d,
         texSize: [ u.width, u.height ]
     };
-    Wn(e, f, o);
+    Xn(e, f, o);
     let p = !1;
     o.textOpacity < 1 && (p = !0), e.properties.memorySize = e.getMemorySize(), e.generateBuffers(t, {
         excludeElementsInVAO: !0
     });
-    const m = new n.Material(f, Un), y = new n.Mesh(e, m, {
+    const m = new n.Material(f, Gn), y = new n.Mesh(e, m, {
         disableVAO: !0,
         transparent: p,
         castShadow: !1,
@@ -5431,8 +5446,8 @@ function qn(t, e, i, r, o, s, a, l, c) {
             texSize: [ u.width, u.height ],
             isHalo: 0
         };
-        Wn(e, t, o);
-        const r = new n.Material(t, Un), s = new n.Mesh(e, r, {
+        Xn(e, t, o);
+        const r = new n.Material(t, Gn), s = new n.Mesh(e, r, {
             disableVAO: !0,
             transparent: p,
             castShadow: !1,
@@ -5460,8 +5475,8 @@ function qn(t, e, i, r, o, s, a, l, c) {
     }), h;
 }
 
-function Gn(t, e, n) {
-    const i = this.getSymbol(t.properties.symbolIndex), r = "line" === i.textPlacement && !ye(i), {aPosition: o, aShape: s} = t.data, a = o.length / t.desc.positionSize;
+function Bn(t, e, n) {
+    const i = this.getSymbol(t.properties.symbolIndex), r = "line" === i.textPlacement && !ve(i), {aPosition: o, aShape: s} = t.data, a = o.length / t.desc.positionSize;
     if (t.properties.aPickingId = t.data.aPickingId, t.properties.aCount = t.data.aCount, 
     delete t.data.aCount, (e || r) && (t.properties.aAnchor = o, t.properties.aShape = s), 
     t.properties.visElemts || (t.properties.elements = t.elements, t.properties.visElemts = new t.elements.constructor(t.elements.length)), 
@@ -5484,24 +5499,24 @@ function Gn(t, e, n) {
         t.data.aOpacity.data.fill(255, 0));
         const {aTextHaloRadius: e} = t.data;
         if (e && !t.properties.aTextHaloRadius) {
-            const n = (be + "aTextHaloRadius").trim();
+            const n = (we + "aTextHaloRadius").trim();
             t.properties.aTextHaloRadius = t.properties[n] || new e.constructor(e);
         }
     }
 }
 
-function Wn(t, e, n) {
-    void 0 === e.isHalo && (e.isHalo = 1), ce(e, "textOpacity", n, "textOpacity", Un.textOpacity), 
-    ce(e, "textFill", n, "textFill", Un.textFill, de()), ce(e, "textHaloFill", n, "textHaloFill", Un.textHaloFill, de()), 
-    ce(e, "textHaloBlur", n, "textHaloBlur", Un.textHaloBlur), ce(e, "textHaloRadius", n, "textHaloRadius", Un.textHaloRadius), 
-    ce(e, "textHaloOpacity", n, "textHaloOpacity", Un.textHaloOpacity), ce(e, "textPerspectiveRatio", n, "textPerspectiveRatio", Un.textPerspectiveRatio, t => "line" === n.textPlacement ? 1 : t), 
-    ce(e, "rotateWithMap", n, "textRotationAlignment", Un.textRotationAlignment, t => +("map" === t)), 
-    ce(e, "pitchWithMap", n, "textPitchAlignment", Un.textPitchAlignment, t => +("map" === t)), 
-    ce(e, "textSize", n, "textSize", Un.textSize), ce(e, "textDx", n, "textDx", Un.textDx), 
-    ce(e, "textDy", n, "textDy", Un.textDy), ce(e, "textRotation", n, "textRotation", Un.textRotation, t => t * Math.PI / 180);
+function Xn(t, e, n) {
+    void 0 === e.isHalo && (e.isHalo = 1), ue(e, "textOpacity", n, "textOpacity", Gn.textOpacity), 
+    ue(e, "textFill", n, "textFill", Gn.textFill, pe()), ue(e, "textHaloFill", n, "textHaloFill", Gn.textHaloFill, pe()), 
+    ue(e, "textHaloBlur", n, "textHaloBlur", Gn.textHaloBlur), ue(e, "textHaloRadius", n, "textHaloRadius", Gn.textHaloRadius), 
+    ue(e, "textHaloOpacity", n, "textHaloOpacity", Gn.textHaloOpacity), ue(e, "textPerspectiveRatio", n, "textPerspectiveRatio", Gn.textPerspectiveRatio, t => "line" === n.textPlacement ? 1 : t), 
+    ue(e, "rotateWithMap", n, "textRotationAlignment", Gn.textRotationAlignment, t => +("map" === t)), 
+    ue(e, "pitchWithMap", n, "textPitchAlignment", Gn.textPitchAlignment, t => +("map" === t)), 
+    ue(e, "textSize", n, "textSize", Gn.textSize), ue(e, "textDx", n, "textDx", Gn.textDx), 
+    ue(e, "textDy", n, "textDy", Gn.textDy), ue(e, "textRotation", n, "textRotation", Gn.textRotation, t => t * Math.PI / 180);
 }
 
-function Bn(t, e) {
+function $n(t, e) {
     const n = t.getRenderer().canvas;
     return {
         uniforms: [ {
@@ -5560,7 +5575,7 @@ function Bn(t, e) {
     };
 }
 
-function Xn(t, e) {
+function Jn(t, e) {
     const n = m(e.textFill), i = m(e.textSize), r = m(e.textHaloFill), o = m(e.textHaloRadius), s = m(e.textHaloOpacity), a = m(e.textDx), l = m(e.textDy), c = m(e.textOpacity), h = y(e.textPitchAlignment), u = y(e.textRotationAlignment), d = m(e.textRotation), f = y(e.textAllowOverlapFn), g = y(e.textIgnorePlacement), v = {}, b = new Int16Array(1), x = new Uint16Array(1);
     return [ {
         attrName: "aTextFill",
@@ -5571,7 +5586,7 @@ function Xn(t, e) {
         evaluate: (e, i) => {
             let r = n(t.getZoom(), e);
             return p(r) && (r = this.evaluateInFnTypeConfig(r, i, t, e, !0)), Array.isArray(r) || (r = v[r] = v[r] || C(r).unitArray()), 
-            r = ue(r), r;
+            r = fe(r), r;
         }
     }, {
         attrName: "aTextSize",
@@ -5580,7 +5595,7 @@ function Xn(t, e) {
         type: Uint8Array,
         width: 1,
         evaluate: (e, n) => {
-            let r = i(t.getZoom(), e) || Un.textSize;
+            let r = i(t.getZoom(), e) || Gn.textSize;
             return p(r) && (r = this.evaluateInFnTypeConfig(r, n, t, e)), b[0] = r, b[0];
         }
     }, {
@@ -5591,7 +5606,7 @@ function Xn(t, e) {
         width: 4,
         evaluate: e => {
             let n = r(t.getZoom(), e);
-            return Array.isArray(n) || (n = v[n] = v[n] || C(n).array()), n = ue(n), n;
+            return Array.isArray(n) || (n = v[n] = v[n] || C(n).array()), n = fe(n), n;
         }
     }, {
         attrName: "aTextHaloRadius",
@@ -5664,7 +5679,7 @@ function Xn(t, e) {
         width: 1,
         define: "HAS_ROTATION",
         evaluate: e => {
-            const n = se(d(t.getZoom(), e), 0, 360) * Math.PI / 180;
+            const n = le(d(t.getZoom(), e), 0, 360) * Math.PI / 180;
             return x[0] = 9362 * n, x[0];
         }
     }, {
@@ -5688,21 +5703,21 @@ function Xn(t, e) {
     } ];
 }
 
-const $n = [], Jn = [], Yn = [], Zn = [];
+const Yn = [], Zn = [], Kn = [], Qn = [];
 
-function Kn(t, e, n, i, r, o, s) {
+function ti(t, e, n, i, r, o, s) {
     t = 1 === t ? 1 : 0;
-    const a = this.getMap(), l = e.geometry.properties, c = this.getSymbol(l.symbolIndex), h = "line" === c.textPlacement && !ye(c), {aTextSize: u, aTextHaloRadius: d, aShape: f} = l;
+    const a = this.getMap(), l = e.geometry.properties, c = this.getSymbol(l.symbolIndex), h = "line" === c.textPlacement && !ve(c), {aTextSize: u, aTextHaloRadius: d, aShape: f} = l;
     let p = u ? u[n[r]] : e.properties.textSize;
-    null == p && (p = Un.textSize);
-    const m = d ? d[n[r]] : e.properties.textHaloRadius, y = Vn(Yn, e, n[r]), g = dn(Zn, y, s, a.width, a.height), v = i, {boxes: b, collision: x} = this.ir(e, r);
+    null == p && (p = Gn.textSize);
+    const m = d ? d[n[r]] : e.properties.textHaloRadius, y = qn(Kn, e, n[r]), g = pn(Qn, y, s, a.width, a.height), v = i, {boxes: b, collision: x} = this.ir(e, r);
     let w = 0;
     if (h || 1 === e.material.uniforms.rotateWithMap || c.textRotation) {
         let i = 0;
         for (let o = r; o < r + 6 * v; o += 6) {
             const r = b[w] = b[w] || [];
             w++;
-            const l = Hn.call(this, r, y, g, e, p, m, n[o], s, a);
+            const l = Un.call(this, r, y, g, e, p, m, n[o], s, a);
             if (!t) {
                 const e = this.isCollides(l);
                 1 === e ? t = 1 : -1 === e && i++;
@@ -5714,7 +5729,7 @@ function Kn(t, e, n, i, r, o, s) {
         for (let c = r; c < o; c += 6) {
             const r = f[2 * n[c] + 1];
             if (l !== r || c === o - 6) {
-                const h = n[c === o - 6 ? c : c - 6], u = Hn.call(this, $n, y, g, e, p, m, i, s, a), d = Hn.call(this, Jn, y, g, e, p, m, h, s, a), f = b[w] = b[w] || [];
+                const h = n[c === o - 6 ? c : c - 6], u = Un.call(this, Yn, y, g, e, p, m, i, s, a), d = Un.call(this, Zn, y, g, e, p, m, h, s, a), f = b[w] = b[w] || [];
                 w++, f[0] = Math.min(u[0], d[0]), f[1] = Math.min(u[1], d[1]), f[2] = Math.max(u[2], d[2]), 
                 f[3] = Math.max(u[3], d[3]), i = n[c], l = r, !t && this.isCollides(f) && (t = 1);
             }
@@ -5723,67 +5738,67 @@ function Kn(t, e, n, i, r, o, s) {
     return x.collides = t, x;
 }
 
-function Qn(t, e) {
+function ei(t, e) {
     const n = function(t, e) {
         const {aPickingId: n, features: i} = t.geometry.properties, r = n[e];
         return (i && i[r] && i[r].feature).label;
     }(t, e);
     return n ? function(t, e, n) {
         if (!n) return null;
-        const i = t.localTransform, r = Vn(ti, t, e);
-        a.set(ei, r[0], r[1], r[2], 1);
-        const o = a.transformMat4(ei, ei, i);
+        const i = t.localTransform, r = qn(ni, t, e);
+        a.set(ii, r[0], r[1], r[2], 1);
+        const o = a.transformMat4(ii, ii, i);
         let s = 0;
         for (let t = 0; t < n.length; t++) s += n.charCodeAt(t);
         return [ Math.floor(o[0]), Math.floor(o[1]), Math.floor(o[2]), s ];
     }(t, e, n) : null;
 }
 
-const ti = [], ei = [];
+const ni = [], ii = [];
 
-var ni = "#define SHADER_NAME TEXT\n#define RAD 0.0174532925\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec2 aShape;\nattribute vec2 aTexCoord;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nattribute float aRotationAlign;\n#else\nuniform float rotateWithMap;\n#endif\nuniform float flipY;\n#if defined(HAS_ROTATION)\nattribute float aRotation;\n#else\nuniform float textRotation;\n#endif\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform vec2 texSize;\nuniform vec2 canvasSize;\nuniform float glyphSize;\nuniform float mapPitch;\nuniform float mapRotation;\nuniform float zoomScale;\nuniform float tileRatio;\nuniform float layerScale;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vSize;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nattribute vec4 aTextFill;\nvarying vec4 vTextFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nattribute vec4 aTextHaloFill;\nvarying vec4 vTextHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nattribute float aTextHaloRadius;\nvarying float vTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nattribute float aTextHaloOpacity;\nvarying float vTextHaloOpacity;\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_TEXT_SIZE\nfloat d = aTextSize * layerScale;\n#else\nfloat d = textSize * layerScale;\n#endif\n#ifdef HAS_TEXT_DX\nfloat e = aTextDx;\n#else\nfloat e = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat f = aTextDy;\n#else\nfloat f = textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nfloat h = aPitchAlign;\n#else\nfloat h = pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nfloat i = aRotationAlign;\n#else\nfloat i = rotateWithMap;\n#endif\nvec2 j = aShape / 10.0;\n  if(h == 1. && flipY == .0) {\n    j = j * vec2(1., -1.);\n  }\n  vec2 k = aTexCoord;\n  gl_Position = projViewModelMatrix * vec4(c, 1.);\n  float l = gl_Position.w;\n  float m = (1. - cameraToCenterDistance / l) * textPerspectiveRatio;\n  float n = clamp(.5 + .5 * (1. - m), .0, 4.);\n#ifdef HAS_ROTATION\nfloat o = aRotation / 9362. - mapRotation * i;\n#else\nfloat o = textRotation - mapRotation * i;\n#endif\nif(h == 1.) {\n    \n#ifdef REVERSE_MAP_ROTATION_ON_PITCH\no += mapRotation;\n#else\no -= mapRotation;\n#endif\n  }\n  float u = sin(o);\n  float v = cos(o);\n  mat2 A = mat2(v, -1. * u, u, v);\n  j = A * (j / glyphSize * d);\n  float B = l / cameraToCenterDistance;\n  if(h == .0) {\n    vec2 C = j * 2. / canvasSize;\n    gl_Position.xy += C * n * l;\n  } else {\n    vec2 C = j;\n    gl_Position = projViewModelMatrix * vec4(c + vec3(C, .0) * tileRatio / zoomScale * B * n, 1.);\n  }\n  gl_Position.xy += vec2(e, -f) * 2. / canvasSize * l;\n#ifndef PICKING_MODE\nif(h == .0) {\n    vGammaScale = mix(1., B, textPerspectiveRatio);\n  } else {\n    vGammaScale = B + mapPitch / 4.;\n  }\n  vTexCoord = k / texSize;\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vSize = d;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\n#endif\n#ifdef HAS_TEXT_FILL\nvTextFill = aTextFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvTextHaloFill = aTextHaloFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvTextHaloRadius = aTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nvTextHaloOpacity = aTextHaloOpacity;\n#endif\n#else\n#ifdef ENABLE_COLLISION\nbool D = aOpacity == 255.;\n#else\nbool D = true;\n#endif\nfbo_picking_setData(gl_Position.w, D);\n#endif\n}", ii = "#define SHADER_NAME TEXT\n#define SDF_PX 8.0\n#define DEVICE_PIXEL_RATIO 1.0\n#define EDGE_GAMMA 0.105 / DEVICE_PIXEL_RATIO\nprecision mediump float;\nuniform sampler2D texture;\nuniform float textOpacity;\nuniform highp float gammaScale;\nuniform int isHalo;\nuniform highp float textHaloBlur;\n#ifdef HAS_TEXT_HALO_OPACITY\nvarying float vTextHaloOpacity;\n#else\nuniform float textHaloOpacity;\n#endif\nvarying vec2 vTexCoord;\nvarying float vSize;\nvarying float vGammaScale;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nvarying vec4 vTextFill;\n#else\nuniform vec4 textFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvarying vec4 vTextHaloFill;\n#else\nuniform vec4 textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvarying float vTextHaloRadius;\n#else\nuniform highp float textHaloRadius;\n#endif\nvoid main() {\n  \n#ifdef HAS_TEXT_FILL\nvec4 c = vTextFill;\n#else\nvec4 c = textFill;\n#endif\nfloat d = vSize / 24.;\n  lowp vec4 e = c;\n  highp float f = EDGE_GAMMA / (d * gammaScale);\n  lowp float h = 185. / 256.;\n  if(isHalo == 1) {\n    \n#ifdef HAS_TEXT_HALO_FILL\nvec4 i = vTextHaloFill;\n#else\nvec4 i = textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nfloat j = vTextHaloRadius;\n#else\nfloat j = textHaloRadius;\n#endif\ne = i;\n    f = (textHaloBlur * 1.19 / SDF_PX + EDGE_GAMMA) / (d * gammaScale);\n    h = (6. - j / d) / SDF_PX;\n#ifdef HAS_TEXT_HALO_OPACITY\nfloat k = vTextHaloOpacity / 255.;\n#else\nfloat k = textHaloOpacity;\n#endif\ne *= k * 1.25;\n  }\n  float l = texture2D(texture, vTexCoord).a;\n  highp float m = f * vGammaScale * .7;\n  float n = clamp(smoothstep(h - m, h + m, l), .0, 1.);\n  gl_FragColor = e * (n * textOpacity * vOpacity);\n}";
+var ri = "#define SHADER_NAME TEXT\n#define RAD 0.0174532925\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec2 aShape;\nattribute vec2 aTexCoord;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nattribute float aRotationAlign;\n#else\nuniform float rotateWithMap;\n#endif\nuniform float flipY;\n#if defined(HAS_ROTATION)\nattribute float aRotation;\n#else\nuniform float textRotation;\n#endif\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform vec2 texSize;\nuniform vec2 canvasSize;\nuniform float glyphSize;\nuniform float mapPitch;\nuniform float mapRotation;\nuniform float zoomScale;\nuniform float tileRatio;\nuniform float layerScale;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vSize;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nattribute vec4 aTextFill;\nvarying vec4 vTextFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nattribute vec4 aTextHaloFill;\nvarying vec4 vTextHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nattribute float aTextHaloRadius;\nvarying float vTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nattribute float aTextHaloOpacity;\nvarying float vTextHaloOpacity;\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_TEXT_SIZE\nfloat d = aTextSize * layerScale;\n#else\nfloat d = textSize * layerScale;\n#endif\n#ifdef HAS_TEXT_DX\nfloat e = aTextDx;\n#else\nfloat e = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat f = aTextDy;\n#else\nfloat f = textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nfloat h = aPitchAlign;\n#else\nfloat h = pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nfloat i = aRotationAlign;\n#else\nfloat i = rotateWithMap;\n#endif\nvec2 j = aShape / 10.0;\n  if(h == 1. && flipY == .0) {\n    j = j * vec2(1., -1.);\n  }\n  vec2 k = aTexCoord;\n  gl_Position = projViewModelMatrix * vec4(c, 1.);\n  float l = gl_Position.w;\n  float m = (1. - cameraToCenterDistance / l) * textPerspectiveRatio;\n  float n = clamp(.5 + .5 * (1. - m), .0, 4.);\n#ifdef HAS_ROTATION\nfloat o = aRotation / 9362. - mapRotation * i;\n#else\nfloat o = textRotation - mapRotation * i;\n#endif\nif(h == 1.) {\n    \n#ifdef REVERSE_MAP_ROTATION_ON_PITCH\no += mapRotation;\n#else\no -= mapRotation;\n#endif\n  }\n  float u = sin(o);\n  float v = cos(o);\n  mat2 A = mat2(v, -1. * u, u, v);\n  j = A * (j / glyphSize * d);\n  float B = l / cameraToCenterDistance;\n  if(h == .0) {\n    vec2 C = j * 2. / canvasSize;\n    gl_Position.xy += C * n * l;\n  } else {\n    vec2 C = j;\n    gl_Position = projViewModelMatrix * vec4(c + vec3(C, .0) * tileRatio / zoomScale * B * n, 1.);\n  }\n  gl_Position.xy += vec2(e, -f) * 2. / canvasSize * l;\n#ifndef PICKING_MODE\nif(h == .0) {\n    vGammaScale = mix(1., B, textPerspectiveRatio);\n  } else {\n    vGammaScale = B + mapPitch / 4.;\n  }\n  vTexCoord = k / texSize;\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vSize = d;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\n#endif\n#ifdef HAS_TEXT_FILL\nvTextFill = aTextFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvTextHaloFill = aTextHaloFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvTextHaloRadius = aTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nvTextHaloOpacity = aTextHaloOpacity;\n#endif\n#else\n#ifdef ENABLE_COLLISION\nbool D = aOpacity == 255.;\n#else\nbool D = true;\n#endif\nfbo_picking_setData(gl_Position.w, D);\n#endif\n}", oi = "#define SHADER_NAME TEXT\n#define SDF_PX 8.0\n#define DEVICE_PIXEL_RATIO 1.0\n#define EDGE_GAMMA 0.105 / DEVICE_PIXEL_RATIO\nprecision mediump float;\nuniform sampler2D texture;\nuniform float textOpacity;\nuniform highp float gammaScale;\nuniform int isHalo;\nuniform highp float textHaloBlur;\n#ifdef HAS_TEXT_HALO_OPACITY\nvarying float vTextHaloOpacity;\n#else\nuniform float textHaloOpacity;\n#endif\nvarying vec2 vTexCoord;\nvarying float vSize;\nvarying float vGammaScale;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nvarying vec4 vTextFill;\n#else\nuniform vec4 textFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvarying vec4 vTextHaloFill;\n#else\nuniform vec4 textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvarying float vTextHaloRadius;\n#else\nuniform highp float textHaloRadius;\n#endif\nvoid main() {\n  \n#ifdef HAS_TEXT_FILL\nvec4 c = vTextFill;\n#else\nvec4 c = textFill;\n#endif\nfloat d = vSize / 24.;\n  lowp vec4 e = c;\n  highp float f = EDGE_GAMMA / (d * gammaScale);\n  lowp float h = 185. / 256.;\n  if(isHalo == 1) {\n    \n#ifdef HAS_TEXT_HALO_FILL\nvec4 i = vTextHaloFill;\n#else\nvec4 i = textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nfloat j = vTextHaloRadius;\n#else\nfloat j = textHaloRadius;\n#endif\ne = i;\n    f = (textHaloBlur * 1.19 / SDF_PX + EDGE_GAMMA) / (d * gammaScale);\n    h = (6. - j / d) / SDF_PX;\n#ifdef HAS_TEXT_HALO_OPACITY\nfloat k = vTextHaloOpacity / 255.;\n#else\nfloat k = textHaloOpacity;\n#endif\ne *= k * 1.25;\n  }\n  float l = texture2D(texture, vTexCoord).a;\n  highp float m = f * vGammaScale * .7;\n  float n = clamp(smoothstep(h - m, h + m, l), .0, 1.);\n  gl_FragColor = e * (n * textOpacity * vOpacity);\n}";
 
-const ri = new Uint16Array(1), oi = new Int8Array(1);
+const si = new Uint16Array(1), ai = new Int8Array(1);
 
-function si(t, e, n) {
-    we(t, e, n), function(t) {
+function li(t, e, n) {
+    ke(t, e, n), function(t) {
         const {aMarkerWidth: e, aMarkerHeight: n, aMarkerDx: i, aMarkerDy: r, aPitchAlign: o, aRotationAlign: s, aRotation: a, aOverlap: l} = t.data;
         if (e) {
-            const n = (be + "aMarkerWidth").trim();
+            const n = (we + "aMarkerWidth").trim();
             t.properties.aMarkerWidth = t.properties[n] || new e.constructor(e);
         }
         if (n) {
-            const e = (be + "aMarkerHeight").trim();
+            const e = (we + "aMarkerHeight").trim();
             t.properties.aMarkerHeight = t.properties[e] || new n.constructor(n);
         }
         if (i) {
-            const e = (be + "aMarkerDx").trim();
+            const e = (we + "aMarkerDx").trim();
             t.properties.aMarkerDx = t.properties[e] || new i.constructor(i);
         }
         if (r) {
-            const e = (be + "aMarkerDy").trim();
+            const e = (we + "aMarkerDy").trim();
             t.properties.aMarkerDy = t.properties[e] || new r.constructor(r);
         }
         if (o) {
-            const e = (be + "aPitchAlign").trim();
+            const e = (we + "aPitchAlign").trim();
             t.properties.aPitchAlign = t.properties[e] || new o.constructor(o);
         }
         if (s) {
-            const e = (be + "aRotationAlign").trim();
+            const e = (we + "aRotationAlign").trim();
             t.properties.aRotationAlign = t.properties[e] || new s.constructor(s);
         }
         if (a) {
-            const e = (be + "aRotation").trim();
+            const e = (we + "aRotation").trim();
             t.properties.aRotation = t.properties[e] || new a.constructor(a);
         }
         if (l) {
-            const e = (be + "aOverlap").trim();
+            const e = (we + "aOverlap").trim();
             t.properties.aOverlap = t.properties[e] || new l.constructor(l);
         }
     }(t);
 }
 
-function ai(t, e) {
+function ci(t, e) {
     const n = m(e.markerWidth), i = m(e.markerHeight), r = m(e.markerDx), o = m(e.markerDy), s = m(e.markerOpacity), a = m(e.markerTextFit), l = y(e.markerPitchAlignment), c = y(e.markerRotationAlignment), h = m(e.markerRotation), u = y(e.markerAllowOverlapFn), d = y(e.markerIgnorePlacement), f = new Int16Array(1), g = new Uint16Array(1);
     return [ {
         attrName: "aMarkerWidth",
@@ -5860,7 +5875,7 @@ function ai(t, e) {
         width: 1,
         define: "HAS_ROTATION",
         evaluate: e => {
-            const n = se(h(t.getZoom(), e), 0, 360) * Math.PI / 180;
+            const n = le(h(t.getZoom(), e), 0, 360) * Math.PI / 180;
             return g[0] = 9362 * n, g[0];
         }
     }, {
@@ -5884,7 +5899,7 @@ function ai(t, e) {
     } ];
 }
 
-function li(t, e, n, i) {
+function hi(t, e, n, i) {
     if (!n || !i || "none" === i) return;
     const r = function(t, e, n) {
         let i = t.properties.textFitFn;
@@ -5956,11 +5971,11 @@ function li(t, e, n, i) {
             if (!o) return [];
             return n;
         }(e, n);
-        i.length && (e.properties.labelShape = i, ci.call(this, t, e, n));
+        i.length && (e.properties.labelShape = i, ui.call(this, t, e, n));
     }
 }
 
-function ci(t, e) {
+function ui(t, e) {
     const n = this.getSymbolDef(e.properties.symbolIndex), i = n.markerTextFit, r = e.properties;
     let o = "both" === i || "width" === i, s = "both" === i || "height" === i;
     if (p(n.markerTextFit)) {
@@ -5986,7 +6001,7 @@ function ci(t, e) {
     if (o) if (a) {
         const t = e.data.aMarkerWidth;
         e.data.aMarkerWidth = new Uint16Array(t), r.aMarkerWidth = new Uint16Array(t);
-        const n = (be + "aMarkerWidth").trim();
+        const n = (we + "aMarkerWidth").trim();
         r[n] && (r[n] = r.aMarkerWidth);
     } else {
         const t = this.getSymbol(e.properties.symbolIndex).markerWidth || 0;
@@ -5996,7 +6011,7 @@ function ci(t, e) {
     if (s) if (l) {
         const t = e.data.aMarkerHeight;
         e.data.aMarkerHeight = new Uint16Array(t), r.aMarkerHeight = new Uint16Array(t);
-        const n = (be + "aMarkerHeight").trim();
+        const n = (we + "aMarkerHeight").trim();
         r[n] && (r[n] = r.aMarkerHeight);
     } else {
         const t = this.getSymbol(e.properties.symbolIndex).markerHeight || 0;
@@ -6004,10 +6019,10 @@ function ci(t, e) {
         e.data.aMarkerHeight = new Uint16Array(h);
     }
     const u = this.getSymbolDef(e.properties.textGeo.properties.symbolIndex), d = m(u.textSize);
-    hi.call(this, t, e), (!p(u.textSize) || d.isZoomConstant && d.isFeatureConstant) && (r.isFitConstant = !0);
+    di.call(this, t, e), (!p(u.textSize) || d.isZoomConstant && d.isFeatureConstant) && (r.isFitConstant = !0);
 }
 
-function hi(t, e) {
+function di(t, e) {
     const n = e.properties.textGeo;
     if (!n) return;
     const i = n.properties, r = e.properties;
@@ -6036,16 +6051,16 @@ function hi(t, e) {
         M = r.aPadOffsetY = new Int8Array(g.length))), delete _.$layer, delete _.$type, 
         g && n) {
             const e = Math.abs((d - o) / 10 * S) + (P[1] + P[3] || 0);
-            if (ri[0] = e, g[t] !== ri[0] && (pe(g, ri[0], t, t + 4), g.dirty = !0), T) {
+            if (si[0] = e, g[t] !== si[0] && (ye(g, si[0], t, t + 4), g.dirty = !0), T) {
                 const e = (P[1] + P[3]) / 2 - P[3];
-                oi[0] = e, T[t] !== oi[0] && (pe(T, e, t, t + 4), T.dirty = !0);
+                ai[0] = e, T[t] !== ai[0] && (ye(T, e, t, t + 4), T.dirty = !0);
             }
         }
         if (v && i) {
             const e = Math.abs((f - u) / 10 * S) + (P[0] + P[2] || 0);
-            if (ri[0] = e, v[t] !== ri[0] && (pe(v, ri[0], t, t + 4), v.dirty = !0), M) {
+            if (si[0] = e, v[t] !== si[0] && (ye(v, si[0], t, t + 4), v.dirty = !0), M) {
                 const e = P[0] - (P[0] + P[2]) / 2;
-                oi[0] = e, M[t] !== oi[0] && (pe(M, e, t, t + 4), M.dirty = !0);
+                ai[0] = e, M[t] !== ai[0] && (ye(M, e, t, t + 4), M.dirty = !0);
             }
         }
     };
@@ -6071,35 +6086,35 @@ function hi(t, e) {
     _ && (e.data.aPadOffsetX = _, e.data.aPadOffsetY = S);
 }
 
-const ui = function(t) {
+const fi = function(t) {
     const e = this.layer.getRenderer();
     return !this.sr(t) && e.isForeground(t) && !!t.geometry.properties.iconAtlas && !t.geometry.properties.isEmpty;
-}, di = function(t) {
+}, pi = function(t) {
     const e = this.layer.getRenderer();
     return !(this.sr(t) || e.isForeground(t) || !t.geometry.properties.iconAtlas || t.geometry.properties.isEmpty);
-}, fi = function(t) {
+}, mi = function(t) {
     const e = this.layer.getRenderer();
     return !this.sr(t) && e.isForeground(t) && !!t.geometry.properties.glyphAtlas;
-}, pi = function(t) {
+}, yi = function(t) {
     const e = this.layer.getRenderer();
     return !this.sr(t) && !e.isForeground(t) && !!t.geometry.properties.glyphAtlas;
-}, mi = [], yi = {
+}, gi = [], vi = {
     colliides: -1
 };
 
-class gi extends an {
+class bi extends cn {
     constructor(t, e, n, i, r) {
         super(t, e, n, i, r), this.propAllowOverlap = "markerAllowOverlap", this.propIgnorePlacement = "markerIgnorePlacement", 
-        this.Un = {}, this.isLabelCollides = Kn.bind(this), this.cr = ui.bind(this), this.hr = di.bind(this), 
-        this.ur = fi.bind(this), this.dr = pi.bind(this), this.pr = [];
+        this.Un = {}, this.isLabelCollides = ti.bind(this), this.cr = fi.bind(this), this.hr = pi.bind(this), 
+        this.ur = mi.bind(this), this.dr = yi.bind(this), this.pr = [];
     }
     setTextShaderDefines(t) {
         this.mr = t;
     }
     createFnTypeConfig(t, e) {
         return {
-            icon: ai.call(this, t, e),
-            text: Xn.call(this, t, e)
+            icon: ci.call(this, t, e),
+            text: Jn.call(this, t, e)
         };
     }
     startFrame(...t) {
@@ -6114,13 +6129,13 @@ class gi extends an {
     postCreateGeometry(t, e) {
         const {geometry: n, symbolIndex: i} = t, r = this.getSymbolDef(i), o = this.getFnTypeConfig(i);
         if (this.yr(n)) n.properties.iconAtlas ? this.drawDebugAtlas(n.properties.iconAtlas) : n.properties.isEmpty = !0, 
-        si(n, r, o.icon); else if (this.gr(n) && ye(r)) {
+        li(n, r, o.icon); else if (this.gr(n) && ve(r)) {
             const t = e[e.length - 1];
             if (t) {
                 const {geometry: e, symbolIndex: o} = t;
                 if (e && o.index === i.index) {
                     const t = this.getMap(), i = r.markerTextFit;
-                    e.properties.textGeo = n, li.call(this, t, e, n, i);
+                    e.properties.textGeo = n, hi.call(this, t, e, n, i);
                 }
             }
         }
@@ -6159,11 +6174,11 @@ class gi extends an {
                     e.properties.aAnchor = t, e.properties.aShape = n;
                 }
                 e.properties.visElemts || (e.properties.elements = e.elements, e.properties.visElemts = new e.elements.constructor(e.elements.length)), 
-                ce(u, "markerOpacity", o, "markerOpacity", 1), ce(u, "markerPerspectiveRatio", o, "markerPerspectiveRatio", o.markerTextFit ? 0 : 1), 
-                ce(u, "markerWidth", o, "markerWidth", 15), ce(u, "markerHeight", o, "markerHeight", 15), 
-                ce(u, "markerDx", o, "markerDx", 0), ce(u, "markerDy", o, "markerDy", 0), ce(u, "markerRotation", o, "markerRotation", 0, t => t * Math.PI / 180), 
-                ce(u, "pitchWithMap", o, "markerPitchAlignment", 0, t => "map" === t ? 1 : 0), ce(u, "rotateWithMap", o, "markerRotationAlignment", 0, t => "map" === t ? 1 : 0), 
-                u.iconTex = h ? Ge(t, h, !1) : null, u.texSize = h ? [ h.width, h.height ] : [ 0, 0 ], 
+                ue(u, "markerOpacity", o, "markerOpacity", 1), ue(u, "markerPerspectiveRatio", o, "markerPerspectiveRatio", o.markerTextFit ? 0 : 1), 
+                ue(u, "markerWidth", o, "markerWidth", 15), ue(u, "markerHeight", o, "markerHeight", 15), 
+                ue(u, "markerDx", o, "markerDx", 0), ue(u, "markerDy", o, "markerDy", 0), ue(u, "markerRotation", o, "markerRotation", 0, t => t * Math.PI / 180), 
+                ue(u, "pitchWithMap", o, "markerPitchAlignment", 0, t => "map" === t ? 1 : 0), ue(u, "rotateWithMap", o, "markerRotationAlignment", 0, t => "map" === t ? 1 : 0), 
+                u.iconTex = h ? Be(t, h, !1) : null, u.texSize = h ? [ h.width, h.height ] : [ 0, 0 ], 
                 e.generateBuffers(t, {
                     excludeElementsInVAO: !0
                 });
@@ -6183,7 +6198,7 @@ class gi extends an {
             }(this.regl, a, e, 0, h, u.icon, s.options.collision, !o, this.isEnableUniquePlacement());
             t && (delete t.geometry.properties.glyphAtlas, d.push(t));
         } else if (this.gr(a)) {
-            const t = qn.call(this, this.regl, a, e, c, h, u.text, s.options.collision, !o, this.isEnableUniquePlacement());
+            const t = Wn.call(this, this.regl, a, e, c, h, u.text, s.options.collision, !o, this.isEnableUniquePlacement());
             t.length && (t.forEach(t => {
                 delete t.geometry.properties.iconAtlas;
             }), d.push(...t));
@@ -6196,7 +6211,7 @@ class gi extends an {
         if (this.yr(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 = ve(i), e.markerCollideMap = {
+            t.properties.collideIds = i, t.properties.uniqueCollideIds = xe(i), e.markerCollideMap = {
                 old: n,
                 new: i
             };
@@ -6212,33 +6227,33 @@ class gi extends an {
                     const h = -1 === l ? ++o : e.markerCollideMap.new[l + 4 * s], u = t + 4 * c;
                     n.fill(h, t, u), t += 4 * c, s++, u < n.length && (c = i[u]);
                 }
-                t.properties.uniqueCollideIds = ve(n);
+                t.properties.uniqueCollideIds = xe(n);
             } else {
                 let e = 0, r = i[0];
                 for (let t = 0; t < n.length; ) {
                     const o = t + 4 * r;
                     n.fill(e++, t, o), t += 4 * r, o < n.length && (r = i[o]);
                 }
-                t.properties.uniqueCollideIds = ve(n);
+                t.properties.uniqueCollideIds = xe(n);
             }
         }
     }
     addMesh(t) {
         if (this.Ui() && t.length > 0) {
-            const e = new Qe(t);
+            const e = new en(t);
             e.properties.uniqueCollideIds = t[0].geometry.properties.uniqueCollideIds, e.properties.meshKey = t[0].properties.meshKey, 
             e.properties.level = t[0].properties.level, this.pr.push(e);
         }
         for (let e = 0; e < t.length; e++) {
             if (!this.isMeshIterable(t[e])) continue;
             const n = t[e].geometry, {symbolIndex: i} = n.properties;
-            ye(this.getSymbolDef(i)) && hi.call(this, this.getMap(), n);
+            ve(this.getSymbolDef(i)) && di.call(this, this.getMap(), n);
         }
         const e = this.getMap().getZoom();
         for (let n = 0; n < t.length; n++) {
             if (!this.isMeshIterable(t[n])) continue;
             const i = t[n].geometry, {symbolIndex: r} = i.properties, o = this.getSymbolDef(r), s = this.getFnTypeConfig(r);
-            Se(this.regl, o, 0 === r.type ? s.icon : s.text, t[n], e);
+            Me(this.regl, o, 0 === r.type ? s.icon : s.text, t[n], e);
             const {aMarkerWidth: a, aMarkerHeight: l, aPadOffsetX: c, aPadOffsetY: h} = i.properties;
             a && a.dirty && (i.updateData("aMarkerWidth", a), a.dirty = !1), l && l.dirty && (i.updateData("aMarkerHeight", l), 
             l.dirty = !1), c && c.dirty && (i.updateData("aPadOffsetX", c), c.dirty = !1), h && h.dirty && (i.updateData("aPadOffsetY", h), 
@@ -6276,7 +6291,7 @@ class gi extends an {
     }
     Ar(t) {
         const e = this.layer.getRenderer();
-        t = t.sort(vi);
+        t = t.sort(xi);
         for (let n = 0; n < t.length; n++) {
             const i = t[n];
             if (!i || !i.meshes.length) continue;
@@ -6309,7 +6324,7 @@ class gi extends an {
     Mr(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(mi, o.projViewMatrix, t.meshes[0].localTransform);
+        const a = r.multiply(gi, o.projViewMatrix, t.meshes[0].localTransform);
         let l, c = !1;
         const h = t.meshes;
         let u = 0;
@@ -6369,14 +6384,14 @@ class gi extends an {
         }
     }
     isBoxCollides(t, e, n, i, r, o) {
-        if (this.gr(t.geometry)) return Kn.call(this, 0, t, e, n, i, r, o);
-        if (t.geometry.properties.isEmpty) return yi;
+        if (this.gr(t.geometry)) return ti.call(this, 0, t, e, n, i, r, o);
+        if (t.geometry.properties.isEmpty) return vi;
         const s = this.getMap(), {boxes: a, collision: l} = this.ir(t, i);
         let c = 0, h = 0, u = 0;
         for (let n = i; n < r; n += 6) {
             const i = a[u] = a[u] || [];
             u++;
-            const r = Fn.call(this, i, t, e[n], o, s);
+            const r = En.call(this, i, t, e[n], o, s);
             if (!c) {
                 const t = this.isCollides(r);
                 1 === t ? c = 1 : -1 === t && h++;
@@ -6385,12 +6400,12 @@ class gi extends an {
         return h === n && (c = -1), l.collides = c, l;
     }
     deleteMesh(t, e) {
-        t && (t instanceof Qe && (t = t.meshes), e && (Array.isArray(t) ? t.forEach(t => {
+        t && (t instanceof en && (t = t.meshes), e && (Array.isArray(t) ? t.forEach(t => {
             t && t.material && delete t.material.uniforms.iconTex;
         }) : t.material && delete t.material.uniforms.iconTex), super.deleteMesh(t, e));
     }
     isBloom(t) {
-        const e = t && t.material && !ae(t.material.get("markerOpacity")), n = this.getSymbol(t.properties.symbolIndex);
+        const e = t && t.material && !ce(t.material.get("markerOpacity")), n = this.getSymbol(t.properties.symbolIndex);
         return !!(e ? n.markerBloom : n.textBloom);
     }
     init() {
@@ -6412,7 +6427,7 @@ class gi extends an {
                 enable: !0,
                 range: () => this.sceneConfig.depthRange || [ 0, 1 ],
                 func: () => this.sceneConfig.depthFunc || "always",
-                mask: !!ae(this.sceneConfig.depthMask) || this.sceneConfig.depthMask
+                mask: !!ce(this.sceneConfig.depthMask) || this.sceneConfig.depthMask
             },
             polygonOffset: {
                 enable: !0,
@@ -6420,7 +6435,7 @@ class gi extends an {
             }
         };
         this.shader = new n.MeshShader({
-            vert: hn,
+            vert: dn,
             frag: "#define SHADER_NAME MARKER\nprecision mediump float;\n#include <gl2_frag>\nuniform sampler2D iconTex;\nuniform lowp float markerOpacity;\nuniform lowp float blendSrcIsOne;\nvarying vec2 vTexCoord;\nvarying float vOpacity;\nvoid main() {\n  vec4 c = texture2D(iconTex, vTexCoord) * markerOpacity * vOpacity;\n  if(blendSrcIsOne == 1.) {\n    c *= c.a;\n  }\n  if(c.a < .05) {\n    discard;\n  }\n  glFragColor = c;\n#if __VERSION__ == 100\ngl_FragColor = glFragColor;\n#endif\n}",
             uniforms: [ {
                 name: "projViewModelMatrix",
@@ -6437,16 +6452,16 @@ class gi extends an {
             } ],
             extraCommandProps: i
         }), this.shader.version = 300;
-        const {uniforms: o, extraCommandProps: s} = Bn.call(this, this.layer, this.sceneConfig), a = this.mr || {};
+        const {uniforms: o, extraCommandProps: s} = $n.call(this, this.layer, this.sceneConfig), a = this.mr || {};
         if (this.wr = new n.MeshShader({
-            vert: ni,
-            frag: ii,
+            vert: ri,
+            frag: oi,
             uniforms: o,
             extraCommandProps: s,
             defines: a
         }), this.pickingFBO) {
             const t = new n.FBORayPicking(this.renderer, {
-                vert: "#define PICKING_MODE 1\n" + hn,
+                vert: "#define PICKING_MODE 1\n" + dn,
                 uniforms: [ {
                     name: "projViewModelMatrix",
                     type: "function",
@@ -6464,7 +6479,7 @@ class gi extends an {
             }, this.pickingFBO);
             t.filter = t => !!t.geometry.properties.iconAtlas;
             const e = new n.FBORayPicking(this.renderer, {
-                vert: "#define PICKING_MODE 1\n" + ni,
+                vert: "#define PICKING_MODE 1\n" + ri,
                 uniforms: o,
                 extraCommandProps: s
             }, this.pickingFBO);
@@ -6490,7 +6505,7 @@ class gi extends an {
     getUniqueEntryKey(t, e) {
         if (!this.gr(t.geometry)) return null;
         const {elements: n} = t.geometry.properties;
-        return Qn(t, n[e]);
+        return ei(t, n[e]);
     }
     yr(t) {
         const {symbolIndex: e} = t.properties;
@@ -6502,19 +6517,19 @@ class gi extends an {
     }
 }
 
-function vi(t, e) {
+function xi(t, e) {
     return t.properties.level - e.properties.level || t.properties.meshKey - e.properties.meshKey;
 }
 
-var bi = xi;
+var wi = Ai;
 
-function xi(t, e) {
+function Ai(t, e) {
     this.x = t, this.y = e;
 }
 
-xi.prototype = {
+Ai.prototype = {
     clone: function() {
-        return new xi(this.x, this.y);
+        return new Ai(this.x, this.y);
     },
     add: function(t) {
         return this.clone().Ir(t);
@@ -6617,20 +6632,20 @@ xi.prototype = {
     Hr: function() {
         return this.x = Math.round(this.x), this.y = Math.round(this.y), this;
     }
-}, xi.convert = function(t) {
-    return t instanceof xi ? t : Array.isArray(t) ? new xi(t[0], t[1]) : t;
+}, Ai.convert = function(t) {
+    return t instanceof Ai ? t : Array.isArray(t) ? new Ai(t[0], t[1]) : t;
 };
 
-const wi = [], Ai = [], ki = [];
+const ki = [], _i = [], Si = [];
 
-function _i(t, e, n, r, o, s, a, l) {
-    const {aGlyphOffset: h, aSegment: u, aTextDx: d, aTextDy: f, symbolIndex: p} = e.geometry.properties, m = this.getSymbol(p), y = d ? d[o] : m.textDx, g = f ? f[o] : m.textDy, v = c.set(ki, y || 0, g || 0), b = c.set(wi, h[2 * o], h[2 * o + 1]), x = i.set(Ai, u[3 * o], u[3 * o + 1], u[3 * o + 2]);
+function Ti(t, e, n, r, o, s, a, l) {
+    const {aGlyphOffset: h, aSegment: u, aTextDx: d, aTextDy: f, symbolIndex: p} = e.geometry.properties, m = this.getSymbol(p), y = d ? d[o] : m.textDx, g = f ? f[o] : m.textDy, v = c.set(Si, y || 0, g || 0), b = c.set(ki, h[2 * o], h[2 * o + 1]), x = i.set(_i, u[3 * o], u[3 * o + 1], u[3 * o + 2]);
     return function(t, e, n, i, r, o, s, a, l, c, h, u) {
         const d = i[0] * c, f = h ? d - r : d + r;
         let p = f > 0 ? 1 : -1, m = 0;
         h && (p *= -1, m = Math.PI), p < 0 && (m += Math.PI);
         const y = a + l, g = Math.abs(f);
-        let v = p > 0 ? s : s + 1, b = bi.convert(n), x = bi.convert(n), w = 0, A = 0;
+        let v = p > 0 ? s : s + 1, b = wi.convert(n), x = wi.convert(n), w = 0, A = 0;
         for (;w + A <= g; ) {
             if (v += p, v < a || v >= y) return null;
             x.x = b.x, x.y = b.y, b.x = e[3 * v], b.y = e[3 * v + 1], w += A, A = x.dist(b) / u;
@@ -6642,42 +6657,42 @@ function _i(t, e, n, r, o, s, a, l) {
     }(t, r, s, b, v[0], v[1], x[0], x[1], x[2], n / 24, l, a);
 }
 
-const Si = [], Ti = [];
+const Mi = [], Pi = [];
 
-function Mi(t, e, n, r, o, s, a, l, h, u, d) {
+function Ii(t, e, n, r, o, s, a, l, h, u, d) {
     const {aVertical: f} = n.geometry.properties, p = f[s];
-    let m, y, g = _i.call(this, Si, n, r, o, s, l, h, !1);
+    let m, y, g = Ti.call(this, Mi, n, r, o, s, l, h, !1);
     if (!g) return null;
-    if (i.copy(t, g), g = _i.call(this, Ti, n, r, o, a, l, h, !1), !g) return null;
-    if (i.copy(e, g), d && (c.transformMat2(Si, Si, d), c.transformMat2(Ti, Ti, d)), 
+    if (i.copy(t, g), g = Ti.call(this, Pi, n, r, o, a, l, h, !1), !g) return null;
+    if (i.copy(e, g), d && (c.transformMat2(Mi, Mi, d), c.transformMat2(Pi, Pi, d)), 
     p) {
-        const t = Math.abs(Ti[1] - Si[1]), e = Math.abs(Ti[0] - Si[0]) * u;
-        y = Si[0] > Ti[0] ? 1 : 0, t > e ? (m = 1, y = Si[1] < Ti[1] ? 0 : 1) : m = 0;
-    } else m = 0, y = Si[0] > Ti[0] ? 1 : 0;
+        const t = Math.abs(Pi[1] - Mi[1]), e = Math.abs(Pi[0] - Mi[0]) * u;
+        y = Mi[0] > Pi[0] ? 1 : 0, t > e ? (m = 1, y = Mi[1] < Pi[1] ? 0 : 1) : m = 0;
+    } else m = 0, y = Mi[0] > Pi[0] ? 1 : 0;
     return 2 * y + m;
 }
 
-var Pi = "#define SHADER_NAME TEXT_LINE\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec2 aTexCoord;\n#ifdef HAS_OFFSET_Z\nattribute vec3 aOffset;\nuniform float altitudeScale;\n#else\nattribute vec2 aOffset;\n#endif\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float pitchWithMap;\n#endif\nuniform float zoomScale;\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform float mapPitch;\nuniform vec2 texSize;\nuniform vec2 canvasSize;\nuniform float tileRatio;\nuniform float layerScale;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vSize;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nattribute vec4 aTextFill;\nvarying vec4 vTextFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nattribute vec4 aTextHaloFill;\nvarying vec4 vTextHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nattribute float aTextHaloRadius;\nvarying float vTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nattribute float aTextHaloOpacity;\nvarying float vTextHaloOpacity;\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_TEXT_DX\nfloat d = aTextDx;\n#else\nfloat d = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat e = aTextDy;\n#else\nfloat e = textDy;\n#endif\n#ifdef HAS_TEXT_SIZE\nfloat f = aTextSize * layerScale;\n#else\nfloat f = textSize * layerScale;\n#endif\n#ifdef HAS_PITCH_ALIGN\nfloat h = aPitchAlign;\n#else\nfloat h = pitchWithMap;\n#endif\ngl_Position = projViewModelMatrix * vec4(c, 1.);\n  float i = gl_Position.w;\n  float j = i / cameraToCenterDistance;\n  float k = (1. - cameraToCenterDistance / i) * textPerspectiveRatio;\n  float l = clamp(.5 + .5 * (1. - k), .0, 4.);\n#ifdef HAS_OFFSET_Z\nvec3 m = aOffset / 10.0;\n  m[2] /= altitudeScale;\n#else\nvec3 m = vec3(aOffset / 10.0, .0);\n#endif\nvec2 n = aTexCoord;\n  if(h == 1.) {\n    m.xy *= tileRatio / zoomScale * j * l;\n    gl_Position = projViewModelMatrix * vec4(c + m, 1.);\n  } else {\n    gl_Position.xy += m.xy * 2. / canvasSize * l * i;\n  }\n  gl_Position.xy += vec2(d, -e) * 2. / canvasSize * i;\n#ifndef PICKING_MODE\nif(h == 1.) {\n    vGammaScale = j + mapPitch / 4.;\n  } else {\n    vGammaScale = mix(1., j, textPerspectiveRatio);\n  }\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vTexCoord = n / texSize;\n  vSize = f;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\n#endif\n#ifdef HAS_TEXT_FILL\nvTextFill = aTextFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvTextHaloFill = aTextHaloFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvTextHaloRadius = aTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nvTextHaloOpacity = aTextHaloOpacity;\n#endif\n#else\n#ifdef ENABLE_COLLISION\nbool o = aOpacity == 255.;\n#else\nbool o = true;\n#endif\nfbo_picking_setData(gl_Position.w, o);\n#endif\n}";
+var Oi = "#define SHADER_NAME TEXT_LINE\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec2 aTexCoord;\n#ifdef HAS_OFFSET_Z\nattribute vec3 aOffset;\nuniform float altitudeScale;\n#else\nattribute vec2 aOffset;\n#endif\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float pitchWithMap;\n#endif\nuniform float zoomScale;\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform float mapPitch;\nuniform vec2 texSize;\nuniform vec2 canvasSize;\nuniform float tileRatio;\nuniform float layerScale;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vSize;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nattribute vec4 aTextFill;\nvarying vec4 vTextFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nattribute vec4 aTextHaloFill;\nvarying vec4 vTextHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nattribute float aTextHaloRadius;\nvarying float vTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nattribute float aTextHaloOpacity;\nvarying float vTextHaloOpacity;\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_TEXT_DX\nfloat d = aTextDx;\n#else\nfloat d = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat e = aTextDy;\n#else\nfloat e = textDy;\n#endif\n#ifdef HAS_TEXT_SIZE\nfloat f = aTextSize * layerScale;\n#else\nfloat f = textSize * layerScale;\n#endif\n#ifdef HAS_PITCH_ALIGN\nfloat h = aPitchAlign;\n#else\nfloat h = pitchWithMap;\n#endif\ngl_Position = projViewModelMatrix * vec4(c, 1.);\n  float i = gl_Position.w;\n  float j = i / cameraToCenterDistance;\n  float k = (1. - cameraToCenterDistance / i) * textPerspectiveRatio;\n  float l = clamp(.5 + .5 * (1. - k), .0, 4.);\n#ifdef HAS_OFFSET_Z\nvec3 m = aOffset / 10.0;\n  m[2] /= altitudeScale;\n#else\nvec3 m = vec3(aOffset / 10.0, .0);\n#endif\nvec2 n = aTexCoord;\n  if(h == 1.) {\n    m.xy *= tileRatio / zoomScale * j * l;\n    gl_Position = projViewModelMatrix * vec4(c + m, 1.);\n  } else {\n    gl_Position.xy += m.xy * 2. / canvasSize * l * i;\n  }\n  gl_Position.xy += vec2(d, -e) * 2. / canvasSize * i;\n#ifndef PICKING_MODE\nif(h == 1.) {\n    vGammaScale = j + mapPitch / 4.;\n  } else {\n    vGammaScale = mix(1., j, textPerspectiveRatio);\n  }\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vTexCoord = n / texSize;\n  vSize = f;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\n#endif\n#ifdef HAS_TEXT_FILL\nvTextFill = aTextFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvTextHaloFill = aTextHaloFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvTextHaloRadius = aTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nvTextHaloOpacity = aTextHaloOpacity;\n#endif\n#else\n#ifdef ENABLE_COLLISION\nbool o = aOpacity == 255.;\n#else\nbool o = true;\n#endif\nfbo_picking_setData(gl_Position.w, o);\n#endif\n}";
 
-const Ii = function(t) {
+const Ci = function(t) {
     const e = this.layer.getRenderer(), n = this.getSymbol(t.properties.symbolIndex);
     return !this.sr(t) && e.isForeground(t) && "line" !== n.textPlacement;
-}, Oi = function(t) {
+}, Fi = function(t) {
     const e = this.layer.getRenderer(), n = this.getSymbol(t.properties.symbolIndex);
     return !this.sr(t) && !e.isForeground(t) && "line" !== n.textPlacement;
-}, Ci = function(t) {
+}, zi = function(t) {
     const e = this.layer.getRenderer(), n = this.getSymbol(t.properties.symbolIndex);
     return !this.sr(t) && e.isForeground(t) && "line" === n.textPlacement;
-}, Fi = function(t) {
+}, Ei = function(t) {
     const e = this.layer.getRenderer(), n = this.getSymbol(t.properties.symbolIndex);
     return !this.sr(t) && !e.isForeground(t) && "line" === n.textPlacement;
-}, zi = [ 0, 0, 3 ], Ei = [], ji = [], Di = [], Ri = [], Ni = [], Li = [], Hi = [], Vi = [], Ui = [], qi = [ 1, -1 ], Gi = new Int16Array(3), Wi = [], Bi = [], Xi = [], $i = [], Ji = [], Yi = [];
+}, ji = [ 0, 0, 3 ], Di = [], Ri = [], Ni = [], Li = [], Hi = [], Vi = [], Ui = [], qi = [], Gi = [], Wi = [ 1, -1 ], Bi = new Int16Array(3), Xi = [], $i = [], Ji = [], Yi = [], Zi = [], Ki = [];
 
-class Zi extends an {
+class Qi extends cn {
     constructor(t, e, n, i, r) {
         super(t, e, n, i, r), this.propAllowOverlap = "textAllowOverlap", this.propIgnorePlacement = "textIgnorePlacement", 
-        this.colorCache = {}, this.Vr = Ii.bind(this), this.Ur = Oi.bind(this), this.qr = Ci.bind(this), 
-        this.Gr = Fi.bind(this), this.isLabelCollides = Kn.bind(this), this.Wr();
+        this.colorCache = {}, this.Vr = Ci.bind(this), this.Ur = Fi.bind(this), this.qr = zi.bind(this), 
+        this.Gr = Ei.bind(this), this.isLabelCollides = ti.bind(this), this.Wr();
     }
     Wr() {
         this.Br = [];
@@ -6696,7 +6711,7 @@ class Zi extends an {
         return !1;
     }
     createFnTypeConfig(t, e) {
-        return Xn(t, e);
+        return Jn(t, e);
     }
     isBloom(t) {
         return !!this.getSymbol(t.properties.symbolIndex).textBloom;
@@ -6714,7 +6729,7 @@ class Zi extends an {
     createMesh(t, e) {
         const n = this.isEnableCollision(), i = this.isEnableUniquePlacement(), {geometry: r, symbolIndex: o} = t;
         r.properties.symbolIndex = o;
-        const s = this.getSymbol(o), a = this.getSymbolDef(o), l = this.getFnTypeConfig(o), c = qn.call(this, this.regl, r, e, a, s, l, this.layer.options.collision, !n, i);
+        const s = this.getSymbol(o), a = this.getSymbolDef(o), l = this.getFnTypeConfig(o), c = Wn.call(this, this.regl, r, e, a, s, l, this.layer.options.collision, !n, i);
         if (c.length) {
             "line" === s.textPlacement ? this.Xr = !0 : this.$r = !0;
         }
@@ -6736,7 +6751,7 @@ class Zi extends an {
     Yr() {
         let t = this.scene.getMeshes();
         if (!t || !t.length) return;
-        const e = -this.getMap().getBearing() * Math.PI / 180, n = l.fromRotation(Di, e), i = (t, e, n, i) => {
+        const e = -this.getMap().getBearing() * Math.PI / 180, n = l.fromRotation(Ni, e), i = (t, e, n, i) => {
             const {start: r, end: o, mesh: s, allElements: a} = e[0];
             if (this.updateBoxCollisionFading(!0, s, e, n, i)) {
                 let e = t.count;
@@ -6744,14 +6759,14 @@ class Zi extends an {
                 t.count = e;
             }
         }, r = this.Ui(), o = this.layer.getRenderer();
-        t = t.sort(Qi);
+        t = t.sort(er);
         for (let e = 0; e < t.length; e++) {
             const s = t[e];
             if (!this.isMeshIterable(s)) continue;
             const a = o.isForeground(s);
             if (this.shouldIgnoreBackground() && !a) continue;
             const l = s.geometry, c = this.getSymbol(s.properties.symbolIndex);
-            s.properties.textHaloRadius = ae(c.textHaloRadius) ? Un.textHaloRadius : c.textHaloRadius;
+            s.properties.textHaloRadius = ce(c.textHaloRadius) ? Gn.textHaloRadius : c.textHaloRadius;
             const h = s.properties.meshKey;
             if ("line" === c.textPlacement) {
                 if (!l.properties.line) continue;
@@ -6778,7 +6793,7 @@ class Zi extends an {
         return "line" !== this.getSymbol(t.properties.symbolIndex).textPlacement;
     }
     getUniqueEntryKey(t, e) {
-        return Qn(t, e);
+        return ei(t, e);
     }
     Kr(t, e) {
         const n = this.getMap(), i = t.geometry, o = i.properties, s = this.layer.getRenderer().isForeground(t);
@@ -6787,7 +6802,7 @@ class Zi extends an {
         if (!a) return;
         const l = 1 === t.material.uniforms.pitchWithMap, c = o.elements;
         if (!l) {
-            const e = r.multiply(Ei, n.projViewMatrix, t.localTransform), i = new Array(a.length);
+            const e = r.multiply(Di, n.projViewMatrix, t.localTransform), i = new Array(a.length);
             a = this.Qr(i, a, e, n.width, n.height);
         }
         const h = this.Ui(), u = i.properties.visElemts = i.properties.visElemts || new c.constructor(c.length);
@@ -6806,14 +6821,14 @@ class Zi extends an {
         if (this.Jr[o]) return this.Jr[o];
         const s = function(t, e, n, i, r) {
             const o = [];
-            for (let s = 0; s < e.length; s += 3) a.set(o, e[s], e[s + 1], e[s + 2], 1), dn(o, o, n, i, r), 
+            for (let s = 0; s < e.length; s += 3) a.set(o, e[s], e[s + 1], e[s + 2], 1), pn(o, o, n, i, r), 
             t[s] = o[0], t[s + 1] = o[1], t[s + 2] = e[s + 2];
             return t;
         }(t, e, n, i, r);
         return this.Jr[o] = s, s;
     }
     forEachBox(t, e) {
-        const n = this.getMap(), i = r.multiply(Ei, n.projViewMatrix, t.localTransform), {collideIds: o, aCount: s, features: a, elements: l} = t.geometry.properties, c = o, h = this.isEnableUniquePlacement(), u = this.rr(1);
+        const n = this.getMap(), i = r.multiply(Di, n.projViewMatrix, t.localTransform), {collideIds: o, aCount: s, features: a, elements: l} = t.geometry.properties, c = o, h = this.isEnableUniquePlacement(), u = this.rr(1);
         u[0].allElements = l, u[0].mesh = t;
         let d = 0, f = l[0], p = 0, m = c[f];
         for (let n = 0; n <= l.length; n += 6) if (f = l[n], c[f] !== m || n === l.length) {
@@ -6832,52 +6847,52 @@ class Zi extends an {
     }
     to(t, e, n, o, s, l, u) {
         const d = this.Ui(), f = this.getMap(), p = t.geometry, m = p.desc.positionSize, {aShape: y, aOffset: g, aAnchor: v, aAltitude: b, aPitchRotation: x} = p.properties, w = p.properties.aTextSize, A = !u, k = e[n] * m;
-        let _ = Ri;
-        p.data.aAltitude ? i.set(Ri, v[k], v[k + 1], b[e[n]]) : P.unpackPosition(Ri, v[k], v[k + 1], v[k + 2]);
-        const S = dn(Ni, _, l, f.width, f.height);
-        if (a.set(Li, S[0], S[1], S[0], S[1]), f.isOffscreen(Li)) return d || Ki(g, e, n, o), 
+        let _ = Li;
+        p.data.aAltitude ? i.set(Li, v[k], v[k + 1], b[e[n]]) : P.unpackPosition(Li, v[k], v[k + 1], v[k + 2]);
+        const S = pn(Hi, _, l, f.width, f.height);
+        if (a.set(Vi, S[0], S[1], S[0], S[1]), f.isOffscreen(Vi)) return d || tr(g, e, n, o), 
         !1;
         A && (_ = S);
         const T = A ? 1 : p.properties.tileExtent / this.layer.options.tileSize[0];
         let M = !0;
         const I = e[n], O = e[o - 1], C = w ? w[I] : t.properties.textSize, F = this.eo(t, C, s, I, O, _, T, u);
-        if (null === F) return Ki(g, e, n, o), !1;
+        if (null === F) return tr(g, e, n, o), !1;
         const z = O - I <= 3, E = t.material.uniforms, j = 1 === E.pitchWithMap, D = Math.floor(F / 2), R = F % 2;
         for (let a = n; a < o; a += 6) {
             const l = e[a];
             let u;
-            if (u = D || a !== n || z ? D || a !== o - 6 || z ? _i.call(this, ji, t, C, s, l, _, T, D) : Yi : Ji, 
+            if (u = D || a !== n || z ? D || a !== o - 6 || z ? Ti.call(this, Ri, t, C, s, l, _, T, D) : Ki : Zi, 
             !u) {
-                M = !1, d || Ki(g, e, n, o);
+                M = !1, d || tr(g, e, n, o);
                 break;
             }
             let f = u[2];
             R && (f -= Math.PI / 2);
-            const p = wn(Hi, f, 0, E.rotateWithMap, E.pitchWithMap), m = g.length > y.length;
+            const p = kn(Ui, f, 0, E.rotateWithMap, E.pitchWithMap), m = g.length > y.length;
             let v;
             if (m) {
-                i.set($i, x[3 * l], x[3 * l + 1], 0);
-                const t = i.normalize($i, $i), e = -x[3 * l + 2];
+                i.set(Yi, x[3 * l], x[3 * l + 1], 0);
+                const t = i.normalize(Yi, Yi), e = -x[3 * l + 2];
                 if (e) {
-                    const n = h.setAxisAngle(Wi, t, e);
-                    r.fromTranslation(Bi, zi), r.fromQuat(Xi, n), v = r.multiply(Xi, Xi, Bi);
+                    const n = h.setAxisAngle(Xi, t, e);
+                    r.fromTranslation($i, ji), r.fromQuat(Ji, n), v = r.multiply(Ji, Ji, $i);
                 }
             }
             for (let t = 0; t < 4; t++) {
                 const e = 2 * (l + t);
-                c.set(Vi, y[e] / 10, y[e + 1] / 10), c.scale(Vi, Vi, C / 24), c.transformMat2(Vi, Vi, p), 
-                j ? (c.multiply(Vi, Vi, qi), c.add(Ui, Vi, u), m && (Ui[2] = 0, v && i.transformMat4(Ui, Ui, v))) : (c.multiply(Ui, u, qi), 
-                c.add(Ui, Vi, Ui)), Gi[0] = 10 * Ui[0], Gi[1] = 10 * Ui[1], m && (Gi[2] = 10 * Ui[2]);
+                c.set(qi, y[e] / 10, y[e + 1] / 10), c.scale(qi, qi, C / 24), c.transformMat2(qi, qi, p), 
+                j ? (c.multiply(qi, qi, Wi), c.add(Gi, qi, u), m && (Gi[2] = 0, v && i.transformMat4(Gi, Gi, v))) : (c.multiply(Gi, u, Wi), 
+                c.add(Gi, qi, Gi)), Bi[0] = 10 * Gi[0], Bi[1] = 10 * Gi[1], m && (Bi[2] = 10 * Gi[2]);
                 const n = (m ? 3 : 2) * (l + t);
-                (g[n] !== Gi[0] || g[n + 1] !== Gi[1] || m && g[n + 2] !== Gi[2]) && (g.dirty = !0, 
-                g[n] = Gi[0], g[n + 1] = Gi[1], m && (g[n + 2] = Gi[2]));
+                (g[n] !== Bi[0] || g[n + 1] !== Bi[1] || m && g[n + 2] !== Bi[2]) && (g.dirty = !0, 
+                g[n] = Bi[0], g[n + 1] = Bi[1], m && (g[n + 2] = Bi[2]));
             }
         }
         return M;
     }
     eo(t, e, n, i, r, o, s, a) {
         const l = r - i <= 3, c = this.getMap();
-        return l ? 0 : Mi.call(this, Ji, Yi, t, e, n, i, r, o, s, c.width / c.height, a);
+        return l ? 0 : Ii.call(this, Zi, Ki, t, e, n, i, r, o, s, c.width / c.height, a);
     }
     isBoxCollides(t, e, n, i, r, o) {
         return this.isLabelCollides(0, t, e, n, i, r, o);
@@ -6896,23 +6911,23 @@ class Zi extends an {
     init() {
         const t = this.regl;
         this.renderer = new n.Renderer(t);
-        const {uniforms: e, extraCommandProps: i} = Bn.call(this, this.layer, this.sceneConfig);
+        const {uniforms: e, extraCommandProps: i} = $n.call(this, this.layer, this.sceneConfig);
         this.shader = new n.MeshShader({
-            vert: ni,
-            frag: ii,
+            vert: ri,
+            frag: oi,
             uniforms: e,
             extraCommandProps: i
         });
         let r = i;
-        if (this.layer.getRenderer().isEnableWorkAround("win-intel-gpu-crash") && (r = re({}, i), 
-        r.stencil = re({}, i.stencil), r.stencil.enable = !0), this.Zr = new n.MeshShader({
-            vert: Pi,
-            frag: ii,
+        if (this.layer.getRenderer().isEnableWorkAround("win-intel-gpu-crash") && (r = se({}, i), 
+        r.stencil = se({}, i.stencil), r.stencil.enable = !0), this.Zr = new n.MeshShader({
+            vert: Oi,
+            frag: oi,
             uniforms: e,
             extraCommandProps: r
         }), this.pickingFBO) {
             const t = new n.FBORayPicking(this.renderer, {
-                vert: "#define PICKING_MODE 1\n" + ni,
+                vert: "#define PICKING_MODE 1\n" + ri,
                 uniforms: e,
                 extraCommandProps: {
                     viewport: this.pickingViewport
@@ -6923,7 +6938,7 @@ class Zi extends an {
                 return "line" !== this.getSymbol(e).textPlacement;
             };
             const i = new n.FBORayPicking(this.renderer, {
-                vert: "#define PICKING_MODE 1\n" + Pi,
+                vert: "#define PICKING_MODE 1\n" + Oi,
                 uniforms: e,
                 extraCommandProps: {
                     viewport: this.pickingViewport
@@ -6953,7 +6968,7 @@ class Zi extends an {
     }
 }
 
-function Ki(t, e, n, i) {
+function tr(t, e, n, i) {
     for (let r = n; r < i; r += 6) {
         const n = e[r];
         for (let e = 0; e < 4; e++) {
@@ -6963,20 +6978,20 @@ function Ki(t, e, n, i) {
     }
 }
 
-function Qi(t, e) {
+function er(t, e) {
     const n = t.uniforms.level - e.uniforms.level;
     return 0 === n ? t.properties.meshKey - e.properties.meshKey : n;
 }
 
-var tr = "#define SHADER_NAME NATIVE_POINT\n#include <gl2_vert>\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nuniform mat4 projViewModelMatrix;\nuniform float markerSize;\n#ifdef PICKING_MODE\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n  gl_Position = projViewModelMatrix * vec4(c, 1.);\n  gl_PointSize = markerSize;\n#ifdef PICKING_MODE\nfbo_picking_setData(gl_Position.w, true);\n#endif\n}";
+var nr = "#define SHADER_NAME NATIVE_POINT\n#include <gl2_vert>\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nuniform mat4 projViewModelMatrix;\nuniform float markerSize;\n#ifdef PICKING_MODE\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n  gl_Position = projViewModelMatrix * vec4(c, 1.);\n  gl_PointSize = markerSize;\n#ifdef PICKING_MODE\nfbo_picking_setData(gl_Position.w, true);\n#endif\n}";
 
-const er = {
+const ir = {
     markerFill: [ 0, 0, 0 ],
     markerOpacity: 1,
     markerSize: 10
 };
 
-class nr extends Ue {
+class rr extends Ge {
     getPrimitive() {
         return "points";
     }
@@ -6984,9 +6999,9 @@ class nr extends Ue {
         const {geometry: i, symbolIndex: r, ref: o} = t, s = this.getSymbol(r);
         void 0 === o && i.generateBuffers(this.regl);
         const a = {};
-        ce(a, "markerOpacity", s, "markerOpacity", 1), ce(a, "markerSize", s, "markerSize", 10), 
-        ce(a, "markerFill", s, "markerFill", "#000", de(this.colorCache, 3));
-        const l = new n.Material(a, er);
+        ue(a, "markerOpacity", s, "markerOpacity", 1), ue(a, "markerSize", s, "markerSize", 10), 
+        ue(a, "markerFill", s, "markerFill", "#000", pe(this.colorCache, 3));
+        const l = new n.Material(a, ir);
         l.createDefines = () => "square" !== s.markerType ? {
             USE_CIRCLE: 1
         } : null, l.appendDefines = t => ("square" !== s.markerType && (t.USE_CIRCLE = 1), 
@@ -7007,7 +7022,7 @@ class nr extends Ue {
             width: () => this.canvas ? this.canvas.width : 1,
             height: () => this.canvas ? this.canvas.height : 1
         }, i = this.layer.getRenderer().isEnableTileStencil && this.layer.getRenderer().isEnableTileStencil(), o = {
-            vert: tr,
+            vert: nr,
             frag: "#define SHADER_NAME NATIVE_POINT\nprecision mediump float;\n#include <gl2_frag>\n#ifdef USE_CIRCLE\n#if __VERSION__ == 100\n#ifdef GL_OES_standard_derivatives\n#define STANDARD_DERIVATIVES_ENABLED 1\n#extension GL_OES_standard_derivatives : enable\n#endif\n#else\n#define STANDARD_DERIVATIVES_ENABLED 1\n#endif\n#endif\nuniform vec3 markerFill;\nuniform float markerOpacity;\nvoid main() {\n  float c = 1.;\n#ifdef USE_CIRCLE\nfloat r = .0, d = .0;\n  vec2 e = 2. * gl_PointCoord - 1.;\n  r = dot(e, e);\n  if(r > 1.) {\n    discard;\n  }\n#ifdef STANDARD_DERIVATIVES_ENABLED\nd = fwidth(r);\n  c = 1. - smoothstep(1. - d, 1. + d, r);\n#endif\n#endif\nglFragColor = vec4(markerFill, 1.) * markerOpacity * c;\n#if __VERSION__ == 100\ngl_FragColor = glFragColor;\n#endif\n}",
             uniforms: [ {
                 name: "projViewModelMatrix",
@@ -7047,7 +7062,7 @@ class nr extends Ue {
             }
         };
         this.shader = new n.MeshShader(o), this.shader.version = 300, this.pickingFBO && (this.picking = [ new n.FBORayPicking(this.renderer, {
-            vert: "#define PICKING_MODE 1\n" + tr,
+            vert: "#define PICKING_MODE 1\n" + nr,
             uniforms: [ {
                 name: "projViewModelMatrix",
                 type: "function",
@@ -7068,9 +7083,9 @@ class nr extends Ue {
     }
 }
 
-var ir = "#define SHADER_NAME NATIVE_LINE\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nuniform mat4 projViewModelMatrix;\n#ifndef PICKING_MODE\n#if defined(HAS_COLOR)\nattribute vec4 aColor;\nvarying vec4 vColor;\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n  gl_Position = projViewModelMatrix * vec4(c, 1.);\n#ifndef PICKING_MODE\n#if defined(HAS_COLOR)\nvColor = aColor / 255.;\n#endif\n#else\nfbo_picking_setData(gl_Position.w, true);\n#endif\n}";
+var or = "#define SHADER_NAME NATIVE_LINE\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nuniform mat4 projViewModelMatrix;\n#ifndef PICKING_MODE\n#if defined(HAS_COLOR)\nattribute vec4 aColor;\nvarying vec4 vColor;\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n  gl_Position = projViewModelMatrix * vec4(c, 1.);\n#ifndef PICKING_MODE\n#if defined(HAS_COLOR)\nvColor = aColor / 255.;\n#endif\n#else\nfbo_picking_setData(gl_Position.w, true);\n#endif\n}";
 
-class rr extends Ue {
+class sr extends Ge {
     constructor(t, e, n, i, r) {
         if (super(t, e, n, i, r), this.primitive = "lines", p(this.symbolDef.lineColor)) {
             const t = e.getMap(), n = y(this.symbolDef.lineColor);
@@ -7093,7 +7108,7 @@ class rr extends Ue {
     }
     getMeshUniforms(t, e) {
         const n = {};
-        return ce(n, "lineColor", e, "lineColor", "#000", de(this.colorCache)), ce(n, "lineOpacity", e, "lineOpacity", 1), 
+        return ue(n, "lineColor", e, "lineColor", "#000", pe(this.colorCache)), ue(n, "lineOpacity", e, "lineOpacity", 1), 
         n;
     }
     init() {
@@ -7112,7 +7127,7 @@ class rr extends Ue {
                 return r.multiply(n, e.projViewMatrix, e.modelMatrix), n;
             }
         } ], s = this.sceneConfig.depthRange, a = {
-            vert: ir,
+            vert: or,
             frag: "#define SHADER_NAME NATIVE_LINE\nprecision mediump float;\nuniform float lineOpacity;\nuniform vec4 lineColor;\n#if defined(HAS_COLOR)\nvarying vec4 vColor;\n#endif\nvoid main() {\n  gl_FragColor = lineColor * lineOpacity;\n#if defined(HAS_COLOR)\ngl_FragColor *= vColor;\n#endif\n}",
             uniforms: o,
             defines: null,
@@ -7149,7 +7164,7 @@ class rr extends Ue {
             }
         };
         this.shader = new n.MeshShader(a), this.pickingFBO && (this.picking = [ new n.FBORayPicking(this.renderer, {
-            vert: "#define PICKING_MODE 1\n" + ir,
+            vert: "#define PICKING_MODE 1\n" + or,
             uniforms: o,
             extraCommandProps: {
                 viewport: this.pickingViewport
@@ -7166,9 +7181,9 @@ class rr extends Ue {
     }
 }
 
-const or = [ 1, 1, 1 ], sr = [ 1, 1, 1, 1 ], ar = [ 0, 0 ];
+const ar = [ 1, 1, 1 ], lr = [ 1, 1, 1, 1 ], cr = [ 0, 0 ];
 
-class lr extends Le {
+class hr extends Ve {
     supportRenderMode(t) {
         return this.isAnimating() ? "fxaa" === t || "fxaaAfterTaa" === t : "taa" === t || "fxaa" === t;
     }
@@ -7179,12 +7194,12 @@ class lr extends Le {
         if (!this.material) return this.setToRedraw(), null;
         const {geometry: s, symbolIndex: a} = t, l = new n.Mesh(s, this.material);
         if (this.sceneConfig.animation) {
-            or[2] = .01;
+            ar[2] = .01;
             const t = [];
-            r.fromScaling(t, or), r.multiply(t, e, t), e = t;
+            r.fromScaling(t, ar), r.multiply(t, e, t), e = t;
         }
         const c = this.getSymbolDef(a), h = this.getFnTypeConfig(a);
-        we(s, c, h);
+        ke(s, c, h);
         const u = this.getShader(), d = u.getGeometryDefines ? u.getGeometryDefines(s) : {}, f = this.getSymbol(a);
         if (s.data.aExtrude) {
             d.IS_LINE_EXTRUSION = 1;
@@ -7194,16 +7209,16 @@ class lr extends Le {
                 get: function() {
                     return e * n.getResolution() / t;
                 }
-            }), ce(l.uniforms, "lineWidth", f, "lineWidth", 4), ce(l.uniforms, "lineOpacity", f, "lineOpacity", 1), 
-            ce(l.uniforms, "lineColor", f, "lineColor", "#fff", de(this.colorCache)), Object.defineProperty(l.uniforms, "lineHeight", {
+            }), ue(l.uniforms, "lineWidth", f, "lineWidth", 4), ue(l.uniforms, "lineOpacity", f, "lineOpacity", 1), 
+            ue(l.uniforms, "lineColor", f, "lineColor", "#fff", pe(this.colorCache)), Object.defineProperty(l.uniforms, "lineHeight", {
                 enumerable: !0,
                 get: () => {
                     const t = this.dataConfig.defaultAltitude * (this.dataConfig.altitudeScale || 1);
-                    return me(t) ? t : 0;
+                    return ge(t) ? t : 0;
                 }
             });
-        } else ce(l.uniforms, "polygonFill", f, "polygonFill", sr, de(this.colorCache)), 
-        ce(l.uniforms, "polygonOpacity", f, "polygonOpacity", 1);
+        } else ue(l.uniforms, "polygonFill", f, "polygonFill", lr, pe(this.colorCache)), 
+        ue(l.uniforms, "polygonOpacity", f, "polygonOpacity", 1);
         if (s.data.aColor && (d.HAS_COLOR = 1), s.data.aLineWidth && (d.HAS_LINE_WIDTH = 1), 
         s.data.aLineHeight && (d.HAS_LINE_HEIGHT = 1), s.data.aOpacity) {
             const t = s.data.aOpacity;
@@ -7240,7 +7255,7 @@ class lr extends Le {
         return t.material && t.material.uvOffsetAnim;
     }
     getUVOffset(t) {
-        const e = this.getSymbols()[0], n = e.material && e.material.uvOffset || ar, i = this.layer.getRenderer().getFrameTimestamp(), r = [ n[0], n[1] ], o = !!e.material && e.material.noiseTexture, s = o ? 5e5 : 1e3, a = o ? 256 : 1;
+        const e = this.getSymbols()[0], n = e.material && e.material.uvOffset || cr, i = this.layer.getRenderer().getFrameTimestamp(), r = [ n[0], n[1] ], o = !!e.material && e.material.noiseTexture, s = o ? 5e5 : 1e3, a = o ? 256 : 1;
         return t && t[0] && (r[0] = i * t[0] % s / s * a), t && t[1] && (r[1] = i * t[1] % s / s * a), 
         r;
     }
@@ -7258,7 +7273,7 @@ class lr extends Le {
     ri(t, e) {
         if (null !== e) {
             const n = t.localTransform;
-            0 === e && (e = .01), or[2] = e, r.fromScaling(n, or), r.multiply(n, t.properties.tileTransform, n), 
+            0 === e && (e = .01), ar[2] = e, r.fromScaling(n, ar), 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.io = !0), 
@@ -7282,7 +7297,7 @@ class lr extends Le {
             evaluate: e => {
                 let i = n(t.getZoom(), e);
                 return Array.isArray(i) || (i = this.colorCache[i] = this.colorCache[i] || C(i).unitArray()), 
-                i = ue(i), i;
+                i = fe(i), i;
             }
         }, {
             attrName: "aOpacity",
@@ -7316,17 +7331,17 @@ class lr extends Le {
         return t.material && this.ro(t.material), n;
     }
     qn(t, e) {
-        return cr(t) !== cr(e);
+        return ur(t) !== ur(e);
     }
 }
 
-function cr(t) {
+function ur(t) {
     if (!t || !t.material) return !1;
     for (const e in t.material) if (e.indexOf("Texture") > 0 && t.material[e]) return !0;
     return !1;
 }
 
-class hr extends lr {
+class dr extends hr {
     createGeometry(t) {
         const e = t.data, i = this.getSymbols()[0];
         if (i.material && i.material.extrusionOpacity) {
@@ -7335,7 +7350,7 @@ class hr extends lr {
             e.aExtrusionOpacity = t;
         }
         const r = new n.Geometry(e, t.indices);
-        return re(r.properties, t.properties), {
+        return se(r.properties, t.properties), {
             geometry: r,
             symbolIndex: {
                 index: 0
@@ -7344,7 +7359,7 @@ class hr extends lr {
     }
     updateSceneConfig(t) {
         let e;
-        if (this.sceneConfig.cullFace !== t.cullFace && (e = !0), re(this.sceneConfig, t), 
+        if (this.sceneConfig.cullFace !== t.cullFace && (e = !0), se(this.sceneConfig, t), 
         e) {
             const t = this.getShaderConfig();
             this.shader.dispose(), this.shader = new n.PhongShader(t);
@@ -7430,11 +7445,11 @@ class hr extends lr {
     ro() {
         this.material && this.material.dispose();
         const t = this.getSymbols()[0].material, e = {};
-        for (const n in t) ge(t, n) && (e[n] = t[n]);
+        for (const n in t) be(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.so(), s = re({
+        const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, o = this.so(), s = se({
             viewMatrix: n,
             projMatrix: i,
             cameraPosition: r,
@@ -7458,9 +7473,9 @@ class hr extends lr {
     }
 }
 
-const ur = [ 1, 1, 1 ];
+const fr = [ 1, 1, 1 ];
 
-class dr extends Le {
+class pr extends Ve {
     constructor(t, e, n, i, r) {
         if (super(t, e, n, i, r), p(this.symbolDef[0].lineColor)) {
             const t = e.getMap(), n = y(this.symbolDef.lineColor);
@@ -7483,9 +7498,9 @@ class dr extends Le {
     createMesh(t, e) {
         const {geometry: i} = t, o = new n.Mesh(i);
         if (o.castShadow = !1, this.sceneConfig.animation) {
-            ur[2] = .01;
+            fr[2] = .01;
             const t = [];
-            r.fromScaling(t, ur), r.multiply(t, e, t), e = t;
+            r.fromScaling(t, fr), r.multiply(t, e, t), e = t;
         }
         return o.setLocalTransform(e), o.properties.symbolIndex = {
             index: 0
@@ -7494,7 +7509,7 @@ class dr extends Le {
     addMesh(t, e) {
         if (!t.length) return this;
         let n;
-        null !== e ? (0 === e && (e = .01), n = t[0].localTransform, ur[2] = e, r.fromScaling(n, ur), 
+        null !== e ? (0 === e && (e = .01), n = t[0].localTransform, fr[2] = e, r.fromScaling(n, fr), 
         r.multiply(n, t[0].properties.tileTransform, n)) : n = t[0].properties.tileTransform;
         for (let e = 0; e < t.length; e++) t[e].setLocalTransform(n);
         return this.scene.addMesh(t), this;
@@ -7551,9 +7566,9 @@ class dr extends Le {
     }
 }
 
-const {getPBRUniforms: fr} = n.pbr.PBRUtils, pr = [];
+const {getPBRUniforms: mr} = n.pbr.PBRUtils, yr = [];
 
-class mr extends lr {
+class gr extends hr {
     constructor(...t) {
         super(...t), this.ao = new n.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
     }
@@ -7577,7 +7592,7 @@ class mr extends lr {
         const e = new n.Geometry(t.data, t.indices, 0, {
             uv0Attribute: "aTexCoord0"
         });
-        return re(e.properties, t.properties), {
+        return se(e.properties, t.properties), {
             geometry: e,
             symbolIndex: {
                 index: 0
@@ -7591,7 +7606,7 @@ class mr extends lr {
         let n = !!t.ssr && this.getSymbols()[0].ssr;
         const i = this.shader, r = i.shaderDefines;
         if (n) {
-            const e = re({}, r, t.ssr.defines);
+            const e = se({}, r, t.ssr.defines);
             i.shaderDefines = e;
         }
         if (t.onlyUpdateDepthInTaa && (this.shader = this.co, !n && this.ho && (this.shader = i, 
@@ -7608,7 +7623,7 @@ class mr extends lr {
         this.ho = n;
     }
     getShadowMeshes() {
-        if (!this.isVisible()) return pr;
+        if (!this.isVisible()) return yr;
         this.shadowCount = this.scene.getMeshes().length;
         const t = this.scene.getMeshes().filter(t => 0 === t.getUniform("level"));
         for (let e = 0; e < t.length; e++) {
@@ -7618,7 +7633,7 @@ class mr extends lr {
         return t;
     }
     updateSceneConfig(t) {
-        re(this.sceneConfig, t), this.setToRedraw();
+        se(this.sceneConfig, t), this.setToRedraw();
     }
     delete() {
         super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.uo && this.uo.dispose(), 
@@ -7701,7 +7716,7 @@ class mr extends lr {
     ro(t) {
         const e = t || this.getSymbols()[0].material, i = {};
         let r = !1;
-        for (const t in e) if (ge(e, t)) if (t.indexOf("Texture") > 0) {
+        for (const t in e) if (be(e, t)) if (t.indexOf("Texture") > 0) {
             let o = e[t];
             if (!o) {
                 i[t] = void 0;
@@ -7731,7 +7746,7 @@ class mr extends lr {
         return this.shader;
     }
     getUniformValues(t, e) {
-        const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = fr(t, n, i, e && e.ssr, e && e.jitter);
+        const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = mr(t, n, i, e && e.ssr, e && e.jitter);
         return this.setIncludeUniformValues(r, e), r;
     }
     bo(t) {
@@ -7744,7 +7759,7 @@ class mr extends lr {
     }
 }
 
-const yr = [], gr = [], vr = [ 0, 0, 0 ], br = [ 0, 0, 0 ], xr = [ 1, 1, 1 ], wr = [], Ar = [ 1, 1, 1, 1 ], kr = [], _r = t => class extends t {
+const vr = [], br = [], xr = [ 0, 0, 0 ], wr = [ 0, 0, 0 ], Ar = [ 1, 1, 1 ], kr = [], _r = [ 1, 1, 1, 1 ], Sr = [], Tr = t => class extends t {
     constructor(t, e, n, i, r) {
         super(t, e, n, i, r), this.xo = !1, this.scene.sortFunction = this.sortByCommandKey, 
         this.wo = [];
@@ -7761,7 +7776,7 @@ const yr = [], gr = [], vr = [ 0, 0, 0 ], br = [ 0, 0, 0 ], xr = [ 1, 1, 1 ], wr
         const {data: n, positionSize: i} = t;
         return {
             geometry: {
-                properties: re({}, t.properties),
+                properties: se({}, t.properties),
                 data: n,
                 positionSize: i,
                 features: e
@@ -7770,7 +7785,7 @@ const yr = [], gr = [], vr = [ 0, 0, 0 ], br = [ 0, 0, 0 ], xr = [ 1, 1, 1 ], wr
         };
     }
     getFnTypeConfig() {
-        return wr;
+        return kr;
     }
     createMesh(t, e, {tileTranslationMatrix: o, tileExtent: s}) {
         const a = this.getMap(), {geometry: l} = t, {positionSize: c, features: h} = l, {aPosition: u} = l.data, d = u.length / c;
@@ -7797,7 +7812,7 @@ const yr = [], gr = [], vr = [ 0, 0, 0 ], br = [ 0, 0, 0 ], xr = [ 1, 1, 1 ], wr
             const {translation: l, rotation: c, scale: u, fixSizeOnZoom: g} = e, v = this.To([], l, c, u);
             let b = 0;
             s.forEach(t => {
-                const {geometry: n, nodeMatrix: i} = t, o = r.multiply(kr, v, i), s = n.boundingBox.copy();
+                const {geometry: n, nodeMatrix: i} = t, o = r.multiply(Sr, v, i), s = n.boundingBox.copy();
                 s.transform(o);
                 const a = this.Mo(s, e);
                 a > b && (b = a);
@@ -7810,12 +7825,12 @@ const yr = [], gr = [], vr = [ 0, 0, 0 ], br = [ 0, 0, 0 ], xr = [ 1, 1, 1 ], wr
                 m && (k.setUniform("jointTexture", m.jointTexture), k.setUniform("jointTextureSize", m.jointTextureSize), 
                 k.setUniform("numJoints", m.numJoints), k.setUniform("skinAnimation", 0), A.HAS_SKIN = 1), 
                 y && (k.setUniform("morphWeights", y), A.HAS_MORPH = 1), k.setUniform("hasAlpha", b.alphaMode && "BLEND" === b.alphaMode.toUpperCase()), 
-                ce(k.uniforms, "polygonFill", e, "polygonFill", Ar, de(this.colorCache)), ce(k.uniforms, "polygonOpacity", e, "polygonOpacity", 1);
+                ue(k.uniforms, "polygonFill", e, "polygonFill", _r, pe(this.colorCache)), ue(k.uniforms, "polygonOpacity", e, "polygonOpacity", 1);
                 const _ = r.multiply([], v, c), S = [];
                 return r.fromTranslation(S, x), r.multiply(_, S, _), k.setPositionMatrix(() => {
-                    if (me(g)) {
+                    if (ge(g)) {
                         const t = a.getGLScale() / a.getGLScale(g);
-                        return i.set(yr, t, t, t), r.fromScaling(S, yr), r.multiply(S, S, _);
+                        return i.set(vr, t, t, t), r.fromScaling(S, vr), r.multiply(S, S, _);
                     }
                     return _;
                 }), k.setLocalTransform(o), l.generateBuffers(this.regl, {
@@ -7861,13 +7876,13 @@ const yr = [], gr = [], vr = [ 0, 0, 0 ], br = [ 0, 0, 0 ], xr = [ 1, 1, 1 ], wr
                 n || (n = !0);
                 let e = r.speed;
                 const o = !!r.loop;
-                ae(e) && (e = 1), this.Ao[i].updateAnimation(t.timestamp, o, e);
+                ce(e) && (e = 1), this.Ao[i].updateAnimation(t.timestamp, o, e);
             }
         }
         n && this.setToRedraw(!0), super.prepareRender(t);
     }
     getShadowMeshes() {
-        if (!this.isVisible()) return wr;
+        if (!this.isVisible()) return kr;
         this.shadowCount = this.scene.getMeshes().length;
         return this.scene.getMeshes().filter(t => 0 === t.getUniform("level"));
     }
@@ -7933,31 +7948,31 @@ const yr = [], gr = [], vr = [ 0, 0, 0 ], br = [ 0, 0, 0 ], xr = [ 1, 1, 1 ], wr
         }
     }
     To(t, e, n, o) {
-        const s = i.set(yr, ...e || vr), a = n || br, l = o || xr, c = h.fromEuler(gr, a[0], a[1], a[2]);
+        const s = i.set(vr, ...e || xr), a = n || wr, l = o || Ar, c = h.fromEuler(br, a[0], a[1], a[2]);
         return r.fromRotationTranslationScale(t, c, s, l);
     }
 };
 
-class Sr extends(_r(hr)){
+class Mr extends(Tr(dr)){
     getMaterialClazz(t) {
         return t.diffuseFactor ? n.PhongSpecularGlossinessMaterial : n.PhongMaterial;
     }
 }
 
-class Tr extends(_r(mr)){
+class Pr extends(Tr(gr)){
     getMaterialClazz(t) {
         return t.specularGlossinessTexture || t.diffuseTexture ? n.pbr.StandardSpecularGlossinessMaterial : n.pbr.StandardMaterial;
     }
 }
 
-const Mr = {
+const Ir = {
     color: [ 2.0303, 2.028, 2.028 ],
     direction: [ 0, -.2717, -1 ]
-}, Pr = {
+}, Or = {
     index: 0
-}, Ir = [ 0, 0, 0 ];
+}, Cr = [ 0, 0, 0 ];
 
-class Or extends Ue {
+class Fr extends Ge {
     supportRenderMode(t) {
         return "fxaa" === t || "fxaaBeforeTaa" === t;
     }
@@ -7965,7 +7980,7 @@ class Or extends Ue {
         return !0;
     }
     needToRedraw() {
-        return this.getSymbol(Pr).animation;
+        return this.getSymbol(Or).animation;
     }
     createMesh(t, e) {
         const {geometry: i} = t;
@@ -7974,7 +7989,7 @@ class Or extends Ue {
             castShadow: !1,
             picking: !0
         });
-        return r.properties.symbolIndex = Pr, r.setLocalTransform(e), r;
+        return r.properties.symbolIndex = Or, r.setLocalTransform(e), r;
     }
     callShader(t, e) {
         super.callShader(t, e), this.transformWater();
@@ -7985,15 +8000,15 @@ class Or extends Ue {
         this.ri(t, e), super.addMesh(...arguments);
     }
     ri(t) {
-        const e = this.getSymbol(Pr).ssr;
+        const e = this.getSymbol(Or).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.Oo.dispose(), 
         this.ei(t));
-        const e = !!t.ssr && this.getSymbol(Pr).ssr, n = this.Oo, i = n.shaderDefines;
+        const e = !!t.ssr && this.getSymbol(Or).ssr, n = this.Oo, i = n.shaderDefines;
         if (e) {
-            const e = re({}, i, t.ssr.defines);
+            const e = se({}, i, t.ssr.defines);
             n.shaderDefines = e;
         }
         this.updateIBLDefines(n), this.Fo.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
@@ -8002,7 +8017,7 @@ class Or extends Ue {
         this.createIBLTextures();
         const e = this.regl;
         this.renderer = new n.Renderer(e), this.createGround(), this.ei(t), this.pickingFBO && (this.picking = [ new n.FBORayPicking(this.renderer, {
-            vert: qe,
+            vert: We,
             uniforms: [ {
                 name: "projViewModelMatrix",
                 type: "function",
@@ -8166,7 +8181,7 @@ class Or extends Ue {
     Io(t, e) {
         const {iblTexes: n} = this.getIBLRes(), i = t.projViewMatrix, r = t.getLightManager();
         let o = r && r.getDirectionalLight() || {};
-        const s = r && r.getAmbientLight() || {}, a = this.getSymbol(Pr), l = this.Lo = this.Lo || [], c = {
+        const s = r && r.getAmbientLight() || {}, a = this.getSymbol(Or), l = this.Lo = this.Lo || [], c = {
             hdrHsv: s.hsv || [ 0, 0, 0 ],
             specularPBR: n && n.prefilterMap,
             rgbmRange: n && n.rgbmRange,
@@ -8176,19 +8191,19 @@ class Or extends Ue {
             projViewMatrix: i,
             viewMatrix: t.viewMatrix,
             cameraNearFar: [ t.cameraNear, t.cameraFar ],
-            lightDirection: o.direction || Mr.direction,
-            lightColor: o.color || Mr.color,
+            lightDirection: o.direction || Ir.direction,
+            lightColor: o.color || Ir.color,
             camPos: t.cameraPosition,
             timeElapsed: a.animation ? (this.layer.getRenderer().getFrameTimestamp() || 0) / (1 / (a.waterSpeed || 1) * 1e4) : 0,
             normalTexture: this.Do || this.Eo,
             heightTexture: this.No || this.Eo,
             waveParams: [ .09, a.uvScale || 3, .03, -.5 ],
-            waterDir: Cr(l, a.waterDirection || 0),
+            waterDir: zr(l, a.waterDirection || 0),
             waterBaseColor: a.waterBaseColor || [ .1451, .2588, .4863, 1 ],
             contrast: a.contrast || 1,
-            hsv: a.hsv || Ir
+            hsv: a.hsv || Cr
         };
-        return this.setIncludeUniformValues(c, e), e && e.ssr && e.ssr.renderUniforms && re(c, e.ssr.renderUniforms), 
+        return this.setIncludeUniformValues(c, e), e && e.ssr && e.ssr.renderUniforms && se(c, e.ssr.renderUniforms), 
         c;
     }
     delete() {
@@ -8213,58 +8228,58 @@ class Or extends Ue {
     }
 }
 
-function Cr(t, e) {
+function zr(t, e) {
     var n;
     return n = e, e = Math.PI * n / 180, t[0] = Math.sin(e), t[1] = Math.cos(e), t;
 }
 
-const Fr = ne("fill", Be);
+const Er = re("fill", $e);
 
-Fr.registerAt(pt);
+Er.registerAt(yt);
 
-const zr = ne("line", $e);
+const jr = re("line", Ye);
 
-zr.registerAt(pt);
+jr.registerAt(yt);
 
-const Er = ne("line-gradient", Je);
+const Dr = re("line-gradient", Ze);
 
-Er.registerAt(pt);
+Dr.registerAt(yt);
 
-const jr = ne("icon", gi);
+const Rr = re("icon", bi);
 
-jr.registerAt(pt);
+Rr.registerAt(yt);
 
-const Dr = ne("text", Zi);
+const Nr = re("text", Qi);
 
-Dr.registerAt(pt);
+Nr.registerAt(yt);
 
-const Rr = ne("native-line", rr);
+const Lr = re("native-line", sr);
 
-Rr.registerAt(pt);
+Lr.registerAt(yt);
 
-ne("native-point", nr).registerAt(pt);
+re("native-point", rr).registerAt(yt);
 
-const Nr = ne("phong", hr);
+const Hr = re("phong", dr);
 
-Nr.registerAt(pt);
+Hr.registerAt(yt);
 
-const Lr = ne("wireframe", dr);
+const Vr = re("wireframe", pr);
 
-Lr.registerAt(pt);
+Vr.registerAt(yt);
 
-const Hr = ne("lit", mr);
+const Ur = re("lit", gr);
 
-Hr.registerAt(pt);
+Ur.registerAt(yt);
 
-const Vr = ne("gltf-phong", Sr);
+const qr = re("gltf-phong", Mr);
 
-Vr.registerAt(pt);
+qr.registerAt(yt);
 
-const Ur = ne("gltf-lit", Tr);
+const Gr = re("gltf-lit", Pr);
 
-Ur.registerAt(pt);
+Gr.registerAt(yt);
 
-const qr = ne("heatmap", class extends Ue {
+const Wr = re("heatmap", class extends Ge {
     createFnTypeConfig(t, e) {
         const n = m(e.heatWeight), i = new Int16Array(1);
         return [ {
@@ -8281,14 +8296,14 @@ const qr = ne("heatmap", class extends Ue {
     createMesh(t, e) {
         const {geometry: i, symbolIndex: r, ref: o} = t;
         if (void 0 === o) {
-            we(i, this.getSymbolDef(r), this.getFnTypeConfig(r));
+            ke(i, this.getSymbolDef(r), this.getFnTypeConfig(r));
         }
         const s = this.getSymbol(r), a = {
             tileRatio: i.properties.tileRatio,
             dataResolution: i.properties.tileResolution
         };
-        ce(a, "heatmapIntensity", s, "heatmapIntensity", 1), ce(a, "heatmapRadius", s, "heatmapRadius", 6), 
-        ce(a, "heatmapWeight", s, "heatmapWeight", 1), ce(a, "heatmapOpacity", s, "heatmapOpacity", 1), 
+        ue(a, "heatmapIntensity", s, "heatmapIntensity", 1), ue(a, "heatmapRadius", s, "heatmapRadius", 6), 
+        ue(a, "heatmapWeight", s, "heatmapWeight", 1), ue(a, "heatmapOpacity", s, "heatmapOpacity", 1), 
         i.generateBuffers(this.regl);
         const l = new n.Material(a), c = new n.Mesh(i, l, {
             transparent: !0,
@@ -8340,14 +8355,14 @@ const qr = ne("heatmap", class extends Ue {
     }
 });
 
-qr.registerAt(pt);
+Wr.registerAt(yt);
 
-const Gr = ne("water", Or);
+const Br = re("water", Fr);
 
-Gr.registerAt(pt), St.registerPainter("lit", mr), St.registerPainter("icon", gi), 
-St.registerPainter("fill", Be), St.registerPainter("line", $e), St.registerPainter("line-gradient", Je), 
-St.registerPainter("water", Or), n.ShaderLib.register("vt_position_vert", "#ifdef HAS_ALTITUDE\n    vec3 unpackVTPosition() {\n        return vec3(aPosition, aAltitude);\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        return vec3(pos, altitude);\n    }\n#endif"), 
-pt.VERSION = "0.67.1", St.VERSION = "0.67.1";
+Br.registerAt(yt), Mt.registerPainter("lit", gr), Mt.registerPainter("icon", bi), 
+Mt.registerPainter("fill", $e), Mt.registerPainter("line", Ye), Mt.registerPainter("line-gradient", Ze), 
+Mt.registerPainter("water", Fr), n.ShaderLib.register("vt_position_vert", "#ifdef HAS_ALTITUDE\n    vec3 unpackVTPosition() {\n        return vec3(aPosition, aAltitude);\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        return vec3(pos, altitude);\n    }\n#endif"), 
+yt.VERSION = "0.67.2", Mt.VERSION = "0.67.2";
 
 if (e.mat4.create(), e.transcoders) {
     const n = t.Map.VERSION;
@@ -8359,6 +8374,6 @@ if (e.mat4.create(), e.transcoders) {
     }));
 } else t.registerWorkerAdapter("@maptalks/vt", j);
 
-export { Be as FillPainter, Fr as FillPlugin, Vr as GLTFPhongPlugin, Ur as GLTFStandardPlugin, At as GeoJSONVectorTileLayer, qr as HeatmapPlugin, gi as IconPainter, jr as IconPlugin, Er as LineGradientPlugin, $e as LinePainter, zr as LinePlugin, Jt as LineStringLayer, Hr as LitPlugin, xt as MapboxVectorTileLayer, rr as NativeLinePainter, Rr as NativeLinePlugin, nr as NativePointPainter, hr as PhongPainter, Nr as PhongPlugin, $t as PointLayer, Zt as PolygonLayer, Zi as TextPainter, Dr as TextPlugin, St as Vector3DLayer, pt as VectorTileLayer, st as VectorTileLayerRenderer, Gr as WaterPlugin, dr as WireframePainter, Lr as WireframePlugin };
+export { $e as FillPainter, Er as FillPlugin, qr as GLTFPhongPlugin, Gr as GLTFStandardPlugin, _t as GeoJSONVectorTileLayer, Wr as HeatmapPlugin, bi as IconPainter, Rr as IconPlugin, Dr as LineGradientPlugin, Ye as LinePainter, jr as LinePlugin, Zt as LineStringLayer, Ur as LitPlugin, At as MapboxVectorTileLayer, sr as NativeLinePainter, Lr as NativeLinePlugin, rr as NativePointPainter, dr as PhongPainter, Hr as PhongPlugin, Yt as PointLayer, Qt as PolygonLayer, Qi as TextPainter, Nr as TextPlugin, Mt as Vector3DLayer, yt as VectorTileLayer, lt as VectorTileLayerRenderer, Br as WaterPlugin, pr as WireframePainter, Vr as WireframePlugin };
 
-"undefined" != typeof console && console.log("@maptalks/vt v0.67.1");
+"undefined" != typeof console && console.log("@maptalks/vt v0.67.2");