@maptalks/vt 0.55.0 → 0.56.0

package/dist/maptalks.vt.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/vt v0.55.0
+ * @maptalks/vt v0.56.0
  * LICENSE : undefined
  * (c) 2016-2021 maptalks.org
  */
@@ -208,21 +208,21 @@
             return t;
         }
         function _(t) {
-            return !I(t) && ("string" == typeof t || null !== t.constructor && t.constructor === String);
+            return !C(t) && ("string" == typeof t || null !== t.constructor && t.constructor === String);
         }
         function P(t) {
             return "number" == typeof t && !isNaN(t);
         }
         function S(t) {
-            return !I(t) && ("function" == typeof t || null !== t.constructor && t.constructor === Function);
+            return !C(t) && ("function" == typeof t || null !== t.constructor && t.constructor === Function);
         }
         function O(t) {
             return !Array.isArray(t) && "object" == typeof t && !!t;
         }
-        function I(t) {
+        function C(t) {
             return null == t;
         }
-        function C(t) {
+        function I(t) {
             for (let i = 1; i < arguments.length; i++) {
                 const n = arguments[i];
                 if (n) for (let i = 0, e = n.length; i < e; i++) t.push(n[i]);
@@ -238,7 +238,7 @@
         function L(t) {
             return (t = Math.abs(t)) < 128 ? Int8Array : t < 32768 ? Int16Array : Float32Array;
         }
-        function E(t) {
+        function U(t) {
             return function t(i) {
                 if (!Array.isArray(i)) return t([ i ]);
                 const n = [];
@@ -256,7 +256,7 @@
                 return i.filter && i.filter.value && (i.filter = i.filter.value), i;
             }));
         }
-        function U(t, i) {
+        function E(t, i) {
             return g(i[t]) && i[t].property;
         }
         const j = "function" == typeof fetch && "function" == typeof AbortController, R = {
@@ -281,8 +281,8 @@
                         method: i.method || "GET",
                         referrerPolicy: "origin"
                     };
-                    return e && (I(i.body) || (s.body = JSON.stringify(i.body))), I(i.headers) || (s.headers = i.headers), 
-                    I(i.credentials) || (s.credentials = i.credentials), fetch(t, s).then(t => {
+                    return e && (C(i.body) || (s.body = JSON.stringify(i.body))), C(i.headers) || (s.headers = i.headers), 
+                    C(i.credentials) || (s.credentials = i.credentials), fetch(t, s).then(t => {
                         const e = this.s(t, i.returnJSON, i.responseType);
                         e.message ? n(e) : e.then(e => {
                             "arraybuffer" === i.responseType ? n(null, {
@@ -387,13 +387,13 @@
             if (i.geometry) {
                 var r = i.geometry.coordinates, s = i.geometry.type, o = Math.pow(n.tolerance / ((1 << n.maxZoom) * n.extent), 2), h = [], a = i.id;
                 if (n.promoteId ? a = i.properties[n.promoteId] : n.generateId && (a = e || 0), 
-                "Point" === s) V(r, h); else if ("MultiPoint" === s) for (var l = 0; l < r.length; l++) V(r[l], h); else if ("LineString" === s) G(r, h, o, !1); else if ("MultiLineString" === s) {
+                "Point" === s) V(r, h); else if ("MultiPoint" === s) for (var l = 0; l < r.length; l++) V(r[l], h); else if ("LineString" === s) $(r, h, o, !1); else if ("MultiLineString" === s) {
                     if (n.lineMetrics) {
-                        for (l = 0; l < r.length; l++) h = [], G(r[l], h, o, !1), t.push(z(a, "LineString", h, i.properties));
+                        for (l = 0; l < r.length; l++) h = [], $(r[l], h, o, !1), t.push(z(a, "LineString", h, i.properties));
                         return;
                     }
-                    $(r, h, o, !1);
-                } else if ("Polygon" === s) $(r, h, o, !0); else {
+                    G(r, h, o, !1);
+                } else if ("Polygon" === s) G(r, h, o, !0); else {
                     if ("MultiPolygon" !== s) {
                         if ("GeometryCollection" === s) {
                             for (l = 0; l < i.geometry.geometries.length; l++) H(t, {
@@ -407,7 +407,7 @@
                     }
                     for (l = 0; l < r.length; l++) {
                         var u = [];
-                        $(r[l], u, o, !0), h.push(u);
+                        G(r[l], u, o, !0), h.push(u);
                     }
                 }
                 t.push(z(a, s, h, i.properties));
@@ -416,7 +416,7 @@
         function V(t, i) {
             i.push(J(t[0])), i.push(q(t[1])), i.push(0);
         }
-        function G(t, i, n, e) {
+        function $(t, i, n, e) {
             for (var r, s, o = 0, h = 0; h < t.length; h++) {
                 var a = J(t[h][0]), l = q(t[h][1]);
                 i.push(a), i.push(l), i.push(0), h > 0 && (o += e ? (r * l - a * s) / 2 : Math.sqrt(Math.pow(a - r, 2) + Math.pow(l - s, 2))), 
@@ -434,10 +434,10 @@
                 o > r && (s - n > 3 && t(i, n, s, r), i[s + 2] = o, e - s > 3 && t(i, s, e, r));
             }(i, 0, u, n), i[u + 2] = 1, i.size = Math.abs(o), i.start = 0, i.end = i.size;
         }
-        function $(t, i, n, e) {
+        function G(t, i, n, e) {
             for (var r = 0; r < t.length; r++) {
                 var s = [];
-                G(t[r], s, n, e), i.push(s);
+                $(t[r], s, n, e), i.push(s);
             }
         }
         function J(t) {
@@ -868,13 +868,13 @@
             var l, u, c, f;
         }
         "undefined" != typeof undefinedThis ? globalThis : "undefined" != typeof window ? window : "undefined" != typeof self && self;
-        var Ot = It;
-        function It(t, i) {
+        var Ot = Ct;
+        function Ct(t, i) {
             this.x = t, this.y = i;
         }
-        It.prototype = {
+        Ct.prototype = {
             clone: function() {
-                return new It(this.x, this.y);
+                return new Ct(this.x, this.y);
             },
             add: function(t) {
                 return this.clone().m(t);
@@ -901,10 +901,10 @@
                 return this.clone().O(t, i);
             },
             matMult: function(t) {
-                return this.clone().I(t);
+                return this.clone().C(t);
             },
             unit: function() {
-                return this.clone().C();
+                return this.clone().I();
             },
             perp: function() {
                 return this.clone().T();
@@ -937,7 +937,7 @@
             angleWithSep: function(t, i) {
                 return Math.atan2(this.x * i - this.y * t, this.x * t + this.y * i);
             },
-            I: function(t) {
+            C: function(t) {
                 var i = t[0] * this.x + t[1] * this.y, n = t[2] * this.x + t[3] * this.y;
                 return this.x = i, this.y = n, this;
             },
@@ -959,7 +959,7 @@
             A: function(t) {
                 return this.x /= t.x, this.y /= t.y, this;
             },
-            C: function() {
+            I: function() {
                 return this.P(this.mag()), this;
             },
             T: function() {
@@ -977,10 +977,10 @@
             D: function() {
                 return this.x = Math.round(this.x), this.y = Math.round(this.y), this;
             }
-        }, It.convert = function(t) {
-            return t instanceof It ? t : Array.isArray(t) ? new It(t[0], t[1]) : t;
+        }, Ct.convert = function(t) {
+            return t instanceof Ct ? t : Array.isArray(t) ? new Ct(t[0], t[1]) : t;
         };
-        const Ct = {
+        const It = {
             Point: 1,
             LineString: 2,
             Polygon: 3,
@@ -999,13 +999,13 @@
             if (i.geometry && i.geometry.geometry) {
                 var r = i.geometry.coordinates, s = i.geometry.type, o = [], h = i.id;
                 if (n.promoteId ? h = i.properties[n.promoteId] : n.generateId && (h = e || 0), 
-                "Point" === s) Lt(r, o); else if ("MultiPoint" === s) for (var a = 0; a < r.length; a++) Lt(r[a], o); else if ("LineString" === s) Ut([ r ], o); else if ("MultiLineString" === s) {
+                "Point" === s) Lt(r, o); else if ("MultiPoint" === s) for (var a = 0; a < r.length; a++) Lt(r[a], o); else if ("LineString" === s) Et([ r ], o); else if ("MultiLineString" === s) {
                     if (n.lineMetrics) {
-                        for (a = 0; a < r.length; a++) o = [], Et(r[a], o), t.push(jt(h, "LineString", o, i.properties));
+                        for (a = 0; a < r.length; a++) o = [], Ut(r[a], o), t.push(jt(h, "LineString", o, i.properties));
                         return;
                     }
-                    Ut(r, o);
-                } else if ("Polygon" === s) Ut(r, o); else {
+                    Et(r, o);
+                } else if ("Polygon" === s) Et(r, o); else {
                     if ("MultiPolygon" !== s) {
                         if ("GeometryCollection" === s) {
                             for (a = 0; a < i.geometry.geometries.length; a++) Dt(t, {
@@ -1019,7 +1019,7 @@
                     }
                     for (a = 0; a < r.length; a++) {
                         var l = [];
-                        Ut(r[a], l), o.push(l);
+                        Et(r[a], l), o.push(l);
                     }
                 }
                 t.push(jt(h, s, o, i.properties));
@@ -1028,22 +1028,22 @@
         function Lt(t, i) {
             i.push([ new Ot(t[0], t[1]) ]);
         }
-        function Et(t, i) {
+        function Ut(t, i) {
             for (var n = 0; n < t.length; n++) {
                 var e = t[n][0], r = t[n][1];
                 i.push(new Ot(e, r));
             }
         }
-        function Ut(t, i, n, e) {
+        function Et(t, i, n, e) {
             for (var r = 0; r < t.length; r++) {
                 var s = [];
-                Et(t[r], s), i.push(s);
+                Ut(t[r], s), i.push(s);
             }
         }
         function jt(t, i, n, e) {
             return {
                 id: void 0 === t ? null : t,
-                type: Ct[i],
+                type: It[i],
                 geometry: n,
                 properties: e
             };
@@ -1169,7 +1169,7 @@
         }, Nt.prototype.resize = function(t) {
             return this.free += t - this.w, this.w = t, !0;
         };
-        class Gt {
+        class $t {
             constructor(t, i) {
                 Wt(this, t, 1, i);
             }
@@ -1177,7 +1177,7 @@
                 Ht(this, t, 1);
             }
             clone() {
-                return new Gt({
+                return new $t({
                     width: this.width,
                     height: this.height
                 }, new Uint8Array(this.data));
@@ -1186,7 +1186,7 @@
                 Vt(t, i, n, e, r, 1);
             }
         }
-        class $t {
+        class Gt {
             constructor(t, i) {
                 Wt(this, t, 4, i);
             }
@@ -1194,7 +1194,7 @@
                 Ht(this, t, 4);
             }
             clone() {
-                return new $t({
+                return new Gt({
                     width: this.width,
                     height: this.height
                 }, new Uint8Array(this.data));
@@ -1244,13 +1244,13 @@
                     const t = Xt(n.w), i = Xt(n.h);
                     n.resize(t, i);
                 }
-                const r = new $t({
+                const r = new Gt({
                     width: n.w,
                     height: n.h
                 });
                 for (const n in t) {
                     const e = t[n], s = i[n].paddedRect;
-                    $t.copy(e.data, r, {
+                    Gt.copy(e.data, r, {
                         x: 0,
                         y: 0
                     }, {
@@ -1300,7 +1300,7 @@
                 n.pack(e, {
                     inPlace: !0
                 });
-                const r = new Gt({
+                const r = new $t({
                     width: n.w,
                     height: n.h
                 });
@@ -1310,7 +1310,7 @@
                         const s = e[+t];
                         if (!s || 0 === s.bitmap.width || 0 === s.bitmap.height) continue;
                         const o = i[n][t].rect;
-                        Gt.copy(s.bitmap, r, {
+                        $t.copy(s.bitmap, r, {
                             x: 0,
                             y: 0
                         }, {
@@ -1333,9 +1333,9 @@
         }
         function ti(t) {
             const i = t.type, n = [];
-            if (1 === i || 4 === i) for (let i = 0; i < t.geometry.length; i++) Lt(t.geometry[i], n); else if (2 === i) Ut(t.geometry, n); else if (3 === i) Ut(t.geometry, n); else if (5 === i) Ut(t.geometry, n); else if (6 === i) for (let i = 0; i < t.geometry.length; i++) {
+            if (1 === i || 4 === i) for (let i = 0; i < t.geometry.length; i++) Lt(t.geometry[i], n); else if (2 === i) Et(t.geometry, n); else if (3 === i) Et(t.geometry, n); else if (5 === i) Et(t.geometry, n); else if (6 === i) for (let i = 0; i < t.geometry.length; i++) {
                 const e = [];
-                Ut(t.geometry[i], e), n.push(e);
+                Et(t.geometry[i], e), n.push(e);
             }
             return t.geometry = n, t;
         }
@@ -1421,7 +1421,7 @@
         }
         const mi = {
             lineWidth: 1,
-            lineGapWidth: 1,
+            lineStrokeWidth: 1,
             lineDx: 1,
             lineDy: 1,
             lineOpacity: 1,
@@ -1521,7 +1521,7 @@
                                 if (t && Object.keys(t).length) {
                                     for (const i in t) {
                                         const n = t[i], {width: e, height: r, data: s} = n.data;
-                                        n.data = new $t({
+                                        n.data = new Gt({
                                             width: e,
                                             height: r
                                         }, s);
@@ -1533,7 +1533,7 @@
                                         const i = n[t];
                                         for (const t in i) {
                                             const n = i[t], {width: e, height: r, data: s} = n.bitmap;
-                                            n.bitmap = new Gt({
+                                            n.bitmap = new $t({
                                                 width: e,
                                                 height: r
                                             }, s);
@@ -1691,16 +1691,16 @@
             };
         }
         const wi = /\{([\w_]+)\}/g;
-        const bi = t => t >= 128 && t <= 255, Mi = t => t >= 1536 && t <= 1791, xi = t => t >= 1872 && t <= 1919, Fi = t => t >= 2208 && t <= 2303, Ai = t => t >= 4352 && t <= 4607, ki = t => t >= 5120 && t <= 5759, _i = t => t >= 6320 && t <= 6399, Pi = t => t >= 8192 && t <= 8303, Si = t => t >= 8448 && t <= 8527, Oi = t => t >= 8528 && t <= 8591, Ii = t => t >= 8960 && t <= 9215, Ci = t => t >= 9216 && t <= 9279, Ti = t => t >= 9280 && t <= 9311, Di = t => t >= 9312 && t <= 9471, Li = t => t >= 9632 && t <= 9727, Ei = t => t >= 9728 && t <= 9983, Ui = t => t >= 11008 && t <= 11263, ji = t => t >= 11904 && t <= 12031, Ri = t => t >= 12032 && t <= 12255, Ni = t => t >= 12272 && t <= 12287, zi = t => t >= 12288 && t <= 12351, Wi = t => t >= 12352 && t <= 12447, Hi = t => t >= 12448 && t <= 12543, Vi = t => t >= 12544 && t <= 12591, Gi = t => t >= 12592 && t <= 12687, $i = t => t >= 12688 && t <= 12703, Ji = t => t >= 12704 && t <= 12735, qi = t => t >= 12736 && t <= 12783, Bi = t => t >= 12784 && t <= 12799, Xi = t => t >= 12800 && t <= 13055, Zi = t => t >= 13056 && t <= 13311, Yi = t => t >= 13312 && t <= 19903, Ki = t => t >= 19904 && t <= 19967, Qi = t => t >= 19968 && t <= 40959, tn = t => t >= 40960 && t <= 42127, nn = t => t >= 42128 && t <= 42191, en = t => t >= 43360 && t <= 43391, rn = t => t >= 44032 && t <= 55215, sn = t => t >= 55216 && t <= 55295, on = t => t >= 57344 && t <= 63743, hn = t => t >= 63744 && t <= 64255, an = t => t >= 64336 && t <= 65023, ln = t => t >= 65040 && t <= 65055, un = t => t >= 65072 && t <= 65103, cn = t => t >= 65104 && t <= 65135, fn = t => t >= 65136 && t <= 65279, dn = t => t >= 65280 && t <= 65519;
+        const bi = t => t >= 128 && t <= 255, Mi = t => t >= 1536 && t <= 1791, xi = t => t >= 1872 && t <= 1919, Fi = t => t >= 2208 && t <= 2303, Ai = t => t >= 4352 && t <= 4607, ki = t => t >= 5120 && t <= 5759, _i = t => t >= 6320 && t <= 6399, Pi = t => t >= 8192 && t <= 8303, Si = t => t >= 8448 && t <= 8527, Oi = t => t >= 8528 && t <= 8591, Ci = t => t >= 8960 && t <= 9215, Ii = t => t >= 9216 && t <= 9279, Ti = t => t >= 9280 && t <= 9311, Di = t => t >= 9312 && t <= 9471, Li = t => t >= 9632 && t <= 9727, Ui = t => t >= 9728 && t <= 9983, Ei = t => t >= 11008 && t <= 11263, ji = t => t >= 11904 && t <= 12031, Ri = t => t >= 12032 && t <= 12255, Ni = t => t >= 12272 && t <= 12287, zi = t => t >= 12288 && t <= 12351, Wi = t => t >= 12352 && t <= 12447, Hi = t => t >= 12448 && t <= 12543, Vi = t => t >= 12544 && t <= 12591, $i = t => t >= 12592 && t <= 12687, Gi = t => t >= 12688 && t <= 12703, Ji = t => t >= 12704 && t <= 12735, qi = t => t >= 12736 && t <= 12783, Bi = t => t >= 12784 && t <= 12799, Xi = t => t >= 12800 && t <= 13055, Zi = t => t >= 13056 && t <= 13311, Yi = t => t >= 13312 && t <= 19903, Ki = t => t >= 19904 && t <= 19967, Qi = t => t >= 19968 && t <= 40959, tn = t => t >= 40960 && t <= 42127, nn = t => t >= 42128 && t <= 42191, en = t => t >= 43360 && t <= 43391, rn = t => t >= 44032 && t <= 55215, sn = t => t >= 55216 && t <= 55295, on = t => t >= 57344 && t <= 63743, hn = t => t >= 63744 && t <= 64255, an = t => t >= 64336 && t <= 65023, ln = t => t >= 65040 && t <= 65055, un = t => t >= 65072 && t <= 65103, cn = t => t >= 65104 && t <= 65135, fn = t => t >= 65136 && t <= 65279, dn = t => t >= 65280 && t <= 65519;
         function yn(t) {
             return !Mi(t) && (!xi(t) && (!Fi(t) && (!an(t) && !fn(t))));
         }
         function pn(t) {
-            return 746 === t || 747 === t || !(t < 4352) && (!!Ji(t) || (!!Vi(t) || (!(!un(t) || t >= 65097 && t <= 65103) || (!!hn(t) || (!!Zi(t) || (!!ji(t) || (!!qi(t) || (!(!zi(t) || t >= 12296 && t <= 12305 || t >= 12308 && t <= 12319 || 12336 === t) || (!!Yi(t) || (!!Qi(t) || (!!Xi(t) || (!!Gi(t) || (!!en(t) || (!!sn(t) || (!!Ai(t) || (!!rn(t) || (!!Wi(t) || (!!Ni(t) || (!!$i(t) || (!!Ri(t) || (!!Bi(t) || (!(!Hi(t) || 12540 === t) || (!(!dn(t) || 65288 === t || 65289 === t || 65293 === t || t >= 65306 && t <= 65310 || 65339 === t || 65341 === t || 65343 === t || t >= 65371 && t <= 65503 || 65507 === t || t >= 65512 && t <= 65519) || (!(!cn(t) || t >= 65112 && t <= 65118 || t >= 65123 && t <= 65126) || (!!ki(t) || (!!_i(t) || (!!ln(t) || (!!Ki(t) || (!!tn(t) || !!nn(t))))))))))))))))))))))))))))));
+            return 746 === t || 747 === t || !(t < 4352) && (!!Ji(t) || (!!Vi(t) || (!(!un(t) || t >= 65097 && t <= 65103) || (!!hn(t) || (!!Zi(t) || (!!ji(t) || (!!qi(t) || (!(!zi(t) || t >= 12296 && t <= 12305 || t >= 12308 && t <= 12319 || 12336 === t) || (!!Yi(t) || (!!Qi(t) || (!!Xi(t) || (!!$i(t) || (!!en(t) || (!!sn(t) || (!!Ai(t) || (!!rn(t) || (!!Wi(t) || (!!Ni(t) || (!!Gi(t) || (!!Ri(t) || (!!Bi(t) || (!(!Hi(t) || 12540 === t) || (!(!dn(t) || 65288 === t || 65289 === t || 65293 === t || t >= 65306 && t <= 65310 || 65339 === t || 65341 === t || 65343 === t || t >= 65371 && t <= 65503 || 65507 === t || t >= 65512 && t <= 65519) || (!(!cn(t) || t >= 65112 && t <= 65118 || t >= 65123 && t <= 65126) || (!!ki(t) || (!!_i(t) || (!!ln(t) || (!!Ki(t) || (!!tn(t) || !!nn(t))))))))))))))))))))))))))))));
         }
         function mn(t) {
             return !(pn(t) || function(t) {
-                return !(!bi(t) || 167 !== t && 169 !== t && 174 !== t && 177 !== t && 188 !== t && 189 !== t && 190 !== t && 215 !== t && 247 !== t) || (!(!Pi(t) || 8214 !== t && 8224 !== t && 8225 !== t && 8240 !== t && 8241 !== t && 8251 !== t && 8252 !== t && 8258 !== t && 8263 !== t && 8264 !== t && 8265 !== t && 8273 !== t) || (!!Si(t) || (!!Oi(t) || (!(!Ii(t) || !(t >= 8960 && t <= 8967 || t >= 8972 && t <= 8991 || t >= 8996 && t <= 9e3 || 9003 === t || t >= 9085 && t <= 9114 || t >= 9150 && t <= 9165 || 9167 === t || t >= 9169 && t <= 9179 || t >= 9186 && t <= 9215)) || (!(!Ci(t) || 9251 === t) || (!!Ti(t) || (!!Di(t) || (!!Li(t) || (!(!Ei(t) || t >= 9754 && t <= 9759) || (!(!Ui(t) || !(t >= 11026 && t <= 11055 || t >= 11088 && t <= 11097 || t >= 11192 && t <= 11243)) || (!!zi(t) || (!!Hi(t) || (!!on(t) || (!!un(t) || (!!cn(t) || (!!dn(t) || (8734 === t || 8756 === t || 8757 === t || t >= 9984 && t <= 10087 || t >= 10102 && t <= 10131 || 65532 === t || 65533 === t)))))))))))))))));
+                return !(!bi(t) || 167 !== t && 169 !== t && 174 !== t && 177 !== t && 188 !== t && 189 !== t && 190 !== t && 215 !== t && 247 !== t) || (!(!Pi(t) || 8214 !== t && 8224 !== t && 8225 !== t && 8240 !== t && 8241 !== t && 8251 !== t && 8252 !== t && 8258 !== t && 8263 !== t && 8264 !== t && 8265 !== t && 8273 !== t) || (!!Si(t) || (!!Oi(t) || (!(!Ci(t) || !(t >= 8960 && t <= 8967 || t >= 8972 && t <= 8991 || t >= 8996 && t <= 9e3 || 9003 === t || t >= 9085 && t <= 9114 || t >= 9150 && t <= 9165 || 9167 === t || t >= 9169 && t <= 9179 || t >= 9186 && t <= 9215)) || (!(!Ii(t) || 9251 === t) || (!!Ti(t) || (!!Di(t) || (!!Li(t) || (!(!Ui(t) || t >= 9754 && t <= 9759) || (!(!Ei(t) || !(t >= 11026 && t <= 11055 || t >= 11088 && t <= 11097 || t >= 11192 && t <= 11243)) || (!!zi(t) || (!!Hi(t) || (!!on(t) || (!!un(t) || (!!cn(t) || (!!dn(t) || (8734 === t || 8756 === t || 8757 === t || t >= 9984 && t <= 10087 || t >= 10102 && t <= 10131 || 65532 === t || 65533 === t)))))))))))))))));
             }(t));
         }
         function vn(t) {
@@ -1873,7 +1873,7 @@
                     }
                     if (f.length !== s) {
                         const t = l - h;
-                        c = Math.max(t, c), In(f, i, s, f.length - 1, d);
+                        c = Math.max(t, c), Cn(f, i, s, f.length - 1, d);
                     }
                     l = 0, u -= e;
                 }
@@ -1963,7 +1963,7 @@
                 verticalAlign: n
             };
         }
-        function In(t, i, n, e, r) {
+        function Cn(t, i, n, e, r) {
             if (!r) return;
             const s = i[t[e].glyph];
             if (s) {
@@ -1972,7 +1972,7 @@
                 for (let i = n; i <= e; i++) t[i].x -= o;
             }
         }
-        function Cn(t) {
+        function In(t) {
             if (!function(t) {
                 for (const i of t) if (vn(i.charCodeAt(0))) return !0;
                 return !1;
@@ -2151,7 +2151,7 @@
                             const n = _[i];
                             return ni(n) ? "" : Array.isArray(n) ? n.join() : n;
                         })) : k);
-                        n && n.length && (n = Cn(n), v.glyph = {
+                        n && n.length && (n = In(n), v.glyph = {
                             font: i,
                             text: n
                         });
@@ -2170,7 +2170,7 @@
          * From mapbox-gl-js
          * MIT License
          * https://github.com/mapbox/mapbox-gl-js
-         */        function En(t, i, n, e, r) {
+         */        function Un(t, i, n, e, r) {
             const s = [];
             for (let o = 0; o < t.length; o++) {
                 const h = t[o];
@@ -2186,12 +2186,12 @@
             }
             return s;
         }
-        class Un extends Ot {
+        class En extends Ot {
             constructor(t, i, n, e) {
                 super(t, i), this.angle = n, void 0 !== e && (this.segment = e);
             }
             clone() {
-                return new Un(this.x, this.y, this.angle, this.segment);
+                return new En(this.x, this.y, this.angle, this.segment);
             }
         }
         /*!
@@ -2241,7 +2241,7 @@
                         d += e;
                         const m = (d - f) / a, v = Nn(n.x, h.x, m), g = Nn(n.y, h.y, m);
                         if (v >= 0 && v < l && g >= 0 && g < l && d - u >= 0 && d + u <= c) {
-                            const n = new Un(v, g, p, t);
+                            const n = new En(v, g, p, t);
                             n.line = i, n.D(), r && !jn(i, n, o, r, s) || y.push(n);
                         }
                     }
@@ -2302,18 +2302,18 @@
         function Vn(t, i) {
             return i.area - t.area;
         }
-        var Gn = {
+        var $n = {
             exports: {}
         };
-        function $n(t, i) {
-            if (!(this instanceof $n)) return new $n(t, i);
+        function Gn(t, i) {
+            if (!(this instanceof Gn)) return new Gn(t, i);
             if (this.data = t || [], this.length = this.data.length, this.compare = i || Jn, 
             this.length > 0) for (var n = (this.length >> 1) - 1; n >= 0; n--) this.G(n);
         }
         function Jn(t, i) {
             return t < i ? -1 : t > i ? 1 : 0;
         }
-        Gn.exports = $n, Gn.exports.default = $n, $n.prototype = {
+        $n.exports = Gn, $n.exports.default = Gn, Gn.prototype = {
             push: function(t) {
                 this.data.push(t), this.length++, this.J(this.length - 1);
             },
@@ -2344,7 +2344,7 @@
                 i[t] = r;
             }
         };
-        var qn = Gn.exports;
+        var qn = $n.exports;
         function Bn(t, i, n) {
             const e = i.distSqr(n);
             if (0 === e) return t.distSqr(i);
@@ -3021,24 +3021,24 @@
                 }(e);
             }));
         }));
-        var Se = Pe, Oe = Qn.exports, Ie = Se, Ce = [].slice, Te = [ "keyword", "gray", "hex" ], De = {};
-        Object.keys(Ie).forEach((function(t) {
-            De[Ce.call(Ie[t].labels).sort().join("")] = t;
+        var Se = Pe, Oe = Qn.exports, Ce = Se, Ie = [].slice, Te = [ "keyword", "gray", "hex" ], De = {};
+        Object.keys(Ce).forEach((function(t) {
+            De[Ie.call(Ce[t].labels).sort().join("")] = t;
         }));
         var Le = {};
-        function Ee(t, i) {
-            if (!(this instanceof Ee)) return new Ee(t, i);
-            if (i && i in Te && (i = null), i && !(i in Ie)) throw new Error("Unknown model: " + i);
+        function Ue(t, i) {
+            if (!(this instanceof Ue)) return new Ue(t, i);
+            if (i && i in Te && (i = null), i && !(i in Ce)) throw new Error("Unknown model: " + i);
             var n, e;
-            if (null == t) this.model = "rgb", this.color = [ 0, 0, 0 ], this.valpha = 1; else if (t instanceof Ee) this.model = t.model, 
+            if (null == t) this.model = "rgb", this.color = [ 0, 0, 0 ], this.valpha = 1; else if (t instanceof Ue) this.model = t.model, 
             this.color = t.color.slice(), this.valpha = t.valpha; else if ("string" == typeof t) {
                 var r = Oe.get(t);
                 if (null === r) throw new Error("Unable to parse color from string: " + t);
-                this.model = r.model, e = Ie[this.model].channels, this.color = r.value.slice(0, e), 
+                this.model = r.model, e = Ce[this.model].channels, this.color = r.value.slice(0, e), 
                 this.valpha = "number" == typeof r.value[e] ? r.value[e] : 1;
             } else if (t.length) {
-                this.model = i || "rgb", e = Ie[this.model].channels;
-                var s = Ce.call(t, 0, e);
+                this.model = i || "rgb", e = Ce[this.model].channels;
+                var s = Ie.call(t, 0, e);
                 this.color = Ne(s, e), this.valpha = "number" == typeof t[e] ? t[e] : 1;
             } else if ("number" == typeof t) t &= 16777215, this.model = "rgb", this.color = [ t >> 16 & 255, t >> 8 & 255, 255 & t ], 
             this.valpha = 1; else {
@@ -3048,17 +3048,17 @@
                 var h = o.sort().join("");
                 if (!(h in De)) throw new Error("Unable to parse color from object: " + JSON.stringify(t));
                 this.model = De[h];
-                var a = Ie[this.model].labels, l = [];
+                var a = Ce[this.model].labels, l = [];
                 for (n = 0; n < a.length; n++) l.push(t[a[n]]);
                 this.color = Ne(l);
             }
-            if (Le[this.model]) for (e = Ie[this.model].channels, n = 0; n < e; n++) {
+            if (Le[this.model]) for (e = Ce[this.model].channels, n = 0; n < e; n++) {
                 var u = Le[this.model][n];
                 u && (this.color[n] = u(this.color[n]));
             }
             this.valpha = Math.max(0, Math.min(1, this.valpha)), Object.freeze && Object.freeze(this);
         }
-        function Ue(t, i, n) {
+        function Ee(t, i, n) {
             return (t = Array.isArray(t) ? t : [ t ]).forEach((function(t) {
                 (Le[t] || (Le[t] = []))[i] = n;
             })), t = t[0], function(e) {
@@ -3079,7 +3079,7 @@
             for (var n = 0; n < i; n++) "number" != typeof t[n] && (t[n] = 0);
             return t;
         }
-        Ee.prototype = {
+        Ue.prototype = {
             toString: function() {
                 return this.string();
             },
@@ -3098,7 +3098,7 @@
                 return 1 === this.valpha ? this.color.slice() : this.color.concat(this.valpha);
             },
             object: function() {
-                for (var t = {}, i = Ie[this.model].channels, n = Ie[this.model].labels, e = 0; e < i; e++) t[n[e]] = this.color[e];
+                for (var t = {}, i = Ce[this.model].channels, n = Ce[this.model].labels, e = 0; e < i; e++) t[n[e]] = this.color[e];
                 return 1 !== this.valpha && (t.alpha = this.valpha), t;
             },
             unitArray: function() {
@@ -3112,7 +3112,7 @@
                 t;
             },
             round: function(t) {
-                return t = Math.max(t || 0, 0), new Ee(this.color.map(function(t) {
+                return t = Math.max(t || 0, 0), new Ue(this.color.map(function(t) {
                     return function(i) {
                         return function(t, i) {
                             return Number(t.toFixed(i));
@@ -3121,37 +3121,37 @@
                 }(t)).concat(this.valpha), this.model);
             },
             alpha: function(t) {
-                return arguments.length ? new Ee(this.color.concat(Math.max(0, Math.min(1, t))), this.model) : this.valpha;
+                return arguments.length ? new Ue(this.color.concat(Math.max(0, Math.min(1, t))), this.model) : this.valpha;
             },
-            red: Ue("rgb", 0, je(255)),
-            green: Ue("rgb", 1, je(255)),
-            blue: Ue("rgb", 2, je(255)),
-            hue: Ue([ "hsl", "hsv", "hsl", "hwb", "hcg" ], 0, (function(t) {
+            red: Ee("rgb", 0, je(255)),
+            green: Ee("rgb", 1, je(255)),
+            blue: Ee("rgb", 2, je(255)),
+            hue: Ee([ "hsl", "hsv", "hsl", "hwb", "hcg" ], 0, (function(t) {
                 return (t % 360 + 360) % 360;
             })),
-            saturationl: Ue("hsl", 1, je(100)),
-            lightness: Ue("hsl", 2, je(100)),
-            saturationv: Ue("hsv", 1, je(100)),
-            value: Ue("hsv", 2, je(100)),
-            chroma: Ue("hcg", 1, je(100)),
-            gray: Ue("hcg", 2, je(100)),
-            white: Ue("hwb", 1, je(100)),
-            wblack: Ue("hwb", 2, je(100)),
-            cyan: Ue("cmyk", 0, je(100)),
-            magenta: Ue("cmyk", 1, je(100)),
-            yellow: Ue("cmyk", 2, je(100)),
-            black: Ue("cmyk", 3, je(100)),
-            x: Ue("xyz", 0, je(100)),
-            y: Ue("xyz", 1, je(100)),
-            z: Ue("xyz", 2, je(100)),
-            l: Ue("lab", 0, je(100)),
-            a: Ue("lab", 1),
-            b: Ue("lab", 2),
+            saturationl: Ee("hsl", 1, je(100)),
+            lightness: Ee("hsl", 2, je(100)),
+            saturationv: Ee("hsv", 1, je(100)),
+            value: Ee("hsv", 2, je(100)),
+            chroma: Ee("hcg", 1, je(100)),
+            gray: Ee("hcg", 2, je(100)),
+            white: Ee("hwb", 1, je(100)),
+            wblack: Ee("hwb", 2, je(100)),
+            cyan: Ee("cmyk", 0, je(100)),
+            magenta: Ee("cmyk", 1, je(100)),
+            yellow: Ee("cmyk", 2, je(100)),
+            black: Ee("cmyk", 3, je(100)),
+            x: Ee("xyz", 0, je(100)),
+            y: Ee("xyz", 1, je(100)),
+            z: Ee("xyz", 2, je(100)),
+            l: Ee("lab", 0, je(100)),
+            a: Ee("lab", 1),
+            b: Ee("lab", 2),
             keyword: function(t) {
-                return arguments.length ? new Ee(t) : Ie[this.model].keyword(this.color);
+                return arguments.length ? new Ue(t) : Ce[this.model].keyword(this.color);
             },
             hex: function(t) {
-                return arguments.length ? new Ee(t) : Oe.to.hex(this.rgb().round().color);
+                return arguments.length ? new Ue(t) : Oe.to.hex(this.rgb().round().color);
             },
             rgbNumber: function() {
                 var t = this.rgb().color;
@@ -3209,7 +3209,7 @@
             },
             grayscale: function() {
                 var t = this.rgb().color, i = .3 * t[0] + .59 * t[1] + .11 * t[2];
-                return Ee.rgb(i, i, i);
+                return Ue.rgb(i, i, i);
             },
             fade: function(t) {
                 return this.alpha(this.valpha - this.valpha * t);
@@ -3224,22 +3224,22 @@
             mix: function(t, i) {
                 if (!t || !t.rgb) throw new Error('Argument to "mix" was not a Color instance, but rather an instance of ' + typeof t);
                 var n = t.rgb(), e = this.rgb(), r = void 0 === i ? .5 : i, s = 2 * r - 1, o = n.alpha() - e.alpha(), h = ((s * o == -1 ? s : (s + o) / (1 + s * o)) + 1) / 2, a = 1 - h;
-                return Ee.rgb(h * n.red() + a * e.red(), h * n.green() + a * e.green(), h * n.blue() + a * e.blue(), n.alpha() * r + e.alpha() * (1 - r));
+                return Ue.rgb(h * n.red() + a * e.red(), h * n.green() + a * e.green(), h * n.blue() + a * e.blue(), n.alpha() * r + e.alpha() * (1 - r));
             }
-        }, Object.keys(Ie).forEach((function(t) {
+        }, Object.keys(Ce).forEach((function(t) {
             if (-1 === Te.indexOf(t)) {
-                var i = Ie[t].channels;
-                Ee.prototype[t] = function() {
-                    if (this.model === t) return new Ee(this);
-                    if (arguments.length) return new Ee(arguments, t);
+                var i = Ce[t].channels;
+                Ue.prototype[t] = function() {
+                    if (this.model === t) return new Ue(this);
+                    if (arguments.length) return new Ue(arguments, t);
                     var n = "number" == typeof arguments[i] ? i : this.valpha;
-                    return new Ee(Re(Ie[this.model][t].raw(this.color)).concat(n), t);
-                }, Ee[t] = function(n) {
-                    return "number" == typeof n && (n = Ne(Ce.call(arguments), i)), new Ee(n, t);
+                    return new Ue(Re(Ce[this.model][t].raw(this.color)).concat(n), t);
+                }, Ue[t] = function(n) {
+                    return "number" == typeof n && (n = Ne(Ie.call(arguments), i)), new Ue(n, t);
                 };
             }
         }));
-        var ze = Ee;
+        var ze = Ue;
         const We = 14;
         class He extends vi {
             static splitPointSymbol(t, i = 0) {
@@ -3488,11 +3488,11 @@
                         if (pn(t.charAt(n).charCodeAt(0))) i = 0; else if (i++, i >= 1) return !1;
                     }
                     return !0;
-                }(t.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: c, textSizeFn: f, textHaloFillFn: d, textHaloRadiusFn: y, textHaloOpacityFn: p, textDxFn: m, textDyFn: v, textPitchAlignmentFn: w, textRotationAlignmentFn: b, textRotationFn: M, textAllowOverlapFn: x, textIgnorePlacementFn: F, textOpacityFn: A, markerWidthFn: k, markerHeightFn: _, markerDxFn: P, markerDyFn: S, markerPitchAlignmentFn: O, markerRotationAlignmentFn: I, markerRotationFn: C, markerAllowOverlapFn: T, markerIgnorePlacementFn: D, markerOpacityFn: L} = this.j;
-                let E, U, j, R, N, z, W, H, V, G, $, J, q, B, X, Z, Y;
+                }(t.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: c, textSizeFn: f, textHaloFillFn: d, textHaloRadiusFn: y, textHaloOpacityFn: p, textDxFn: m, textDyFn: v, textPitchAlignmentFn: w, textRotationAlignmentFn: b, textRotationFn: M, textAllowOverlapFn: x, textIgnorePlacementFn: F, textOpacityFn: A, markerWidthFn: k, markerHeightFn: _, markerDxFn: P, markerDyFn: S, markerPitchAlignmentFn: O, markerRotationAlignmentFn: C, markerRotationFn: I, markerAllowOverlapFn: T, markerIgnorePlacementFn: D, markerOpacityFn: L} = this.j;
+                let U, E, j, R, N, z, W, H, V, $, G, J, q, B, X, Z, Y;
                 if (l) {
                     const i = t.getIconAndGlyph().glyph.font;
-                    E = function(t, i, n) {
+                    U = function(t, i, n) {
                         const e = t.positionedGlyphs, r = [];
                         for (let s = 0; s < e.length; s++) {
                             const o = e[s], h = n[o.glyph];
@@ -3515,13 +3515,13 @@
                             });
                         }
                         return r;
-                    }(n.horizontal, a, this.glyphAtlas.positions[i]), c && (U = c(null, h), g(U) ? U = [ 0, 0, 0, 0 ] : (U = Array.isArray(U) ? U.map(t => 255 * t) : ze(U).array(), 
-                    3 === U.length && U.push(255))), f && (j = f(this.options.zoom, h), null == j && (j = We)), 
+                    }(n.horizontal, a, this.glyphAtlas.positions[i]), c && (E = c(null, h), g(E) ? E = [ 0, 0, 0, 0 ] : (E = Array.isArray(E) ? E.map(t => 255 * t) : ze(E).array(), 
+                    3 === E.length && E.push(255))), f && (j = f(this.options.zoom, h), null == j && (j = We)), 
                     d && (R = d(null, h), R = Array.isArray(R) ? R.map(t => 255 * t) : ze(R).array(), 
                     3 === R.length && R.push(255)), y && (N = y(null, h)), p && (z = 255 * p(null, h)), 
                     m && (W = m(null, h) || 0), v && (H = v(null, h) || 0), w && (q = +("map" === w(null, h))), 
                     b && (B = +("map" === b(null, h))), M && (X = yi(M(null, h), 0, 360) * Math.PI / 180);
-                } else E = n ? function(t) {
+                } else U = n ? function(t) {
                     const i = t.image, n = t.top - 1 / i.pixelRatio, e = t.left - 1 / i.pixelRatio, r = t.bottom + 1 / i.pixelRatio, s = t.right + 1 / i.pixelRatio;
                     let o, h, a, l;
                     return o = new Ot(e, n), h = new Ot(s, n), a = new Ot(s, r), l = new Ot(e, r), [ {
@@ -3554,8 +3554,8 @@
                         writingMode: void 0,
                         glyphOffset: [ 0, 0 ]
                     } ];
-                }(), k && (V = k(null, h)), _ && (G = _(null, h)), P && ($ = P(null, h)), S && (J = S(null, h)), 
-                O && (q = +("map" === O(null, h))), I && (B = +("map" === I(null, h))), C && (X = yi(C(null, h), 0, 360) * Math.PI / 180);
+                }(), k && (V = k(null, h)), _ && ($ = _(null, h)), P && (G = P(null, h)), S && (J = S(null, h)), 
+                O && (q = +("map" === O(null, h))), C && (B = +("map" === C(null, h))), I && (X = yi(I(null, h), 0, 360) * Math.PI / 180);
                 const K = T || x;
                 K && (Z = K(null, h) || 0);
                 const Q = D || F;
@@ -3563,19 +3563,19 @@
                 Q && (Y = Q(null, h) || 0);
                 const it = A || L;
                 it && (tt = 255 * it(this.options.zoom, h));
-                const nt = this.options.EXTENT, et = E.length, rt = this.getAltitude(t.feature.properties);
+                const nt = this.options.EXTENT, et = U.length, rt = this.getAltitude(t.feature.properties);
                 for (let t = 0; t < e.length; t++) {
                     const i = e[t];
                     if (nt !== 1 / 0 && di(i, nt)) continue;
-                    const n = i.x, o = i.y, h = E.length;
+                    const n = i.x, o = i.y, h = U.length;
                     for (let t = 0; t < h; t++) {
-                        const e = E[t], {tl: h, tr: c, bl: f, br: d, tex: y} = e;
+                        const e = U[t], {tl: h, tr: c, bl: f, br: d, tex: y} = e;
                         this.K(r, n, o, rt, 10 * h.x, 10 * h.y, y.x, y.y + y.h), l && this.tt(r, a, et, e.glyphOffset, i, u), 
-                        this.it(r, U, j, R, N, z, W, H, V, G, $, J, tt, q, B, X, Z, Y), this.K(r, n, o, rt, 10 * c.x, 10 * c.y, y.x + y.w, y.y + y.h), 
-                        l && this.tt(r, a, et, e.glyphOffset, i, u), this.it(r, U, j, R, N, z, W, H, V, G, $, J, tt, q, B, X, Z, Y), 
+                        this.it(r, E, j, R, N, z, W, H, V, $, G, J, tt, q, B, X, Z, Y), this.K(r, n, o, rt, 10 * c.x, 10 * c.y, y.x + y.w, y.y + y.h), 
+                        l && this.tt(r, a, et, e.glyphOffset, i, u), this.it(r, E, j, R, N, z, W, H, V, $, G, J, tt, q, B, X, Z, Y), 
                         this.K(r, n, o, rt, 10 * f.x, 10 * f.y, y.x, y.y), l && this.tt(r, a, et, e.glyphOffset, i, u), 
-                        this.it(r, U, j, R, N, z, W, H, V, G, $, J, tt, q, B, X, Z, Y), this.K(r, n, o, rt, 10 * d.x, 10 * d.y, y.x + y.w, y.y), 
-                        l && this.tt(r, a, et, e.glyphOffset, i, u), this.it(r, U, j, R, N, z, W, H, V, G, $, J, tt, q, B, X, Z, Y), 
+                        this.it(r, E, j, R, N, z, W, H, V, $, G, J, tt, q, B, X, Z, Y), this.K(r, n, o, rt, 10 * d.x, 10 * d.y, y.x + y.w, y.y), 
+                        l && this.tt(r, a, et, e.glyphOffset, i, u), this.it(r, E, j, R, N, z, W, H, V, $, G, J, tt, q, B, X, Z, Y), 
                         this.addElements(s, s + 1, s + 2), this.addElements(s + 1, s + 2, s + 3), s += 4;
                         const p = Math.max(Math.abs(n), Math.abs(o), Math.abs(rt));
                         p > this.maxPos && (this.maxPos = p);
@@ -3593,12 +3593,12 @@
                 }
             }
             it(t, i, n, e, r, s, o, h, a, l, u, c, f, d, y, p, m, v) {
-                const {textFillFn: g, textSizeFn: w, textHaloFillFn: b, textHaloRadiusFn: M, textHaloOpacityFn: x, textDxFn: F, textDyFn: A, textPitchAlignmentFn: k, textRotationAlignmentFn: _, textRotationFn: P, textAllowOverlapFn: S, textIgnorePlacementFn: O, textOpacityFn: I, markerWidthFn: C, markerHeightFn: T, markerDxFn: D, markerDyFn: L, markerPitchAlignmentFn: E, markerRotationAlignmentFn: U, markerRotationFn: j, markerAllowOverlapFn: R, markerIgnorePlacementFn: N, markerOpacityFn: z} = this.j;
+                const {textFillFn: g, textSizeFn: w, textHaloFillFn: b, textHaloRadiusFn: M, textHaloOpacityFn: x, textDxFn: F, textDyFn: A, textPitchAlignmentFn: k, textRotationAlignmentFn: _, textRotationFn: P, textAllowOverlapFn: S, textIgnorePlacementFn: O, textOpacityFn: C, markerWidthFn: I, markerHeightFn: T, markerDxFn: D, markerDyFn: L, markerPitchAlignmentFn: U, markerRotationAlignmentFn: E, markerRotationFn: j, markerAllowOverlapFn: R, markerIgnorePlacementFn: N, markerOpacityFn: z} = this.j;
                 g && t.aTextFill.push(...i), w && t.aTextSize.push(n), b && t.aTextHaloFill.push(...e), 
                 M && t.aTextHaloRadius.push(r), x && t.aTextHaloOpacity.push(s), F && t.aTextDx.push(o), 
-                A && t.aTextDy.push(h), C && t.aMarkerWidth.push(a), T && t.aMarkerHeight.push(l), 
+                A && t.aTextDy.push(h), I && t.aMarkerWidth.push(a), T && t.aMarkerHeight.push(l), 
                 D && t.aMarkerDx.push(u), L && t.aMarkerDy.push(c);
-                (z || I) && t.aColorOpacity.push(f), (k || E) && t.aPitchAlign.push(d), (U || _) && t.aRotationAlign.push(y), 
+                (z || C) && t.aColorOpacity.push(f), (k || U) && t.aPitchAlign.push(d), (E || _) && t.aRotationAlign.push(y), 
                 (j || P) && t.aRotation.push(9362 * p);
                 const W = R || S, H = N || O;
                 if (W || H) {
@@ -3613,7 +3613,7 @@
                     const {feature: h, size: a, symbol: l} = t, u = a ? 24 : 0, c = e * (a ? a[0] / u : 1), f = [];
                     if ("line" === s) {
                         let t = h.geometry;
-                        r && (t = En(h.geometry, 0, 0, r, r));
+                        r && (t = Un(h.geometry, 0, 0, r, r));
                         for (let e = 0; e < t.length; e++) {
                             const s = Rn(t[e], o, Kn, l.isIconText ? null : n.vertical || n.horizontal || n, null, u, l.isIconText ? 1 : c, 1, r || 1 / 0);
                             if (l.textPlacement && !l.isIconText) for (let t = 0; t < s.length; t++) s[t].startIndex = i.length / 3;
@@ -3647,8 +3647,8 @@
                 return n ? n(null, i.feature && i.feature.properties) : e ? e(null, i.feature && i.feature.properties) : t.markerPlacement || t.textPlacement;
             }
         }
-        const Ve = Math.cos(Math.PI / 180 * 37.5), Ge = Math.pow(2, 16) / 1;
-        class $e extends vi {
+        const Ve = Math.cos(Math.PI / 180 * 37.5), $e = Math.pow(2, 16) / 1;
+        class Ge extends vi {
             constructor(t, i, n) {
                 super(t, i, n);
                 let e = !1;
@@ -3663,98 +3663,104 @@
                 return !this.options.atlas && o && (r[o] = 1), s;
             }
             getFormat() {
-                const {lineWidthFn: t, lineGapWidthFn: i, lineColorFn: n, lineOpacityFn: e, lineDxFn: r, lineDyFn: s, linePatternAnimSpeedFn: o, linePatternGapFn: h} = this.j, a = [ {
+                const {lineWidthFn: t, lineStrokeWidthFn: i, lineStrokeColorFn: n, lineColorFn: e, lineOpacityFn: r, lineDxFn: s, lineDyFn: o, linePatternAnimSpeedFn: h, linePatternGapFn: a} = this.j, l = [ {
                     type: Int16Array,
                     width: 3,
                     name: "aPosition"
                 } ];
-                if (this.options.center || this.iconAtlas ? a.push({
+                if (this.options.center || this.iconAtlas ? l.push({
                     type: Int8Array,
                     width: 3,
                     name: "aExtrude"
-                }) : a.push({
+                }) : l.push({
                     type: Int8Array,
                     width: 2,
                     name: "aExtrude"
-                }), a.push({
+                }), l.push({
                     type: Uint16Array,
                     width: 1,
                     name: "aLinesofar"
-                }), t && a.push({
+                }), t && l.push({
                     type: Uint8Array,
                     width: 1,
                     name: "aLineWidth"
-                }), i && a.push({
+                }), i && l.push({
                     type: Uint8Array,
                     width: 1,
-                    name: "aLineGapWidth"
-                }), n && a.push({
+                    name: "aLineStrokeWidth"
+                }), e && l.push({
                     type: Uint8Array,
                     width: 4,
                     name: "aColor"
-                }), e && a.push({
+                }), n && l.push({
+                    type: Uint8Array,
+                    width: 4,
+                    name: "aStrokeColor"
+                }), r && l.push({
                     type: Uint8Array,
                     width: 1,
                     name: "aOpacity"
-                }), this.symbol.lineOffset && a.push({
+                }), this.symbol.lineOffset && l.push({
                     type: Int8Array,
                     width: 2,
                     name: "aExtrudeOffset"
-                }), this.dasharrayFn && a.push({
+                }), this.dasharrayFn && l.push({
                     type: Uint8Array,
                     width: 4,
                     name: "aDasharray"
-                }), this.dashColorFn && a.push({
+                }), this.dashColorFn && l.push({
                     type: Uint8Array,
                     width: 4,
                     name: "aDashColor"
                 }), this.iconAtlas) {
                     const t = this.getIconAtlasMaxValue();
-                    a.push({
+                    l.push({
                         type: t > 255 ? Uint16Array : Uint8Array,
                         width: 4,
                         name: "aTexInfo"
                     });
                 }
-                return r && a.push({
+                return s && l.push({
                     type: Int8Array,
                     width: 1,
                     name: "aLineDx"
-                }), s && a.push({
+                }), o && l.push({
                     type: Int8Array,
                     width: 1,
                     name: "aLineDy"
-                }), o && a.push({
+                }), h && l.push({
                     type: Int8Array,
                     width: 1,
                     name: "aLinePatternAnimSpeed"
-                }), h && a.push({
+                }), a && l.push({
                     type: Uint8Array,
                     width: 1,
                     name: "aLinePatternGap"
-                }), a;
+                }), l;
             }
             placeVector(t) {
-                const {lineJoinFn: i, lineCapFn: n, lineWidthFn: e, lineGapWidthFn: r, lineColorFn: s, lineOpacityFn: o, lineJoinPatternModeFn: h, lineDxFn: a, lineDyFn: l, linePatternAnimSpeedFn: u, linePatternGapFn: c} = this.j, f = this.symbol, d = t.feature, y = 3 === d.type, p = this.elements;
-                y && (this.elements = []);
-                let m = f.lineJoin || "miter", v = f.lineCap || "butt";
-                if (i && (m = i(this.options.zoom, d.properties) || "miter"), n && (v = n(this.options.zoom, d.properties) || "butt"), 
+                const {lineJoinFn: i, lineCapFn: n, lineWidthFn: e, lineStrokeWidthFn: r, lineStrokeColorFn: s, lineColorFn: o, lineOpacityFn: h, lineJoinPatternModeFn: a, lineDxFn: l, lineDyFn: u, linePatternAnimSpeedFn: c, linePatternGapFn: f} = this.j, d = this.symbol, y = t.feature, p = 3 === y.type, m = this.elements;
+                p && (this.elements = []);
+                let v = d.lineJoin || "miter", w = d.lineCap || "butt";
+                if (i && (v = i(this.options.zoom, y.properties) || "miter"), n && (w = n(this.options.zoom, y.properties) || "butt"), 
                 e) {
-                    let t = e(this.options.zoom, d.properties);
+                    let t = e(this.options.zoom, y.properties);
                     ni(t) && (t = 4), this.feaLineWidth = t;
-                } else this.feaLineWidth = f.lineWidth;
+                } else this.feaLineWidth = d.lineWidth;
                 if (r) {
-                    let t = r(this.options.zoom, d.properties);
-                    ni(t) && (t = 0), this.feaLineGapWidth = t;
-                } else this.feaLineGapWidth = f.lineGapWidth || 0;
-                if (s && (this.feaColor = s(this.options.zoom, d.properties) || [ 0, 0, 0, 255 ], 
+                    let t = r(this.options.zoom, y.properties);
+                    ni(t) && (t = 0), this.feaLineStrokeWidth = t;
+                } else this.feaLineStrokeWidth = d.lineStrokeWidth || 0;
+                if (o && (this.feaColor = o(this.options.zoom, y.properties) || [ 0, 0, 0, 255 ], 
                 g(this.feaColor) ? this.feaColor = [ 0, 0, 0, 0 ] : (Array.isArray(this.feaColor) ? this.feaColor = this.feaColor.map(t => 255 * t) : this.feaColor = ze(this.feaColor).array(), 
-                3 === this.feaColor.length && this.feaColor.push(255))), o) {
-                    let t = o(this.options.zoom, d.properties);
+                3 === this.feaColor.length && this.feaColor.push(255))), s && (this.feaStrokeColor = s(this.options.zoom, y.properties) || [ 0, 0, 0, 255 ], 
+                g(this.feaStrokeColor) ? this.feaStrokeColor = [ 0, 0, 0, 0 ] : (Array.isArray(this.feaStrokeColor) ? this.feaStrokeColor = this.feaStrokeColor.map(t => 255 * t) : this.feaStrokeColor = ze(this.feaStrokeColor).array(), 
+                3 === this.feaStrokeColor.length && this.feaStrokeColor.push(255))), h) {
+                    let t = h(this.options.zoom, y.properties);
                     ni(t) && (t = 1), this.feaOpacity = 255 * t;
                 }
                 if (this.dasharrayFn) {
-                    let t = this.dasharrayFn(this.options.zoom, d.properties) || [ 0, 0, 0, 0 ];
+                    let t = this.dasharrayFn(this.options.zoom, y.properties) || [ 0, 0, 0, 0 ];
                     if (t.length < 4) {
                         const i = t;
                         1 === t.length ? t = [ i[0], i[0], i[0], i[0] ] : 2 === t.length ? t = [ i[0], i[1], i[0], i[1] ] : 3 === t.length && (t = [ i[0], i[1], i[2], i[2] ]);
@@ -3762,7 +3768,7 @@
                     this.feaDash = t;
                 }
                 if (this.dashColorFn) {
-                    let t = (this.dashColorFn ? this.dashColorFn(this.options.zoom, d.properties) : this.symbol.lineDashColor) || [ 0, 0, 0, 0 ];
+                    let t = (this.dashColorFn ? this.dashColorFn(this.options.zoom, y.properties) : this.symbol.lineDashColor) || [ 0, 0, 0, 0 ];
                     t = Array.isArray(t) ? t.map(t => 255 * t) : ze(t).array(), 3 === t.length && t.push(255), 
                     this.feaDashColor = t;
                 }
@@ -3773,33 +3779,33 @@
                         this.feaTexInfo[0] = t[0], this.feaTexInfo[1] = t[1], this.feaTexInfo[2] = n[0] - 1, 
                         this.feaTexInfo[3] = n[1] - 1;
                     } else this.feaTexInfo[0] = this.feaTexInfo[1] = this.feaTexInfo[2] = this.feaTexInfo[3] = 0;
-                    this.feaJoinPatternMode = h ? h(this.options.zoom, d.properties) || 0 : f.lineJoinPatternMode || 0;
+                    this.feaJoinPatternMode = a ? a(this.options.zoom, y.properties) || 0 : d.lineJoinPatternMode || 0;
                 }
-                if (a) {
-                    let t = a(this.options.zoom, d.properties);
+                if (l) {
+                    let t = l(this.options.zoom, y.properties);
                     ni(t) && (t = 0), this.feaLineDx = t;
                 }
-                if (l) {
-                    let t = l(this.options.zoom, d.properties);
+                if (u) {
+                    let t = u(this.options.zoom, y.properties);
                     ni(t) && (t = 0), this.feaLineDy = t;
                 }
-                if (u) {
-                    let t = u(this.options.zoom, d.properties);
+                if (c) {
+                    let t = c(this.options.zoom, y.properties);
                     ni(t) && (t = 0), 0 !== t && (this.properties.hasPatternAnim = 1), this.feaPatternAnimSpeed = t;
                 }
-                if (c) {
-                    let t = c(this.options.zoom, d.properties);
+                if (f) {
+                    let t = f(this.options.zoom, y.properties);
                     ni(t) && (t = 0), this.feaLinePatternGap = t;
                 }
-                const w = this.options.EXTENT;
-                let b = d.geometry;
-                w !== 1 / 0 && 3 !== d.type && (b = En(d.geometry, -1, -1, w + 1, w + 1));
-                for (let t = 0; t < b.length; t++) {
+                const b = this.options.EXTENT;
+                let M = y.geometry;
+                b !== 1 / 0 && 3 !== y.type && (M = Un(y.geometry, -1, -1, b + 1, b + 1));
+                for (let t = 0; t < M.length; t++) {
                     this.offset = this.data.aPosition.length / 3;
-                    const i = b[t];
-                    this.et(i, d, m, v, 2, 1.05), y && (this.rt(p), this.elements = []);
+                    const i = M[t];
+                    this.et(i, y, v, w, 2, 1.05), p && (this.rt(m), this.elements = []);
                 }
-                y && (this.elements = p);
+                p && (this.elements = m);
             }
             st() {
                 return this.iconAtlas && this.feaTexInfo[2] && this.feaTexInfo[3];
@@ -3825,12 +3831,12 @@
                     primitiveLength: 0
                 };
                 let d, y, p, m, v;
-                this.e1 = this.e2 = -1, a && (d = t[l - 2], v = t[u].sub(d).C().T());
+                this.e1 = this.e2 = -1, a && (d = t[l - 2], v = t[u].sub(d).I().T());
                 for (let i = u; i < l; i++) {
                     if (p = i === l - 1 ? a ? t[u + 1] : void 0 : t[i + 1], p && t[i].equals(p)) continue;
-                    v && (m = v), d && (y = d), d = t[i], v = p ? p.sub(d).C().T() : m, m = m || v;
+                    v && (m = v), d && (y = d), d = t[i], v = p ? p.sub(d).I().T() : m, m = m || v;
                     let h = m.add(v);
-                    0 === h.x && 0 === h.y || h.C();
+                    0 === h.x && 0 === h.y || h.I();
                     const g = m.x * v.x + m.y * v.y, w = h.x * v.x + h.y * v.y, b = 0 !== w ? 1 / w : 1 / 0, M = 2 * Math.sqrt(2 - 2 * w), x = w < Ve && y && p, F = m.x * v.y - m.y * v.x > 0;
                     if (!o && x && i > u) {
                         const t = d.dist(y);
@@ -3863,7 +3869,7 @@
                                     const t = n - .5;
                                     n += n * t * (n - 1) * ((1.0904 + g * (g * (3.55645 - 1.43519 * g) - 3.2452)) * t * t + (.848013 + g * (.215638 * g - 1.06021)));
                                 }
-                                const e = v.sub(m).k(n).m(m).C().k(F ? -1 : 1);
+                                const e = v.sub(m).k(n).m(m).I().k(F ? -1 : 1);
                                 this.addHalfVertex(d, e.x, e.y, !1, F, 0, f);
                             }
                         }
@@ -3890,7 +3896,7 @@
             addCurrentVertex(t, i, n, e, r, s = !1) {
                 const o = i.x + i.y * n, h = i.y - i.x * n, a = -i.x + i.y * e, l = -i.y - i.x * e;
                 this.addHalfVertex(t, o, h, s, !1, n, r), this.addHalfVertex(t, a, l, s, !0, -e, r), 
-                this.distance > Ge / 2 && 0 === this.totalDistance && (this.distance = 0, this.updateScaledDistance(), 
+                this.distance > $e / 2 && 0 === this.totalDistance && (this.distance = 0, this.updateScaledDistance(), 
                 this.addCurrentVertex(t, i, n, e, r, s));
             }
             addHalfVertex({x: t, y: i}, n, e, r, s, o, h) {
@@ -3901,7 +3907,7 @@
                 s ? this.e2 = l : this.e1 = l;
             }
             fillData(t, i, n, e, r, s, o, h) {
-                const {lineWidthFn: a, lineGapWidthFn: l, lineColorFn: u, lineOpacityFn: c, lineDxFn: f, lineDyFn: d, linePatternAnimSpeedFn: y, linePatternGapFn: p} = this.j;
+                const {lineWidthFn: a, lineStrokeWidthFn: l, lineStrokeColorFn: u, lineColorFn: c, lineOpacityFn: f, lineDxFn: d, lineDyFn: y, linePatternAnimSpeedFn: p, linePatternGapFn: m} = this.j;
                 if (this.options.center || (i = (i << 1) + (s ? 1 : 0), n = (n << 1) + (o ? 1 : 0)), 
                 t.aPosition.push(i, n, 0), t.aExtrude.push(63 * e, 63 * r), this.options.center || this.iconAtlas) {
                     let i = 0;
@@ -3909,11 +3915,12 @@
                     t.aExtrude.push(i);
                 }
                 t.aLinesofar.push(h), a && t.aLineWidth.push(Math.round(2 * this.feaLineWidth)), 
-                l && t.aLineGapWidth.push(Math.round(2 * this.feaLineGapWidth)), u && t.aColor.push(...this.feaColor), 
-                c && t.aOpacity.push(this.feaOpacity), this.dasharrayFn && t.aDasharray.push(...this.feaDash), 
-                this.dashColorFn && t.aDashColor.push(...this.feaDashColor), this.iconAtlas && t.aTexInfo.push(...this.feaTexInfo), 
-                f && t.aLineDx.push(this.feaLineDx), d && t.aLineDy.push(this.feaLineDy), y && t.aLinePatternAnimSpeed.push(127 * this.feaPatternAnimSpeed), 
-                p && t.aLinePatternGap.push(10 * this.feaLinePatternGap), this.maxPos = Math.max(this.maxPos, Math.abs(i) + 1, Math.abs(n) + 1);
+                l && t.aLineStrokeWidth.push(Math.round(2 * this.feaLineStrokeWidth)), c && t.aColor.push(...this.feaColor), 
+                u && t.aStrokeColor.push(...this.feaStrokeColor), f && t.aOpacity.push(this.feaOpacity), 
+                this.dasharrayFn && t.aDasharray.push(...this.feaDash), this.dashColorFn && t.aDashColor.push(...this.feaDashColor), 
+                this.iconAtlas && t.aTexInfo.push(...this.feaTexInfo), d && t.aLineDx.push(this.feaLineDx), 
+                y && t.aLineDy.push(this.feaLineDy), p && t.aLinePatternAnimSpeed.push(127 * this.feaPatternAnimSpeed), 
+                m && t.aLinePatternGap.push(10 * this.feaLinePatternGap), this.maxPos = Math.max(this.maxPos, Math.abs(i) + 1, Math.abs(n) + 1);
             }
             addElements(t, i, n) {
                 super.addElements(this.offset + t, this.offset + i, this.offset + n);
@@ -3936,7 +3943,7 @@
                 this.distance += t.dist(i), this.updateScaledDistance();
             }
             updateScaledDistance() {
-                this.scaledDistance = this.totalDistance > 0 ? (this.clipStart + (this.clipEnd - this.clipStart) * this.distance / this.totalDistance) * (Ge - 1) : this.distance;
+                this.scaledDistance = this.totalDistance > 0 ? (this.clipStart + (this.clipEnd - this.clipStart) * this.distance / this.totalDistance) * ($e - 1) : this.distance;
             }
         }
         function Je(t, i, n) {
@@ -4115,7 +4122,7 @@
         function wr(t, i, n) {
             return t[0] = i[n], t[1] = i[n + 1], t;
         }
-        class br extends $e {
+        class br extends Ge {
             constructor(t, i, n) {
                 super(t, i, n), this.at = n.altitudeProperty;
             }
@@ -4336,7 +4343,7 @@
                 const e = t.feature, r = t.feature.type, s = this.options.EXTENT, o = [];
                 if ("line" === n) {
                     let t = e.geometry;
-                    s && (t = En(e.geometry, 0, 0, s, s));
+                    s && (t = Un(e.geometry, 0, 0, s, s));
                     for (let n = 0; n < t.length; n++) {
                         const e = Rn(t[n], i, Fr, null, null, 24, 1, 1, s || 1 / 0);
                         o.push.apply(o, e);
@@ -4374,7 +4381,7 @@
                 var r, s, o, h, a, l = [];
                 for (r = 0, s = i.length; r < s; r++) o = i[r] * e, h = r < s - 1 ? i[r + 1] * e : t.length, 
                 (a = Pr(t, o, h, e, !1)) === a.next && (a.steiner = !0), l.push(Rr(a));
-                for (l.sort(Lr), r = 0; r < l.length; r++) Er(l[r], n), n = Sr(n, n.next);
+                for (l.sort(Lr), r = 0; r < l.length; r++) Ur(l[r], n), n = Sr(n, n.next);
                 return n;
             }(t, i, f, n)), t.length > 80 * n) {
                 e = s = t[0], r = o = t[1];
@@ -4423,14 +4430,14 @@
                         } while (o > 1);
                     }(r);
                 }(t, e, r, s);
-                for (var h, a, l = t; t.prev !== t.next; ) if (h = t.prev, a = t.next, s ? Cr(t, e, r, s) : Ir(t)) i.push(h.i / n), 
+                for (var h, a, l = t; t.prev !== t.next; ) if (h = t.prev, a = t.next, s ? Ir(t, e, r, s) : Cr(t)) i.push(h.i / n), 
                 i.push(t.i / n), i.push(a.i / n), Xr(t), t = a.next, l = a.next; else if ((t = a) === l) {
                     o ? 1 === o ? Or(t = Tr(Sr(t), i, n), i, n, e, r, s, 2) : 2 === o && Dr(t, i, n, e, r, s) : Or(Sr(t), i, n, e, r, s, 1);
                     break;
                 }
             }
         }
-        function Ir(t) {
+        function Cr(t) {
             var i = t.prev, n = t, e = t.next;
             if (Wr(i, n, e) >= 0) return !1;
             for (var r = t.next.next; r !== t.prev; ) {
@@ -4439,7 +4446,7 @@
             }
             return !0;
         }
-        function Cr(t, i, n, e) {
+        function Ir(t, i, n, e) {
             var r = t.prev, s = t, o = t.next;
             if (Wr(r, s, o) >= 0) return !1;
             for (var h = r.x < s.x ? r.x < o.x ? r.x : o.x : s.x < o.x ? s.x : o.x, a = r.y < s.y ? r.y < o.y ? r.y : o.y : s.y < o.y ? s.y : o.y, l = r.x > s.x ? r.x > o.x ? r.x : o.x : s.x > o.x ? s.x : o.x, u = r.y > s.y ? r.y > o.y ? r.y : o.y : s.y > o.y ? s.y : o.y, c = jr(h, a, i, n, e), f = jr(l, u, i, n, e), d = t.prevZ, y = t.nextZ; d && d.z >= c && y && y.z <= f; ) {
@@ -4482,7 +4489,7 @@
         function Lr(t, i) {
             return t.x - i.x;
         }
-        function Er(t, i) {
+        function Ur(t, i) {
             if (i = function(t, i) {
                 var n, e = i, r = t.x, s = t.y, o = -1 / 0;
                 do {
@@ -4504,7 +4511,7 @@
                 e = n;
                 do {
                     r >= e.x && e.x >= u && r !== e.x && Nr(s < c ? r : o, s, u, c, s < c ? o : r, s, e.x, e.y) && (a = Math.abs(s - e.y) / (r - e.x), 
-                    Jr(e, t) && (a < f || a === f && (e.x > n.x || e.x === n.x && Ur(n, e))) && (n = e, 
+                    Jr(e, t) && (a < f || a === f && (e.x > n.x || e.x === n.x && Er(n, e))) && (n = e, 
                     f = a)), e = e.next;
                 } while (e !== l);
                 return n;
@@ -4513,7 +4520,7 @@
                 Sr(i, i.next), Sr(n, n.next);
             }
         }
-        function Ur(t, i) {
+        function Er(t, i) {
             return Wr(t.prev, t, i.prev) < 0 && Wr(i.next, t, t.next) < 0;
         }
         function jr(t, i, n, e, r) {
@@ -4553,13 +4560,13 @@
             return t.x === i.x && t.y === i.y;
         }
         function Vr(t, i, n, e) {
-            var r = $r(Wr(t, i, n)), s = $r(Wr(t, i, e)), o = $r(Wr(n, e, t)), h = $r(Wr(n, e, i));
-            return r !== s && o !== h || (!(0 !== r || !Gr(t, n, i)) || (!(0 !== s || !Gr(t, e, i)) || (!(0 !== o || !Gr(n, t, e)) || !(0 !== h || !Gr(n, i, e)))));
+            var r = Gr(Wr(t, i, n)), s = Gr(Wr(t, i, e)), o = Gr(Wr(n, e, t)), h = Gr(Wr(n, e, i));
+            return r !== s && o !== h || (!(0 !== r || !$r(t, n, i)) || (!(0 !== s || !$r(t, e, i)) || (!(0 !== o || !$r(n, t, e)) || !(0 !== h || !$r(n, i, e)))));
         }
-        function Gr(t, i, n) {
+        function $r(t, i, n) {
             return i.x <= Math.max(t.x, n.x) && i.x >= Math.min(t.x, n.x) && i.y <= Math.max(t.y, n.y) && i.y >= Math.min(t.y, n.y);
         }
-        function $r(t) {
+        function Gr(t) {
             return t > 0 ? 1 : t < 0 ? -1 : 0;
         }
         function Jr(t, i) {
@@ -4804,21 +4811,21 @@
         function as(t, i, n, e, r, s, o, h, a, l) {
             void 0 === i.top && (i.top = !0), void 0 === i.side && (i.side = !0);
             const {altitudeScale: u, altitudeProperty: c, defaultAltitude: f, heightProperty: d, minHeightProperty: y, defaultHeight: p, tangent: m, uv: v, uvScale: g, topUVMode: M, sideUVMode: x, top: F, side: A, topThickness: k} = i, _ = function(t, i, {altitudeScale: n, altitudeProperty: e, defaultAltitude: r, heightProperty: s, minHeightProperty: o, defaultHeight: h}, {side: a, top: l, topThickness: u, uvOrigin: c, uv: f, uvSize: d, topUVMode: y, sideUVMode: p, glScale: m, localScale: v, vScale: g}, w) {
-                const b = i / t[0].extent, M = [], x = [], F = [], A = [], k = [], _ = [], S = !!f, O = !!l, I = !!a, T = S ? [] : null;
-                function E(t, n, e, r) {
+                const b = i / t[0].extent, M = [], x = [], F = [], A = [], k = [], _ = [], S = !!f, O = !!l, C = !!a, T = S ? [] : null;
+                function U(t, n, e, r) {
                     if (O) {
                         const r = Kr(A, e, 3);
                         if (0 === r.length) return n;
                         let s;
-                        C(k, A), n += A.length;
+                        I(k, A), n += A.length;
                         for (let i = 2, n = r.length; i < n; i += 3) s = r[i - 1], r[i - 1] = r[i] + t / 3, 
                         r[i] = s + t / 3, r[i - 2] += t / 3;
-                        C(_, r), S && kt(y || 0, t, n, T, k, 0, m, v, d[0], d[1]), u > 0 && !I && (n = os(k, A, e, _, n, 0, u, i, S, p || 0, T, d, m, v, g));
+                        I(_, r), S && kt(y || 0, t, n, T, k, 0, m, v, d[0], d[1]), u > 0 && !C && (n = os(k, A, e, _, n, 0, u, i, S, p || 0, T, d, m, v, g));
                     }
-                    return I && (O && (u = 0), n = os(k, A, e, _, n, u, r, i, S, p || 0, T, d, m, v, g)), 
+                    return C && (O && (u = 0), n = os(k, A, e, _, n, u, r, i, S, p || 0, T, d, m, v, g)), 
                     n;
                 }
-                let U = 0, j = 0;
+                let E = 0, j = 0;
                 const R = [ -1, -1, i + 1, i + 1 ];
                 let N = 0, z = t.length;
                 void 0 !== w && (N = w, z = w + 1);
@@ -4827,37 +4834,37 @@
                     const a = t[N], l = a.id;
                     P(l) && (Math.abs(l) > W && (W = Math.abs(l)), l < 0 && (H = !0));
                     const u = a.geometry, {altitude: c, height: f} = fi(a, n, e, r, s, h, o);
-                    U = Math.max(Math.abs(c), U);
+                    E = Math.max(Math.abs(c), E);
                     const d = k.length;
                     let y = j, p = [];
                     A.length = 0;
                     for (let t = 0, n = u.length; t < n; t++) {
                         const e = li(u[t]) < 0;
-                        !e && t > 0 && (j = E(y, j, p, f * b), A.length = 0, p = [], y = j);
+                        !e && t > 0 && (j = U(y, j, p, f * b), A.length = 0, p = [], y = j);
                         let r = u[t];
                         if (i !== 1 / 0 && (r = is(r, R)), !r.length) {
-                            t === n - 1 && (j = E(y, j, p, f * b));
+                            t === n - 1 && (j = U(y, j, p, f * b));
                             continue;
                         }
                         const s = r.length;
                         Array.isArray(r[0]) ? r[0][0] === r[s - 1][0] && r[0][1] === r[s - 1][1] || r.push([ r[0][0], r[0][1] ]) : r[0].x === r[s - 1].x && r[0].y === r[s - 1].y || r.push(r[0]), 
-                        e && p.push(A.length / 3), ft(A, A.length, r, b, c), t === n - 1 && (j = E(y, j, p, f * b));
+                        e && p.push(A.length / 3), ft(A, A.length, r, b, c), t === n - 1 && (j = U(y, j, p, f * b));
                     }
                     const m = k.length - d, v = "__fea_idx".trim();
                     for (let t = 0; t < m / 3; t++) x.push(void 0 === a[v] ? N : a[v]), M.push(N), P(l) && F.push(l);
                 }
-                const V = D(x.length ? x[x.length - 1] : 0), G = {
-                    maxAltitude: U,
-                    vertices: new (L(Math.max(512, U)))(k),
+                const V = D(x.length ? x[x.length - 1] : 0), $ = {
+                    maxAltitude: E,
+                    vertices: new (L(Math.max(512, E)))(k),
                     indices: _,
                     pickingIds: new V(x),
                     featureIndexes: M
                 };
                 if (F.length) {
                     const t = H ? L(W) : D(W);
-                    G.featureIds = new t(F);
-                } else G.featureIds = [];
-                return T && (T.length = k.length / 3 * 2, G.uvs = T), G;
+                    $.featureIds = new t(F);
+                } else $.featureIds = [];
+                return T && (T.length = k.length / 3 * 2, $.uvs = T), $;
             }(t, n, {
                 altitudeScale: u,
                 altitudeProperty: c,
@@ -4879,10 +4886,10 @@
                 vScale: s
             }, l), S = [], O = new (T(_.vertices.length / 3))(_.indices);
             delete _.indices, S.push(O.buffer, _.vertices.buffer, _.pickingIds.buffer);
-            const I = vr(_.vertices, O);
-            let E = !0;
-            for (let t = 0; t < I.length; t++) I[t] = -I[t], I[t] % 1 != 0 && (E = !1);
-            if (_.normals = I, m) {
+            const C = vr(_.vertices, O);
+            let U = !0;
+            for (let t = 0; t < C.length; t++) C[t] = -C[t], C[t] % 1 != 0 && (U = !1);
+            if (_.normals = C, m) {
                 let t = function(t, i, n, e) {
                     const r = t.length / 3, s = new Array(4 * r), o = [], h = [];
                     for (let t = 0; t < r; t++) o[t] = [ 0, 0, 0 ], h[t] = [ 0, 0, 0 ];
@@ -4917,14 +4924,14 @@
                     return n;
                 }(_.normals, t), _.tangents = t, S.push(t.buffer), delete _.normals;
             }
-            if (_.normals && (_.normals = E ? new Int8Array(_.normals) : new Float32Array(_.normals), 
+            if (_.normals && (_.normals = U ? new Int8Array(_.normals) : new Float32Array(_.normals), 
             S.push(_.normals.buffer)), _.uvs) {
                 const t = _.uvs;
                 _.uvs = new Float32Array(t), S.push(_.uvs.buffer);
             }
             const j = function(t, i, n, e) {
                 const r = {};
-                if (U("polygonFill", i)) {
+                if (E("polygonFill", i)) {
                     const s = {}, o = b(i.polygonFill), h = new Uint8Array(4 * e.length);
                     for (let i = 0; i < e.length; i++) {
                         const r = t[e[i]];
@@ -4937,7 +4944,7 @@
                     }
                     r.aColor = h;
                 }
-                if (U("polygonOpacity", i)) {
+                if (E("polygonOpacity", i)) {
                     const s = w(i.polygonOpacity), o = new Uint8Array(e.length);
                     for (let i = 0; i < e.length; i++) {
                         const r = t[e[i]], h = s(n, r.properties);
@@ -5115,7 +5122,7 @@
                 });
                 const s = !this.options.style.style.length && !this.options.style.featureStyle.length;
                 let o = this.pluginConfig.slice(0);
-                s && (o = this.bt(t)), this.featurePlugins && C(o, this.featurePlugins);
+                s && (o = this.bt(t)), this.featurePlugins && I(o, this.featurePlugins);
                 const h = i[0].extent, a = r.z, l = {
                     x: r.extent2d.xmin * n,
                     y: r.extent2d.ymax * n
@@ -5225,7 +5232,7 @@
                         zoom: l,
                         debugIndex: d
                     });
-                    return gs(t, r, i, $e);
+                    return gs(t, r, i, Ge);
                 }
                 if ("native-line" === f) {
                     const i = k({}, e, {
@@ -5287,10 +5294,10 @@
                         e[t] = 1;
                     }), t.filter = [ "in", "$id", ...t.id ]) : (e[t.id] = 1, t.filter = [ "==", "$id", t.id ]);
                 });
-                const r = E(i);
+                const r = U(i);
                 for (let t = 0; t < i.length; t++) r[t].filter && (r[t].filter.def = i[t].filter ? i[t].filter.value || i[t].filter : void 0), 
                 r[t].type = 0;
-                const s = [], o = E(n);
+                const s = [], o = U(n);
                 for (let t = 0; t < n.length; t++) o[t].type = 1, o[t].filter.def = n[t].filter ? n[t].filter.value || n[t].filter : void 0, 
                 o[t].renderPlugin && s.push(o[t]);
                 this.pluginConfig = r, this.featurePlugins = s, this.styledFeatures = e;
@@ -5411,7 +5418,7 @@
         }
         function ws(t) {
             if (!t) return 0;
-            for (const i in t) if (U(i, t)) return 1;
+            for (const i in t) if (E(i, t)) return 1;
             return 0;
         }
         var bs = function(t) {
@@ -5576,10 +5583,10 @@
             n.realloc(e);
             for (var r = n.pos - 1; r >= t; r--) n.buf[r + e] = n.buf[r];
         }
-        function Is(t, i) {
+        function Cs(t, i) {
             for (var n = 0; n < t.length; n++) i.writeVarint(t[n]);
         }
-        function Cs(t, i) {
+        function Is(t, i) {
             for (var n = 0; n < t.length; n++) i.writeSVarint(t[n]);
         }
         function Ts(t, i) {
@@ -5591,10 +5598,10 @@
         function Ls(t, i) {
             for (var n = 0; n < t.length; n++) i.writeBoolean(t[n]);
         }
-        function Es(t, i) {
+        function Us(t, i) {
             for (var n = 0; n < t.length; n++) i.writeFixed32(t[n]);
         }
-        function Us(t, i) {
+        function Es(t, i) {
             for (var n = 0; n < t.length; n++) i.writeSFixed32(t[n]);
         }
         function js(t, i) {
@@ -5860,10 +5867,10 @@
                 this.writeTag(t, ks.Bytes), this.writeRawMessage(i, n);
             },
             writePackedVarint: function(t, i) {
-                i.length && this.writeMessage(t, Is, i);
+                i.length && this.writeMessage(t, Cs, i);
             },
             writePackedSVarint: function(t, i) {
-                i.length && this.writeMessage(t, Cs, i);
+                i.length && this.writeMessage(t, Is, i);
             },
             writePackedBoolean: function(t, i) {
                 i.length && this.writeMessage(t, Ls, i);
@@ -5875,10 +5882,10 @@
                 i.length && this.writeMessage(t, Ds, i);
             },
             writePackedFixed32: function(t, i) {
-                i.length && this.writeMessage(t, Es, i);
+                i.length && this.writeMessage(t, Us, i);
             },
             writePackedSFixed32: function(t, i) {
-                i.length && this.writeMessage(t, Us, i);
+                i.length && this.writeMessage(t, Es, i);
             },
             writePackedFixed64: function(t, i) {
                 i.length && this.writeMessage(t, js, i);
@@ -5920,12 +5927,12 @@
                 this.writeVarintField(t, Boolean(i));
             }
         };
-        var Hs = Ot, Vs = Gs;
-        function Gs(t, i, n, e, r) {
+        var Hs = Ot, Vs = $s;
+        function $s(t, i, n, e, r) {
             this.properties = {}, this.extent = n, this.type = 0, this.kt = t, this._t = -1, 
-            this.Pt = e, this.St = r, t.readFields($s, this, i);
+            this.Pt = e, this.St = r, t.readFields(Gs, this, i);
         }
-        function $s(t, i, n) {
+        function Gs(t, i, n) {
             1 == t ? i.id = n.readVarint() : 2 == t ? function(t, i) {
                 var n = t.readVarint() + t.pos;
                 for (;t.pos < n; ) {
@@ -5939,7 +5946,7 @@
             e += ((n = t[o]).x - i.x) * (i.y + n.y);
             return e;
         }
-        Gs.types = [ "Unknown", "Point", "LineString", "Polygon" ], Gs.prototype.loadGeometry = function() {
+        $s.types = [ "Unknown", "Point", "LineString", "Polygon" ], $s.prototype.loadGeometry = function() {
             var t = this.kt;
             t.pos = this._t;
             for (var i, n = t.readVarint() + t.pos, e = 1, r = 0, s = 0, o = 0, h = []; t.pos < n; ) {
@@ -5954,7 +5961,7 @@
                 }
             }
             return i && h.push(i), h;
-        }, Gs.prototype.bbox = function() {
+        }, $s.prototype.bbox = function() {
             var t = this.kt;
             t.pos = this._t;
             for (var i = t.readVarint() + t.pos, n = 1, e = 0, r = 0, s = 0, o = 1 / 0, h = -1 / 0, a = 1 / 0, l = -1 / 0; t.pos < i; ) {
@@ -5966,8 +5973,8 @@
                 (s += t.readSVarint()) < a && (a = s), s > l && (l = s); else if (7 !== n) throw new Error("unknown command " + n);
             }
             return [ o, a, h, l ];
-        }, Gs.prototype.toGeoJSON = function(t, i, n) {
-            var e, r, s = this.extent * Math.pow(2, n), o = this.extent * t, h = this.extent * i, a = this.loadGeometry(), l = Gs.types[this.type];
+        }, $s.prototype.toGeoJSON = function(t, i, n) {
+            var e, r, s = this.extent * Math.pow(2, n), o = this.extent * t, h = this.extent * i, a = this.loadGeometry(), l = $s.types[this.type];
             function u(t) {
                 for (var i = 0; i < t.length; i++) {
                     var n = t[i], e = 180 - 360 * (n.y + h) / s;
@@ -6123,16 +6130,16 @@
         }(128), eo = {};
         class ro {
             constructor(t) {
-                this.It = {}, this.Ct = {}, this.workerId = t;
+                this.Ct = {}, this.It = {}, this.workerId = t;
             }
             addLayer({actorId: t, mapId: i, layerId: n, params: e}, r) {
                 if (this.Tt(i, n)) return;
                 const s = this.Dt(i, n), o = e.type, h = e.options, a = this.send.bind(this, t);
-                this.It[s] = "GeoJSONVectorTileLayer" === o ? new Ms(n, h, a, no, eo, r) : new to(n, h, a, no, eo, r);
+                this.Ct[s] = "GeoJSONVectorTileLayer" === o ? new Ms(n, h, a, no, eo, r) : new to(n, h, a, no, eo, r);
             }
             removeLayer({mapId: t, layerId: i}, n) {
                 const e = this.Tt(t, i), r = this.Dt(t, i);
-                delete this.It[r], e && (e.onRemove(n), this.Lt());
+                delete this.Ct[r], e && (e.onRemove(n), this.Lt());
             }
             loadTile({mapId: t, layerId: i, params: n}, e) {
                 const r = this.Tt(t, i);
@@ -6159,12 +6166,12 @@
                 r && (r.setData(n.data, e), this.Lt());
             }
             receive(t) {
-                const i = t.callback, n = this.Ct[i];
-                delete this.Ct[i], n && t.error ? n(new Error(t.error)) : n && n(null, t.data);
+                const i = t.callback, n = this.It[i];
+                delete this.It[i], n && t.error ? n(new Error(t.error)) : n && n(null, t.data);
             }
             send(t, i, n, e, r) {
                 const s = r ? `${t}-${io++}` : null;
-                r && (this.Ct[s] = r), postMessage({
+                r && (this.It[s] = r), postMessage({
                     type: "<request>",
                     workerId: this.workerId,
                     actorId: t,
@@ -6178,7 +6185,7 @@
             }
             Tt(t, i) {
                 const n = this.Dt(t, i);
-                return this.It[n];
+                return this.Ct[n];
             }
             Lt() {
                 const t = Object.keys(eo);
@@ -6391,15 +6398,15 @@
             return t;
         }
         function S(t) {
-            return !C(t) && ("string" == typeof t || null !== t.constructor && t.constructor === String);
+            return !I(t) && ("string" == typeof t || null !== t.constructor && t.constructor === String);
         }
         function O(t) {
             return "number" == typeof t && !isNaN(t);
         }
-        function I(t) {
-            return !C(t) && ("function" == typeof t || null !== t.constructor && t.constructor === Function);
-        }
         function C(t) {
+            return !I(t) && ("function" == typeof t || null !== t.constructor && t.constructor === Function);
+        }
+        function I(t) {
             return null == t;
         }
         function T(t) {
@@ -6432,11 +6439,11 @@
                 return i.filter && i.filter.value && (i.filter = i.filter.value), i;
             }));
         }
-        function E(t, i) {
+        function U(t, i) {
             return Object.prototype.hasOwnProperty.call(t, i);
         }
         "undefined" != typeof globalThis ? globalThis : "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self && self;
-        var U = j;
+        var E = j;
         function j(t, i) {
             this.x = t, this.y = i;
         }
@@ -6469,10 +6476,10 @@
                 return this.clone().O(t, i);
             },
             matMult: function(t) {
-                return this.clone().I(t);
+                return this.clone().C(t);
             },
             unit: function() {
-                return this.clone().C();
+                return this.clone().I();
             },
             perp: function() {
                 return this.clone().T();
@@ -6505,7 +6512,7 @@
             angleWithSep: function(t, i) {
                 return Math.atan2(this.x * i - this.y * t, this.x * t + this.y * i);
             },
-            I: function(t) {
+            C: function(t) {
                 var i = t[0] * this.x + t[1] * this.y, n = t[2] * this.x + t[3] * this.y;
                 return this.x = i, this.y = n, this;
             },
@@ -6527,7 +6534,7 @@
             A: function(t) {
                 return this.x /= t.x, this.y /= t.y, this;
             },
-            C: function() {
+            I: function() {
                 return this.P(this.mag()), this;
             },
             T: function() {
@@ -6569,7 +6576,7 @@
                 if (n.promoteId ? h = i.properties[n.promoteId] : n.generateId && (h = e || 0), 
                 "Point" === s) W(r, o); else if ("MultiPoint" === s) for (var a = 0; a < r.length; a++) W(r[a], o); else if ("LineString" === s) V([ r ], o); else if ("MultiLineString" === s) {
                     if (n.lineMetrics) {
-                        for (a = 0; a < r.length; a++) o = [], H(r[a], o), t.push(G(h, "LineString", o, i.properties));
+                        for (a = 0; a < r.length; a++) o = [], H(r[a], o), t.push($(h, "LineString", o, i.properties));
                         return;
                     }
                     V(r, o);
@@ -6590,16 +6597,16 @@
                         V(r[a], l), o.push(l);
                     }
                 }
-                t.push(G(h, s, o, i.properties));
+                t.push($(h, s, o, i.properties));
             }
         }
         function W(t, i) {
-            i.push([ new U(t[0], t[1]) ]);
+            i.push([ new E(t[0], t[1]) ]);
         }
         function H(t, i) {
             for (var n = 0; n < t.length; n++) {
                 var e = t[n][0], r = t[n][1];
-                i.push(new U(e, r));
+                i.push(new E(e, r));
             }
         }
         function V(t, i, n, e) {
@@ -6608,7 +6615,7 @@
                 H(t[r], s), i.push(s);
             }
         }
-        function G(t, i, n, e) {
+        function $(t, i, n, e) {
             return {
                 id: void 0 === t ? null : t,
                 type: R[i],
@@ -6616,7 +6623,7 @@
                 properties: e
             };
         }
-        function $(t, i, n) {
+        function G(t, i, n) {
             n = n || {}, this.w = t || 64, this.h = i || 64, this.autoResize = !!n.autoResize, 
             this.shelves = [], this.freebins = [], this.stats = {}, this.bins = {}, this.maxId = 0;
         }
@@ -6666,7 +6673,7 @@
             }
             return i;
         }
-        $.prototype.pack = function(t, i) {
+        G.prototype.pack = function(t, i) {
             t = [].concat(t), i = i || {};
             for (var n, e, r, s, o = [], h = 0; h < t.length; h++) if (n = t[h].w || t[h].width, 
             e = t[h].h || t[h].height, r = t[h].id, n && e) {
@@ -6674,7 +6681,7 @@
                 i.inPlace && (t[h].x = s.x, t[h].y = s.y, t[h].id = s.id), o.push(s);
             }
             return this.shrink(), o;
-        }, $.prototype.packOne = function(t, i, n) {
+        }, G.prototype.packOne = function(t, i, n) {
             var e, r, s, o, h, a, l, u, c = {
                 freebin: -1,
                 shelf: -1,
@@ -6698,14 +6705,14 @@
             this.allocShelf(this.shelves.push(r) - 1, t, i, n)) : this.autoResize ? (h = a = this.h, 
             ((l = u = this.w) <= h || t > l) && (u = 2 * Math.max(t, l)), (h < l || i > h) && (a = 2 * Math.max(i, h)), 
             this.resize(u, a), this.packOne(t, i, n)) : null;
-        }, $.prototype.allocFreebin = function(t, i, n, e) {
+        }, G.prototype.allocFreebin = function(t, i, n, e) {
             var r = this.freebins.splice(t, 1)[0];
             return r.id = e, r.w = i, r.h = n, r.refcount = 0, this.bins[e] = r, this.ref(r), 
             r;
-        }, $.prototype.allocShelf = function(t, i, n, e) {
+        }, G.prototype.allocShelf = function(t, i, n, e) {
             var r = this.shelves[t].alloc(i, n, e);
             return this.bins[e] = r, this.ref(r), r;
-        }, $.prototype.shrink = function() {
+        }, G.prototype.shrink = function() {
             if (this.shelves.length > 0) {
                 for (var t = 0, i = 0, n = 0; n < this.shelves.length; n++) {
                     var e = this.shelves[n];
@@ -6713,20 +6720,20 @@
                 }
                 this.resize(t, i);
             }
-        }, $.prototype.getBin = function(t) {
+        }, G.prototype.getBin = function(t) {
             return this.bins[t];
-        }, $.prototype.ref = function(t) {
+        }, G.prototype.ref = function(t) {
             if (1 == ++t.refcount) {
                 var i = t.h;
                 this.stats[i] = 1 + (0 | this.stats[i]);
             }
             return t.refcount;
-        }, $.prototype.unref = function(t) {
+        }, G.prototype.unref = function(t) {
             return 0 === t.refcount ? 0 : (0 == --t.refcount && (this.stats[t.h]--, delete this.bins[t.id], 
             this.freebins.push(t)), t.refcount);
-        }, $.prototype.clear = function() {
+        }, G.prototype.clear = function() {
             this.shelves = [], this.freebins = [], this.stats = {}, this.bins = {}, this.maxId = 0;
-        }, $.prototype.resize = function(t, i) {
+        }, G.prototype.resize = function(t, i) {
             this.w = t, this.h = i;
             for (var n = 0; n < this.shelves.length; n++) this.shelves[n].resize(t);
             return !0;
@@ -6794,7 +6801,7 @@
                 this.glyphMap = t, this.build();
             }
             build() {
-                const t = this.glyphMap, i = {}, n = new $(0, 0, {
+                const t = this.glyphMap, i = {}, n = new G(0, 0, {
                     autoResize: !0
                 }), e = [];
                 for (const n in t) {
@@ -6845,7 +6852,7 @@
                 this.glyphMap = t, this.build();
             }
             build() {
-                const t = this.glyphMap, i = {}, n = new $(0, 0, {
+                const t = this.glyphMap, i = {}, n = new G(0, 0, {
                     autoResize: !0
                 }), e = [];
                 for (const n in t) {
@@ -6976,7 +6983,7 @@
         }
         const Mt = {
             lineWidth: 1,
-            lineGapWidth: 1,
+            lineStrokeWidth: 1,
             lineDx: 1,
             lineDy: 1,
             lineOpacity: 1,
@@ -7023,7 +7030,7 @@
                 if (Array.isArray(r.geometry) && r.properties) {
                     let i = r.geometry[0];
                     for (;Array.isArray(i); ) i = i[0];
-                    i instanceof U && (n = t);
+                    i instanceof E && (n = t);
                 }
                 if (!n) if (n = [], Array.isArray(r.geometry)) for (let i = 0; i < t.length; i++) {
                     const e = at({}, t[i]);
@@ -7246,16 +7253,16 @@
             };
         }
         const At = /\{([\w_]+)\}/g;
-        const kt = t => t >= 128 && t <= 255, _t = t => t >= 1536 && t <= 1791, Pt = t => t >= 1872 && t <= 1919, St = t => t >= 2208 && t <= 2303, Ot = t => t >= 4352 && t <= 4607, It = t => t >= 5120 && t <= 5759, Ct = t => t >= 6320 && t <= 6399, Tt = t => t >= 8192 && t <= 8303, Dt = t => t >= 8448 && t <= 8527, Lt = t => t >= 8528 && t <= 8591, Et = t => t >= 8960 && t <= 9215, Ut = t => t >= 9216 && t <= 9279, jt = t => t >= 9280 && t <= 9311, Rt = t => t >= 9312 && t <= 9471, Nt = t => t >= 9632 && t <= 9727, zt = t => t >= 9728 && t <= 9983, Wt = t => t >= 11008 && t <= 11263, Ht = t => t >= 11904 && t <= 12031, Vt = t => t >= 12032 && t <= 12255, Gt = t => t >= 12272 && t <= 12287, $t = t => t >= 12288 && t <= 12351, Jt = t => t >= 12352 && t <= 12447, qt = t => t >= 12448 && t <= 12543, Bt = t => t >= 12544 && t <= 12591, Xt = t => t >= 12592 && t <= 12687, Zt = t => t >= 12688 && t <= 12703, Yt = t => t >= 12704 && t <= 12735, Kt = t => t >= 12736 && t <= 12783, Qt = t => t >= 12784 && t <= 12799, ti = t => t >= 12800 && t <= 13055, ii = t => t >= 13056 && t <= 13311, ni = t => t >= 13312 && t <= 19903, ei = t => t >= 19904 && t <= 19967, ri = t => t >= 19968 && t <= 40959, si = t => t >= 40960 && t <= 42127, oi = t => t >= 42128 && t <= 42191, hi = t => t >= 43360 && t <= 43391, ai = t => t >= 44032 && t <= 55215, li = t => t >= 55216 && t <= 55295, ui = t => t >= 57344 && t <= 63743, ci = t => t >= 63744 && t <= 64255, fi = t => t >= 64336 && t <= 65023, di = t => t >= 65040 && t <= 65055, yi = t => t >= 65072 && t <= 65103, pi = t => t >= 65104 && t <= 65135, mi = t => t >= 65136 && t <= 65279, vi = t => t >= 65280 && t <= 65519;
+        const kt = t => t >= 128 && t <= 255, _t = t => t >= 1536 && t <= 1791, Pt = t => t >= 1872 && t <= 1919, St = t => t >= 2208 && t <= 2303, Ot = t => t >= 4352 && t <= 4607, Ct = t => t >= 5120 && t <= 5759, It = t => t >= 6320 && t <= 6399, Tt = t => t >= 8192 && t <= 8303, Dt = t => t >= 8448 && t <= 8527, Lt = t => t >= 8528 && t <= 8591, Ut = t => t >= 8960 && t <= 9215, Et = t => t >= 9216 && t <= 9279, jt = t => t >= 9280 && t <= 9311, Rt = t => t >= 9312 && t <= 9471, Nt = t => t >= 9632 && t <= 9727, zt = t => t >= 9728 && t <= 9983, Wt = t => t >= 11008 && t <= 11263, Ht = t => t >= 11904 && t <= 12031, Vt = t => t >= 12032 && t <= 12255, $t = t => t >= 12272 && t <= 12287, Gt = t => t >= 12288 && t <= 12351, Jt = t => t >= 12352 && t <= 12447, qt = t => t >= 12448 && t <= 12543, Bt = t => t >= 12544 && t <= 12591, Xt = t => t >= 12592 && t <= 12687, Zt = t => t >= 12688 && t <= 12703, Yt = t => t >= 12704 && t <= 12735, Kt = t => t >= 12736 && t <= 12783, Qt = t => t >= 12784 && t <= 12799, ti = t => t >= 12800 && t <= 13055, ii = t => t >= 13056 && t <= 13311, ni = t => t >= 13312 && t <= 19903, ei = t => t >= 19904 && t <= 19967, ri = t => t >= 19968 && t <= 40959, si = t => t >= 40960 && t <= 42127, oi = t => t >= 42128 && t <= 42191, hi = t => t >= 43360 && t <= 43391, ai = t => t >= 44032 && t <= 55215, li = t => t >= 55216 && t <= 55295, ui = t => t >= 57344 && t <= 63743, ci = t => t >= 63744 && t <= 64255, fi = t => t >= 64336 && t <= 65023, di = t => t >= 65040 && t <= 65055, yi = t => t >= 65072 && t <= 65103, pi = t => t >= 65104 && t <= 65135, mi = t => t >= 65136 && t <= 65279, vi = t => t >= 65280 && t <= 65519;
         function gi(t) {
             return !_t(t) && (!Pt(t) && (!St(t) && (!fi(t) && !mi(t))));
         }
         function wi(t) {
-            return 746 === t || 747 === t || !(t < 4352) && (!!Yt(t) || (!!Bt(t) || (!(!yi(t) || t >= 65097 && t <= 65103) || (!!ci(t) || (!!ii(t) || (!!Ht(t) || (!!Kt(t) || (!(!$t(t) || t >= 12296 && t <= 12305 || t >= 12308 && t <= 12319 || 12336 === t) || (!!ni(t) || (!!ri(t) || (!!ti(t) || (!!Xt(t) || (!!hi(t) || (!!li(t) || (!!Ot(t) || (!!ai(t) || (!!Jt(t) || (!!Gt(t) || (!!Zt(t) || (!!Vt(t) || (!!Qt(t) || (!(!qt(t) || 12540 === t) || (!(!vi(t) || 65288 === t || 65289 === t || 65293 === t || t >= 65306 && t <= 65310 || 65339 === t || 65341 === t || 65343 === t || t >= 65371 && t <= 65503 || 65507 === t || t >= 65512 && t <= 65519) || (!(!pi(t) || t >= 65112 && t <= 65118 || t >= 65123 && t <= 65126) || (!!It(t) || (!!Ct(t) || (!!di(t) || (!!ei(t) || (!!si(t) || !!oi(t))))))))))))))))))))))))))))));
+            return 746 === t || 747 === t || !(t < 4352) && (!!Yt(t) || (!!Bt(t) || (!(!yi(t) || t >= 65097 && t <= 65103) || (!!ci(t) || (!!ii(t) || (!!Ht(t) || (!!Kt(t) || (!(!Gt(t) || t >= 12296 && t <= 12305 || t >= 12308 && t <= 12319 || 12336 === t) || (!!ni(t) || (!!ri(t) || (!!ti(t) || (!!Xt(t) || (!!hi(t) || (!!li(t) || (!!Ot(t) || (!!ai(t) || (!!Jt(t) || (!!$t(t) || (!!Zt(t) || (!!Vt(t) || (!!Qt(t) || (!(!qt(t) || 12540 === t) || (!(!vi(t) || 65288 === t || 65289 === t || 65293 === t || t >= 65306 && t <= 65310 || 65339 === t || 65341 === t || 65343 === t || t >= 65371 && t <= 65503 || 65507 === t || t >= 65512 && t <= 65519) || (!(!pi(t) || t >= 65112 && t <= 65118 || t >= 65123 && t <= 65126) || (!!Ct(t) || (!!It(t) || (!!di(t) || (!!ei(t) || (!!si(t) || !!oi(t))))))))))))))))))))))))))))));
         }
         function bi(t) {
             return !(wi(t) || function(t) {
-                return !(!kt(t) || 167 !== t && 169 !== t && 174 !== t && 177 !== t && 188 !== t && 189 !== t && 190 !== t && 215 !== t && 247 !== t) || (!(!Tt(t) || 8214 !== t && 8224 !== t && 8225 !== t && 8240 !== t && 8241 !== t && 8251 !== t && 8252 !== t && 8258 !== t && 8263 !== t && 8264 !== t && 8265 !== t && 8273 !== t) || (!!Dt(t) || (!!Lt(t) || (!(!Et(t) || !(t >= 8960 && t <= 8967 || t >= 8972 && t <= 8991 || t >= 8996 && t <= 9e3 || 9003 === t || t >= 9085 && t <= 9114 || t >= 9150 && t <= 9165 || 9167 === t || t >= 9169 && t <= 9179 || t >= 9186 && t <= 9215)) || (!(!Ut(t) || 9251 === t) || (!!jt(t) || (!!Rt(t) || (!!Nt(t) || (!(!zt(t) || t >= 9754 && t <= 9759) || (!(!Wt(t) || !(t >= 11026 && t <= 11055 || t >= 11088 && t <= 11097 || t >= 11192 && t <= 11243)) || (!!$t(t) || (!!qt(t) || (!!ui(t) || (!!yi(t) || (!!pi(t) || (!!vi(t) || (8734 === t || 8756 === t || 8757 === t || t >= 9984 && t <= 10087 || t >= 10102 && t <= 10131 || 65532 === t || 65533 === t)))))))))))))))));
+                return !(!kt(t) || 167 !== t && 169 !== t && 174 !== t && 177 !== t && 188 !== t && 189 !== t && 190 !== t && 215 !== t && 247 !== t) || (!(!Tt(t) || 8214 !== t && 8224 !== t && 8225 !== t && 8240 !== t && 8241 !== t && 8251 !== t && 8252 !== t && 8258 !== t && 8263 !== t && 8264 !== t && 8265 !== t && 8273 !== t) || (!!Dt(t) || (!!Lt(t) || (!(!Ut(t) || !(t >= 8960 && t <= 8967 || t >= 8972 && t <= 8991 || t >= 8996 && t <= 9e3 || 9003 === t || t >= 9085 && t <= 9114 || t >= 9150 && t <= 9165 || 9167 === t || t >= 9169 && t <= 9179 || t >= 9186 && t <= 9215)) || (!(!Et(t) || 9251 === t) || (!!jt(t) || (!!Rt(t) || (!!Nt(t) || (!(!zt(t) || t >= 9754 && t <= 9759) || (!(!Wt(t) || !(t >= 11026 && t <= 11055 || t >= 11088 && t <= 11097 || t >= 11192 && t <= 11243)) || (!!Gt(t) || (!!qt(t) || (!!ui(t) || (!!yi(t) || (!!pi(t) || (!!vi(t) || (8734 === t || 8756 === t || 8757 === t || t >= 9984 && t <= 10087 || t >= 10102 && t <= 10131 || 65532 === t || 65533 === t)))))))))))))))));
             }(t));
         }
         function Mi(t) {
@@ -7395,7 +7402,7 @@
                 let o = 0;
                 for (let n = 0; n < t.length; n++) {
                     const a = t.charCodeAt(n), l = e[a];
-                    l && !Si[a] && (o += l.metrics.advance + i), n < t.length - 1 && (Oi[a] || !((h = a) < 11904) && (Yt(h) || Bt(h) || yi(h) || ci(h) || ii(h) || Ht(h) || Kt(h) || $t(h) || ni(h) || ri(h) || ti(h) || vi(h) || Jt(h) || Gt(h) || Vt(h) || Qt(h) || qt(h) || di(h) || oi(h) || si(h))) && r.push(Ti(n + 1, o, s, r, Ci(a, t.charCodeAt(n + 1)), !1));
+                    l && !Si[a] && (o += l.metrics.advance + i), n < t.length - 1 && (Oi[a] || !((h = a) < 11904) && (Yt(h) || Bt(h) || yi(h) || ci(h) || ii(h) || Ht(h) || Kt(h) || Gt(h) || ni(h) || ri(h) || ti(h) || vi(h) || Jt(h) || $t(h) || Vt(h) || Qt(h) || qt(h) || di(h) || oi(h) || si(h))) && r.push(Ti(n + 1, o, s, r, Ii(a, t.charCodeAt(n + 1)), !1));
                 }
                 var h;
                 return function t(i) {
@@ -7465,19 +7472,19 @@
             8211: !0,
             8231: !0
         };
-        function Ii(t, i, n, e) {
+        function Ci(t, i, n, e) {
             const r = Math.pow(t - i, 2);
             return e ? t < i ? r / 2 : 2 * r : r + Math.abs(n) * n;
         }
-        function Ci(t, i) {
+        function Ii(t, i) {
             let n = 0;
             return 10 === t && (n -= 1e4), 40 !== t && 65288 !== t || (n += 50), 41 !== i && 65289 !== i || (n += 50), 
             n;
         }
         function Ti(t, i, n, e, r, s) {
-            let o = null, h = Ii(i, n, r, s);
+            let o = null, h = Ci(i, n, r, s);
             for (let t = 0; t < e.length; t++) {
-                const a = e[t], l = Ii(i - a.x, n, r, s) + a.badness;
+                const a = e[t], l = Ci(i - a.x, n, r, s) + a.badness;
                 l <= h && (o = a, h = l);
             }
             return {
@@ -7527,7 +7534,7 @@
                 for (let i = n; i <= e; i++) t[i].x -= o;
             }
         }
-        function Ei(t) {
+        function Ui(t) {
             if (!function(t) {
                 for (const i of t) if (Mi(i.charCodeAt(0))) return !0;
                 return !1;
@@ -7543,7 +7550,7 @@
             return e.length && n.push(...e), n.length && (h > 0 && n.reverse(), i.push(...n)), 
             i.reverse().join("");
         }
-        const Ui = /\{ *([\w_]+) *\}/g;
+        const Ei = /\{ *([\w_]+) *\}/g;
         class ji {
             constructor(t, i, n, e, r) {
                 this.feature = t, this.symbolDef = i, this.symbol = n, this.options = r, this.W = this.H.bind(this), 
@@ -7649,7 +7656,7 @@
                             lt(t) || (i.markerLinePatternFile = t);
                         } else g.markerLinePatternFile && (i.markerLinePatternFile = g.markerLinePatternFile);
                         t = "vector://" + JSON.stringify(i);
-                    } else t = b ? b.replace(Ui, this.W) : g.markerPath ? function(t, i, n) {
+                    } else t = b ? b.replace(Ei, this.W) : g.markerPath ? function(t, i, n) {
                         if (!t.markerPath) return null;
                         let e = 1;
                         const r = function(t) {
@@ -7706,7 +7713,7 @@
                             const n = _[i];
                             return lt(n) ? "" : Array.isArray(n) ? n.join() : n;
                         })) : k);
-                        n && n.length && (n = Ei(n), v.glyph = {
+                        n && n.length && (n = Ui(n), v.glyph = {
                             font: i,
                             text: n
                         });
@@ -7732,16 +7739,16 @@
                 let a;
                 for (let t = 0; t < h.length - 1; t++) {
                     let o = h[t], l = h[t + 1];
-                    o.x < i && l.x < i || (o.x < i ? o = new U(i, o.y + (l.y - o.y) * ((i - o.x) / (l.x - o.x))).D() : l.x < i && (l = new U(i, o.y + (l.y - o.y) * ((i - o.x) / (l.x - o.x))).D()), 
-                    o.y < n && l.y < n || (o.y < n ? o = new U(o.x + (l.x - o.x) * ((n - o.y) / (l.y - o.y)), n).D() : l.y < n && (l = new U(o.x + (l.x - o.x) * ((n - o.y) / (l.y - o.y)), n).D()), 
-                    o.x >= e && l.x >= e || (o.x >= e ? o = new U(e, o.y + (l.y - o.y) * ((e - o.x) / (l.x - o.x))).D() : l.x >= e && (l = new U(e, o.y + (l.y - o.y) * ((e - o.x) / (l.x - o.x))).D()), 
-                    o.y >= r && l.y >= r || (o.y >= r ? o = new U(o.x + (l.x - o.x) * ((r - o.y) / (l.y - o.y)), r).D() : l.y >= r && (l = new U(o.x + (l.x - o.x) * ((r - o.y) / (l.y - o.y)), r).D()), 
+                    o.x < i && l.x < i || (o.x < i ? o = new E(i, o.y + (l.y - o.y) * ((i - o.x) / (l.x - o.x))).D() : l.x < i && (l = new E(i, o.y + (l.y - o.y) * ((i - o.x) / (l.x - o.x))).D()), 
+                    o.y < n && l.y < n || (o.y < n ? o = new E(o.x + (l.x - o.x) * ((n - o.y) / (l.y - o.y)), n).D() : l.y < n && (l = new E(o.x + (l.x - o.x) * ((n - o.y) / (l.y - o.y)), n).D()), 
+                    o.x >= e && l.x >= e || (o.x >= e ? o = new E(e, o.y + (l.y - o.y) * ((e - o.x) / (l.x - o.x))).D() : l.x >= e && (l = new E(e, o.y + (l.y - o.y) * ((e - o.x) / (l.x - o.x))).D()), 
+                    o.y >= r && l.y >= r || (o.y >= r ? o = new E(o.x + (l.x - o.x) * ((r - o.y) / (l.y - o.y)), r).D() : l.y >= r && (l = new E(o.x + (l.x - o.x) * ((r - o.y) / (l.y - o.y)), r).D()), 
                     a && o.equals(a[a.length - 1]) || (a = [ o ], s.push(a)), a.push(l)))));
                 }
             }
             return s;
         }
-        class zi extends U {
+        class zi extends E {
             constructor(t, i, n, e) {
                 super(t, i), this.angle = n, void 0 !== e && (this.segment = e);
             }
@@ -7809,7 +7816,7 @@
         function Vi(t, i, n) {
             return t * (1 - n) + i * n;
         }
-        var Gi = {
+        var $i = {
             exports: {}
         };
         !function(t, i) {
@@ -7838,8 +7845,8 @@
                     }(n, e, r || 0, s || n.length - 1, o || i);
                 };
             }();
-        }(Gi);
-        var $i = Gi.exports;
+        }($i);
+        var Gi = $i.exports;
         function Ji(t, i) {
             const n = t.length;
             if (n <= 1) return [ t ];
@@ -7850,7 +7857,7 @@
                 0 !== n && (t[i].area = Math.abs(n), void 0 === s && (s = n < 0), s === n < 0 ? (r && e.push(r), 
                 r = [ t[i] ]) : r.push(t[i]));
             }
-            if (r && e.push(r), i > 1) for (let t = 0; t < e.length; t++) e[t].length <= i || ($i(e[t], i, 1, e[t].length - 1, qi), 
+            if (r && e.push(r), i > 1) for (let t = 0; t < e.length; t++) e[t].length <= i || (Gi(e[t], i, 1, e[t].length - 1, qi), 
             e[t] = e[t].slice(0, i));
             return e;
         }
@@ -7917,7 +7924,7 @@
             const a = s - e, l = o - r, u = Math.min(a, l);
             let c = u / 2;
             const f = new Yi(null, tn);
-            if (0 === u) return new U(e, r);
+            if (0 === u) return new E(e, r);
             for (let i = e; i < s; i += u) for (let n = r; n < o; n += u) f.push(new nn(i + c, n + c, c, t));
             let d = function(t) {
                 let i = 0, n = 0, e = 0;
@@ -7942,7 +7949,7 @@
             return i.max - t.max;
         }
         function nn(t, i, n, e) {
-            this.p = new U(t, i), this.h = n, this.d = function(t, i) {
+            this.p = new E(t, i), this.h = n, this.d = function(t, i) {
                 let n = !1, e = 1 / 0;
                 for (let r = 0; r < i.length; r++) {
                     const s = i[r];
@@ -8542,20 +8549,20 @@
             e = Sn(_n[i[r].parent][r], e), r = i[r].parent;
             return e.conversion = n, e;
         }
-        var In = gn.exports, Cn = function(t) {
+        var Cn = gn.exports, In = function(t) {
             for (var i = Pn(t), n = {}, e = Object.keys(i), r = e.length, s = 0; s < r; s++) {
                 var o = e[s];
                 null !== i[o].parent && (n[o] = On(o, i));
             }
             return n;
         }, Tn = {};
-        Object.keys(In).forEach((function(t) {
+        Object.keys(Cn).forEach((function(t) {
             Tn[t] = {}, Object.defineProperty(Tn[t], "channels", {
-                value: In[t].channels
+                value: Cn[t].channels
             }), Object.defineProperty(Tn[t], "labels", {
-                value: In[t].labels
+                value: Cn[t].labels
             });
-            var i = Cn(t);
+            var i = In(t);
             Object.keys(i).forEach((function(n) {
                 var e = i[n];
                 Tn[t][n] = function(t) {
@@ -8576,25 +8583,25 @@
                 }(e);
             }));
         }));
-        var Dn = Tn, Ln = rn.exports, En = Dn, Un = [].slice, jn = [ "keyword", "gray", "hex" ], Rn = {};
-        Object.keys(En).forEach((function(t) {
-            Rn[Un.call(En[t].labels).sort().join("")] = t;
+        var Dn = Tn, Ln = rn.exports, Un = Dn, En = [].slice, jn = [ "keyword", "gray", "hex" ], Rn = {};
+        Object.keys(Un).forEach((function(t) {
+            Rn[En.call(Un[t].labels).sort().join("")] = t;
         }));
         var Nn = {};
         function zn(t, i) {
             if (!(this instanceof zn)) return new zn(t, i);
-            if (i && i in jn && (i = null), i && !(i in En)) throw new Error("Unknown model: " + i);
+            if (i && i in jn && (i = null), i && !(i in Un)) throw new Error("Unknown model: " + i);
             var n, e;
             if (null == t) this.model = "rgb", this.color = [ 0, 0, 0 ], this.valpha = 1; else if (t instanceof zn) this.model = t.model, 
             this.color = t.color.slice(), this.valpha = t.valpha; else if ("string" == typeof t) {
                 var r = Ln.get(t);
                 if (null === r) throw new Error("Unable to parse color from string: " + t);
-                this.model = r.model, e = En[this.model].channels, this.color = r.value.slice(0, e), 
+                this.model = r.model, e = Un[this.model].channels, this.color = r.value.slice(0, e), 
                 this.valpha = "number" == typeof r.value[e] ? r.value[e] : 1;
             } else if (t.length) {
-                this.model = i || "rgb", e = En[this.model].channels;
-                var s = Un.call(t, 0, e);
-                this.color = Gn(s, e), this.valpha = "number" == typeof t[e] ? t[e] : 1;
+                this.model = i || "rgb", e = Un[this.model].channels;
+                var s = En.call(t, 0, e);
+                this.color = $n(s, e), this.valpha = "number" == typeof t[e] ? t[e] : 1;
             } else if ("number" == typeof t) t &= 16777215, this.model = "rgb", this.color = [ t >> 16 & 255, t >> 8 & 255, 255 & t ], 
             this.valpha = 1; else {
                 this.valpha = 1;
@@ -8603,11 +8610,11 @@
                 var h = o.sort().join("");
                 if (!(h in Rn)) throw new Error("Unable to parse color from object: " + JSON.stringify(t));
                 this.model = Rn[h];
-                var a = En[this.model].labels, l = [];
+                var a = Un[this.model].labels, l = [];
                 for (n = 0; n < a.length; n++) l.push(t[a[n]]);
-                this.color = Gn(l);
+                this.color = $n(l);
             }
-            if (Nn[this.model]) for (e = En[this.model].channels, n = 0; n < e; n++) {
+            if (Nn[this.model]) for (e = Un[this.model].channels, n = 0; n < e; n++) {
                 var u = Nn[this.model][n];
                 u && (this.color[n] = u(this.color[n]));
             }
@@ -8630,7 +8637,7 @@
         function Vn(t) {
             return Array.isArray(t) ? t : [ t ];
         }
-        function Gn(t, i) {
+        function $n(t, i) {
             for (var n = 0; n < i; n++) "number" != typeof t[n] && (t[n] = 0);
             return t;
         }
@@ -8653,7 +8660,7 @@
                 return 1 === this.valpha ? this.color.slice() : this.color.concat(this.valpha);
             },
             object: function() {
-                for (var t = {}, i = En[this.model].channels, n = En[this.model].labels, e = 0; e < i; e++) t[n[e]] = this.color[e];
+                for (var t = {}, i = Un[this.model].channels, n = Un[this.model].labels, e = 0; e < i; e++) t[n[e]] = this.color[e];
                 return 1 !== this.valpha && (t.alpha = this.valpha), t;
             },
             unitArray: function() {
@@ -8703,7 +8710,7 @@
             a: Wn("lab", 1),
             b: Wn("lab", 2),
             keyword: function(t) {
-                return arguments.length ? new zn(t) : En[this.model].keyword(this.color);
+                return arguments.length ? new zn(t) : Un[this.model].keyword(this.color);
             },
             hex: function(t) {
                 return arguments.length ? new zn(t) : Ln.to.hex(this.rgb().round().color);
@@ -8781,20 +8788,20 @@
                 var n = t.rgb(), e = this.rgb(), r = void 0 === i ? .5 : i, s = 2 * r - 1, o = n.alpha() - e.alpha(), h = ((s * o == -1 ? s : (s + o) / (1 + s * o)) + 1) / 2, a = 1 - h;
                 return zn.rgb(h * n.red() + a * e.red(), h * n.green() + a * e.green(), h * n.blue() + a * e.blue(), n.alpha() * r + e.alpha() * (1 - r));
             }
-        }, Object.keys(En).forEach((function(t) {
+        }, Object.keys(Un).forEach((function(t) {
             if (-1 === jn.indexOf(t)) {
-                var i = En[t].channels;
+                var i = Un[t].channels;
                 zn.prototype[t] = function() {
                     if (this.model === t) return new zn(this);
                     if (arguments.length) return new zn(arguments, t);
                     var n = "number" == typeof arguments[i] ? i : this.valpha;
-                    return new zn(Vn(En[this.model][t].raw(this.color)).concat(n), t);
+                    return new zn(Vn(Un[this.model][t].raw(this.color)).concat(n), t);
                 }, zn[t] = function(n) {
-                    return "number" == typeof n && (n = Gn(Un.call(arguments), i)), new zn(n, t);
+                    return "number" == typeof n && (n = $n(En.call(arguments), i)), new zn(n, t);
                 };
             }
         }));
-        var $n = zn;
+        var Gn = zn;
         const Jn = 14;
         class qn extends xt {
             static splitPointSymbol(t, i = 0) {
@@ -9043,20 +9050,20 @@
                         if (wi(t.charAt(n).charCodeAt(0))) i = 0; else if (i++, i >= 1) return !1;
                     }
                     return !0;
-                }(t.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: c, textSizeFn: f, textHaloFillFn: d, textHaloRadiusFn: y, textHaloOpacityFn: p, textDxFn: m, textDyFn: v, textPitchAlignmentFn: g, textRotationAlignmentFn: w, textRotationFn: b, textAllowOverlapFn: x, textIgnorePlacementFn: F, textOpacityFn: A, markerWidthFn: k, markerHeightFn: _, markerDxFn: P, markerDyFn: S, markerPitchAlignmentFn: O, markerRotationAlignmentFn: I, markerRotationFn: C, markerAllowOverlapFn: T, markerIgnorePlacementFn: D, markerOpacityFn: L} = this.j;
-                let E, j, R, N, z, W, H, V, G, $, J, q, B, X, Z, Y, K;
+                }(t.getIconAndGlyph().glyph.text) ? 1 : 0, {textFillFn: c, textSizeFn: f, textHaloFillFn: d, textHaloRadiusFn: y, textHaloOpacityFn: p, textDxFn: m, textDyFn: v, textPitchAlignmentFn: g, textRotationAlignmentFn: w, textRotationFn: b, textAllowOverlapFn: x, textIgnorePlacementFn: F, textOpacityFn: A, markerWidthFn: k, markerHeightFn: _, markerDxFn: P, markerDyFn: S, markerPitchAlignmentFn: O, markerRotationAlignmentFn: C, markerRotationFn: I, markerAllowOverlapFn: T, markerIgnorePlacementFn: D, markerOpacityFn: L} = this.j;
+                let U, j, R, N, z, W, H, V, $, G, J, q, B, X, Z, Y, K;
                 if (l) {
                     const i = t.getIconAndGlyph().glyph.font;
-                    E = function(t, i, n) {
+                    U = function(t, i, n) {
                         const e = t.positionedGlyphs, r = [];
                         for (let s = 0; s < e.length; s++) {
                             const o = e[s], h = n[o.glyph];
                             if (!h) continue;
                             const a = h.rect;
                             if (!a) continue;
-                            const l = 4, u = h.metrics.advance / 2, c = h.metrics.height / 2, f = i ? [ o.x + u, 0 ] : [ 0, 0 ], d = i ? [ 0, o.y - c ] : [ o.x + u, o.y - c ], y = h.metrics.left - l - u + d[0], p = h.metrics.top - l + d[1], m = y + a.w, v = p + a.h, g = new U(y, p), w = new U(m, p), b = new U(y, v), M = new U(m, v);
+                            const l = 4, u = h.metrics.advance / 2, c = h.metrics.height / 2, f = i ? [ o.x + u, 0 ] : [ 0, 0 ], d = i ? [ 0, o.y - c ] : [ o.x + u, o.y - c ], y = h.metrics.left - l - u + d[0], p = h.metrics.top - l + d[1], m = y + a.w, v = p + a.h, g = new E(y, p), w = new E(m, p), b = new E(y, v), M = new E(m, v);
                             if (i && o.vertical) {
-                                const t = new U(-u, u), i = -Math.PI / 2, n = new U(5, 0);
+                                const t = new E(-u, u), i = -Math.PI / 2, n = new E(5, 0);
                                 g.O(i, t).m(n), w.O(i, t).m(n), b.O(i, t).m(n), M.O(i, t).m(n);
                             }
                             r.push({
@@ -9070,16 +9077,16 @@
                             });
                         }
                         return r;
-                    }(n.horizontal, a, this.glyphAtlas.positions[i]), c && (j = c(null, h), M(j) ? j = [ 0, 0, 0, 0 ] : (j = Array.isArray(j) ? j.map(t => 255 * t) : $n(j).array(), 
+                    }(n.horizontal, a, this.glyphAtlas.positions[i]), c && (j = c(null, h), M(j) ? j = [ 0, 0, 0, 0 ] : (j = Array.isArray(j) ? j.map(t => 255 * t) : Gn(j).array(), 
                     3 === j.length && j.push(255))), f && (R = f(this.options.zoom, h), null == R && (R = Jn)), 
-                    d && (N = d(null, h), N = Array.isArray(N) ? N.map(t => 255 * t) : $n(N).array(), 
+                    d && (N = d(null, h), N = Array.isArray(N) ? N.map(t => 255 * t) : Gn(N).array(), 
                     3 === N.length && N.push(255)), y && (z = y(null, h)), p && (W = 255 * p(null, h)), 
                     m && (H = m(null, h) || 0), v && (V = v(null, h) || 0), g && (B = +("map" === g(null, h))), 
                     w && (X = +("map" === w(null, h))), b && (Z = wt(b(null, h), 0, 360) * Math.PI / 180);
-                } else E = n ? function(t) {
+                } else U = n ? function(t) {
                     const i = t.image, n = t.top - 1 / i.pixelRatio, e = t.left - 1 / i.pixelRatio, r = t.bottom + 1 / i.pixelRatio, s = t.right + 1 / i.pixelRatio;
                     let o, h, a, l;
-                    return o = new U(e, n), h = new U(s, n), a = new U(s, r), l = new U(e, r), [ {
+                    return o = new E(e, n), h = new E(s, n), a = new E(s, r), l = new E(e, r), [ {
                         tl: o,
                         tr: h,
                         bl: l,
@@ -9094,11 +9101,11 @@
                         glyphOffset: [ 0, 0 ]
                     } ];
                 }(n) : function() {
-                    const t = new U(0, 0), i = new U(0, 0), n = new U(0, 0);
+                    const t = new E(0, 0), i = new E(0, 0), n = new E(0, 0);
                     return [ {
                         tl: t,
                         tr: i,
-                        bl: new U(0, 0),
+                        bl: new E(0, 0),
                         br: n,
                         tex: {
                             x: 0,
@@ -9109,8 +9116,8 @@
                         writingMode: void 0,
                         glyphOffset: [ 0, 0 ]
                     } ];
-                }(), k && (G = k(null, h)), _ && ($ = _(null, h)), P && (J = P(null, h)), S && (q = S(null, h)), 
-                O && (B = +("map" === O(null, h))), I && (X = +("map" === I(null, h))), C && (Z = wt(C(null, h), 0, 360) * Math.PI / 180);
+                }(), k && ($ = k(null, h)), _ && (G = _(null, h)), P && (J = P(null, h)), S && (q = S(null, h)), 
+                O && (B = +("map" === O(null, h))), C && (X = +("map" === C(null, h))), I && (Z = wt(I(null, h), 0, 360) * Math.PI / 180);
                 const Q = T || x;
                 Q && (Y = Q(null, h) || 0);
                 const tt = D || F;
@@ -9118,19 +9125,19 @@
                 tt && (K = tt(null, h) || 0);
                 const nt = A || L;
                 nt && (it = 255 * nt(this.options.zoom, h));
-                const et = this.options.EXTENT, rt = E.length, st = this.getAltitude(t.feature.properties);
+                const et = this.options.EXTENT, rt = U.length, st = this.getAltitude(t.feature.properties);
                 for (let t = 0; t < e.length; t++) {
                     const i = e[t];
                     if (et !== 1 / 0 && gt(i, et)) continue;
-                    const n = i.x, o = i.y, h = E.length;
+                    const n = i.x, o = i.y, h = U.length;
                     for (let t = 0; t < h; t++) {
-                        const e = E[t], {tl: h, tr: c, bl: f, br: d, tex: y} = e;
+                        const e = U[t], {tl: h, tr: c, bl: f, br: d, tex: y} = e;
                         this.K(r, n, o, st, 10 * h.x, 10 * h.y, y.x, y.y + y.h), l && this.tt(r, a, rt, e.glyphOffset, i, u), 
-                        this.it(r, j, R, N, z, W, H, V, G, $, J, q, it, B, X, Z, Y, K), this.K(r, n, o, st, 10 * c.x, 10 * c.y, y.x + y.w, y.y + y.h), 
-                        l && this.tt(r, a, rt, e.glyphOffset, i, u), this.it(r, j, R, N, z, W, H, V, G, $, J, q, it, B, X, Z, Y, K), 
+                        this.it(r, j, R, N, z, W, H, V, $, G, J, q, it, B, X, Z, Y, K), this.K(r, n, o, st, 10 * c.x, 10 * c.y, y.x + y.w, y.y + y.h), 
+                        l && this.tt(r, a, rt, e.glyphOffset, i, u), this.it(r, j, R, N, z, W, H, V, $, G, J, q, it, B, X, Z, Y, K), 
                         this.K(r, n, o, st, 10 * f.x, 10 * f.y, y.x, y.y), l && this.tt(r, a, rt, e.glyphOffset, i, u), 
-                        this.it(r, j, R, N, z, W, H, V, G, $, J, q, it, B, X, Z, Y, K), this.K(r, n, o, st, 10 * d.x, 10 * d.y, y.x + y.w, y.y), 
-                        l && this.tt(r, a, rt, e.glyphOffset, i, u), this.it(r, j, R, N, z, W, H, V, G, $, J, q, it, B, X, Z, Y, K), 
+                        this.it(r, j, R, N, z, W, H, V, $, G, J, q, it, B, X, Z, Y, K), this.K(r, n, o, st, 10 * d.x, 10 * d.y, y.x + y.w, y.y), 
+                        l && this.tt(r, a, rt, e.glyphOffset, i, u), this.it(r, j, R, N, z, W, H, V, $, G, J, q, it, B, X, Z, Y, K), 
                         this.addElements(s, s + 1, s + 2), this.addElements(s + 1, s + 2, s + 3), s += 4;
                         const p = Math.max(Math.abs(n), Math.abs(o), Math.abs(st));
                         p > this.maxPos && (this.maxPos = p);
@@ -9148,12 +9155,12 @@
                 }
             }
             it(t, i, n, e, r, s, o, h, a, l, u, c, f, d, y, p, m, v) {
-                const {textFillFn: g, textSizeFn: w, textHaloFillFn: b, textHaloRadiusFn: M, textHaloOpacityFn: x, textDxFn: F, textDyFn: A, textPitchAlignmentFn: k, textRotationAlignmentFn: _, textRotationFn: P, textAllowOverlapFn: S, textIgnorePlacementFn: O, textOpacityFn: I, markerWidthFn: C, markerHeightFn: T, markerDxFn: D, markerDyFn: L, markerPitchAlignmentFn: E, markerRotationAlignmentFn: U, markerRotationFn: j, markerAllowOverlapFn: R, markerIgnorePlacementFn: N, markerOpacityFn: z} = this.j;
+                const {textFillFn: g, textSizeFn: w, textHaloFillFn: b, textHaloRadiusFn: M, textHaloOpacityFn: x, textDxFn: F, textDyFn: A, textPitchAlignmentFn: k, textRotationAlignmentFn: _, textRotationFn: P, textAllowOverlapFn: S, textIgnorePlacementFn: O, textOpacityFn: C, markerWidthFn: I, markerHeightFn: T, markerDxFn: D, markerDyFn: L, markerPitchAlignmentFn: U, markerRotationAlignmentFn: E, markerRotationFn: j, markerAllowOverlapFn: R, markerIgnorePlacementFn: N, markerOpacityFn: z} = this.j;
                 g && t.aTextFill.push(...i), w && t.aTextSize.push(n), b && t.aTextHaloFill.push(...e), 
                 M && t.aTextHaloRadius.push(r), x && t.aTextHaloOpacity.push(s), F && t.aTextDx.push(o), 
-                A && t.aTextDy.push(h), C && t.aMarkerWidth.push(a), T && t.aMarkerHeight.push(l), 
+                A && t.aTextDy.push(h), I && t.aMarkerWidth.push(a), T && t.aMarkerHeight.push(l), 
                 D && t.aMarkerDx.push(u), L && t.aMarkerDy.push(c);
-                (z || I) && t.aColorOpacity.push(f), (k || E) && t.aPitchAlign.push(d), (U || _) && t.aRotationAlign.push(y), 
+                (z || C) && t.aColorOpacity.push(f), (k || U) && t.aPitchAlign.push(d), (E || _) && t.aRotationAlign.push(y), 
                 (j || P) && t.aRotation.push(9362 * p);
                 const W = R || S, H = N || O;
                 if (W || H) {
@@ -9218,98 +9225,104 @@
                 return !this.options.atlas && o && (r[o] = 1), s;
             }
             getFormat() {
-                const {lineWidthFn: t, lineGapWidthFn: i, lineColorFn: n, lineOpacityFn: e, lineDxFn: r, lineDyFn: s, linePatternAnimSpeedFn: o, linePatternGapFn: h} = this.j, a = [ {
+                const {lineWidthFn: t, lineStrokeWidthFn: i, lineStrokeColorFn: n, lineColorFn: e, lineOpacityFn: r, lineDxFn: s, lineDyFn: o, linePatternAnimSpeedFn: h, linePatternGapFn: a} = this.j, l = [ {
                     type: Int16Array,
                     width: 3,
                     name: "aPosition"
                 } ];
-                if (this.options.center || this.iconAtlas ? a.push({
+                if (this.options.center || this.iconAtlas ? l.push({
                     type: Int8Array,
                     width: 3,
                     name: "aExtrude"
-                }) : a.push({
+                }) : l.push({
                     type: Int8Array,
                     width: 2,
                     name: "aExtrude"
-                }), a.push({
+                }), l.push({
                     type: Uint16Array,
                     width: 1,
                     name: "aLinesofar"
-                }), t && a.push({
+                }), t && l.push({
                     type: Uint8Array,
                     width: 1,
                     name: "aLineWidth"
-                }), i && a.push({
+                }), i && l.push({
                     type: Uint8Array,
                     width: 1,
-                    name: "aLineGapWidth"
-                }), n && a.push({
+                    name: "aLineStrokeWidth"
+                }), e && l.push({
                     type: Uint8Array,
                     width: 4,
                     name: "aColor"
-                }), e && a.push({
+                }), n && l.push({
+                    type: Uint8Array,
+                    width: 4,
+                    name: "aStrokeColor"
+                }), r && l.push({
                     type: Uint8Array,
                     width: 1,
                     name: "aOpacity"
-                }), this.symbol.lineOffset && a.push({
+                }), this.symbol.lineOffset && l.push({
                     type: Int8Array,
                     width: 2,
                     name: "aExtrudeOffset"
-                }), this.dasharrayFn && a.push({
+                }), this.dasharrayFn && l.push({
                     type: Uint8Array,
                     width: 4,
                     name: "aDasharray"
-                }), this.dashColorFn && a.push({
+                }), this.dashColorFn && l.push({
                     type: Uint8Array,
                     width: 4,
                     name: "aDashColor"
                 }), this.iconAtlas) {
                     const t = this.getIconAtlasMaxValue();
-                    a.push({
+                    l.push({
                         type: t > 255 ? Uint16Array : Uint8Array,
                         width: 4,
                         name: "aTexInfo"
                     });
                 }
-                return r && a.push({
+                return s && l.push({
                     type: Int8Array,
                     width: 1,
                     name: "aLineDx"
-                }), s && a.push({
+                }), o && l.push({
                     type: Int8Array,
                     width: 1,
                     name: "aLineDy"
-                }), o && a.push({
+                }), h && l.push({
                     type: Int8Array,
                     width: 1,
                     name: "aLinePatternAnimSpeed"
-                }), h && a.push({
+                }), a && l.push({
                     type: Uint8Array,
                     width: 1,
                     name: "aLinePatternGap"
-                }), a;
+                }), l;
             }
             placeVector(t) {
-                const {lineJoinFn: i, lineCapFn: n, lineWidthFn: e, lineGapWidthFn: r, lineColorFn: s, lineOpacityFn: o, lineJoinPatternModeFn: h, lineDxFn: a, lineDyFn: l, linePatternAnimSpeedFn: u, linePatternGapFn: c} = this.j, f = this.symbol, d = t.feature, y = 3 === d.type, p = this.elements;
-                y && (this.elements = []);
-                let m = f.lineJoin || "miter", v = f.lineCap || "butt";
-                if (i && (m = i(this.options.zoom, d.properties) || "miter"), n && (v = n(this.options.zoom, d.properties) || "butt"), 
+                const {lineJoinFn: i, lineCapFn: n, lineWidthFn: e, lineStrokeWidthFn: r, lineStrokeColorFn: s, lineColorFn: o, lineOpacityFn: h, lineJoinPatternModeFn: a, lineDxFn: l, lineDyFn: u, linePatternAnimSpeedFn: c, linePatternGapFn: f} = this.j, d = this.symbol, y = t.feature, p = 3 === y.type, m = this.elements;
+                p && (this.elements = []);
+                let v = d.lineJoin || "miter", g = d.lineCap || "butt";
+                if (i && (v = i(this.options.zoom, y.properties) || "miter"), n && (g = n(this.options.zoom, y.properties) || "butt"), 
                 e) {
-                    let t = e(this.options.zoom, d.properties);
+                    let t = e(this.options.zoom, y.properties);
                     lt(t) && (t = 4), this.feaLineWidth = t;
-                } else this.feaLineWidth = f.lineWidth;
+                } else this.feaLineWidth = d.lineWidth;
                 if (r) {
-                    let t = r(this.options.zoom, d.properties);
-                    lt(t) && (t = 0), this.feaLineGapWidth = t;
-                } else this.feaLineGapWidth = f.lineGapWidth || 0;
-                if (s && (this.feaColor = s(this.options.zoom, d.properties) || [ 0, 0, 0, 255 ], 
-                M(this.feaColor) ? this.feaColor = [ 0, 0, 0, 0 ] : (Array.isArray(this.feaColor) ? this.feaColor = this.feaColor.map(t => 255 * t) : this.feaColor = $n(this.feaColor).array(), 
-                3 === this.feaColor.length && this.feaColor.push(255))), o) {
-                    let t = o(this.options.zoom, d.properties);
+                    let t = r(this.options.zoom, y.properties);
+                    lt(t) && (t = 0), this.feaLineStrokeWidth = t;
+                } else this.feaLineStrokeWidth = d.lineStrokeWidth || 0;
+                if (o && (this.feaColor = o(this.options.zoom, y.properties) || [ 0, 0, 0, 255 ], 
+                M(this.feaColor) ? this.feaColor = [ 0, 0, 0, 0 ] : (Array.isArray(this.feaColor) ? this.feaColor = this.feaColor.map(t => 255 * t) : this.feaColor = Gn(this.feaColor).array(), 
+                3 === this.feaColor.length && this.feaColor.push(255))), s && (this.feaStrokeColor = s(this.options.zoom, y.properties) || [ 0, 0, 0, 255 ], 
+                M(this.feaStrokeColor) ? this.feaStrokeColor = [ 0, 0, 0, 0 ] : (Array.isArray(this.feaStrokeColor) ? this.feaStrokeColor = this.feaStrokeColor.map(t => 255 * t) : this.feaStrokeColor = Gn(this.feaStrokeColor).array(), 
+                3 === this.feaStrokeColor.length && this.feaStrokeColor.push(255))), h) {
+                    let t = h(this.options.zoom, y.properties);
                     lt(t) && (t = 1), this.feaOpacity = 255 * t;
                 }
                 if (this.dasharrayFn) {
-                    let t = this.dasharrayFn(this.options.zoom, d.properties) || [ 0, 0, 0, 0 ];
+                    let t = this.dasharrayFn(this.options.zoom, y.properties) || [ 0, 0, 0, 0 ];
                     if (t.length < 4) {
                         const i = t;
                         1 === t.length ? t = [ i[0], i[0], i[0], i[0] ] : 2 === t.length ? t = [ i[0], i[1], i[0], i[1] ] : 3 === t.length && (t = [ i[0], i[1], i[2], i[2] ]);
@@ -9317,8 +9330,8 @@
                     this.feaDash = t;
                 }
                 if (this.dashColorFn) {
-                    let t = (this.dashColorFn ? this.dashColorFn(this.options.zoom, d.properties) : this.symbol.lineDashColor) || [ 0, 0, 0, 0 ];
-                    t = Array.isArray(t) ? t.map(t => 255 * t) : $n(t).array(), 3 === t.length && t.push(255), 
+                    let t = (this.dashColorFn ? this.dashColorFn(this.options.zoom, y.properties) : this.symbol.lineDashColor) || [ 0, 0, 0, 0 ];
+                    t = Array.isArray(t) ? t.map(t => 255 * t) : Gn(t).array(), 3 === t.length && t.push(255), 
                     this.feaDashColor = t;
                 }
                 if (this.iconAtlas) {
@@ -9328,33 +9341,33 @@
                         this.feaTexInfo[0] = t[0], this.feaTexInfo[1] = t[1], this.feaTexInfo[2] = n[0] - 1, 
                         this.feaTexInfo[3] = n[1] - 1;
                     } else this.feaTexInfo[0] = this.feaTexInfo[1] = this.feaTexInfo[2] = this.feaTexInfo[3] = 0;
-                    this.feaJoinPatternMode = h ? h(this.options.zoom, d.properties) || 0 : f.lineJoinPatternMode || 0;
+                    this.feaJoinPatternMode = a ? a(this.options.zoom, y.properties) || 0 : d.lineJoinPatternMode || 0;
                 }
-                if (a) {
-                    let t = a(this.options.zoom, d.properties);
+                if (l) {
+                    let t = l(this.options.zoom, y.properties);
                     lt(t) && (t = 0), this.feaLineDx = t;
                 }
-                if (l) {
-                    let t = l(this.options.zoom, d.properties);
+                if (u) {
+                    let t = u(this.options.zoom, y.properties);
                     lt(t) && (t = 0), this.feaLineDy = t;
                 }
-                if (u) {
-                    let t = u(this.options.zoom, d.properties);
+                if (c) {
+                    let t = c(this.options.zoom, y.properties);
                     lt(t) && (t = 0), 0 !== t && (this.properties.hasPatternAnim = 1), this.feaPatternAnimSpeed = t;
                 }
-                if (c) {
-                    let t = c(this.options.zoom, d.properties);
+                if (f) {
+                    let t = f(this.options.zoom, y.properties);
                     lt(t) && (t = 0), this.feaLinePatternGap = t;
                 }
-                const g = this.options.EXTENT;
-                let w = d.geometry;
-                g !== 1 / 0 && 3 !== d.type && (w = Ni(d.geometry, -1, -1, g + 1, g + 1));
-                for (let t = 0; t < w.length; t++) {
+                const w = this.options.EXTENT;
+                let b = y.geometry;
+                w !== 1 / 0 && 3 !== y.type && (b = Ni(y.geometry, -1, -1, w + 1, w + 1));
+                for (let t = 0; t < b.length; t++) {
                     this.offset = this.data.aPosition.length / 3;
-                    const i = w[t];
-                    this.et(i, d, m, v, 2, 1.05), y && (this.rt(p), this.elements = []);
+                    const i = b[t];
+                    this.et(i, y, v, g, 2, 1.05), p && (this.rt(m), this.elements = []);
                 }
-                y && (this.elements = p);
+                p && (this.elements = m);
             }
             st() {
                 return this.iconAtlas && this.feaTexInfo[2] && this.feaTexInfo[3];
@@ -9380,12 +9393,12 @@
                     primitiveLength: 0
                 };
                 let d, y, p, m, v;
-                this.e1 = this.e2 = -1, a && (d = t[l - 2], v = t[u].sub(d).C().T());
+                this.e1 = this.e2 = -1, a && (d = t[l - 2], v = t[u].sub(d).I().T());
                 for (let i = u; i < l; i++) {
                     if (p = i === l - 1 ? a ? t[u + 1] : void 0 : t[i + 1], p && t[i].equals(p)) continue;
-                    v && (m = v), d && (y = d), d = t[i], v = p ? p.sub(d).C().T() : m, m = m || v;
+                    v && (m = v), d && (y = d), d = t[i], v = p ? p.sub(d).I().T() : m, m = m || v;
                     let h = m.add(v);
-                    0 === h.x && 0 === h.y || h.C();
+                    0 === h.x && 0 === h.y || h.I();
                     const g = m.x * v.x + m.y * v.y, w = h.x * v.x + h.y * v.y, b = 0 !== w ? 1 / w : 1 / 0, M = 2 * Math.sqrt(2 - 2 * w), x = w < Bn && y && p, F = m.x * v.y - m.y * v.x > 0;
                     if (!o && x && i > u) {
                         const t = d.dist(y);
@@ -9418,7 +9431,7 @@
                                     const t = n - .5;
                                     n += n * t * (n - 1) * ((1.0904 + g * (g * (3.55645 - 1.43519 * g) - 3.2452)) * t * t + (.848013 + g * (.215638 * g - 1.06021)));
                                 }
-                                const e = v.sub(m).k(n).m(m).C().k(F ? -1 : 1);
+                                const e = v.sub(m).k(n).m(m).I().k(F ? -1 : 1);
                                 this.addHalfVertex(d, e.x, e.y, !1, F, 0, f);
                             }
                         }
@@ -9456,7 +9469,7 @@
                 s ? this.e2 = l : this.e1 = l;
             }
             fillData(t, i, n, e, r, s, o, h) {
-                const {lineWidthFn: a, lineGapWidthFn: l, lineColorFn: u, lineOpacityFn: c, lineDxFn: f, lineDyFn: d, linePatternAnimSpeedFn: y, linePatternGapFn: p} = this.j;
+                const {lineWidthFn: a, lineStrokeWidthFn: l, lineStrokeColorFn: u, lineColorFn: c, lineOpacityFn: f, lineDxFn: d, lineDyFn: y, linePatternAnimSpeedFn: p, linePatternGapFn: m} = this.j;
                 if (this.options.center || (i = (i << 1) + (s ? 1 : 0), n = (n << 1) + (o ? 1 : 0)), 
                 t.aPosition.push(i, n, 0), t.aExtrude.push(63 * e, 63 * r), this.options.center || this.iconAtlas) {
                     let i = 0;
@@ -9464,11 +9477,12 @@
                     t.aExtrude.push(i);
                 }
                 t.aLinesofar.push(h), a && t.aLineWidth.push(Math.round(2 * this.feaLineWidth)), 
-                l && t.aLineGapWidth.push(Math.round(2 * this.feaLineGapWidth)), u && t.aColor.push(...this.feaColor), 
-                c && t.aOpacity.push(this.feaOpacity), this.dasharrayFn && t.aDasharray.push(...this.feaDash), 
-                this.dashColorFn && t.aDashColor.push(...this.feaDashColor), this.iconAtlas && t.aTexInfo.push(...this.feaTexInfo), 
-                f && t.aLineDx.push(this.feaLineDx), d && t.aLineDy.push(this.feaLineDy), y && t.aLinePatternAnimSpeed.push(127 * this.feaPatternAnimSpeed), 
-                p && t.aLinePatternGap.push(10 * this.feaLinePatternGap), this.maxPos = Math.max(this.maxPos, Math.abs(i) + 1, Math.abs(n) + 1);
+                l && t.aLineStrokeWidth.push(Math.round(2 * this.feaLineStrokeWidth)), c && t.aColor.push(...this.feaColor), 
+                u && t.aStrokeColor.push(...this.feaStrokeColor), f && t.aOpacity.push(this.feaOpacity), 
+                this.dasharrayFn && t.aDasharray.push(...this.feaDash), this.dashColorFn && t.aDashColor.push(...this.feaDashColor), 
+                this.iconAtlas && t.aTexInfo.push(...this.feaTexInfo), d && t.aLineDx.push(this.feaLineDx), 
+                y && t.aLineDy.push(this.feaLineDy), p && t.aLinePatternAnimSpeed.push(127 * this.feaPatternAnimSpeed), 
+                m && t.aLinePatternGap.push(10 * this.feaLinePatternGap), this.maxPos = Math.max(this.maxPos, Math.abs(i) + 1, Math.abs(n) + 1);
             }
             addElements(t, i, n) {
                 super.addElements(this.offset + t, this.offset + i, this.offset + n);
@@ -9761,13 +9775,13 @@
        * https://github.com/Turfjs/turf
        * MIT LICENSE
        */        const Se = [], Oe = [];
-        function Ie(t, i) {
+        function Ce(t, i) {
             var n, e, r, s, o, h, a;
             for (e = 1; e <= 8; e *= 2) {
                 for (n = [], s = !(Te(r = t[t.length - 1], i) & e), o = 0; o < t.length; o++) {
                     if ((a = !(Te(h = t[o], i) & e)) !== s) {
-                        const t = Ce(r, h, e, i);
-                        void 0 !== h.x ? n.push(new U(t[0], t[1])) : n.push(t);
+                        const t = Ie(r, h, e, i);
+                        void 0 !== h.x ? n.push(new E(t[0], t[1])) : n.push(t);
                     }
                     a && n.push(h), r = h, s = a;
                 }
@@ -9775,7 +9789,7 @@
             }
             return n;
         }
-        function Ce(t, i, n, e) {
+        function Ie(t, i, n, e) {
             return Se[0] = void 0 === t.x ? t[0] : t.x, Se[1] = void 0 === t.y ? t[1] : t.y, 
             t = Se, Oe[0] = void 0 === i.x ? i[0] : i.x, Oe[1] = void 0 === i.y ? i[1] : i.y, 
             i = Oe, 8 & n ? [ t[0] + (i[0] - t[0]) * (e[3] - t[1]) / (i[1] - t[1]), e[3] ] : 4 & n ? [ t[0] + (i[0] - t[0]) * (e[1] - t[1]) / (i[1] - t[1]), e[1] ] : 2 & n ? [ e[2], t[1] + (i[1] - t[1]) * (e[2] - t[0]) / (i[0] - t[0]) ] : 1 & n ? [ e[0], t[1] + (i[1] - t[1]) * (e[0] - t[0]) / (i[0] - t[0]) ] : null;
@@ -9841,7 +9855,7 @@
             ct(t, i) {
                 let n, e, r, s;
                 const {polygonFillFn: o, polygonOpacityFn: h, uvScaleFn: a, uvOffsetFn: l} = this.j;
-                o && (n = o(this.options.zoom, i.properties) || [ 255, 255, 255, 255 ], M(n) ? n = [ 0, 0, 0, 0 ] : (n = Array.isArray(n) ? n.map(t => 255 * t) : $n(n).array(), 
+                o && (n = o(this.options.zoom, i.properties) || [ 255, 255, 255, 255 ], M(n) ? n = [ 0, 0, 0, 0 ] : (n = Array.isArray(n) ? n.map(t => 255 * t) : Gn(n).array(), 
                 3 === n.length && n.push(255))), h && (e = h(this.options.zoom, i.properties), lt(e) && (e = 1), 
                 e *= 255), a && (r = a(this.options.zoom, i.properties), lt(r) && (r = [ 1, 1 ]), 
                 r = [ 255 * r[0], 255 * r[1] ]), l && (s = l(this.options.zoom, i.properties), lt(s) && (s = [ 0, 0 ]), 
@@ -9859,7 +9873,7 @@
                     const i = c[t], o = this.data.aPosition.length / 3, h = [], a = [];
                     for (let t = 0; t < i.length; t++) {
                         let o = i[t];
-                        if (this.options.EXTENT !== 1 / 0 && (o = Ie(o, p)), 0 === o.length) continue;
+                        if (this.options.EXTENT !== 1 / 0 && (o = Ce(o, p)), 0 === o.length) continue;
                         0 !== t && a.push(h.length / 2);
                         const l = this.lineElements.length;
                         this.data.aPosition.push(o[0].x, o[0].y, f), u && this.data.aTexInfo.push(...d, ...y), 
@@ -9924,8 +9938,8 @@
        * based on @mapbox/tiny-sdf
        * https://github.com/mapbox/tiny-sdf
        * @License BSD 2-Clause
-       */        var Ee = 1e20;
-        function Ue(t, i, n, e, r, s, o) {
+       */        var Ue = 1e20;
+        function Ee(t, i, n, e, r, s, o) {
             this.fontSize = t || 24, this.buffer = void 0 === i ? 3 : i, this.cutoff = e || .25, 
             this.fontFamily = r || "sans-serif", this.fontWeight = s || "normal", this.fontStyle = o || "normal", 
             this.radius = n || 8;
@@ -9943,25 +9957,25 @@
         }
         function Re(t, i, n, e, r, s, o) {
             var h, a, l, u;
-            for (s[0] = 0, o[0] = -Ee, o[1] = Ee, h = 0; h < e; h++) r[h] = t[i + h * n];
+            for (s[0] = 0, o[0] = -Ue, o[1] = Ue, h = 0; h < e; h++) r[h] = t[i + h * n];
             for (h = 1, a = 0, l = 0; h < e; h++) {
                 do {
                     u = s[a], l = (r[h] - r[u] + h * h - u * u) / (h - u) / 2;
                 } while (l <= o[a] && --a > -1);
-                s[++a] = h, o[a] = l, o[a + 1] = Ee;
+                s[++a] = h, o[a] = l, o[a + 1] = Ue;
             }
             for (h = 0, a = 0; h < e; h++) {
                 for (;o[a + 1] < h; ) a++;
                 u = s[a], t[i + h * n] = r[u] + (h - u) * (h - u);
             }
         }
-        Ue.prototype.draw = function(t, i, n) {
+        Ee.prototype.draw = function(t, i, n) {
             this.ctx.clearRect(0, 0, this.size, this.size), this.ctx.textBaseline = "bottom", 
             this.ctx.fillText(t, this.buffer, n - this.buffer + 1);
             for (var e = this.ctx.getImageData(0, 0, i, n), r = new Uint8ClampedArray(i * n), s = 0; s < i * n; s++) {
                 var o = e.data[4 * s + 3] / 255;
-                this.gridOuter[s] = 1 === o ? 0 : 0 === o ? Ee : Math.pow(Math.max(0, .5 - o), 2), 
-                this.gridInner[s] = 1 === o ? Ee : 0 === o ? 0 : Math.pow(Math.max(0, o - .5), 2);
+                this.gridOuter[s] = 1 === o ? 0 : 0 === o ? Ue : Math.pow(Math.max(0, .5 - o), 2), 
+                this.gridInner[s] = 1 === o ? Ue : 0 === o ? 0 : Math.pow(Math.max(0, o - .5), 2);
             }
             for (je(this.gridOuter, i, n, this.f, this.v, this.z), je(this.gridInner, i, n, this.f, this.v, this.z), 
             s = 0; s < i * n; s++) {
@@ -9973,7 +9987,7 @@
         let Ne = 0;
         class ze {
             constructor(t, i = 15, n) {
-                this.entries = {}, this.Et = {}, this.yt = new Le(2048, (function() {})), this.Ut = t, 
+                this.entries = {}, this.Ut = {}, this.yt = new Le(2048, (function() {})), this.Et = t, 
                 this.jt = i, this.Rt = n;
             }
             getGlyphs(t, i) {
@@ -9992,7 +10006,7 @@
                             const t = i.split(" "), c = r && "normal" === t[0] && !wi(+u), f = i + ":" + u + ":" + c;
                             let d;
                             if (this.yt.has(f) ? d = this.yt.get(f) : (d = this.Nt(n[i], t, u, c), this.yt.add(f, d), 
-                            a++), d = We(d), s[i][u] = d, h.push(d.bitmap.data.buffer), a > this.jt) return void this.Ut(o(l, s, h));
+                            a++), d = We(d), s[i][u] = d, h.push(d.bitmap.data.buffer), a > this.jt) return void this.Et(o(l, s, h));
                         }
                     }
                     i(null, {
@@ -10014,7 +10028,7 @@
                 if (!h) {
                     let i = "400";
                     /bolder/i.test(s) ? i = "1000" : /bold/i.test(s) ? i = "900" : /medium/i.test(s) ? i = "500" : /light/i.test(s) && (i = "200"), 
-                    h = t.tinySDF = new Ue(24, a, 8, .25, o, i, r);
+                    h = t.tinySDF = new Ee(24, a, 8, .25, o, i, r);
                 }
                 const u = String.fromCharCode(n), c = h.ctx.measureText(u), f = Math.round(c.width), d = h.draw(String.fromCharCode(n), f + 2 * a, 24 + 2 * a);
                 if (Ne < 4) {
@@ -10162,9 +10176,9 @@
         function Ve(t) {
             return 3 === t.length && t.push(1), t.reduce((t, i, n) => t += n < 3 ? 255 * i + "," : i + ")", "rgba(");
         }
-        var Ge = Object.freeze({
+        var $e = Object.freeze({
             __proto__: null,
-            clipPolygon: Ie,
+            clipPolygon: Ce,
             calculateSignedArea: mt,
             getFeaAltitudeAndHeight: function(t, i, n, e, r, s, o) {
                 const h = vt(t.properties, n, e), a = h * i;
@@ -10175,9 +10189,9 @@
                     height: l
                 };
             },
-            convertRTLText: Ei
+            convertRTLText: Ui
         });
-        const $e = {
+        const Ge = {
             polygonPatternFile: 1,
             markerFile: 1,
             markerPlacement: 1,
@@ -10201,13 +10215,13 @@
         }, qe = {
             lineDasharray: 1
         };
-        Object.assign(Je, $e), Object.assign(qe, $e);
+        Object.assign(Je, Ge), Object.assign(qe, Ge);
         const Be = [ "GeoJSONVectorTileLayer" ];
         class Xe extends r.worker.Actor {
             constructor(t, i) {
                 super(t);
                 const n = i.getMap().id;
-                this.Gt = i, this.$t = n, this.Jt = "vt_" + r.Util.UID();
+                this.$t = i, this.Gt = n, this.Jt = "vt_" + r.Util.UID();
                 const e = i.getJSONType();
                 this.qt = Be.indexOf(e) >= 0, this.Bt = {}, this.Xt = new He({
                     iconErrorUrl: i.options.iconErrorUrl,
@@ -10222,8 +10236,8 @@
                 t(null);
             }
             addLayer(t) {
-                const i = this.Gt, n = i.getWorkerOptions() || {}, e = this.Jt, r = i.getJSONType(), s = {
-                    mapId: this.$t,
+                const i = this.$t, n = i.getWorkerOptions() || {}, e = this.Jt, r = i.getJSONType(), s = {
+                    mapId: this.Gt,
                     layerId: e,
                     command: "addLayer",
                     params: {
@@ -10235,7 +10249,7 @@
             }
             abortTile(t, i) {
                 const n = this.Jt, e = {
-                    mapId: this.$t,
+                    mapId: this.Gt,
                     layerId: n,
                     command: "abortTile",
                     params: {
@@ -10246,7 +10260,7 @@
             }
             removeLayer(t) {
                 const i = this.Jt, n = {
-                    mapId: this.$t,
+                    mapId: this.Gt,
                     layerId: i,
                     command: "removeLayer"
                 };
@@ -10254,7 +10268,7 @@
             }
             updateStyle(t, i) {
                 const n = this.Jt, e = {
-                    mapId: this.$t,
+                    mapId: this.Gt,
                     layerId: n,
                     command: "updateStyle",
                     params: t
@@ -10263,7 +10277,7 @@
             }
             updateOptions(t, i) {
                 const n = this.Jt, e = {
-                    mapId: this.$t,
+                    mapId: this.Gt,
                     layerId: n,
                     command: "updateOptions",
                     params: t
@@ -10272,7 +10286,7 @@
             }
             loadTile(t, i) {
                 const n = this.Jt, e = {
-                    mapId: this.$t,
+                    mapId: this.Gt,
                     layerId: n,
                     command: "loadTile",
                     params: {
@@ -10301,7 +10315,7 @@
             }
             setData(t, i) {
                 const n = this.Jt, e = {
-                    mapId: this.$t,
+                    mapId: this.Gt,
                     layerId: n,
                     command: "setData",
                     params: {
@@ -10599,14 +10613,14 @@
                 return ir;
             }
             draw(t, i) {
-                this.Ii !== t && (this.Mi = !1, this.Ci());
+                this.Ci !== t && (this.Mi = !1, this.Ii());
                 const n = this.layer;
                 this.prepareCanvas(), this.ready && n.ready ? (this.plugins || this.Fi(), n.isDefaultRender() || this.plugins.length || this.featurePlugins.length ? (n.options.collision && (n.clearCollisionIndex(), 
                 n.clearBackgroundCollisionIndex()), this.Ti = t, this.Di = this.Li(this.getMap().getGLRes()), 
-                this.Ei = i || {}, this.Ui(t), super.draw(t), this.Ii !== t && this.ji(t), this.Ri(t), 
-                this.completeRender(), this.Ii = t) : this.completeRender()) : this.completeRender();
+                this.Ui = i || {}, this.Ei(t), super.draw(t), this.Ci !== t && this.ji(t), this.Ri(t), 
+                this.completeRender(), this.Ci = t) : this.completeRender()) : this.completeRender();
             }
-            Ci() {
+            Ii() {
                 this.ki().forEach((t, i) => {
                     t.renderIndex = i;
                 });
@@ -10640,10 +10654,10 @@
                 }), t;
             }
             isForeground(t) {
-                return !(!this.Gi || !this.Gi[t.properties.tile.id]);
+                return !(!this.$i || !this.$i[t.properties.tile.id]);
             }
             isBackTile(t) {
-                return !(!this.$i || !this.$i[t]);
+                return !(!this.Gi || !this.Gi[t]);
             }
             loadTile(t) {
                 const {url: i} = t, n = this.pi[i];
@@ -10786,8 +10800,8 @@
                 }
                 return this.plugins;
             }
-            Ui(t) {
-                const i = this.layer.isDefaultRender() && this.Ft, n = this.Ei;
+            Ei(t) {
+                const i = this.layer.isDefaultRender() && this.Ft, n = this.Ui;
                 this.ki().forEach((e, r) => {
                     if (!e) return;
                     if (!this.Vi(r)) return;
@@ -10805,7 +10819,7 @@
                 });
             }
             Ri(t) {
-                const i = this.Ei, n = i.renderMode, e = i && i.renderTarget && i.renderTarget.fbo, r = this.getMap().cameraPosition, s = this.ki();
+                const i = this.Ui, n = i.renderMode, e = i && i.renderTarget && i.renderTarget.fbo, r = this.getMap().cameraPosition, s = this.ki();
                 this.layer.options.collision ? s.forEach(i => {
                     if (!hr(i)) return;
                     if (n && "default" !== n && !i.supportRenderMode(n)) return;
@@ -10817,7 +10831,7 @@
                     const e = this.Qi(i, 0, r, t);
                     i.prepareRender(e);
                 });
-                const o = !i.timestamp || i.isFinalRender, h = this.Ii !== i.timestamp;
+                const o = !i.timestamp || i.isFinalRender, h = this.Ci !== i.timestamp;
                 let a = !1;
                 if (h) {
                     const i = -this.layer.getPolygonOffset(), n = this.Qi(null, i, r, t);
@@ -10839,7 +10853,7 @@
             }
             nn() {
                 if (this.layer.options.debug) {
-                    const t = this.Ei, i = [], e = this.getMap().projViewMatrix;
+                    const t = this.Ui, i = [], e = this.getMap().projViewMatrix;
                     for (const r in this.tilesInView) {
                         const s = this.tilesInView[r].info, o = s.transform, h = this.tilesInView[r].image.extent, a = t && t.renderTarget;
                         o && h && this.Pi.draw(this.getDebugInfo(s.id), n.mat4.multiply(i, e, o), this.layer.getTileSize().width, h, a && a.fbo);
@@ -10848,7 +10862,7 @@
             }
             tn(t) {
                 if (!t) return !0;
-                const i = t.renderIndex, n = this.Ei, e = this.Vi(i), r = n && n.states && n.states.includesChanged, s = this.en(t.painter.scene.getMeshes());
+                const i = t.renderIndex, n = this.Ui, e = this.Vi(i), r = n && n.states && n.states.includesChanged, s = this.en(t.painter.scene.getMeshes());
                 return !e || !r && !s ? 0 : s ? 2 : 1;
             }
             Qi(t, i, n, e) {
@@ -10861,12 +10875,12 @@
                     polygonOffsetIndex: i,
                     cameraPosition: n,
                     timestamp: e
-                }, s = this.Ei;
+                }, s = this.Ui;
                 return s && P(r, s), r;
             }
             en(t) {
                 if (!t) return !1;
-                const i = this.Ei && this.Ei.sceneFilter;
+                const i = this.Ui && this.Ui.sceneFilter;
                 return i ? t.filter(i).length > 0 : t.length > 0;
             }
             in(t) {
@@ -10893,10 +10907,10 @@
             onDrawTileStart(t) {
                 super.onDrawTileStart(t);
                 const {tiles: i, childTiles: n, parentTiles: e} = t;
-                this.Gi = {}, this.$i = {};
-                for (let t = 0; t < i.length; t++) this.Gi[i[t].info.id] = 1;
-                for (let t = 0; t < n.length; t++) this.$i[n[t].info.id] = 1;
-                for (let t = 0; t < e.length; t++) this.$i[e[t].info.id] = 1;
+                this.$i = {}, this.Gi = {};
+                for (let t = 0; t < i.length; t++) this.$i[i[t].info.id] = 1;
+                for (let t = 0; t < n.length; t++) this.Gi[n[t].info.id] = 1;
+                for (let t = 0; t < e.length; t++) this.Gi[e[t].info.id] = 1;
                 this.sn = t;
             }
             isEnableTileStencil() {
@@ -10927,7 +10941,7 @@
                         timestamp: this.Ti,
                         tileInfo: t,
                         tileZoom: this._tileZoom,
-                        bloom: this.Ei && this.Ei.bloom
+                        bloom: this.Ui && this.Ui.bloom
                     }, u = e.paintTile(l);
                     n[h].geometry && (o[h] = 1), !this.Mi && (u.retire || u.redraw) && e.supportRenderMode("taa") && (this.Mi = !0), 
                     u.redraw && this.setToRedraw();
@@ -11248,7 +11262,7 @@
                 }, document.getElementsByTagName("head")[0].appendChild(e), this;
             },
             get: function(t, i, n) {
-                if (I(i)) {
+                if (C(i)) {
                     const t = n;
                     n = i, i = t;
                 }
@@ -11260,8 +11274,8 @@
                         method: i.method || "GET",
                         referrerPolicy: "origin"
                     };
-                    return e && (C(i.body) || (s.body = JSON.stringify(i.body))), C(i.headers) || (s.headers = i.headers), 
-                    C(i.credentials) || (s.credentials = i.credentials), fetch(t, s).then(t => {
+                    return e && (I(i.body) || (s.body = JSON.stringify(i.body))), I(i.headers) || (s.headers = i.headers), 
+                    I(i.credentials) || (s.credentials = i.credentials), fetch(t, s).then(t => {
                         const e = this.s(t, i.returnJSON, i.responseType);
                         e.message ? n(e) : e.then(e => {
                             "arraybuffer" === i.responseType ? n(null, {
@@ -11327,14 +11341,14 @@
                 return i.onreadystatechange = yr.u(i, t), i;
             },
             getArrayBuffer(t, i, n) {
-                if (I(i)) {
+                if (C(i)) {
                     const t = n;
                     n = i, i = t;
                 }
                 return i || (i = {}), i.responseType = "arraybuffer", yr.get(t, i, n);
             },
             getJSON: function(t, i, n) {
-                if (I(i)) {
+                if (C(i)) {
                     const t = n;
                     n = i, i = t;
                 }
@@ -11595,7 +11609,7 @@
                             break;
                         }
                     }
-                    for (const t in n) E(n, t) && (!r.Util.isObject(n[t]) || Array.isArray(n[t]) || n[t].stops ? s[t] = n[t] : (s[t] || (s[t] = {}), 
+                    for (const t in n) U(n, t) && (!r.Util.isObject(n[t]) || Array.isArray(n[t]) || n[t].stops ? s[t] = n[t] : (s[t] || (s[t] = {}), 
                     P(s[t], n[t])));
                     let c = a.options.style;
                     Array.isArray(c) || (c = a.Ai(t, a.options.style));
@@ -11698,7 +11712,7 @@
                 return this.Pn && this.Pn.clear(), this;
             }
             getDataSchema(t) {
-                return this.Sn || (this.Sn = {}), C(t) || this.Sn[t] || (this.Sn[t] = {}), C(t) ? this.Sn : this.Sn[t];
+                return this.Sn || (this.Sn = {}), I(t) || this.Sn[t] || (this.Sn[t] = {}), I(t) ? this.Sn : this.Sn[t];
             }
             onRemove() {
                 super.onRemove();
@@ -11739,7 +11753,7 @@
             return !(!t || !t.properties);
         }
         function gr(t) {
-            return t ? (Array.isArray(t) || (t = $n(t).unitArray()), 3 === t.length && t.push(1), 
+            return t ? (Array.isArray(t) || (t = Gn(t).unitArray()), 3 === t.length && t.push(1), 
             t) : null;
         }
         function wr(t, i) {
@@ -11782,13 +11796,13 @@
                 if (this.options.data = t, t && (S(t) || t.url)) {
                     return !!this.getRenderer() && this.On(), this;
                 }
-                return this.In(t), this.On(), this;
+                return this.Cn(t), this.On(), this;
             }
-            In(t) {
+            Cn(t) {
                 if (this.options.convertFn) {
                     t = new Function("data", this.options.convertFn + "\nreturn convert(data)")(t);
                 }
-                return this.features = t, this.Cn(), this;
+                return this.features = t, this.In(), this;
             }
             On() {
                 const t = this.getRenderer();
@@ -11811,7 +11825,7 @@
             Dn(t) {
                 this.Tn = new r.Extent(...t);
             }
-            En(t, i) {
+            Un(t, i) {
                 S(t) ? yr.getJSON(t, i) : yr.getJSON(t.url, t, i);
             }
             getData() {
@@ -11826,7 +11840,7 @@
             static fromJSON(t) {
                 return t && "GeoJSONVectorTileLayer" === t.type ? new Ar(t.id, t.options) : null;
             }
-            Cn() {
+            In() {
                 if (!this.features) return;
                 if (this.features = JSON.parse(JSON.stringify(this.features)), !this.features) return;
                 let t = 0;
@@ -11939,7 +11953,7 @@
             }
         });
         const Sr = new r.Point(0, 0), Or = "_vector3dlayer_id";
-        function Ir(t, i, n) {
+        function Cr(t, i, n) {
             const e = "__fea_idx".trim(), s = t.getMap(), o = s.getGLRes();
             let h = t.getCoordinates();
             const a = [];
@@ -11968,7 +11982,7 @@
                 const r = [], s = c.length;
                 for (let o = 0; o < s; o++) {
                     const h = o === s - 1 ? u : P({}, u);
-                    for (const t in c[o]) E(c[o], t) && (h["_symbol_" + t] = c[o][t]);
+                    for (const t in c[o]) U(c[o], t) && (h["_symbol_" + t] = c[o][t]);
                     const d = n && n[o] ? n[o].id : i.pickingId++, y = {
                         type: l,
                         id: f,
@@ -11981,7 +11995,7 @@
                 }
                 return r;
             }
-            for (const t in c) E(c, t) && (u["_symbol_" + t] = c[t]);
+            for (const t in c) U(c, t) && (u["_symbol_" + t] = c[t]);
             const d = n ? n.id : i.pickingId++, y = {
                 type: l,
                 id: f,
@@ -11992,7 +12006,7 @@
             };
             return y[e] = d, y;
         }
-        const Cr = {
+        const Ir = {
             markerFile: {
                 type: "identity",
                 default: void 0,
@@ -12230,16 +12244,21 @@
                 default: 2,
                 property: "_symbol_lineWidth"
             },
-            lineGapWidth: {
+            lineStrokeWidth: {
                 type: "identity",
                 default: 0,
-                property: "_symbol_lineGapWidth"
+                property: "_symbol_lineStrokeWidth"
             },
             lineColor: {
                 type: "identity",
-                default: 20,
+                default: [ 1, 0, 0, 1 ],
                 property: "_symbol_lineColor"
             },
+            lineStrokeColor: {
+                type: "identity",
+                default: [ 0, 0, 0, 0 ],
+                property: "_symbol_lineStrokeColor"
+            },
             lineDx: {
                 type: "identity",
                 default: 0,
@@ -12297,15 +12316,15 @@
             }
         };
         let Lr = 1;
-        const Er = "_symbol_", Ur = "__fea_idx".trim();
+        const Ur = "_symbol_", Er = "__fea_idx".trim();
         let jr = new Float32Array(1);
         class Rr extends r.renderer.CanvasRenderer {
             constructor(...t) {
-                super(...t), this.features = {}, this.Un = {}, this.ui = 1, this.jn = {}, this.Rn = {}, 
+                super(...t), this.features = {}, this.En = {}, this.ui = 1, this.jn = {}, this.Rn = {}, 
                 this.Nn = {}, this.zn = {}, this.Wn = {}, this.Hn = !0, this.Vn = {
                     id: 0,
                     pickingId: 0
-                }, this.Gn = P({}, Cr, Tr), this.$n = {};
+                }, this.$n = P({}, Ir, Tr), this.Gn = {};
             }
             hasNoAARendering() {
                 return !0;
@@ -12317,7 +12336,7 @@
             draw(t, i) {
                 const n = this.layer;
                 if (this.prepareCanvas(), this.Di = this.Li(this.getMap().getGLRes()), this.Hn) this.buildMesh(), 
-                this.Bn(), this.Xn(), this.$n = {}, this.Zn = !1, this.Hn = !1, this.Yn = !1; else if (this.Zn) {
+                this.Bn(), this.Xn(), this.Gn = {}, this.Zn = !1, this.Hn = !1, this.Yn = !1; else if (this.Zn) {
                     const t = this.atlas, i = this.Kn, n = this.Qn;
                     delete this.atlas, delete this.Kn, delete this.Qn, this.buildMesh(t), this.Bn(i), 
                     this.Xn(n), this.Zn = !1, this.Yn = !1;
@@ -12327,7 +12346,7 @@
                 }
                 if (!this.meshes && !this.te && !this.ie) return void this.completeRender();
                 this.ne && (this.ee(), this.ne = !1), this.re(), n.options.collision && n.clearCollisionIndex(), 
-                this.Ti = t, this.Ei = i || {};
+                this.Ti = t, this.Ui = i || {};
                 const e = this.se();
                 let r = 0;
                 this.painter && this.meshes && (this.painter.startFrame(e), this.painter.addMesh(this.meshes, null, {
@@ -12358,7 +12377,7 @@
                     cameraPosition: this.getMap().cameraPosition,
                     timestamp: this.getFrameTimestamp()
                 };
-                return this.Ei && P(t, this.Ei), t;
+                return this.Ui && P(t, this.Ui), t;
             }
             drawOnInteracting(t, i, n) {
                 this.draw(i, n);
@@ -12482,7 +12501,7 @@
                 delete this.te));
                 const {features: r, center: s} = this.he(), o = [], h = [];
                 for (let t = 0; t < r.length; t++) {
-                    const i = r[t][Ur];
+                    const i = r[t][Er];
                     this.Nn[i] && o.push(r[t]), this.zn[i] && h.push(r[t]);
                 }
                 if (!o.length && !h.length) return void (this.te && (this.Jn.deleteMesh(this.te), 
@@ -12532,7 +12551,7 @@
                     defaultAltitude: 0
                 }, s = P({}, r);
                 r.allowEmptyPack = 1;
-                return qn.splitPointSymbol(this.Gn).map((n, e) => new qn(0 === e ? t : i, n, 0 === e ? r : s).load());
+                return qn.splitPointSymbol(this.$n).map((n, e) => new qn(0 === e ? t : i, n, 0 === e ? r : s).load());
             }
             updateMesh() {}
             ge(t) {
@@ -12552,7 +12571,7 @@
                     !1;
                 }
                 for (let t = 0; t < r.length; t++) {
-                    const i = r[t][Ur];
+                    const i = r[t][Er];
                     this.Nn[i] && s.push(r[t]), this.zn[i] && o.push(r[t]);
                 }
                 const u = r[0].id, c = this.pe(s, o, this.Kn, this.ye), f = this.te;
@@ -12612,7 +12631,7 @@
                         if (!(s < 0)) {
                             if (t[n]) {
                                 const i = t[n].data.featureIds.length, r = t[n].data.data;
-                                for (const t in r) if (E(r, t)) {
+                                for (const t in r) if (U(r, t)) {
                                     const n = r[t];
                                     e.geometry.updateSubData(t, n, s * n.length / i);
                                 }
@@ -12654,8 +12673,8 @@
             Ae(t) {
                 const i = [], n = [], e = [];
                 for (let r = 0; r < t.length; r++) {
-                    const s = t[r], o = s.properties && s.properties[Er + "lineDasharray"];
-                    o && Gr(o) ? e.push(s) : s.properties && s.properties[Er + "linePatternFile"] ? n.push(s) : i.push(s);
+                    const s = t[r], o = s.properties && s.properties[Ur + "lineDasharray"];
+                    o && $r(o) ? e.push(s) : s.properties && s.properties[Ur + "linePatternFile"] ? n.push(s) : i.push(s);
                 }
                 return [ n, e, i ];
             }
@@ -12681,15 +12700,15 @@
             we(t) {
                 t[Or] || (t[Or] = this.ui++);
                 const i = t[Or];
-                this.features[i] && this.Se(i), this.features[i] = Ir(t, this.Vn, this.features[i]);
+                this.features[i] && this.Se(i), this.features[i] = Cr(t, this.Vn, this.features[i]);
                 const n = this.features[i];
-                return this.Oe(n), this.features[i][Or] = i, this.Un[i] = t, i;
+                return this.Oe(n), this.features[i][Or] = i, this.En[i] = t, i;
             }
             Oe(t) {
                 if (!t) return;
                 const i = Array.isArray(t) ? t[0].id : t.id;
                 if (this.Rn[i] = t, Array.isArray(t)) for (let i = 0; i < t.length; i++) {
-                    const n = t[i][Ur];
+                    const n = t[i][Er];
                     this.jn[n] = {
                         feature: t[i]
                     };
@@ -12700,7 +12719,7 @@
                 } else {
                     const i = {
                         feature: t
-                    }, n = t[Ur];
+                    }, n = t[Er];
                     Wr(t) && (this.Nn[n] = i), Hr(t) && (this.zn[n] = i), Vr(t) && (this.Wn[n] = i), 
                     this.jn[n] = i;
                 }
@@ -12708,10 +12727,10 @@
             Se(t) {
                 const i = this.features[t];
                 if (Array.isArray(i)) for (let t = 0; t < i.length; t++) {
-                    const n = i[t][Ur], e = i[t].id;
+                    const n = i[t][Er], e = i[t].id;
                     delete this.Rn[e], delete this.jn[n], delete this.Nn[n], delete this.zn[n], delete this.Wn[n];
                 } else {
-                    const t = i[Ur], n = i.id;
+                    const t = i[Er], n = i.id;
                     delete this.Rn[n], delete this.jn[t], delete this.Nn[t], delete this.zn[t], delete this.Wn[t];
                 }
             }
@@ -12722,18 +12741,18 @@
                     const s = r.pick(t, i, n.tolerance);
                     if (s && s.data && s.data.feature) {
                         const t = s.data.feature;
-                        e.push(this.Un[t[Or]]);
+                        e.push(this.En[t[Or]]);
                     }
                 }), e;
             }
-            Ie(t) {
+            Ce(t) {
                 const i = t[Or], n = this.features[i];
-                return Array.isArray(n) ? n[0][Ur] : n[Ur];
+                return Array.isArray(n) ? n[0][Er] : n[Er];
             }
             re() {
                 let t = !1;
-                for (const i in this.$n) {
-                    const n = this.$n[i], e = this.Ie(n);
+                for (const i in this.Gn) {
+                    const n = this.Gn[i], e = this.Ce(n);
                     if (!this.me && (this.Nn[e] || this.zn[e])) {
                         const i = this.ge(n);
                         t = t || i;
@@ -12742,12 +12761,12 @@
                         const i = this.Me(n);
                         t = t || i;
                     }
-                    if (!this.Ce) {
+                    if (!this.Ie) {
                         const i = this.updateMesh(n);
                         t = t || i;
                     }
                 }
-                this.$n = {}, t && (Nr(this), this.layer.fire("partialupdate"));
+                this.Gn = {}, t && (Nr(this), this.layer.fire("partialupdate"));
             }
             Te(t) {
                 this.we(t), this.be(), Nr(this);
@@ -12759,26 +12778,26 @@
                 if (t && t.length) {
                     for (let i = 0; i < t.length; i++) {
                         const n = t[i][Or];
-                        void 0 !== n && (delete this.Un[n], this.Se(n), delete this.features[n]);
+                        void 0 !== n && (delete this.En[n], this.Se(n), delete this.features[n]);
                     }
                     this.be(), Nr(this);
                 }
             }
             onGeometrySymbolChange(t) {
                 const i = t.target._getParent() || t.target, n = t.properties;
-                for (const t in n) if (E(n, t) && qe[t]) return void this.Te(i);
+                for (const t in n) if (U(n, t) && qe[t]) return void this.Te(i);
                 const e = i[Or], r = i._getInternalSymbol(), s = this.features[e];
                 if (this.we(i), s) if (function(t, i) {
                     return Array.isArray(t) ? !!Array.isArray(i) && t.length === i.length : !Array.isArray(i);
                 }(r, s)) {
                     if (Array.isArray(r)) for (let t = 0; t < r.length; t++) {
-                        if (!$r(r[t], s[t])) return void this.Te(i);
-                    } else if (!$r(r, s)) return void this.Te(i);
+                        if (!Gr(r[t], s[t])) return void this.Te(i);
+                    } else if (!Gr(r, s)) return void this.Te(i);
                     this.onGeometryPositionChange(t);
                 } else this.Te(i); else this.Te(i);
             }
             onGeometryShapeChange(t) {
-                const i = t.target._getParent() || t.target, n = Ir(i, {
+                const i = t.target._getParent() || t.target, n = Cr(i, {
                     id: 0
                 }).geometry, e = i[Or], r = this.features[e];
                 if (function t(i, n) {
@@ -12793,7 +12812,7 @@
             }
             onGeometryPositionChange(t) {
                 const i = t.target._getParent() || t.target, n = i[Or];
-                this.Pe([ i ]), this.$n[n] = i, Nr(this);
+                this.Pe([ i ]), this.Gn[n] = i, Nr(this);
             }
             onGeometryZIndexChange() {
                 this.be();
@@ -12823,7 +12842,7 @@
             }
             onGeometryPropertiesChange(t) {
                 const i = t.target, n = i[Or];
-                if (this.features[n] = Ir(i, this.Vn), Array.isArray(this.features[n])) {
+                if (this.features[n] = Cr(i, this.Vn), Array.isArray(this.features[n])) {
                     const t = this.features[n];
                     for (let i = 0; i < t.length; i++) t[i][Or] = n;
                 } else this.features[n][Or] = n;
@@ -12835,7 +12854,7 @@
                 t && (this.canvas.pickingFBO = this.canvas.pickingFBO || this.regl.framebuffer(this.canvas.width, this.canvas.height)), 
                 this.prepareRequestors(), this.pickingFBO = this.canvas.pickingFBO || this.regl.framebuffer(this.canvas.width, this.canvas.height), 
                 this.painter = this.createPainter();
-                const i = Pr.get3DPainterClass("icon"), n = P({}, Cr, Tr);
+                const i = Pr.get3DPainterClass("icon"), n = P({}, Ir, Tr);
                 this.Jn = new i(this.regl, this.layer, n, this.layer.options.sceneConfig, 0);
                 const e = Pr.get3DPainterClass("line"), r = P({}, Dr);
                 this.qn = new e(this.regl, this.layer, r, this.layer.options.sceneConfig, 0), this.layer.getGeometries() && this.onGeometryAdd(this.layer.getGeometries());
@@ -12885,14 +12904,14 @@
             }
             drawOutline(t) {
                 if (this.Hi && (this.painter && this.painter.outlineAll(t), this.Jn.outlineAll(t), 
-                this.qn.outlineAll(t)), this.Ee) for (let i = 0; i < this.Ee.length; i++) this.painter && this.painter.outline(t, this.Ee[i]), 
-                this.Jn.outline(t, this.Ee[i]), this.qn.outline(t, this.Ee[i]);
+                this.qn.outlineAll(t)), this.Ue) for (let i = 0; i < this.Ue.length; i++) this.painter && this.painter.outline(t, this.Ue[i]), 
+                this.Jn.outline(t, this.Ue[i]), this.qn.outline(t, this.Ue[i]);
             }
             outlineAll() {
                 this.Hi = !0, this.setToRedraw();
             }
             outline(t) {
-                this.Ee || (this.Ee = []);
+                this.Ue || (this.Ue = []);
                 const i = [];
                 for (let n = 0; n < t.length; n++) {
                     const e = this.layer.getGeometryById(t[n]);
@@ -12901,10 +12920,10 @@
                         if (Array.isArray(t)) for (let n = 0; n < t.length; n++) i.push(t[n].id); else i.push(t.id);
                     }
                 }
-                this.Ee.push(i), this.setToRedraw();
+                this.Ue.push(i), this.setToRedraw();
             }
             cancelOutline() {
-                delete this.Hi, delete this.Ee, this.setToRedraw();
+                delete this.Hi, delete this.Ue, this.setToRedraw();
             }
             isEnableWorkAround(t) {
                 return "win-intel-gpu-crash" === t && (this.layer.options.workarounds["win-intel-gpu-crash"] && zr(this.gl));
@@ -12925,23 +12944,23 @@
             return !1;
         }
         function Wr({properties: t}) {
-            return t[Er + "markerFile"] || t[Er + "markerType"];
+            return t[Ur + "markerFile"] || t[Ur + "markerType"];
         }
         function Hr({properties: t}) {
-            return t[Er + "textName"];
+            return t[Ur + "textName"];
         }
         function Vr(t) {
-            return 2 === t.type || 3 === t.type && !!t.properties[Er + "lineWidth"];
+            return 2 === t.type || 3 === t.type && !!t.properties[Ur + "lineWidth"];
         }
-        function Gr(t) {
+        function $r(t) {
             if (!Array.isArray(t)) return 0;
             let i = 0;
             for (let n = 0; n < t.length; n++) i += t[n];
             return i;
         }
-        function $r(t, i) {
-            if (Object.keys(t).sort().join() !== Object.keys(i.properties || {}).filter(t => 0 === t.indexOf(Er)).map(t => t.substring(Er.length)).sort().join()) return !1;
-            for (const n in t) if (E(t, n) && M(t[n]) !== M(i.properties[Er + n])) return !1;
+        function Gr(t, i) {
+            if (Object.keys(t).sort().join() !== Object.keys(i.properties || {}).filter(t => 0 === t.indexOf(Ur)).map(t => t.substring(Ur.length)).sort().join()) return !1;
+            for (const n in t) if (U(t, n) && M(t[n]) !== M(i.properties[Ur + n])) return !1;
             return !0;
         }
         function Jr(t, i, n) {
@@ -13038,9 +13057,9 @@
                 const {features: i, center: n} = this.he();
                 if (!i.length) return;
                 const e = this.ne;
-                this.Ue = n;
+                this.Ee = n;
                 const r = this.je(i), s = P({}, Zr), o = r.map((i, e) => this.createMesh(this.painter, De, s, i, t && t[e], n));
-                this.Ce = !0, Promise.all(o).then(t => {
+                this.Ie = !0, Promise.all(o).then(t => {
                     this.meshes && this.painter.deleteMesh(this.meshes);
                     const i = [], n = [];
                     for (let e = 0; e < t.length; e++) {
@@ -13052,7 +13071,7 @@
                             n[e] = t[e].atlas;
                         }
                     }
-                    this.meshes = i, this.atlas = n, e && (this.ne = e), this.Ce = !1, this.setToRedraw();
+                    this.meshes = i, this.atlas = n, e && (this.ne = e), this.Ie = !1, this.setToRedraw();
                 });
             }
             je(t) {
@@ -13069,15 +13088,15 @@
                 return new t(this.regl, this.layer, this.painterSymbol, this.layer.options.sceneConfig, 0);
             }
             updateMesh(t) {
-                return this.xe(t, this.meshes, this.atlas, this.Ue, this.painter, De, Zr, this.je);
+                return this.xe(t, this.meshes, this.atlas, this.Ee, this.painter, De, Zr, this.je);
             }
-        }), Xr.registerRenderer("canvas", null), mr.VERSION = "0.55.0", Pr.VERSION = "0.55.0", 
+        }), Xr.registerRenderer("canvas", null), mr.VERSION = "0.56.0", Pr.VERSION = "0.56.0", 
         t.GeoJSONVectorTileLayer = Ar, t.LineStringLayer = Br, t.MapboxVectorTileLayer = xr, 
-        t.PackUtil = Ge, t.PointLayer = qr, t.PolygonLayer = Xr, t.SYMBOLS_NEED_REBUILD_IN_VECTOR = qe, 
+        t.PackUtil = $e, t.PointLayer = qr, t.PolygonLayer = Xr, t.SYMBOLS_NEED_REBUILD_IN_VECTOR = qe, 
         t.SYMBOLS_NEED_REBUILD_IN_VT = Je, t.Vector3DLayer = Pr, t.VectorTileLayer = mr, 
         t.VectorTileLayerRenderer = rr, Object.defineProperty(t, "t", {
             value: !0
         });
     }));
-    o.mat4.create(), "undefined" != typeof console && console.log("@maptalks/vt v0.55.0");
+    o.mat4.create(), "undefined" != typeof console && console.log("@maptalks/vt v0.56.0");
 }));