@maptalks/vt 0.92.2 → 0.92.3

package/dist/maptalks.vt.es.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/vt v0.92.2
+ * @maptalks/vt v0.92.3
  * LICENSE : undefined
  * (c) 2016-2024 maptalks.org
  */
@@ -2276,13 +2276,14 @@ he.prototype._getTileZoom = function(e) {
     schema: !1,
     cascadeTiles: !0,
     collision: !0,
+    collisionBuffserSize: 0,
     picking: !0,
     pickingPoint: !0,
     pickingGeometry: !1,
     glyphSdfLimitPerFrame: 15,
     tileLimitPerFrame: 1,
-    loadingLimitOnInteracting: 1,
-    loadingLimit: 3,
+    loadingLimitOnInteracting: 5,
+    loadingLimit: 0,
     antialias: !1,
     iconErrorUrl: null,
     collisionFrameLimit: 1.5,
@@ -2549,6 +2550,7 @@ we.mergeOptions({
     pickingPoint: !0,
     renderer: "gl",
     collision: !1,
+    collisionBufferSize: 0,
     textGamma: 1,
     geometryEvents: !0,
     styleScale: 1,
@@ -7286,59 +7288,64 @@ class br extends Bi {
     isCollides(t) {
         const e = this.layer, n = e.getMap(), i = n.getDevicePixelRatio();
         if (a.scale(xr, t, 1 / i), n.isOffscreen(xr)) return -1;
-        return +e.getCollisionIndex().collides(t);
+        const r = e.getCollisionIndex(), s = this.sceneConfig.collisionBufferSize || e.options.collisionBufferSize || 0;
+        return s && (t = _r(xr, t, s)), +r.collides(t);
     }
     insertCollisionBox(t) {
-        this.layer.getCollisionIndex().insertBox(t);
+        const e = this.layer, n = e.getCollisionIndex(), i = this.sceneConfig.collisionBufferSize || e.options.collisionBufferSize || 0;
+        let r = t;
+        i && (r = t.as = t.as || [], t = _r(r, t, i)), n.insertBox(r);
     }
     addCollisionDebugBox(t, e) {
         if (t && t.length) if (Array.isArray(t[0])) for (let n = 0; n < t.length; n++) {
             const i = t[n];
-            this.as(i, e);
-        } else this.as(t, e);
+            this.ls(i, e);
+        } else this.ls(t, e);
     }
-    as(t, e) {
+    ls(t, e) {
         if (!t) return;
-        const n = this.ls = this.ls || {
+        const n = this.hs = this.hs || {
             aPosition: [],
             aVisible: [],
             indices: []
-        }, i = this.getMap(), r = i.getDevicePixelRatio();
-        if (a.scale(xr, t, 1 / r), i.isOffscreen(xr)) return;
-        const s = n.aPosition.length / 2;
+        }, i = this.sceneConfig.collisionBufferSize || this.layer.options.collisionBufferSize || 0;
+        i && (t = _r(xr, t, i));
+        const r = this.getMap(), s = r.getDevicePixelRatio();
+        if (a.scale(xr, t, 1 / s), r.isOffscreen(xr)) return;
+        const o = n.aPosition.length / 2;
         n.aPosition.push(t[0], t[1], t[2], t[1], t[2], t[3], t[0], t[3]), n.aVisible.push(e, e, e, e), 
-        n.indices.push(s, s + 1, s + 1, s + 2, s + 2, s + 3, s + 3, s);
+        n.indices.push(o, o + 1, o + 1, o + 2, o + 2, o + 3, o + 3, o);
     }
     updateCollision(t) {
-        super.updateCollision(t), this.Nr(), this.hs(), this.us && this.us.length && (this.cs(), 
-        this.us && (this.setToRedraw(), this.scene.addMesh(this.us)));
-        (this.getMap().isZooming() || this.us && this.us.length) && (this.fs(), this.ds(this.scene.getMeshes()));
+        super.updateCollision(t), this.Nr(), this.us(), this.cs && this.cs.length && (this.fs(), 
+        this.cs && (this.setToRedraw(), this.scene.addMesh(this.cs)));
+        (this.getMap().isZooming() || this.cs && this.cs.length) && (this.ds(), this.ps(this.scene.getMeshes()));
     }
     paint(t) {
         const e = super.paint(t);
-        return this.ps(t), !1 === this.Tr && this.setToRedraw(), e;
+        return this.ms(t), !1 === this.Tr && this.setToRedraw(), e;
     }
     shouldIgnoreBackground() {
-        return !this.getMap().isZooming() && !this.us;
+        return !this.getMap().isZooming() && !this.cs;
     }
-    hs() {
+    us() {
         const t = this.getMap(), e = t.isZooming();
         if (!e && this.Br) {
             const t = this.layer.getRenderer();
-            this.us = this.scene.getMeshes().filter(e => !t.isForeground(e) && !e.properties.isLinePlacement);
-        } else e && !this.Br && (this.ms = t.getResolution());
-        if (e) this.ys && (clearTimeout(this.ys), delete this.Xr, delete this.ys), this.Xr = this.ms && t.getResolution() > this.ms; else if (this.Br && !this.ys) {
+            this.cs = this.scene.getMeshes().filter(e => !t.isForeground(e) && !e.properties.isLinePlacement);
+        } else e && !this.Br && (this.ys = t.getResolution());
+        if (e) this.gs && (clearTimeout(this.gs), delete this.Xr, delete this.gs), this.Xr = this.ys && t.getResolution() > this.ys; else if (this.Br && !this.gs) {
             let {fadeOutDelay: t, fadingDuration: e} = this.sceneConfig;
-            It(t) && (t = pr), It(e) && (e = fr), this.ys = setTimeout(() => {
-                delete this.Xr, delete this.ys;
+            It(t) && (t = pr), It(e) && (e = fr), this.gs = setTimeout(() => {
+                delete this.Xr, delete this.gs;
             }, t + e + 1);
         }
         this.Br = e;
     }
-    ps(t) {
-        if (!this.ls || !this.layer.options.debugCollision) return;
-        this.os || this.gs();
-        const {aPosition: e, aVisible: i, indices: r} = this.ls;
+    ms(t) {
+        if (!this.hs || !this.layer.options.debugCollision) return;
+        this.os || this.vs();
+        const {aPosition: e, aVisible: i, indices: r} = this.hs;
         if (!this.rs) {
             const t = new n.Geometry({
                 aPosition: [],
@@ -7347,15 +7354,15 @@ class br extends Bi {
                 positionSize: 2,
                 primitive: "lines"
             });
-            this.rs = new n.Mesh(t), this.vs = new n.Scene, this.vs.addMesh(this.rs);
+            this.rs = new n.Mesh(t), this.xs = new n.Scene, this.xs.addMesh(this.rs);
         }
         const s = this.rs.geometry;
         s.updateData("aPosition", new Float32Array(e)), s.updateData("aVisible", new Uint8Array(i)), 
         s.setElements(r), this.os.render(this.ss, {
             size: [ this.canvas.width, this.canvas.height ]
-        }, this.vs, this.getRenderFBO(t)), delete this.ls;
+        }, this.xs, this.getRenderFBO(t)), delete this.hs;
     }
-    gs() {
+    vs() {
         const t = this.regl;
         this.os = new n.Renderer(t);
         const e = this.canvas, i = {
@@ -7384,17 +7391,17 @@ class br extends Bi {
             }
         });
     }
-    cs() {
+    fs() {
         let {fadeOutDelay: t, fadingDuration: e} = this.sceneConfig;
         It(t) && (t = pr), It(e) && (e = fr);
         const n = this.layer.getRenderer(), i = n.getCurrentTileZoom(), r = n.getFrameTimestamp(), s = [];
-        for (let o = 0; o < this.us.length; o++) {
-            const a = this.us[o], l = a.properties.tile;
+        for (let o = 0; o < this.cs.length; o++) {
+            const a = this.cs[o], l = a.properties.tile;
             !a.Yr && n.isBackTile(l.id) && (a.Yr = r);
             const h = l.z - i > 0 ? 2 * (l.z - i) - 1 : 2 * (i - l.z);
             a.properties.level = h, n.isForeground(a) || a.Yr && r - a.Yr > t + e ? delete a.Yr : s.push(a);
         }
-        delete this.us, s.length && (this.us = s);
+        delete this.cs, s.length && (this.cs = s);
     }
     isEnableCollision() {
         return this.layer.options.collision && !!this.sceneConfig.collision;
@@ -7405,7 +7412,7 @@ class br extends Bi {
     isMeshUniquePlaced(t) {
         return this.isMeshIterable(t);
     }
-    fs() {
+    ds() {
         if (!this.isEnableUniquePlacement()) return;
         const t = this.scene.getMeshes(), e = (t, e, n, i) => {
             const {start: r, end: s} = e[0], o = t.geometry.properties, a = o.elements;
@@ -7425,29 +7432,29 @@ class br extends Bi {
             this.isMeshUniquePlaced(i) && this.forEachBox(i, e);
         }
     }
-    ds(t) {
+    ps(t) {
         if (!this.isEnableUniquePlacement()) return;
         const e = this.getMap().getZoom();
-        let n = !this.xs || this.bs !== e;
-        if (!n) for (let e = 0; e < t.length; e++) if (!this.xs[t[e].properties.meshKey]) {
+        let n = !this.bs || this.As !== e;
+        if (!n) for (let e = 0; e < t.length; e++) if (!this.bs[t[e].properties.meshKey]) {
             n = !0;
             break;
         }
         if (!n) return;
-        this.bs = e, this.As = {}, this.xs = {}, t = t.sort(wr);
+        this.As = e, this.ws = {}, this.bs = {}, t = t.sort(wr);
         const i = this.getMap().getGLScale(), r = {};
         for (let e = 0; e < t.length; e++) {
             const n = t[e];
             if (!n.geometry) continue;
             const {meshKey: s} = n.properties;
-            this.xs[s] = 1;
+            this.bs[s] = 1;
             const {uniquePlacements: o} = n.geometry.properties;
             if (o) for (let t = 0; t < o.length; t++) {
                 if (!o[t]) continue;
                 const {key: e, index: s} = o[t], a = this.Wr(n), l = Ar(e, i), h = r[l];
                 if (h) {
                     const t = h.length, e = h[t - 3].properties.meshKey, i = h[t - 2], r = h[t - 1];
-                    this.As[e] = this.As[e] || {}, this.As[e][r] = 1, this.ws(a, s, i, r), h.push(n, a, s);
+                    this.ws[e] = this.ws[e] || {}, this.ws[e][r] = 1, this._s(a, s, i, r), h.push(n, a, s);
                 } else r[l] = [ n, a, s ];
             }
         }
@@ -7460,16 +7467,16 @@ class br extends Bi {
             }
         }
     }
-    ws(t, e, n, i) {
+    _s(t, e, n, i) {
         if (void 0 !== n[i]) if (void 0 === t[e]) t[e] = n[i]; else {
             let r = t[e];
             Math.abs(n[i]) > Math.abs(r) ? t[e] = n[i] : n[i] = t[e];
         } else void 0 !== t[e] && (n[i] = t[e]);
     }
     jr(t, e) {
-        return this.As && this.As[t] && this.As[t][e];
+        return this.ws && this.ws[t] && this.ws[t][e];
     }
-    _s(t, e) {
+    Ss(t, e) {
         const {symbolIndex: n} = t.properties, i = n.type || 0;
         let r = t.properties._collidesBoxes;
         r || (r = t.properties._collidesBoxes = []);
@@ -7487,15 +7494,15 @@ class br extends Bi {
         }
         return s[o];
     }
-    Ss(t) {
-        let e = this.Ms;
-        if (e || (e = this.Ms = []), !e[t]) {
+    Ms(t) {
+        let e = this.Ps;
+        if (e || (e = this.Ps = []), !e[t]) {
             e[t] = [];
             for (let n = 0; n < t; n++) e[t][n] = {};
         }
         return e[t];
     }
-    Ps(t) {
+    Ts(t) {
         if (!t || !t.geometry) return !0;
         if (!t.geometry.properties.glyphAtlas || !t.material.get("isHalo") || t.geometry.data.aTextHaloRadius && t.geometry.properties.hasHalo) return !1;
         if (t.geometry.data.aTextHaloRadius && !t.geometry.properties.hasHalo) return !0;
@@ -7512,109 +7519,113 @@ function wr(t, e) {
     return 0 === n ? t.properties.meshKey - e.properties.meshKey : n;
 }
 
-var _r = "#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 positionMatrix;\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;\nuniform float isRenderingTerrain;\n#include <vt_position_vert>\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vOpacity;\n#include <highlight_vert>\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 * positionMatrix * vec4(c, 1.);\n  float k = gl_Position.w;\n  float l;\n  if(isRenderingTerrain == 1. && i == 1.) {\n    l = 1.;\n  } else {\n    float m = (1. - cameraToCenterDistance / k) * markerPerspectiveRatio;\n    l = clamp(.5 + .5 * (1. - m), .0, 4.);\n  }\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 * l * k;\n  } else {\n    float C;\n    if(isRenderingTerrain == 1.) {\n      C = 1.;\n    } else {\n      C = k / cameraToCenterDistance;\n    }\n    vec2 B = A;\n    gl_Position = projViewModelMatrix * positionMatrix * vec4(c + vec3(B, .0) * tileRatio / zoomScale * C * l, 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\nhighlight_setVarying();\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}";
+function _r(t, e, n) {
+    return t[0] = e[0] - n, t[1] = e[1] - n, t[2] = e[2] + n, t[3] = e[3] + n, t;
+}
+
+var Sr = "#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 positionMatrix;\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;\nuniform float isRenderingTerrain;\n#include <vt_position_vert>\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vOpacity;\n#include <highlight_vert>\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 * positionMatrix * vec4(c, 1.);\n  float k = gl_Position.w;\n  float l;\n  if(isRenderingTerrain == 1. && i == 1.) {\n    l = 1.;\n  } else {\n    float m = (1. - cameraToCenterDistance / k) * markerPerspectiveRatio;\n    l = clamp(.5 + .5 * (1. - m), .0, 4.);\n  }\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 * l * k;\n  } else {\n    float C;\n    if(isRenderingTerrain == 1.) {\n      C = 1.;\n    } else {\n      C = k / cameraToCenterDistance;\n    }\n    vec2 B = A;\n    gl_Position = projViewModelMatrix * positionMatrix * vec4(c + vec3(B, .0) * tileRatio / zoomScale * C * l, 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\nhighlight_setVarying();\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 Sr = [], Mr = [], Pr = [], Tr = [], kr = [], Or = [];
+const Mr = [], Pr = [], Tr = [], kr = [], Or = [], Ir = [];
 
-function Ir(t, e, n, r, s, o, l, u, c, f, d, p, m, y) {
+function Fr(t, e, n, r, s, o, l, u, c, f, d, p, m, y) {
     const {tileRatio: g, tileResolution: v} = c, x = g / (v / f.getResolution()) * (d / f.cameraToCenterDistance) * p;
-    h.scale(n, n, x), h.scale(r, r, x), h.scale(s, s, x), h.scale(o, o, x), i.set(Sr, n[0], n[1], m ? n[2] / y : 0), 
-    i.set(Mr, r[0], r[1], m ? r[2] / y : 0), i.set(Pr, s[0], s[1], m ? s[2] / y : 0), 
-    i.set(Tr, o[0], o[1], m ? o[2] / y : 0), i.add(Sr, Sr, e), i.add(Mr, Mr, e), i.add(Pr, Pr, e), 
-    i.add(Tr, Tr, e), bi(n, Sr, l, f.width, f.height), bi(r, Mr, l, f.width, f.height), 
-    bi(s, Pr, l, f.width, f.height), bi(o, Tr, l, f.width, f.height), h.set(kr, Math.min(n[0], r[0], s[0], o[0]), Math.min(n[1], r[1], s[1], o[1])), 
-    h.set(Or, Math.max(n[0], r[0], s[0], o[0]), Math.max(n[1], r[1], s[1], o[1])), a.set(t, kr[0] + u[0], kr[1] + u[1], Or[0] + u[0], Or[1] + u[1]);
+    h.scale(n, n, x), h.scale(r, r, x), h.scale(s, s, x), h.scale(o, o, x), i.set(Mr, n[0], n[1], m ? n[2] / y : 0), 
+    i.set(Pr, r[0], r[1], m ? r[2] / y : 0), i.set(Tr, s[0], s[1], m ? s[2] / y : 0), 
+    i.set(kr, o[0], o[1], m ? o[2] / y : 0), i.add(Mr, Mr, e), i.add(Pr, Pr, e), i.add(Tr, Tr, e), 
+    i.add(kr, kr, e), bi(n, Mr, l, f.width, f.height), bi(r, Pr, l, f.width, f.height), 
+    bi(s, Tr, l, f.width, f.height), bi(o, kr, l, f.width, f.height), h.set(Or, Math.min(n[0], r[0], s[0], o[0]), Math.min(n[1], r[1], s[1], o[1])), 
+    h.set(Ir, Math.max(n[0], r[0], s[0], o[0]), Math.max(n[1], r[1], s[1], o[1])), a.set(t, Or[0] + u[0], Or[1] + u[1], Ir[0] + u[0], Ir[1] + u[1]);
 }
 
-function Fr(t, e, n, i, r, s, o, l) {
+function Cr(t, e, n, i, r, s, o, l) {
     1 !== l && (h.scale(n, n, l), h.scale(i, i, l), h.scale(r, r, l), h.scale(s, s, l)), 
-    h.set(kr, Math.min(n[0], i[0], r[0], s[0]), Math.min(n[1], i[1], r[1], s[1])), h.set(Or, Math.max(n[0], i[0], r[0], s[0]), Math.max(n[1], i[1], r[1], s[1])), 
-    a.set(t, e[0] + kr[0] + o[0], e[1] + kr[1] - o[1], e[0] + Or[0] + o[0], e[1] + Or[1] - o[1]);
+    h.set(Or, Math.min(n[0], i[0], r[0], s[0]), Math.min(n[1], i[1], r[1], s[1])), h.set(Ir, Math.max(n[0], i[0], r[0], s[0]), Math.max(n[1], i[1], r[1], s[1])), 
+    a.set(t, e[0] + Or[0] + o[0], e[1] + Or[1] - o[1], e[0] + Ir[0] + o[0], e[1] + Ir[1] - o[1]);
 }
 
-function Cr(t, e, n, i, r) {
+function Er(t, e, n, i, r) {
     e -= n * i, 1 === r && (e += n);
     const s = Math.sin(e), o = Math.cos(e);
     return u.set(t, o, -s, s, o);
 }
 
-const Er = [], Dr = [], Rr = [], Lr = [], Nr = [], Hr = [], zr = [], Vr = [], Ur = [ 1, -1 ], jr = [ 1, 1 ];
+const Dr = [], Rr = [], Lr = [], Nr = [], Hr = [], zr = [], Vr = [], Ur = [], jr = [ 1, -1 ], Br = [ 1, 1 ];
 
-function Br(t, e, n, r, s) {
-    const o = e.material.uniforms, a = s.cameraToCenterDistance, l = e.geometry.properties, u = this.getSymbol(l.symbolIndex), c = e.geometry.desc.positionSize, f = l.aAnchor, d = i.set(Er, f[n * c], f[n * c + 1], 2 === c ? 0 : f[n * c + 2]), {aTerrainAltitude: p} = l;
+function Gr(t, e, n, r, s) {
+    const o = e.material.uniforms, a = s.cameraToCenterDistance, l = e.geometry.properties, u = this.getSymbol(l.symbolIndex), c = e.geometry.desc.positionSize, f = l.aAnchor, d = i.set(Dr, f[n * c], f[n * c + 1], 2 === c ? 0 : f[n * c + 2]), {aTerrainAltitude: p} = l;
     if (p) {
         const t = 100 * p[2 * n];
         t && (d[2] += t);
     }
-    let m = bi(Dr, d, r, s.width, s.height);
+    let m = bi(Rr, d, r, s.width, s.height);
     const y = m[2];
     let g = 1;
     if (o.markerPerspectiveRatio) {
         g = kt(.5 + .5 * (1 - (1 - a / y) * o.markerPerspectiveRatio), 0, 4);
     }
-    const {aShape: v, aMarkerDx: x, aMarkerDy: b, aMarkerWidth: A, aMarkerHeight: w, aPitchAlign: _, aRotationAlign: S, aRotation: M} = l, P = x ? x[n] : u.markerDx, T = b ? b[n] : u.markerDy, k = _ ? _[n] : o.pitchWithMap, O = S ? S[n] : o.rotateWithMap, I = h.set(Vr, P || 0, -(T || 0));
-    let F = h.set(Lr, v[2 * n] / 10, v[2 * n + 1] / 10), C = h.set(Nr, v[2 * n + 2] / 10, v[2 * n + 3] / 10), E = h.set(Hr, v[2 * n + 4] / 10, v[2 * n + 5] / 10), D = h.set(zr, v[2 * n + 6] / 10, v[2 * n + 7] / 10);
-    0 === o.flipY && 1 === k && (h.multiply(F, F, Ur), h.multiply(C, C, Ur), h.multiply(E, E, Ur), 
-    h.multiply(D, D, Ur));
+    const {aShape: v, aMarkerDx: x, aMarkerDy: b, aMarkerWidth: A, aMarkerHeight: w, aPitchAlign: _, aRotationAlign: S, aRotation: M} = l, P = x ? x[n] : u.markerDx, T = b ? b[n] : u.markerDy, k = _ ? _[n] : o.pitchWithMap, O = S ? S[n] : o.rotateWithMap, I = h.set(Ur, P || 0, -(T || 0));
+    let F = h.set(Nr, v[2 * n] / 10, v[2 * n + 1] / 10), C = h.set(Hr, v[2 * n + 2] / 10, v[2 * n + 3] / 10), E = h.set(zr, v[2 * n + 4] / 10, v[2 * n + 5] / 10), D = h.set(Vr, v[2 * n + 6] / 10, v[2 * n + 7] / 10);
+    0 === o.flipY && 1 === k && (h.multiply(F, F, jr), h.multiply(C, C, jr), h.multiply(E, E, jr), 
+    h.multiply(D, D, jr));
     const [R, L] = $i(e.geometry);
     let N = A ? A[n] : u.markerWidth;
     It(N) && (N = R || 15);
     let H = w ? w[n] : u.markerHeight;
     It(H) && (H = L || 15);
-    const z = h.set(jr, N / 2048, H / 2048);
+    const z = h.set(Br, N / 2048, H / 2048);
     h.mul(F, F, z), h.mul(C, C, z), h.mul(E, E, z), h.mul(D, D, z);
     const V = -(M ? M[n] / 9362 : -(u.markerRotation || 0) * Math.PI / 180), U = s.getBearing() * Math.PI / 180;
     if (U * O || V) {
-        const t = Cr(Rr, V, U, O, k);
+        const t = Er(Lr, V, U, O, k);
         F = h.transformMat2(F, F, t), C = h.transformMat2(C, C, t), E = h.transformMat2(E, E, t), 
         D = h.transformMat2(D, D, t);
     }
-    1 === k ? Ir(t, d, F, C, E, D, r, I, o, s, y, g) : (h.multiply(F, F, Ur), h.multiply(C, C, Ur), 
-    h.multiply(E, E, Ur), h.multiply(D, D, Ur), Fr(t, m, F, C, E, D, I, g));
+    1 === k ? Fr(t, d, F, C, E, D, r, I, o, s, y, g) : (h.multiply(F, F, jr), h.multiply(C, C, jr), 
+    h.multiply(E, E, jr), h.multiply(D, D, jr), Cr(t, m, F, C, E, D, I, g));
     const j = this.getMap().getDevicePixelRatio();
     return 1 !== j && (t[0] *= j, t[1] *= j, t[2] *= j, t[3] *= j), t;
 }
 
-const Gr = [], Wr = [], Xr = [], Yr = [], $r = [], qr = [], Jr = [ 1, -1 ];
+const Wr = [], Xr = [], Yr = [], $r = [], qr = [], Jr = [], Kr = [ 1, -1 ];
 
-function Kr(t, e, n, r, s, o, a, l, u) {
+function Zr(t, e, n, r, s, o, a, l, u) {
     const c = r.material.uniforms, f = u.cameraToCenterDistance, d = r.geometry.properties, p = this.getSymbol(d.symbolIndex), m = "line" === p.textPlacement && !zt(p), y = n[2];
     let g = 1;
     if (c.textPerspectiveRatio) {
         g = kt(.5 + .5 * (1 - (1 - f / y) * c.textPerspectiveRatio), 0, 4);
     }
-    const {aTextDx: v, aTextDy: x, aPitchAlign: b, aRotationAlign: A, aRotation: w} = r.geometry.properties, _ = v ? v[a] : p.textDx, S = x ? x[a] : p.textDy, M = b ? b[a] : c.pitchWithMap, P = A ? A[a] : c.rotateWithMap, T = h.set(qr, _ || 0, -(S || 0));
+    const {aTextDx: v, aTextDy: x, aPitchAlign: b, aRotationAlign: A, aRotation: w} = r.geometry.properties, _ = v ? v[a] : p.textDx, S = x ? x[a] : p.textDy, M = b ? b[a] : c.pitchWithMap, P = A ? A[a] : c.rotateWithMap, T = h.set(Jr, _ || 0, -(S || 0));
     if (m) {
         const {aOffset: r, aShape: s} = d, o = r.length !== s.length;
         let f, p, m, v;
-        if (o ? (f = i.set(Wr, r[3 * a] / 10, r[3 * a + 1] / 10, r[3 * a + 2] / 10), p = i.set(Xr, r[3 * a + 3] / 10, r[3 * a + 4] / 10, r[3 * a + 5] / 10), 
-        m = i.set(Yr, r[3 * a + 6] / 10, r[3 * a + 7] / 10, r[3 * a + 8] / 10), v = i.set($r, r[3 * a + 9] / 10, r[3 * a + 10] / 10, r[3 * a + 11] / 10)) : (f = h.set(Wr, r[2 * a] / 10, r[2 * a + 1] / 10), 
-        p = h.set(Xr, r[2 * a + 2] / 10, r[2 * a + 3] / 10), m = h.set(Yr, r[2 * a + 4] / 10, r[2 * a + 5] / 10), 
-        v = h.set($r, r[2 * a + 6] / 10, r[2 * a + 7] / 10)), 1 === M) {
+        if (o ? (f = i.set(Xr, r[3 * a] / 10, r[3 * a + 1] / 10, r[3 * a + 2] / 10), p = i.set(Yr, r[3 * a + 3] / 10, r[3 * a + 4] / 10, r[3 * a + 5] / 10), 
+        m = i.set($r, r[3 * a + 6] / 10, r[3 * a + 7] / 10, r[3 * a + 8] / 10), v = i.set(qr, r[3 * a + 9] / 10, r[3 * a + 10] / 10, r[3 * a + 11] / 10)) : (f = h.set(Xr, r[2 * a] / 10, r[2 * a + 1] / 10), 
+        p = h.set(Yr, r[2 * a + 2] / 10, r[2 * a + 3] / 10), m = h.set($r, r[2 * a + 4] / 10, r[2 * a + 5] / 10), 
+        v = h.set(qr, r[2 * a + 6] / 10, r[2 * a + 7] / 10)), 1 === M) {
             const n = lt(u.getResolution(), u);
-            Ir(t, e, f, p, m, v, l, T, c, u, y, g, o, n);
-        } else h.multiply(f, f, Jr), h.multiply(p, p, Jr), h.multiply(m, m, Jr), h.multiply(v, v, Jr), 
-        Fr(t, n, f, p, m, v, T, g);
+            Fr(t, e, f, p, m, v, l, T, c, u, y, g, o, n);
+        } else h.multiply(f, f, Kr), h.multiply(p, p, Kr), h.multiply(m, m, Kr), h.multiply(v, v, Kr), 
+        Cr(t, n, f, p, m, v, T, g);
     } else {
         const {aShape: i} = d;
-        let r = h.set(Wr, i[2 * a] / 10, -i[2 * a + 1] / 10), o = h.set(Xr, i[2 * a + 2] / 10, -i[2 * a + 3] / 10), f = h.set(Yr, i[2 * a + 4] / 10, -i[2 * a + 5] / 10), v = h.set($r, i[2 * a + 6] / 10, -i[2 * a + 7] / 10);
-        0 === c.flipY && 1 === M && (h.multiply(r, r, Jr), h.multiply(o, o, Jr), h.multiply(f, f, Jr), 
-        h.multiply(v, v, Jr));
+        let r = h.set(Xr, i[2 * a] / 10, -i[2 * a + 1] / 10), o = h.set(Yr, i[2 * a + 2] / 10, -i[2 * a + 3] / 10), f = h.set($r, i[2 * a + 4] / 10, -i[2 * a + 5] / 10), v = h.set(qr, i[2 * a + 6] / 10, -i[2 * a + 7] / 10);
+        0 === c.flipY && 1 === M && (h.multiply(r, r, Kr), h.multiply(o, o, Kr), h.multiply(f, f, Kr), 
+        h.multiply(v, v, Kr));
         const x = w ? w[a] / 9362 : (p.textRotation || 0) * Math.PI / 180, b = m ? 0 : u.getBearing() * Math.PI / 180;
         if (x || b) {
-            const t = Cr(Gr, x, b, P, M);
+            const t = Er(Wr, x, b, P, M);
             r = h.transformMat2(r, r, t), o = h.transformMat2(o, o, t), f = h.transformMat2(f, f, t), 
             v = h.transformMat2(v, v, t);
         }
         const A = s / 24;
-        h.scale(r, r, A), h.scale(o, o, A), h.scale(f, f, A), h.scale(v, v, A), 1 === M ? Ir(t, e, r, o, f, v, l, T, c, u, y, g) : Fr(t, n, r, o, f, v, T, g);
+        h.scale(r, r, A), h.scale(o, o, A), h.scale(f, f, A), h.scale(v, v, A), 1 === M ? Fr(t, e, r, o, f, v, l, T, c, u, y, g) : Cr(t, n, r, o, f, v, T, g);
     }
     o = o || 0, t[0] -= o + 1, t[1] -= o + 1, t[2] += o + 1, t[3] += o + 1;
     const k = this.getMap().getDevicePixelRatio();
     return 1 !== k && (t[0] *= k, t[1] *= k, t[2] *= k, t[3] *= k), t;
 }
 
-function Zr(t, e, n) {
+function Qr(t, e, n) {
     const r = e.geometry.desc.positionSize, {aAnchor: s, aAltitude: o, aTerrainAltitude: a} = e.geometry.properties, l = n * r;
     if (o ? i.set(t, s[l], s[l + 1], o[n]) : 3 === r ? A.unpackPosition(t, s[l], s[l + 1], s[l + 2]) : i.set(t, s[l], s[l + 1], 0), 
     a) {
@@ -7624,7 +7635,7 @@ function Zr(t, e, n) {
     return t;
 }
 
-const Qr = {
+const ts = {
     textFill: [ 0, 0, 0, 1 ],
     textOpacity: 1,
     textPitchAlignment: 0,
@@ -7640,14 +7651,14 @@ const Qr = {
     textRotation: 0
 };
 
-function ts(t, e, i, r, s, o, a, l, h) {
+function es(t, e, i, r, s, o, a, l, h) {
     const u = [];
     if (e.isDisposed() || 0 === e.data.aPosition.length) return u;
     const c = e.properties.glyphAtlas;
     if (!c) return u;
     if (0 === r.textSize || 0 === r.textOpacity) return u;
     if (si(e, r, o), !e.properties.aCount) {
-        es.call(this, e, a || h, l);
+        ns.call(this, e, a || h, l);
         const {aTextSize: t, aTextDx: n, aTextDy: i, aPitchAlign: r, aRotationAlign: s, aRotation: o, aOverlap: u, aAltitude: c} = e.data;
         if (t) {
             const n = (ri + "aTextSize").trim();
@@ -7689,12 +7700,12 @@ function ts(t, e, i, r, s, o, a, l, h) {
         texture: f,
         texSize: [ c.width, c.height ]
     };
-    ns(e, d, s);
+    is(e, d, s);
     let p = !1;
     s.textOpacity < 1 && (p = !0), e.properties.memorySize = e.getMemorySize(), e.generateBuffers(t, {
         excludeElementsInVAO: !0
     });
-    const m = new n.Material(d, Qr), y = new n.Mesh(e, m, {
+    const m = new n.Material(d, ts), y = new n.Mesh(e, m, {
         disableVAO: !0,
         transparent: p,
         castShadow: !1,
@@ -7712,8 +7723,8 @@ function ts(t, e, i, r, s, o, a, l, h) {
             texSize: [ c.width, c.height ],
             isHalo: 0
         };
-        ns(e, t, s);
-        const r = new n.Material(t, Qr), o = new n.Mesh(e, r, {
+        is(e, t, s);
+        const r = new n.Material(t, ts), o = new n.Mesh(e, r, {
             disableVAO: !0,
             transparent: p,
             castShadow: !1,
@@ -7741,7 +7752,7 @@ function ts(t, e, i, r, s, o, a, l, h) {
     }), u;
 }
 
-function es(t, e, n) {
+function ns(t, e, n) {
     const i = this.getSymbol(t.properties.symbolIndex), r = "line" === t.properties.textPlacement && !zt(i), {aPosition: s, aShape: o} = t.data, a = s.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 = s, t.properties.aShape = o), 
@@ -7771,18 +7782,18 @@ function es(t, e, n) {
     }
 }
 
-function ns(t, e, n) {
-    void 0 === e.isHalo && (e.isHalo = 1), Ct(e, "textOpacity", n, "textOpacity", Qr.textOpacity), 
-    Ct(e, "textFill", n, "textFill", Qr.textFill, Rt()), Ct(e, "textHaloFill", n, "textHaloFill", Qr.textHaloFill, Rt()), 
-    Ct(e, "textHaloBlur", n, "textHaloBlur", Qr.textHaloBlur), Ct(e, "textHaloRadius", n, "textHaloRadius", Qr.textHaloRadius), 
-    Ct(e, "textHaloOpacity", n, "textHaloOpacity", Qr.textHaloOpacity), Ct(e, "textPerspectiveRatio", n, "textPerspectiveRatio", Qr.textPerspectiveRatio, e => "line" === t.properties.textPlacement ? 1 : e), 
-    Ct(e, "rotateWithMap", n, "textRotationAlignment", Qr.textRotationAlignment, t => +("map" === t)), 
-    Ct(e, "pitchWithMap", n, "textPitchAlignment", Qr.textPitchAlignment, t => +("map" === t)), 
-    Ct(e, "textSize", n, "textSize", Qr.textSize), Ct(e, "textDx", n, "textDx", Qr.textDx), 
-    Ct(e, "textDy", n, "textDy", Qr.textDy), Ct(e, "textRotation", n, "textRotation", Qr.textRotation, t => t * Math.PI / 180);
+function is(t, e, n) {
+    void 0 === e.isHalo && (e.isHalo = 1), Ct(e, "textOpacity", n, "textOpacity", ts.textOpacity), 
+    Ct(e, "textFill", n, "textFill", ts.textFill, Rt()), Ct(e, "textHaloFill", n, "textHaloFill", ts.textHaloFill, Rt()), 
+    Ct(e, "textHaloBlur", n, "textHaloBlur", ts.textHaloBlur), Ct(e, "textHaloRadius", n, "textHaloRadius", ts.textHaloRadius), 
+    Ct(e, "textHaloOpacity", n, "textHaloOpacity", ts.textHaloOpacity), Ct(e, "textPerspectiveRatio", n, "textPerspectiveRatio", ts.textPerspectiveRatio, e => "line" === t.properties.textPlacement ? 1 : e), 
+    Ct(e, "rotateWithMap", n, "textRotationAlignment", ts.textRotationAlignment, t => +("map" === t)), 
+    Ct(e, "pitchWithMap", n, "textPitchAlignment", ts.textPitchAlignment, t => +("map" === t)), 
+    Ct(e, "textSize", n, "textSize", ts.textSize), Ct(e, "textDx", n, "textDx", ts.textDx), 
+    Ct(e, "textDy", n, "textDy", ts.textDy), Ct(e, "textRotation", n, "textRotation", ts.textRotation, t => t * Math.PI / 180);
 }
 
-function is(t, e) {
+function rs(t, e) {
     const n = [];
     return {
         uniforms: [ {
@@ -7841,7 +7852,7 @@ function is(t, e) {
     };
 }
 
-function rs(t, e) {
+function ss(t, e) {
     const n = g(e.textFill), i = g(e.textSize), r = g(e.textHaloFill), s = g(e.textHaloRadius), o = g(e.textHaloOpacity), a = g(e.textDx), l = g(e.textDy), h = g(e.textOpacity), u = y(e.textPitchAlignment), c = y(e.textRotationAlignment), f = g(e.textRotation), d = y(e.textAllowOverlapFn), m = y(e.textIgnorePlacement), v = {}, x = new Int16Array(1), b = new Uint16Array(1);
     return [ {
         attrName: "aTextFill",
@@ -7861,7 +7872,7 @@ function rs(t, e) {
         type: Uint8Array,
         width: 1,
         evaluate: (e, n) => {
-            let r = i(t.getZoom(), e) || Qr.textSize;
+            let r = i(t.getZoom(), e) || ts.textSize;
             return p(r) && (r = this.evaluateInFnTypeConfig(r, n, t, e)), x[0] = r, x[0];
         }
     }, {
@@ -7969,25 +7980,25 @@ function rs(t, e) {
     } ];
 }
 
-const ss = [], os = [], as = [], ls = [];
+const os = [], as = [], ls = [], hs = [];
 
-function hs(t, e, n, i, r, s, o) {
+function us(t, e, n, i, r, s, o) {
     t = 1 === t ? 1 : 0;
     const a = this.getMap(), l = e.geometry.properties, h = this.getSymbol(l.symbolIndex), u = "line" === l.textPlacement && !zt(h), {aTextSize: c, aTextHaloRadius: f, aShape: d} = l;
     let p = c ? c[n[r]] : e.properties.textSize;
-    null == p && (p = Qr.textSize);
-    const m = f ? f[n[r]] : e.properties.textHaloRadius, y = Zr(as, e, n[r]), {aProjectedAnchor: g} = e.geometry.properties;
-    let v = ls;
+    null == p && (p = ts.textSize);
+    const m = f ? f[n[r]] : e.properties.textHaloRadius, y = Qr(ls, e, n[r]), {aProjectedAnchor: g} = e.geometry.properties;
+    let v = hs;
     const x = 3 * n[r];
-    g && -999999 !== g[x] ? (ls[0] = g[x], ls[1] = g[x + 1], ls[2] = g[x + 2]) : v = bi(ls, y, o, a.width, a.height);
-    const b = i, {boxes: A, collision: w} = this._s(e, r);
+    g && -999999 !== g[x] ? (hs[0] = g[x], hs[1] = g[x + 1], hs[2] = g[x + 2]) : v = bi(hs, y, o, a.width, a.height);
+    const b = i, {boxes: A, collision: w} = this.Ss(e, r);
     let _ = 0;
     if (u || 1 === e.material.uniforms.rotateWithMap || h.textRotation) {
         let i = 0;
         for (let s = r; s < r + 6 * b; s += 6) {
             const r = A[_] = A[_] || [];
             _++;
-            const l = Kr.call(this, r, y, v, e, p, m, n[s], o, a);
+            const l = Zr.call(this, r, y, v, e, p, m, n[s], o, a);
             if (!t) {
                 const e = this.isCollides(l);
                 1 === e ? t = 1 : -1 === e && i++;
@@ -7999,7 +8010,7 @@ function hs(t, e, n, i, r, s, o) {
         for (let h = r; h < s; h += 6) {
             const r = d[2 * n[h] + 1];
             if (l !== r || h === s - 6) {
-                const u = n[h === s - 6 ? h : h - 6], c = Kr.call(this, ss, y, v, e, p, m, i, o, a), f = Kr.call(this, os, y, v, e, p, m, u, o, a), d = A[_] = A[_] || [];
+                const u = n[h === s - 6 ? h : h - 6], c = Zr.call(this, os, y, v, e, p, m, i, o, a), f = Zr.call(this, as, y, v, e, p, m, u, o, a), d = A[_] = A[_] || [];
                 _++, d[0] = Math.min(c[0], f[0]), d[1] = Math.min(c[1], f[1]), d[2] = Math.max(c[2], f[2]), 
                 d[3] = Math.max(c[3], f[3]), i = n[h], l = r, !t && this.isCollides(d) && (t = 1);
             }
@@ -8008,29 +8019,29 @@ function hs(t, e, n, i, r, s, o) {
     return w.collides = t, w;
 }
 
-function us(t, e) {
+function cs(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 = Zr(cs, t, e);
-        a.set(fs, r[0], r[1], r[2], 1);
-        const s = a.transformMat4(fs, fs, i);
+        const i = t.localTransform, r = Qr(fs, t, e);
+        a.set(ds, r[0], r[1], r[2], 1);
+        const s = a.transformMat4(ds, ds, i);
         let o = 0;
         for (let t = 0; t < n.length; t++) o += n.charCodeAt(t);
         return [ Math.floor(s[0]), Math.floor(s[1]), Math.floor(s[2]), o ];
     }(t, e, n) : null;
 }
 
-const cs = [], fs = [];
+const fs = [], ds = [];
 
-var ds = "#define SHADER_NAME TEXT_VERT\n#define RAD 0.0174532925\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec2 aShape;\nattribute vec2 aTexCoord;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float 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 positionMatrix;\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;\nuniform float isRenderingTerrain;\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#include <highlight_vert>\n#else\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_TEXT_SIZE\nfloat d = aTextSize * layerScale;\n#else\nfloat d = textSize * layerScale;\n#endif\n#ifdef HAS_TEXT_DX\nfloat e = aTextDx;\n#else\nfloat e = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat f = aTextDy;\n#else\nfloat f = textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nfloat h = aPitchAlign;\n#else\nfloat h = 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 * positionMatrix * vec4(c, 1.);\n  float l = gl_Position.w;\n  float m;\n  if(isRenderingTerrain == 1. && h == 1.) {\n    m = 1.;\n  } else {\n    float n = (1. - cameraToCenterDistance / l) * textPerspectiveRatio;\n    m = clamp(.5 + .5 * (1. - n), .0, 4.);\n  }\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;\n  if(isRenderingTerrain == 1.) {\n    B = 1.;\n  } else {\n    B = l / cameraToCenterDistance;\n  }\n  if(h == .0) {\n    vec2 C = j * 2. / canvasSize;\n    gl_Position.xy += C * m * l;\n  } else {\n    float D;\n    if(isRenderingTerrain == 1.) {\n      D = tileRatio / zoomScale;\n    } else {\n      D = tileRatio / zoomScale * B * m;\n    }\n    vec2 C = j;\n    gl_Position = projViewModelMatrix * positionMatrix * vec4(c + vec3(C, .0) * D, 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\nhighlight_setVarying();\n#else\n#ifdef ENABLE_COLLISION\nbool E = aOpacity == 255.;\n#else\nbool E = true;\n#endif\nfbo_picking_setData(gl_Position.w, E);\n#endif\n}", ps = "#define SHADER_NAME TEXT_FRAG\n#define HAS_HIGHLIGHT_COLOR_POINT 1\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;\nuniform float alphaTest;\n#ifdef HAS_TEXT_HALO_OPACITY\nvarying float vTextHaloOpacity;\n#else\nuniform float textHaloOpacity;\n#endif\nuniform float layerOpacity;\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\n#include <highlight_frag>\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 * layerOpacity);\n  if(gl_FragColor.a < alphaTest) {\n    discard;\n  }\n  gl_FragColor = highlight_blendColor(gl_FragColor);\n}";
+var ps = "#define SHADER_NAME TEXT_VERT\n#define RAD 0.0174532925\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec2 aShape;\nattribute vec2 aTexCoord;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float 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 positionMatrix;\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;\nuniform float isRenderingTerrain;\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#include <highlight_vert>\n#else\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_TEXT_SIZE\nfloat d = aTextSize * layerScale;\n#else\nfloat d = textSize * layerScale;\n#endif\n#ifdef HAS_TEXT_DX\nfloat e = aTextDx;\n#else\nfloat e = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat f = aTextDy;\n#else\nfloat f = textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nfloat h = aPitchAlign;\n#else\nfloat h = 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 * positionMatrix * vec4(c, 1.);\n  float l = gl_Position.w;\n  float m;\n  if(isRenderingTerrain == 1. && h == 1.) {\n    m = 1.;\n  } else {\n    float n = (1. - cameraToCenterDistance / l) * textPerspectiveRatio;\n    m = clamp(.5 + .5 * (1. - n), .0, 4.);\n  }\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;\n  if(isRenderingTerrain == 1.) {\n    B = 1.;\n  } else {\n    B = l / cameraToCenterDistance;\n  }\n  if(h == .0) {\n    vec2 C = j * 2. / canvasSize;\n    gl_Position.xy += C * m * l;\n  } else {\n    float D;\n    if(isRenderingTerrain == 1.) {\n      D = tileRatio / zoomScale;\n    } else {\n      D = tileRatio / zoomScale * B * m;\n    }\n    vec2 C = j;\n    gl_Position = projViewModelMatrix * positionMatrix * vec4(c + vec3(C, .0) * D, 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\nhighlight_setVarying();\n#else\n#ifdef ENABLE_COLLISION\nbool E = aOpacity == 255.;\n#else\nbool E = true;\n#endif\nfbo_picking_setData(gl_Position.w, E);\n#endif\n}", ms = "#define SHADER_NAME TEXT_FRAG\n#define HAS_HIGHLIGHT_COLOR_POINT 1\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;\nuniform float alphaTest;\n#ifdef HAS_TEXT_HALO_OPACITY\nvarying float vTextHaloOpacity;\n#else\nuniform float textHaloOpacity;\n#endif\nuniform float layerOpacity;\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\n#include <highlight_frag>\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 * layerOpacity);\n  if(gl_FragColor.a < alphaTest) {\n    discard;\n  }\n  gl_FragColor = highlight_blendColor(gl_FragColor);\n}";
 
-const ms = new Uint16Array(1), ys = new Int8Array(1);
+const ys = new Uint16Array(1), gs = new Int8Array(1);
 
-function gs(t, e, n) {
+function vs(t, e, n) {
     si(t, e, n), function(t) {
         const {aMarkerWidth: e, aMarkerHeight: n, aMarkerDx: i, aMarkerDy: r, aPitchAlign: s, aRotationAlign: o, aRotation: a, aOverlap: l} = t.data;
         if (e) {
@@ -8068,7 +8079,7 @@ function gs(t, e, n) {
     }(t);
 }
 
-function vs(t, e) {
+function xs(t, e) {
     const n = g(e.markerWidth), i = g(e.markerHeight), r = g(e.markerDx), s = g(e.markerDy), o = g(e.markerOpacity), a = g(e.markerTextFit), l = y(e.markerPitchAlignment), h = y(e.markerRotationAlignment), u = g(e.markerRotation), c = y(e.markerAllowOverlapFn), f = y(e.markerIgnorePlacement), d = new Int16Array(1), m = new Uint16Array(1);
     return [ {
         attrName: "aMarkerWidth",
@@ -8169,7 +8180,7 @@ function vs(t, e) {
     } ];
 }
 
-function xs(t, e, n, i) {
+function bs(t, e, n, i) {
     if (!n || !i || "none" === i) return;
     const r = function(t, e, n) {
         let i = t.properties.textFitFn;
@@ -8238,11 +8249,11 @@ function xs(t, e, n, i) {
             if (!s) return [];
             return n;
         }(e, n);
-        i.length && (e.properties.labelShape = i, bs.call(this, t, e, n));
+        i.length && (e.properties.labelShape = i, As.call(this, t, e, n));
     }
 }
 
-function bs(t, e) {
+function As(t, e) {
     const n = this.getSymbolDef(e.properties.symbolIndex), i = n.markerTextFit, r = e.properties;
     let s = "both" === i || "width" === i, o = "both" === i || "height" === i;
     if (p(n.markerTextFit)) {
@@ -8285,22 +8296,22 @@ function bs(t, e) {
         e.data.aMarkerHeight = new Uint16Array(u);
     }
     const c = this.getSymbolDef(e.properties.textGeo.properties.symbolIndex), f = g(c.textSize);
-    ws.call(this, t, e), (!p(c.textSize) || f.isZoomConstant && f.isFeatureConstant) && (r.isFitConstant = !0);
+    _s.call(this, t, e), (!p(c.textSize) || f.isZoomConstant && f.isFeatureConstant) && (r.isFitConstant = !0);
 }
 
-const As = [ 0, 0, 0, 0 ];
+const ws = [ 0, 0, 0, 0 ];
 
-function ws(t, e) {
+function _s(t, e) {
     const n = e.properties.textGeo;
     if (!n) return;
     const i = n.properties, r = e.properties;
     if (r.isFitConstant || !r.labelShape || !r.labelShape.length) return;
     const s = this.getSymbolDef(e.properties.symbolIndex), o = this.getSymbolDef(n.properties.symbolIndex).textSize;
     let a;
-    p(o) && (a = i.Ts ? i.Ts : i.Ts = g(o));
-    const l = s.markerTextFitPadding || As;
+    p(o) && (a = i.ks ? i.ks : i.ks = g(o));
+    const l = s.markerTextFitPadding || ws;
     let h;
-    p(l) && (h = r.ks ? r.ks : r.ks = y(l));
+    p(l) && (h = r.Os ? r.Os : r.Os = y(l));
     const u = t.getZoom(), {fitIcons: c, fitWidthIcons: f, fitHeightIcons: d} = r, {aMarkerWidth: m, aMarkerHeight: v, labelShape: x} = r, b = r.elements || e.elements, {features: A, aPickingId: w} = r, _ = (t, e, n, i) => {
         const s = x[4 * e], c = x[4 * e + 1], f = x[4 * e + 2], d = x[4 * e + 3];
         if (!(s || c || f || d)) return;
@@ -8314,20 +8325,20 @@ function ws(t, e) {
         if (p(k)) {
             k = (S.fitPaddingFn = S.fitPaddingFn || y(k))(u, S);
         }
-        if (k = k || As, k[0] === k[2] && k[1] === k[3] || (P = r.aPadOffsetX, T = r.aPadOffsetY, 
+        if (k = k || ws, k[0] === k[2] && k[1] === k[3] || (P = r.aPadOffsetX, T = r.aPadOffsetY, 
         P || (P = r.aPadOffsetX = new Int8Array(m.length), T = r.aPadOffsetY = new Int8Array(m.length))), 
         m && n) {
             const e = Math.abs((f - s) / 10 * M) + (k[1] + k[3] || 0);
-            if (ms[0] = e, m[t] !== ms[0] && (Nt(m, ms[0], t, t + 4), m.dirty = !0), P) {
+            if (ys[0] = e, m[t] !== ys[0] && (Nt(m, ys[0], t, t + 4), m.dirty = !0), P) {
                 const e = (k[1] + k[3]) / 2 - k[3];
-                ys[0] = e, P[t] !== ys[0] && (Nt(P, e, t, t + 4), P.dirty = !0);
+                gs[0] = e, P[t] !== gs[0] && (Nt(P, e, t, t + 4), P.dirty = !0);
             }
         }
         if (v && i) {
             const e = Math.abs((d - c) / 10 * M) + (k[0] + k[2] || 0);
-            if (ms[0] = e, v[t] !== ms[0] && (Nt(v, ms[0], t, t + 4), v.dirty = !0), T) {
+            if (ys[0] = e, v[t] !== ys[0] && (Nt(v, ys[0], t, t + 4), v.dirty = !0), T) {
                 const e = k[0] - (k[0] + k[2]) / 2;
-                ys[0] = e, T[t] !== ys[0] && (Nt(T, e, t, t + 4), T.dirty = !0);
+                gs[0] = e, T[t] !== gs[0] && (Nt(T, e, t, t + 4), T.dirty = !0);
             }
         }
     };
@@ -8353,30 +8364,30 @@ function ws(t, e) {
     S && (e.data.aPadOffsetX = S, e.data.aPadOffsetY = M);
 }
 
-const _s = function(t) {
-    const e = this.layer.getRenderer();
-    return !this.Ps(t) && e.isForeground(t) && !!t.geometry.properties.iconAtlas && !t.geometry.properties.isEmpty;
-}, Ss = function(t) {
+const Ss = function(t) {
     const e = this.layer.getRenderer();
-    return !(this.Ps(t) || e.isForeground(t) || !t.geometry.properties.iconAtlas || t.geometry.properties.isEmpty);
+    return !this.Ts(t) && e.isForeground(t) && !!t.geometry.properties.iconAtlas && !t.geometry.properties.isEmpty;
 }, Ms = function(t) {
     const e = this.layer.getRenderer();
-    return !this.Ps(t) && e.isForeground(t) && !!t.geometry.properties.glyphAtlas;
+    return !(this.Ts(t) || e.isForeground(t) || !t.geometry.properties.iconAtlas || t.geometry.properties.isEmpty);
 }, Ps = function(t) {
     const e = this.layer.getRenderer();
-    return !this.Ps(t) && !e.isForeground(t) && !!t.geometry.properties.glyphAtlas;
-}, Ts = [], ks = {
+    return !this.Ts(t) && e.isForeground(t) && !!t.geometry.properties.glyphAtlas;
+}, Ts = function(t) {
+    const e = this.layer.getRenderer();
+    return !this.Ts(t) && !e.isForeground(t) && !!t.geometry.properties.glyphAtlas;
+}, ks = [], Os = {
     collides: -1
-}, Os = [ 2048, 2048 ], Is = r.identity([]), Fs = [];
+}, Is = [ 2048, 2048 ], Fs = r.identity([]), Cs = [];
 
-class Cs extends br {
+class Es extends br {
     static getBloomSymbol() {
         return [ "markerBloom", "textBloom" ];
     }
     constructor(t, e, n, i, r, s) {
         super(t, e, n, i, r, s), this.propAllowOverlap = "markerAllowOverlap", this.propIgnorePlacement = "markerIgnorePlacement", 
-        this.Zi = {}, this.isLabelCollides = hs.bind(this), this.Os = _s.bind(this), this.Is = Ss.bind(this), 
-        this.Fs = Ms.bind(this), this.Cs = Ps.bind(this), this.Es = [];
+        this.Zi = {}, this.isLabelCollides = us.bind(this), this.Is = Ss.bind(this), this.Fs = Ms.bind(this), 
+        this.Cs = Ps.bind(this), this.Es = Ts.bind(this), this.Ds = [];
     }
     needToRefreshTerrainTileOnZooming() {
         for (let t = 0; t < this.symbolDef.length; t++) {
@@ -8392,16 +8403,16 @@ class Cs extends br {
         return super.isTerrainSkin() && this.needToRefreshTerrainTileOnZooming();
     }
     setTextShaderDefines(t) {
-        this.Ds = t;
+        this.Rs = t;
     }
     createFnTypeConfig(t, e) {
         return {
-            icon: vs.call(this, t, e),
-            text: rs.call(this, t, e)
+            icon: xs.call(this, t, e),
+            text: ss.call(this, t, e)
         };
     }
     startFrame(...t) {
-        return this.Es.length = 0, super.startFrame(...t);
+        return this.Ds.length = 0, super.startFrame(...t);
     }
     createGeometry(t, e) {
         return t && t.empty && (t.data = {
@@ -8411,14 +8422,14 @@ class Cs extends br {
     }
     postCreateGeometry(t, e) {
         const {geometry: n, symbolIndex: i} = t, r = this.getSymbolDef(i), s = this.getFnTypeConfig(i);
-        if (this.Rs(n)) n.properties.iconAtlas ? this.drawDebugAtlas(n.properties.iconAtlas) : n.properties.isEmpty = !0, 
-        gs(n, r, s.icon); else if (this.Ls(n) && zt(r)) {
+        if (this.Ls(n)) n.properties.iconAtlas ? this.drawDebugAtlas(n.properties.iconAtlas) : n.properties.isEmpty = !0, 
+        vs(n, r, s.icon); else if (this.Ns(n) && zt(r)) {
             const t = e[e.length - 1];
             if (t) {
                 const {geometry: e, symbolIndex: s} = t;
                 if (e && s.index === i.index) {
                     const t = this.getMap(), i = r.markerTextFit;
-                    e.properties.textGeo = n, xs.call(this, t, e, n, i);
+                    e.properties.textGeo = n, bs.call(this, t, e, n, i);
                 }
             }
         }
@@ -8438,7 +8449,7 @@ class Cs extends br {
         const s = this.isEnableCollision(), o = this.layer, {geometry: a, symbolIndex: l} = t;
         a.properties.symbolIndex = l;
         const h = this.getSymbolDef(l), u = this.getSymbol(l), c = this.getFnTypeConfig(l), f = [];
-        if (this.Rs(a)) {
+        if (this.Ls(a)) {
             const t = function(t, e, i, r, s, o, a, l) {
                 if (e.isDisposed() || 0 === e.data.aPosition.length) return null;
                 const h = e.properties.iconAtlas;
@@ -8483,25 +8494,25 @@ class Cs extends br {
             }(this.regl, a, e, 0, u, c.icon, o.options.collision, !s, this.isEnableUniquePlacement());
             t && (t.positionMatrix = this.getAltitudeOffsetMatrix(), delete t.geometry.properties.glyphAtlas, 
             f.push(t));
-        } else if (this.Ls(a)) {
-            const t = ts.call(this, this.regl, a, e, h, u, c.text, o.options.collision, !s, this.isEnableUniquePlacement());
+        } else if (this.Ns(a)) {
+            const t = es.call(this, this.regl, a, e, h, u, c.text, o.options.collision, !s, this.isEnableUniquePlacement());
             t.length && (t.forEach(t => {
                 t.positionMatrix = this.getAltitudeOffsetMatrix(), delete t.geometry.properties.iconAtlas;
             }), f.push(...t));
         }
-        return "line" === a.properties.markerPlacement && this.Ns(a, r), "line" === a.properties.markerPlacement && f.forEach(t => t.properties.isLinePlacement = !0), 
+        return "line" === a.properties.markerPlacement && this.Hs(a, r), "line" === a.properties.markerPlacement && f.forEach(t => t.properties.isLinePlacement = !0), 
         this.prepareCollideIndex(a), f;
     }
-    Ns(t, e) {
+    Hs(t, e) {
         const {collideIds: n} = t.properties, i = new Uint16Array(n.length);
-        if (this.Rs(t)) {
+        if (this.Ls(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 = Ut(i), e.markerCollideMap = {
                 old: n,
                 new: i
             };
-        } else if (this.Ls(t)) {
+        } else if (this.Ns(t)) {
             const {collideIds: n, aCount: i} = t.properties;
             if (!i) return;
             if (e.markerCollideMap) {
@@ -8528,12 +8539,12 @@ class Cs extends br {
         if (this.isEnableCollision() && t.length > 0) {
             const e = new cr(t);
             e.properties.uniqueCollideIds = t[0].geometry.properties.uniqueCollideIds, e.properties.meshKey = t[0].properties.meshKey, 
-            e.properties.level = t[0].properties.level, this.Es.push(e);
+            e.properties.level = t[0].properties.level, this.Ds.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;
-            zt(this.getSymbolDef(i)) && ws.call(this, this.getMap(), n);
+            zt(this.getSymbolDef(i)) && _s.call(this, this.getMap(), n);
         }
         const e = this.getMap().getZoom();
         for (let n = 0; n < t.length; n++) {
@@ -8551,33 +8562,33 @@ class Cs extends br {
         if (!this.isEnableCollision()) return;
         super.updateCollision(t);
         const e = this.scene.getMeshes();
-        e && e.length ? (this.Hs(t.timestamp), this.Es = [], this.zr()) : this.zr();
+        e && e.length ? (this.zs(t.timestamp), this.Ds = [], this.zr()) : this.zr();
     }
     callCurrentTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.Os, e.sceneFilter ] : this.Os, this.callRenderer(this.shader, t, e), 
-        this.zs.filter = e.sceneFilter ? [ this.Fs, e.sceneFilter ] : this.Fs, this.callRenderer(this.zs, t, e);
+        this.shader.filter = e.sceneFilter ? [ this.Is, e.sceneFilter ] : this.Is, this.callRenderer(this.shader, t, e), 
+        this.Vs.filter = e.sceneFilter ? [ this.Cs, e.sceneFilter ] : this.Cs, this.callRenderer(this.Vs, t, e);
     }
     callBackgroundTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.Is, e.sceneFilter ] : this.Is, this.callRenderer(this.shader, t, e), 
-        this.zs.filter = e.sceneFilter ? [ this.Cs, e.sceneFilter ] : this.Cs, this.callRenderer(this.zs, t, e);
+        this.shader.filter = e.sceneFilter ? [ this.Fs, e.sceneFilter ] : this.Fs, this.callRenderer(this.shader, t, e), 
+        this.Vs.filter = e.sceneFilter ? [ this.Es, e.sceneFilter ] : this.Es, this.callRenderer(this.Vs, t, e);
     }
     isMeshIterable(t) {
         return t && t.geometry && !t.geometry.properties.isEmpty && t.material && !t.material.get("isHalo") && this.isMeshVisible(t) && !(this.shouldIgnoreBackground() && !this.layer.getRenderer().isForeground(t));
     }
-    Hs() {
+    zs() {
         if (!this.isEnableCollision()) return;
-        let t = this.Es;
-        t && t.length && this.Vs(t);
+        let t = this.Ds;
+        t && t.length && this.Us(t);
     }
-    Us(t, e, n, i) {
+    js(t, e, n, i) {
         return this.updateBoxCollisionFading(!0, t, e, n, i);
     }
     isEnableUniquePlacement() {
         return this.isEnableCollision() && !0 === this.sceneConfig.uniquePlacement;
     }
-    Vs(t) {
+    Us(t) {
         const e = this.layer.getRenderer();
-        t = t.sort(Es);
+        t = t.sort(Ds);
         for (let n = 0; n < t.length; n++) {
             const i = t[n];
             if (!i || !i.meshes.length) continue;
@@ -8590,12 +8601,12 @@ class Cs extends br {
             const s = e.isForeground(i.meshes[0]);
             if (this.shouldIgnoreBackground() && !s) continue;
             const o = i.properties.meshKey;
-            this.startMeshCollision(i), this.js(i), this.forEachBox(i, this.Us), this.Bs(i), 
+            this.startMeshCollision(i), this.Bs(i), this.forEachBox(i, this.js), this.Gs(i), 
             this.endMeshCollision(o);
-            for (let t = 0; t < i.meshes.length; t++) this.Gs(i.meshes[t]);
+            for (let t = 0; t < i.meshes.length; t++) this.Ws(i.meshes[t]);
         }
     }
-    Gs(t) {
+    Ws(t) {
         const e = t && t.geometry && t.geometry.properties.aOpacity;
         e && e.dirty && (t.geometry.updateData("aOpacity", e), e.dirty = !1);
     }
@@ -8605,12 +8616,12 @@ class Cs extends br {
         const i = {
             boxIndex: 0
         }, r = n.length;
-        for (let s = 0; s < r; s++) this.Ws(t, n[s], e, i);
+        for (let s = 0; s < r; s++) this.Xs(t, n[s], e, i);
     }
-    Ws(t, e, n, i) {
+    Xs(t, e, n, i) {
         const s = this.getMap(), {collideBoxIndex: o} = t.meshes[0].geometry.properties;
         if (!(o && o[e])) return !1;
-        const a = r.multiply(Ts, s.projViewMatrix, t.meshes[0].localTransform);
+        const a = r.multiply(ks, s.projViewMatrix, t.meshes[0].localTransform);
         let l, h = !1;
         const u = t.meshes;
         let c = 0;
@@ -8620,7 +8631,7 @@ class Cs extends br {
             n[e] && c++;
         }
         if (!c) return !1;
-        l = this.Ss(c);
+        l = this.Ms(c);
         let f = 0;
         for (let t = 0; t < u.length; t++) {
             const n = u[t];
@@ -8636,16 +8647,16 @@ class Cs extends br {
             l[f].allElements = r, f++;
         }
         if (!h) return !1;
-        return n.call(this, t, l, a, i.boxIndex++) && this.Xs(t, e), !0;
+        return n.call(this, t, l, a, i.boxIndex++) && this.Ys(t, e), !0;
     }
-    js(t) {
+    Bs(t) {
         const e = t.meshes;
         for (let t = 0; t < e.length; t++) {
             const n = e[t], i = n && n.geometry;
             i && (i.properties.visElemts.count = 0);
         }
     }
-    Xs(t, e) {
+    Ys(t, e) {
         const n = t.meshes;
         for (let t = 0; t < n.length; t++) {
             const i = n[t];
@@ -8660,7 +8671,7 @@ class Cs extends br {
             a.count = c;
         }
     }
-    Bs(t) {
+    Gs(t) {
         const e = t.meshes;
         for (let t = 0; t < e.length; t++) {
             const n = e[t], i = n && n.geometry;
@@ -8670,18 +8681,18 @@ class Cs extends br {
         }
     }
     isBoxCollides(t, e, n, i, r, s) {
-        if (this.Ls(t.geometry)) return hs.call(this, 0, t, e, n, i, r, s);
-        if (t.geometry.properties.isEmpty) return ks;
+        if (this.Ns(t.geometry)) return us.call(this, 0, t, e, n, i, r, s);
+        if (t.geometry.properties.isEmpty) return Os;
         const {aTerrainAltitude: o} = t.geometry.properties;
         if (o) {
-            if (o[2 * e[i]] === xt) return ks;
+            if (o[2 * e[i]] === xt) return Os;
         }
-        const a = this.getMap(), {boxes: l, collision: h} = this._s(t, i);
+        const a = this.getMap(), {boxes: l, collision: h} = this.Ss(t, i);
         let u = 0, c = 0, f = 0;
         for (let n = i; n < r; n += 6) {
             const i = l[f] = l[f] || [];
             f++;
-            const r = Br.call(this, i, t, e[n], s, a);
+            const r = Gr.call(this, i, t, e[n], s, a);
             if (!u) {
                 const t = this.isCollides(r);
                 1 === t ? u = 1 : -1 === t && c++;
@@ -8725,7 +8736,7 @@ class Cs extends br {
             }
         };
         this.shader = new n.MeshShader({
-            vert: _r,
+            vert: Sr,
             frag: "#define SHADER_NAME MARKER\n#define HAS_HIGHLIGHT_COLOR_POINT 1\nprecision mediump float;\n#include <gl2_frag>\nuniform float alphaTest;\nuniform sampler2D iconTex;\nuniform lowp float markerOpacity;\nuniform lowp float blendSrcIsOne;\nuniform float layerOpacity;\n#include <highlight_frag>\nvarying vec2 vTexCoord;\nvarying float vOpacity;\nvoid main() {\n  vec4 c = texture2D(iconTex, vTexCoord) * markerOpacity * vOpacity * layerOpacity;\n  if(c.a < .05) {\n    discard;\n  }\n  glFragColor = c;\n  glFragColor = highlight_blendColor(glFragColor);\n  if(glFragColor.a < alphaTest) {\n    discard;\n  }\n  glFragColor = highlight_blendColor(glFragColor);\n#if __VERSION__ == 100\ngl_FragColor = glFragColor;\n#endif\n}",
             uniforms: [ {
                 name: "projViewModelMatrix",
@@ -8742,16 +8753,16 @@ class Cs extends br {
             } ],
             extraCommandProps: i
         }), this.shader.version = 300;
-        const {uniforms: s, extraCommandProps: o} = is.call(this, e, this.sceneConfig), a = this.Ds || {};
-        if (this.zs = new n.MeshShader({
-            vert: ds,
-            frag: ps,
+        const {uniforms: s, extraCommandProps: o} = rs.call(this, e, this.sceneConfig), a = this.Rs || {};
+        if (this.Vs = new n.MeshShader({
+            vert: ps,
+            frag: ms,
             uniforms: s,
             extraCommandProps: o,
             defines: a
         }), this.pickingFBO) {
             const t = new n.FBORayPicking(this.renderer, {
-                vert: "#define PICKING_MODE 1\n" + _r,
+                vert: "#define PICKING_MODE 1\n" + Sr,
                 uniforms: [ {
                     name: "projViewModelMatrix",
                     type: "function",
@@ -8769,7 +8780,7 @@ class Cs extends br {
             }, this.pickingFBO, this.getMap());
             t.filter = t => !!t.geometry.properties.iconAtlas;
             const e = new n.FBORayPicking(this.renderer, {
-                vert: "#define PICKING_MODE 1\n" + ds,
+                vert: "#define PICKING_MODE 1\n" + ps,
                 uniforms: s,
                 extraCommandProps: o
             }, this.pickingFBO, this.getMap());
@@ -8777,7 +8788,7 @@ class Cs extends br {
         }
     }
     getUniformValues(e, n) {
-        const i = n && n.isRenderingTerrainSkin, r = this.layer.getTileSize().width, s = i ? Is : e.projViewMatrix, o = e.cameraToCenterDistance, a = h.set(Fs, e.width, e.height);
+        const i = n && n.isRenderingTerrainSkin, r = this.layer.getTileSize().width, s = i ? Fs : e.projViewMatrix, o = e.cameraToCenterDistance, a = h.set(Cs, e.width, e.height);
         i && h.set(a, r, r);
         const l = this.getBlendFunc(), u = t.Util.isFunction(l.src) ? l.src() : l.src;
         return {
@@ -8787,7 +8798,7 @@ class Cs extends br {
             projViewMatrix: s,
             cameraToCenterDistance: o,
             canvasSize: a,
-            iconSize: Os,
+            iconSize: Is,
             resolution: e.getResolution(),
             glyphSize: 24,
             gammaScale: 1,
@@ -8797,28 +8808,28 @@ class Cs extends br {
         };
     }
     getUniqueEntryKey(t, e) {
-        if (!this.Ls(t.geometry)) return null;
+        if (!this.Ns(t.geometry)) return null;
         const {elements: n} = t.geometry.properties;
-        return us(t, n[e]);
+        return cs(t, n[e]);
     }
-    Rs(t) {
+    Ls(t) {
         const {symbolIndex: e} = t.properties;
         return 0 === e.type;
     }
-    Ls(t) {
+    Ns(t) {
         const {symbolIndex: e} = t.properties;
         return 1 === e.type;
     }
 }
 
-function Es(t, e) {
+function Ds(t, e) {
     return t.properties.level - e.properties.level || t.properties.meshKey - e.properties.meshKey;
 }
 
-const Ds = [], Rs = [], Ls = [];
+const Rs = [], Ls = [], Ns = [];
 
-function Ns(t, e, n, r, s, o, a, l, u, c, f, d, p) {
-    const {aGlyphOffset: m, aSegment: y, aTextDx: g, aTextDy: v, symbolIndex: x} = e.geometry.properties, b = this.getSymbol(x), A = g ? g[s] : b.textDx, w = v ? v[s] : b.textDy, _ = h.set(Ls, A || 0, w || 0), S = h.set(Ds, m[2 * s], m[2 * s + 1]), M = i.set(Rs, y[3 * s], y[3 * s + 1], y[3 * s + 2]);
+function Hs(t, e, n, r, s, o, a, l, u, c, f, d, p) {
+    const {aGlyphOffset: m, aSegment: y, aTextDx: g, aTextDy: v, symbolIndex: x} = e.geometry.properties, b = this.getSymbol(x), A = g ? g[s] : b.textDx, w = v ? v[s] : b.textDy, _ = h.set(Ns, A || 0, w || 0), S = h.set(Rs, m[2 * s], m[2 * s + 1]), M = i.set(Ls, y[3 * s], y[3 * s + 1], y[3 * s + 2]);
     return function(t, e, n, i, r, s, o, a, l, h, u, c, f, d, p, m, y, g) {
         p || (p = i);
         const v = e.geometry.properties.line, x = s[0] * c, b = f ? x - o : x + o;
@@ -8846,45 +8857,45 @@ function Ns(t, e, n, r, s, o, a, l, u, c, f, d, p) {
     }(t, e, r, o, a, S, _[0], _[1], M[0], M[1], M[2], n / 24, u, l, c, f, d, p);
 }
 
-const Hs = [], zs = [];
+const zs = [], Vs = [];
 
-function Vs(t, e, n, r, s, o, a, l, u, c, f, d) {
+function Us(t, e, n, r, s, o, a, l, u, c, f, d) {
     const {aVertical: p} = n.geometry.properties, m = p[o];
-    let y, g, v = Ns.call(this, Hs, n, r, s, o, l, u, c, !1);
+    let y, g, v = Hs.call(this, zs, n, r, s, o, l, u, c, !1);
     if (!v) return null;
-    if (i.copy(t, v), v = Ns.call(this, zs, n, r, s, a, l, u, c, !1), !v) return null;
-    if (i.copy(e, v), d && (h.transformMat2(Hs, Hs, d), h.transformMat2(zs, zs, d)), 
+    if (i.copy(t, v), v = Hs.call(this, Vs, n, r, s, a, l, u, c, !1), !v) return null;
+    if (i.copy(e, v), d && (h.transformMat2(zs, zs, d), h.transformMat2(Vs, Vs, d)), 
     m) {
-        const t = Math.abs(zs[1] - Hs[1]), e = Math.abs(zs[0] - Hs[0]) * f;
-        g = Hs[0] > zs[0] ? 1 : 0, t > e ? (y = 1, g = Hs[1] < zs[1] ? 0 : 1) : y = 0;
-    } else y = 0, g = Hs[0] > zs[0] ? 1 : 0;
+        const t = Math.abs(Vs[1] - zs[1]), e = Math.abs(Vs[0] - zs[0]) * f;
+        g = zs[0] > Vs[0] ? 1 : 0, t > e ? (y = 1, g = zs[1] < Vs[1] ? 0 : 1) : y = 0;
+    } else y = 0, g = zs[0] > Vs[0] ? 1 : 0;
     return 2 * g + y;
 }
 
-var Us = "#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;\nuniform float isRenderingTerrain;\nuniform float textPitchFilter;\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#include <highlight_vert>\n#else\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_TEXT_DX\nfloat d = aTextDx;\n#else\nfloat d = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat e = aTextDy;\n#else\nfloat e = textDy;\n#endif\n#ifdef HAS_TEXT_SIZE\nfloat f = aTextSize * layerScale;\n#else\nfloat f = textSize * layerScale;\n#endif\n#ifdef HAS_PITCH_ALIGN\nfloat h = aPitchAlign;\n#else\nfloat h = pitchWithMap;\n#endif\ngl_Position = projViewModelMatrix * vec4(c, 1.);\n  float i = gl_Position.w;\n  float j = i / cameraToCenterDistance;\n  float k;\n  if(isRenderingTerrain == 1.) {\n    k = 1.;\n  } else {\n    float l = (1. - cameraToCenterDistance / i) * textPerspectiveRatio;\n    k = clamp(.5 + .5 * (1. - l), .0, 4.);\n  }\n#ifdef HAS_OFFSET_Z\nvec3 m = aOffset / 10.0;\n  m[2] /= altitudeScale;\n#else\nvec3 m = vec3(aOffset / 10.0, .0);\n#endif\nvec2 n = aTexCoord;\n  if(h == 1.) {\n    float o;\n    if(isRenderingTerrain == 1.) {\n      o = tileRatio;\n    } else {\n      o = tileRatio / zoomScale * j * k;\n    }\n    m.xy *= o;\n    gl_Position = projViewModelMatrix * vec4(c + m, 1.);\n  } else {\n    gl_Position.xy += m.xy * 2. / canvasSize * k * i;\n  }\n  gl_Position.xy += vec2(d, -e) * 2. / canvasSize * i;\n  if(textPitchFilter > .0) {\n    if(textPitchFilter == 1. && h == .0 || textPitchFilter == 2. && h == 1.) {\n      gl_Position = vec4(-9999., -9999., .0, 1.);\n    }\n  }\n#ifndef PICKING_MODE\nif(h == 1.) {\n    vGammaScale = j + mapPitch / 4.;\n  } else {\n    vGammaScale = mix(1., j, textPerspectiveRatio);\n  }\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vTexCoord = n / 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\nhighlight_setVarying();\n#else\n#ifdef ENABLE_COLLISION\nbool u = aOpacity == 255.;\n#else\nbool u = true;\n#endif\nfbo_picking_setData(gl_Position.w, u);\n#endif\n}";
+var js = "#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;\nuniform float isRenderingTerrain;\nuniform float textPitchFilter;\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#include <highlight_vert>\n#else\n#include <fbo_picking_vert>\n#endif\n#include <vt_position_vert>\nvoid main() {\n  vec3 c = unpackVTPosition();\n#ifdef HAS_TEXT_DX\nfloat d = aTextDx;\n#else\nfloat d = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat e = aTextDy;\n#else\nfloat e = textDy;\n#endif\n#ifdef HAS_TEXT_SIZE\nfloat f = aTextSize * layerScale;\n#else\nfloat f = textSize * layerScale;\n#endif\n#ifdef HAS_PITCH_ALIGN\nfloat h = aPitchAlign;\n#else\nfloat h = pitchWithMap;\n#endif\ngl_Position = projViewModelMatrix * vec4(c, 1.);\n  float i = gl_Position.w;\n  float j = i / cameraToCenterDistance;\n  float k;\n  if(isRenderingTerrain == 1.) {\n    k = 1.;\n  } else {\n    float l = (1. - cameraToCenterDistance / i) * textPerspectiveRatio;\n    k = clamp(.5 + .5 * (1. - l), .0, 4.);\n  }\n#ifdef HAS_OFFSET_Z\nvec3 m = aOffset / 10.0;\n  m[2] /= altitudeScale;\n#else\nvec3 m = vec3(aOffset / 10.0, .0);\n#endif\nvec2 n = aTexCoord;\n  if(h == 1.) {\n    float o;\n    if(isRenderingTerrain == 1.) {\n      o = tileRatio;\n    } else {\n      o = tileRatio / zoomScale * j * k;\n    }\n    m.xy *= o;\n    gl_Position = projViewModelMatrix * vec4(c + m, 1.);\n  } else {\n    gl_Position.xy += m.xy * 2. / canvasSize * k * i;\n  }\n  gl_Position.xy += vec2(d, -e) * 2. / canvasSize * i;\n  if(textPitchFilter > .0) {\n    if(textPitchFilter == 1. && h == .0 || textPitchFilter == 2. && h == 1.) {\n      gl_Position = vec4(-9999., -9999., .0, 1.);\n    }\n  }\n#ifndef PICKING_MODE\nif(h == 1.) {\n    vGammaScale = j + mapPitch / 4.;\n  } else {\n    vGammaScale = mix(1., j, textPerspectiveRatio);\n  }\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vTexCoord = n / 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\nhighlight_setVarying();\n#else\n#ifdef ENABLE_COLLISION\nbool u = aOpacity == 255.;\n#else\nbool u = true;\n#endif\nfbo_picking_setData(gl_Position.w, u);\n#endif\n}";
 
-const js = function(t) {
+const Bs = function(t) {
     const e = this.layer.getRenderer();
-    return !this.Ps(t) && e.isTileNearCamera(t) && "line" !== t.geometry.properties.textPlacement;
-}, Bs = function(t) {
-    const e = this.layer.getRenderer();
-    return !this.Ps(t) && !e.isForeground(t) && "line" !== t.geometry.properties.textPlacement;
+    return !this.Ts(t) && e.isTileNearCamera(t) && "line" !== t.geometry.properties.textPlacement;
 }, Gs = function(t) {
     const e = this.layer.getRenderer();
-    return !this.Ps(t) && e.isTileNearCamera(t) && "line" === t.geometry.properties.textPlacement;
+    return !this.Ts(t) && !e.isForeground(t) && "line" !== t.geometry.properties.textPlacement;
 }, Ws = function(t) {
+    const e = this.layer.getRenderer();
+    return !this.Ts(t) && e.isTileNearCamera(t) && "line" === t.geometry.properties.textPlacement;
+}, Xs = function(t) {
     const e = this.layer.getRenderer(), n = t.properties.tile.z, i = e.getCurrentTileZoom();
-    return !this.Ps(t) && !e.isForeground(t) && "line" === t.geometry.properties.textPlacement && n < i;
-}, Xs = [ 0, 0, 3 ], Ys = [], $s = [], qs = [], Js = [], Ks = [], Zs = [], Qs = [], to = [], eo = [ 1, -1 ], no = new Int16Array(3), io = [], ro = [], so = [], oo = [], ao = [], lo = [], ho = [], uo = {}, co = {}, fo = {}, po = [], mo = [], yo = r.identity([]), go = [];
+    return !this.Ts(t) && !e.isForeground(t) && "line" === t.geometry.properties.textPlacement && n < i;
+}, Ys = [ 0, 0, 3 ], $s = [], qs = [], Js = [], Ks = [], Zs = [], Qs = [], to = [], eo = [], no = [ 1, -1 ], io = new Int16Array(3), ro = [], so = [], oo = [], ao = [], lo = [], ho = [], uo = [], co = {}, fo = {}, po = {}, mo = [], yo = [], go = r.identity([]), vo = [];
 
-class vo extends br {
+class xo extends br {
     static getBloomSymbol() {
         return [ "textBloom" ];
     }
     constructor(t, e, n, i, r, s) {
         super(t, e, n, i, r, s), this.propAllowOverlap = "textAllowOverlap", this.propIgnorePlacement = "textIgnorePlacement", 
-        this.colorCache = {}, this.Ys = js.bind(this), this.$s = Bs.bind(this), this.qs = Gs.bind(this), 
-        this.Js = Ws.bind(this), this.isLabelCollides = hs.bind(this), this.Ks();
+        this.colorCache = {}, this.$s = Bs.bind(this), this.qs = Gs.bind(this), this.Js = Ws.bind(this), 
+        this.Ks = Xs.bind(this), this.isLabelCollides = us.bind(this), this.Zs();
     }
     prepareRender(...t) {
         super.prepareRender(...t);
@@ -8896,44 +8907,44 @@ class vo extends br {
         }
     }
     updateSymbol(...t) {
-        this.Zs = void 0, this.Qs = void 0;
+        this.Qs = void 0, this.to = void 0;
         const e = super.updateSymbol(...t);
-        return this.Ks(), e;
+        return this.Zs(), e;
     }
     isTerrainVector() {
         if (!super.isTerrainSkin()) return !1;
-        if (void 0 !== this.Zs) return this.Zs;
+        if (void 0 !== this.Qs) return this.Qs;
         for (let t = 0; t < this.symbolDef.length; t++) {
-            if ("map" !== this.symbolDef[t].textPitchAlignment) return this.Zs = !0, !0;
+            if ("map" !== this.symbolDef[t].textPitchAlignment) return this.Qs = !0, !0;
         }
-        return this.Zs = !1, !1;
+        return this.Qs = !1, !1;
     }
     isTerrainSkin() {
         if (!super.isTerrainSkin()) return !1;
-        if (void 0 !== this.Qs) return this.Qs;
+        if (void 0 !== this.to) return this.to;
         for (let t = 0; t < this.symbolDef.length; t++) {
             const e = this.symbolDef[t].textPitchAlignment;
-            if ("map" === e || p(e) || b.isExpression(e)) return this.Qs = !0, !0;
+            if ("map" === e || p(e) || b.isExpression(e)) return this.to = !0, !0;
         }
-        return this.Qs = !1, !1;
+        return this.to = !1, !1;
     }
-    Ks() {
-        this.to = [];
+    Zs() {
+        this.eo = [];
         for (let t = 0; t < this.symbolDef.length; t++) {
             const e = this.symbolDef[t];
             if (b.isExpression(e.textName)) {
                 const n = b.createExpression(e.textName, "string");
-                this.to[t] = (t, e) => {
+                this.eo[t] = (t, e) => {
                     let i;
-                    uo.zoom = t, co.properties = e;
+                    co.zoom = t, fo.properties = e;
                     try {
-                        i = n.evaluateWithoutErrorHandling(uo, co, fo, null, po);
+                        i = n.evaluateWithoutErrorHandling(co, fo, po, null, mo);
                     } catch (t) {
                         i = null;
                     }
                     return i;
                 };
-            } else p(e.textName) && (this.to[t] = g(e.textName));
+            } else p(e.textName) && (this.eo[t] = g(e.textName));
         }
     }
     shouldDeleteMeshOnUpdateSymbol(t) {
@@ -8942,10 +8953,10 @@ class vo extends br {
         return !1;
     }
     createFnTypeConfig(t, e) {
-        return rs(t, e);
+        return ss(t, e);
     }
     isBloom(t) {
-        return !!this.getSymbol(t.properties.symbolIndex)[vo.getBloomSymbol()[0]];
+        return !!this.getSymbol(t.properties.symbolIndex)[xo.getBloomSymbol()[0]];
     }
     createGeometry(t, e, n) {
         const i = t;
@@ -8960,9 +8971,9 @@ class vo extends br {
     createMesh(t, e, {tileVectorTransform: n}) {
         const i = this.isEnableCollision(), r = this.isEnableUniquePlacement(), {geometry: s, symbolIndex: o} = t;
         s.properties.symbolIndex = o;
-        const a = this.getSymbol(o), l = this.getSymbolDef(o), h = this.getFnTypeConfig(o), u = ts.call(this, this.regl, s, e, l, a, h, this.layer.options.collision, !i, r);
+        const a = this.getSymbol(o), l = this.getSymbolDef(o), h = this.getFnTypeConfig(o), u = es.call(this, this.regl, s, e, l, a, h, this.layer.options.collision, !i, r);
         if (u.length) {
-            "line" === s.properties.textPlacement ? this.eo = !0 : this.no = !0;
+            "line" === s.properties.textPlacement ? this.no = !0 : this.io = !0;
         }
         return u.forEach(t => {
             t.positionMatrix = this.getAltitudeOffsetMatrix(), t.properties.tileVectorTransform = n;
@@ -8971,24 +8982,24 @@ class vo extends br {
     updateCollision(t) {
         super.updateCollision(t);
         const e = this.scene.getMeshes();
-        e && e.length ? (this.io = {}, this.ro(t.timestamp), this.zr()) : this.zr();
+        e && e.length ? (this.ro = {}, this.so(t.timestamp), this.zr()) : this.zr();
     }
     callCurrentTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.Ys, e.sceneFilter ] : this.Ys, this.callRenderer(this.shader, t, e), 
-        this.so.filter = e.sceneFilter ? [ this.qs, e.sceneFilter ] : this.qs, this.callRenderer(this.so, t, e);
+        this.shader.filter = e.sceneFilter ? [ this.$s, e.sceneFilter ] : this.$s, this.callRenderer(this.shader, t, e), 
+        this.oo.filter = e.sceneFilter ? [ this.Js, e.sceneFilter ] : this.Js, this.callRenderer(this.oo, t, e);
     }
     callBackgroundTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.$s, e.sceneFilter ] : this.$s, this.callRenderer(this.shader, t, e), 
-        this.so.filter = e.sceneFilter ? [ this.Js, e.sceneFilter ] : this.Js, this.callRenderer(this.so, t, e);
+        this.shader.filter = e.sceneFilter ? [ this.qs, e.sceneFilter ] : this.qs, this.callRenderer(this.shader, t, e), 
+        this.oo.filter = e.sceneFilter ? [ this.Ks, e.sceneFilter ] : this.Ks, this.callRenderer(this.oo, t, e);
     }
     callRenderer(t, e, n) {
         n && n.isRenderingTerrain && p(this.symbolDef.textPitchAlignment) && (n.isRenderingTerrainSkin ? e.textPitchFilter = 1 : e.textPitchFilter = 2), 
         super.callRenderer(t, e, n);
     }
-    ro() {
+    so() {
         let t = this.scene.getMeshes();
         if (!t || !t.length) return;
-        const e = -this.getMap().getBearing() * Math.PI / 180, n = u.fromRotation(qs, e), i = (t, e, n, i) => {
+        const e = -this.getMap().getBearing() * Math.PI / 180, n = u.fromRotation(Js, e), i = (t, e, n, i) => {
             const {start: r, end: s, mesh: o, allElements: a} = e[0];
             if (this.updateBoxCollisionFading(!0, o, e, n, i)) {
                 let e = t.count;
@@ -8996,7 +9007,7 @@ class vo extends br {
                 t.count = e;
             }
         }, r = this.isEnableCollision(), s = this.layer.getRenderer();
-        t = t.sort(bo);
+        t = t.sort(Ao);
         for (let e = 0; e < t.length; e++) {
             const o = t[e];
             if (!this.isMeshIterable(o)) continue;
@@ -9006,11 +9017,11 @@ class vo extends br {
                 continue;
             }
             const a = o.geometry, l = this.getSymbol(o.properties.symbolIndex);
-            o.properties.textHaloRadius = It(l.textHaloRadius) ? Qr.textHaloRadius : l.textHaloRadius;
+            o.properties.textHaloRadius = It(l.textHaloRadius) ? ts.textHaloRadius : l.textHaloRadius;
             const h = o.properties.meshKey;
             if ("line" === a.properties.textPlacement) {
                 if (!a.properties.line) continue;
-                r && this.startMeshCollision(o), this.oo(o, n);
+                r && this.startMeshCollision(o), this.ao(o, n);
                 const {aOffset: t, aOpacity: e} = a.properties;
                 t.dirty && (a.updateData("aOffset", t), t.dirty = !1), e && e.dirty && (a.updateData("aOpacity", e), 
                 e.dirty = !1), r && this.endMeshCollision(h);
@@ -9033,18 +9044,18 @@ class vo extends br {
         return "line" !== this.getSymbol(t.properties.symbolIndex).textPlacement;
     }
     getUniqueEntryKey(t, e) {
-        return us(t, e);
+        return cs(t, e);
     }
-    oo(t, e) {
+    ao(t, e) {
         const n = this.getMap(), i = t.geometry, s = i.properties;
         let o = s.line;
         if (!o) return;
         const a = n.getPitch(), l = n.getBearing(), {lineTextPitch: h, lineTextBearing: u} = t.properties, c = 1 === t.material.uniforms.pitchWithMap, f = s.elements;
         if (!c) {
-            const e = r.multiply(Ys, n.projViewMatrix, t.localTransform), i = o.id + "-" + e.join();
+            const e = r.multiply($s, n.projViewMatrix, t.localTransform), i = o.id + "-" + e.join();
             let a;
-            this.io[i] ? o = this.io[i] : (a = s.projectedLine = s.projectedLine || new Array(o.length), 
-            o = this.ao(a, o, e, n.width, n.height), this.io[i] = a);
+            this.ro[i] ? o = this.ro[i] : (a = s.projectedLine = s.projectedLine || new Array(o.length), 
+            o = this.lo(a, o, e, n.width, n.height), this.ro[i] = a);
         }
         const d = this.isEnableCollision(), p = i.properties.visElemts = i.properties.visElemts || new f.constructor(f.length), m = i.properties.visCache = i.properties.visCache || [];
         d && (p.count = 0);
@@ -9052,7 +9063,7 @@ class vo extends br {
         this.forEachBox(t, (t, n, i, r) => {
             const {start: s, end: a} = n[0];
             let l = m[r];
-            if ((void 0 === l || y) && (l = this.lo(t, f, s, a, o, i, c ? e : null, r)), m[r] = l, 
+            if ((void 0 === l || y) && (l = this.ho(t, f, s, a, o, i, c ? e : null, r)), m[r] = l, 
             d && (l = this.updateBoxCollisionFading(l, t, n, i, r), l)) {
                 let t = p.count;
                 for (let e = s; e < a; e++) p[t++] = f[e];
@@ -9062,7 +9073,7 @@ class vo extends br {
         const g = t.geometry.properties.aAltitude;
         g && g.dirty && (i.updateData("aAltitude", g), g.dirty = !1), !d || p.count === f.length && i.count === p.count || i.setElements(p, p.count);
     }
-    ao(t, e, n, i, r) {
+    lo(t, e, n, i, r) {
         return function(t, e, n, i, r) {
             for (let s = 0; s < e.length; s += 3) a.set(xi, e[s], e[s + 1], e[s + 2], 1), bi(xi, xi, n, i, r), 
             t[s] = xi[0], t[s + 1] = xi[1], t[s + 2] = e[s + 2];
@@ -9070,15 +9081,15 @@ class vo extends br {
         }(t, e, n, i, r);
     }
     forEachBox(t, e) {
-        const n = this.getMap(), i = r.multiply(Ys, n.projViewMatrix, t.properties.tileVectorTransform), {collideIds: s, aCount: o, features: a, elements: l} = t.geometry.properties, h = s;
+        const n = this.getMap(), i = r.multiply($s, n.projViewMatrix, t.properties.tileVectorTransform), {collideIds: s, aCount: o, features: a, elements: l} = t.geometry.properties, h = s;
         if (!h) return;
-        const u = this.isEnableUniquePlacement(), c = this.Ss(1);
+        const u = this.isEnableUniquePlacement(), c = this.Ms(1);
         c[0].allElements = l, c[0].mesh = t;
         let f = 0, d = l[0], p = 0, m = h[d];
         for (let n = 0; n <= l.length; n += 6) if (d = l[n], h[d] !== m || n === l.length) {
             const r = a[m] && a[m].feature;
             if (u && this.isMeshUniquePlaced(t) && r && !r.label) {
-                const e = r.properties || {}, {symbolIndex: n} = t.properties, i = n && this.to[n.index] ? this.to[n.index](t.properties.z, e) : this.getSymbol(t.properties.symbolIndex).textName, s = R.resolveText(i, e);
+                const e = r.properties || {}, {symbolIndex: n} = t.properties, i = n && this.eo[n.index] ? this.eo[n.index](t.properties.z, e) : this.getSymbol(t.properties.symbolIndex).textName, s = R.resolveText(i, e);
                 r.label = s;
             }
             const s = n, y = o[l[p]];
@@ -9087,65 +9098,65 @@ class vo extends br {
             m = h[d], p = n;
         }
     }
-    lo(t, e, n, s, o, l, u) {
+    ho(t, e, n, s, o, l, u) {
         const f = this.layer.getRenderer(), d = t.material.uniforms, p = 1 === d.pitchWithMap, m = !p && f.getTerrainHelper && f.getTerrainHelper(), y = this.isEnableCollision(), g = this.getMap(), v = t.geometry, x = v.desc.positionSize, {aShape: b, aOffset: w, aAnchor: _, aAltitude: S, aPitchRotation: M} = v.properties;
         let {aProjectedAnchor: P} = v.properties;
         P || (P = v.properties.aProjectedAnchor = new Array(_.length / x * 3));
         const T = v.properties.aTextSize, k = !u, O = e[n], I = O * x;
         let F;
-        F = v.data.aAltitude ? i.set(Js, _[I], _[I + 1], S[O]) : A.unpackPosition(Js, _[I], _[I + 1], _[I + 2]);
-        const C = bi(Ks, F, l, g.width, g.height), E = v.properties.aTerrainAltitude;
+        F = v.data.aAltitude ? i.set(Ks, _[I], _[I + 1], S[O]) : A.unpackPosition(Ks, _[I], _[I + 1], _[I + 2]);
+        const C = bi(Zs, F, l, g.width, g.height), E = v.properties.aTerrainAltitude;
         let D;
         if (E) {
             const t = E[O];
             if (t === xt) return P[3 * O] = -999999, P[3 * O + 1] = -999999, P[3 * O + 2] = -999999, 
             !1;
-            t ? (D = i.set(mo, ...F), D[2] = 100 * t, D = bi(D, D, l, g.width, g.height)) : D = C;
+            t ? (D = i.set(yo, ...F), D[2] = 100 * t, D = bi(D, D, l, g.width, g.height)) : D = C;
         } else D = C;
         const R = g.getDevicePixelRatio();
-        if (a.scale(go, D, 1 / R), g.isOffscreen(go)) return y || xo(w, e, n, s), P[3 * O] = -999999, 
+        if (a.scale(vo, D, 1 / R), g.isOffscreen(vo)) return y || bo(w, e, n, s), P[3 * O] = -999999, 
         P[3 * O + 1] = -999999, P[3 * O + 2] = -999999, !1;
         k && (F = C), P[3 * O] = D[0], P[3 * O + 1] = D[1], P[3 * O + 2] = D[2];
         const L = k ? 1 : v.properties.tileExtent / this.layer.getTileSize().width;
         let N = !0;
-        const H = e[n], z = e[s - 1], V = T ? T[H] : t.properties.textSize, U = this.ho(t, V, o, H, z, F, Js, L, u);
-        if (null === U) return xo(w, e, n, s), !1;
+        const H = e[n], z = e[s - 1], V = T ? T[H] : t.properties.textSize, U = this.uo(t, V, o, H, z, F, Ks, L, u);
+        if (null === U) return bo(w, e, n, s), !1;
         const j = z - H <= 3, B = Math.floor(U / 2), G = U % 2;
         for (let a = n; a < s; a += 6) {
             const u = e[a];
             let f;
-            if (f = B || a !== n || j || m ? B || a !== s - 6 || j || m ? Ns.call(this, $s, t, V, o, u, F, Js, L, B, D, this.layer, l, p) : ho : lo, 
+            if (f = B || a !== n || j || m ? B || a !== s - 6 || j || m ? Hs.call(this, qs, t, V, o, u, F, Ks, L, B, D, this.layer, l, p) : uo : ho, 
             !f) {
-                N = !1, y || xo(w, e, n, s);
+                N = !1, y || bo(w, e, n, s);
                 break;
             }
             let g = f[2];
             G && (g -= Math.PI / 2);
-            const v = Cr(Zs, g, 0, d.rotateWithMap, d.pitchWithMap), x = w.length > b.length;
+            const v = Er(Qs, g, 0, d.rotateWithMap, d.pitchWithMap), x = w.length > b.length;
             let A;
             if (x) {
-                i.set(oo, M[3 * u], M[3 * u + 1], 0);
-                const t = i.normalize(oo, oo), e = -M[3 * u + 2];
+                i.set(ao, M[3 * u], M[3 * u + 1], 0);
+                const t = i.normalize(ao, ao), e = -M[3 * u + 2];
                 if (e) {
-                    const n = c.setAxisAngle(io, t, e);
-                    r.fromTranslation(ro, Xs), r.fromQuat(so, n), A = r.multiply(so, so, ro);
+                    const n = c.setAxisAngle(ro, t, e);
+                    r.fromTranslation(so, Ys), r.fromQuat(oo, n), A = r.multiply(oo, oo, so);
                 }
             }
             for (let t = 0; t < 4; t++) {
                 const e = 2 * (u + t);
-                h.set(Qs, b[e] / 10, b[e + 1] / 10), h.scale(Qs, Qs, V / 24), h.transformMat2(Qs, Qs, v), 
-                p ? (h.multiply(Qs, Qs, eo), h.add(to, Qs, f), x && (to[2] = 0, A && i.transformMat4(to, to, A))) : (h.multiply(to, f, eo), 
-                h.add(to, Qs, to)), no[0] = 10 * to[0], no[1] = 10 * to[1], x && (no[2] = 10 * to[2]);
+                h.set(to, b[e] / 10, b[e + 1] / 10), h.scale(to, to, V / 24), h.transformMat2(to, to, v), 
+                p ? (h.multiply(to, to, no), h.add(eo, to, f), x && (eo[2] = 0, A && i.transformMat4(eo, eo, A))) : (h.multiply(eo, f, no), 
+                h.add(eo, to, eo)), io[0] = 10 * eo[0], io[1] = 10 * eo[1], x && (io[2] = 10 * eo[2]);
                 const n = (x ? 3 : 2) * (u + t);
-                (w[n] !== no[0] || w[n + 1] !== no[1] || x && w[n + 2] !== no[2]) && (w.dirty = !0, 
-                w[n] = no[0], w[n + 1] = no[1], x && (w[n + 2] = no[2]));
+                (w[n] !== io[0] || w[n + 1] !== io[1] || x && w[n + 2] !== io[2]) && (w.dirty = !0, 
+                w[n] = io[0], w[n + 1] = io[1], x && (w[n + 2] = io[2]));
             }
         }
         return N;
     }
-    ho(t, e, n, i, r, s, o, a, l) {
+    uo(t, e, n, i, r, s, o, a, l) {
         const h = r - i <= 3, u = this.getMap();
-        return h ? 0 : Vs.call(this, lo, ho, t, e, n, i, r, s, o, a, u.width / u.height, l);
+        return h ? 0 : Us.call(this, ho, uo, t, e, n, i, r, s, o, a, u.width / u.height, l);
     }
     isBoxCollides(t, e, n, i, r, s) {
         return this.isLabelCollides(0, t, e, n, i, r, s);
@@ -9156,7 +9167,7 @@ class vo extends br {
         }) : t.material && delete t.material.uniforms.texture), super.deleteMesh(t, e));
     }
     delete() {
-        super.delete(), this.so.dispose(), delete this.io, this.uo && this.uo.dispose();
+        super.delete(), this.oo.dispose(), delete this.ro, this.co && this.co.dispose();
     }
     needClearStencil() {
         return !0;
@@ -9164,28 +9175,28 @@ class vo extends br {
     init() {
         const t = this.regl;
         this.renderer = new n.Renderer(t);
-        const {uniforms: e, extraCommandProps: i} = is.call(this, this.canvas, this.sceneConfig), r = this.canvas, s = {
+        const {uniforms: e, extraCommandProps: i} = rs.call(this, this.canvas, this.sceneConfig), r = this.canvas, s = {
             x: (t, e) => e.viewport ? e.viewport.x : 0,
             y: (t, e) => e.viewport ? e.viewport.y : 0,
             width: (t, e) => e.viewport ? e.viewport.width : r ? r.width : 1,
             height: (t, e) => e.viewport ? e.viewport.height : r ? r.height : 1
         };
         i.viewport = s, this.shader = new n.MeshShader({
-            vert: ds,
-            frag: ps,
+            vert: ps,
+            frag: ms,
             uniforms: e,
             extraCommandProps: i
         });
         let o = i;
         if (this.layer.getRenderer().isEnableWorkAround("win-intel-gpu-crash") && (o = Tt({}, i), 
-        o.stencil = Tt({}, i.stencil), o.stencil.enable = !0), this.so = new n.MeshShader({
-            vert: Us,
-            frag: ps,
+        o.stencil = Tt({}, i.stencil), o.stencil.enable = !0), this.oo = new n.MeshShader({
+            vert: js,
+            frag: ms,
             uniforms: e,
             extraCommandProps: o
         }), this.pickingFBO) {
             const t = new n.FBORayPicking(this.renderer, {
-                vert: "#define PICKING_MODE 1\n" + ds,
+                vert: "#define PICKING_MODE 1\n" + ps,
                 uniforms: e,
                 extraCommandProps: {
                     viewport: this.pickingViewport
@@ -9196,7 +9207,7 @@ class vo extends br {
                 return "line" !== this.getSymbol(e).textPlacement;
             };
             const i = new n.FBORayPicking(this.renderer, {
-                vert: "#define PICKING_MODE 1\n" + Us,
+                vert: "#define PICKING_MODE 1\n" + js,
                 uniforms: e,
                 extraCommandProps: {
                     viewport: this.pickingViewport
@@ -9206,7 +9217,7 @@ class vo extends br {
         }
     }
     getUniformValues(t, e) {
-        const n = e && e.isRenderingTerrainSkin, i = this.layer.getTileSize().width, r = n ? yo : t.projViewMatrix, s = t.cameraToCenterDistance, o = h.set(ao, t.width, t.height);
+        const n = e && e.isRenderingTerrainSkin, i = this.layer.getTileSize().width, r = n ? go : t.projViewMatrix, s = t.cameraToCenterDistance, o = h.set(lo, t.width, t.height);
         n && h.set(o, i, i);
         const a = lt(t.getResolution(), t);
         return {
@@ -9228,7 +9239,7 @@ class vo extends br {
     }
 }
 
-function xo(t, e, n, i) {
+function bo(t, e, n, i) {
     for (let r = n; r < i; r += 6) {
         const n = e[r];
         for (let e = 0; e < 4; e++) {
@@ -9238,20 +9249,20 @@ function xo(t, e, n, i) {
     }
 }
 
-function bo(t, e) {
+function Ao(t, e) {
     const n = t.properties.level - e.properties.level;
     return 0 === n ? t.properties.meshKey - e.properties.meshKey : n;
 }
 
-var Ao = "#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\n#ifdef HAS_COLOR\nattribute vec4 aColor;\nvarying vec4 vColor;\n#endif\nuniform mat4 positionMatrix;\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 * positionMatrix * vec4(c, 1.);\n  gl_PointSize = markerSize;\n#ifdef HAS_COLOR\nvColor = aColor / 255.;\n#endif\n#ifdef PICKING_MODE\nfbo_picking_setData(gl_Position.w, true);\n#endif\n}";
+var wo = "#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\n#ifdef HAS_COLOR\nattribute vec4 aColor;\nvarying vec4 vColor;\n#endif\nuniform mat4 positionMatrix;\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 * positionMatrix * vec4(c, 1.);\n  gl_PointSize = markerSize;\n#ifdef HAS_COLOR\nvColor = aColor / 255.;\n#endif\n#ifdef PICKING_MODE\nfbo_picking_setData(gl_Position.w, true);\n#endif\n}";
 
-const wo = {
+const _o = {
     markerFill: [ 0, 0, 0 ],
     markerOpacity: 1,
     markerSize: 10
 };
 
-class _o extends Bi {
+class So extends Bi {
     getPrimitive() {
         return "points";
     }
@@ -9269,7 +9280,7 @@ class _o extends Bi {
         const a = {};
         Ct(a, "markerOpacity", o, "markerOpacity", 1), Ct(a, "markerSize", o, "markerSize", 10), 
         Ct(a, "markerFill", o, "markerFill", "#000", Rt(this.colorCache, 3));
-        const l = new n.Material(a, wo);
+        const l = new n.Material(a, _o);
         l.createDefines = () => "square" !== o.markerType ? {
             USE_CIRCLE: 1
         } : null, l.appendDefines = t => ("square" !== o.markerType && (t.USE_CIRCLE = 1), 
@@ -9301,7 +9312,7 @@ class _o extends Bi {
         const t = this.regl;
         this.renderer = new n.Renderer(t);
         const e = [], i = {
-            vert: Ao,
+            vert: wo,
             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\n#ifdef HAS_COLOR\nvarying vec4 vColor;\n#else\nuniform vec3 markerFill;\n#endif\nuniform float markerOpacity;\nuniform float layerOpacity;\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\n#ifdef HAS_COLOR\nvec4 f = vColor;\n#else\nvec4 f = vec4(markerFill, 1.);\n#endif\nglFragColor = f * markerOpacity * c * layerOpacity;\n#if __VERSION__ == 100\ngl_FragColor = glFragColor;\n#endif\n}",
             uniforms: [ {
                 name: "projViewModelMatrix",
@@ -9334,7 +9345,7 @@ class _o extends Bi {
         if (this.shader = new n.MeshShader(i), this.shader.version = 300, this.pickingFBO) {
             const t = [];
             this.picking = [ new n.FBORayPicking(this.renderer, {
-                vert: "#define PICKING_MODE 1\n" + Ao,
+                vert: "#define PICKING_MODE 1\n" + wo,
                 uniforms: [ {
                     name: "projViewModelMatrix",
                     type: "function",
@@ -9355,11 +9366,11 @@ class _o extends Bi {
     }
 }
 
-var So = "#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 Mo = "#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}";
 
-const Mo = r.identity([]);
+const Po = r.identity([]);
 
-class Po extends Bi {
+class To extends Bi {
     constructor(t, e, n, i, r, s) {
         if (super(t, e, n, i, r, s), this.primitive = "lines", p(this.symbolDef.lineColor)) {
             const t = e.getMap(), n = y(this.symbolDef.lineColor);
@@ -9401,7 +9412,7 @@ class Po extends Bi {
                 return r.multiply(n, e.projViewMatrix, e.modelMatrix), n;
             }
         } ], l = this.sceneConfig.depthRange, h = {
-            vert: So,
+            vert: Mo,
             frag: "#define SHADER_NAME NATIVE_LINE\nprecision mediump float;\nuniform float lineOpacity;\nuniform vec4 lineColor;\nuniform float layerOpacity;\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\ngl_FragColor *= layerOpacity;\n}",
             uniforms: a,
             defines: null,
@@ -9438,7 +9449,7 @@ class Po extends Bi {
             }
         };
         this.shader = new n.MeshShader(h), this.pickingFBO && (this.picking = [ new n.FBORayPicking(this.renderer, {
-            vert: "#define PICKING_MODE 1\n" + So,
+            vert: "#define PICKING_MODE 1\n" + Mo,
             uniforms: a,
             extraCommandProps: {
                 viewport: this.pickingViewport
@@ -9448,7 +9459,7 @@ class Po extends Bi {
     getUniformValues(t, e) {
         const n = e && e.isRenderingTerrainSkin;
         return {
-            projViewMatrix: n ? Mo : t.projViewMatrix,
+            projViewMatrix: n ? Po : t.projViewMatrix,
             viewport: n && e && e.viewport
         };
     }
@@ -9457,9 +9468,9 @@ class Po extends Bi {
     }
 }
 
-const To = [ 0, 0 ], ko = [ 1, 1, 1 ], Oo = [ 1, 1, 1, 1 ], Io = [ 0, 0 ], Fo = [ 1, 1 ], Co = [], Eo = new t.Coordinate(0, 0), Do = new t.Coordinate(0, 0), Ro = [], Lo = [];
+const ko = [ 0, 0 ], Oo = [ 1, 1, 1 ], Io = [ 1, 1, 1, 1 ], Fo = [ 0, 0 ], Co = [ 1, 1 ], Eo = [], Do = new t.Coordinate(0, 0), Ro = new t.Coordinate(0, 0), Lo = [], No = [];
 
-class No extends Vi {
+class Ho extends Vi {
     supportRenderMode(t) {
         return this.isAnimating() ? "fxaa" === t || "fxaaAfterTaa" === t : "taa" === t || "fxaa" === t;
     }
@@ -9476,9 +9487,9 @@ class No extends Vi {
         if (!this.material) return this.setToRedraw(), null;
         const {geometry: o, symbolIndex: a} = e, l = this.layer instanceof t.TileLayer, u = new n.Mesh(o, this.material);
         if (this.sceneConfig.animation) {
-            ko[2] = .01;
+            Oo[2] = .01;
             const t = [];
-            r.fromScaling(t, ko), r.multiply(t, i, t), i = t;
+            r.fromScaling(t, Oo), r.multiply(t, i, t), i = t;
         }
         const c = this.getSymbolDef(a), f = this.getFnTypeConfig(a);
         si(o, c, f);
@@ -9500,12 +9511,12 @@ class No extends Vi {
                 }
             });
         } else {
-            Ct(u.uniforms, "polygonFill", m, "polygonFill", Oo, y), Ct(u.uniforms, "polygonOpacity", m, "polygonOpacity", 1);
+            Ct(u.uniforms, "polygonFill", m, "polygonFill", Io, y), Ct(u.uniforms, "polygonOpacity", m, "polygonOpacity", 1);
             const t = [];
             Object.defineProperty(u.uniforms, "vertexColorsOfType", {
                 enumerable: !0,
                 get: () => {
-                    const e = y(m.bottomPolygonFill || Oo), n = y(m.topPolygonFill || Oo);
+                    const e = y(m.bottomPolygonFill || Io), n = y(m.topPolygonFill || Io);
                     t[0] = e[0], t[1] = e[1], t[2] = e[2], t[3] = e[3], t[4] = n[0], t[5] = n[1], t[6] = n[2], 
                     t[7] = n[3];
                     const i = u.geometry.properties.vertexColors;
@@ -9545,7 +9556,7 @@ class No extends Vi {
         Object.defineProperty(u.uniforms, "uvOrigin", {
             enumerable: !0,
             get: () => {
-                const t = this.co(_, a, s, g, A, l);
+                const t = this.fo(_, a, s, g, A, l);
                 return h.set(w, t[0] - t[0] % 1, t[1] - t[1] % 1);
             }
         });
@@ -9553,7 +9564,7 @@ class No extends Vi {
         Object.defineProperty(u.uniforms, "uvOffset", {
             enumerable: !0,
             get: () => {
-                const t = this.co(_, a, s, g, A, l);
+                const t = this.fo(_, a, s, g, A, l);
                 return h.set(w, t[0] % 1, t[1] % 1);
             }
         }), Object.defineProperty(u.uniforms, "hasAlpha", {
@@ -9569,17 +9580,17 @@ class No extends Vi {
             get: () => x.isForeground(u) ? 0 : S - u.properties.tile.z
         }), u.properties.symbolIndex = a, u;
     }
-    co(t, e, n, i, r, s) {
-        if (1 === this.dataConfig.topUVMode) return To;
+    fo(t, e, n, i, r, s) {
+        if (1 === this.dataConfig.topUVMode) return ko;
         const o = this.getMap(), a = this.getSymbol(e).material;
         let l = n;
-        !this.dataConfig.side && a && a.textureOrigin && (Eo.set(a.textureOrigin[0], a.textureOrigin[1]), 
-        o.coordToPointAtRes(Eo, i, Do), l = h.set(Ro, n[0] - Do.x, n[1] - Do.y));
+        !this.dataConfig.side && a && a.textureOrigin && (Do.set(a.textureOrigin[0], a.textureOrigin[1]), 
+        o.coordToPointAtRes(Do, i, Ro), l = h.set(Lo, n[0] - Ro.x, n[1] - Ro.y));
         const u = !!a && a.uvOffsetInMeter;
-        let c = a && a.uvOffset || Io;
+        let c = a && a.uvOffset || Fo;
         const f = this.getUVOffsetAnim();
         f && (c = this.getUVOffset(f));
-        const d = a && a.uvScale || Fo;
+        const d = a && a.uvScale || Co;
         let p = this.dataConfig.side ? 0 : l[0], m = this.dataConfig.side ? 0 : l[1];
         const y = a && a.textureWidth || F, g = y * d[1] / d[0];
         u && (p += c[0] / r, m += c[1] / r);
@@ -9592,7 +9603,7 @@ class No extends Vi {
         super.callShader(t, e);
     }
     getShadowMeshes() {
-        if (!this.isVisible()) return Co;
+        if (!this.isVisible()) return Eo;
         this.shadowCount = this.scene.getMeshes().length;
         const t = this.scene.getMeshes().filter(t => 0 === t.properties.level);
         for (let e = 0; e < t.length; e++) {
@@ -9606,14 +9617,14 @@ class No extends Vi {
         return t.material && t.material.uvOffsetAnim;
     }
     getUVOffset(t) {
-        const e = this.getSymbols()[0], n = e.material && e.material.uvOffset || Io, i = !!e.material && e.material.uvOffsetInMeter, r = performance.now() / 1e3, s = h.set(Lo, n[0], n[1]);
+        const e = this.getSymbols()[0], n = e.material && e.material.uvOffset || Fo, i = !!e.material && e.material.uvOffsetInMeter, r = performance.now() / 1e3, s = h.set(No, n[0], n[1]);
         return s[0] = r * t[0], s[1] = r * t[0], i || (s[0] %= 1, s[1] %= 1), s;
     }
     needPolygonOffset() {
-        return this.fo;
+        return this.do;
     }
     startFrame(...t) {
-        return delete this.fo, super.startFrame(...t);
+        return delete this.do, super.startFrame(...t);
     }
     addMesh(t, e) {
         t.forEach(t => {
@@ -9623,10 +9634,10 @@ class No extends Vi {
     _r(t, e) {
         if (null !== e) {
             const n = t.localTransform;
-            0 === e && (e = .01), ko[2] = e, r.fromScaling(n, ko), r.multiply(n, t.properties.tileTransform, n), 
+            0 === e && (e = .01), Oo[2] = e, r.fromScaling(n, Oo), 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.fo = !0), 
+        t.material !== this.material && t.setMaterial(this.material), t.geometry.properties.maxAltitude <= 0 && (this.do = !0), 
         this.getSymbol(t.properties.symbolIndex).ssr ? t.ssr = 1 : t.ssr = 0;
     }
     deleteMaterial() {
@@ -9678,29 +9689,29 @@ class No extends Vi {
     updateSymbol(t, e) {
         let n = !1;
         t && t.material && (n = function(t, e) {
-            for (const n in e) if (zo[n] && e[n] !== t[n] && (!t[n] || !e[n])) return !0;
+            for (const n in e) if (Vo[n] && e[n] !== t[n] && (!t[n] || !e[n])) return !0;
             return !1;
         }(this.symbolDef[0].material || {}, t.material));
         const i = super.updateSymbol(t, e);
         return t && t.material && this.ri(t.material), n || i;
     }
     Qi(t, e) {
-        return Ho(t) !== Ho(e);
+        return zo(t) !== zo(e);
     }
 }
 
-function Ho(t) {
+function zo(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;
 }
 
-const zo = {
+const Vo = {
     normalTexture: 1,
     bumpTexture: 1
 };
 
-class Vo extends No {
+class Uo extends Ho {
     createGeometry(t) {
         const e = t.data, i = this.getSymbols()[0];
         if (i.material && i.material.extrusionOpacity) {
@@ -9729,10 +9740,10 @@ class Vo extends No {
         return this.shader;
     }
     delete(t) {
-        this.getMap().off("updatelights", this.do, this), super.delete(t), this.material.dispose();
+        this.getMap().off("updatelights", this.po, this), super.delete(t), this.material.dispose();
     }
     init() {
-        this.getMap().on("updatelights", this.do, this);
+        this.getMap().on("updatelights", this.po, this);
         const t = this.regl;
         this.renderer = new n.Renderer(t);
         const e = this.getShaderConfig();
@@ -9752,7 +9763,7 @@ class Vo extends No {
         };
         this.picking = [ new n.FBORayPicking(this.renderer, i, this.layer.getRenderer().pickingFBO, this.getMap()) ];
     }
-    do() {
+    po() {
         this.setToRedraw();
     }
     getShaderConfig() {
@@ -9808,7 +9819,7 @@ class Vo extends No {
         this.material = new n.PhongMaterial(e);
     }
     getUniformValues(t, e) {
-        const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, s = this.po(), o = Tt({
+        const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, s = this.mo(), o = Tt({
             viewMatrix: n,
             projMatrix: i,
             cameraPosition: r,
@@ -9821,7 +9832,7 @@ class Vo extends No {
     getPickingVert() {
         return "\n            attribute vec3 aPosition;\n            uniform mat4 projViewModelMatrix;\n            uniform mat4 modelMatrix;\n            uniform mat4 positionMatrix;\n            //引入fbo picking的vert相关函数\n            #include <fbo_picking_vert>\n            #include <get_output>\n            void main()\n            {\n                mat4 localPositionMatrix = getPositionMatrix();\n                vec4 localPosition = getPosition(aPosition);\n\n                gl_Position = projViewModelMatrix * localPositionMatrix * localPosition;\n                //传入gl_Position的depth值\n                fbo_picking_setData(gl_Position.w, true);\n            }\n        ";
     }
-    po() {
+    mo() {
         const t = this.getMap().getLightManager(), e = t && t.getAmbientLight() || {}, n = t && t.getDirectionalLight() || {};
         return {
             ambientColor: e.color || [ .2, .2, .2 ],
@@ -9832,9 +9843,9 @@ class Vo extends No {
     }
 }
 
-const Uo = [ 1, 1, 1 ];
+const jo = [ 1, 1, 1 ];
 
-class jo extends Vi {
+class Bo extends Vi {
     createGeometry(t) {
         const {data: e, indices: i} = t, r = new n.Geometry(e, i, 0, {
             primitive: "lines"
@@ -9849,9 +9860,9 @@ class jo extends Vi {
     createMesh(t, e) {
         const {geometry: i} = t, s = new n.Mesh(i);
         if (s.castShadow = !1, this.sceneConfig.animation) {
-            Uo[2] = .01;
+            jo[2] = .01;
             const t = [];
-            r.fromScaling(t, Uo), r.multiply(t, e, t), e = t;
+            r.fromScaling(t, jo), r.multiply(t, e, t), e = t;
         }
         return s.setLocalTransform(e), s.properties.symbolIndex = {
             index: 0
@@ -9860,7 +9871,7 @@ class jo extends Vi {
     addMesh(t, e) {
         if (!t.length) return this;
         let n;
-        null !== e ? (0 === e && (e = .01), n = t[0].localTransform, Uo[2] = e, r.fromScaling(n, Uo), 
+        null !== e ? (0 === e && (e = .01), n = t[0].localTransform, jo[2] = e, r.fromScaling(n, jo), 
         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;
@@ -9917,24 +9928,24 @@ class jo extends Vi {
     }
 }
 
-const {getPBRUniforms: Bo} = n.pbr.PBRUtils;
+const {getPBRUniforms: Go} = n.pbr.PBRUtils;
 
-class Go extends No {
+class Wo extends Ho {
     constructor(...t) {
-        super(...t), this.mo = new n.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
+        super(...t), this.yo = new n.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
     }
     supportRenderMode(t) {
         return this.getSymbols()[0].ssr ? "fxaa" === t || "fxaaAfterTaa" === t : super.supportRenderMode(t);
     }
     isAnimating() {
-        const t = this.yo();
+        const t = this.vo();
         if (t && (t[0] || t[1])) return !0;
     }
     needToRedraw() {
-        const t = this.yo();
+        const t = this.vo();
         return !(!t || !t[0] && !t[1]) || super.needToRedraw();
     }
-    yo() {
+    vo() {
         const t = this.getSymbols()[0];
         return t.material && t.material.uvOffsetAnim;
     }
@@ -9957,32 +9968,32 @@ class Go extends No {
     paint(t) {
         const e = !!t.shadow;
         t.states && t.states.includesChanged && (this.shader.dispose(), delete this.shader, 
-        this.vo.dispose(), delete this.vo, this.br(t));
+        this.xo.dispose(), delete this.xo, this.br(t));
         let n = !!t.ssr && this.getSymbols()[0].ssr;
         const i = this.shader, r = i.shaderDefines;
         if (n) {
             const e = Tt({}, r, t.ssr.defines);
             i.shaderDefines = e;
         }
-        if (t.onlyUpdateDepthInTaa && (this.shader = this.vo, !n && this.xo && (this.shader = i, 
+        if (t.onlyUpdateDepthInTaa && (this.shader = this.xo, !n && this.bo && (this.shader = i, 
         this.setToRedraw(!0))), this.updateIBLDefines(i), super.paint(t), void 0 !== this.shadowCount && e) {
             const t = this.scene.getMeshes().length;
             this.shadowCount !== t && this.setToRedraw();
         }
-        this.shader = i, n && (i.shaderDefines = r), delete this.shadowCount, this.xo = n;
+        this.shader = i, n && (i.shaderDefines = r), delete this.shadowCount, this.bo = n;
     }
     updateSceneConfig(t) {
         Tt(this.sceneConfig, t), this.setToRedraw();
     }
     delete() {
-        super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.vo && (this.vo.dispose(), 
-        delete this.vo);
+        super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.xo && (this.xo.dispose(), 
+        delete this.xo);
     }
     init(t) {
-        this.getMap().on("updatelights", this.bo, this), this.createIBLTextures(), this.Sr = this.Sr || t;
+        this.getMap().on("updatelights", this.Ao, this), this.createIBLTextures(), this.Sr = this.Sr || t;
         const e = this.regl;
-        this.renderer = new n.Renderer(e), this.Ao = this.wo.bind(this), this._o = this.disposeCachedTexture.bind(this), 
-        this.So = this.Mo.bind(this), this.ri(), this.br(t);
+        this.renderer = new n.Renderer(e), this.wo = this._o.bind(this), this.So = this.disposeCachedTexture.bind(this), 
+        this.Mo = this.Po.bind(this), this.ri(), this.br(t);
         const i = {
             vert: "\n                #include <gl2_vert>\n                attribute vec3 aPosition;\n                uniform mat4 projViewModelMatrix;\n                uniform mat4 positionMatrix;\n                //引入fbo picking的vert相关函数\n                #include <line_extrusion_vert>\n                #include <get_output>\n                #include <fbo_picking_vert>\n                void main() {\n                    mat4 localPositionMatrix = getPositionMatrix();\n                    #ifdef IS_LINE_EXTRUSION\n                        vec3 linePosition = getLineExtrudePosition(aPosition);\n                        vec4 localVertex = getPosition(linePosition);\n                    #else\n                        vec4 localVertex = getPosition(aPosition);\n                    #endif\n\n                    gl_Position = projViewModelMatrix * localPositionMatrix * localVertex;\n                    fbo_picking_setData(gl_Position.w, true);\n                }\n            ",
             uniforms: [ {
@@ -10044,17 +10055,17 @@ class Go extends No {
             }
         }, o = {
             uniforms: r,
-            defines: this.Po(i),
+            defines: this.To(i),
             extraCommandProps: s
         };
         this.shader = new n.pbr.StandardShader(o), o.frag = "\n            precision mediump float;\n            #include <gl2_frag>\n            void main() {\n                glFragColor = vec4(0.0);\n                #if __VERSION__ == 100\n                    gl_FragColor = glFragColor;\n                #endif\n            }\n        ", 
-        this.vo = new n.pbr.StandardShader(o);
+        this.xo = new n.pbr.StandardShader(o);
     }
-    wo({resources: t}) {
+    _o({resources: t}) {
         for (let e = 0; e < t.length; e++) this.addCachedTexture(t[e].url, t[e].data);
         this.setToRedraw(!0);
     }
-    Mo() {
+    Po() {
         this.setToRedraw(!0);
     }
     ri(t) {
@@ -10081,37 +10092,37 @@ class Go extends No {
                 url: a,
                 wrap: "repeat"
             }), o.flipY = !e.upsideUpTexture, o.min = "linear mipmap linear", o.mag = "linear", 
-            r[t] = new n.Texture2D(o, this.mo), r[t].once("complete", this.Ao), r[t].once("disposed", this._o), 
+            r[t] = new n.Texture2D(o, this.yo), r[t].once("complete", this.wo), r[t].once("disposed", this.So), 
             r[t].promise && this.addCachedTexture(a, r[t].promise), s = !0;
         } else r[t] = i[t];
         if (void 0 === r.alphaTest && this.getMaterialClazz && (r.alphaTest = .05), this.material) {
             for (let t in r) this.material.set(t, r[t]);
             this.setToRedraw(!0);
-        } else this.material = new n.pbr.StandardMaterial(r), this.material.once("complete", this.So);
-        s || this.Mo();
+        } else this.material = new n.pbr.StandardMaterial(r), this.material.once("complete", this.Mo);
+        s || this.Po();
     }
     getShader() {
         return this.shader;
     }
     getUniformValues(t, e) {
-        const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = Bo(t, n, i, e && e.ssr, e && e.jitter);
+        const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = Go(t, n, i, e && e.ssr, e && e.jitter);
         return this.setIncludeUniformValues(r, e), r;
     }
-    Po(t) {
+    To(t) {
         return this.hasIBL() ? t.HAS_IBL_LIGHTING = 1 : delete t.HAS_IBL_LIGHTING, t;
     }
-    bo() {
+    Ao() {
         if (!this.shader) return;
         const t = this.shader.shaderDefines;
-        this.Po(t), this.shader.shaderDefines = t;
+        this.To(t), this.shader.shaderDefines = t;
     }
 }
 
-var Wo = "#include <gl2_vert>\n#define EXTRUDE_SCALE 63.0\n#define EXTRUDE_MOD 64.0\n#define MAX_LINE_DISTANCE 65535.0\nuniform mat4 projViewModelMatrix;\nuniform vec2 centiMeterToLocal;\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec4 aTubeNormal;\n#ifdef HAS_LINE_WIDTH\nattribute float aLineWidth;\n#else\nuniform float lineWidth;\n#endif\n#include <vt_position_vert>\n#ifdef PICKING_MODE\n#include <fbo_picking_vert>\n#else\nuniform mat4 modelViewMatrix;\nuniform mat3 modelNormalMatrix;\nuniform mat4 modelMatrix;\n#if defined(HAS_PATTERN)\nuniform float resolution;\nuniform float tileResolution;\nuniform float tileRatio;\nattribute float aLinesofar;\nvarying highp float vLinesofar;\nattribute vec4 aTexInfo;\nvarying vec4 vTexInfo;\nvarying float vNormalY;\nvarying float vPatternHeight;\nattribute float aNormalDistance;\n#if defined(HAS_PATTERN_ANIM)\nattribute float aLinePatternAnimSpeed;\nvarying float vLinePatternAnimSpeed;\n#endif\n#if defined(HAS_PATTERN_GAP)\nattribute float aLinePatternGap;\nvarying float vLinePatternGap;\n#endif\n#endif\n#ifdef HAS_COLOR\nattribute vec4 aColor;\nvarying vec4 vColor;\n#endif\n#ifdef HAS_OPACITY\nattribute float aOpacity;\n#endif\nvarying float vOpacity;\nvarying vec3 vModelNormal;\nvarying vec4 vViewVertex;\nvarying vec3 vModelVertex;\n#endif\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\n#include <vsm_shadow_vert>\n#endif\n#include <highlight_vert>\nvoid main() {\n  \n#ifdef HAS_LINE_WIDTH\nfloat c = aLineWidth;\n#else\nfloat c = lineWidth;\n#endif\nfloat d = c / 2.;\n  vec3 e = aTubeNormal.xyz / EXTRUDE_SCALE;\n  vec3 f = unpackVTPosition();\n  vec4 h = vec4(f, 1.);\n  h.xy += e.xy * d * centiMeterToLocal;\n  h.z += e.z * d;\n  gl_Position = projViewModelMatrix * h;\n#ifdef PICKING_MODE\nfbo_picking_setData(gl_Position.w, true);\n#else\nvViewVertex = modelViewMatrix * h;\n  vec3 i = normalize(e);\n  vModelNormal = modelNormalMatrix * i;\n  vModelVertex = (modelMatrix * h).xyz;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\nshadow_computeShadowPars(h);\n#endif\n#ifdef HAS_COLOR\nvColor = aColor / 255.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_PATTERN\nfloat j = tileResolution / resolution;\n  float k = aLinesofar - d * centiMeterToLocal.y * aNormalDistance / EXTRUDE_SCALE;\n  vLinesofar = k / tileRatio * j;\n  vTexInfo = vec4(aTexInfo.xy, aTexInfo.zw + 1.);\n  vPatternHeight = c * centiMeterToLocal.x / tileRatio * j;\n  vNormalY = aTubeNormal.w / EXTRUDE_SCALE;\n#if defined(HAS_PATTERN_ANIM)\nvLinePatternAnimSpeed = aLinePatternAnimSpeed / 127.;\n#endif\n#if defined(HAS_PATTERN_GAP)\nvLinePatternGap = aLinePatternGap / 10.0;\n#endif\n#endif\nhighlight_setVarying();\n#endif\n}";
+var Xo = "#include <gl2_vert>\n#define EXTRUDE_SCALE 63.0\n#define EXTRUDE_MOD 64.0\n#define MAX_LINE_DISTANCE 65535.0\nuniform mat4 projViewModelMatrix;\nuniform vec2 centiMeterToLocal;\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec4 aTubeNormal;\n#ifdef HAS_LINE_WIDTH\nattribute float aLineWidth;\n#else\nuniform float lineWidth;\n#endif\n#include <vt_position_vert>\n#ifdef PICKING_MODE\n#include <fbo_picking_vert>\n#else\nuniform mat4 modelViewMatrix;\nuniform mat3 modelNormalMatrix;\nuniform mat4 modelMatrix;\n#if defined(HAS_PATTERN)\nuniform float resolution;\nuniform float tileResolution;\nuniform float tileRatio;\nattribute float aLinesofar;\nvarying highp float vLinesofar;\nattribute vec4 aTexInfo;\nvarying vec4 vTexInfo;\nvarying float vNormalY;\nvarying float vPatternHeight;\nattribute float aNormalDistance;\n#if defined(HAS_PATTERN_ANIM)\nattribute float aLinePatternAnimSpeed;\nvarying float vLinePatternAnimSpeed;\n#endif\n#if defined(HAS_PATTERN_GAP)\nattribute float aLinePatternGap;\nvarying float vLinePatternGap;\n#endif\n#endif\n#ifdef HAS_COLOR\nattribute vec4 aColor;\nvarying vec4 vColor;\n#endif\n#ifdef HAS_OPACITY\nattribute float aOpacity;\n#endif\nvarying float vOpacity;\nvarying vec3 vModelNormal;\nvarying vec4 vViewVertex;\nvarying vec3 vModelVertex;\n#endif\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\n#include <vsm_shadow_vert>\n#endif\n#include <highlight_vert>\nvoid main() {\n  \n#ifdef HAS_LINE_WIDTH\nfloat c = aLineWidth;\n#else\nfloat c = lineWidth;\n#endif\nfloat d = c / 2.;\n  vec3 e = aTubeNormal.xyz / EXTRUDE_SCALE;\n  vec3 f = unpackVTPosition();\n  vec4 h = vec4(f, 1.);\n  h.xy += e.xy * d * centiMeterToLocal;\n  h.z += e.z * d;\n  gl_Position = projViewModelMatrix * h;\n#ifdef PICKING_MODE\nfbo_picking_setData(gl_Position.w, true);\n#else\nvViewVertex = modelViewMatrix * h;\n  vec3 i = normalize(e);\n  vModelNormal = modelNormalMatrix * i;\n  vModelVertex = (modelMatrix * h).xyz;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\nshadow_computeShadowPars(h);\n#endif\n#ifdef HAS_COLOR\nvColor = aColor / 255.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_PATTERN\nfloat j = tileResolution / resolution;\n  float k = aLinesofar - d * centiMeterToLocal.y * aNormalDistance / EXTRUDE_SCALE;\n  vLinesofar = k / tileRatio * j;\n  vTexInfo = vec4(aTexInfo.xy, aTexInfo.zw + 1.);\n  vPatternHeight = c * centiMeterToLocal.x / tileRatio * j;\n  vNormalY = aTubeNormal.w / EXTRUDE_SCALE;\n#if defined(HAS_PATTERN_ANIM)\nvLinePatternAnimSpeed = aLinePatternAnimSpeed / 127.;\n#endif\n#if defined(HAS_PATTERN_GAP)\nvLinePatternGap = aLinePatternGap / 10.0;\n#endif\n#endif\nhighlight_setVarying();\n#endif\n}";
 
-const {getPBRUniforms: Xo} = n.pbr.PBRUtils;
+const {getPBRUniforms: Yo} = n.pbr.PBRUtils;
 
-class Yo extends Bi {
+class $o extends Bi {
     needToRedraw() {
         return super.needToRedraw() || this.isAnimating();
     }
@@ -10177,12 +10188,12 @@ class Yo extends Bi {
         super.paint(t);
     }
     init(t) {
-        this.getMap().on("updatelights", this.bo, this), this.createIBLTextures();
+        this.getMap().on("updatelights", this.Ao, this), this.createIBLTextures();
         const e = this.regl;
         if (this.renderer = new n.Renderer(e), this.createShader(t), this.pickingFBO) {
             const t = [];
             this.picking = [ new n.FBORayPicking(this.renderer, {
-                vert: "#define PICKING_MODE 1\n" + Wo,
+                vert: "#define PICKING_MODE 1\n" + Xo,
                 uniforms: [ {
                     name: "projViewModelMatrix",
                     type: "function",
@@ -10210,9 +10221,9 @@ class Yo extends Bi {
                 return r.multiply(n, e.projViewMatrix, e.modelMatrix), n;
             }
         }), this.shader = new n.pbr.StandardShader({
-            vert: Wo,
+            vert: Xo,
             uniforms: e,
-            defines: this.Po(i),
+            defines: this.To(i),
             extraCommandProps: this.getExtraCommandProps()
         });
     }
@@ -10259,7 +10270,7 @@ class Yo extends Bi {
         };
     }
     getUniformValues(t, e) {
-        const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = Xo(t, n, i, null, e && e.jitter), s = t.projViewMatrix, o = t.viewMatrix;
+        const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = Yo(t, n, i, null, e && e.jitter), s = t.projViewMatrix, o = t.viewMatrix;
         return r.projViewMatrix = s, r.viewMatrix = o, r.resolution = t.getResolution(), 
         r.currentTime = this.layer.getRenderer().getFrameTimestamp() || 0, this.setIncludeUniformValues(r, e), 
         r;
@@ -10327,13 +10338,13 @@ class Yo extends Bi {
             }
         } ];
     }
-    Po(t) {
+    To(t) {
         return this.hasIBL() ? t.HAS_IBL_LIGHTING = 1 : delete t.HAS_IBL_LIGHTING, t;
     }
-    bo() {
+    Ao() {
         if (!this.shader) return;
         const t = this.shader.shaderDefines;
-        this.Po(t), this.shader.shaderDefines = t;
+        this.To(t), this.shader.shaderDefines = t;
     }
     delete() {
         super.delete(), this.disposeIBLTextures(), this.shader && (this.shader.dispose(), 
@@ -10341,15 +10352,15 @@ class Yo extends Bi {
     }
 }
 
-const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0, 0 ], ea = [ 1, 1, 1 ], na = [], ia = [ 1, 1, 1, 1 ], ra = [], sa = [ 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], oa = t => class extends t {
+const qo = [], Jo = [], Ko = [], Zo = [], Qo = [], ta = [ 0, 0, 0 ], ea = [ 0, 0, 0 ], na = [ 1, 1, 1 ], ia = [], ra = [ 1, 1, 1, 1 ], sa = [], oa = [ 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], aa = t => class extends t {
     constructor(t, e, i, r, s, o) {
-        super(t, e, i, r, s, o), this.To = !1, this.scene.sortFunction = this.sortByCommandKey, 
-        this.ko = new n.GLTFManager(t), this.Oo(), this.Io();
+        super(t, e, i, r, s, o), this.ko = !1, this.scene.sortFunction = this.sortByCommandKey, 
+        this.Oo = new n.GLTFManager(t), this.Io(), this.Fo();
     }
     isAnimating() {
         const t = this.getSymbols();
         for (let e = 0; e < t.length; e++) {
-            if (t[e] && this.Fo[e] && this.Co(e)) return !0;
+            if (t[e] && this.Co[e] && this.Eo(e)) return !0;
         }
         return !1;
     }
@@ -10366,10 +10377,10 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         };
     }
     getFnTypeConfig() {
-        return na;
+        return ia;
     }
     createMesh(t, e, {tileTranslationMatrix: s, tileExtent: o}, {timestamp: a}) {
-        if (!this.To) return null;
+        if (!this.ko) return null;
         const l = this.getMap(), {geometry: h} = t, {positionSize: u, features: c} = h, {aPosition: f, aPickingId: d, aXYRotation: p, aZRotation: m, aAltitude: y} = h.data, g = f.length / u;
         if (0 === g) return null;
         const v = {
@@ -10377,7 +10388,7 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
             instance_vectorB: new Float32Array(4 * g),
             instance_vectorC: new Float32Array(4 * g),
             aPickingId: []
-        }, x = this.Eo(v, s, o, h.properties.z, f, y, p, m, u, d, c);
+        }, x = this.Do(v, s, o, h.properties.z, f, y, p, m, u, d, c);
         h.data.aTerrainAltitude && (v.aTerrainAltitude = h.data.aTerrainAltitude);
         const b = {};
         for (const t in v) b[t] = {
@@ -10387,22 +10398,22 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
             }),
             divisor: 1
         };
-        const A = this.Do(), w = this.Ro(), _ = r.identity([]);
+        const A = this.Ro(), w = this.Lo(), _ = r.identity([]);
         r.scale(_, _, [ w, w, w ]);
         const S = [], M = this.getSymbols();
         for (let t = 0; t < M.length; t++) {
-            const e = M[t], o = this.Lo[t];
+            const e = M[t], o = this.No[t];
             if (!o) continue;
-            const u = this.Fo[t][0], {fixSizeOnZoom: c} = e;
+            const u = this.Co[t][0], {fixSizeOnZoom: c} = e;
             let f = r.identity([]);
-            A || (f = this.No(f));
+            A || (f = this.Ho(f));
             let d = 0;
             o.forEach(t => {
                 const {geometry: n, nodeMatrix: i} = t;
-                r.multiply(ra, sa, i), r.multiply(ra, f, ra);
-                const s = r.multiply(ra, _, ra), o = n.boundingBox.copy();
+                r.multiply(sa, oa, i), r.multiply(sa, f, sa);
+                const s = r.multiply(sa, _, sa), o = n.boundingBox.copy();
                 o.transform(s);
-                const a = this.Ho(o, e);
+                const a = this.zo(o, e);
                 Math.abs(a) > Math.abs(d) && (d = a);
             });
             const p = [ 0, 0, d ], m = o.map((o, m) => {
@@ -10413,21 +10424,21 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
                     picking: !0
                 });
                 if (u.hasSkinAnimation()) {
-                    const e = this.zo(k, t, 0)[M];
+                    const e = this.Vo(k, t, 0)[M];
                     k.setUniform("jointTexture", e.jointTexture), k.setUniform("jointTextureSize", e.jointTextureSize), 
-                    k.setUniform("numJoints", e.numJoints), k.setUniform("skinAnimation", +this.Co(t)), 
+                    k.setUniform("numJoints", e.numJoints), k.setUniform("skinAnimation", +this.Eo(t)), 
                     k.properties.startTime = a, T.HAS_SKIN = 1;
                 }
                 w && (k.setUniform("morphWeights", w), T.HAS_MORPH = 1), k.setUniform("hasAlpha", S.alphaMode && "BLEND" === S.alphaMode.toUpperCase()), 
-                Ct(k.uniforms, "polygonFill", e, "markerFill", ia, Rt(this.colorCache)), Ct(k.uniforms, "polygonOpacity", e, "markerOpacity", 1);
+                Ct(k.uniforms, "polygonFill", e, "markerFill", ra, Rt(this.colorCache)), Ct(k.uniforms, "polygonOpacity", e, "markerOpacity", 1);
                 const O = [];
                 k.setPositionMatrix(() => {
-                    const e = this.Vo(t, m, M);
-                    r.multiply(O, sa, e), this.No(f), r.multiply(O, f, O), r.multiply(O, _, O);
-                    const n = r.identity(ra);
+                    const e = this.Uo(t, m, M);
+                    r.multiply(O, oa, e), this.Ho(f), r.multiply(O, f, O), r.multiply(O, _, O);
+                    const n = r.identity(sa);
                     if (0 !== d && (r.fromTranslation(n, p), r.multiply(O, n, O)), Ht(c)) {
                         const t = l.getGLScale() / l.getGLScale(c);
-                        return i.set($o, t, t, t), r.fromScaling(n, $o), r.multiply(n, n, O);
+                        return i.set(qo, t, t, t), r.fromScaling(n, qo), r.multiply(n, n, O);
                     }
                     return O;
                 });
@@ -10453,19 +10464,19 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
             positionSize: u
         }, S;
     }
+    Uo(t, e, n) {
+        const i = t, r = this.No[i][e];
+        return this.Eo(t) && this.jo && this.jo[n] || r.nodeMatrix;
+    }
     Vo(t, e, n) {
-        const i = t, r = this.Lo[i][e];
-        return this.Co(t) && this.Uo && this.Uo[n] || r.nodeMatrix;
-    }
-    zo(t, e, n) {
-        if (!this.Fo) return;
-        const i = this.Fo[e][0];
-        this.jo || (this.jo = {}), this.Uo = {}, this.jo[t.uuid] || (this.jo[t.uuid] = {});
-        const r = this.getSymbols()[e], s = this.Bo[e], {loop: o, speed: a, animationName: l} = r, h = l || s.animations[0].name;
-        return i.updateAnimation(n, o || !1, a || 1, h, t.properties.startTime || 0, this.Uo, this.jo[t.uuid]), 
-        this.jo[t.uuid];
-    }
-    Ho(t, e) {
+        if (!this.Co) return;
+        const i = this.Co[e][0];
+        this.Bo || (this.Bo = {}), this.jo = {}, this.Bo[t.uuid] || (this.Bo[t.uuid] = {});
+        const r = this.getSymbols()[e], s = this.Go[e], {loop: o, speed: a, animationName: l} = r, h = l || s.animations[0].name;
+        return i.updateAnimation(n, o || !1, a || 1, h, t.properties.startTime || 0, this.jo, this.Bo[t.uuid]), 
+        this.Bo[t.uuid];
+    }
+    zo(t, e) {
         const n = e.anchorZ || "center";
         let i = 0;
         const r = t.max[2] - t.min[2];
@@ -10478,8 +10489,8 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         for (let e = 0; e < t.length; e++) {
             if (!t[e] || !t[e].geometry) continue;
             t[e].instancedData.aTerrainAltitude && this.ji(t[e], t[e].instancedData, t[e].properties, 3, n);
-            const r = t[e].properties.symbolIndex.index, s = this.Co(r);
-            s && this.zo(t[e], r, i), t[e].setUniform("skinAnimation", +s);
+            const r = t[e].properties.symbolIndex.index, s = this.Eo(r);
+            s && this.Vo(t[e], r, i), t[e].setUniform("skinAnimation", +s);
         }
         return this.scene.addMesh(t), this;
     }
@@ -10490,8 +10501,8 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         const e = this.getSymbols();
         let n = !1;
         for (let t = 0; t < e.length; t++) {
-            if (!e[t] || !this.Fo[t]) continue;
-            if (this.Co(t) && this.Fo[t] && !n) {
+            if (!e[t] || !this.Co[t]) continue;
+            if (this.Eo(t) && this.Co[t] && !n) {
                 n = !0;
                 break;
             }
@@ -10499,15 +10510,15 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         n && this.setToRedraw(!0), super.prepareRender(t);
     }
     getShadowMeshes() {
-        if (!this.isVisible()) return na;
+        if (!this.isVisible()) return ia;
         this.shadowCount = this.scene.getMeshes().length;
         return this.scene.getMeshes().filter(t => 0 === t.properties.level);
     }
-    Co(t) {
+    Eo(t) {
         const e = this.getSymbols()[t];
-        return !!(e && e.animation && this.Fo[t] && this.Fo[t][0] && this.Fo[t][0].hasSkinAnimation());
+        return !!(e && e.animation && this.Co[t] && this.Co[t][0] && this.Co[t][0].hasSkinAnimation());
     }
-    Eo(t, e, n, s, o, a, l, h, u, c, f) {
+    Do(t, e, n, s, o, a, l, h, u, c, f) {
         function d(e, n, i, r) {
             t[e][4 * n] = i[r], t[e][4 * n + 1] = i[r + 4], t[e][4 * n + 2] = i[r + 8], t[e][4 * n + 3] = i[r + 12];
         }
@@ -10520,19 +10531,19 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
             e[0] < v && (v = e[0]), e[0] > w && (w = e[0]), e[1] < x && (x = e[1]), e[1] > _ && (_ = e[1]), 
             e[2] < b && (b = e[2]), e[2] > S && (S = e[2]);
         }
-        const T = (v + w) / 2, k = (x + _) / 2, O = (b + S) / 2, I = [], F = this.Do(), C = [ 0, 0, 1 ];
+        const T = (v + w) / 2, k = (x + _) / 2, O = (b + S) / 2, I = [], F = this.Ro(), C = [ 0, 0, 1 ];
         for (let e = 0; e < p; e++) {
             a ? i.set(P, o[e * u], o[e * u + 1], a[e]) : A.unpackPosition(P, o[e * u], o[e * u + 1], o[e * u + 2]);
             const n = P[0], s = P[1], p = i.set(M, n * m - T, -s * m - k, (P[2] + g) * y - O), v = l && l[e] || 0, x = h && h[e] || 0;
             if (v || x) {
                 r.fromRotation(I, x, C);
-                const t = i.set($o, n, s, 0), e = i.normalize(t, i.cross(t, t, C));
+                const t = i.set(qo, n, s, 0), e = i.normalize(t, i.cross(t, t, C));
                 r.rotate(I, I, v, e);
-                const o = r.fromTranslation(ra, p);
+                const o = r.fromTranslation(sa, p);
                 r.multiply(I, o, I);
             } else r.fromTranslation(I, p);
             if (F) {
-                const t = this.No(ra, f, c, e);
+                const t = this.Ho(sa, f, c, e);
                 r.multiply(I, I, t);
             }
             d("instance_vectorA", e, I, 0), d("instance_vectorB", e, I, 1), d("instance_vectorC", e, I, 2), 
@@ -10540,30 +10551,30 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         }
         return i.set(M, T, k, O), M;
     }
-    Ro() {
-        if (!this.Go) {
+    Lo() {
+        if (!this.Wo) {
             const t = this.getMap();
-            this.Go = 100 * lt(t.getGLRes(), t);
+            this.Wo = 100 * lt(t.getGLRes(), t);
         }
-        return this.Go;
+        return this.Wo;
     }
-    No(t, e, n, r) {
-        const s = this.getMap(), o = this.symbolDef[0], a = this.Ro();
+    Ho(t, e, n, r) {
+        const s = this.getMap(), o = this.symbolDef[0], a = this.Lo();
         let l = o.translationX || 0, h = o.translationY || 0, u = o.translationZ || 0, c = o.rotationX || 0, f = o.rotationY || 0, d = o.rotationZ || 0, p = o.scaleX || 1, m = o.scaleY || 1, y = o.scaleZ || 1;
-        const g = n && n[r], v = e && e[g], x = s.getZoom(), b = v && v.feature && v.feature.properties, A = this.Wo(x, b);
-        this.Xo && (l = this.Xo(x, b)), this.Yo && (h = this.Yo(x, b)), this.$o && (u = this.$o(x, b));
-        const w = i.set(qo, l * a, h * a, u * a);
-        this.qo && (c = this.qo(x, b)), this.Jo && (f = this.Jo(x, b)), this.Ko && (d = this.Ko(x, b));
-        const _ = i.set(Jo, c, f, d);
-        this.Zo && (p = this.Zo(x, b)), this.Qo && (m = this.Qo(x, b)), this.ta && (y = this.ta(x, b));
-        const S = i.set(Ko, p * A, m * A, y * A);
-        return this.ea(t, w, _, S);
-    }
-    Wo(t, e) {
+        const g = n && n[r], v = e && e[g], x = s.getZoom(), b = v && v.feature && v.feature.properties, A = this.Xo(x, b);
+        this.Yo && (l = this.Yo(x, b)), this.$o && (h = this.$o(x, b)), this.qo && (u = this.qo(x, b));
+        const w = i.set(Jo, l * a, h * a, u * a);
+        this.Jo && (c = this.Jo(x, b)), this.Ko && (f = this.Ko(x, b)), this.Zo && (d = this.Zo(x, b));
+        const _ = i.set(Ko, c, f, d);
+        this.Qo && (p = this.Qo(x, b)), this.ta && (m = this.ta(x, b)), this.ea && (y = this.ea(x, b));
+        const S = i.set(Zo, p * A, m * A, y * A);
+        return this.na(t, w, _, S);
+    }
+    Xo(t, e) {
         const n = this.symbolDef[0];
-        let i = this.na ? this.na(t, e) : n.modelHeight;
+        let i = this.ia ? this.ia(t, e) : n.modelHeight;
         if (rt(i)) return 1;
-        const r = this.ia[0];
+        const r = this.ra[0];
         return i / Math.abs(r.max[1] - r.min[1]);
     }
     getShaderConfig() {
@@ -10571,40 +10582,40 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         return t.positionAttribute = "POSITION", t.normalAttribute = "NORMAL", t;
     }
     init(t) {
-        super.init(t), this.Io();
+        super.init(t), this.Fo();
     }
-    Oo() {
+    Io() {
         const t = this.symbolDef[0];
-        p(t.modelHeight) && (this.na = g(t.modelHeight)), p(t.translationX) && (this.Xo = g(t.translationX)), 
-        p(t.translationY) && (this.Yo = g(t.translationY)), p(t.translationZ) && (this.$o = g(t.translationZ)), 
-        p(t.rotationX) && (this.qo = g(t.rotationX)), p(t.rotationY) && (this.Jo = g(t.rotationY)), 
-        p(t.rotationZ) && (this.Ko = g(t.rotationZ)), p(t.scaleX) && (this.Zo = g(t.scaleX)), 
-        p(t.scaleY) && (this.Qo = g(t.scaleY)), p(t.scaleZ) && (this.ta = g(t.scaleZ));
+        p(t.modelHeight) && (this.ia = g(t.modelHeight)), p(t.translationX) && (this.Yo = g(t.translationX)), 
+        p(t.translationY) && (this.$o = g(t.translationY)), p(t.translationZ) && (this.qo = g(t.translationZ)), 
+        p(t.rotationX) && (this.Jo = g(t.rotationX)), p(t.rotationY) && (this.Ko = g(t.rotationY)), 
+        p(t.rotationZ) && (this.Zo = g(t.rotationZ)), p(t.scaleX) && (this.Qo = g(t.scaleX)), 
+        p(t.scaleY) && (this.ta = g(t.scaleY)), p(t.scaleZ) && (this.ea = g(t.scaleZ));
     }
-    Do() {
-        return !!(this.na && !this.na.isFeatureConstant || this.Xo && !this.Xo.isFeatureConstant || this.Yo && !this.Yo.isFeatureConstant || this.$o && !this.$o.isFeatureConstant || this.qo && !this.qo.isFeatureConstant || this.Jo && !this.Jo.isFeatureConstant || this.Ko && !this.Ko.isFeatureConstant || this.Zo && !this.Zo.isFeatureConstant || this.Qo && !this.Qo.isFeatureConstant || this.ta && !this.ta.isFeatureConstant);
+    Ro() {
+        return !!(this.ia && !this.ia.isFeatureConstant || this.Yo && !this.Yo.isFeatureConstant || this.$o && !this.$o.isFeatureConstant || this.qo && !this.qo.isFeatureConstant || this.Jo && !this.Jo.isFeatureConstant || this.Ko && !this.Ko.isFeatureConstant || this.Zo && !this.Zo.isFeatureConstant || this.Qo && !this.Qo.isFeatureConstant || this.ta && !this.ta.isFeatureConstant || this.ea && !this.ea.isFeatureConstant);
     }
-    Io() {
-        if (this.Fo) return;
-        this.Fo = [], this.Bo = [], this.ia = [], this.Lo = [];
+    Fo() {
+        if (this.Co) return;
+        this.Co = [], this.Go = [], this.ra = [], this.No = [];
         const t = this.getSymbols();
-        this.ra = 0;
+        this.sa = 0;
         for (let e = 0; e < t.length; e++) {
             const n = t[e].url || "pyramid";
-            this.ko.loginGLTF(n);
-            const i = this.ko.getGLTF(n);
+            this.Oo.loginGLTF(n);
+            const i = this.Oo.getGLTF(n);
             if (i.then) i.then(n => {
-                if (!n.gltfPack) return this.ra++, void (this.ra >= t.length && (this.To = !0, this.setToRedraw(!0)));
+                if (!n.gltfPack) return this.sa++, void (this.sa >= t.length && (this.ko = !0, this.setToRedraw(!0)));
                 const {gltfPack: i, json: r, bbox: s} = n;
-                this.Fo[e] = [ i ], this.Lo[e] = i.getMeshesInfo(), this.Bo[e] = r, this.ia[e] = s, 
-                this.ra++, this.ra >= t.length && (this.To = !0), this.setToRedraw(!0);
+                this.Co[e] = [ i ], this.No[e] = i.getMeshesInfo(), this.Go[e] = r, this.ra[e] = s, 
+                this.sa++, this.sa >= t.length && (this.ko = !0), this.setToRedraw(!0);
             }); else {
                 const {gltfPack: t, json: n, bbox: r} = i;
-                t && (this.Fo[e] = [ t ], this.Lo[e] = t.getMeshesInfo(), this.Bo[e] = n, this.ia[e] = r, 
-                this.ra++);
+                t && (this.Co[e] = [ t ], this.No[e] = t.getMeshesInfo(), this.Go[e] = n, this.ra[e] = r, 
+                this.sa++);
             }
         }
-        this.ra >= t.length && (this.To = !0);
+        this.sa >= t.length && (this.ko = !0);
     }
     getPickingVert() {
         return "\n    attribute vec3 aPosition;\n    uniform mat4 projViewModelMatrix;\n    uniform mat4 modelMatrix;\n    uniform mat4 positionMatrix;\n    //引入fbo picking的vert相关函数\n    #include <fbo_picking_vert>\n    #include <get_output>\n    void main()\n    {\n        mat4 localPositionMatrix = getPositionMatrix();\n        vec4 localPosition = getPosition(aPosition);\n\n        gl_Position = projViewModelMatrix * localPositionMatrix * localPosition;\n        //传入gl_Position的depth值\n        fbo_picking_setData(gl_Position.w, true);\n    }";
@@ -10613,10 +10624,10 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         if (t) {
             this.scene.removeMesh(t);
             for (let e = 0; e < t.length; e++) {
-                const n = this.jo && this.jo[t[e].uuid];
+                const n = this.Bo && this.Bo[t[e].uuid];
                 if (n) {
                     for (const t in n) n[t].jointTexture && n[t].jointTexture.destroy();
-                    delete this.jo[t[e].uuid];
+                    delete this.Bo[t[e].uuid];
                 }
                 t[e].disposeInstanceData(), t[e].dispose();
             }
@@ -10627,43 +10638,43 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         const t = this.getSymbols();
         for (let e = 0; e < t.length; e++) {
             const n = t[e].url || "pyramid";
-            this.ko.logoutGLTF(n);
+            this.Oo.logoutGLTF(n);
         }
-        if (this.jo) {
-            for (const t in this.jo) {
-                const e = this.jo[t];
+        if (this.Bo) {
+            for (const t in this.Bo) {
+                const e = this.Bo[t];
                 for (const t in e) e[t].jointTexture && e[t].jointTexture.destroy();
             }
-            delete this.jo;
+            delete this.Bo;
         }
-        delete this.Uo;
+        delete this.jo;
     }
-    ea(t, e, n, s) {
-        const o = i.set($o, ...e || Qo), a = n || ta, l = s || ea, h = c.fromEuler(Zo, a[0], a[1], a[2]);
+    na(t, e, n, s) {
+        const o = i.set(qo, ...e || ta), a = n || ea, l = s || na, h = c.fromEuler(Qo, a[0], a[1], a[2]);
         return r.fromRotationTranslationScale(t, h, o, l);
     }
 };
 
-class aa extends(oa(Vo)){
+class la extends(aa(Uo)){
     getMaterialClazz(t) {
         return t.diffuseFactor ? n.PhongSpecularGlossinessMaterial : n.PhongMaterial;
     }
 }
 
-class la extends(oa(Go)){
+class ha extends(aa(Wo)){
     getMaterialClazz(t) {
         return t.specularGlossinessTexture || t.diffuseTexture ? n.pbr.StandardSpecularGlossinessMaterial : n.pbr.StandardMaterial;
     }
 }
 
-const {getPBRUniforms: ha} = n.pbr.PBRUtils, ua = {
+const {getPBRUniforms: ua} = n.pbr.PBRUtils, ca = {
     color: [ 2.0303, 2.028, 2.028 ],
     direction: [ 0, -.2717, -1 ]
-}, ca = {
+}, fa = {
     index: 0
-}, fa = [ 0, 0, 0 ], da = [ 2, 2 ];
+}, da = [ 0, 0, 0 ], pa = [ 2, 2 ];
 
-class pa extends Bi {
+class ma extends Bi {
     supportRenderMode(t) {
         return "fxaa" === t || "fxaaBeforeTaa" === t;
     }
@@ -10678,7 +10689,7 @@ class pa extends Bi {
     }
     needToRedraw() {
         if (super.needToRedraw()) return !0;
-        return this.getSymbol(ca).animation;
+        return this.getSymbol(fa).animation;
     }
     createMesh(t, e) {
         const {geometry: i} = t;
@@ -10687,29 +10698,29 @@ class pa extends Bi {
             castShadow: !1,
             picking: !0
         });
-        return r.properties.symbolIndex = ca, r.setLocalTransform(e), r;
+        return r.properties.symbolIndex = fa, r.setLocalTransform(e), r;
     }
     callShader(t, e) {
         super.callShader(t, e), this.transformWater();
-        const n = this.sa(this.getMap(), e);
-        this.Gi += this.renderer.render(this.oa, n, this.aa, this.getRenderFBO(e));
+        const n = this.oa(this.getMap(), e);
+        this.Gi += this.renderer.render(this.aa, n, this.la, this.getRenderFBO(e));
     }
     addMesh(t, e) {
         this._r(t, e), super.addMesh(...arguments);
     }
     _r(t) {
-        const e = this.getSymbol(ca).ssr;
+        const e = this.getSymbol(fa).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.oa.dispose(), 
+        t.states && t.states.includesChanged && (this.shader.dispose(), this.aa.dispose(), 
         this.br(t));
-        const e = !!t.ssr && this.getSymbol(ca).ssr, n = this.oa, i = n.shaderDefines;
+        const e = !!t.ssr && this.getSymbol(fa).ssr, n = this.aa, i = n.shaderDefines;
         if (e) {
             const e = Tt({}, i, t.ssr.defines);
             n.shaderDefines = e;
         }
-        this.updateIBLDefines(n), this.la.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
+        this.updateIBLDefines(n), this.ha.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
     }
     init(t) {
         this.createIBLTextures();
@@ -10727,38 +10738,38 @@ class pa extends Bi {
             extraCommandProps: {
                 viewport: this.pickingViewport
             }
-        }, this.pickingFBO, this.getMap()) ]), this.ha();
+        }, this.pickingFBO, this.getMap()) ]), this.ua();
     }
-    ha() {
+    ua() {
         const t = this.regl;
-        this.ua || (this.ua = t.texture(2));
+        this.ca || (this.ca = t.texture(2));
         const e = this.getSymbol({
             index: 0
         }), n = e.texWaveNormal, i = this.getCachedTexture(n), r = this;
-        if (i) this.ca || (i.isLoading ? setTimeout(() => {
-            this.shader && this.ha();
-        }, 20) : this.ca = this.fa(t, i)); else {
+        if (i) this.fa || (i.isLoading ? setTimeout(() => {
+            this.shader && this.ua();
+        }, 20) : this.fa = this.da(t, i)); else {
             const e = new Image;
             e.isLoading = !0, e.onload = function() {
-                delete this.isLoading, r.ca = r.fa(t, this), r.setToRedraw();
+                delete this.isLoading, r.fa = r.da(t, this), r.setToRedraw();
             }, e.onerror = () => {
                 console.error("invalid water wave normal texture:" + n);
             }, this.addCachedTexture(n, e), e.src = n;
         }
         const s = e.texWavePerturbation, o = this.getCachedTexture(s);
-        if (o) this.da || (o.isLoading ? setTimeout(() => {
-            this.ha(), this.shader;
-        }, 20) : this.da = this.fa(t, o)); else {
+        if (o) this.pa || (o.isLoading ? setTimeout(() => {
+            this.ua(), this.shader;
+        }, 20) : this.pa = this.da(t, o)); else {
             const e = new Image;
             e.isLoading = !0, e.onload = function() {
-                delete this.isLoading, r.da = r.fa(t, this), r.setToRedraw();
+                delete this.isLoading, r.pa = r.da(t, this), r.setToRedraw();
             }, e.onerror = () => {
                 console.error("invalid water wave perturbation texture:" + s);
             }, this.addCachedTexture(s, e), e.src = s;
         }
     }
-    fa(t, e) {
-        return this.ua ? t.texture({
+    da(t, e) {
+        return this.ca ? t.texture({
             width: e.width,
             height: e.height,
             mag: "linear",
@@ -10864,7 +10875,7 @@ class pa extends Bi {
                 enable: !1
             }
         };
-        s.push(...n.SsrPass.getUniformDeclares()), this.oa = new n.MeshShader({
+        s.push(...n.SsrPass.getUniformDeclares()), this.aa = new n.MeshShader({
             vert: "#define SHADER_NAME WATER\nuniform mat4 modelMatrix;\nuniform mat4 projViewModelMatrix;\nattribute vec3 aPosition;\nattribute vec2 aTexCoord;\nuniform vec2 uvOffset;\nuniform vec2 noiseUvOffset;\nuniform vec2 uvScale;\nvarying vec2 vUv;\nvarying vec2 vNoiseUv;\nvarying vec3 vPos;\nvarying mat3 vTbnMatrix;\n#ifdef HAS_SSR\nuniform mat4 modelViewMatrix;\nvarying vec4 vViewVertex;\n#endif\n#include <highlight_vert>\nmat3 c(in vec3 d) {\n  vec3 t = normalize(cross(d, vec3(.0, 1., .0)));\n  vec3 e = normalize(cross(d, t));\n  return mat3(t, e, d);\n}\n#if defined(HAS_SHADOWING)\n#include <vsm_shadow_vert>\n#endif\nconst vec3 f = vec3(0., 0., 1.);\nvoid main(void) {\n  vec4 h = vec4(aPosition, 1.);\n  vec4 i = modelMatrix * h;\n  vPos = i.xyz;\n  vTbnMatrix = c(f);\n  gl_Position = projViewModelMatrix * h;\n  vUv = aTexCoord * uvScale + uvOffset;\n  vNoiseUv = aTexCoord * uvScale * TIME_NOISE_TEXTURE_REPEAT + noiseUvOffset;\n#ifdef HAS_SSR\nvec4 j = modelViewMatrix * h;\n  vViewVertex = j;\n#endif\n#if defined(HAS_SHADOWING)\nshadow_computeShadowPars(h);\n#endif\nhighlight_setVarying();\n}",
             frag: "#define SHADER_NAME WATER\nprecision highp float;\nprecision highp sampler2D;\n#include <hsv_frag>\nuniform vec3 hsv;\nuniform float contrast;\nuniform float layerOpacity;\n#if defined(HAS_SHADOWING)\n#include <vsm_shadow_frag>\n#endif\n#include <highlight_frag>\n#if defined(HAS_IBL_LIGHTING)\nuniform vec3 hdrHSV;\nuniform samplerCube prefilterMap;\nuniform sampler2D brdfLUT;\nuniform float rgbmRange;\nuniform mat3 uEnvironmentTransform;\nuniform vec3 diffuseSPH[9];\nvec3 c(const in vec3 d) {\n  vec3 e = uEnvironmentTransform * d;\n  float x = e.x;\n  float y = e.y;\n  float z = e.z;\n  vec3 f = (diffuseSPH[0] + diffuseSPH[1] * x + diffuseSPH[2] * y + diffuseSPH[3] * z + diffuseSPH[4] * z * x + diffuseSPH[5] * y * z + diffuseSPH[6] * y * x + diffuseSPH[7] * (3. * z * z - 1.) + diffuseSPH[8] * (x * x - y * y));\n  if(length(hdrHSV) > .0) {\n    f = hsv_apply(f, hdrHSV);\n  }\n  return max(f, vec3(.0));\n}\nvec3 h(const in vec3 i, const in float j, const in float k, const in float l) {\n  vec4 rgba = texture2D(brdfLUT, vec2(k, j));\n  float b = (rgba[3] * 65280.0 + rgba[2] * 255.);\n  float a = (rgba[1] * 65280.0 + rgba[0] * 255.);\n  const float m = 1. / 65535.;\n  return (i * a + b * l) * m;\n}\n#else\nuniform vec3 ambientColor;\n#endif\nstruct PBRShadingWater {\n  float NdotL;\n  float NdotV;\n  float NdotH;\n  float VdotH;\n  float LdotH;\n  float VdotN;\n};\nvec3 o(const in vec4 u, const in float v) {\n  if(v <= .0)\n    return u.rgb;\n  return v * u.rgb * u.a;\n}\n#ifdef HAS_SSR\nvarying vec4 vViewVertex;\nuniform mat3 modelViewNormalMatrix;\nuniform sampler2D TextureDepth;\nuniform highp vec2 outSize;\nuniform float ssrFactor;\nuniform float ssrQuality;\nuniform sampler2D TextureReflected;\nuniform highp mat4 projMatrix;\nuniform mat4 invProjMatrix;\nuniform vec4 outputFovInfo[2];\nuniform mat4 reprojViewProjMatrix;\nuniform vec2 cameraNearFar;\nfloat A(const in vec4 B) {\n  return B.r + B.g / 255.;\n}\nfloat C(const in vec2 D, const in float E) {\n  vec3 F = vec3(.06711056, .00583715, 52.9829189);\n  return fract(F.z * fract(dot(D.xy + E * vec2(47., 17.) * .695, F.xy))) * .5;\n}\nvec3 G(const in float H, const in float I, const in vec2 J) {\n  float K = min(I - .01, H);\n  float L = floor(K);\n  float M = min(I, L + 1.);\n  float N = pow(2., M);\n  vec2 O = 2. * N / J;\n  if(K - L > .5)\n    N *= 2.;\n  return vec3(O, N);\n}\nvec2 P(const in vec2 Q, const in vec3 R) {\n  vec2 S = max(R.xy, min(1. - R.xy, Q));\n  return vec2(2. * S.x, R.z - 1. - S.y) / R.z;\n}\nvec3 T(const in mat4 U, const in vec3 V) {\n  vec4 W = U * vec4(V, 1.);\n  return vec3(.5 + .5 * W.xy / W.w, W.w);\n}\nvec3 X(const in float Y, const in vec2 S) {\n  return texture2D(TextureReflected, S).rgb;\n}\nfloat Z(float ba) {\n  highp mat4 U = projMatrix;\n  highp float z = ba * 2. - 1.;\n  return -U[3].z / (z + U[2].z);\n}\nfloat bb(const vec2 S) {\n  float ba = A(texture2D(TextureDepth, S));\n  return ba;\n}\nvec3 bc(const in float E, const in vec3 bd, const in vec3 be, const in vec3 bf, const in vec3 bg, const in float bh) {\n  vec2 bi;\n  bi.x = C(gl_FragCoord.yx, E);\n  bi.y = fract(bi.x * 52.9829189);\n  bi.y = mix(bi.y, 1., .7);\n  float bj = 2. * 3.14159 * bi.x;\n  float bk = pow(max(bi.y, .000001), bh / (2. - bh));\n  float bl = sqrt(1. - bk * bk);\n  vec3 bm = vec3(bl * cos(bj), bl * sin(bj), bk);\n  bm = bm.x * bd + bm.y * be + bm.z * bf;\n  return normalize((2. * dot(bg, bm)) * bm - bg);\n}\nfloat bn(const in float E) {\n  return (C(gl_FragCoord.xy, E) - .5);\n}\nvec3 bo(const in vec3 bp, const in float bq, const in vec3 br) {\n  vec3 bs = T(projMatrix, vViewVertex.xyz + br * bq);\n  bs.z = 1. / bs.z;\n  bs -= bp;\n  float bt = min(1., .99 * (1. - bp.x) / max(1e-5, bs.x));\n  float bu = min(1., .99 * (1. - bp.y) / max(1e-5, bs.y));\n  float bv = min(1., .99 * bp.x / max(1e-5, -bs.x));\n  float bw = min(1., .99 * bp.y / max(1e-5, -bs.y));\n  return bs * min(bt, bu) * min(bv, bw);\n}\nfloat bx(const in vec3 bp, const in vec3 bs, inout float by, inout float bz) {\n  float bA = (bz + by) * .5;\n  vec3 bB = bp + bs * bA;\n  float z = bb(bB.xy);\n  float ba = Z(z);\n  float bC = -1. / bB.z;\n  by = ba > bC ? by : bA;\n  bz = ba > bC ? bA : bz;\n  return bA;\n}\nvec4 bD(const in vec3 bp, const in float bq, in float bE, const in vec3 br, const in float j, const in float E) {\n  const int bF = 20;\n  float bG = 1. / float(bF);\n  bE *= bG;\n  vec3 bs = bo(bp, bq, br);\n  float bH = bG;\n  vec3 bI = vec3(.0, bH, 1.);\n  vec3 bB;\n  float z, ba, bC, bJ, bK, bL;\n  bool bM;\n  float bN = 1.;\n  float bA;\n  for(int bO = 0; bO < bF; bO++) {\n    bB = bp + bs * bI.y;\n    z = bb(bB.xy);\n    ba = Z(z);\n    bC = -1. / bB.z;\n    bJ = bC - ba;\n    bJ *= clamp(sign(abs(bJ) - bq * bG * bG), .0, 1.);\n    bM = abs(bJ + bE) < bE;\n    bK = clamp(bI.x / (bI.x - bJ), .0, 1.);\n    bL = bM ? bI.y + bK * bG - bG : 1.;\n    bI.z = min(bI.z, bL);\n    bI.x = bJ;\n    if(bM) {\n      float by = bI.y - bG;\n      float bz = bI.y;\n      bA = bx(bp, bs, by, bz);\n      bA = bx(bp, bs, by, bz);\n      bA = bx(bp, bs, by, bz);\n      bN = bA;\n      break;\n    }\n    bI.y += bG;\n  }\n  return vec4(bp + bs * bN, 1. - bN);\n}\nvec3 bP(in vec4 bQ, const in float bR, const in vec3 bS, const in vec3 bT, const in float j) {\n  vec4 bU = mix(outputFovInfo[0], outputFovInfo[1], bQ.x);\n  bQ.xyz = vec3(mix(bU.xy, bU.zw, bQ.y), 1.) * -1. / bQ.z;\n  bQ.xyz = (reprojViewProjMatrix * vec4(bQ.xyz, 1.)).xyw;\n  bQ.xy /= bQ.z;\n  float bV = clamp(6. - 6. * max(abs(bQ.x), abs(bQ.y)), .0, 1.);\n  bQ.xy = .5 + .5 * bQ.xy;\n  return vec3(bQ.xy, 1.);\n}\nvec3 ssr(const in vec3 bS, const in vec3 bT, const in float j, const in vec3 d, const in vec3 bg) {\n  float bW = .0;\n  vec4 f = vec4(.0);\n  float bh = j * j;\n  bh = bh * bh;\n  vec3 bX = abs(d.z) < .999 ? vec3(.0, .0, 1.) : vec3(1., .0, .0);\n  vec3 bd = normalize(cross(bX, d));\n  vec3 be = cross(d, bd);\n  float bR = ssrFactor * clamp(-4. * dot(bg, d) + 3.8, .0, 1.);\n  bR *= clamp(4.7 - j * 5., .0, 1.);\n  vec3 bp = T(projMatrix, vViewVertex.xyz);\n  bp.z = 1. / bp.z;\n  vec3 br = bc(bW, bd, be, d, bg, bh);\n  float bq = mix(cameraNearFar.y + vViewVertex.z, -vViewVertex.z - cameraNearFar.x, br.z * .5 + .5);\n  float bE = .5 * bq;\n  vec4 bQ;\n  if(dot(br, d) > .001 && bR > .0) {\n    bQ = bD(bp, bq, bE, br, j, bW);\n    if(bQ.w > .0)\n      return bP(bQ, bR, bS, bT, j);\n    \n  }\n  return vec3(.0);\n}\n#endif\nconst vec3 bY = vec3(0., 0., 1.);\nuniform mat4 viewMatrix;\nuniform sampler2D normalTexture;\nuniform sampler2D heightTexture;\nuniform vec4 waveParams;\nuniform vec2 waterDir;\nuniform vec4 waterBaseColor;\nuniform vec3 lightDirection;\nuniform vec3 lightColor;\nuniform vec3 camPos;\nuniform float timeElapsed;\nvarying vec2 vUv;\nvarying vec2 vNoiseUv;\nvarying vec3 vPos;\nvarying mat3 vTbnMatrix;\nfloat bZ(vec3 e, float ca) {\n  float cb = max(.015, ca);\n  return max((e.x + e.y) * .3303545 / cb + .3303545, .0);\n}\nconst vec2 cc = vec2(6. / 25., 5. / 24.);\nvec2 cd(sampler2D ce, vec2 S) {\n  return 2. * texture2D(ce, S).rg - 1.;\n}\nfloat cf(vec2 S) {\n  return texture2D(heightTexture, S).b;\n}\nvec3 cg(sampler2D ce, vec2 S) {\n  return 2. * texture2D(ce, S).rgb - 1.;\n}\nfloat ch(vec2 S, float ci) {\n  return fract(ci);\n}\nfloat cj(vec2 S, float ci) {\n  float ck = ch(S, ci);\n  return 1. - abs(1. - 2. * ck);\n}\nvec3 cl(sampler2D cm, vec2 S, float ci, float cn) {\n  float co = waveParams[2];\n  float cp = waveParams[3];\n  vec2 cq = cd(cm, S) * co;\n  float ck = ch(S, ci + cn);\n  float cr = cj(S, ci + cn);\n  vec2 f = S;\n  f -= cq * (ck + cp);\n  f += cn;\n  f += (ci - ck) * cc;\n  return vec3(f, cr);\n}\nconst float cs = 7.77;\nvec3 ct(sampler2D cu, sampler2D cv, vec2 cw, vec2 cx, float ci) {\n  float ca = waveParams[0];\n  vec2 cy = ci * -cx;\n  float cz = cf(vNoiseUv) * cs;\n  vec3 cA = cl(cv, cw + cy, ci + cz, .0);\n  vec3 cB = cl(cv, cw + cy, ci + cz, .5);\n  vec3 cC = cg(cu, cA.xy) * cA.z;\n  vec3 cD = cg(cu, cB.xy) * cB.z;\n  vec3 cE = normalize(cC + cD);\n  cE.xy *= ca;\n  cE.z = sqrt(1. - dot(cE.xy, cE.xy));\n  return cE;\n}\nvec4 cF(vec2 cw, float cG) {\n  float cH = waveParams[1];\n  vec3 d = ct(normalTexture, heightTexture, cw * cH, waterDir, cG);\n  float cI = bZ(d, waveParams[0]);\n  return vec4(d, cI);\n}\nconst float cJ = 3.141592653589793;\nconst float cK = 1. / cJ;\nconst float cL = .3183098861837907;\nconst float cM = 1.570796326794897;\nconst float cN = .4;\nfloat cO = 2.2;\nvec3 cP(float cQ, vec3 cR, float l) {\n  return cR + (l - cR) * pow(1. - cQ, 5.);\n}\nfloat cS(float cT, float j) {\n  float cU = j * j;\n  float cV = cT * cT;\n  float cW = pow((cV * (cU - 1.) + 1.), cO) * cJ;\n  return cU / cW;\n}\nfloat cX(float cY) {\n  return .25 / (cY * cY);\n}\nvec3 cZ(const vec3 x) {\n  return (x * (2.51 * x + .03)) / (x * (2.43 * x + .59) + .14);\n}\nconst float da = 2.2;\nconst float db = .4545454545;\nvec4 dc(vec4 u) {\n  return vec4(pow(u.rgb, vec3(db)), u.w);\n}\nvec3 dd(vec3 u) {\n  return pow(u, vec3(da));\n}\nconst vec3 de = vec3(.02, 1., 5.);\nconst vec2 df = vec2(.02, .1);\nconst float j = .06;\nconst float dg = 1.7;\nconst vec3 dh = vec3(0, .6, .9);\nconst vec3 di = vec3(.72, .92, 1.);\nconst float dj = .65;\nconst float dk = 300000.0;\nconst float dl = 500000.0;\nconst float dm = .775;\nconst float dn = .8;\nPBRShadingWater dp;\nvec3 dq(in PBRShadingWater dr, float j, vec3 ds, float dt) {\n  vec3 du = cP(dr.VdotH, ds, dt);\n  float dv = cS(dr.NdotH, j);\n  float dw = cX(dr.LdotH);\n  float dx = mix(j + .045, j + .385, 1. - dr.VdotH);\n  float dy = 1.2;\n  float dz = cS(dr.NdotH, dx) * dy;\n  return ((dv + dz) * dw) * du;\n}\nvec3 dA(float dg, float dB, vec3 dh, float dC) {\n  return dg * (.075 * dh * pow(dB, 4.) + 50. * pow(dB, 23.)) * dC;\n}\nvec3 dD(in float bk, in vec3 dE, in vec3 dF) {\n  float dG = pow((1. - bk), de[2]);\n  return mix(dF, dE, dG);\n}\nvec3 dH(in vec3 e, in vec3 dI, in float dJ, in float j) {\n  \n#ifdef HAS_IBL_LIGHTING\nvec3 dK = reflect(-dI, e);\n  vec4 dL = textureCube(prefilterMap, uEnvironmentTransform * dK);\n  float dM = clamp(1. + dot(dK, e), .0, 1.);\n  dL *= dM * dM;\n  vec3 i = o(dL, rgbmRange);\n  vec3 dN = c(e);\n  float l = clamp(50.0 * waterBaseColor.g, .0, 1.);\n  vec3 dO = h(waterBaseColor.rgb, j, dot(e, dI), l);\n  return i * dO + dN;\n#else\nvec3 dP = dd(di);\n  vec3 dQ = dd(dh);\n  vec3 di = dD(dJ, dP, dQ);\n  return di;\n#endif\n}\nvec3 dR(in vec3 e, in vec3 dI, in vec3 dS, vec3 u, in vec3 dT, in vec3 dU, in float dV, float dW, vec3 dX) {\n  float dY = 0.;\n  vec3 dZ = dd(u);\n  vec3 bm = normalize(dS + dI);\n  dp.NdotL = clamp(dot(e, dS), .0, 1.);\n  dp.NdotV = clamp(dot(e, dI), .001, 1.);\n  dp.VdotN = clamp(dot(dI, e), .001, 1.);\n  dp.NdotH = clamp(dot(e, bm), .0, 1.);\n  dp.VdotH = clamp(dot(dI, bm), .0, 1.);\n  dp.LdotH = clamp(dot(dS, bm), .0, 1.);\n  float dJ = max(dot(dU, dI), .0);\n  vec3 di = dH(e, dI, dJ, j);\n  float ea = max(dot(dU, dS), .0);\n  float eb = .1 + ea * .9;\n  di *= eb;\n  float ec = clamp(dV, .8, 1.);\n  vec3 ed = cP(dp.VdotN, vec3(de[0]), de[1]);\n  vec3 ee = ed * di * ec;\n  vec3 ef = dZ * mix(di, ea * dT * cK, 2. / 3.) * ec;\n  vec3 i = vec3(.0);\n  if(dJ > .0 && ea > .0) {\n    vec3 eg = dq(dp, j, vec3(df[0]), df[1]);\n    vec3 eh = dT * cK * dV;\n    i = dp.NdotL * eh * eg;\n  }\n  vec3 cI = vec3(.0);\n  if(dJ > .0) {\n    cI = dA(dg, dW, dh, eb);\n  }\n  vec3 ei = vec3(.0);\n#ifdef HAS_SSR\nfloat ej = smoothstep(dl, dk, -dX.z);\n  mat4 ek = viewMatrix;\n  vec4 el = vec4(dX.xyz, 1.);\n  vec3 em = normalize(el.xyz);\n  vec4 en = ek * vec4(e, .0);\n  vec3 eo = normalize(en.xyz);\n  vec4 ep = ek * vec4(dU, .0);\n  float eq = pow(max(dot(-em, ep.xyz), .0), cN);\n  vec3 er = mix(ep.xyz, eo, eq);\n  vec3 es = ssr(vec3(.0), vec3(1.), j, normalize(er), -normalize(vViewVertex.xyz));\n  if(es.z > .0) {\n    vec2 et = smoothstep(.3, .6, abs(vec2(.5) - es.xy));\n    dY = dm * clamp(1. - 1.3 * et.y, .0, 1.) * ej;\n    vec3 eu = X(.0, es.xy);\n    ei = dd(eu) * dY * ed.y * dj;\n  }\n#endif\nfloat ev = mix(dn, dn * .5, dY);\n  return cZ((1. - dY) * ee + ei + ef * ev + i + cI);\n}\nvoid main() {\n  vec3 dU = bY;\n  vec4 ew = cF(vUv, timeElapsed);\n  vec3 e = normalize(vTbnMatrix * ew.xyz);\n  vec3 dI = -normalize(vPos - camPos);\n  vec3 dS = normalize(-lightDirection);\n#if defined(HAS_SHADOWING)\nfloat dV = shadow_computeShadow();\n#else\nfloat dV = 1.;\n#endif\nvec4 ex = viewMatrix * vec4(vPos, 1.);\n  vec4 ey = vec4(dR(e, dI, dS, waterBaseColor.rgb, lightColor, dU, dV, ew.w, ex.xyz), waterBaseColor.a);\n  gl_FragColor = dc(ey);\n  if(contrast != 1.) {\n    gl_FragColor = contrastMatrix(contrast) * gl_FragColor;\n  }\n  if(length(hsv) > .0) {\n    gl_FragColor = hsv_apply(gl_FragColor, hsv);\n  }\n  gl_FragColor = highlight_blendColor(gl_FragColor) * layerOpacity;\n}",
             defines: o,
@@ -10880,108 +10891,108 @@ class pa extends Bi {
             projViewMatrix: t.projViewMatrix
         };
     }
-    sa(t, e) {
-        const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = ha(t, n, i, e && e.ssr, e && e.jitter), s = t.getLightManager();
+    oa(t, e) {
+        const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = ua(t, n, i, e && e.ssr, e && e.jitter), s = t.getLightManager();
         let o = s && s.getDirectionalLight() || {};
-        const l = s && s.getAmbientLight() || {}, h = this.getSymbol(ca), u = this.pa = this.pa || [], c = this.ma = this.ma || [];
+        const l = s && s.getAmbientLight() || {}, h = this.getSymbol(fa), u = this.ma = this.ma || [], c = this.ya = this.ya || [];
         a.set(c, .09, h.uvScale || 3, .03, -.5);
         Tt(r, {
             ambientColor: l.color || [ .2, .2, .2 ],
             viewMatrix: t.viewMatrix,
-            lightDirection: o.direction || ua.direction,
-            lightColor: o.color || ua.color,
+            lightDirection: o.direction || ca.direction,
+            lightColor: o.color || ca.color,
             camPos: t.cameraPosition,
             timeElapsed: h.animation ? (this.layer.getRenderer().getFrameTimestamp() || 0) / (1 / (h.waterSpeed || 1) * 1e4) : 0,
-            normalTexture: this.ca || this.ua,
-            heightTexture: this.da || this.ua,
+            normalTexture: this.fa || this.ca,
+            heightTexture: this.pa || this.ca,
             waveParams: c,
-            waterDir: ma(u, h.waterDirection || 0),
+            waterDir: ya(u, h.waterDirection || 0),
             waterBaseColor: h.waterBaseColor || [ .1451, .2588, .4863, 1 ],
             contrast: h.contrast || 1,
-            hsv: h.hsv || fa
+            hsv: h.hsv || da
         });
         const f = this.layer.getRenderer();
         return r.layerOpacity = f.ne(), this.setIncludeUniformValues(r, e), e && e.ssr && e.ssr.renderUniforms && Tt(r, e.ssr.renderUniforms), 
         r;
     }
     delete() {
-        super.delete(), this.ua && (this.ua.destroy(), delete this.ua), this.ca && this.ca.destroy(), 
-        this.da && this.da.destroy(), this.shader && (this.shader.dispose(), delete this.shader), 
-        this.oa && this.oa.dispose(), this.la && (this.la.geometry.dispose(), this.la.material && this.la.material.dispose(), 
-        this.la.dispose(), delete this.la), this.disposeIBLTextures();
+        super.delete(), this.ca && (this.ca.destroy(), delete this.ca), this.fa && this.fa.destroy(), 
+        this.pa && this.pa.destroy(), this.shader && (this.shader.dispose(), delete this.shader), 
+        this.aa && this.aa.dispose(), this.ha && (this.ha.geometry.dispose(), this.ha.material && this.ha.material.dispose(), 
+        this.ha.dispose(), delete this.ha), this.disposeIBLTextures();
     }
     createGround() {
         const t = new n.Plane;
         t.data.aTexCoord = new Uint8Array([ 0, 1, 1, 1, 0, 0, 1, 0 ]), t.generateBuffers(this.renderer.regl), 
-        this.la = new n.Mesh(t, null, {
+        this.ha = new n.Mesh(t, null, {
             castShadow: !1
-        }), this.aa = new n.Scene([ this.la ]);
+        }), this.la = new n.Scene([ this.ha ]);
     }
     transformWater() {
-        const t = this.getMap(), e = s.getGroundTransform(this.la.localTransform, t);
-        this.la.setLocalTransform(e);
-        const n = t._get2DExtentAtRes(t.getGLRes()), i = n.getWidth(), r = n.getHeight(), o = t.cameraLookAt, a = o[0] - i, l = o[1] + r, h = a / da[0], u = l / da[1], c = h % 1, f = u % 1, d = .3737 * h % 1, p = .3737 * u % 1, m = i / da[0] * 2, y = r / da[1] * 2;
-        this.la.setUniform("uvOffset", [ c, f ]), this.la.setUniform("noiseUvOffset", [ d, p ]), 
-        this.la.setUniform("uvScale", [ m, -y ]);
+        const t = this.getMap(), e = s.getGroundTransform(this.ha.localTransform, t);
+        this.ha.setLocalTransform(e);
+        const n = t._get2DExtentAtRes(t.getGLRes()), i = n.getWidth(), r = n.getHeight(), o = t.cameraLookAt, a = o[0] - i, l = o[1] + r, h = a / pa[0], u = l / pa[1], c = h % 1, f = u % 1, d = .3737 * h % 1, p = .3737 * u % 1, m = i / pa[0] * 2, y = r / pa[1] * 2;
+        this.ha.setUniform("uvOffset", [ c, f ]), this.ha.setUniform("noiseUvOffset", [ d, p ]), 
+        this.ha.setUniform("uvScale", [ m, -y ]);
     }
 }
 
-function ma(t, e) {
+function ya(t, e) {
     var n;
     return n = e, e = Math.PI * n / 180, t[0] = Math.sin(e), t[1] = Math.cos(e), t;
 }
 
-const ya = ei("fill", nr);
-
-ya.registerAt(he);
-
-const ga = ei("line", or);
+const ga = ei("fill", nr);
 
 ga.registerAt(he);
 
-const va = ei("line-gradient", ar);
+const va = ei("line", or);
 
 va.registerAt(he);
 
-const xa = ei("icon", Cs);
+const xa = ei("line-gradient", ar);
 
 xa.registerAt(he);
 
-const ba = ei("text", vo);
+const ba = ei("icon", Es);
 
 ba.registerAt(he);
 
-const Aa = ei("native-line", Po);
+const Aa = ei("text", xo);
 
 Aa.registerAt(he);
 
-ei("native-point", _o).registerAt(he);
-
-const wa = ei("phong", Vo);
+const wa = ei("native-line", To);
 
 wa.registerAt(he);
 
-const _a = ei("wireframe", jo);
+ei("native-point", So).registerAt(he);
+
+const _a = ei("phong", Uo);
 
 _a.registerAt(he);
 
-const Sa = ei("lit", Go);
+const Sa = ei("wireframe", Bo);
 
 Sa.registerAt(he);
 
-const Ma = ei("tube", Yo);
+const Ma = ei("lit", Wo);
 
 Ma.registerAt(he);
 
-const Pa = ei("gltf-phong", aa);
+const Pa = ei("tube", $o);
 
 Pa.registerAt(he);
 
-const Ta = ei("gltf-lit", la);
+const Ta = ei("gltf-phong", la);
 
 Ta.registerAt(he);
 
-const ka = ei("heatmap", class extends Bi {
+const ka = ei("gltf-lit", ha);
+
+ka.registerAt(he);
+
+const Oa = ei("heatmap", class extends Bi {
     createFnTypeConfig(t, e) {
         const n = g(e.heatmapWeight), i = new Int16Array(1);
         return [ {
@@ -11018,7 +11029,7 @@ const ka = ei("heatmap", class extends Bi {
     }
     callRenderer(t, e, n) {
         const i = this.getRenderFBO(n);
-        this.Gi += this.ya.render(this.scene, e, i);
+        this.Gi += this.ga.render(this.scene, e, i);
     }
     getUniformValues(t) {
         const e = this.getSymbol({
@@ -11035,24 +11046,24 @@ const ka = ei("heatmap", class extends Bi {
         return this.scene.getMeshes();
     }
     delete() {
-        super.delete(...arguments), this.ya.dispose(), delete this.ya;
+        super.delete(...arguments), this.ga.dispose(), delete this.ga;
     }
     init() {
         const t = this.regl;
         this.renderer = new n.Renderer(t);
         const e = this.getPolygonOffset(), i = this.getSymbols()[0];
-        this.ya = new d(this.regl, this.sceneConfig, this.layer, i.heatmapColor, null, e);
+        this.ga = new d(this.regl, this.sceneConfig, this.layer, i.heatmapColor, null, e);
     }
 });
 
-ka.registerAt(he);
+Oa.registerAt(he);
 
-const Oa = ei("water", pa);
+const Ia = ei("water", ma);
 
-Oa.registerAt(he), we.registerPainter("lit", Go), we.registerPainter("icon", Cs), 
+Ia.registerAt(he), we.registerPainter("lit", Wo), we.registerPainter("icon", Es), 
 we.registerPainter("fill", nr), we.registerPainter("line", or), we.registerPainter("line-gradient", ar), 
-we.registerPainter("water", pa), we.registerPainter("tube", Yo), n.ShaderLib.register("vt_position_vert", "#ifdef HAS_TERRAIN_ALTITUDE\n    attribute float aTerrainAltitude;\n#endif\nuniform float minAltitude;\n#ifdef HAS_ALTITUDE\n    vec3 unpackVTPosition() {\n        float altitude = aAltitude;\n        #ifdef HAS_TERRAIN_ALTITUDE\n            altitude += aTerrainAltitude * 100.0;\n        #endif\n        altitude += minAltitude * 100.0;\n        return vec3(aPosition, altitude);\n    }\n#else\n    float position_modValue = 16384.0;\n    float position_delta = 0.00001;\n    vec3 unpackVTPosition() {\n        float z = aPosition.z;\n        vec2 pos = sign(aPosition.xy + position_delta) * mod(abs(aPosition.xy), position_modValue);\n        vec2 highs = floor(abs(aPosition.xy) / position_modValue);\n        float altitude = sign(z + position_delta) * (highs.x * 2.0 + highs.y) * pow(2.0, 15.0) + z;\n        #ifdef HAS_TERRAIN_ALTITUDE\n            altitude += aTerrainAltitude * 100.0;\n        #endif\n        altitude += minAltitude * 100.0;\n        return vec3(pos, altitude);\n    }\n#endif"), 
-he.VERSION = "0.92.2", we.VERSION = "0.92.2";
+we.registerPainter("water", ma), we.registerPainter("tube", $o), n.ShaderLib.register("vt_position_vert", "#ifdef HAS_TERRAIN_ALTITUDE\n    attribute float aTerrainAltitude;\n#endif\nuniform float minAltitude;\n#ifdef HAS_ALTITUDE\n    vec3 unpackVTPosition() {\n        float altitude = aAltitude;\n        #ifdef HAS_TERRAIN_ALTITUDE\n            altitude += aTerrainAltitude * 100.0;\n        #endif\n        altitude += minAltitude * 100.0;\n        return vec3(aPosition, altitude);\n    }\n#else\n    float position_modValue = 16384.0;\n    float position_delta = 0.00001;\n    vec3 unpackVTPosition() {\n        float z = aPosition.z;\n        vec2 pos = sign(aPosition.xy + position_delta) * mod(abs(aPosition.xy), position_modValue);\n        vec2 highs = floor(abs(aPosition.xy) / position_modValue);\n        float altitude = sign(z + position_delta) * (highs.x * 2.0 + highs.y) * pow(2.0, 15.0) + z;\n        #ifdef HAS_TERRAIN_ALTITUDE\n            altitude += aTerrainAltitude * 100.0;\n        #endif\n        altitude += minAltitude * 100.0;\n        return vec3(pos, altitude);\n    }\n#endif"), 
+he.VERSION = "0.92.3", we.VERSION = "0.92.3";
 
 if (e.mat4.create(), e.transcoders) {
     const n = t.Map.VERSION;
@@ -11064,6 +11075,6 @@ if (e.mat4.create(), e.transcoders) {
     }));
 } else t.registerWorkerAdapter("@maptalks/vt", q);
 
-export { $n as ExtrudePolygonLayer, nr as FillPainter, ya as FillPlugin, Pa as GLTFPhongPlugin, Ta as GLTFStandardPlugin, ve as GeoJSONVectorTileLayer, ka as HeatmapPlugin, Cs as IconPainter, xa as IconPlugin, va as LineGradientPlugin, or as LinePainter, ga as LinePlugin, $e as LineStringLayer, Sa as LitPlugin, ye as MapboxVectorTileLayer, Po as NativeLinePainter, Aa as NativeLinePlugin, _o as NativePointPainter, Vo as PhongPainter, wa as PhongPlugin, Ye as PointLayer, Je as PolygonLayer, vo as TextPainter, ba as TextPlugin, Ma as TubePlugin, we as Vector3DLayer, he as VectorTileLayer, Jt as VectorTileLayerRenderer, Oa as WaterPlugin, jo as WireframePainter, _a as WireframePlugin };
+export { $n as ExtrudePolygonLayer, nr as FillPainter, ga as FillPlugin, Ta as GLTFPhongPlugin, ka as GLTFStandardPlugin, ve as GeoJSONVectorTileLayer, Oa as HeatmapPlugin, Es as IconPainter, ba as IconPlugin, xa as LineGradientPlugin, or as LinePainter, va as LinePlugin, $e as LineStringLayer, Ma as LitPlugin, ye as MapboxVectorTileLayer, To as NativeLinePainter, wa as NativeLinePlugin, So as NativePointPainter, Uo as PhongPainter, _a as PhongPlugin, Ye as PointLayer, Je as PolygonLayer, xo as TextPainter, Aa as TextPlugin, Pa as TubePlugin, we as Vector3DLayer, he as VectorTileLayer, Jt as VectorTileLayerRenderer, Ia as WaterPlugin, Bo as WireframePainter, Sa as WireframePlugin };
 
-"undefined" != typeof console && console.log("@maptalks/vt v0.92.2");
+"undefined" != typeof console && console.log("@maptalks/vt v0.92.3");