@poor-knight/cesium-utils 0.3.3 → 0.3.5

package/dist/cesium-utils.js

@@ -4,13 +4,13 @@ var z = (s, i, r) => le(s, typeof i != "symbol" ? i + "" : i, r);
 import * as Cesium from "cesium";
 import { Cartesian2, Cartesian3, VerticalOrigin, HorizontalOrigin, Color, LabelStyle, defined, DeveloperError, Event, Credit, Ellipsoid, GeographicTilingScheme, TerrainProvider, HeightmapTerrainData, Resource, Rectangle as Rectangle$1, WebMapTileServiceImageryProvider, ScreenSpaceEventHandler, ScreenSpaceEventType, ImageryLayer, WebMapServiceImageryProvider, HeightReference, NearFarScalar, SceneMode, BoundingSphere, Occluder, SceneTransforms } from "cesium";
 var commonjsGlobal = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {}, inflate$2 = {};
-const adler32$1 = (s, i, r, l) => {
-  let m = s & 65535 | 0, o = s >>> 16 & 65535 | 0, u = 0;
+const adler32$1 = (s, i, r, u) => {
+  let m = s & 65535 | 0, o = s >>> 16 & 65535 | 0, l = 0;
   for (; r !== 0; ) {
-    u = r > 2e3 ? 2e3 : r, r -= u;
+    l = r > 2e3 ? 2e3 : r, r -= l;
     do
-      m = m + i[l++] | 0, o = o + m | 0;
-    while (--u);
+      m = m + i[u++] | 0, o = o + m | 0;
+    while (--l);
     m %= 65521, o %= 65521;
   }
   return m | o << 16 | 0;
@@ -20,104 +20,104 @@ const makeTable = () => {
   let s, i = [];
   for (var r = 0; r < 256; r++) {
     s = r;
-    for (var l = 0; l < 8; l++)
+    for (var u = 0; u < 8; u++)
       s = s & 1 ? 3988292384 ^ s >>> 1 : s >>> 1;
     i[r] = s;
   }
   return i;
-}, crcTable = new Uint32Array(makeTable()), crc32$1 = (s, i, r, l) => {
-  const m = crcTable, o = l + r;
+}, crcTable = new Uint32Array(makeTable()), crc32$1 = (s, i, r, u) => {
+  const m = crcTable, o = u + r;
   s ^= -1;
-  for (let u = l; u < o; u++)
-    s = s >>> 8 ^ m[(s ^ i[u]) & 255];
+  for (let l = u; l < o; l++)
+    s = s >>> 8 ^ m[(s ^ i[l]) & 255];
   return s ^ -1;
 };
 var crc32_1 = crc32$1;
 const BAD$1 = 16209, TYPE$1 = 16191;
 var inffast = function(i, r) {
-  let l, m, o, u, c, d, a, p, y, g, h, v, b, _, T, w, O, x, R, E, A, P, k, D;
-  const N = i.state;
-  l = i.next_in, k = i.input, m = l + (i.avail_in - 5), o = i.next_out, D = i.output, u = o - (r - i.avail_out), c = o + (i.avail_out - 257), d = N.dmax, a = N.wsize, p = N.whave, y = N.wnext, g = N.window, h = N.hold, v = N.bits, b = N.lencode, _ = N.distcode, T = (1 << N.lenbits) - 1, w = (1 << N.distbits) - 1;
+  let u, m, o, l, c, d, a, p, y, g, h, v, b, _, T, w, x, O, R, E, S, P, C, D;
+  const I = i.state;
+  u = i.next_in, C = i.input, m = u + (i.avail_in - 5), o = i.next_out, D = i.output, l = o - (r - i.avail_out), c = o + (i.avail_out - 257), d = I.dmax, a = I.wsize, p = I.whave, y = I.wnext, g = I.window, h = I.hold, v = I.bits, b = I.lencode, _ = I.distcode, T = (1 << I.lenbits) - 1, w = (1 << I.distbits) - 1;
   e: do {
-    v < 15 && (h += k[l++] << v, v += 8, h += k[l++] << v, v += 8), O = b[h & T];
+    v < 15 && (h += C[u++] << v, v += 8, h += C[u++] << v, v += 8), x = b[h & T];
     t: for (; ; ) {
-      if (x = O >>> 24, h >>>= x, v -= x, x = O >>> 16 & 255, x === 0)
-        D[o++] = O & 65535;
-      else if (x & 16) {
-        R = O & 65535, x &= 15, x && (v < x && (h += k[l++] << v, v += 8), R += h & (1 << x) - 1, h >>>= x, v -= x), v < 15 && (h += k[l++] << v, v += 8, h += k[l++] << v, v += 8), O = _[h & w];
+      if (O = x >>> 24, h >>>= O, v -= O, O = x >>> 16 & 255, O === 0)
+        D[o++] = x & 65535;
+      else if (O & 16) {
+        R = x & 65535, O &= 15, O && (v < O && (h += C[u++] << v, v += 8), R += h & (1 << O) - 1, h >>>= O, v -= O), v < 15 && (h += C[u++] << v, v += 8, h += C[u++] << v, v += 8), x = _[h & w];
         r: for (; ; ) {
-          if (x = O >>> 24, h >>>= x, v -= x, x = O >>> 16 & 255, x & 16) {
-            if (E = O & 65535, x &= 15, v < x && (h += k[l++] << v, v += 8, v < x && (h += k[l++] << v, v += 8)), E += h & (1 << x) - 1, E > d) {
-              i.msg = "invalid distance too far back", N.mode = BAD$1;
+          if (O = x >>> 24, h >>>= O, v -= O, O = x >>> 16 & 255, O & 16) {
+            if (E = x & 65535, O &= 15, v < O && (h += C[u++] << v, v += 8, v < O && (h += C[u++] << v, v += 8)), E += h & (1 << O) - 1, E > d) {
+              i.msg = "invalid distance too far back", I.mode = BAD$1;
               break e;
             }
-            if (h >>>= x, v -= x, x = o - u, E > x) {
-              if (x = E - x, x > p && N.sane) {
-                i.msg = "invalid distance too far back", N.mode = BAD$1;
+            if (h >>>= O, v -= O, O = o - l, E > O) {
+              if (O = E - O, O > p && I.sane) {
+                i.msg = "invalid distance too far back", I.mode = BAD$1;
                 break e;
               }
-              if (A = 0, P = g, y === 0) {
-                if (A += a - x, x < R) {
-                  R -= x;
+              if (S = 0, P = g, y === 0) {
+                if (S += a - O, O < R) {
+                  R -= O;
                   do
-                    D[o++] = g[A++];
-                  while (--x);
-                  A = o - E, P = D;
+                    D[o++] = g[S++];
+                  while (--O);
+                  S = o - E, P = D;
                 }
-              } else if (y < x) {
-                if (A += a + y - x, x -= y, x < R) {
-                  R -= x;
+              } else if (y < O) {
+                if (S += a + y - O, O -= y, O < R) {
+                  R -= O;
                   do
-                    D[o++] = g[A++];
-                  while (--x);
-                  if (A = 0, y < R) {
-                    x = y, R -= x;
+                    D[o++] = g[S++];
+                  while (--O);
+                  if (S = 0, y < R) {
+                    O = y, R -= O;
                     do
-                      D[o++] = g[A++];
-                    while (--x);
-                    A = o - E, P = D;
+                      D[o++] = g[S++];
+                    while (--O);
+                    S = o - E, P = D;
                   }
                 }
-              } else if (A += y - x, x < R) {
-                R -= x;
+              } else if (S += y - O, O < R) {
+                R -= O;
                 do
-                  D[o++] = g[A++];
-                while (--x);
-                A = o - E, P = D;
+                  D[o++] = g[S++];
+                while (--O);
+                S = o - E, P = D;
               }
               for (; R > 2; )
-                D[o++] = P[A++], D[o++] = P[A++], D[o++] = P[A++], R -= 3;
-              R && (D[o++] = P[A++], R > 1 && (D[o++] = P[A++]));
+                D[o++] = P[S++], D[o++] = P[S++], D[o++] = P[S++], R -= 3;
+              R && (D[o++] = P[S++], R > 1 && (D[o++] = P[S++]));
             } else {
-              A = o - E;
+              S = o - E;
               do
-                D[o++] = D[A++], D[o++] = D[A++], D[o++] = D[A++], R -= 3;
+                D[o++] = D[S++], D[o++] = D[S++], D[o++] = D[S++], R -= 3;
               while (R > 2);
-              R && (D[o++] = D[A++], R > 1 && (D[o++] = D[A++]));
+              R && (D[o++] = D[S++], R > 1 && (D[o++] = D[S++]));
             }
-          } else if ((x & 64) === 0) {
-            O = _[(O & 65535) + (h & (1 << x) - 1)];
+          } else if ((O & 64) === 0) {
+            x = _[(x & 65535) + (h & (1 << O) - 1)];
             continue r;
           } else {
-            i.msg = "invalid distance code", N.mode = BAD$1;
+            i.msg = "invalid distance code", I.mode = BAD$1;
             break e;
           }
           break;
         }
-      } else if ((x & 64) === 0) {
-        O = b[(O & 65535) + (h & (1 << x) - 1)];
+      } else if ((O & 64) === 0) {
+        x = b[(x & 65535) + (h & (1 << O) - 1)];
         continue t;
-      } else if (x & 32) {
-        N.mode = TYPE$1;
+      } else if (O & 32) {
+        I.mode = TYPE$1;
         break e;
       } else {
-        i.msg = "invalid literal/length code", N.mode = BAD$1;
+        i.msg = "invalid literal/length code", I.mode = BAD$1;
         break e;
       }
       break;
     }
-  } while (l < m && o < c);
-  R = v >> 3, l -= R, v -= R << 3, h &= (1 << v) - 1, i.next_in = l, i.next_out = o, i.avail_in = l < m ? 5 + (m - l) : 5 - (l - m), i.avail_out = o < c ? 257 + (c - o) : 257 - (o - c), N.hold = h, N.bits = v;
+  } while (u < m && o < c);
+  R = v >> 3, u -= R, v -= R << 3, h &= (1 << v) - 1, i.next_in = u, i.next_out = o, i.avail_in = u < m ? 5 + (m - u) : 5 - (u - m), i.avail_out = o < c ? 257 + (c - o) : 257 - (o - c), I.hold = h, I.bits = v;
 };
 const MAXBITS = 15, ENOUGH_LENS$1 = 852, ENOUGH_DISTS$1 = 592, CODES$1 = 0, LENS$1 = 1, DISTS$1 = 2, lbase = new Uint16Array([
   /* Length codes 257..285 base */
@@ -253,14 +253,14 @@ const MAXBITS = 15, ENOUGH_LENS$1 = 852, ENOUGH_DISTS$1 = 592, CODES$1 = 0, LENS
   29,
   64,
   64
-]), inflate_table$1 = (s, i, r, l, m, o, u, c) => {
+]), inflate_table$1 = (s, i, r, u, m, o, l, c) => {
   const d = c.bits;
-  let a = 0, p = 0, y = 0, g = 0, h = 0, v = 0, b = 0, _ = 0, T = 0, w = 0, O, x, R, E, A, P = null, k;
-  const D = new Uint16Array(MAXBITS + 1), N = new Uint16Array(MAXBITS + 1);
-  let L = null, F, M, U;
+  let a = 0, p = 0, y = 0, g = 0, h = 0, v = 0, b = 0, _ = 0, T = 0, w = 0, x, O, R, E, S, P = null, C;
+  const D = new Uint16Array(MAXBITS + 1), I = new Uint16Array(MAXBITS + 1);
+  let $ = null, q, F, U;
   for (a = 0; a <= MAXBITS; a++)
     D[a] = 0;
-  for (p = 0; p < l; p++)
+  for (p = 0; p < u; p++)
     D[i[r + p]]++;
   for (h = d, g = MAXBITS; g >= 1 && D[g] === 0; g--)
     ;
@@ -273,33 +273,33 @@ const MAXBITS = 15, ENOUGH_LENS$1 = 852, ENOUGH_DISTS$1 = 592, CODES$1 = 0, LENS
       return -1;
   if (_ > 0 && (s === CODES$1 || g !== 1))
     return -1;
-  for (N[1] = 0, a = 1; a < MAXBITS; a++)
-    N[a + 1] = N[a] + D[a];
-  for (p = 0; p < l; p++)
-    i[r + p] !== 0 && (u[N[i[r + p]]++] = p);
-  if (s === CODES$1 ? (P = L = u, k = 20) : s === LENS$1 ? (P = lbase, L = lext, k = 257) : (P = dbase, L = dext, k = 0), w = 0, p = 0, a = y, A = o, v = h, b = 0, R = -1, T = 1 << h, E = T - 1, s === LENS$1 && T > ENOUGH_LENS$1 || s === DISTS$1 && T > ENOUGH_DISTS$1)
+  for (I[1] = 0, a = 1; a < MAXBITS; a++)
+    I[a + 1] = I[a] + D[a];
+  for (p = 0; p < u; p++)
+    i[r + p] !== 0 && (l[I[i[r + p]]++] = p);
+  if (s === CODES$1 ? (P = $ = l, C = 20) : s === LENS$1 ? (P = lbase, $ = lext, C = 257) : (P = dbase, $ = dext, C = 0), w = 0, p = 0, a = y, S = o, v = h, b = 0, R = -1, T = 1 << h, E = T - 1, s === LENS$1 && T > ENOUGH_LENS$1 || s === DISTS$1 && T > ENOUGH_DISTS$1)
     return 1;
   for (; ; ) {
-    F = a - b, u[p] + 1 < k ? (M = 0, U = u[p]) : u[p] >= k ? (M = L[u[p] - k], U = P[u[p] - k]) : (M = 96, U = 0), O = 1 << a - b, x = 1 << v, y = x;
+    q = a - b, l[p] + 1 < C ? (F = 0, U = l[p]) : l[p] >= C ? (F = $[l[p] - C], U = P[l[p] - C]) : (F = 96, U = 0), x = 1 << a - b, O = 1 << v, y = O;
     do
-      x -= O, m[A + (w >> b) + x] = F << 24 | M << 16 | U | 0;
-    while (x !== 0);
-    for (O = 1 << a - 1; w & O; )
-      O >>= 1;
-    if (O !== 0 ? (w &= O - 1, w += O) : w = 0, p++, --D[a] === 0) {
+      O -= x, m[S + (w >> b) + O] = q << 24 | F << 16 | U | 0;
+    while (O !== 0);
+    for (x = 1 << a - 1; w & x; )
+      x >>= 1;
+    if (x !== 0 ? (w &= x - 1, w += x) : w = 0, p++, --D[a] === 0) {
       if (a === g)
         break;
-      a = i[r + u[p]];
+      a = i[r + l[p]];
     }
     if (a > h && (w & E) !== R) {
-      for (b === 0 && (b = h), A += y, v = a - b, _ = 1 << v; v + b < g && (_ -= D[v + b], !(_ <= 0)); )
+      for (b === 0 && (b = h), S += y, v = a - b, _ = 1 << v; v + b < g && (_ -= D[v + b], !(_ <= 0)); )
         v++, _ <<= 1;
       if (T += 1 << v, s === LENS$1 && T > ENOUGH_LENS$1 || s === DISTS$1 && T > ENOUGH_DISTS$1)
         return 1;
-      R = w & E, m[R] = h << 24 | v << 16 | A - o | 0;
+      R = w & E, m[R] = h << 24 | v << 16 | S - o | 0;
     }
   }
-  return w !== 0 && (m[A + w] = a - b << 24 | 64 << 16 | 0), c.bits = h, 0;
+  return w !== 0 && (m[S + w] = a - b << 24 | 64 << 16 | 0), c.bits = h, 0;
 };
 var inftrees = inflate_table$1, constants = {
   /* Allowed flush values; see deflate() and inflate() below for details */
@@ -356,15 +356,15 @@ const inflateStateCheck = (s) => {
   let r;
   if (inflateStateCheck(s))
     return Z_STREAM_ERROR$1;
-  const l = s.state;
-  return i < 0 ? (r = 0, i = -i) : (r = (i >> 4) + 5, i < 48 && (i &= 15)), i && (i < 8 || i > 15) ? Z_STREAM_ERROR$1 : (l.window !== null && l.wbits !== i && (l.window = null), l.wrap = r, l.wbits = i, inflateReset(s));
+  const u = s.state;
+  return i < 0 ? (r = 0, i = -i) : (r = (i >> 4) + 5, i < 48 && (i &= 15)), i && (i < 8 || i > 15) ? Z_STREAM_ERROR$1 : (u.window !== null && u.wbits !== i && (u.window = null), u.wrap = r, u.wbits = i, inflateReset(s));
 }, inflateInit2 = (s, i) => {
   if (!s)
     return Z_STREAM_ERROR$1;
   const r = new InflateState();
   s.state = r, r.strm = s, r.window = null, r.mode = HEAD;
-  const l = inflateReset2(s, i);
-  return l !== Z_OK$1 && (s.state = null), l;
+  const u = inflateReset2(s, i);
+  return u !== Z_OK$1 && (s.state = null), u;
 }, inflateInit = (s) => inflateInit2(s, DEF_WBITS);
 let virgin = !0, lenfix, distfix;
 const fixedtables = (s) => {
@@ -388,21 +388,21 @@ const fixedtables = (s) => {
     }), virgin = !1;
   }
   s.lencode = lenfix, s.lenbits = 9, s.distcode = distfix, s.distbits = 5;
-}, updatewindow = (s, i, r, l) => {
+}, updatewindow = (s, i, r, u) => {
   let m;
   const o = s.state;
-  return o.window === null && (o.wsize = 1 << o.wbits, o.wnext = 0, o.whave = 0, o.window = new Uint8Array(o.wsize)), l >= o.wsize ? (o.window.set(i.subarray(r - o.wsize, r), 0), o.wnext = 0, o.whave = o.wsize) : (m = o.wsize - o.wnext, m > l && (m = l), o.window.set(i.subarray(r - l, r - l + m), o.wnext), l -= m, l ? (o.window.set(i.subarray(r - l, r), 0), o.wnext = l, o.whave = o.wsize) : (o.wnext += m, o.wnext === o.wsize && (o.wnext = 0), o.whave < o.wsize && (o.whave += m))), 0;
+  return o.window === null && (o.wsize = 1 << o.wbits, o.wnext = 0, o.whave = 0, o.window = new Uint8Array(o.wsize)), u >= o.wsize ? (o.window.set(i.subarray(r - o.wsize, r), 0), o.wnext = 0, o.whave = o.wsize) : (m = o.wsize - o.wnext, m > u && (m = u), o.window.set(i.subarray(r - u, r - u + m), o.wnext), u -= m, u ? (o.window.set(i.subarray(r - u, r), 0), o.wnext = u, o.whave = o.wsize) : (o.wnext += m, o.wnext === o.wsize && (o.wnext = 0), o.whave < o.wsize && (o.whave += m))), 0;
 }, inflate$1 = (s, i) => {
-  let r, l, m, o, u, c, d, a, p, y, g, h, v, b, _ = 0, T, w, O, x, R, E, A, P;
-  const k = new Uint8Array(4);
-  let D, N;
-  const L = (
+  let r, u, m, o, l, c, d, a, p, y, g, h, v, b, _ = 0, T, w, x, O, R, E, S, P;
+  const C = new Uint8Array(4);
+  let D, I;
+  const $ = (
     /* permutation of code lengths */
     new Uint8Array([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15])
   );
   if (inflateStateCheck(s) || !s.output || !s.input && s.avail_in !== 0)
     return Z_STREAM_ERROR$1;
-  r = s.state, r.mode === TYPE && (r.mode = TYPEDO), u = s.next_out, m = s.output, d = s.avail_out, o = s.next_in, l = s.input, c = s.avail_in, a = r.hold, p = r.bits, y = c, g = d, P = Z_OK$1;
+  r = s.state, r.mode === TYPE && (r.mode = TYPEDO), l = s.next_out, m = s.output, d = s.avail_out, o = s.next_in, u = s.input, c = s.avail_in, a = r.hold, p = r.bits, y = c, g = d, P = Z_OK$1;
   e: for (; ; )
     switch (r.mode) {
       case HEAD:
@@ -413,10 +413,10 @@ const fixedtables = (s) => {
         for (; p < 16; ) {
           if (c === 0)
             break e;
-          c--, a += l[o++] << p, p += 8;
+          c--, a += u[o++] << p, p += 8;
         }
         if (r.wrap & 2 && a === 35615) {
-          r.wbits === 0 && (r.wbits = 15), r.check = 0, k[0] = a & 255, k[1] = a >>> 8 & 255, r.check = crc32(r.check, k, 2, 0), a = 0, p = 0, r.mode = FLAGS;
+          r.wbits === 0 && (r.wbits = 15), r.check = 0, C[0] = a & 255, C[1] = a >>> 8 & 255, r.check = crc32(r.check, C, 2, 0), a = 0, p = 0, r.mode = FLAGS;
           break;
         }
         if (r.head && (r.head.done = !1), !(r.wrap & 1) || (((a & 255) << 8) + (a >> 8)) % 31) {
@@ -427,7 +427,7 @@ const fixedtables = (s) => {
           s.msg = "unknown compression method", r.mode = BAD;
           break;
         }
-        if (a >>>= 4, p -= 4, A = (a & 15) + 8, r.wbits === 0 && (r.wbits = A), A > 15 || A > r.wbits) {
+        if (a >>>= 4, p -= 4, S = (a & 15) + 8, r.wbits === 0 && (r.wbits = S), S > 15 || S > r.wbits) {
           s.msg = "invalid window size", r.mode = BAD;
           break;
         }
@@ -437,7 +437,7 @@ const fixedtables = (s) => {
         for (; p < 16; ) {
           if (c === 0)
             break e;
-          c--, a += l[o++] << p, p += 8;
+          c--, a += u[o++] << p, p += 8;
         }
         if (r.flags = a, (r.flags & 255) !== Z_DEFLATED) {
           s.msg = "unknown compression method", r.mode = BAD;
@@ -447,45 +447,45 @@ const fixedtables = (s) => {
           s.msg = "unknown header flags set", r.mode = BAD;
           break;
         }
-        r.head && (r.head.text = a >> 8 & 1), r.flags & 512 && r.wrap & 4 && (k[0] = a & 255, k[1] = a >>> 8 & 255, r.check = crc32(r.check, k, 2, 0)), a = 0, p = 0, r.mode = TIME;
+        r.head && (r.head.text = a >> 8 & 1), r.flags & 512 && r.wrap & 4 && (C[0] = a & 255, C[1] = a >>> 8 & 255, r.check = crc32(r.check, C, 2, 0)), a = 0, p = 0, r.mode = TIME;
       /* falls through */
       case TIME:
         for (; p < 32; ) {
           if (c === 0)
             break e;
-          c--, a += l[o++] << p, p += 8;
+          c--, a += u[o++] << p, p += 8;
         }
-        r.head && (r.head.time = a), r.flags & 512 && r.wrap & 4 && (k[0] = a & 255, k[1] = a >>> 8 & 255, k[2] = a >>> 16 & 255, k[3] = a >>> 24 & 255, r.check = crc32(r.check, k, 4, 0)), a = 0, p = 0, r.mode = OS;
+        r.head && (r.head.time = a), r.flags & 512 && r.wrap & 4 && (C[0] = a & 255, C[1] = a >>> 8 & 255, C[2] = a >>> 16 & 255, C[3] = a >>> 24 & 255, r.check = crc32(r.check, C, 4, 0)), a = 0, p = 0, r.mode = OS;
       /* falls through */
       case OS:
         for (; p < 16; ) {
           if (c === 0)
             break e;
-          c--, a += l[o++] << p, p += 8;
+          c--, a += u[o++] << p, p += 8;
         }
-        r.head && (r.head.xflags = a & 255, r.head.os = a >> 8), r.flags & 512 && r.wrap & 4 && (k[0] = a & 255, k[1] = a >>> 8 & 255, r.check = crc32(r.check, k, 2, 0)), a = 0, p = 0, r.mode = EXLEN;
+        r.head && (r.head.xflags = a & 255, r.head.os = a >> 8), r.flags & 512 && r.wrap & 4 && (C[0] = a & 255, C[1] = a >>> 8 & 255, r.check = crc32(r.check, C, 2, 0)), a = 0, p = 0, r.mode = EXLEN;
       /* falls through */
       case EXLEN:
         if (r.flags & 1024) {
           for (; p < 16; ) {
             if (c === 0)
               break e;
-            c--, a += l[o++] << p, p += 8;
+            c--, a += u[o++] << p, p += 8;
           }
-          r.length = a, r.head && (r.head.extra_len = a), r.flags & 512 && r.wrap & 4 && (k[0] = a & 255, k[1] = a >>> 8 & 255, r.check = crc32(r.check, k, 2, 0)), a = 0, p = 0;
+          r.length = a, r.head && (r.head.extra_len = a), r.flags & 512 && r.wrap & 4 && (C[0] = a & 255, C[1] = a >>> 8 & 255, r.check = crc32(r.check, C, 2, 0)), a = 0, p = 0;
         } else r.head && (r.head.extra = null);
         r.mode = EXTRA;
       /* falls through */
       case EXTRA:
-        if (r.flags & 1024 && (h = r.length, h > c && (h = c), h && (r.head && (A = r.head.extra_len - r.length, r.head.extra || (r.head.extra = new Uint8Array(r.head.extra_len)), r.head.extra.set(
-          l.subarray(
+        if (r.flags & 1024 && (h = r.length, h > c && (h = c), h && (r.head && (S = r.head.extra_len - r.length, r.head.extra || (r.head.extra = new Uint8Array(r.head.extra_len)), r.head.extra.set(
+          u.subarray(
             o,
             // extra field is limited to 65536 bytes
             // - no need for additional size check
             o + h
           ),
-          A
-        )), r.flags & 512 && r.wrap & 4 && (r.check = crc32(r.check, l, h, o)), c -= h, o += h, r.length -= h), r.length))
+          S
+        )), r.flags & 512 && r.wrap & 4 && (r.check = crc32(r.check, u, h, o)), c -= h, o += h, r.length -= h), r.length))
           break e;
         r.length = 0, r.mode = NAME;
       /* falls through */
@@ -495,9 +495,9 @@ const fixedtables = (s) => {
             break e;
           h = 0;
           do
-            A = l[o + h++], r.head && A && r.length < 65536 && (r.head.name += String.fromCharCode(A));
-          while (A && h < c);
-          if (r.flags & 512 && r.wrap & 4 && (r.check = crc32(r.check, l, h, o)), c -= h, o += h, A)
+            S = u[o + h++], r.head && S && r.length < 65536 && (r.head.name += String.fromCharCode(S));
+          while (S && h < c);
+          if (r.flags & 512 && r.wrap & 4 && (r.check = crc32(r.check, u, h, o)), c -= h, o += h, S)
             break e;
         } else r.head && (r.head.name = null);
         r.length = 0, r.mode = COMMENT;
@@ -508,9 +508,9 @@ const fixedtables = (s) => {
             break e;
           h = 0;
           do
-            A = l[o + h++], r.head && A && r.length < 65536 && (r.head.comment += String.fromCharCode(A));
-          while (A && h < c);
-          if (r.flags & 512 && r.wrap & 4 && (r.check = crc32(r.check, l, h, o)), c -= h, o += h, A)
+            S = u[o + h++], r.head && S && r.length < 65536 && (r.head.comment += String.fromCharCode(S));
+          while (S && h < c);
+          if (r.flags & 512 && r.wrap & 4 && (r.check = crc32(r.check, u, h, o)), c -= h, o += h, S)
             break e;
         } else r.head && (r.head.comment = null);
         r.mode = HCRC;
@@ -520,7 +520,7 @@ const fixedtables = (s) => {
           for (; p < 16; ) {
             if (c === 0)
               break e;
-            c--, a += l[o++] << p, p += 8;
+            c--, a += u[o++] << p, p += 8;
           }
           if (r.wrap & 4 && a !== (r.check & 65535)) {
             s.msg = "header crc mismatch", r.mode = BAD;
@@ -534,13 +534,13 @@ const fixedtables = (s) => {
         for (; p < 32; ) {
           if (c === 0)
             break e;
-          c--, a += l[o++] << p, p += 8;
+          c--, a += u[o++] << p, p += 8;
         }
         s.adler = r.check = zswap32(a), a = 0, p = 0, r.mode = DICT;
       /* falls through */
       case DICT:
         if (r.havedict === 0)
-          return s.next_out = u, s.avail_out = d, s.next_in = o, s.avail_in = c, r.hold = a, r.bits = p, Z_NEED_DICT$1;
+          return s.next_out = l, s.avail_out = d, s.next_in = o, s.avail_in = c, r.hold = a, r.bits = p, Z_NEED_DICT$1;
         s.adler = r.check = 1, r.mode = TYPE;
       /* falls through */
       case TYPE:
@@ -555,7 +555,7 @@ const fixedtables = (s) => {
         for (; p < 3; ) {
           if (c === 0)
             break e;
-          c--, a += l[o++] << p, p += 8;
+          c--, a += u[o++] << p, p += 8;
         }
         switch (r.last = a & 1, a >>>= 1, p -= 1, a & 3) {
           case 0:
@@ -579,7 +579,7 @@ const fixedtables = (s) => {
         for (a >>>= p & 7, p -= p & 7; p < 32; ) {
           if (c === 0)
             break e;
-          c--, a += l[o++] << p, p += 8;
+          c--, a += u[o++] << p, p += 8;
         }
         if ((a & 65535) !== (a >>> 16 ^ 65535)) {
           s.msg = "invalid stored block lengths", r.mode = BAD;
@@ -595,7 +595,7 @@ const fixedtables = (s) => {
         if (h = r.length, h) {
           if (h > c && (h = c), h > d && (h = d), h === 0)
             break e;
-          m.set(l.subarray(o, o + h), u), c -= h, o += h, d -= h, u += h, r.length -= h;
+          m.set(u.subarray(o, o + h), l), c -= h, o += h, d -= h, l += h, r.length -= h;
           break;
         }
         r.mode = TYPE;
@@ -604,7 +604,7 @@ const fixedtables = (s) => {
         for (; p < 14; ) {
           if (c === 0)
             break e;
-          c--, a += l[o++] << p, p += 8;
+          c--, a += u[o++] << p, p += 8;
         }
         if (r.nlen = (a & 31) + 257, a >>>= 5, p -= 5, r.ndist = (a & 31) + 1, a >>>= 5, p -= 5, r.ncode = (a & 15) + 4, a >>>= 4, p -= 4, r.nlen > 286 || r.ndist > 30) {
           s.msg = "too many length or distance symbols", r.mode = BAD;
@@ -617,12 +617,12 @@ const fixedtables = (s) => {
           for (; p < 3; ) {
             if (c === 0)
               break e;
-            c--, a += l[o++] << p, p += 8;
+            c--, a += u[o++] << p, p += 8;
           }
-          r.lens[L[r.have++]] = a & 7, a >>>= 3, p -= 3;
+          r.lens[$[r.have++]] = a & 7, a >>>= 3, p -= 3;
         }
         for (; r.have < 19; )
-          r.lens[L[r.have++]] = 0;
+          r.lens[$[r.have++]] = 0;
         if (r.lencode = r.lendyn, r.lenbits = 7, D = {
           bits: r.lenbits
         }, P = inflate_table(CODES, r.lens, 0, 19, r.lencode, 0, r.work, D), r.lenbits = D.bits, P) {
@@ -633,46 +633,46 @@ const fixedtables = (s) => {
       /* falls through */
       case CODELENS:
         for (; r.have < r.nlen + r.ndist; ) {
-          for (; _ = r.lencode[a & (1 << r.lenbits) - 1], T = _ >>> 24, w = _ >>> 16 & 255, O = _ & 65535, !(T <= p); ) {
+          for (; _ = r.lencode[a & (1 << r.lenbits) - 1], T = _ >>> 24, w = _ >>> 16 & 255, x = _ & 65535, !(T <= p); ) {
             if (c === 0)
               break e;
-            c--, a += l[o++] << p, p += 8;
+            c--, a += u[o++] << p, p += 8;
           }
-          if (O < 16)
-            a >>>= T, p -= T, r.lens[r.have++] = O;
+          if (x < 16)
+            a >>>= T, p -= T, r.lens[r.have++] = x;
           else {
-            if (O === 16) {
-              for (N = T + 2; p < N; ) {
+            if (x === 16) {
+              for (I = T + 2; p < I; ) {
                 if (c === 0)
                   break e;
-                c--, a += l[o++] << p, p += 8;
+                c--, a += u[o++] << p, p += 8;
               }
               if (a >>>= T, p -= T, r.have === 0) {
                 s.msg = "invalid bit length repeat", r.mode = BAD;
                 break;
               }
-              A = r.lens[r.have - 1], h = 3 + (a & 3), a >>>= 2, p -= 2;
-            } else if (O === 17) {
-              for (N = T + 3; p < N; ) {
+              S = r.lens[r.have - 1], h = 3 + (a & 3), a >>>= 2, p -= 2;
+            } else if (x === 17) {
+              for (I = T + 3; p < I; ) {
                 if (c === 0)
                   break e;
-                c--, a += l[o++] << p, p += 8;
+                c--, a += u[o++] << p, p += 8;
               }
-              a >>>= T, p -= T, A = 0, h = 3 + (a & 7), a >>>= 3, p -= 3;
+              a >>>= T, p -= T, S = 0, h = 3 + (a & 7), a >>>= 3, p -= 3;
             } else {
-              for (N = T + 7; p < N; ) {
+              for (I = T + 7; p < I; ) {
                 if (c === 0)
                   break e;
-                c--, a += l[o++] << p, p += 8;
+                c--, a += u[o++] << p, p += 8;
               }
-              a >>>= T, p -= T, A = 0, h = 11 + (a & 127), a >>>= 7, p -= 7;
+              a >>>= T, p -= T, S = 0, h = 11 + (a & 127), a >>>= 7, p -= 7;
             }
             if (r.have + h > r.nlen + r.ndist) {
               s.msg = "invalid bit length repeat", r.mode = BAD;
               break;
             }
             for (; h--; )
-              r.lens[r.have++] = A;
+              r.lens[r.have++] = S;
           }
         }
         if (r.mode === BAD)
@@ -710,23 +710,23 @@ const fixedtables = (s) => {
       /* falls through */
       case LEN:
         if (c >= 6 && d >= 258) {
-          s.next_out = u, s.avail_out = d, s.next_in = o, s.avail_in = c, r.hold = a, r.bits = p, inflate_fast(s, g), u = s.next_out, m = s.output, d = s.avail_out, o = s.next_in, l = s.input, c = s.avail_in, a = r.hold, p = r.bits, r.mode === TYPE && (r.back = -1);
+          s.next_out = l, s.avail_out = d, s.next_in = o, s.avail_in = c, r.hold = a, r.bits = p, inflate_fast(s, g), l = s.next_out, m = s.output, d = s.avail_out, o = s.next_in, u = s.input, c = s.avail_in, a = r.hold, p = r.bits, r.mode === TYPE && (r.back = -1);
           break;
         }
-        for (r.back = 0; _ = r.lencode[a & (1 << r.lenbits) - 1], T = _ >>> 24, w = _ >>> 16 & 255, O = _ & 65535, !(T <= p); ) {
+        for (r.back = 0; _ = r.lencode[a & (1 << r.lenbits) - 1], T = _ >>> 24, w = _ >>> 16 & 255, x = _ & 65535, !(T <= p); ) {
           if (c === 0)
             break e;
-          c--, a += l[o++] << p, p += 8;
+          c--, a += u[o++] << p, p += 8;
         }
         if (w && (w & 240) === 0) {
-          for (x = T, R = w, E = O; _ = r.lencode[E + ((a & (1 << x + R) - 1) >> x)], T = _ >>> 24, w = _ >>> 16 & 255, O = _ & 65535, !(x + T <= p); ) {
+          for (O = T, R = w, E = x; _ = r.lencode[E + ((a & (1 << O + R) - 1) >> O)], T = _ >>> 24, w = _ >>> 16 & 255, x = _ & 65535, !(O + T <= p); ) {
             if (c === 0)
               break e;
-            c--, a += l[o++] << p, p += 8;
+            c--, a += u[o++] << p, p += 8;
           }
-          a >>>= x, p -= x, r.back += x;
+          a >>>= O, p -= O, r.back += O;
         }
-        if (a >>>= T, p -= T, r.back += T, r.length = O, w === 0) {
+        if (a >>>= T, p -= T, r.back += T, r.length = x, w === 0) {
           r.mode = LIT;
           break;
         }
@@ -742,41 +742,41 @@ const fixedtables = (s) => {
       /* falls through */
       case LENEXT:
         if (r.extra) {
-          for (N = r.extra; p < N; ) {
+          for (I = r.extra; p < I; ) {
             if (c === 0)
               break e;
-            c--, a += l[o++] << p, p += 8;
+            c--, a += u[o++] << p, p += 8;
           }
           r.length += a & (1 << r.extra) - 1, a >>>= r.extra, p -= r.extra, r.back += r.extra;
         }
         r.was = r.length, r.mode = DIST;
       /* falls through */
       case DIST:
-        for (; _ = r.distcode[a & (1 << r.distbits) - 1], T = _ >>> 24, w = _ >>> 16 & 255, O = _ & 65535, !(T <= p); ) {
+        for (; _ = r.distcode[a & (1 << r.distbits) - 1], T = _ >>> 24, w = _ >>> 16 & 255, x = _ & 65535, !(T <= p); ) {
           if (c === 0)
             break e;
-          c--, a += l[o++] << p, p += 8;
+          c--, a += u[o++] << p, p += 8;
         }
         if ((w & 240) === 0) {
-          for (x = T, R = w, E = O; _ = r.distcode[E + ((a & (1 << x + R) - 1) >> x)], T = _ >>> 24, w = _ >>> 16 & 255, O = _ & 65535, !(x + T <= p); ) {
+          for (O = T, R = w, E = x; _ = r.distcode[E + ((a & (1 << O + R) - 1) >> O)], T = _ >>> 24, w = _ >>> 16 & 255, x = _ & 65535, !(O + T <= p); ) {
             if (c === 0)
               break e;
-            c--, a += l[o++] << p, p += 8;
+            c--, a += u[o++] << p, p += 8;
           }
-          a >>>= x, p -= x, r.back += x;
+          a >>>= O, p -= O, r.back += O;
         }
         if (a >>>= T, p -= T, r.back += T, w & 64) {
           s.msg = "invalid distance code", r.mode = BAD;
           break;
         }
-        r.offset = O, r.extra = w & 15, r.mode = DISTEXT;
+        r.offset = x, r.extra = w & 15, r.mode = DISTEXT;
       /* falls through */
       case DISTEXT:
         if (r.extra) {
-          for (N = r.extra; p < N; ) {
+          for (I = r.extra; p < I; ) {
             if (c === 0)
               break e;
-            c--, a += l[o++] << p, p += 8;
+            c--, a += u[o++] << p, p += 8;
           }
           r.offset += a & (1 << r.extra) - 1, a >>>= r.extra, p -= r.extra, r.back += r.extra;
         }
@@ -796,27 +796,27 @@ const fixedtables = (s) => {
           }
           h > r.wnext ? (h -= r.wnext, v = r.wsize - h) : v = r.wnext - h, h > r.length && (h = r.length), b = r.window;
         } else
-          b = m, v = u - r.offset, h = r.length;
+          b = m, v = l - r.offset, h = r.length;
         h > d && (h = d), d -= h, r.length -= h;
         do
-          m[u++] = b[v++];
+          m[l++] = b[v++];
         while (--h);
         r.length === 0 && (r.mode = LEN);
         break;
       case LIT:
         if (d === 0)
           break e;
-        m[u++] = r.length, d--, r.mode = LEN;
+        m[l++] = r.length, d--, r.mode = LEN;
         break;
       case CHECK:
         if (r.wrap) {
           for (; p < 32; ) {
             if (c === 0)
               break e;
-            c--, a |= l[o++] << p, p += 8;
+            c--, a |= u[o++] << p, p += 8;
           }
           if (g -= d, s.total_out += g, r.total += g, r.wrap & 4 && g && (s.adler = r.check = /*UPDATE_CHECK(state.check, put - _out, _out);*/
-          r.flags ? crc32(r.check, m, g, u - g) : adler32(r.check, m, g, u - g)), g = d, r.wrap & 4 && (r.flags ? a : zswap32(a)) !== r.check) {
+          r.flags ? crc32(r.check, m, g, l - g) : adler32(r.check, m, g, l - g)), g = d, r.wrap & 4 && (r.flags ? a : zswap32(a)) !== r.check) {
             s.msg = "incorrect data check", r.mode = BAD;
             break;
           }
@@ -829,7 +829,7 @@ const fixedtables = (s) => {
           for (; p < 32; ) {
             if (c === 0)
               break e;
-            c--, a += l[o++] << p, p += 8;
+            c--, a += u[o++] << p, p += 8;
           }
           if (r.wrap & 4 && a !== (r.total & 4294967295)) {
             s.msg = "incorrect length check", r.mode = BAD;
@@ -852,7 +852,7 @@ const fixedtables = (s) => {
       default:
         return Z_STREAM_ERROR$1;
     }
-  return s.next_out = u, s.avail_out = d, s.next_in = o, s.avail_in = c, r.hold = a, r.bits = p, (r.wsize || g !== s.avail_out && r.mode < BAD && (r.mode < CHECK || i !== Z_FINISH$1)) && updatewindow(s, s.output, s.next_out, g - s.avail_out), y -= s.avail_in, g -= s.avail_out, s.total_in += y, s.total_out += g, r.total += g, r.wrap & 4 && g && (s.adler = r.check = /*UPDATE_CHECK(state.check, strm.next_out - _out, _out);*/
+  return s.next_out = l, s.avail_out = d, s.next_in = o, s.avail_in = c, r.hold = a, r.bits = p, (r.wsize || g !== s.avail_out && r.mode < BAD && (r.mode < CHECK || i !== Z_FINISH$1)) && updatewindow(s, s.output, s.next_out, g - s.avail_out), y -= s.avail_in, g -= s.avail_out, s.total_in += y, s.total_out += g, r.total += g, r.wrap & 4 && g && (s.adler = r.check = /*UPDATE_CHECK(state.check, strm.next_out - _out, _out);*/
   r.flags ? crc32(r.check, m, g, s.next_out - g) : adler32(r.check, m, g, s.next_out - g)), s.data_type = r.bits + (r.last ? 64 : 0) + (r.mode === TYPE ? 128 : 0) + (r.mode === LEN_ || r.mode === COPY_ ? 256 : 0), (y === 0 && g === 0 || i === Z_FINISH$1) && P === Z_OK$1 && (P = Z_BUF_ERROR), P;
 }, inflateEnd = (s) => {
   if (inflateStateCheck(s))
@@ -866,8 +866,8 @@ const fixedtables = (s) => {
   return (r.wrap & 2) === 0 ? Z_STREAM_ERROR$1 : (r.head = i, i.done = !1, Z_OK$1);
 }, inflateSetDictionary = (s, i) => {
   const r = i.length;
-  let l, m, o;
-  return inflateStateCheck(s) || (l = s.state, l.wrap !== 0 && l.mode !== DICT) ? Z_STREAM_ERROR$1 : l.mode === DICT && (m = 1, m = adler32(m, i, r, 0), m !== l.check) ? Z_DATA_ERROR$1 : (o = updatewindow(s, i, r, r), o ? (l.mode = MEM, Z_MEM_ERROR$1) : (l.havedict = 1, Z_OK$1));
+  let u, m, o;
+  return inflateStateCheck(s) || (u = s.state, u.wrap !== 0 && u.mode !== DICT) ? Z_STREAM_ERROR$1 : u.mode === DICT && (m = 1, m = adler32(m, i, r, 0), m !== u.check) ? Z_DATA_ERROR$1 : (o = updatewindow(s, i, r, r), o ? (u.mode = MEM, Z_MEM_ERROR$1) : (u.havedict = 1, Z_OK$1));
 };
 inflate$2.inflateReset = inflateReset;
 inflate$2.inflateReset2 = inflateReset2;
@@ -888,20 +888,20 @@ common$1.assign = function(s) {
     if (r) {
       if (typeof r != "object")
         throw new TypeError(r + "must be non-object");
-      for (const l in r)
-        _has(r, l) && (s[l] = r[l]);
+      for (const u in r)
+        _has(r, u) && (s[u] = r[u]);
     }
   }
   return s;
 };
 common$1.flattenChunks = (s) => {
   let i = 0;
-  for (let l = 0, m = s.length; l < m; l++)
-    i += s[l].length;
+  for (let u = 0, m = s.length; u < m; u++)
+    i += s[u].length;
   const r = new Uint8Array(i);
-  for (let l = 0, m = 0, o = s.length; l < o; l++) {
-    let u = s[l];
-    r.set(u, m), m += u.length;
+  for (let u = 0, m = 0, o = s.length; u < o; u++) {
+    let l = s[u];
+    r.set(l, m), m += l.length;
   }
   return r;
 };
@@ -919,45 +919,45 @@ _utf8len[254] = _utf8len[254] = 1;
 strings$1.string2buf = (s) => {
   if (typeof TextEncoder == "function" && TextEncoder.prototype.encode)
     return new TextEncoder().encode(s);
-  let i, r, l, m, o, u = s.length, c = 0;
-  for (m = 0; m < u; m++)
-    r = s.charCodeAt(m), (r & 64512) === 55296 && m + 1 < u && (l = s.charCodeAt(m + 1), (l & 64512) === 56320 && (r = 65536 + (r - 55296 << 10) + (l - 56320), m++)), c += r < 128 ? 1 : r < 2048 ? 2 : r < 65536 ? 3 : 4;
+  let i, r, u, m, o, l = s.length, c = 0;
+  for (m = 0; m < l; m++)
+    r = s.charCodeAt(m), (r & 64512) === 55296 && m + 1 < l && (u = s.charCodeAt(m + 1), (u & 64512) === 56320 && (r = 65536 + (r - 55296 << 10) + (u - 56320), m++)), c += r < 128 ? 1 : r < 2048 ? 2 : r < 65536 ? 3 : 4;
   for (i = new Uint8Array(c), o = 0, m = 0; o < c; m++)
-    r = s.charCodeAt(m), (r & 64512) === 55296 && m + 1 < u && (l = s.charCodeAt(m + 1), (l & 64512) === 56320 && (r = 65536 + (r - 55296 << 10) + (l - 56320), m++)), r < 128 ? i[o++] = r : r < 2048 ? (i[o++] = 192 | r >>> 6, i[o++] = 128 | r & 63) : r < 65536 ? (i[o++] = 224 | r >>> 12, i[o++] = 128 | r >>> 6 & 63, i[o++] = 128 | r & 63) : (i[o++] = 240 | r >>> 18, i[o++] = 128 | r >>> 12 & 63, i[o++] = 128 | r >>> 6 & 63, i[o++] = 128 | r & 63);
+    r = s.charCodeAt(m), (r & 64512) === 55296 && m + 1 < l && (u = s.charCodeAt(m + 1), (u & 64512) === 56320 && (r = 65536 + (r - 55296 << 10) + (u - 56320), m++)), r < 128 ? i[o++] = r : r < 2048 ? (i[o++] = 192 | r >>> 6, i[o++] = 128 | r & 63) : r < 65536 ? (i[o++] = 224 | r >>> 12, i[o++] = 128 | r >>> 6 & 63, i[o++] = 128 | r & 63) : (i[o++] = 240 | r >>> 18, i[o++] = 128 | r >>> 12 & 63, i[o++] = 128 | r >>> 6 & 63, i[o++] = 128 | r & 63);
   return i;
 };
 const buf2binstring = (s, i) => {
   if (i < 65534 && s.subarray && STR_APPLY_UIA_OK)
     return String.fromCharCode.apply(null, s.length === i ? s : s.subarray(0, i));
   let r = "";
-  for (let l = 0; l < i; l++)
-    r += String.fromCharCode(s[l]);
+  for (let u = 0; u < i; u++)
+    r += String.fromCharCode(s[u]);
   return r;
 };
 strings$1.buf2string = (s, i) => {
   const r = i || s.length;
   if (typeof TextDecoder == "function" && TextDecoder.prototype.decode)
     return new TextDecoder().decode(s.subarray(0, i));
-  let l, m;
+  let u, m;
   const o = new Array(r * 2);
-  for (m = 0, l = 0; l < r; ) {
-    let u = s[l++];
-    if (u < 128) {
-      o[m++] = u;
+  for (m = 0, u = 0; u < r; ) {
+    let l = s[u++];
+    if (l < 128) {
+      o[m++] = l;
       continue;
     }
-    let c = _utf8len[u];
+    let c = _utf8len[l];
     if (c > 4) {
-      o[m++] = 65533, l += c - 1;
+      o[m++] = 65533, u += c - 1;
       continue;
     }
-    for (u &= c === 2 ? 31 : c === 3 ? 15 : 7; c > 1 && l < r; )
-      u = u << 6 | s[l++] & 63, c--;
+    for (l &= c === 2 ? 31 : c === 3 ? 15 : 7; c > 1 && u < r; )
+      l = l << 6 | s[u++] & 63, c--;
     if (c > 1) {
       o[m++] = 65533;
       continue;
     }
-    u < 65536 ? o[m++] = u : (u -= 65536, o[m++] = 55296 | u >> 10 & 1023, o[m++] = 56320 | u & 1023);
+    l < 65536 ? o[m++] = l : (l -= 65536, o[m++] = 55296 | l >> 10 & 1023, o[m++] = 56320 | l & 1023);
   }
   return buf2binstring(o, m);
 };
@@ -1023,12 +1023,12 @@ function Inflate(s) {
     throw new Error(msg[r]);
 }
 Inflate.prototype.push = function(s, i) {
-  const r = this.strm, l = this.options.chunkSize, m = this.options.dictionary;
-  let o, u, c;
+  const r = this.strm, u = this.options.chunkSize, m = this.options.dictionary;
+  let o, l, c;
   if (this.ended) return !1;
-  for (i === ~~i ? u = i : u = i === !0 ? Z_FINISH : Z_NO_FLUSH, toString.call(s) === "[object ArrayBuffer]" ? r.input = new Uint8Array(s) : r.input = s, r.next_in = 0, r.avail_in = r.input.length; ; ) {
-    for (r.avail_out === 0 && (r.output = new Uint8Array(l), r.next_out = 0, r.avail_out = l), o = zlib_inflate.inflate(r, u), o === Z_NEED_DICT && m && (o = zlib_inflate.inflateSetDictionary(r, m), o === Z_OK ? o = zlib_inflate.inflate(r, u) : o === Z_DATA_ERROR && (o = Z_NEED_DICT)); r.avail_in > 0 && o === Z_STREAM_END && r.state.wrap > 0 && s[r.next_in] !== 0; )
-      zlib_inflate.inflateReset(r), o = zlib_inflate.inflate(r, u);
+  for (i === ~~i ? l = i : l = i === !0 ? Z_FINISH : Z_NO_FLUSH, toString.call(s) === "[object ArrayBuffer]" ? r.input = new Uint8Array(s) : r.input = s, r.next_in = 0, r.avail_in = r.input.length; ; ) {
+    for (r.avail_out === 0 && (r.output = new Uint8Array(u), r.next_out = 0, r.avail_out = u), o = zlib_inflate.inflate(r, l), o === Z_NEED_DICT && m && (o = zlib_inflate.inflateSetDictionary(r, m), o === Z_OK ? o = zlib_inflate.inflate(r, l) : o === Z_DATA_ERROR && (o = Z_NEED_DICT)); r.avail_in > 0 && o === Z_STREAM_END && r.state.wrap > 0 && s[r.next_in] !== 0; )
+      zlib_inflate.inflateReset(r), o = zlib_inflate.inflate(r, l);
     switch (o) {
       case Z_STREAM_ERROR:
       case Z_DATA_ERROR:
@@ -1039,7 +1039,7 @@ Inflate.prototype.push = function(s, i) {
     if (c = r.avail_out, r.next_out && (r.avail_out === 0 || o === Z_STREAM_END))
       if (this.options.to === "string") {
         let d = strings.utf8border(r.output, r.next_out), a = r.next_out - d, p = strings.buf2string(r.output, d);
-        r.next_out = a, r.avail_out = l - a, a && r.output.set(r.output.subarray(d, d + a), 0), this.onData(p);
+        r.next_out = a, r.avail_out = u - a, a && r.output.set(r.output.subarray(d, d + a), 0), this.onData(p);
       } else
         this.onData(
           r.output.length === r.next_out ? r.output : r.output.subarray(0, r.next_out)
@@ -1064,9 +1064,9 @@ function inflate(s, i) {
   return r.result;
 }
 var inflate_2 = inflate;
-function f(s, i, r, l, m, o) {
-  let u = s.tileXYToRectangle(r, l, m);
-  return defined(Rectangle$1.intersection(u, i, o));
+function f(s, i, r, u, m, o) {
+  let l = s.tileXYToRectangle(r, u, m);
+  return defined(Rectangle$1.intersection(l, i, o));
 }
 class GeoTerrainProvider {
   constructor(i) {
@@ -1104,33 +1104,33 @@ class GeoTerrainProvider {
     };
     const r = i.credit;
     typeof r == "string" && (this._credit = new Credit(r)), this._rectangles = [];
-    const l = i.ellipsoid ?? Ellipsoid.WGS84;
+    const u = i.ellipsoid ?? Ellipsoid.WGS84;
     this._tilingScheme = new GeographicTilingScheme({
-      ellipsoid: l
+      ellipsoid: u
     }), this._heightmapWidth = 64, this._heightmapHeight = 64, this._levelZeroMaximumGeometricError = TerrainProvider.getEstimatedLevelZeroGeometricErrorForAHeightmap(
-      l,
+      u,
       Math.min(this._heightmapWidth, this._heightmapHeight),
       this._tilingScheme.getNumberOfXTilesAtLevel(0)
     ), this._ready = !0, this._topLevel = i.topLevel ?? 5, this._bottomLevel = i.bottomLevel ?? 25;
   }
-  requestTileGeometry(i, r, l, m) {
+  requestTileGeometry(i, r, u, m) {
     if (!this.ready)
       throw new DeveloperError("requestTileGeometry must not be called before ready returns true.");
-    if (l >= this._bottomLevel) return Promise.reject(`${l}该级别不发送请求!`);
-    if (l < this._topLevel)
+    if (u >= this._bottomLevel) return Promise.reject(`${u}该级别不发送请求!`);
+    if (u < this._topLevel)
       return Promise.resolve(
         new HeightmapTerrainData({
           buffer: this.getVHeightBuffer(),
           width: this._heightmapWidth,
           height: this._heightmapHeight,
-          childTileMask: this.getChildTileMask(i, r, l),
+          childTileMask: this.getChildTileMask(i, r, u),
           structure: this._terrainDataStructure
         })
       );
-    let o = "", u = this._url;
-    Array.isArray(this._subdomains) && this._subdomains.length && (o = this._subdomains[(i + r) % this._subdomains.length], u = u.replace("{s}", o)), u = u.replace("{token}", this._token).replace("{x}", i).replace("{y}", r).replace("{z}", l + 1);
+    let o = "", l = this._url;
+    Array.isArray(this._subdomains) && this._subdomains.length && (o = this._subdomains[(i + r) % this._subdomains.length], l = l.replace("{s}", o)), l = l.replace("{token}", this._token).replace("{x}", i).replace("{y}", r).replace("{z}", u + 1);
     const c = Resource.fetchArrayBuffer({
-      url: u,
+      url: l,
       request: m
     });
     if (c)
@@ -1139,7 +1139,7 @@ class GeoTerrainProvider {
           buffer: this.transformBuffer(d),
           width: this._heightmapWidth,
           height: this._heightmapHeight,
-          childTileMask: this.getChildTileMask(i, r, l),
+          childTileMask: this.getChildTileMask(i, r, u),
           structure: this._terrainDataStructure
         });
         return a._skirtHeight = 6e3, a;
@@ -1150,18 +1150,18 @@ class GeoTerrainProvider {
       throw new DeveloperError("requestTileGeometry must not be called before ready returns true.");
     return this._levelZeroMaximumGeometricError / (1 << i);
   }
-  getTileDataAvailable(i, r, l) {
-    if (l < 25) return !0;
+  getTileDataAvailable(i, r, u) {
+    if (u < 25) return !0;
   }
   transformBuffer(i) {
     let r = 2;
     this._dataType === "int" ? r = 2 : this._dataType === "float" && (r = 4);
-    let l = i;
-    if (l.length !== 22500 * r) return null;
-    let m, o, u, c, d = new ArrayBuffer(r), a = new DataView(d), p = this._heightmapWidth, y = this._heightmapHeight, g = new Uint8Array(p * y * 4);
+    let u = i;
+    if (u.length !== 22500 * r) return null;
+    let m, o, l, c, d = new ArrayBuffer(r), a = new DataView(d), p = this._heightmapWidth, y = this._heightmapHeight, g = new Uint8Array(p * y * 4);
     for (let h = 0; h < y; h++)
       for (let v = 0; v < p; v++) {
-        u = parseInt(149 * h / (y - 1)), c = parseInt(149 * v / (p - 1)), o = r * (150 * u + c), r === 4 ? (a.setInt8(0, l[o]), a.setInt8(1, l[o + 1]), a.setInt8(2, l[o + 2]), a.setInt8(3, l[o + 3]), m = a.getFloat32(0, !0)) : m = l[o] + 256 * l[o + 1], (1e4 < m || m < -2e3) && (m = 0);
+        l = parseInt(149 * h / (y - 1)), c = parseInt(149 * v / (p - 1)), o = r * (150 * l + c), r === 4 ? (a.setInt8(0, u[o]), a.setInt8(1, u[o + 1]), a.setInt8(2, u[o + 2]), a.setInt8(3, u[o + 3]), m = a.getFloat32(0, !0)) : m = u[o] + 256 * u[o + 1], (1e4 < m || m < -2e3) && (m = 0);
         let b = (m + 1e3) / 1e-3, _ = 4 * (h * p + v);
         g[_] = b / 65536, g[1 + _] = (b - 256 * g[_] * 256) / 256, g[2 + _] = b - 256 * g[_] * 256 - 256 * g[1 + _], g[3 + _] = 255;
       }
@@ -1177,13 +1177,13 @@ class GeoTerrainProvider {
     }
     return i;
   }
-  getChildTileMask(i, r, l) {
-    let m = new Rectangle$1(), o = this._tilingScheme, u = this._rectangles, c = o.tileXYToRectangle(i, r, l), d = 0;
-    for (let a = 0; a < u.length && d !== 15; ++a) {
-      let p = u[a];
-      if (!(p.maxLevel <= l)) {
+  getChildTileMask(i, r, u) {
+    let m = new Rectangle$1(), o = this._tilingScheme, l = this._rectangles, c = o.tileXYToRectangle(i, r, u), d = 0;
+    for (let a = 0; a < l.length && d !== 15; ++a) {
+      let p = l[a];
+      if (!(p.maxLevel <= u)) {
         let y = p.rectangle, g = Rectangle$1.intersection(y, c, m);
-        defined(g) && (f(o, y, 2 * i, 2 * r, l + 1, m) && (d |= 4), f(o, y, 2 * i + 1, 2 * r, l + 1, m) && (d |= 8), f(o, y, 2 * i, 2 * r + 1, l + 1, m) && (d |= 1), f(o, y, 2 * i + 1, 2 * r + 1, l + 1, m) && (d |= 2));
+        defined(g) && (f(o, y, 2 * i, 2 * r, u + 1, m) && (d |= 4), f(o, y, 2 * i + 1, 2 * r, u + 1, m) && (d |= 8), f(o, y, 2 * i, 2 * r + 1, u + 1, m) && (d |= 1), f(o, y, 2 * i + 1, 2 * r + 1, u + 1, m) && (d |= 2));
       }
     }
     return d;
@@ -1194,20 +1194,20 @@ function requireAspromise() {
   if (hasRequiredAspromise) return aspromise;
   hasRequiredAspromise = 1, aspromise = s;
   function s(i, r) {
-    for (var l = new Array(arguments.length - 1), m = 0, o = 2, u = !0; o < arguments.length; ) l[m++] = arguments[o++];
+    for (var u = new Array(arguments.length - 1), m = 0, o = 2, l = !0; o < arguments.length; ) u[m++] = arguments[o++];
     return new Promise(function(d, a) {
-      l[m] = function(y) {
-        if (u)
-          if (u = !1, y) a(y);
+      u[m] = function(y) {
+        if (l)
+          if (l = !1, y) a(y);
           else {
             for (var g = new Array(arguments.length - 1), h = 0; h < g.length; ) g[h++] = arguments[h];
             d.apply(null, g);
           }
       };
       try {
-        i.apply(r || null, l);
+        i.apply(r || null, u);
       } catch (p) {
-        u && (u = !1, a(p));
+        l && (l = !1, a(p));
       }
     });
   }
@@ -1223,8 +1223,8 @@ function requireBase64() {
       for (var a = 0; --d % 4 > 1 && c.charAt(d) === "="; ) ++a;
       return Math.ceil(c.length * 3) / 4 - a;
     };
-    for (var r = new Array(64), l = new Array(123), m = 0; m < 64; )
-      l[r[m] = m < 26 ? m + 65 : m < 52 ? m + 71 : m < 62 ? m - 4 : m - 59 | 43] = m++;
+    for (var r = new Array(64), u = new Array(123), m = 0; m < 64; )
+      u[r[m] = m < 26 ? m + 65 : m < 52 ? m + 71 : m < 62 ? m - 4 : m - 59 | 43] = m++;
     i.encode = function(c, d, a) {
       for (var p = null, y = [], g = 0, h = 0, v; d < a; ) {
         var b = c[d++];
@@ -1248,7 +1248,7 @@ function requireBase64() {
       for (var p = a, y = 0, g, h = 0; h < c.length; ) {
         var v = c.charCodeAt(h++);
         if (v === 61 && y > 1) break;
-        if ((v = l[v]) === void 0) throw Error(o);
+        if ((v = u[v]) === void 0) throw Error(o);
         switch (y) {
           case 0:
             g = v, y = 1;
@@ -1278,23 +1278,23 @@ function requireEventemitter() {
   function s() {
     this._listeners = {};
   }
-  return s.prototype.on = function(r, l, m) {
+  return s.prototype.on = function(r, u, m) {
     return (this._listeners[r] || (this._listeners[r] = [])).push({
-      fn: l,
+      fn: u,
       ctx: m || this
     }), this;
-  }, s.prototype.off = function(r, l) {
+  }, s.prototype.off = function(r, u) {
     if (r === void 0) this._listeners = {};
-    else if (l === void 0) this._listeners[r] = [];
+    else if (u === void 0) this._listeners[r] = [];
     else
       for (var m = this._listeners[r], o = 0; o < m.length; )
-        m[o].fn === l ? m.splice(o, 1) : ++o;
+        m[o].fn === u ? m.splice(o, 1) : ++o;
     return this;
   }, s.prototype.emit = function(r) {
-    var l = this._listeners[r];
-    if (l) {
+    var u = this._listeners[r];
+    if (u) {
       for (var m = [], o = 1; o < arguments.length; ) m.push(arguments[o++]);
-      for (o = 0; o < l.length; ) l[o].fn.apply(l[o++].ctx, m);
+      for (o = 0; o < u.length; ) u[o].fn.apply(u[o++].ctx, m);
     }
     return this;
   }, eventemitter;
@@ -1305,23 +1305,23 @@ function requireFloat() {
   hasRequiredFloat = 1, float = s(s);
   function s(o) {
     return typeof Float32Array < "u" ? function() {
-      var u = new Float32Array([-0]), c = new Uint8Array(u.buffer), d = c[3] === 128;
+      var l = new Float32Array([-0]), c = new Uint8Array(l.buffer), d = c[3] === 128;
       function a(h, v, b) {
-        u[0] = h, v[b] = c[0], v[b + 1] = c[1], v[b + 2] = c[2], v[b + 3] = c[3];
+        l[0] = h, v[b] = c[0], v[b + 1] = c[1], v[b + 2] = c[2], v[b + 3] = c[3];
       }
       function p(h, v, b) {
-        u[0] = h, v[b] = c[3], v[b + 1] = c[2], v[b + 2] = c[1], v[b + 3] = c[0];
+        l[0] = h, v[b] = c[3], v[b + 1] = c[2], v[b + 2] = c[1], v[b + 3] = c[0];
       }
       o.writeFloatLE = d ? a : p, o.writeFloatBE = d ? p : a;
       function y(h, v) {
-        return c[0] = h[v], c[1] = h[v + 1], c[2] = h[v + 2], c[3] = h[v + 3], u[0];
+        return c[0] = h[v], c[1] = h[v + 1], c[2] = h[v + 2], c[3] = h[v + 3], l[0];
       }
       function g(h, v) {
-        return c[3] = h[v], c[2] = h[v + 1], c[1] = h[v + 2], c[0] = h[v + 3], u[0];
+        return c[3] = h[v], c[2] = h[v + 1], c[1] = h[v + 2], c[0] = h[v + 3], l[0];
       }
       o.readFloatLE = d ? y : g, o.readFloatBE = d ? g : y;
     }() : function() {
-      function u(d, a, p, y) {
+      function l(d, a, p, y) {
         var g = a < 0 ? 1 : 0;
         if (g && (a = -a), a === 0)
           d(1 / a > 0 ? (
@@ -1341,30 +1341,30 @@ function requireFloat() {
           d((g << 31 | h + 127 << 23 | v) >>> 0, p, y);
         }
       }
-      o.writeFloatLE = u.bind(null, i), o.writeFloatBE = u.bind(null, r);
+      o.writeFloatLE = l.bind(null, i), o.writeFloatBE = l.bind(null, r);
       function c(d, a, p) {
         var y = d(a, p), g = (y >> 31) * 2 + 1, h = y >>> 23 & 255, v = y & 8388607;
         return h === 255 ? v ? NaN : g * (1 / 0) : h === 0 ? g * 1401298464324817e-60 * v : g * Math.pow(2, h - 150) * (v + 8388608);
       }
-      o.readFloatLE = c.bind(null, l), o.readFloatBE = c.bind(null, m);
+      o.readFloatLE = c.bind(null, u), o.readFloatBE = c.bind(null, m);
     }(), typeof Float64Array < "u" ? function() {
-      var u = new Float64Array([-0]), c = new Uint8Array(u.buffer), d = c[7] === 128;
+      var l = new Float64Array([-0]), c = new Uint8Array(l.buffer), d = c[7] === 128;
       function a(h, v, b) {
-        u[0] = h, v[b] = c[0], v[b + 1] = c[1], v[b + 2] = c[2], v[b + 3] = c[3], v[b + 4] = c[4], v[b + 5] = c[5], v[b + 6] = c[6], v[b + 7] = c[7];
+        l[0] = h, v[b] = c[0], v[b + 1] = c[1], v[b + 2] = c[2], v[b + 3] = c[3], v[b + 4] = c[4], v[b + 5] = c[5], v[b + 6] = c[6], v[b + 7] = c[7];
       }
       function p(h, v, b) {
-        u[0] = h, v[b] = c[7], v[b + 1] = c[6], v[b + 2] = c[5], v[b + 3] = c[4], v[b + 4] = c[3], v[b + 5] = c[2], v[b + 6] = c[1], v[b + 7] = c[0];
+        l[0] = h, v[b] = c[7], v[b + 1] = c[6], v[b + 2] = c[5], v[b + 3] = c[4], v[b + 4] = c[3], v[b + 5] = c[2], v[b + 6] = c[1], v[b + 7] = c[0];
       }
       o.writeDoubleLE = d ? a : p, o.writeDoubleBE = d ? p : a;
       function y(h, v) {
-        return c[0] = h[v], c[1] = h[v + 1], c[2] = h[v + 2], c[3] = h[v + 3], c[4] = h[v + 4], c[5] = h[v + 5], c[6] = h[v + 6], c[7] = h[v + 7], u[0];
+        return c[0] = h[v], c[1] = h[v + 1], c[2] = h[v + 2], c[3] = h[v + 3], c[4] = h[v + 4], c[5] = h[v + 5], c[6] = h[v + 6], c[7] = h[v + 7], l[0];
       }
       function g(h, v) {
-        return c[7] = h[v], c[6] = h[v + 1], c[5] = h[v + 2], c[4] = h[v + 3], c[3] = h[v + 4], c[2] = h[v + 5], c[1] = h[v + 6], c[0] = h[v + 7], u[0];
+        return c[7] = h[v], c[6] = h[v + 1], c[5] = h[v + 2], c[4] = h[v + 3], c[3] = h[v + 4], c[2] = h[v + 5], c[1] = h[v + 6], c[0] = h[v + 7], l[0];
       }
       o.readDoubleLE = d ? y : g, o.readDoubleBE = d ? g : y;
     }() : function() {
-      function u(d, a, p, y, g, h) {
+      function l(d, a, p, y, g, h) {
         var v = y < 0 ? 1 : 0;
         if (v && (y = -y), y === 0)
           d(0, g, h + a), d(1 / y > 0 ? (
@@ -1392,25 +1392,25 @@ function requireFloat() {
           }
         }
       }
-      o.writeDoubleLE = u.bind(null, i, 0, 4), o.writeDoubleBE = u.bind(null, r, 4, 0);
+      o.writeDoubleLE = l.bind(null, i, 0, 4), o.writeDoubleBE = l.bind(null, r, 4, 0);
       function c(d, a, p, y, g) {
         var h = d(y, g + a), v = d(y, g + p), b = (v >> 31) * 2 + 1, _ = v >>> 20 & 2047, T = 4294967296 * (v & 1048575) + h;
         return _ === 2047 ? T ? NaN : b * (1 / 0) : _ === 0 ? b * 5e-324 * T : b * Math.pow(2, _ - 1075) * (T + 4503599627370496);
       }
-      o.readDoubleLE = c.bind(null, l, 0, 4), o.readDoubleBE = c.bind(null, m, 4, 0);
+      o.readDoubleLE = c.bind(null, u, 0, 4), o.readDoubleBE = c.bind(null, m, 4, 0);
     }(), o;
   }
-  function i(o, u, c) {
-    u[c] = o & 255, u[c + 1] = o >>> 8 & 255, u[c + 2] = o >>> 16 & 255, u[c + 3] = o >>> 24;
+  function i(o, l, c) {
+    l[c] = o & 255, l[c + 1] = o >>> 8 & 255, l[c + 2] = o >>> 16 & 255, l[c + 3] = o >>> 24;
   }
-  function r(o, u, c) {
-    u[c] = o >>> 24, u[c + 1] = o >>> 16 & 255, u[c + 2] = o >>> 8 & 255, u[c + 3] = o & 255;
+  function r(o, l, c) {
+    l[c] = o >>> 24, l[c + 1] = o >>> 16 & 255, l[c + 2] = o >>> 8 & 255, l[c + 3] = o & 255;
   }
-  function l(o, u) {
-    return (o[u] | o[u + 1] << 8 | o[u + 2] << 16 | o[u + 3] << 24) >>> 0;
+  function u(o, l) {
+    return (o[l] | o[l + 1] << 8 | o[l + 2] << 16 | o[l + 3] << 24) >>> 0;
   }
-  function m(o, u) {
-    return (o[u] << 24 | o[u + 1] << 16 | o[u + 2] << 8 | o[u + 3]) >>> 0;
+  function m(o, l) {
+    return (o[l] << 24 | o[l + 1] << 16 | o[l + 2] << 8 | o[l + 3]) >>> 0;
   }
   return float;
 }
@@ -1432,20 +1432,20 @@ var utf8$2 = {}, hasRequiredUtf8;
 function requireUtf8() {
   return hasRequiredUtf8 || (hasRequiredUtf8 = 1, function(s) {
     var i = s;
-    i.length = function(l) {
-      for (var m = 0, o = 0, u = 0; u < l.length; ++u)
-        o = l.charCodeAt(u), o < 128 ? m += 1 : o < 2048 ? m += 2 : (o & 64512) === 55296 && (l.charCodeAt(u + 1) & 64512) === 56320 ? (++u, m += 4) : m += 3;
+    i.length = function(u) {
+      for (var m = 0, o = 0, l = 0; l < u.length; ++l)
+        o = u.charCodeAt(l), o < 128 ? m += 1 : o < 2048 ? m += 2 : (o & 64512) === 55296 && (u.charCodeAt(l + 1) & 64512) === 56320 ? (++l, m += 4) : m += 3;
       return m;
-    }, i.read = function(l, m, o) {
-      var u = o - m;
-      if (u < 1) return "";
+    }, i.read = function(u, m, o) {
+      var l = o - m;
+      if (l < 1) return "";
       for (var c = null, d = [], a = 0, p; m < o; )
-        p = l[m++], p < 128 ? d[a++] = p : p > 191 && p < 224 ? d[a++] = (p & 31) << 6 | l[m++] & 63 : p > 239 && p < 365 ? (p = ((p & 7) << 18 | (l[m++] & 63) << 12 | (l[m++] & 63) << 6 | l[m++] & 63) - 65536, d[a++] = 55296 + (p >> 10), d[a++] = 56320 + (p & 1023)) : d[a++] = (p & 15) << 12 | (l[m++] & 63) << 6 | l[m++] & 63, a > 8191 && ((c || (c = [])).push(String.fromCharCode.apply(String, d)), a = 0);
+        p = u[m++], p < 128 ? d[a++] = p : p > 191 && p < 224 ? d[a++] = (p & 31) << 6 | u[m++] & 63 : p > 239 && p < 365 ? (p = ((p & 7) << 18 | (u[m++] & 63) << 12 | (u[m++] & 63) << 6 | u[m++] & 63) - 65536, d[a++] = 55296 + (p >> 10), d[a++] = 56320 + (p & 1023)) : d[a++] = (p & 15) << 12 | (u[m++] & 63) << 6 | u[m++] & 63, a > 8191 && ((c || (c = [])).push(String.fromCharCode.apply(String, d)), a = 0);
       return c ? (a && c.push(String.fromCharCode.apply(String, d.slice(0, a))), c.join("")) : String.fromCharCode.apply(String, d.slice(0, a));
-    }, i.write = function(l, m, o) {
-      for (var u = o, c, d, a = 0; a < l.length; ++a)
-        c = l.charCodeAt(a), c < 128 ? m[o++] = c : c < 2048 ? (m[o++] = c >> 6 | 192, m[o++] = c & 63 | 128) : (c & 64512) === 55296 && ((d = l.charCodeAt(a + 1)) & 64512) === 56320 ? (c = 65536 + ((c & 1023) << 10) + (d & 1023), ++a, m[o++] = c >> 18 | 240, m[o++] = c >> 12 & 63 | 128, m[o++] = c >> 6 & 63 | 128, m[o++] = c & 63 | 128) : (m[o++] = c >> 12 | 224, m[o++] = c >> 6 & 63 | 128, m[o++] = c & 63 | 128);
-      return o - u;
+    }, i.write = function(u, m, o) {
+      for (var l = o, c, d, a = 0; a < u.length; ++a)
+        c = u.charCodeAt(a), c < 128 ? m[o++] = c : c < 2048 ? (m[o++] = c >> 6 | 192, m[o++] = c & 63 | 128) : (c & 64512) === 55296 && ((d = u.charCodeAt(a + 1)) & 64512) === 56320 ? (c = 65536 + ((c & 1023) << 10) + (d & 1023), ++a, m[o++] = c >> 18 | 240, m[o++] = c >> 12 & 63 | 128, m[o++] = c >> 6 & 63 | 128, m[o++] = c & 63 | 128) : (m[o++] = c >> 12 | 224, m[o++] = c >> 6 & 63 | 128, m[o++] = c & 63 | 128);
+      return o - l;
     };
   }(utf8$2)), utf8$2;
 }
@@ -1453,12 +1453,12 @@ var pool_1, hasRequiredPool;
 function requirePool() {
   if (hasRequiredPool) return pool_1;
   hasRequiredPool = 1, pool_1 = s;
-  function s(i, r, l) {
-    var m = l || 8192, o = m >>> 1, u = null, c = m;
+  function s(i, r, u) {
+    var m = u || 8192, o = m >>> 1, l = null, c = m;
     return function(a) {
       if (a < 1 || a > o) return i(a);
-      c + a > m && (u = i(m), c = 0);
-      var p = r.call(u, c, c += a);
+      c + a > m && (l = i(m), c = 0);
+      var p = r.call(l, c, c += a);
       return c & 7 && (c = (c | 7) + 1), p;
     };
   }
@@ -1469,8 +1469,8 @@ function requireLongbits() {
   if (hasRequiredLongbits) return longbits;
   hasRequiredLongbits = 1, longbits = i;
   var s = requireMinimal();
-  function i(o, u) {
-    this.lo = o >>> 0, this.hi = u >>> 0;
+  function i(o, l) {
+    this.lo = o >>> 0, this.hi = l >>> 0;
   }
   var r = i.zero = new i(0, 0);
   r.toNumber = function() {
@@ -1480,40 +1480,40 @@ function requireLongbits() {
   }, r.length = function() {
     return 1;
   };
-  var l = i.zeroHash = "\0\0\0\0\0\0\0\0";
-  i.fromNumber = function(u) {
-    if (u === 0) return r;
-    var c = u < 0;
-    c && (u = -u);
-    var d = u >>> 0, a = (u - d) / 4294967296 >>> 0;
+  var u = i.zeroHash = "\0\0\0\0\0\0\0\0";
+  i.fromNumber = function(l) {
+    if (l === 0) return r;
+    var c = l < 0;
+    c && (l = -l);
+    var d = l >>> 0, a = (l - d) / 4294967296 >>> 0;
     return c && (a = ~a >>> 0, d = ~d >>> 0, ++d > 4294967295 && (d = 0, ++a > 4294967295 && (a = 0))), new i(d, a);
-  }, i.from = function(u) {
-    if (typeof u == "number") return i.fromNumber(u);
-    if (s.isString(u))
-      if (s.Long) u = s.Long.fromString(u);
-      else return i.fromNumber(parseInt(u, 10));
-    return u.low || u.high ? new i(u.low >>> 0, u.high >>> 0) : r;
-  }, i.prototype.toNumber = function(u) {
-    if (!u && this.hi >>> 31) {
+  }, i.from = function(l) {
+    if (typeof l == "number") return i.fromNumber(l);
+    if (s.isString(l))
+      if (s.Long) l = s.Long.fromString(l);
+      else return i.fromNumber(parseInt(l, 10));
+    return l.low || l.high ? new i(l.low >>> 0, l.high >>> 0) : r;
+  }, i.prototype.toNumber = function(l) {
+    if (!l && this.hi >>> 31) {
       var c = ~this.lo + 1 >>> 0, d = ~this.hi >>> 0;
       return c || (d = d + 1 >>> 0), -(c + d * 4294967296);
     }
     return this.lo + this.hi * 4294967296;
-  }, i.prototype.toLong = function(u) {
-    return s.Long ? new s.Long(this.lo | 0, this.hi | 0, !!u) : (
+  }, i.prototype.toLong = function(l) {
+    return s.Long ? new s.Long(this.lo | 0, this.hi | 0, !!l) : (
       /* istanbul ignore next */
       {
         low: this.lo | 0,
         high: this.hi | 0,
-        unsigned: !!u
+        unsigned: !!l
       }
     );
   };
   var m = String.prototype.charCodeAt;
-  return i.fromHash = function(u) {
-    return u === l ? r : new i(
-      (m.call(u, 0) | m.call(u, 1) << 8 | m.call(u, 2) << 16 | m.call(u, 3) << 24) >>> 0,
-      (m.call(u, 4) | m.call(u, 5) << 8 | m.call(u, 6) << 16 | m.call(u, 7) << 24) >>> 0
+  return i.fromHash = function(l) {
+    return l === u ? r : new i(
+      (m.call(l, 0) | m.call(l, 1) << 8 | m.call(l, 2) << 16 | m.call(l, 3) << 24) >>> 0,
+      (m.call(l, 4) | m.call(l, 5) << 8 | m.call(l, 6) << 16 | m.call(l, 7) << 24) >>> 0
     );
   }, i.prototype.toHash = function() {
     return String.fromCharCode(
@@ -1527,14 +1527,14 @@ function requireLongbits() {
       this.hi >>> 24
     );
   }, i.prototype.zzEncode = function() {
-    var u = this.hi >> 31;
-    return this.hi = ((this.hi << 1 | this.lo >>> 31) ^ u) >>> 0, this.lo = (this.lo << 1 ^ u) >>> 0, this;
+    var l = this.hi >> 31;
+    return this.hi = ((this.hi << 1 | this.lo >>> 31) ^ l) >>> 0, this.lo = (this.lo << 1 ^ l) >>> 0, this;
   }, i.prototype.zzDecode = function() {
-    var u = -(this.lo & 1);
-    return this.lo = ((this.lo >>> 1 | this.hi << 31) ^ u) >>> 0, this.hi = (this.hi >>> 1 ^ u) >>> 0, this;
+    var l = -(this.lo & 1);
+    return this.lo = ((this.lo >>> 1 | this.hi << 31) ^ l) >>> 0, this.hi = (this.hi >>> 1 ^ l) >>> 0, this;
   }, i.prototype.length = function() {
-    var u = this.lo, c = (this.lo >>> 28 | this.hi << 4) >>> 0, d = this.hi >>> 24;
-    return d === 0 ? c === 0 ? u < 16384 ? u < 128 ? 1 : 2 : u < 2097152 ? 3 : 4 : c < 16384 ? c < 128 ? 5 : 6 : c < 2097152 ? 7 : 8 : d < 128 ? 9 : 10;
+    var l = this.lo, c = (this.lo >>> 28 | this.hi << 4) >>> 0, d = this.hi >>> 24;
+    return d === 0 ? c === 0 ? l < 16384 ? l < 128 ? 1 : 2 : l < 2097152 ? 3 : 4 : c < 16384 ? c < 128 ? 5 : 6 : c < 2097152 ? 7 : 8 : d < 128 ? 9 : 10;
   }, longbits;
 }
 var hasRequiredMinimal;
@@ -1560,9 +1560,9 @@ function requireMinimal() {
      * @param {string} prop Property name
      * @returns {boolean} `true` if considered to be present, otherwise `false`
      */
-    i.isSet = function(o, u) {
-      var c = o[u];
-      return c != null && o.hasOwnProperty(u) ? typeof c != "object" || (Array.isArray(c) ? c.length : Object.keys(c).length) > 0 : !1;
+    i.isSet = function(o, l) {
+      var c = o[l];
+      return c != null && o.hasOwnProperty(l) ? typeof c != "object" || (Array.isArray(c) ? c.length : Object.keys(c).length) > 0 : !1;
     }, i.Buffer = function() {
       try {
         var m = i.inquire("buffer").Buffer;
@@ -1580,24 +1580,24 @@ function requireMinimal() {
     i.global.dcodeIO.Long || /* istanbul ignore next */
     i.global.Long || i.inquire("long"), i.key2Re = /^true|false|0|1$/, i.key32Re = /^-?(?:0|[1-9][0-9]*)$/, i.key64Re = /^(?:[\\x00-\\xff]{8}|-?(?:0|[1-9][0-9]*))$/, i.longToHash = function(o) {
       return o ? i.LongBits.from(o).toHash() : i.LongBits.zeroHash;
-    }, i.longFromHash = function(o, u) {
+    }, i.longFromHash = function(o, l) {
       var c = i.LongBits.fromHash(o);
-      return i.Long ? i.Long.fromBits(c.lo, c.hi, u) : c.toNumber(!!u);
+      return i.Long ? i.Long.fromBits(c.lo, c.hi, l) : c.toNumber(!!l);
     };
-    function r(m, o, u) {
+    function r(m, o, l) {
       for (var c = Object.keys(o), d = 0; d < c.length; ++d)
-        (m[c[d]] === void 0 || !u) && (m[c[d]] = o[c[d]]);
+        (m[c[d]] === void 0 || !l) && (m[c[d]] = o[c[d]]);
       return m;
     }
     i.merge = r, i.lcFirst = function(o) {
       return o.charAt(0).toLowerCase() + o.substring(1);
     };
-    function l(m) {
-      function o(u, c) {
-        if (!(this instanceof o)) return new o(u, c);
+    function u(m) {
+      function o(l, c) {
+        if (!(this instanceof o)) return new o(l, c);
         Object.defineProperty(this, "message", {
           get: function() {
-            return u;
+            return l;
           }
         }), Error.captureStackTrace ? Error.captureStackTrace(this, o) : Object.defineProperty(this, "stack", {
           value: new Error().stack || ""
@@ -1632,17 +1632,17 @@ function requireMinimal() {
         }
       }), o;
     }
-    i.newError = l, i.ProtocolError = l("ProtocolError"), i.oneOfGetter = function(o) {
-      for (var u = {}, c = 0; c < o.length; ++c) u[o[c]] = 1;
+    i.newError = u, i.ProtocolError = u("ProtocolError"), i.oneOfGetter = function(o) {
+      for (var l = {}, c = 0; c < o.length; ++c) l[o[c]] = 1;
       return function() {
         for (var d = Object.keys(this), a = d.length - 1; a > -1; --a)
-          if (u[d[a]] === 1 && this[d[a]] !== void 0 && this[d[a]] !== null)
+          if (l[d[a]] === 1 && this[d[a]] !== void 0 && this[d[a]] !== null)
             return d[a];
       };
     }, i.oneOfSetter = function(o) {
-      return function(u) {
+      return function(l) {
         for (var c = 0; c < o.length; ++c)
-          o[c] !== u && delete this[o[c]];
+          o[c] !== l && delete this[o[c]];
       };
     }, i.toJSONOptions = {
       longs: String,
@@ -1655,10 +1655,10 @@ function requireMinimal() {
         i._Buffer_from = i._Buffer_allocUnsafe = null;
         return;
       }
-      i._Buffer_from = m.from !== Uint8Array.from && m.from || function(u, c) {
-        return new m(u, c);
-      }, i._Buffer_allocUnsafe = m.allocUnsafe || function(u) {
-        return new m(u);
+      i._Buffer_from = m.from !== Uint8Array.from && m.from || function(l, c) {
+        return new m(l, c);
+      }, i._Buffer_allocUnsafe = m.allocUnsafe || function(l) {
+        return new m(l);
       };
     };
   }(minimal)), minimal;
@@ -1692,8 +1692,8 @@ Writer$1.alloc = function s(i) {
   return new util$7.Array(i);
 };
 util$7.Array !== Array && (Writer$1.alloc = util$7.pool(Writer$1.alloc, util$7.Array.prototype.subarray));
-Writer$1.prototype._push = function s(i, r, l) {
-  return this.tail = this.tail.next = new Op(i, r, l), this.len += r, this;
+Writer$1.prototype._push = function s(i, r, u) {
+  return this.tail = this.tail.next = new Op(i, r, u), this.len += r, this;
 };
 function writeByte(s, i, r) {
   i[r] = s & 255;
@@ -1757,20 +1757,20 @@ Writer$1.prototype.float = function s(i) {
 Writer$1.prototype.double = function s(i) {
   return this._push(util$7.float.writeDoubleLE, 8, i);
 };
-var writeBytes = util$7.Array.prototype.set ? function s(i, r, l) {
-  r.set(i, l);
+var writeBytes = util$7.Array.prototype.set ? function s(i, r, u) {
+  r.set(i, u);
 } : (
   /* istanbul ignore next */
-  function s(i, r, l) {
-    for (var m = 0; m < i.length; ++m) r[l + m] = i[m];
+  function s(i, r, u) {
+    for (var m = 0; m < i.length; ++m) r[u + m] = i[m];
   }
 );
 Writer$1.prototype.bytes = function s(i) {
   var r = i.length >>> 0;
   if (!r) return this._push(writeByte, 1, 0);
   if (util$7.isString(i)) {
-    var l = Writer$1.alloc(r = base64.length(i));
-    base64.decode(i, l, 0), i = l;
+    var u = Writer$1.alloc(r = base64.length(i));
+    base64.decode(i, u, 0), i = u;
   }
   return this.uint32(r)._push(writeBytes, r, i);
 };
@@ -1785,12 +1785,12 @@ Writer$1.prototype.reset = function s() {
   return this.states ? (this.head = this.states.head, this.tail = this.states.tail, this.len = this.states.len, this.states = this.states.next) : (this.head = this.tail = new Op(noop, 0, 0), this.len = 0), this;
 };
 Writer$1.prototype.ldelim = function s() {
-  var i = this.head, r = this.tail, l = this.len;
-  return this.reset().uint32(l), l && (this.tail.next = i.next, this.tail = r, this.len += l), this;
+  var i = this.head, r = this.tail, u = this.len;
+  return this.reset().uint32(u), u && (this.tail.next = i.next, this.tail = r, this.len += u), this;
 };
 Writer$1.prototype.finish = function s() {
-  for (var i = this.head.next, r = this.constructor.alloc(this.len), l = 0; i; )
-    i.fn(i.val, r, l), l += i.len, i = i.next;
+  for (var i = this.head.next, r = this.constructor.alloc(this.len), u = 0; i; )
+    i.fn(i.val, r, u), u += i.len, i = i.next;
   return r;
 };
 Writer$1._configure = function(s) {
@@ -1803,16 +1803,16 @@ function BufferWriter() {
   Writer.call(this);
 }
 BufferWriter._configure = function() {
-  BufferWriter.alloc = util$6._Buffer_allocUnsafe, BufferWriter.writeBytesBuffer = util$6.Buffer && util$6.Buffer.prototype instanceof Uint8Array && util$6.Buffer.prototype.set.name === "set" ? function(i, r, l) {
-    r.set(i, l);
+  BufferWriter.alloc = util$6._Buffer_allocUnsafe, BufferWriter.writeBytesBuffer = util$6.Buffer && util$6.Buffer.prototype instanceof Uint8Array && util$6.Buffer.prototype.set.name === "set" ? function(i, r, u) {
+    r.set(i, u);
   } : (
     /* istanbul ignore next */
-    function(i, r, l) {
+    function(i, r, u) {
       if (i.copy)
-        i.copy(r, l, 0, i.length);
+        i.copy(r, u, 0, i.length);
       else
         for (var m = 0; m < i.length; )
-          r[l++] = i[m++];
+          r[u++] = i[m++];
     }
   );
 };
@@ -1935,15 +1935,15 @@ Reader$1.prototype.double = function s() {
   return this.pos += 8, i;
 };
 Reader$1.prototype.bytes = function s() {
-  var i = this.uint32(), r = this.pos, l = this.pos + i;
-  if (l > this.len) throw indexOutOfRange(this, i);
+  var i = this.uint32(), r = this.pos, u = this.pos + i;
+  if (u > this.len) throw indexOutOfRange(this, i);
   if (this.pos += i, Array.isArray(this.buf))
-    return this.buf.slice(r, l);
-  if (r === l) {
+    return this.buf.slice(r, u);
+  if (r === u) {
     var m = util$5.Buffer;
     return m ? m.alloc(0) : new this.buf.constructor(0);
   }
-  return this._slice.call(this.buf, r, l);
+  return this._slice.call(this.buf, r, u);
 };
 Reader$1.prototype.string = function s() {
   var i = this.bytes();
@@ -2027,41 +2027,41 @@ function Service$1(s, i, r) {
   if (typeof s != "function") throw TypeError("rpcImpl must be a function");
   util$3.EventEmitter.call(this), this.rpcImpl = s, this.requestDelimited = !!i, this.responseDelimited = !!r;
 }
-Service$1.prototype.rpcCall = function s(i, r, l, m, o) {
+Service$1.prototype.rpcCall = function s(i, r, u, m, o) {
   if (!m) throw TypeError("request must be specified");
-  var u = this;
-  if (!o) return util$3.asPromise(s, u, i, r, l, m);
-  if (!u.rpcImpl) {
+  var l = this;
+  if (!o) return util$3.asPromise(s, l, i, r, u, m);
+  if (!l.rpcImpl) {
     setTimeout(function() {
       o(Error("already ended"));
     }, 0);
     return;
   }
   try {
-    return u.rpcImpl(
+    return l.rpcImpl(
       i,
-      r[u.requestDelimited ? "encodeDelimited" : "encode"](m).finish(),
+      r[l.requestDelimited ? "encodeDelimited" : "encode"](m).finish(),
       function(d, a) {
         if (d)
-          return u.emit("error", d, i), o(d);
+          return l.emit("error", d, i), o(d);
         if (a === null) {
-          u.end(
+          l.end(
             /* endedByRPC */
             !0
           );
           return;
         }
-        if (!(a instanceof l))
+        if (!(a instanceof u))
           try {
-            a = l[u.responseDelimited ? "decodeDelimited" : "decode"](a);
+            a = u[l.responseDelimited ? "decodeDelimited" : "decode"](a);
           } catch (p) {
-            return u.emit("error", p, i), o(p);
+            return l.emit("error", p, i), o(p);
           }
-        return u.emit("data", a, i), o(null, a);
+        return l.emit("data", a, i), o(null, a);
       }
     );
   } catch (c) {
-    u.emit("error", c, i), setTimeout(function() {
+    l.emit("error", c, i), setTimeout(function() {
       o(c);
     }, 0);
     return;
@@ -2087,15 +2087,15 @@ var util$2 = { exports: {} }, codegen_1 = codegen;
 function codegen(s, i) {
   typeof s == "string" && (i = s, s = void 0);
   var r = [];
-  function l(o) {
+  function u(o) {
     if (typeof o != "string") {
-      var u = m();
-      if (codegen.verbose && console.warn("codegen: " + u), u = "return " + u, o) {
+      var l = m();
+      if (codegen.verbose && console.warn("codegen: " + l), l = "return " + l, o) {
         for (var c = Object.keys(o), d = new Array(c.length + 1), a = new Array(c.length), p = 0; p < c.length; )
           d[p] = c[p], a[p] = o[c[p++]];
-        return d[p] = u, Function.apply(null, d).apply(null, a);
+        return d[p] = l, Function.apply(null, d).apply(null, a);
       }
-      return Function(u)();
+      return Function(l)();
     }
     for (var y = new Array(arguments.length - 1), g = 0; g < y.length; )
       y[g] = arguments[++g];
@@ -2114,7 +2114,7 @@ function codegen(s, i) {
       }
       return "%";
     }), g !== y.length) throw Error("parameter count mismatch");
-    return r.push(o), l;
+    return r.push(o), u;
   }
   function m(o) {
     return "function " + (o || i || "") + "(" + (s && s.join(",") || "") + `){
@@ -2122,7 +2122,7 @@ function codegen(s, i) {
   `) + `
 }`;
   }
-  return l.toString = m, l;
+  return u.toString = m, u;
 }
 codegen.verbose = !1;
 var fetch_1 = fetch, asPromise = requireAspromise(), inquire = requireInquire(), fs = inquire("fs");
@@ -2131,21 +2131,21 @@ function fetch(s, i, r) {
     return m && typeof XMLHttpRequest < "u" ? fetch.xhr(s, i, r) : m ? r(m) : r(null, i.binary ? o : o.toString("utf8"));
   }) : fetch.xhr(s, i, r) : asPromise(fetch, this, s, i);
 }
-fetch.xhr = function s(i, r, l) {
+fetch.xhr = function s(i, r, u) {
   var m = new XMLHttpRequest();
   m.onreadystatechange = function() {
     if (m.readyState === 4) {
-      if (m.status !== 0 && m.status !== 200) return l(Error("status " + m.status));
+      if (m.status !== 0 && m.status !== 200) return u(Error("status " + m.status));
       if (r.binary) {
-        var u = m.response;
-        if (!u) {
-          u = [];
+        var l = m.response;
+        if (!l) {
+          l = [];
           for (var c = 0; c < m.responseText.length; ++c)
-            u.push(m.responseText.charCodeAt(c) & 255);
+            l.push(m.responseText.charCodeAt(c) & 255);
         }
-        return l(null, typeof Uint8Array < "u" ? new Uint8Array(u) : u);
+        return u(null, typeof Uint8Array < "u" ? new Uint8Array(l) : l);
       }
-      return l(null, m.responseText);
+      return u(null, m.responseText);
     }
   }, r.binary && ("overrideMimeType" in m && m.overrideMimeType("text/plain; charset=x-user-defined"), m.responseType = "arraybuffer"), m.open("GET", i), m.send();
 };
@@ -2160,7 +2160,7 @@ var path = {};
     i.isAbsolute = function(o) {
       return /^(?:\/|\w+:)/.test(o);
     }
-  ), l = (
+  ), u = (
     /**
      * Normalizes the specified path.
      * @param {string} path Path to normalize
@@ -2168,21 +2168,21 @@ var path = {};
      */
     i.normalize = function(o) {
       o = o.replace(/\\/g, "/").replace(/\/{2,}/g, "/");
-      var u = o.split("/"), c = r(o), d = "";
-      c && (d = u.shift() + "/");
-      for (var a = 0; a < u.length; )
-        u[a] === ".." ? a > 0 && u[a - 1] !== ".." ? u.splice(--a, 2) : c ? u.splice(a, 1) : ++a : u[a] === "." ? u.splice(a, 1) : ++a;
-      return d + u.join("/");
+      var l = o.split("/"), c = r(o), d = "";
+      c && (d = l.shift() + "/");
+      for (var a = 0; a < l.length; )
+        l[a] === ".." ? a > 0 && l[a - 1] !== ".." ? l.splice(--a, 2) : c ? l.splice(a, 1) : ++a : l[a] === "." ? l.splice(a, 1) : ++a;
+      return d + l.join("/");
     }
   );
-  i.resolve = function(o, u, c) {
-    return c || (u = l(u)), r(u) ? u : (c || (o = l(o)), (o = o.replace(/(?:\/|^)[^/]+$/, "")).length ? l(o + "/" + u) : u);
+  i.resolve = function(o, l, c) {
+    return c || (l = u(l)), r(l) ? l : (c || (o = u(o)), (o = o.replace(/(?:\/|^)[^/]+$/, "")).length ? u(o + "/" + l) : l);
   };
 })(path);
 var types$1 = {}, hasRequiredTypes;
 function requireTypes() {
   return hasRequiredTypes || (hasRequiredTypes = 1, function(s) {
-    var i = s, r = requireUtil(), l = [
+    var i = s, r = requireUtil(), u = [
       "double",
       // 0
       "float",
@@ -2214,9 +2214,9 @@ function requireTypes() {
       "bytes"
       // 14
     ];
-    function m(o, u) {
+    function m(o, l) {
       var c = 0, d = {};
-      for (u |= 0; c < o.length; ) d[l[c + u]] = o[c++];
+      for (l |= 0; c < o.length; ) d[u[c + l]] = o[c++];
       return d;
     }
     i.basic = m([
@@ -2358,33 +2358,33 @@ function requireTypes() {
 var field, hasRequiredField;
 function requireField() {
   if (hasRequiredField) return field;
-  hasRequiredField = 1, field = u;
+  hasRequiredField = 1, field = l;
   var s = requireObject();
-  ((u.prototype = Object.create(s.prototype)).constructor = u).className = "Field";
-  var i = require_enum(), r = requireTypes(), l = requireUtil(), m, o = /^required|optional|repeated$/;
-  u.fromJSON = function(d, a) {
-    return new u(d, a.id, a.type, a.rule, a.extend, a.options, a.comment);
+  ((l.prototype = Object.create(s.prototype)).constructor = l).className = "Field";
+  var i = require_enum(), r = requireTypes(), u = requireUtil(), m, o = /^required|optional|repeated$/;
+  l.fromJSON = function(d, a) {
+    return new l(d, a.id, a.type, a.rule, a.extend, a.options, a.comment);
   };
-  function u(c, d, a, p, y, g, h) {
-    if (l.isObject(p) ? (h = y, g = p, p = y = void 0) : l.isObject(y) && (h = g, g = y, y = void 0), s.call(this, c, g), !l.isInteger(d) || d < 0) throw TypeError("id must be a non-negative integer");
-    if (!l.isString(a)) throw TypeError("type must be a string");
+  function l(c, d, a, p, y, g, h) {
+    if (u.isObject(p) ? (h = y, g = p, p = y = void 0) : u.isObject(y) && (h = g, g = y, y = void 0), s.call(this, c, g), !u.isInteger(d) || d < 0) throw TypeError("id must be a non-negative integer");
+    if (!u.isString(a)) throw TypeError("type must be a string");
     if (p !== void 0 && !o.test(p = p.toString().toLowerCase()))
       throw TypeError("rule must be a string rule");
-    if (y !== void 0 && !l.isString(y)) throw TypeError("extend must be a string");
-    p === "proto3_optional" && (p = "optional"), this.rule = p && p !== "optional" ? p : void 0, this.type = a, this.id = d, this.extend = y || void 0, this.required = p === "required", this.optional = !this.required, this.repeated = p === "repeated", this.map = !1, this.message = null, this.partOf = null, this.typeDefault = null, this.defaultValue = null, this.long = l.Long ? r.long[a] !== void 0 : (
+    if (y !== void 0 && !u.isString(y)) throw TypeError("extend must be a string");
+    p === "proto3_optional" && (p = "optional"), this.rule = p && p !== "optional" ? p : void 0, this.type = a, this.id = d, this.extend = y || void 0, this.required = p === "required", this.optional = !this.required, this.repeated = p === "repeated", this.map = !1, this.message = null, this.partOf = null, this.typeDefault = null, this.defaultValue = null, this.long = u.Long ? r.long[a] !== void 0 : (
       /* istanbul ignore next */
       !1
     ), this.bytes = a === "bytes", this.resolvedType = null, this.extensionField = null, this.declaringField = null, this._packed = null, this.comment = h;
   }
-  return Object.defineProperty(u.prototype, "packed", {
+  return Object.defineProperty(l.prototype, "packed", {
     get: function() {
       return this._packed === null && (this._packed = this.getOption("packed") !== !1), this._packed;
     }
-  }), u.prototype.setOption = function(d, a, p) {
+  }), l.prototype.setOption = function(d, a, p) {
     return d === "packed" && (this._packed = null), s.prototype.setOption.call(this, d, a, p);
-  }, u.prototype.toJSON = function(d) {
+  }, l.prototype.toJSON = function(d) {
     var a = d ? !!d.keepComments : !1;
-    return l.toObject([
+    return u.toObject([
       "rule",
       this.rule !== "optional" && this.rule || void 0,
       "type",
@@ -2398,51 +2398,51 @@ function requireField() {
       "comment",
       a ? this.comment : void 0
     ]);
-  }, u.prototype.resolve = function() {
+  }, l.prototype.resolve = function() {
     if (this.resolved) return this;
     if ((this.typeDefault = r.defaults[this.type]) === void 0 ? (this.resolvedType = (this.declaringField ? this.declaringField.parent : this.parent).lookupTypeOrEnum(this.type), this.resolvedType instanceof m ? this.typeDefault = null : this.typeDefault = this.resolvedType.values[Object.keys(this.resolvedType.values)[0]]) : this.options && this.options.proto3_optional && (this.typeDefault = null), this.options && this.options.default != null && (this.typeDefault = this.options.default, this.resolvedType instanceof i && typeof this.typeDefault == "string" && (this.typeDefault = this.resolvedType.values[this.typeDefault])), this.options && ((this.options.packed === !0 || this.options.packed !== void 0 && this.resolvedType && !(this.resolvedType instanceof i)) && delete this.options.packed, Object.keys(this.options).length || (this.options = void 0)), this.long)
-      this.typeDefault = l.Long.fromNumber(this.typeDefault, this.type.charAt(0) === "u"), Object.freeze && Object.freeze(this.typeDefault);
+      this.typeDefault = u.Long.fromNumber(this.typeDefault, this.type.charAt(0) === "u"), Object.freeze && Object.freeze(this.typeDefault);
     else if (this.bytes && typeof this.typeDefault == "string") {
       var d;
-      l.base64.test(this.typeDefault) ? l.base64.decode(
+      u.base64.test(this.typeDefault) ? u.base64.decode(
         this.typeDefault,
-        d = l.newBuffer(l.base64.length(this.typeDefault)),
+        d = u.newBuffer(u.base64.length(this.typeDefault)),
         0
-      ) : l.utf8.write(
+      ) : u.utf8.write(
         this.typeDefault,
-        d = l.newBuffer(l.utf8.length(this.typeDefault)),
+        d = u.newBuffer(u.utf8.length(this.typeDefault)),
         0
       ), this.typeDefault = d;
     }
-    return this.map ? this.defaultValue = l.emptyObject : this.repeated ? this.defaultValue = l.emptyArray : this.defaultValue = this.typeDefault, this.parent instanceof m && (this.parent.ctor.prototype[this.name] = this.defaultValue), s.prototype.resolve.call(this);
-  }, u.d = function(d, a, p, y) {
-    return typeof a == "function" ? a = l.decorateType(a).name : a && typeof a == "object" && (a = l.decorateEnum(a).name), function(h, v) {
-      l.decorateType(h.constructor).add(
-        new u(v, d, a, p, {
+    return this.map ? this.defaultValue = u.emptyObject : this.repeated ? this.defaultValue = u.emptyArray : this.defaultValue = this.typeDefault, this.parent instanceof m && (this.parent.ctor.prototype[this.name] = this.defaultValue), s.prototype.resolve.call(this);
+  }, l.d = function(d, a, p, y) {
+    return typeof a == "function" ? a = u.decorateType(a).name : a && typeof a == "object" && (a = u.decorateEnum(a).name), function(h, v) {
+      u.decorateType(h.constructor).add(
+        new l(v, d, a, p, {
           default: y
         })
       );
     };
-  }, u._configure = function(d) {
+  }, l._configure = function(d) {
     m = d;
   }, field;
 }
 var oneof, hasRequiredOneof;
 function requireOneof() {
   if (hasRequiredOneof) return oneof;
-  hasRequiredOneof = 1, oneof = l;
+  hasRequiredOneof = 1, oneof = u;
   var s = requireObject();
-  ((l.prototype = Object.create(s.prototype)).constructor = l).className = "OneOf";
+  ((u.prototype = Object.create(s.prototype)).constructor = u).className = "OneOf";
   var i = requireField(), r = requireUtil();
-  function l(o, u, c, d) {
-    if (Array.isArray(u) || (c = u, u = void 0), s.call(this, o, c), !(u === void 0 || Array.isArray(u)))
+  function u(o, l, c, d) {
+    if (Array.isArray(l) || (c = l, l = void 0), s.call(this, o, c), !(l === void 0 || Array.isArray(l)))
       throw TypeError("fieldNames must be an Array");
-    this.oneof = u || [], this.fieldsArray = [], this.comment = d;
+    this.oneof = l || [], this.fieldsArray = [], this.comment = d;
   }
-  l.fromJSON = function(u, c) {
-    return new l(u, c.oneof, c.options, c.comment);
-  }, l.prototype.toJSON = function(u) {
-    var c = u ? !!u.keepComments : !1;
+  u.fromJSON = function(l, c) {
+    return new u(l, c.oneof, c.options, c.comment);
+  }, u.prototype.toJSON = function(l) {
+    var c = l ? !!l.keepComments : !1;
     return r.toObject([
       "options",
       this.options,
@@ -2454,34 +2454,34 @@ function requireOneof() {
   };
   function m(o) {
     if (o.parent)
-      for (var u = 0; u < o.fieldsArray.length; ++u)
-        o.fieldsArray[u].parent || o.parent.add(o.fieldsArray[u]);
-  }
-  return l.prototype.add = function(u) {
-    if (!(u instanceof i)) throw TypeError("field must be a Field");
-    return u.parent && u.parent !== this.parent && u.parent.remove(u), this.oneof.push(u.name), this.fieldsArray.push(u), u.partOf = this, m(this), this;
-  }, l.prototype.remove = function(u) {
-    if (!(u instanceof i)) throw TypeError("field must be a Field");
-    var c = this.fieldsArray.indexOf(u);
-    if (c < 0) throw Error(u + " is not a member of " + this);
-    return this.fieldsArray.splice(c, 1), c = this.oneof.indexOf(u.name), c > -1 && this.oneof.splice(c, 1), u.partOf = null, this;
-  }, l.prototype.onAdd = function(u) {
-    s.prototype.onAdd.call(this, u);
+      for (var l = 0; l < o.fieldsArray.length; ++l)
+        o.fieldsArray[l].parent || o.parent.add(o.fieldsArray[l]);
+  }
+  return u.prototype.add = function(l) {
+    if (!(l instanceof i)) throw TypeError("field must be a Field");
+    return l.parent && l.parent !== this.parent && l.parent.remove(l), this.oneof.push(l.name), this.fieldsArray.push(l), l.partOf = this, m(this), this;
+  }, u.prototype.remove = function(l) {
+    if (!(l instanceof i)) throw TypeError("field must be a Field");
+    var c = this.fieldsArray.indexOf(l);
+    if (c < 0) throw Error(l + " is not a member of " + this);
+    return this.fieldsArray.splice(c, 1), c = this.oneof.indexOf(l.name), c > -1 && this.oneof.splice(c, 1), l.partOf = null, this;
+  }, u.prototype.onAdd = function(l) {
+    s.prototype.onAdd.call(this, l);
     for (var c = this, d = 0; d < this.oneof.length; ++d) {
-      var a = u.get(this.oneof[d]);
+      var a = l.get(this.oneof[d]);
       a && !a.partOf && (a.partOf = c, c.fieldsArray.push(a));
     }
     m(this);
-  }, l.prototype.onRemove = function(u) {
+  }, u.prototype.onRemove = function(l) {
     for (var c = 0, d; c < this.fieldsArray.length; ++c)
       (d = this.fieldsArray[c]).parent && d.parent.remove(d);
-    s.prototype.onRemove.call(this, u);
-  }, l.d = function() {
-    for (var u = new Array(arguments.length), c = 0; c < arguments.length; ) u[c] = arguments[c++];
+    s.prototype.onRemove.call(this, l);
+  }, u.d = function() {
+    for (var l = new Array(arguments.length), c = 0; c < arguments.length; ) l[c] = arguments[c++];
     return function(a, p) {
-      r.decorateType(a.constructor).add(new l(p, u)), Object.defineProperty(a, p, {
-        get: r.oneOfGetter(u),
-        set: r.oneOfSetter(u)
+      r.decorateType(a.constructor).add(new u(p, l)), Object.defineProperty(a, p, {
+        get: r.oneOfGetter(l),
+        set: r.oneOfSetter(l)
       });
     };
   }, oneof;
@@ -2492,7 +2492,7 @@ function requireNamespace() {
   hasRequiredNamespace = 1, namespace = d;
   var s = requireObject();
   ((d.prototype = Object.create(s.prototype)).constructor = d).className = "Namespace";
-  var i = requireField(), r = requireUtil(), l = requireOneof(), m, o, u;
+  var i = requireField(), r = requireUtil(), u = requireOneof(), m, o, l;
   d.fromJSON = function(y, g) {
     return new d(y, g.options).addJSON(g.nested);
   };
@@ -2538,16 +2538,16 @@ function requireNamespace() {
       for (var h = Object.keys(y), v = 0, b; v < h.length; ++v)
         b = y[h[v]], g.add(
           // most to least likely
-          (b.fields !== void 0 ? m.fromJSON : b.values !== void 0 ? u.fromJSON : b.methods !== void 0 ? o.fromJSON : b.id !== void 0 ? i.fromJSON : d.fromJSON)(h[v], b)
+          (b.fields !== void 0 ? m.fromJSON : b.values !== void 0 ? l.fromJSON : b.methods !== void 0 ? o.fromJSON : b.id !== void 0 ? i.fromJSON : d.fromJSON)(h[v], b)
         );
     return this;
   }, d.prototype.get = function(y) {
     return this.nested && this.nested[y] || null;
   }, d.prototype.getEnum = function(y) {
-    if (this.nested && this.nested[y] instanceof u) return this.nested[y].values;
+    if (this.nested && this.nested[y] instanceof l) return this.nested[y].values;
     throw Error("no such enum: " + y);
   }, d.prototype.add = function(y) {
-    if (!(y instanceof i && y.extend !== void 0 || y instanceof m || y instanceof l || y instanceof u || y instanceof o || y instanceof d))
+    if (!(y instanceof i && y.extend !== void 0 || y instanceof m || y instanceof u || y instanceof l || y instanceof o || y instanceof d))
       throw TypeError("object must be a valid nested object");
     if (!this.nested) this.nested = {};
     else {
@@ -2600,11 +2600,11 @@ function requireNamespace() {
     if (!g) throw Error("no such type: " + y);
     return g;
   }, d.prototype.lookupEnum = function(y) {
-    var g = this.lookup(y, [u]);
+    var g = this.lookup(y, [l]);
     if (!g) throw Error("no such Enum '" + y + "' in " + this);
     return g;
   }, d.prototype.lookupTypeOrEnum = function(y) {
-    var g = this.lookup(y, [m, u]);
+    var g = this.lookup(y, [m, l]);
     if (!g) throw Error("no such Type or Enum '" + y + "' in " + this);
     return g;
   }, d.prototype.lookupService = function(y) {
@@ -2612,24 +2612,24 @@ function requireNamespace() {
     if (!g) throw Error("no such Service '" + y + "' in " + this);
     return g;
   }, d._configure = function(p, y, g) {
-    m = p, o = y, u = g;
+    m = p, o = y, l = g;
   }, namespace;
 }
 var mapfield, hasRequiredMapfield;
 function requireMapfield() {
   if (hasRequiredMapfield) return mapfield;
-  hasRequiredMapfield = 1, mapfield = l;
+  hasRequiredMapfield = 1, mapfield = u;
   var s = requireField();
-  ((l.prototype = Object.create(s.prototype)).constructor = l).className = "MapField";
+  ((u.prototype = Object.create(s.prototype)).constructor = u).className = "MapField";
   var i = requireTypes(), r = requireUtil();
-  function l(m, o, u, c, d, a) {
-    if (s.call(this, m, o, c, void 0, void 0, d, a), !r.isString(u)) throw TypeError("keyType must be a string");
-    this.keyType = u, this.resolvedKeyType = null, this.map = !0;
-  }
-  return l.fromJSON = function(o, u) {
-    return new l(o, u.id, u.keyType, u.type, u.options, u.comment);
-  }, l.prototype.toJSON = function(o) {
-    var u = o ? !!o.keepComments : !1;
+  function u(m, o, l, c, d, a) {
+    if (s.call(this, m, o, c, void 0, void 0, d, a), !r.isString(l)) throw TypeError("keyType must be a string");
+    this.keyType = l, this.resolvedKeyType = null, this.map = !0;
+  }
+  return u.fromJSON = function(o, l) {
+    return new u(o, l.id, l.keyType, l.type, l.options, l.comment);
+  }, u.prototype.toJSON = function(o) {
+    var l = o ? !!o.keepComments : !1;
     return r.toObject([
       "keyType",
       this.keyType,
@@ -2642,15 +2642,15 @@ function requireMapfield() {
       "options",
       this.options,
       "comment",
-      u ? this.comment : void 0
+      l ? this.comment : void 0
     ]);
-  }, l.prototype.resolve = function() {
+  }, u.prototype.resolve = function() {
     if (this.resolved) return this;
     if (i.mapKey[this.keyType] === void 0) throw Error("invalid key type: " + this.keyType);
     return s.prototype.resolve.call(this);
-  }, l.d = function(o, u, c) {
+  }, u.d = function(o, l, c) {
     return typeof c == "function" ? c = r.decorateType(c).name : c && typeof c == "object" && (c = r.decorateEnum(c).name), function(a, p) {
-      r.decorateType(a.constructor).add(new l(p, o, u, c));
+      r.decorateType(a.constructor).add(new u(p, o, l, c));
     };
   }, mapfield;
 }
@@ -2661,11 +2661,11 @@ function requireMethod() {
   var s = requireObject();
   ((r.prototype = Object.create(s.prototype)).constructor = r).className = "Method";
   var i = requireUtil();
-  function r(l, m, o, u, c, d, a, p, y) {
+  function r(u, m, o, l, c, d, a, p, y) {
     if (i.isObject(c) ? (a = c, c = d = void 0) : i.isObject(d) && (a = d, d = void 0), !(m === void 0 || i.isString(m))) throw TypeError("type must be a string");
     if (!i.isString(o)) throw TypeError("requestType must be a string");
-    if (!i.isString(u)) throw TypeError("responseType must be a string");
-    s.call(this, l, a), this.type = m || "rpc", this.requestType = o, this.requestStream = c ? !0 : void 0, this.responseType = u, this.responseStream = d ? !0 : void 0, this.resolvedRequestType = null, this.resolvedResponseType = null, this.comment = p, this.parsedOptions = y;
+    if (!i.isString(l)) throw TypeError("responseType must be a string");
+    s.call(this, u, a), this.type = m || "rpc", this.requestType = o, this.requestStream = c ? !0 : void 0, this.responseType = l, this.responseStream = d ? !0 : void 0, this.resolvedRequestType = null, this.resolvedResponseType = null, this.comment = p, this.parsedOptions = y;
   }
   return r.fromJSON = function(m, o) {
     return new r(
@@ -2710,9 +2710,9 @@ function requireService() {
   hasRequiredService = 1, service = m;
   var s = requireNamespace();
   ((m.prototype = Object.create(s.prototype)).constructor = m).className = "Service";
-  var i = requireMethod(), r = requireUtil(), l = rpc;
-  function m(u, c) {
-    s.call(this, u, c), this.methods = {}, this._methodsArray = null;
+  var i = requireMethod(), r = requireUtil(), u = rpc;
+  function m(l, c) {
+    s.call(this, l, c), this.methods = {}, this._methodsArray = null;
   }
   m.fromJSON = function(c, d) {
     var a = new m(c, d.options);
@@ -2738,8 +2738,8 @@ function requireService() {
       return this._methodsArray || (this._methodsArray = r.toArray(this.methods));
     }
   });
-  function o(u) {
-    return u._methodsArray = null, u;
+  function o(l) {
+    return l._methodsArray = null, l;
   }
   return m.prototype.get = function(c) {
     return this.methods[c] || s.prototype.get.call(this, c);
@@ -2756,7 +2756,7 @@ function requireService() {
     }
     return s.prototype.remove.call(this, c);
   }, m.prototype.create = function(c, d, a) {
-    for (var p = new l.Service(c, d, a), y = 0, g; y < /* initializes */
+    for (var p = new u.Service(c, d, a), y = 0, g; y < /* initializes */
     this.methodsArray.length; ++y) {
       var h = r.lcFirst((g = this._methodsArray[y]).resolve().name).replace(/[^$\w_]/g, "");
       p[h] = r.codegen(
@@ -2809,46 +2809,46 @@ function requireDecoder() {
   if (hasRequiredDecoder) return decoder_1;
   hasRequiredDecoder = 1, decoder_1 = m;
   var s = require_enum(), i = requireTypes(), r = requireUtil();
-  function l(o) {
+  function u(o) {
     return "missing required '" + o.name + "'";
   }
   function m(o) {
-    var u = r.codegen(["r", "l"], o.name + "$decode")("if(!(r instanceof Reader))")(
+    var l = r.codegen(["r", "l"], o.name + "$decode")("if(!(r instanceof Reader))")(
       "r=Reader.create(r)"
     )(
       "var c=l===undefined?r.len:r.pos+l,m=new this.ctor" + (o.fieldsArray.filter(function(g) {
         return g.map;
       }).length ? ",k,value" : "")
     )("while(r.pos<c){")("var t=r.uint32()");
-    o.group && u("if((t&7)===4)")("break"), u("switch(t>>>3){");
+    o.group && l("if((t&7)===4)")("break"), l("switch(t>>>3){");
     for (var c = 0; c < /* initializes */
     o.fieldsArray.length; ++c) {
       var d = o._fieldsArray[c].resolve(), a = d.resolvedType instanceof s ? "int32" : d.type, p = "m" + r.safeProp(d.name);
-      u("case %i: {", d.id), d.map ? (u("if(%s===util.emptyObject)", p)("%s={}", p)("var c2 = r.uint32()+r.pos"), i.defaults[d.keyType] !== void 0 ? u("k=%j", i.defaults[d.keyType]) : u("k=null"), i.defaults[a] !== void 0 ? u("value=%j", i.defaults[a]) : u("value=null"), u("while(r.pos<c2){")("var tag2=r.uint32()")("switch(tag2>>>3){")(
+      l("case %i: {", d.id), d.map ? (l("if(%s===util.emptyObject)", p)("%s={}", p)("var c2 = r.uint32()+r.pos"), i.defaults[d.keyType] !== void 0 ? l("k=%j", i.defaults[d.keyType]) : l("k=null"), i.defaults[a] !== void 0 ? l("value=%j", i.defaults[a]) : l("value=null"), l("while(r.pos<c2){")("var tag2=r.uint32()")("switch(tag2>>>3){")(
         "case 1: k=r.%s(); break",
         d.keyType
-      )("case 2:"), i.basic[a] === void 0 ? u("value=types[%i].decode(r,r.uint32())", c) : u("value=r.%s()", a), u("break")("default:")("r.skipType(tag2&7)")("break")("}")("}"), i.long[d.keyType] !== void 0 ? u('%s[typeof k==="object"?util.longToHash(k):k]=value', p) : u("%s[k]=value", p)) : d.repeated ? (u("if(!(%s&&%s.length))", p, p)("%s=[]", p), i.packed[a] !== void 0 && u("if((t&7)===2){")("var c2=r.uint32()+r.pos")("while(r.pos<c2)")(
+      )("case 2:"), i.basic[a] === void 0 ? l("value=types[%i].decode(r,r.uint32())", c) : l("value=r.%s()", a), l("break")("default:")("r.skipType(tag2&7)")("break")("}")("}"), i.long[d.keyType] !== void 0 ? l('%s[typeof k==="object"?util.longToHash(k):k]=value', p) : l("%s[k]=value", p)) : d.repeated ? (l("if(!(%s&&%s.length))", p, p)("%s=[]", p), i.packed[a] !== void 0 && l("if((t&7)===2){")("var c2=r.uint32()+r.pos")("while(r.pos<c2)")(
         "%s.push(r.%s())",
         p,
         a
-      )("}else"), i.basic[a] === void 0 ? u(
+      )("}else"), i.basic[a] === void 0 ? l(
         d.resolvedType.group ? "%s.push(types[%i].decode(r))" : "%s.push(types[%i].decode(r,r.uint32()))",
         p,
         c
-      ) : u("%s.push(r.%s())", p, a)) : i.basic[a] === void 0 ? u(
+      ) : l("%s.push(r.%s())", p, a)) : i.basic[a] === void 0 ? l(
         d.resolvedType.group ? "%s=types[%i].decode(r)" : "%s=types[%i].decode(r,r.uint32())",
         p,
         c
-      ) : u("%s=r.%s()", p, a), u("break")("}");
+      ) : l("%s=r.%s()", p, a), l("break")("}");
     }
-    for (u("default:")("r.skipType(t&7)")("break")("}")("}"), c = 0; c < o._fieldsArray.length; ++c) {
+    for (l("default:")("r.skipType(t&7)")("break")("}")("}"), c = 0; c < o._fieldsArray.length; ++c) {
       var y = o._fieldsArray[c];
-      y.required && u("if(!m.hasOwnProperty(%j))", y.name)(
+      y.required && l("if(!m.hasOwnProperty(%j))", y.name)(
         "throw util.ProtocolError(%j,{instance:m})",
-        l(y)
+        u(y)
       );
     }
-    return u("return m");
+    return l("return m");
   }
   return decoder_1;
 }
@@ -2857,18 +2857,18 @@ function requireVerifier() {
   if (hasRequiredVerifier) return verifier_1;
   hasRequiredVerifier = 1, verifier_1 = o;
   var s = require_enum(), i = requireUtil();
-  function r(u, c) {
-    return u.name + ": " + c + (u.repeated && c !== "array" ? "[]" : u.map && c !== "object" ? "{k:" + u.keyType + "}" : "") + " expected";
+  function r(l, c) {
+    return l.name + ": " + c + (l.repeated && c !== "array" ? "[]" : l.map && c !== "object" ? "{k:" + l.keyType + "}" : "") + " expected";
   }
-  function l(u, c, d, a) {
+  function u(l, c, d, a) {
     if (c.resolvedType)
       if (c.resolvedType instanceof s) {
-        u("switch(%s){", a)("default:")("return%j", r(c, "enum value"));
+        l("switch(%s){", a)("default:")("return%j", r(c, "enum value"));
         for (var p = Object.keys(c.resolvedType.values), y = 0; y < p.length; ++y)
-          u("case %i:", c.resolvedType.values[p[y]]);
-        u("break")("}");
+          l("case %i:", c.resolvedType.values[p[y]]);
+        l("break")("}");
       } else
-        u("{")("var e=types[%i].verify(%s);", d, a)("if(e)")(
+        l("{")("var e=types[%i].verify(%s);", d, a)("if(e)")(
           "return%j+e",
           c.name + "."
         )("}");
@@ -2879,14 +2879,14 @@ function requireVerifier() {
         case "sint32":
         case "fixed32":
         case "sfixed32":
-          u("if(!util.isInteger(%s))", a)("return%j", r(c, "integer"));
+          l("if(!util.isInteger(%s))", a)("return%j", r(c, "integer"));
           break;
         case "int64":
         case "uint64":
         case "sint64":
         case "fixed64":
         case "sfixed64":
-          u(
+          l(
             "if(!util.isInteger(%s)&&!(%s&&util.isInteger(%s.low)&&util.isInteger(%s.high)))",
             a,
             a,
@@ -2896,16 +2896,16 @@ function requireVerifier() {
           break;
         case "float":
         case "double":
-          u('if(typeof %s!=="number")', a)("return%j", r(c, "number"));
+          l('if(typeof %s!=="number")', a)("return%j", r(c, "number"));
           break;
         case "bool":
-          u('if(typeof %s!=="boolean")', a)("return%j", r(c, "boolean"));
+          l('if(typeof %s!=="boolean")', a)("return%j", r(c, "boolean"));
           break;
         case "string":
-          u("if(!util.isString(%s))", a)("return%j", r(c, "string"));
+          l("if(!util.isString(%s))", a)("return%j", r(c, "string"));
           break;
         case "bytes":
-          u(
+          l(
             'if(!(%s&&typeof %s.length==="number"||util.isString(%s)))',
             a,
             a,
@@ -2913,59 +2913,59 @@ function requireVerifier() {
           )("return%j", r(c, "buffer"));
           break;
       }
-    return u;
+    return l;
   }
-  function m(u, c, d) {
+  function m(l, c, d) {
     switch (c.keyType) {
       case "int32":
       case "uint32":
       case "sint32":
       case "fixed32":
       case "sfixed32":
-        u("if(!util.key32Re.test(%s))", d)("return%j", r(c, "integer key"));
+        l("if(!util.key32Re.test(%s))", d)("return%j", r(c, "integer key"));
         break;
       case "int64":
       case "uint64":
       case "sint64":
       case "fixed64":
       case "sfixed64":
-        u("if(!util.key64Re.test(%s))", d)(
+        l("if(!util.key64Re.test(%s))", d)(
           // see comment above: x is ok, d is not
           "return%j",
           r(c, "integer|Long key")
         );
         break;
       case "bool":
-        u("if(!util.key2Re.test(%s))", d)("return%j", r(c, "boolean key"));
+        l("if(!util.key2Re.test(%s))", d)("return%j", r(c, "boolean key"));
         break;
     }
-    return u;
+    return l;
   }
-  function o(u) {
-    var c = i.codegen(["m"], u.name + "$verify")('if(typeof m!=="object"||m===null)')(
+  function o(l) {
+    var c = i.codegen(["m"], l.name + "$verify")('if(typeof m!=="object"||m===null)')(
       "return%j",
       "object expected"
-    ), d = u.oneofsArray, a = {};
+    ), d = l.oneofsArray, a = {};
     d.length && c("var p={}");
     for (var p = 0; p < /* initializes */
-    u.fieldsArray.length; ++p) {
-      var y = u._fieldsArray[p].resolve(), g = "m" + i.safeProp(y.name);
+    l.fieldsArray.length; ++p) {
+      var y = l._fieldsArray[p].resolve(), g = "m" + i.safeProp(y.name);
       if (y.optional && c("if(%s!=null&&m.hasOwnProperty(%j)){", g, y.name), y.map)
         c("if(!util.isObject(%s))", g)("return%j", r(y, "object"))(
           "var k=Object.keys(%s)",
           g
-        )("for(var i=0;i<k.length;++i){"), m(c, y, "k[i]"), l(c, y, p, g + "[k[i]]")("}");
+        )("for(var i=0;i<k.length;++i){"), m(c, y, "k[i]"), u(c, y, p, g + "[k[i]]")("}");
       else if (y.repeated)
         c("if(!Array.isArray(%s))", g)("return%j", r(y, "array"))(
           "for(var i=0;i<%s.length;++i){",
           g
-        ), l(c, y, p, g + "[i]")("}");
+        ), u(c, y, p, g + "[i]")("}");
       else {
         if (y.partOf) {
           var h = i.safeProp(y.partOf.name);
           a[y.partOf.name] === 1 && c("if(p%s===1)", h)("return%j", y.partOf.name + ": multiple values"), a[y.partOf.name] = 1, c("p%s=1", h);
         }
-        l(c, y, p, g);
+        u(c, y, p, g);
       }
       y.optional && c("}");
     }
@@ -2976,23 +2976,23 @@ function requireVerifier() {
 var converter = {}, hasRequiredConverter;
 function requireConverter() {
   return hasRequiredConverter || (hasRequiredConverter = 1, function(s) {
-    var i = s, r = require_enum(), l = requireUtil();
-    function m(u, c, d, a) {
+    var i = s, r = require_enum(), u = requireUtil();
+    function m(l, c, d, a) {
       var p = !1;
       if (c.resolvedType)
         if (c.resolvedType instanceof r) {
-          u("switch(d%s){", a);
+          l("switch(d%s){", a);
           for (var y = c.resolvedType.values, g = Object.keys(y), h = 0; h < g.length; ++h)
-            y[g[h]] === c.typeDefault && !p && (u("default:")('if(typeof(d%s)==="number"){m%s=d%s;break}', a, a, a), c.repeated || u(
+            y[g[h]] === c.typeDefault && !p && (l("default:")('if(typeof(d%s)==="number"){m%s=d%s;break}', a, a, a), c.repeated || l(
               // fallback to default value only for
               // arrays, to avoid leaving holes.
               "break"
-            ), p = !0), u("case%j:", g[h])("case %i:", y[g[h]])("m%s=%j", a, y[g[h]])(
+            ), p = !0), l("case%j:", g[h])("case %i:", y[g[h]])("m%s=%j", a, y[g[h]])(
               "break"
             );
-          u("}");
+          l("}");
         } else
-          u('if(typeof d%s!=="object")', a)(
+          l('if(typeof d%s!=="object")', a)(
             "throw TypeError(%j)",
             c.fullName + ": object expected"
           )("m%s=types[%i].fromObject(d%s)", a, d, a);
@@ -3001,16 +3001,16 @@ function requireConverter() {
         switch (c.type) {
           case "double":
           case "float":
-            u("m%s=Number(d%s)", a, a);
+            l("m%s=Number(d%s)", a, a);
             break;
           case "uint32":
           case "fixed32":
-            u("m%s=d%s>>>0", a, a);
+            l("m%s=d%s>>>0", a, a);
             break;
           case "int32":
           case "sint32":
           case "sfixed32":
-            u("m%s=d%s|0", a, a);
+            l("m%s=d%s|0", a, a);
             break;
           case "uint64":
             v = !0;
@@ -3018,7 +3018,7 @@ function requireConverter() {
           case "sint64":
           case "fixed64":
           case "sfixed64":
-            u("if(util.Long)")(
+            l("if(util.Long)")(
               "(m%s=util.Long.fromValue(d%s)).unsigned=%j",
               a,
               a,
@@ -3040,7 +3040,7 @@ function requireConverter() {
             );
             break;
           case "bytes":
-            u('if(typeof d%s==="string")', a)(
+            l('if(typeof d%s==="string")', a)(
               "util.base64.decode(d%s,m%s=util.newBuffer(util.base64.length(d%s)),0)",
               a,
               a,
@@ -3048,23 +3048,23 @@ function requireConverter() {
             )("else if(d%s.length >= 0)", a)("m%s=d%s", a, a);
             break;
           case "string":
-            u("m%s=String(d%s)", a, a);
+            l("m%s=String(d%s)", a, a);
             break;
           case "bool":
-            u("m%s=Boolean(d%s)", a, a);
+            l("m%s=Boolean(d%s)", a, a);
             break;
         }
       }
-      return u;
+      return l;
     }
     i.fromObject = function(c) {
-      var d = c.fieldsArray, a = l.codegen(["d"], c.name + "$fromObject")("if(d instanceof this.ctor)")(
+      var d = c.fieldsArray, a = u.codegen(["d"], c.name + "$fromObject")("if(d instanceof this.ctor)")(
         "return d"
       );
       if (!d.length) return a("return new this.ctor");
       a("var m=new this.ctor");
       for (var p = 0; p < d.length; ++p) {
-        var y = d[p].resolve(), g = l.safeProp(y.name);
+        var y = d[p].resolve(), g = u.safeProp(y.name);
         y.map ? (a("if(d%s){", g)('if(typeof d%s!=="object")', g)(
           "throw TypeError(%j)",
           y.fullName + ": object expected"
@@ -3097,9 +3097,9 @@ function requireConverter() {
       }
       return a("return m");
     };
-    function o(u, c, d, a) {
+    function o(l, c, d, a) {
       if (c.resolvedType)
-        c.resolvedType instanceof r ? u(
+        c.resolvedType instanceof r ? l(
           "d%s=o.enums===String?(types[%i].values[m%s]===undefined?m%s:types[%i].values[m%s]):m%s",
           a,
           d,
@@ -3108,13 +3108,13 @@ function requireConverter() {
           d,
           a,
           a
-        ) : u("d%s=types[%i].toObject(m%s,o)", a, d, a);
+        ) : l("d%s=types[%i].toObject(m%s,o)", a, d, a);
       else {
         var p = !1;
         switch (c.type) {
           case "double":
           case "float":
-            u("d%s=o.json&&!isFinite(m%s)?String(m%s):m%s", a, a, a, a);
+            l("d%s=o.json&&!isFinite(m%s)?String(m%s):m%s", a, a, a, a);
             break;
           case "uint64":
             p = !0;
@@ -3122,7 +3122,7 @@ function requireConverter() {
           case "sint64":
           case "fixed64":
           case "sfixed64":
-            u('if(typeof m%s==="number")', a)(
+            l('if(typeof m%s==="number")', a)(
               "d%s=o.longs===String?String(m%s):m%s",
               a,
               a,
@@ -3139,7 +3139,7 @@ function requireConverter() {
             );
             break;
           case "bytes":
-            u(
+            l(
               "d%s=o.bytes===String?util.base64.encode(m%s,0,m%s.length):o.bytes===Array?Array.prototype.slice.call(m%s):m%s",
               a,
               a,
@@ -3149,29 +3149,29 @@ function requireConverter() {
             );
             break;
           default:
-            u("d%s=m%s", a, a);
+            l("d%s=m%s", a, a);
             break;
         }
       }
-      return u;
+      return l;
     }
     i.toObject = function(c) {
-      var d = c.fieldsArray.slice().sort(l.compareFieldsById);
-      if (!d.length) return l.codegen()("return {}");
-      for (var a = l.codegen(["m", "o"], c.name + "$toObject")("if(!o)")("o={}")("var d={}"), p = [], y = [], g = [], h = 0; h < d.length; ++h)
+      var d = c.fieldsArray.slice().sort(u.compareFieldsById);
+      if (!d.length) return u.codegen()("return {}");
+      for (var a = u.codegen(["m", "o"], c.name + "$toObject")("if(!o)")("o={}")("var d={}"), p = [], y = [], g = [], h = 0; h < d.length; ++h)
         d[h].partOf || (d[h].resolve().repeated ? p : d[h].map ? y : g).push(d[h]);
       if (p.length) {
         for (a("if(o.arrays||o.defaults){"), h = 0; h < p.length; ++h)
-          a("d%s=[]", l.safeProp(p[h].name));
+          a("d%s=[]", u.safeProp(p[h].name));
         a("}");
       }
       if (y.length) {
-        for (a("if(o.objects||o.defaults){"), h = 0; h < y.length; ++h) a("d%s={}", l.safeProp(y[h].name));
+        for (a("if(o.objects||o.defaults){"), h = 0; h < y.length; ++h) a("d%s={}", u.safeProp(y[h].name));
         a("}");
       }
       if (g.length) {
         for (a("if(o.defaults){"), h = 0; h < g.length; ++h) {
-          var v = g[h], b = l.safeProp(v.name);
+          var v = g[h], b = u.safeProp(v.name);
           if (v.resolvedType instanceof r)
             a(
               "d%s=o.enums===String?%j:%j",
@@ -3211,7 +3211,7 @@ function requireConverter() {
       }
       var T = !1;
       for (h = 0; h < d.length; ++h) {
-        var v = d[h], w = c._fieldsArray.indexOf(v), b = l.safeProp(v.name);
+        var v = d[h], w = c._fieldsArray.indexOf(v), b = u.safeProp(v.name);
         v.map ? (T || (T = !0, a("var ks2")), a("if(m%s&&(ks2=Object.keys(m%s)).length){", b, b)("d%s={}", b)(
           "for(var j=0;j<ks2.length;++j){"
         ), o(
@@ -3235,7 +3235,7 @@ function requireConverter() {
           /* sorted */
           w,
           b
-        ), v.partOf && a("if(o.oneofs)")("d%s=%j", l.safeProp(v.partOf.name), v.name)), a("}");
+        ), v.partOf && a("if(o.oneofs)")("d%s=%j", u.safeProp(v.partOf.name), v.name)), a("}");
       }
       return a("return d");
     };
@@ -3245,31 +3245,31 @@ var wrappers = {};
 (function(s) {
   var i = s, r = message;
   i[".google.protobuf.Any"] = {
-    fromObject: function(l) {
-      if (l && l["@type"]) {
-        var m = l["@type"].substring(l["@type"].lastIndexOf("/") + 1), o = this.lookup(m);
+    fromObject: function(u) {
+      if (u && u["@type"]) {
+        var m = u["@type"].substring(u["@type"].lastIndexOf("/") + 1), o = this.lookup(m);
         if (o) {
-          var u = l["@type"].charAt(0) === "." ? l["@type"].slice(1) : l["@type"];
-          return u.indexOf("/") === -1 && (u = "/" + u), this.create({
-            type_url: u,
-            value: o.encode(o.fromObject(l)).finish()
+          var l = u["@type"].charAt(0) === "." ? u["@type"].slice(1) : u["@type"];
+          return l.indexOf("/") === -1 && (l = "/" + l), this.create({
+            type_url: l,
+            value: o.encode(o.fromObject(u)).finish()
           });
         }
       }
-      return this.fromObject(l);
+      return this.fromObject(u);
     },
-    toObject: function(l, m) {
-      var o = "type.googleapis.com/", u = "", c = "";
-      if (m && m.json && l.type_url && l.value) {
-        c = l.type_url.substring(l.type_url.lastIndexOf("/") + 1), u = l.type_url.substring(0, l.type_url.lastIndexOf("/") + 1);
+    toObject: function(u, m) {
+      var o = "type.googleapis.com/", l = "", c = "";
+      if (m && m.json && u.type_url && u.value) {
+        c = u.type_url.substring(u.type_url.lastIndexOf("/") + 1), l = u.type_url.substring(0, u.type_url.lastIndexOf("/") + 1);
         var d = this.lookup(c);
-        d && (l = d.decode(l.value));
+        d && (u = d.decode(u.value));
       }
-      if (!(l instanceof this.ctor) && l instanceof r) {
-        var a = l.$type.toObject(l, m), p = l.$type.fullName[0] === "." ? l.$type.fullName.slice(1) : l.$type.fullName;
-        return u === "" && (u = o), c = u + p, a["@type"] = c, a;
+      if (!(u instanceof this.ctor) && u instanceof r) {
+        var a = u.$type.toObject(u, m), p = u.$type.fullName[0] === "." ? u.$type.fullName.slice(1) : u.$type.fullName;
+        return l === "" && (l = o), c = l + p, a["@type"] = c, a;
       }
-      return this.toObject(l, m);
+      return this.toObject(u, m);
     }
   };
 })(wrappers);
@@ -3279,7 +3279,7 @@ function requireType() {
   hasRequiredType = 1, type = b;
   var s = requireNamespace();
   ((b.prototype = Object.create(s.prototype)).constructor = b).className = "Type";
-  var i = require_enum(), r = requireOneof(), l = requireField(), m = requireMapfield(), o = requireService(), u = message, c = reader, d = writer, a = requireUtil(), p = requireEncoder(), y = requireDecoder(), g = requireVerifier(), h = requireConverter(), v = wrappers;
+  var i = require_enum(), r = requireOneof(), u = requireField(), m = requireMapfield(), o = requireService(), l = message, c = reader, d = writer, a = requireUtil(), p = requireEncoder(), y = requireDecoder(), g = requireVerifier(), h = requireConverter(), v = wrappers;
   function b(T, w) {
     s.call(this, T, w), this.fields = {}, this.oneofs = void 0, this.extensions = void 0, this.reserved = void 0, this.group = void 0, this._fieldsById = null, this._fieldsArray = null, this._oneofsArray = null, this._ctor = null;
   }
@@ -3295,9 +3295,9 @@ function requireType() {
         if (this._fieldsById) return this._fieldsById;
         this._fieldsById = {};
         for (var T = Object.keys(this.fields), w = 0; w < T.length; ++w) {
-          var O = this.fields[T[w]], x = O.id;
-          if (this._fieldsById[x]) throw Error("duplicate id " + x + " in " + this);
-          this._fieldsById[x] = O;
+          var x = this.fields[T[w]], O = x.id;
+          if (this._fieldsById[O]) throw Error("duplicate id " + O + " in " + this);
+          this._fieldsById[O] = x;
         }
         return this._fieldsById;
       }
@@ -3336,23 +3336,23 @@ function requireType() {
       },
       set: function(T) {
         var w = T.prototype;
-        w instanceof u || ((T.prototype = new u()).constructor = T, a.merge(T.prototype, w)), T.$type = T.prototype.$type = this, a.merge(T, u, !0), this._ctor = T;
-        for (var O = 0; O < /* initializes */
-        this.fieldsArray.length; ++O) this._fieldsArray[O].resolve();
-        var x = {};
-        for (O = 0; O < /* initializes */
-        this.oneofsArray.length; ++O)
-          x[this._oneofsArray[O].resolve().name] = {
-            get: a.oneOfGetter(this._oneofsArray[O].oneof),
-            set: a.oneOfSetter(this._oneofsArray[O].oneof)
+        w instanceof l || ((T.prototype = new l()).constructor = T, a.merge(T.prototype, w)), T.$type = T.prototype.$type = this, a.merge(T, l, !0), this._ctor = T;
+        for (var x = 0; x < /* initializes */
+        this.fieldsArray.length; ++x) this._fieldsArray[x].resolve();
+        var O = {};
+        for (x = 0; x < /* initializes */
+        this.oneofsArray.length; ++x)
+          O[this._oneofsArray[x].resolve().name] = {
+            get: a.oneOfGetter(this._oneofsArray[x].oneof),
+            set: a.oneOfSetter(this._oneofsArray[x].oneof)
           };
-        O && Object.defineProperties(T.prototype, x);
+        x && Object.defineProperties(T.prototype, O);
       }
     }
   }), b.generateConstructor = function(w) {
-    for (var O = a.codegen(["p"], w.name), x = 0, R; x < w.fieldsArray.length; ++x)
-      (R = w._fieldsArray[x]).map ? O("this%s={}", a.safeProp(R.name)) : R.repeated && O("this%s=[]", a.safeProp(R.name));
-    return O("if(p)for(var ks=Object.keys(p),i=0;i<ks.length;++i)if(p[ks[i]]!=null)")(
+    for (var x = a.codegen(["p"], w.name), O = 0, R; O < w.fieldsArray.length; ++O)
+      (R = w._fieldsArray[O]).map ? x("this%s={}", a.safeProp(R.name)) : R.repeated && x("this%s=[]", a.safeProp(R.name));
+    return x("if(p)for(var ks=Object.keys(p),i=0;i<ks.length;++i)if(p[ks[i]]!=null)")(
       // omit undefined or null
       "this[ks[i]]=p[ks[i]]"
     );
@@ -3360,33 +3360,33 @@ function requireType() {
   function _(T) {
     return T._fieldsById = T._fieldsArray = T._oneofsArray = null, delete T.encode, delete T.decode, delete T.verify, T;
   }
-  return b.fromJSON = function(w, O) {
-    var x = new b(w, O.options);
-    x.extensions = O.extensions, x.reserved = O.reserved;
-    for (var R = Object.keys(O.fields), E = 0; E < R.length; ++E)
-      x.add(
-        (typeof O.fields[R[E]].keyType < "u" ? m.fromJSON : l.fromJSON)(
+  return b.fromJSON = function(w, x) {
+    var O = new b(w, x.options);
+    O.extensions = x.extensions, O.reserved = x.reserved;
+    for (var R = Object.keys(x.fields), E = 0; E < R.length; ++E)
+      O.add(
+        (typeof x.fields[R[E]].keyType < "u" ? m.fromJSON : u.fromJSON)(
           R[E],
-          O.fields[R[E]]
+          x.fields[R[E]]
         )
       );
-    if (O.oneofs)
-      for (R = Object.keys(O.oneofs), E = 0; E < R.length; ++E)
-        x.add(r.fromJSON(R[E], O.oneofs[R[E]]));
-    if (O.nested)
-      for (R = Object.keys(O.nested), E = 0; E < R.length; ++E) {
-        var A = O.nested[R[E]];
-        x.add(
+    if (x.oneofs)
+      for (R = Object.keys(x.oneofs), E = 0; E < R.length; ++E)
+        O.add(r.fromJSON(R[E], x.oneofs[R[E]]));
+    if (x.nested)
+      for (R = Object.keys(x.nested), E = 0; E < R.length; ++E) {
+        var S = x.nested[R[E]];
+        O.add(
           // most to least likely
-          (A.id !== void 0 ? l.fromJSON : A.fields !== void 0 ? b.fromJSON : A.values !== void 0 ? i.fromJSON : A.methods !== void 0 ? o.fromJSON : s.fromJSON)(R[E], A)
+          (S.id !== void 0 ? u.fromJSON : S.fields !== void 0 ? b.fromJSON : S.values !== void 0 ? i.fromJSON : S.methods !== void 0 ? o.fromJSON : s.fromJSON)(R[E], S)
         );
       }
-    return O.extensions && O.extensions.length && (x.extensions = O.extensions), O.reserved && O.reserved.length && (x.reserved = O.reserved), O.group && (x.group = !0), O.comment && (x.comment = O.comment), x;
+    return x.extensions && x.extensions.length && (O.extensions = x.extensions), x.reserved && x.reserved.length && (O.reserved = x.reserved), x.group && (O.group = !0), x.comment && (O.comment = x.comment), O;
   }, b.prototype.toJSON = function(w) {
-    var O = s.prototype.toJSON.call(this, w), x = w ? !!w.keepComments : !1;
+    var x = s.prototype.toJSON.call(this, w), O = w ? !!w.keepComments : !1;
     return a.toObject([
       "options",
-      O && O.options || void 0,
+      x && x.options || void 0,
       "oneofs",
       s.arrayToJSON(this.oneofsArray, w),
       "fields",
@@ -3403,20 +3403,20 @@ function requireType() {
       "group",
       this.group || void 0,
       "nested",
-      O && O.nested || void 0,
+      x && x.nested || void 0,
       "comment",
-      x ? this.comment : void 0
+      O ? this.comment : void 0
     ]);
   }, b.prototype.resolveAll = function() {
-    for (var w = this.fieldsArray, O = 0; O < w.length; ) w[O++].resolve();
-    var x = this.oneofsArray;
-    for (O = 0; O < x.length; ) x[O++].resolve();
+    for (var w = this.fieldsArray, x = 0; x < w.length; ) w[x++].resolve();
+    var O = this.oneofsArray;
+    for (x = 0; x < O.length; ) O[x++].resolve();
     return s.prototype.resolveAll.call(this);
   }, b.prototype.get = function(w) {
     return this.fields[w] || this.oneofs && this.oneofs[w] || this.nested && this.nested[w] || null;
   }, b.prototype.add = function(w) {
     if (this.get(w.name)) throw Error("duplicate name '" + w.name + "' in " + this);
-    if (w instanceof l && w.extend === void 0) {
+    if (w instanceof u && w.extend === void 0) {
       if (this._fieldsById ? (
         /* istanbul ignore next */
         this._fieldsById[w.id]
@@ -3429,7 +3429,7 @@ function requireType() {
     }
     return w instanceof r ? (this.oneofs || (this.oneofs = {}), this.oneofs[w.name] = w, w.onAdd(this), _(this)) : s.prototype.add.call(this, w);
   }, b.prototype.remove = function(w) {
-    if (w instanceof l && w.extend === void 0) {
+    if (w instanceof u && w.extend === void 0) {
       if (!this.fields || this.fields[w.name] !== w)
         throw Error(w + " is not a member of " + this);
       return delete this.fields[w.name], w.parent = null, w.onRemove(this), _(this);
@@ -3447,25 +3447,25 @@ function requireType() {
   }, b.prototype.create = function(w) {
     return new this.ctor(w);
   }, b.prototype.setup = function() {
-    for (var w = this.fullName, O = [], x = 0; x < /* initializes */
-    this.fieldsArray.length; ++x)
-      O.push(this._fieldsArray[x].resolve().resolvedType);
+    for (var w = this.fullName, x = [], O = 0; O < /* initializes */
+    this.fieldsArray.length; ++O)
+      x.push(this._fieldsArray[O].resolve().resolvedType);
     this.encode = p(this)({
       Writer: d,
-      types: O,
+      types: x,
       util: a
     }), this.decode = y(this)({
       Reader: c,
-      types: O,
+      types: x,
       util: a
     }), this.verify = g(this)({
-      types: O,
+      types: x,
       util: a
     }), this.fromObject = h.fromObject(this)({
-      types: O,
+      types: x,
       util: a
     }), this.toObject = h.toObject(this)({
-      types: O,
+      types: x,
       util: a
     });
     var R = v[w];
@@ -3474,23 +3474,23 @@ function requireType() {
       E.fromObject = this.fromObject, this.fromObject = R.fromObject.bind(E), E.toObject = this.toObject, this.toObject = R.toObject.bind(E);
     }
     return this;
-  }, b.prototype.encode = function(w, O) {
-    return this.setup().encode(w, O);
-  }, b.prototype.encodeDelimited = function(w, O) {
-    return this.encode(w, O && O.len ? O.fork() : O).ldelim();
-  }, b.prototype.decode = function(w, O) {
-    return this.setup().decode(w, O);
+  }, b.prototype.encode = function(w, x) {
+    return this.setup().encode(w, x);
+  }, b.prototype.encodeDelimited = function(w, x) {
+    return this.encode(w, x && x.len ? x.fork() : x).ldelim();
+  }, b.prototype.decode = function(w, x) {
+    return this.setup().decode(w, x);
   }, b.prototype.decodeDelimited = function(w) {
     return w instanceof c || (w = c.create(w)), this.decode(w, w.uint32());
   }, b.prototype.verify = function(w) {
     return this.setup().verify(w);
   }, b.prototype.fromObject = function(w) {
     return this.setup().fromObject(w);
-  }, b.prototype.toObject = function(w, O) {
-    return this.setup().toObject(w, O);
+  }, b.prototype.toObject = function(w, x) {
+    return this.setup().toObject(w, x);
   }, b.d = function(w) {
-    return function(x) {
-      a.decorateType(x, w);
+    return function(O) {
+      a.decorateType(O, w);
     };
   }, type;
 }
@@ -3500,7 +3500,7 @@ function requireRoot() {
   hasRequiredRoot = 1, root$1 = d;
   var s = requireNamespace();
   ((d.prototype = Object.create(s.prototype)).constructor = d).className = "Root";
-  var i = requireField(), r = require_enum(), l = requireOneof(), m = requireUtil(), o, u, c;
+  var i = requireField(), r = require_enum(), u = requireOneof(), m = requireUtil(), o, l, c;
   function d(g) {
     s.call(this, "", g), this.deferred = [], this.files = [];
   }
@@ -3514,72 +3514,72 @@ function requireRoot() {
     var _ = this;
     if (!b) return m.asPromise(g, _, h, v);
     var T = b === a;
-    function w(k, D) {
+    function w(C, D) {
       if (b) {
-        if (T) throw k;
-        var N = b;
-        b = null, N(k, D);
+        if (T) throw C;
+        var I = b;
+        b = null, I(C, D);
       }
     }
-    function O(k) {
-      var D = k.lastIndexOf("google/protobuf/");
+    function x(C) {
+      var D = C.lastIndexOf("google/protobuf/");
       if (D > -1) {
-        var N = k.substring(D);
-        if (N in c) return N;
+        var I = C.substring(D);
+        if (I in c) return I;
       }
       return null;
     }
-    function x(k, D) {
+    function O(C, D) {
       try {
         if (m.isString(D) && D.charAt(0) === "{" && (D = JSON.parse(D)), !m.isString(D)) _.setOptions(D.options).addJSON(D.nested);
         else {
-          u.filename = k;
-          var N = u(D, _, v), L, F = 0;
-          if (N.imports)
-            for (; F < N.imports.length; ++F)
-              (L = O(N.imports[F]) || _.resolvePath(k, N.imports[F])) && R(L);
-          if (N.weakImports)
-            for (F = 0; F < N.weakImports.length; ++F)
-              (L = O(N.weakImports[F]) || _.resolvePath(k, N.weakImports[F])) && R(L, !0);
+          l.filename = C;
+          var I = l(D, _, v), $, q = 0;
+          if (I.imports)
+            for (; q < I.imports.length; ++q)
+              ($ = x(I.imports[q]) || _.resolvePath(C, I.imports[q])) && R($);
+          if (I.weakImports)
+            for (q = 0; q < I.weakImports.length; ++q)
+              ($ = x(I.weakImports[q]) || _.resolvePath(C, I.weakImports[q])) && R($, !0);
         }
-      } catch (M) {
-        w(M);
+      } catch (F) {
+        w(F);
       }
       !T && !E && w(null, _);
     }
-    function R(k, D) {
-      if (k = O(k) || k, !(_.files.indexOf(k) > -1)) {
-        if (_.files.push(k), k in c) {
-          T ? x(k, c[k]) : (++E, setTimeout(function() {
-            --E, x(k, c[k]);
+    function R(C, D) {
+      if (C = x(C) || C, !(_.files.indexOf(C) > -1)) {
+        if (_.files.push(C), C in c) {
+          T ? O(C, c[C]) : (++E, setTimeout(function() {
+            --E, O(C, c[C]);
           }));
           return;
         }
         if (T) {
-          var N;
+          var I;
           try {
-            N = m.fs.readFileSync(k).toString("utf8");
-          } catch (L) {
-            D || w(L);
+            I = m.fs.readFileSync(C).toString("utf8");
+          } catch ($) {
+            D || w($);
             return;
           }
-          x(k, N);
+          O(C, I);
         } else
-          ++E, _.fetch(k, function(L, F) {
+          ++E, _.fetch(C, function($, q) {
             if (--E, !!b) {
-              if (L) {
-                D ? E || w(null, _) : w(L);
+              if ($) {
+                D ? E || w(null, _) : w($);
                 return;
               }
-              x(k, F);
+              O(C, q);
             }
           });
       }
     }
     var E = 0;
     m.isString(h) && (h = [h]);
-    for (var A = 0, P; A < h.length; ++A)
-      (P = _.resolvePath("", h[A])) && R(P);
+    for (var S = 0, P; S < h.length; ++S)
+      (P = _.resolvePath("", h[S])) && R(P);
     if (T) return _;
     E || w(null, _);
   }, d.prototype.loadSync = function(h, v) {
@@ -3617,7 +3617,7 @@ function requireRoot() {
       !h.extensionField && (y(this, h) || this.deferred.push(h));
     else if (h instanceof r)
       p.test(h.name) && (h.parent[h.name] = h.values);
-    else if (!(h instanceof l)) {
+    else if (!(h instanceof u)) {
       if (h instanceof o)
         for (var v = 0; v < this.deferred.length; )
           y(this, this.deferred[v]) ? this.deferred.splice(v, 1) : ++v;
@@ -3650,14 +3650,14 @@ function requireRoot() {
       p.test(h.name) && delete h.parent[h.name];
     }
   }, d._configure = function(g, h, v) {
-    o = g, u = h, c = v;
+    o = g, l = h, c = v;
   }, root$1;
 }
 var hasRequiredUtil;
 function requireUtil() {
   if (hasRequiredUtil) return util$2.exports;
   hasRequiredUtil = 1;
-  var s = util$2.exports = requireMinimal(), i = roots, r, l;
+  var s = util$2.exports = requireMinimal(), i = roots, r, u;
   s.codegen = codegen_1, s.fetch = fetch_1, s.path = path, s.fs = s.inquire("fs"), s.toArray = function(a) {
     if (a) {
       for (var p = Object.keys(a), y = new Array(p.length), g = 0; g < p.length; ) y[g] = a[p[g++]];
@@ -3681,9 +3681,9 @@ function requireUtil() {
   }, s.ucFirst = function(a) {
     return a.charAt(0).toUpperCase() + a.substring(1);
   };
-  var u = /_([a-z])/g;
+  var l = /_([a-z])/g;
   s.camelCase = function(a) {
-    return a.substring(0, 1) + a.substring(1).replace(u, function(p, y) {
+    return a.substring(0, 1) + a.substring(1).replace(l, function(p, y) {
       return y.toUpperCase();
     });
   }, s.compareFieldsById = function(a, p) {
@@ -3704,8 +3704,8 @@ function requireUtil() {
   var c = 0;
   return s.decorateEnum = function(a) {
     if (a.$type) return a.$type;
-    l || (l = require_enum());
-    var p = new l("Enum" + c++, a);
+    u || (u = require_enum());
+    var p = new u("Enum" + c++, a);
     return s.decorateRoot.add(p), Object.defineProperty(a, "$type", {
       value: p,
       enumerable: !1
@@ -3737,10 +3737,10 @@ function requireObject() {
   if (hasRequiredObject) return object;
   hasRequiredObject = 1, object = r, r.className = "ReflectionObject";
   var s = requireUtil(), i;
-  function r(l, m) {
-    if (!s.isString(l)) throw TypeError("name must be a string");
+  function r(u, m) {
+    if (!s.isString(u)) throw TypeError("name must be a string");
     if (m && !s.isObject(m)) throw TypeError("options must be an object");
-    this.options = m, this.parsedOptions = null, this.name = l, this.parent = null, this.resolved = !1, this.comment = null, this.filename = null;
+    this.options = m, this.parsedOptions = null, this.name = u, this.parent = null, this.resolved = !1, this.comment = null, this.filename = null;
   }
   return Object.defineProperties(r.prototype, {
     /**
@@ -3751,8 +3751,8 @@ function requireObject() {
      */
     root: {
       get: function() {
-        for (var l = this; l.parent !== null; ) l = l.parent;
-        return l;
+        for (var u = this; u.parent !== null; ) u = u.parent;
+        return u;
       }
     },
     /**
@@ -3763,9 +3763,9 @@ function requireObject() {
      */
     fullName: {
       get: function() {
-        for (var l = [this.name], m = this.parent; m; )
-          l.unshift(m.name), m = m.parent;
-        return l.join(".");
+        for (var u = [this.name], m = this.parent; m; )
+          u.unshift(m.name), m = m.parent;
+        return u.join(".");
       }
     }
   }), r.prototype.toJSON = /* istanbul ignore next */
@@ -3782,20 +3782,20 @@ function requireObject() {
     return this.resolved ? this : (this.root instanceof i && (this.resolved = !0), this);
   }, r.prototype.getOption = function(m) {
     if (this.options) return this.options[m];
-  }, r.prototype.setOption = function(m, o, u) {
-    return (!u || !this.options || this.options[m] === void 0) && ((this.options || (this.options = {}))[m] = o), this;
-  }, r.prototype.setParsedOption = function(m, o, u) {
+  }, r.prototype.setOption = function(m, o, l) {
+    return (!l || !this.options || this.options[m] === void 0) && ((this.options || (this.options = {}))[m] = o), this;
+  }, r.prototype.setParsedOption = function(m, o, l) {
     this.parsedOptions || (this.parsedOptions = []);
     var c = this.parsedOptions;
-    if (u) {
+    if (l) {
       var d = c.find(function(y) {
         return Object.prototype.hasOwnProperty.call(y, m);
       });
       if (d) {
         var a = d[m];
-        s.setProperty(a, u, o);
+        s.setProperty(a, l, o);
       } else
-        d = {}, d[m] = s.setProperty({}, u, o), c.push(d);
+        d = {}, d[m] = s.setProperty({}, l, o), c.push(d);
     } else {
       var p = {};
       p[m] = o, c.push(p);
@@ -3803,34 +3803,34 @@ function requireObject() {
     return this;
   }, r.prototype.setOptions = function(m, o) {
     if (m)
-      for (var u = Object.keys(m), c = 0; c < u.length; ++c)
-        this.setOption(u[c], m[u[c]], o);
+      for (var l = Object.keys(m), c = 0; c < l.length; ++c)
+        this.setOption(l[c], m[l[c]], o);
     return this;
   }, r.prototype.toString = function() {
     var m = this.constructor.className, o = this.fullName;
     return o.length ? m + " " + o : m;
-  }, r._configure = function(l) {
-    i = l;
+  }, r._configure = function(u) {
+    i = u;
   }, object;
 }
 var _enum, hasRequired_enum;
 function require_enum() {
   if (hasRequired_enum) return _enum;
-  hasRequired_enum = 1, _enum = l;
+  hasRequired_enum = 1, _enum = u;
   var s = requireObject();
-  ((l.prototype = Object.create(s.prototype)).constructor = l).className = "Enum";
+  ((u.prototype = Object.create(s.prototype)).constructor = u).className = "Enum";
   var i = requireNamespace(), r = requireUtil();
-  function l(m, o, u, c, d, a) {
-    if (s.call(this, m, u), o && typeof o != "object") throw TypeError("values must be an object");
+  function u(m, o, l, c, d, a) {
+    if (s.call(this, m, l), o && typeof o != "object") throw TypeError("values must be an object");
     if (this.valuesById = {}, this.values = Object.create(this.valuesById), this.comment = c, this.comments = d || {}, this.valuesOptions = a, this.reserved = void 0, o)
       for (var p = Object.keys(o), y = 0; y < p.length; ++y)
         typeof o[p[y]] == "number" && (this.valuesById[this.values[p[y]] = o[p[y]]] = p[y]);
   }
-  return l.fromJSON = function(o, u) {
-    var c = new l(o, u.values, u.options, u.comment, u.comments);
-    return c.reserved = u.reserved, c;
-  }, l.prototype.toJSON = function(o) {
-    var u = o ? !!o.keepComments : !1;
+  return u.fromJSON = function(o, l) {
+    var c = new u(o, l.values, l.options, l.comment, l.comments);
+    return c.reserved = l.reserved, c;
+  }, u.prototype.toJSON = function(o) {
+    var l = o ? !!o.keepComments : !1;
     return r.toObject([
       "options",
       this.options,
@@ -3841,30 +3841,30 @@ function require_enum() {
       "reserved",
       this.reserved && this.reserved.length ? this.reserved : void 0,
       "comment",
-      u ? this.comment : void 0,
+      l ? this.comment : void 0,
       "comments",
-      u ? this.comments : void 0
+      l ? this.comments : void 0
     ]);
-  }, l.prototype.add = function(o, u, c, d) {
+  }, u.prototype.add = function(o, l, c, d) {
     if (!r.isString(o)) throw TypeError("name must be a string");
-    if (!r.isInteger(u)) throw TypeError("id must be an integer");
+    if (!r.isInteger(l)) throw TypeError("id must be an integer");
     if (this.values[o] !== void 0) throw Error("duplicate name '" + o + "' in " + this);
-    if (this.isReservedId(u)) throw Error("id " + u + " is reserved in " + this);
+    if (this.isReservedId(l)) throw Error("id " + l + " is reserved in " + this);
     if (this.isReservedName(o)) throw Error("name '" + o + "' is reserved in " + this);
-    if (this.valuesById[u] !== void 0) {
+    if (this.valuesById[l] !== void 0) {
       if (!(this.options && this.options.allow_alias))
-        throw Error("duplicate id " + u + " in " + this);
-      this.values[o] = u;
-    } else this.valuesById[this.values[o] = u] = o;
+        throw Error("duplicate id " + l + " in " + this);
+      this.values[o] = l;
+    } else this.valuesById[this.values[o] = l] = o;
     return d && (this.valuesOptions === void 0 && (this.valuesOptions = {}), this.valuesOptions[o] = d || null), this.comments[o] = c || null, this;
-  }, l.prototype.remove = function(o) {
+  }, u.prototype.remove = function(o) {
     if (!r.isString(o)) throw TypeError("name must be a string");
-    var u = this.values[o];
-    if (u == null) throw Error("name '" + o + "' does not exist in " + this);
-    return delete this.valuesById[u], delete this.values[o], delete this.comments[o], this.valuesOptions && delete this.valuesOptions[o], this;
-  }, l.prototype.isReservedId = function(o) {
+    var l = this.values[o];
+    if (l == null) throw Error("name '" + o + "' does not exist in " + this);
+    return delete this.valuesById[l], delete this.values[o], delete this.comments[o], this.valuesOptions && delete this.valuesOptions[o], this;
+  }, u.prototype.isReservedId = function(o) {
     return i.isReservedId(this.reserved, o);
-  }, l.prototype.isReservedName = function(o) {
+  }, u.prototype.isReservedName = function(o) {
     return i.isReservedName(this.reserved, o);
   }, _enum;
 }
@@ -3873,27 +3873,27 @@ function requireEncoder() {
   if (hasRequiredEncoder) return encoder_1;
   hasRequiredEncoder = 1, encoder_1 = m;
   var s = require_enum(), i = requireTypes(), r = requireUtil();
-  function l(o, u, c, d) {
-    return u.resolvedType.group ? o(
+  function u(o, l, c, d) {
+    return l.resolvedType.group ? o(
       "types[%i].encode(%s,w.uint32(%i)).uint32(%i)",
       c,
       d,
-      (u.id << 3 | 3) >>> 0,
-      (u.id << 3 | 4) >>> 0
+      (l.id << 3 | 3) >>> 0,
+      (l.id << 3 | 4) >>> 0
     ) : o(
       "types[%i].encode(%s,w.uint32(%i).fork()).ldelim()",
       c,
       d,
-      (u.id << 3 | 2) >>> 0
+      (l.id << 3 | 2) >>> 0
     );
   }
   function m(o) {
-    for (var u = r.codegen(["m", "w"], o.name + "$encode")("if(!w)")("w=Writer.create()"), c, d, a = (
+    for (var l = r.codegen(["m", "w"], o.name + "$encode")("if(!w)")("w=Writer.create()"), c, d, a = (
       /* initializes */
       o.fieldsArray.slice().sort(r.compareFieldsById)
     ), c = 0; c < a.length; ++c) {
       var p = a[c].resolve(), y = o._fieldsArray.indexOf(p), g = p.resolvedType instanceof s ? "int32" : p.type, h = i.basic[g];
-      d = "m" + r.safeProp(p.name), p.map ? (u(
+      d = "m" + r.safeProp(p.name), p.map ? (l(
         "if(%s!=null&&Object.hasOwnProperty.call(m,%j)){",
         d,
         p.name
@@ -3906,16 +3906,16 @@ function requireEncoder() {
         (p.id << 3 | 2) >>> 0,
         8 | i.mapKey[p.keyType],
         p.keyType
-      ), h === void 0 ? u("types[%i].encode(%s[ks[i]],w.uint32(18).fork()).ldelim().ldelim()", y, d) : u(".uint32(%i).%s(%s[ks[i]]).ldelim()", 16 | h, g, d), u("}")("}")) : p.repeated ? (u("if(%s!=null&&%s.length){", d, d), p.packed && i.packed[g] !== void 0 ? u("w.uint32(%i).fork()", (p.id << 3 | 2) >>> 0)(
+      ), h === void 0 ? l("types[%i].encode(%s[ks[i]],w.uint32(18).fork()).ldelim().ldelim()", y, d) : l(".uint32(%i).%s(%s[ks[i]]).ldelim()", 16 | h, g, d), l("}")("}")) : p.repeated ? (l("if(%s!=null&&%s.length){", d, d), p.packed && i.packed[g] !== void 0 ? l("w.uint32(%i).fork()", (p.id << 3 | 2) >>> 0)(
         "for(var i=0;i<%s.length;++i)",
         d
       )(
         "w.%s(%s[i])",
         g,
         d
-      )("w.ldelim()") : (u("for(var i=0;i<%s.length;++i)", d), h === void 0 ? l(u, p, y, d + "[i]") : u("w.uint32(%i).%s(%s[i])", (p.id << 3 | h) >>> 0, g, d)), u("}")) : (p.optional && u("if(%s!=null&&Object.hasOwnProperty.call(m,%j))", d, p.name), h === void 0 ? l(u, p, y, d) : u("w.uint32(%i).%s(%s)", (p.id << 3 | h) >>> 0, g, d));
+      )("w.ldelim()") : (l("for(var i=0;i<%s.length;++i)", d), h === void 0 ? u(l, p, y, d + "[i]") : l("w.uint32(%i).%s(%s[i])", (p.id << 3 | h) >>> 0, g, d)), l("}")) : (p.optional && l("if(%s!=null&&Object.hasOwnProperty.call(m,%j))", d, p.name), h === void 0 ? u(l, p, y, d) : l("w.uint32(%i).%s(%s)", (p.id << 3 | h) >>> 0, g, d));
     }
-    return u("return w");
+    return l("return w");
   }
   return encoder_1;
 }
@@ -3972,46 +3972,46 @@ function unescape(s) {
 tokenize$1.unescape = unescape;
 function tokenize$1(s, i) {
   s = s.toString();
-  var r = 0, l = s.length, m = 1, o = 0, u = {}, c = [], d = null;
-  function a(x) {
-    return Error("illegal " + x + " (line " + m + ")");
+  var r = 0, u = s.length, m = 1, o = 0, l = {}, c = [], d = null;
+  function a(O) {
+    return Error("illegal " + O + " (line " + m + ")");
   }
   function p() {
-    var x = d === "'" ? stringSingleRe : stringDoubleRe;
-    x.lastIndex = r - 1;
-    var R = x.exec(s);
+    var O = d === "'" ? stringSingleRe : stringDoubleRe;
+    O.lastIndex = r - 1;
+    var R = O.exec(s);
     if (!R) throw a("string");
-    return r = x.lastIndex, _(d), d = null, unescape(R[1]);
+    return r = O.lastIndex, _(d), d = null, unescape(R[1]);
   }
-  function y(x) {
-    return s.charAt(x);
+  function y(O) {
+    return s.charAt(O);
   }
-  function g(x, R, E) {
-    var A = {
-      type: s.charAt(x++),
+  function g(O, R, E) {
+    var S = {
+      type: s.charAt(O++),
       lineEmpty: !1,
       leading: E
     }, P;
     i ? P = 2 : P = 3;
-    var k = x - P, D;
+    var C = O - P, D;
     do
-      if (--k < 0 || (D = s.charAt(k)) === `
+      if (--C < 0 || (D = s.charAt(C)) === `
 `) {
-        A.lineEmpty = !0;
+        S.lineEmpty = !0;
         break;
       }
     while (D === " " || D === "	");
-    for (var N = s.substring(x, R).split(setCommentSplitRe), L = 0; L < N.length; ++L)
-      N[L] = N[L].replace(i ? setCommentAltRe : setCommentRe, "").trim();
-    A.text = N.join(`
-`).trim(), u[m] = A, o = m;
+    for (var I = s.substring(O, R).split(setCommentSplitRe), $ = 0; $ < I.length; ++$)
+      I[$] = I[$].replace(i ? setCommentAltRe : setCommentRe, "").trim();
+    S.text = I.join(`
+`).trim(), l[m] = S, o = m;
   }
-  function h(x) {
-    var R = v(x), E = s.substring(x, R), A = /^\s*\/\//.test(E);
-    return A;
+  function h(O) {
+    var R = v(O), E = s.substring(O, R), S = /^\s*\/\//.test(E);
+    return S;
   }
-  function v(x) {
-    for (var R = x; R < l && y(R) !== `
+  function v(O) {
+    for (var R = O; R < u && y(R) !== `
 `; )
       R++;
     return R;
@@ -4019,74 +4019,74 @@ function tokenize$1(s, i) {
   function b() {
     if (c.length > 0) return c.shift();
     if (d) return p();
-    var x, R, E, A, P, k = r === 0;
+    var O, R, E, S, P, C = r === 0;
     do {
-      if (r === l) return null;
-      for (x = !1; whitespaceRe.test(E = y(r)); )
+      if (r === u) return null;
+      for (O = !1; whitespaceRe.test(E = y(r)); )
         if (E === `
-` && (k = !0, ++m), ++r === l) return null;
+` && (C = !0, ++m), ++r === u) return null;
       if (y(r) === "/") {
-        if (++r === l)
+        if (++r === u)
           throw a("comment");
         if (y(r) === "/")
           if (i) {
-            if (A = r, P = !1, h(r - 1)) {
+            if (S = r, P = !1, h(r - 1)) {
               P = !0;
               do
-                if (r = v(r), r === l || (r++, !k))
+                if (r = v(r), r === u || (r++, !C))
                   break;
               while (h(r));
             } else
-              r = Math.min(l, v(r) + 1);
-            P && (g(A, r, k), k = !0), m++, x = !0;
+              r = Math.min(u, v(r) + 1);
+            P && (g(S, r, C), C = !0), m++, O = !0;
           } else {
-            for (P = y(A = r + 1) === "/"; y(++r) !== `
+            for (P = y(S = r + 1) === "/"; y(++r) !== `
 `; )
-              if (r === l)
+              if (r === u)
                 return null;
-            ++r, P && (g(A, r - 1, k), k = !0), ++m, x = !0;
+            ++r, P && (g(S, r - 1, C), C = !0), ++m, O = !0;
           }
         else if ((E = y(r)) === "*") {
-          A = r + 1, P = i || y(A) === "*";
+          S = r + 1, P = i || y(S) === "*";
           do {
             if (E === `
-` && ++m, ++r === l)
+` && ++m, ++r === u)
               throw a("comment");
             R = E, E = y(r);
           } while (R !== "*" || E !== "/");
-          ++r, P && (g(A, r - 2, k), k = !0), x = !0;
+          ++r, P && (g(S, r - 2, C), C = !0), O = !0;
         } else
           return "/";
       }
-    } while (x);
+    } while (O);
     var D = r;
     delimRe.lastIndex = 0;
-    var N = delimRe.test(y(D++));
-    if (!N) for (; D < l && !delimRe.test(y(D)); ) ++D;
-    var L = s.substring(r, r = D);
-    return (L === '"' || L === "'") && (d = L), L;
+    var I = delimRe.test(y(D++));
+    if (!I) for (; D < u && !delimRe.test(y(D)); ) ++D;
+    var $ = s.substring(r, r = D);
+    return ($ === '"' || $ === "'") && (d = $), $;
   }
-  function _(x) {
-    c.push(x);
+  function _(O) {
+    c.push(O);
   }
   function T() {
     if (!c.length) {
-      var x = b();
-      if (x === null) return null;
-      _(x);
+      var O = b();
+      if (O === null) return null;
+      _(O);
     }
     return c[0];
   }
-  function w(x, R) {
-    var E = T(), A = E === x;
-    if (A)
+  function w(O, R) {
+    var E = T(), S = E === O;
+    if (S)
       return b(), !0;
-    if (!R) throw a("token '" + E + "', '" + x + "' expected");
+    if (!R) throw a("token '" + E + "', '" + O + "' expected");
     return !1;
   }
-  function O(x) {
+  function x(O) {
     var R = null, E;
-    return x === void 0 ? (E = u[m - 1], delete u[m - 1], E && (i || E.type === "*" || E.lineEmpty) && (R = E.leading ? E.text : null)) : (o < x && T(), E = u[x], delete u[x], E && !E.lineEmpty && (i || E.type === "/") && (R = E.leading ? null : E.text)), R;
+    return O === void 0 ? (E = l[m - 1], delete l[m - 1], E && (i || E.type === "*" || E.lineEmpty) && (R = E.leading ? E.text : null)) : (o < O && T(), E = l[O], delete l[O], E && !E.lineEmpty && (i || E.type === "/") && (R = E.leading ? null : E.text)), R;
   }
   return Object.defineProperty(
     {
@@ -4094,7 +4094,7 @@ function tokenize$1(s, i) {
       peek: T,
       push: _,
       skip: w,
-      cmnt: O
+      cmnt: x
     },
     "line",
     {
@@ -4112,29 +4112,29 @@ parse.defaults = {
 var tokenize = tokenize_1, Root = requireRoot(), Type = requireType(), Field = requireField(), MapField = requireMapfield(), OneOf = requireOneof(), Enum = require_enum(), Service = requireService(), Method = requireMethod(), types = requireTypes(), util = requireUtil(), base10Re = /^[1-9][0-9]*$/, base10NegRe = /^-?[1-9][0-9]*$/, base16Re = /^0[x][0-9a-fA-F]+$/, base16NegRe = /^-?0[x][0-9a-fA-F]+$/, base8Re = /^0[0-7]+$/, base8NegRe = /^-?0[0-7]+$/, numberRe = /^(?![eE])[0-9]*(?:\.[0-9]*)?(?:[eE][+-]?[0-9]+)?$/, nameRe = /^[a-zA-Z_][a-zA-Z_0-9]*$/, typeRefRe = /^(?:\.?[a-zA-Z_][a-zA-Z_0-9]*)(?:\.[a-zA-Z_][a-zA-Z_0-9]*)*$/, fqTypeRefRe = /^(?:\.[a-zA-Z_][a-zA-Z_0-9]*)+$/;
 function parse(s, i, r) {
   i instanceof Root || (r = i, i = new Root()), r || (r = parse.defaults);
-  var l = r.preferTrailingComment || !1, m = tokenize(s, r.alternateCommentMode || !1), o = m.next, u = m.push, c = m.peek, d = m.skip, a = m.cmnt, p = !0, y, g, h, v, b = !1, _ = i, T = r.keepCase ? function(S) {
-    return S;
+  var u = r.preferTrailingComment || !1, m = tokenize(s, r.alternateCommentMode || !1), o = m.next, l = m.push, c = m.peek, d = m.skip, a = m.cmnt, p = !0, y, g, h, v, b = !1, _ = i, T = r.keepCase ? function(A) {
+    return A;
   } : util.camelCase;
-  function w(S, C, I) {
-    var $ = parse.filename;
-    return I || (parse.filename = null), Error(
-      "illegal " + (C || "token") + " '" + S + "' (" + ($ ? $ + ", " : "") + "line " + m.line + ")"
+  function w(A, k, N) {
+    var B = parse.filename;
+    return N || (parse.filename = null), Error(
+      "illegal " + (k || "token") + " '" + A + "' (" + (B ? B + ", " : "") + "line " + m.line + ")"
     );
   }
-  function O() {
-    var S = [], C;
+  function x() {
+    var A = [], k;
     do {
-      if ((C = o()) !== '"' && C !== "'") throw w(C);
-      S.push(o()), d(C), C = c();
-    } while (C === '"' || C === "'");
-    return S.join("");
+      if ((k = o()) !== '"' && k !== "'") throw w(k);
+      A.push(o()), d(k), k = c();
+    } while (k === '"' || k === "'");
+    return A.join("");
   }
-  function x() {
-    var S = o();
-    switch (S) {
+  function O() {
+    var A = o();
+    switch (A) {
       case "'":
       case '"':
-        return u(S), O();
+        return l(A), x();
       case "true":
       case "TRUE":
         return !0;
@@ -4144,44 +4144,44 @@ function parse(s, i, r) {
     }
     try {
       return E(
-        S,
+        A,
         /* insideTryCatch */
         !0
       );
     } catch {
-      if (typeRefRe.test(S)) return S;
-      throw w(S, "value");
+      if (typeRefRe.test(A)) return A;
+      throw w(A, "value");
     }
   }
-  function R(S, C) {
-    var I, $;
+  function R(A, k) {
+    var N, B;
     do
-      C && ((I = c()) === '"' || I === "'") ? S.push(O()) : S.push([$ = A(o()), d("to", !0) ? A(o()) : $]);
+      k && ((N = c()) === '"' || N === "'") ? A.push(x()) : A.push([B = S(o()), d("to", !0) ? S(o()) : B]);
     while (d(",", !0));
-    var B = {
+    var L = {
       options: void 0
     };
-    B.setOption = function(q, j) {
-      this.options === void 0 && (this.options = {}), this.options[q] = j;
-    }, L(
-      B,
+    L.setOption = function(M, j) {
+      this.options === void 0 && (this.options = {}), this.options[M] = j;
+    }, $(
+      L,
       function(j) {
         if (j === "option")
-          W(B, j), d(";");
+          Z(L, j), d(";");
         else throw w(j);
       },
       function() {
-        X(B);
+        X(L);
       }
     );
   }
-  function E(S, C) {
-    var I = 1;
-    switch (S.charAt(0) === "-" && (I = -1, S = S.substring(1)), S) {
+  function E(A, k) {
+    var N = 1;
+    switch (A.charAt(0) === "-" && (N = -1, A = A.substring(1)), A) {
       case "inf":
       case "INF":
       case "Inf":
-        return I * (1 / 0);
+        return N * (1 / 0);
       case "nan":
       case "NAN":
       case "Nan":
@@ -4190,14 +4190,14 @@ function parse(s, i, r) {
       case "0":
         return 0;
     }
-    if (base10Re.test(S)) return I * parseInt(S, 10);
-    if (base16Re.test(S)) return I * parseInt(S, 16);
-    if (base8Re.test(S)) return I * parseInt(S, 8);
-    if (numberRe.test(S)) return I * parseFloat(S);
-    throw w(S, "number", C);
-  }
-  function A(S, C) {
-    switch (S) {
+    if (base10Re.test(A)) return N * parseInt(A, 10);
+    if (base16Re.test(A)) return N * parseInt(A, 16);
+    if (base8Re.test(A)) return N * parseInt(A, 8);
+    if (numberRe.test(A)) return N * parseFloat(A);
+    throw w(A, "number", k);
+  }
+  function S(A, k) {
+    switch (A) {
       case "max":
       case "MAX":
       case "Max":
@@ -4205,312 +4205,312 @@ function parse(s, i, r) {
       case "0":
         return 0;
     }
-    if (!C && S.charAt(0) === "-") throw w(S, "id");
-    if (base10NegRe.test(S)) return parseInt(S, 10);
-    if (base16NegRe.test(S)) return parseInt(S, 16);
-    if (base8NegRe.test(S)) return parseInt(S, 8);
-    throw w(S, "id");
+    if (!k && A.charAt(0) === "-") throw w(A, "id");
+    if (base10NegRe.test(A)) return parseInt(A, 10);
+    if (base16NegRe.test(A)) return parseInt(A, 16);
+    if (base8NegRe.test(A)) return parseInt(A, 8);
+    throw w(A, "id");
   }
   function P() {
     if (y !== void 0) throw w("package");
     if (y = o(), !typeRefRe.test(y)) throw w(y, "name");
     _ = _.define(y), d(";");
   }
-  function k() {
-    var S = c(), C;
-    switch (S) {
+  function C() {
+    var A = c(), k;
+    switch (A) {
       case "weak":
-        C = h || (h = []), o();
+        k = h || (h = []), o();
         break;
       case "public":
         o();
       default:
-        C = g || (g = []);
+        k = g || (g = []);
         break;
     }
-    S = O(), d(";"), C.push(S);
+    A = x(), d(";"), k.push(A);
   }
   function D() {
-    if (d("="), v = O(), b = v === "proto3", !b && v !== "proto2") throw w(v, "syntax");
+    if (d("="), v = x(), b = v === "proto3", !b && v !== "proto2") throw w(v, "syntax");
     i.setOption("syntax", v), d(";");
   }
-  function N(S, C) {
-    switch (C) {
+  function I(A, k) {
+    switch (k) {
       case "option":
-        return W(S, C), d(";"), !0;
+        return Z(A, k), d(";"), !0;
       case "message":
-        return F(S, C), !0;
+        return q(A, k), !0;
       case "enum":
-        return Q(S, C), !0;
+        return Q(A, k), !0;
       case "service":
-        return se(S, C), !0;
+        return se(A, k), !0;
       case "extend":
-        return oe(S, C), !0;
+        return oe(A, k), !0;
     }
     return !1;
   }
-  function L(S, C, I) {
-    var $ = m.line;
-    if (S && (typeof S.comment != "string" && (S.comment = a()), S.filename = parse.filename), d("{", !0)) {
-      for (var B; (B = o()) !== "}"; ) C(B);
+  function $(A, k, N) {
+    var B = m.line;
+    if (A && (typeof A.comment != "string" && (A.comment = a()), A.filename = parse.filename), d("{", !0)) {
+      for (var L; (L = o()) !== "}"; ) k(L);
       d(";", !0);
     } else
-      I && I(), d(";"), S && (typeof S.comment != "string" || l) && (S.comment = a($) || S.comment);
-  }
-  function F(S, C) {
-    if (!nameRe.test(C = o())) throw w(C, "type name");
-    var I = new Type(C);
-    L(I, function(B) {
-      if (!N(I, B))
-        switch (B) {
+      N && N(), d(";"), A && (typeof A.comment != "string" || u) && (A.comment = a(B) || A.comment);
+  }
+  function q(A, k) {
+    if (!nameRe.test(k = o())) throw w(k, "type name");
+    var N = new Type(k);
+    $(N, function(L) {
+      if (!I(N, L))
+        switch (L) {
           case "map":
-            te(I);
+            te(N);
             break;
           case "required":
           case "repeated":
-            M(I, B);
+            F(N, L);
             break;
           case "optional":
-            b ? M(I, "proto3_optional") : M(I, "optional");
+            b ? F(N, "proto3_optional") : F(N, "optional");
             break;
           case "oneof":
-            re(I, B);
+            re(N, L);
             break;
           case "extensions":
-            R(I.extensions || (I.extensions = []));
+            R(N.extensions || (N.extensions = []));
             break;
           case "reserved":
-            R(I.reserved || (I.reserved = []), !0);
+            R(N.reserved || (N.reserved = []), !0);
             break;
           default:
-            if (!b || !typeRefRe.test(B)) throw w(B);
-            u(B), M(I, "optional");
+            if (!b || !typeRefRe.test(L)) throw w(L);
+            l(L), F(N, "optional");
             break;
         }
-    }), S.add(I);
+    }), A.add(N);
   }
-  function M(S, C, I) {
-    var $ = o();
-    if ($ === "group") {
-      U(S, C);
+  function F(A, k, N) {
+    var B = o();
+    if (B === "group") {
+      U(A, k);
       return;
     }
-    for (; $.endsWith(".") || c().startsWith("."); )
-      $ += o();
-    if (!typeRefRe.test($)) throw w($, "type");
-    var B = o();
-    if (!nameRe.test(B)) throw w(B, "name");
-    B = T(B), d("=");
-    var q = new Field(B, A(o()), $, C, I);
-    if (L(
-      q,
-      function(Z) {
-        if (Z === "option")
-          W(q, Z), d(";");
-        else throw w(Z);
+    for (; B.endsWith(".") || c().startsWith("."); )
+      B += o();
+    if (!typeRefRe.test(B)) throw w(B, "type");
+    var L = o();
+    if (!nameRe.test(L)) throw w(L, "name");
+    L = T(L), d("=");
+    var M = new Field(L, S(o()), B, k, N);
+    if ($(
+      M,
+      function(W) {
+        if (W === "option")
+          Z(M, W), d(";");
+        else throw w(W);
       },
       function() {
-        X(q);
+        X(M);
       }
-    ), C === "proto3_optional") {
-      var j = new OneOf("_" + B);
-      q.setOption("proto3_optional", !0), j.add(q), S.add(j);
+    ), k === "proto3_optional") {
+      var j = new OneOf("_" + L);
+      M.setOption("proto3_optional", !0), j.add(M), A.add(j);
     } else
-      S.add(q);
-    !b && q.repeated && (types.packed[$] !== void 0 || types.basic[$] === void 0) && q.setOption(
+      A.add(M);
+    !b && M.repeated && (types.packed[B] !== void 0 || types.basic[B] === void 0) && M.setOption(
       "packed",
       !1,
       /* ifNotSet */
       !0
     );
   }
-  function U(S, C) {
-    var I = o();
-    if (!nameRe.test(I)) throw w(I, "name");
-    var $ = util.lcFirst(I);
-    I === $ && (I = util.ucFirst(I)), d("=");
-    var B = A(o()), q = new Type(I);
-    q.group = !0;
-    var j = new Field($, B, I, C);
-    j.filename = parse.filename, L(q, function(Z) {
-      switch (Z) {
+  function U(A, k) {
+    var N = o();
+    if (!nameRe.test(N)) throw w(N, "name");
+    var B = util.lcFirst(N);
+    N === B && (N = util.ucFirst(N)), d("=");
+    var L = S(o()), M = new Type(N);
+    M.group = !0;
+    var j = new Field(B, L, N, k);
+    j.filename = parse.filename, $(M, function(W) {
+      switch (W) {
         case "option":
-          W(q, Z), d(";");
+          Z(M, W), d(";");
           break;
         case "required":
         case "repeated":
-          M(q, Z);
+          F(M, W);
           break;
         case "optional":
-          b ? M(q, "proto3_optional") : M(q, "optional");
+          b ? F(M, "proto3_optional") : F(M, "optional");
           break;
         case "message":
-          F(q, Z);
+          q(M, W);
           break;
         case "enum":
-          Q(q, Z);
+          Q(M, W);
           break;
         /* istanbul ignore next */
         default:
-          throw w(Z);
+          throw w(W);
       }
-    }), S.add(q).add(j);
+    }), A.add(M).add(j);
   }
-  function te(S) {
+  function te(A) {
     d("<");
-    var C = o();
-    if (types.mapKey[C] === void 0) throw w(C, "type");
+    var k = o();
+    if (types.mapKey[k] === void 0) throw w(k, "type");
     d(",");
-    var I = o();
-    if (!typeRefRe.test(I)) throw w(I, "type");
+    var N = o();
+    if (!typeRefRe.test(N)) throw w(N, "type");
     d(">");
-    var $ = o();
-    if (!nameRe.test($)) throw w($, "name");
+    var B = o();
+    if (!nameRe.test(B)) throw w(B, "name");
     d("=");
-    var B = new MapField(T($), A(o()), C, I);
-    L(
-      B,
+    var L = new MapField(T(B), S(o()), k, N);
+    $(
+      L,
       function(j) {
         if (j === "option")
-          W(B, j), d(";");
+          Z(L, j), d(";");
         else throw w(j);
       },
       function() {
-        X(B);
+        X(L);
       }
-    ), S.add(B);
-  }
-  function re(S, C) {
-    if (!nameRe.test(C = o())) throw w(C, "name");
-    var I = new OneOf(T(C));
-    L(I, function(B) {
-      B === "option" ? (W(I, B), d(";")) : (u(B), M(I, "optional"));
-    }), S.add(I);
-  }
-  function Q(S, C) {
-    if (!nameRe.test(C = o())) throw w(C, "name");
-    var I = new Enum(C);
-    L(I, function(B) {
-      switch (B) {
+    ), A.add(L);
+  }
+  function re(A, k) {
+    if (!nameRe.test(k = o())) throw w(k, "name");
+    var N = new OneOf(T(k));
+    $(N, function(L) {
+      L === "option" ? (Z(N, L), d(";")) : (l(L), F(N, "optional"));
+    }), A.add(N);
+  }
+  function Q(A, k) {
+    if (!nameRe.test(k = o())) throw w(k, "name");
+    var N = new Enum(k);
+    $(N, function(L) {
+      switch (L) {
         case "option":
-          W(I, B), d(";");
+          Z(N, L), d(";");
           break;
         case "reserved":
-          R(I.reserved || (I.reserved = []), !0);
+          R(N.reserved || (N.reserved = []), !0);
           break;
         default:
-          ie(I, B);
+          ie(N, L);
       }
-    }), S.add(I);
+    }), A.add(N);
   }
-  function ie(S, C) {
-    if (!nameRe.test(C)) throw w(C, "name");
+  function ie(A, k) {
+    if (!nameRe.test(k)) throw w(k, "name");
     d("=");
-    var I = A(o(), !0), $ = {
+    var N = S(o(), !0), B = {
       options: void 0
     };
-    $.setOption = function(B, q) {
-      this.options === void 0 && (this.options = {}), this.options[B] = q;
-    }, L(
-      $,
-      function(q) {
-        if (q === "option")
-          W($, q), d(";");
-        else throw w(q);
+    B.setOption = function(L, M) {
+      this.options === void 0 && (this.options = {}), this.options[L] = M;
+    }, $(
+      B,
+      function(M) {
+        if (M === "option")
+          Z(B, M), d(";");
+        else throw w(M);
       },
       function() {
-        X($);
+        X(B);
       }
-    ), S.add(C, I, $.comment, $.options);
+    ), A.add(k, N, B.comment, B.options);
   }
-  function W(S, C) {
-    var I = d("(", !0);
-    if (!typeRefRe.test(C = o())) throw w(C, "name");
-    var $ = C, B = $, q;
-    I && (d(")"), $ = "(" + $ + ")", B = $, C = c(), fqTypeRefRe.test(C) && (q = C.slice(1), $ += C, o())), d("=");
-    var j = ee(S, $);
-    ne(S, B, j, q);
+  function Z(A, k) {
+    var N = d("(", !0);
+    if (!typeRefRe.test(k = o())) throw w(k, "name");
+    var B = k, L = B, M;
+    N && (d(")"), B = "(" + B + ")", L = B, k = c(), fqTypeRefRe.test(k) && (M = k.slice(1), B += k, o())), d("=");
+    var j = ee(A, B);
+    ne(A, L, j, M);
   }
-  function ee(S, C) {
+  function ee(A, k) {
     if (d("{", !0)) {
-      for (var I = {}; !d("}", !0); ) {
+      for (var N = {}; !d("}", !0); ) {
         if (!nameRe.test(H = o()))
           throw w(H, "name");
         if (H === null)
           throw w(H, "end of input");
-        var $, B = H;
-        if (d(":", !0), c() === "{") $ = ee(S, C + "." + H);
+        var B, L = H;
+        if (d(":", !0), c() === "{") B = ee(A, k + "." + H);
         else if (c() === "[") {
-          $ = [];
-          var q;
+          B = [];
+          var M;
           if (d("[", !0)) {
             do
-              q = x(), $.push(q);
+              M = O(), B.push(M);
             while (d(",", !0));
-            d("]"), typeof q < "u" && K(S, C + "." + H, q);
+            d("]"), typeof M < "u" && K(A, k + "." + H, M);
           }
         } else
-          $ = x(), K(S, C + "." + H, $);
-        var j = I[B];
-        j && ($ = [].concat(j).concat($)), I[B] = $, d(",", !0), d(";", !0);
+          B = O(), K(A, k + "." + H, B);
+        var j = N[L];
+        j && (B = [].concat(j).concat(B)), N[L] = B, d(",", !0), d(";", !0);
       }
-      return I;
+      return N;
     }
-    var V = x();
-    return K(S, C, V), V;
+    var V = O();
+    return K(A, k, V), V;
   }
-  function K(S, C, I) {
-    S.setOption && S.setOption(C, I);
+  function K(A, k, N) {
+    A.setOption && A.setOption(k, N);
   }
-  function ne(S, C, I, $) {
-    S.setParsedOption && S.setParsedOption(C, I, $);
+  function ne(A, k, N, B) {
+    A.setParsedOption && A.setParsedOption(k, N, B);
   }
-  function X(S) {
+  function X(A) {
     if (d("[", !0)) {
       do
-        W(S, "option");
+        Z(A, "option");
       while (d(",", !0));
       d("]");
     }
-    return S;
+    return A;
   }
-  function se(S, C) {
-    if (!nameRe.test(C = o())) throw w(C, "service name");
-    var I = new Service(C);
-    L(I, function(B) {
-      if (!N(I, B))
-        if (B === "rpc") ae(I, B);
-        else throw w(B);
-    }), S.add(I);
-  }
-  function ae(S, C) {
-    var I = a(), $ = C;
-    if (!nameRe.test(C = o())) throw w(C, "name");
-    var B = C, q, j, V, Z;
-    if (d("("), d("stream", !0) && (j = !0), !typeRefRe.test(C = o()) || (q = C, d(")"), d("returns"), d("("), d("stream", !0) && (Z = !0), !typeRefRe.test(C = o()))) throw w(C);
-    V = C, d(")");
-    var J = new Method(B, $, q, V, j, Z);
-    J.comment = I, L(J, function(Y) {
+  function se(A, k) {
+    if (!nameRe.test(k = o())) throw w(k, "service name");
+    var N = new Service(k);
+    $(N, function(L) {
+      if (!I(N, L))
+        if (L === "rpc") ae(N, L);
+        else throw w(L);
+    }), A.add(N);
+  }
+  function ae(A, k) {
+    var N = a(), B = k;
+    if (!nameRe.test(k = o())) throw w(k, "name");
+    var L = k, M, j, V, W;
+    if (d("("), d("stream", !0) && (j = !0), !typeRefRe.test(k = o()) || (M = k, d(")"), d("returns"), d("("), d("stream", !0) && (W = !0), !typeRefRe.test(k = o()))) throw w(k);
+    V = k, d(")");
+    var J = new Method(L, B, M, V, j, W);
+    J.comment = N, $(J, function(Y) {
       if (Y === "option")
-        W(J, Y), d(";");
+        Z(J, Y), d(";");
       else throw w(Y);
-    }), S.add(J);
+    }), A.add(J);
   }
-  function oe(S, C) {
-    if (!typeRefRe.test(C = o())) throw w(C, "reference");
-    var I = C;
-    L(null, function(B) {
-      switch (B) {
+  function oe(A, k) {
+    if (!typeRefRe.test(k = o())) throw w(k, "reference");
+    var N = k;
+    $(null, function(L) {
+      switch (L) {
         case "required":
         case "repeated":
-          M(S, B, I);
+          F(A, L, N);
           break;
         case "optional":
-          b ? M(S, "proto3_optional", I) : M(S, "optional", I);
+          b ? F(A, "proto3_optional", N) : F(A, "optional", N);
           break;
         default:
-          if (!b || !typeRefRe.test(B)) throw w(B);
-          u(B), M(S, "optional", I);
+          if (!b || !typeRefRe.test(L)) throw w(L);
+          l(L), F(A, "optional", N);
           break;
       }
     });
@@ -4523,17 +4523,17 @@ function parse(s, i, r) {
         break;
       case "import":
         if (!p) throw w(H);
-        k();
+        C();
         break;
       case "syntax":
         if (!p) throw w(H);
         D();
         break;
       case "option":
-        W(_, H), d(";");
+        Z(_, H), d(";");
         break;
       default:
-        if (N(_, H)) {
+        if (I(_, H)) {
           p = !1;
           continue;
         }
@@ -4895,7 +4895,7 @@ var index = {
   GeoTerrainProvider
 };
 function createTdtProvider(s, i) {
-  const { token: r, ...l } = i;
+  const { token: r, ...u } = i;
   return new WebMapTileServiceImageryProvider({
     url: `https://t0.tianditu.gov.cn/${s}_w/wmts?tk=${r}`,
     layer: s,
@@ -4904,7 +4904,7 @@ function createTdtProvider(s, i) {
     tileMatrixSetID: "w",
     maximumLevel: 18,
     credit: new Credit("TianDiTu"),
-    ...l
+    ...u
   });
 }
 function createTdtTerrain(s) {
@@ -4920,11 +4920,11 @@ function getRawTag(s) {
   var i = hasOwnProperty$6.call(s, symToStringTag$1), r = s[symToStringTag$1];
   try {
     s[symToStringTag$1] = void 0;
-    var l = !0;
+    var u = !0;
   } catch {
   }
   var m = nativeObjectToString$1.call(s);
-  return l && (i ? s[symToStringTag$1] = r : delete s[symToStringTag$1]), m;
+  return u && (i ? s[symToStringTag$1] = r : delete s[symToStringTag$1]), m;
 }
 var objectProto$7 = Object.prototype, nativeObjectToString = objectProto$7.toString;
 function objectToString(s) {
@@ -5035,8 +5035,8 @@ var HOT_COUNT = 800, HOT_SPAN = 16, nativeNow = Date.now;
 function shortOut(s) {
   var i = 0, r = 0;
   return function() {
-    var l = nativeNow(), m = HOT_SPAN - (l - r);
-    if (r = l, m > 0) {
+    var u = nativeNow(), m = HOT_SPAN - (u - r);
+    if (r = u, m > 0) {
       if (++i >= HOT_COUNT)
         return arguments[0];
     } else
@@ -5073,12 +5073,12 @@ function eq(s, i) {
 var nativeMax$1 = Math.max;
 function overRest(s, i, r) {
   return i = nativeMax$1(i === void 0 ? s.length - 1 : i, 0), function() {
-    for (var l = arguments, m = -1, o = nativeMax$1(l.length - i, 0), u = Array(o); ++m < o; )
-      u[m] = l[i + m];
+    for (var u = arguments, m = -1, o = nativeMax$1(u.length - i, 0), l = Array(o); ++m < o; )
+      l[m] = u[i + m];
     m = -1;
     for (var c = Array(i + 1); ++m < i; )
-      c[m] = l[m];
-    return c[i] = r(u), apply(s, this, c);
+      c[m] = u[m];
+    return c[i] = r(l), apply(s, this, c);
   };
 }
 function baseRest(s, i) {
@@ -5094,8 +5094,8 @@ function isArrayLike(s) {
 function isIterateeCall(s, i, r) {
   if (!isObject(r))
     return !1;
-  var l = typeof i;
-  return (l == "number" ? isArrayLike(r) && isIndex(i, r.length) : l == "string" && i in r) ? eq(r[i], s) : !1;
+  var u = typeof i;
+  return (u == "number" ? isArrayLike(r) && isIndex(i, r.length) : u == "string" && i in r) ? eq(r[i], s) : !1;
 }
 var objectProto$5 = Object.prototype;
 function isPrototype(s) {
@@ -5103,9 +5103,9 @@ function isPrototype(s) {
   return s === r;
 }
 function baseTimes(s, i) {
-  for (var r = -1, l = Array(s); ++r < s; )
-    l[r] = i(r);
-  return l;
+  for (var r = -1, u = Array(s); ++r < s; )
+    u[r] = i(r);
+  return u;
 }
 var argsTag$1 = "[object Arguments]";
 function baseIsArguments(s) {
@@ -5138,9 +5138,9 @@ var freeExports = typeof exports == "object" && exports && !exports.nodeType &&
   }
 }(), nodeIsTypedArray = nodeUtil && nodeUtil.isTypedArray, isTypedArray = nodeIsTypedArray ? baseUnary(nodeIsTypedArray) : baseIsTypedArray;
 function arrayLikeKeys(s, i) {
-  var r = isArray(s), l = !r && isArguments(s), m = !r && !l && isBuffer(s), o = !r && !l && !m && isTypedArray(s), u = r || l || m || o, c = u ? baseTimes(s.length, String) : [], d = c.length;
+  var r = isArray(s), u = !r && isArguments(s), m = !r && !u && isBuffer(s), o = !r && !u && !m && isTypedArray(s), l = r || u || m || o, c = l ? baseTimes(s.length, String) : [], d = c.length;
   for (var a in s)
-    u && // Safari 9 has enumerable `arguments.length` in strict mode.
+    l && // Safari 9 has enumerable `arguments.length` in strict mode.
     (a == "length" || // Node.js 0.10 has enumerable non-index properties on buffers.
     m && (a == "offset" || a == "parent") || // PhantomJS 2 has enumerable non-index properties on typed arrays.
     o && (a == "buffer" || a == "byteLength" || a == "byteOffset") || // Skip index properties.
@@ -5159,8 +5159,8 @@ function baseKeysIn(s) {
   if (!isObject(s))
     return nativeKeysIn(s);
   var i = isPrototype(s), r = [];
-  for (var l in s)
-    l == "constructor" && (i || !hasOwnProperty$3.call(s, l)) || r.push(l);
+  for (var u in s)
+    u == "constructor" && (i || !hasOwnProperty$3.call(s, u)) || r.push(u);
   return r;
 }
 function keysIn(s) {
@@ -5196,8 +5196,8 @@ function hashSet(s, i) {
 function Hash(s) {
   var i = -1, r = s == null ? 0 : s.length;
   for (this.clear(); ++i < r; ) {
-    var l = s[i];
-    this.set(l[0], l[1]);
+    var u = s[i];
+    this.set(u[0], u[1]);
   }
 }
 Hash.prototype.clear = hashClear;
@@ -5219,8 +5219,8 @@ function listCacheDelete(s) {
   var i = this.__data__, r = assocIndexOf(i, s);
   if (r < 0)
     return !1;
-  var l = i.length - 1;
-  return r == l ? i.pop() : splice.call(i, r, 1), --this.size, !0;
+  var u = i.length - 1;
+  return r == u ? i.pop() : splice.call(i, r, 1), --this.size, !0;
 }
 function listCacheGet(s) {
   var i = this.__data__, r = assocIndexOf(i, s);
@@ -5230,14 +5230,14 @@ function listCacheHas(s) {
   return assocIndexOf(this.__data__, s) > -1;
 }
 function listCacheSet(s, i) {
-  var r = this.__data__, l = assocIndexOf(r, s);
-  return l < 0 ? (++this.size, r.push([s, i])) : r[l][1] = i, this;
+  var r = this.__data__, u = assocIndexOf(r, s);
+  return u < 0 ? (++this.size, r.push([s, i])) : r[u][1] = i, this;
 }
 function ListCache(s) {
   var i = -1, r = s == null ? 0 : s.length;
   for (this.clear(); ++i < r; ) {
-    var l = s[i];
-    this.set(l[0], l[1]);
+    var u = s[i];
+    this.set(u[0], u[1]);
   }
 }
 ListCache.prototype.clear = listCacheClear;
@@ -5272,14 +5272,14 @@ function mapCacheHas(s) {
   return getMapData(this, s).has(s);
 }
 function mapCacheSet(s, i) {
-  var r = getMapData(this, s), l = r.size;
-  return r.set(s, i), this.size += r.size == l ? 0 : 1, this;
+  var r = getMapData(this, s), u = r.size;
+  return r.set(s, i), this.size += r.size == u ? 0 : 1, this;
 }
 function MapCache(s) {
   var i = -1, r = s == null ? 0 : s.length;
   for (this.clear(); ++i < r; ) {
-    var l = s[i];
-    this.set(l[0], l[1]);
+    var u = s[i];
+    this.set(u[0], u[1]);
   }
 }
 MapCache.prototype.clear = mapCacheClear;
@@ -5292,11 +5292,11 @@ function memoize(s, i) {
   if (typeof s != "function" || i != null && typeof i != "function")
     throw new TypeError(FUNC_ERROR_TEXT$1);
   var r = function() {
-    var l = arguments, m = i ? i.apply(this, l) : l[0], o = r.cache;
+    var u = arguments, m = i ? i.apply(this, u) : u[0], o = r.cache;
     if (o.has(m))
       return o.get(m);
-    var u = s.apply(this, l);
-    return r.cache = o.set(m, u) || o, u;
+    var l = s.apply(this, u);
+    return r.cache = o.set(m, l) || o, l;
   };
   return r.cache = new (memoize.Cache || MapCache)(), r;
 }
@@ -5305,24 +5305,24 @@ var now = function() {
   return root.Date.now();
 }, FUNC_ERROR_TEXT = "Expected a function", nativeMax = Math.max, nativeMin = Math.min;
 function debounce(s, i, r) {
-  var l, m, o, u, c, d, a = 0, p = !1, y = !1, g = !0;
+  var u, m, o, l, c, d, a = 0, p = !1, y = !1, g = !0;
   if (typeof s != "function")
     throw new TypeError(FUNC_ERROR_TEXT);
   i = toNumber(i) || 0, isObject(r) && (p = !!r.leading, y = "maxWait" in r, o = y ? nativeMax(toNumber(r.maxWait) || 0, i) : o, g = "trailing" in r ? !!r.trailing : g);
   function h(E) {
-    var A = l, P = m;
-    return l = m = void 0, a = E, u = s.apply(P, A), u;
+    var S = u, P = m;
+    return u = m = void 0, a = E, l = s.apply(P, S), l;
   }
   function v(E) {
-    return a = E, c = setTimeout(T, i), p ? h(E) : u;
+    return a = E, c = setTimeout(T, i), p ? h(E) : l;
   }
   function b(E) {
-    var A = E - d, P = E - a, k = i - A;
-    return y ? nativeMin(k, o - P) : k;
+    var S = E - d, P = E - a, C = i - S;
+    return y ? nativeMin(C, o - P) : C;
   }
   function _(E) {
-    var A = E - d, P = E - a;
-    return d === void 0 || A >= i || A < 0 || y && P >= o;
+    var S = E - d, P = E - a;
+    return d === void 0 || S >= i || S < 0 || y && P >= o;
   }
   function T() {
     var E = now();
@@ -5331,32 +5331,32 @@ function debounce(s, i, r) {
     c = setTimeout(T, b(E));
   }
   function w(E) {
-    return c = void 0, g && l ? h(E) : (l = m = void 0, u);
-  }
-  function O() {
-    c !== void 0 && clearTimeout(c), a = 0, l = d = m = c = void 0;
+    return c = void 0, g && u ? h(E) : (u = m = void 0, l);
   }
   function x() {
-    return c === void 0 ? u : w(now());
+    c !== void 0 && clearTimeout(c), a = 0, u = d = m = c = void 0;
+  }
+  function O() {
+    return c === void 0 ? l : w(now());
   }
   function R() {
-    var E = now(), A = _(E);
-    if (l = arguments, m = this, d = E, A) {
+    var E = now(), S = _(E);
+    if (u = arguments, m = this, d = E, S) {
       if (c === void 0)
         return v(d);
       if (y)
         return clearTimeout(c), c = setTimeout(T, i), h(d);
     }
-    return c === void 0 && (c = setTimeout(T, i)), u;
+    return c === void 0 && (c = setTimeout(T, i)), l;
   }
-  return R.cancel = O, R.flush = x, R;
+  return R.cancel = x, R.flush = O, R;
 }
 var objectProto = Object.prototype, hasOwnProperty = objectProto.hasOwnProperty, defaults = baseRest(function(s, i) {
   s = Object(s);
-  var r = -1, l = i.length, m = l > 2 ? i[2] : void 0;
-  for (m && isIterateeCall(i[0], i[1], m) && (l = 1); ++r < l; )
-    for (var o = i[r], u = keysIn(o), c = -1, d = u.length; ++c < d; ) {
-      var a = u[c], p = s[a];
+  var r = -1, u = i.length, m = u > 2 ? i[2] : void 0;
+  for (m && isIterateeCall(i[0], i[1], m) && (u = 1); ++r < u; )
+    for (var o = i[r], l = keysIn(o), c = -1, d = l.length; ++c < d; ) {
+      var a = l[c], p = s[a];
       (p === void 0 || eq(p, objectProto[a]) && !hasOwnProperty.call(s, a)) && (s[a] = o[a]);
     }
   return s;
@@ -5368,9 +5368,9 @@ var eventemitter3 = { exports: {} }, hasRequiredEventemitter3;
 function requireEventemitter3() {
   return hasRequiredEventemitter3 || (hasRequiredEventemitter3 = 1, function(s) {
     var i = Object.prototype.hasOwnProperty, r = "~";
-    function l() {
+    function u() {
     }
-    Object.create && (l.prototype = /* @__PURE__ */ Object.create(null), new l().__proto__ || (r = !1));
+    Object.create && (u.prototype = /* @__PURE__ */ Object.create(null), new u().__proto__ || (r = !1));
     function m(d, a, p) {
       this.fn = d, this.context = a, this.once = p || !1;
     }
@@ -5380,11 +5380,11 @@ function requireEventemitter3() {
       var h = new m(p, y || d, g), v = r ? r + a : a;
       return d._events[v] ? d._events[v].fn ? d._events[v] = [d._events[v], h] : d._events[v].push(h) : (d._events[v] = h, d._eventsCount++), d;
     }
-    function u(d, a) {
-      --d._eventsCount === 0 ? d._events = new l() : delete d._events[a];
+    function l(d, a) {
+      --d._eventsCount === 0 ? d._events = new u() : delete d._events[a];
     }
     function c() {
-      this._events = new l(), this._eventsCount = 0;
+      this._events = new u(), this._eventsCount = 0;
     }
     c.prototype.eventNames = function() {
       var a = [], p, y;
@@ -5405,7 +5405,7 @@ function requireEventemitter3() {
     }, c.prototype.emit = function(a, p, y, g, h, v) {
       var b = r ? r + a : a;
       if (!this._events[b]) return !1;
-      var _ = this._events[b], T = arguments.length, w, O;
+      var _ = this._events[b], T = arguments.length, w, x;
       if (_.fn) {
         switch (_.once && this.removeListener(a, _.fn, void 0, !0), T) {
           case 1:
@@ -5421,29 +5421,29 @@ function requireEventemitter3() {
           case 6:
             return _.fn.call(_.context, p, y, g, h, v), !0;
         }
-        for (O = 1, w = new Array(T - 1); O < T; O++)
-          w[O - 1] = arguments[O];
+        for (x = 1, w = new Array(T - 1); x < T; x++)
+          w[x - 1] = arguments[x];
         _.fn.apply(_.context, w);
       } else {
-        var x = _.length, R;
-        for (O = 0; O < x; O++)
-          switch (_[O].once && this.removeListener(a, _[O].fn, void 0, !0), T) {
+        var O = _.length, R;
+        for (x = 0; x < O; x++)
+          switch (_[x].once && this.removeListener(a, _[x].fn, void 0, !0), T) {
             case 1:
-              _[O].fn.call(_[O].context);
+              _[x].fn.call(_[x].context);
               break;
             case 2:
-              _[O].fn.call(_[O].context, p);
+              _[x].fn.call(_[x].context, p);
               break;
             case 3:
-              _[O].fn.call(_[O].context, p, y);
+              _[x].fn.call(_[x].context, p, y);
               break;
             case 4:
-              _[O].fn.call(_[O].context, p, y, g);
+              _[x].fn.call(_[x].context, p, y, g);
               break;
             default:
               if (!w) for (R = 1, w = new Array(T - 1); R < T; R++)
                 w[R - 1] = arguments[R];
-              _[O].fn.apply(_[O].context, w);
+              _[x].fn.apply(_[x].context, w);
           }
       }
       return !0;
@@ -5455,27 +5455,27 @@ function requireEventemitter3() {
       var h = r ? r + a : a;
       if (!this._events[h]) return this;
       if (!p)
-        return u(this, h), this;
+        return l(this, h), this;
       var v = this._events[h];
       if (v.fn)
-        v.fn === p && (!g || v.once) && (!y || v.context === y) && u(this, h);
+        v.fn === p && (!g || v.once) && (!y || v.context === y) && l(this, h);
       else {
         for (var b = 0, _ = [], T = v.length; b < T; b++)
           (v[b].fn !== p || g && !v[b].once || y && v[b].context !== y) && _.push(v[b]);
-        _.length ? this._events[h] = _.length === 1 ? _[0] : _ : u(this, h);
+        _.length ? this._events[h] = _.length === 1 ? _[0] : _ : l(this, h);
       }
       return this;
     }, c.prototype.removeAllListeners = function(a) {
       var p;
-      return a ? (p = r ? r + a : a, this._events[p] && u(this, p)) : (this._events = new l(), this._eventsCount = 0), this;
+      return a ? (p = r ? r + a : a, this._events[p] && l(this, p)) : (this._events = new u(), this._eventsCount = 0), this;
     }, c.prototype.off = c.prototype.removeListener, c.prototype.addListener = c.prototype.on, c.prefixed = r, c.EventEmitter = c, s.exports = c;
   }(eventemitter3)), eventemitter3.exports;
 }
 var eventemitter3Exports = requireEventemitter3();
 const EventEmitter = /* @__PURE__ */ getDefaultExportFromCjs(eventemitter3Exports);
 class WmsLayer {
-  constructor(i, r, l, m = 1 / 0) {
-    this.ctrl = i, this.key = r, this.layer = l, this.zIndex = m, this.ctrl.registerLayer(this);
+  constructor(i, r, u, m = 1 / 0) {
+    this.ctrl = i, this.key = r, this.layer = u, this.zIndex = m, this.ctrl.registerLayer(this);
   }
   show(i) {
     this.ctrl.showLayer(i, this.key);
@@ -5499,7 +5499,7 @@ class WmsLayerController extends EventEmitter {
       this.handler || this.hookClickEvent(r), this.imgLayer = new ImageryLayer(
         new WebMapServiceImageryProvider({
           ...this.args,
-          layers: this.showLayers.map((l) => this.layerMap.get(l).layer).join(",")
+          layers: this.showLayers.map((u) => this.layerMap.get(u).layer).join(",")
         })
       ), this.imgLayer.show = !0, r.imageryLayers.add(this.imgLayer);
     }, 200));
@@ -5521,22 +5521,22 @@ class WmsLayerController extends EventEmitter {
       throw new Error(`Layer with key 【${r.key}】 is already registered`);
     this.layerMap.set(r.key, r);
   }
-  showLayer(r, l) {
-    if (!this.layerMap.has(l))
-      throw new Error(`Layer with key 【${l}】 is not registered`);
-    this.showLayers.push(l), this.showLayers.sort((m, o) => {
-      const u = this.layerMap.get(m).zIndex, c = this.layerMap.get(o).zIndex;
-      return u - c;
+  showLayer(r, u) {
+    if (!this.layerMap.has(u))
+      throw new Error(`Layer with key 【${u}】 is not registered`);
+    this.showLayers.push(u), this.showLayers.sort((m, o) => {
+      const l = this.layerMap.get(m).zIndex, c = this.layerMap.get(o).zIndex;
+      return l - c;
     }), this.update(r);
   }
-  hideLayer(r, l) {
-    const m = this.showLayers.indexOf(l);
+  hideLayer(r, u) {
+    const m = this.showLayers.indexOf(u);
     m !== -1 && (this.showLayers.splice(m, 1), this.update(r));
   }
   hookClickEvent(r) {
-    this.handler = new ScreenSpaceEventHandler(r.scene.canvas), this.handler.setInputAction(async (l) => {
-      const m = r.scene, o = m.camera.getPickRay(l.position), u = await m.imageryLayers.pickImageryLayerFeatures(o, r.scene);
-      this.emit("click", u);
+    this.handler = new ScreenSpaceEventHandler(r.scene.canvas), this.handler.setInputAction(async (u) => {
+      const m = r.scene, o = m.camera.getPickRay(u.position), l = await m.imageryLayers.pickImageryLayerFeatures(o, r.scene);
+      this.emit("click", l);
     }, ScreenSpaceEventType.LEFT_CLICK);
   }
   destroyHandler() {
@@ -5581,15 +5581,15 @@ const createShipIconUrl = memoize(
   (s, i) => `${s},${i}`
 ), createShipIconV2 = memoize(
   (s) => {
-    const i = s.designBeam, r = s.designLength, l = s.aisFromBow != null && s.aisFromCenter != null ? { x: s.aisFromCenter, y: s.designLength - s.aisFromBow } : { x: 0, y: r / 2 }, m = `${i / 2 + l.x} ${l.y}`, o = `${-i / 2 + l.x} ${l.y}`, u = `${l.x} ${l.y}`, c = `${l.x} ${-r + l.y}`, d = Math.floor(r * 4 / 5), a = Math.floor((r - d) * 2 / 3), p = `M${u}
-    C${m} ${m} ${i / 2 + l.x} ${l.y - 3}
-    V${-d + l.y}
-    C${i / 2 + l.x} ${l.y - d - a} ${2 + l.x} ${-r + l.y} ${c}
-    C${-2 + l.x} ${-r + l.y} ${-i / 2 + l.x} ${l.y - d - a} ${-i / 2 + l.x} ${-d + l.y}
-    V${-3 + l.y}
-    C${o} ${o} ${u}`, y = Math.max(Math.abs(i / 2 + l.x), Math.abs(-i / 2 + l.x)), g = Math.max(
-      Math.abs(-r + l.y + (s.isMoving ? -5 : 0)),
-      Math.abs(l.y + (s.isMoving ? 146 / 124 * i : 0))
+    const i = s.designBeam, r = s.designLength, u = s.aisFromBow != null && s.aisFromCenter != null ? { x: s.aisFromCenter, y: s.designLength - s.aisFromBow } : { x: 0, y: r / 2 }, m = `${i / 2 + u.x} ${u.y}`, o = `${-i / 2 + u.x} ${u.y}`, l = `${u.x} ${u.y}`, c = `${u.x} ${-r + u.y}`, d = Math.floor(r * 4 / 5), a = Math.floor((r - d) * 2 / 3), p = `M${l}
+    C${m} ${m} ${i / 2 + u.x} ${u.y - 3}
+    V${-d + u.y}
+    C${i / 2 + u.x} ${u.y - d - a} ${2 + u.x} ${-r + u.y} ${c}
+    C${-2 + u.x} ${-r + u.y} ${-i / 2 + u.x} ${u.y - d - a} ${-i / 2 + u.x} ${-d + u.y}
+    V${-3 + u.y}
+    C${o} ${o} ${l}`, y = Math.max(Math.abs(i / 2 + u.x), Math.abs(-i / 2 + u.x)), g = Math.max(
+      Math.abs(-r + u.y + (s.isMoving ? -5 : 0)),
+      Math.abs(u.y + (s.isMoving ? 146 / 124 * i : 0))
     ), h = [-y * 1.2, -g, 2 * y * 1.2, 2 * g], v = { x: 2 * 1.2 * y / i, y: 2 * g / r }, b = `<?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="${h.join(" ")}">
   <defs>
@@ -5619,19 +5619,66 @@ const createShipIconUrl = memoize(
     <path id="svg_1" data-name="svg 1" class="cls-2" d="M${c}v-5"/>
     <path id="svg_4" data-name="svg 4" class="cls-1" d="${p}"/>
   </g>
-  <image id="img_1" width="${i}" height="${146 / 124 * i}" transform="translate(${-i / 2 + l.x} ${l.y})" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHwAAACSCAMAAACwjl5+AAAAq1BMVEUAAAD////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////Nr6iZAAAAOXRSTlMABRshFgkSZg5qJmFdWlEqOXBFPYVJQYB1VXtNLpc1mzKguZCKtJONxc69yaukwa/SqN/k1trs6fBhRQqRAAAVcElEQVR42rSX3ZKaQBCFgxoIICh/ggjiIMPPMAOy6yZ5/yfLaTBVSa5istu1Vepe+M3p7jkHPz1Vmqav99umYLxsh7bvO6oeb8ZR1XUS7TaftU8fVdqX9cWpGBt5WeJvKbwbOJvyujEPlv5RcLBXZyesc1lyMSk5qWmS0zQxNQrGVF2Fpv9hdOg+2HFzZZwPQjFWFAxV4FUNJd5VcWr4u4+hgx0YcVgVchRtOSmW50wpVoA+lS0vWB6mifkxdE2H7jSOazaVfYtJo91yHKVSUmLq/Yihp2Zi09a9N1rb7Hxi07oN/dAOgnMwB4F9E3jtW1Y1oWea2yhbve/Oa583WWR4SRLnGHAPVkd3bblpA70XvcjDKjVs24ku70rX9NU5OgIeV9ect0L03a3rbve3l5e3+6273Vp0opVVmnrG1jkFl9UX7R3HfY5c2zCTOLxKNHzobzdCv3779voK/ls3tOi+ihPPcI5uFGRrXdPeZ8t16+y7zpbgVcHFWLb9fUZ/RX0D/e2txew5zxPTcNzIP+xBR+vfgb2x9oeTe3Rs04sLXuKmDWg5sb+jFnqH9ZejrL3t1o0Oh+CcrWG1/4v//GW1OwfR6XRybC+5SrBLPnTd/YXYC/3l7XYfJB+VVA3aHgX7/fli/TddA3ud7Q++758cI6kUVwo3rOu7t9/ht46rETe/iA3Az5cs261X+hfQ/4Otb9a7bB/sA9+1zbCYGIOx4FID/voV9AWOje8GxSaY3jW1XYzcsnbWf9E1DfNeW1l2yc6B75hxDjNVk6Q4Rdtp3x4zv3dt23Oy+bquUvsUZNYa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"/>
+  <image id="img_1" width="${i}" height="${146 / 124 * i}" transform="translate(${-i / 2 + u.x} ${u.y})" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHwAAACSCAMAAACwjl5+AAAAq1BMVEUAAAD////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////Nr6iZAAAAOXRSTlMABRshFgkSZg5qJmFdWlEqOXBFPYVJQYB1VXtNLpc1mzKguZCKtJONxc69yaukwa/SqN/k1trs6fBhRQqRAAAVcElEQVR42rSX3ZKaQBCFgxoIICh/ggjiIMPPMAOy6yZ5/yfLaTBVSa5istu1Vepe+M3p7jkHPz1Vmqav99umYLxsh7bvO6oeb8ZR1XUS7TaftU8fVdqX9cWpGBt5WeJvKbwbOJvyujEPlv5RcLBXZyesc1lyMSk5qWmS0zQxNQrGVF2Fpv9hdOg+2HFzZZwPQjFWFAxV4FUNJd5VcWr4u4+hgx0YcVgVchRtOSmW50wpVoA+lS0vWB6mifkxdE2H7jSOazaVfYtJo91yHKVSUmLq/Yihp2Zi09a9N1rb7Hxi07oN/dAOgnMwB4F9E3jtW1Y1oWea2yhbve/Oa583WWR4SRLnGHAPVkd3bblpA70XvcjDKjVs24ku70rX9NU5OgIeV9ect0L03a3rbve3l5e3+6273Vp0opVVmnrG1jkFl9UX7R3HfY5c2zCTOLxKNHzobzdCv3779voK/ls3tOi+ihPPcI5uFGRrXdPeZ8t16+y7zpbgVcHFWLb9fUZ/RX0D/e2txew5zxPTcNzIP+xBR+vfgb2x9oeTe3Rs04sLXuKmDWg5sb+jFnqH9ZejrL3t1o0Oh+CcrWG1/4v//GW1OwfR6XRybC+5SrBLPnTd/YXYC/3l7XYfJB+VVA3aHgX7/fli/TddA3ud7Q++758cI6kUVwo3rOu7t9/ht46rETe/iA3Az5cs261X+hfQ/4Otb9a7bB/sA9+1zbCYGIOx4FID/voV9AWOje8GxSaY3jW1XYzcsnbWf9E1DfNeW1l2yc6B75hxDjNVk6Q4Rdtp3x4zv3dt23Oy+bquUvsUZNYa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"/>
 </svg>`;
     return { url: URL.createObjectURL(new Blob([b], { type: "image/svg+xml" })), viewBox: h, scale: v };
   },
   (s) => `${s.color},${s.isMoving},${s.designBeam ?? 0},${s.designLength ?? 0},${s.aisFromBow ?? 0},${s.aisFromCenter ?? 0}`
-);
+), shipTypeColorMap = /* @__PURE__ */ new Map([
+  [-1, "#00FF00"],
+  // -1: '未知'
+  [70, "#95B3D7"],
+  // 70: '货船'
+  [37, "#00FF00"],
+  // 37: 拖船
+  [50, "#366092"],
+  //引航船
+  [51, "#366092"],
+  //引航船
+  [52, "#366092"],
+  //引航船
+  [53, "#366092"],
+  //引航船
+  [54, "#366092"],
+  //引航船
+  [55, "#366092"],
+  //引航船
+  [56, "#366092"],
+  //引航船
+  [57, "#366092"],
+  //引航船
+  [58, "#366092"],
+  //引航船
+  [59, "#366092"],
+  //引航船
+  [80, "red"],
+  // 油船
+  [81, "red"],
+  // 油船
+  [82, "red"],
+  // 油船
+  [83, "red"],
+  // 油船
+  [84, "red"],
+  // 油船
+  [85, "red"],
+  // 油船
+  [86, "red"],
+  // 油船
+  [87, "red"],
+  // 油船
+  [88, "red"],
+  // 油船
+  [89, "red"]
+  // 油船
+]);
 function createAlphaSampled(s) {
-  const i = new Cesium.SampledProperty(Cesium.Color), r = (s == null ? void 0 : s.startTime) ?? Cesium.JulianDate.now(), l = Cesium.JulianDate.addMinutes(r, 1, new Cesium.JulianDate()), m = Cesium.JulianDate.addMinutes(r, 5, new Cesium.JulianDate()), o = Cesium.JulianDate.fromIso8601("2100-01-01T00:00:00Z"), u = (s == null ? void 0 : s.color) ?? Cesium.Color.WHITE;
-  return i.addSample(r, u.withAlpha(1)), i.addSample(l, u.withAlpha(1)), i.addSample(m, u.withAlpha(0.2)), i.addSample(o, u.withAlpha(0.1)), i;
+  const i = new Cesium.SampledProperty(Cesium.Color), r = (s == null ? void 0 : s.startTime) ?? Cesium.JulianDate.now(), u = Cesium.JulianDate.addMinutes(r, 1, new Cesium.JulianDate()), m = Cesium.JulianDate.addMinutes(r, 5, new Cesium.JulianDate()), o = Cesium.JulianDate.fromIso8601("2100-01-01T00:00:00Z"), l = (s == null ? void 0 : s.color) ?? Cesium.Color.WHITE;
+  return i.addSample(r, l.withAlpha(1)), i.addSample(u, l.withAlpha(1)), i.addSample(m, l.withAlpha(0.2)), i.addSample(o, l.withAlpha(0.1)), i;
 }
 function getHideAfterFiveMinutesProperty(s) {
   const i = s ?? Cesium.JulianDate.now(), r = Cesium.JulianDate.addMinutes(i, 5, new Cesium.JulianDate());
-  return new Cesium.CallbackProperty((l) => l ? Cesium.JulianDate.lessThan(l, r) : !0, !1);
+  return new Cesium.CallbackProperty((u) => u ? Cesium.JulianDate.lessThan(u, r) : !0, !1);
 }
 class ShipLayer {
   constructor(i, r) {
@@ -5640,6 +5687,7 @@ class ShipLayer {
     z(this, "_viewer", null);
     z(this, "entityMap", /* @__PURE__ */ new Map());
     z(this, "IS_MOVING_THRESHOLD", 1);
+    z(this, "shadowEntityMap", /* @__PURE__ */ new WeakMap());
     this.key = i, this.zIndex = r, this.db = new Cesium.CustomDataSource(i);
   }
   show(i) {
@@ -5657,113 +5705,109 @@ class ShipLayer {
   /**渲染feature */
   renderFeature(i) {
     var c, d;
-    const r = String(i.id), l = new Cesium.SampledPositionProperty(), m = Cesium.Cartesian3.fromDegrees(
+    const r = String(i.id), u = new Cesium.SampledPositionProperty();
+    u.backwardExtrapolationType = Cesium.ExtrapolationType.HOLD, u.forwardExtrapolationType = Cesium.ExtrapolationType.HOLD;
+    const m = Cesium.Cartesian3.fromDegrees(
       i.geometry.coordinates[0],
       i.geometry.coordinates[1]
     );
-    l.addSample(((c = this._viewer) == null ? void 0 : c.clock.currentTime) ?? Cesium.JulianDate.now(), m), l.addSample(
-      Cesium.JulianDate.fromIso8601("2100-01-01T00:00:00Z"),
-      // 起始时间
-      m
-    );
-    const o = ((d = i.properties) == null ? void 0 : d.courseOverGroundTrue) ?? 0, u = new Cesium.Entity({
+    u.addSample(((c = this._viewer) == null ? void 0 : c.clock.currentTime) ?? Cesium.JulianDate.now(), m);
+    const o = ((d = i.properties) == null ? void 0 : d.courseOverGroundTrue) ?? 0, l = new Cesium.Entity({
       id: r,
-      position: l,
-      orientation: Cesium.Transforms.headingPitchRollQuaternion(
-        m,
-        new Cesium.HeadingPitchRoll(o, 0, 0)
+      position: u,
+      orientation: new Cesium.ConstantProperty(
+        Cesium.Transforms.headingPitchRollQuaternion(
+          m,
+          new Cesium.HeadingPitchRoll(o, 0, 0)
+        )
       ),
       properties: i.properties ?? {}
     });
-    this.entityMap.set(r, u), this.db.entities.add(u), this.renderEntity(u);
+    this.entityMap.set(r, l), this.db.entities.add(l), this.renderEntity(l);
   }
   /**更新or新增feature */
   update(i) {
-    var l, m, o, u, c;
+    var u, m, o, l, c, d, a, p;
     const r = this.db.entities.getById(String(i.id));
     if (r) {
-      const [d, a] = i.geometry.coordinates, p = ((l = this._viewer) == null ? void 0 : l.clock.currentTime) ?? Cesium.JulianDate.now(), y = (m = r.position) == null ? void 0 : m.getValue(p), g = Cesium.JulianDate.addSeconds(p, 3, new Cesium.JulianDate()), h = Cesium.Cartesian3.fromDegrees(d, a), v = r.position;
-      if (v instanceof Cesium.SampledPositionProperty) {
-        for (let b = 0; b < 3; b++)
-          r.position._property._values.pop();
-        r.position._property._times.pop(), v.addSample(
-          Cesium.JulianDate.addSeconds(p, 1, new Cesium.JulianDate()),
-          y ?? h
-        ), v.addSample(g, h), v.addSample(Cesium.JulianDate.fromIso8601("2100-01-01T00:00:00Z"), h);
-      }
-      if (r.properties)
-        for (const [b, _] of Object.entries(i.properties ?? {})) {
-          if (b == "speedOverGround") {
-            const T = r.properties.getValue().speedOverGround ?? 0, w = Number(T) > this.IS_MOVING_THRESHOLD, O = Number(_) > this.IS_MOVING_THRESHOLD;
-            if (w !== O && (r.billboard && (r.billboard.image = new Cesium.ConstantProperty(
-              createShipIconUrl("yellow", O)
-            )), r.plane)) {
-              const x = ((o = i.properties) == null ? void 0 : o.designBeam) ?? 8, R = ((u = i.properties) == null ? void 0 : u.designLength) ?? 20, E = createShipIconV2({
-                color: "yellow",
-                isMoving: O,
+      const y = this.shadowEntityMap.get(r), g = ((u = i.properties) == null ? void 0 : u.shipTypeId) ?? -1, h = shipTypeColorMap.get(g) ?? shipTypeColorMap.get(-1), [v, b] = i.geometry.coordinates, _ = ((m = this._viewer) == null ? void 0 : m.clock.currentTime) ?? Cesium.JulianDate.now(), T = (o = r.position) == null ? void 0 : o.getValue(_), w = Cesium.JulianDate.addSeconds(_, 3, new Cesium.JulianDate()), x = Cesium.Cartesian3.fromDegrees(v, b), O = new Cesium.SampledPositionProperty();
+      if (O.backwardExtrapolationType = Cesium.ExtrapolationType.HOLD, O.forwardExtrapolationType = Cesium.ExtrapolationType.HOLD, O instanceof Cesium.SampledPositionProperty && (O.addSample(
+        Cesium.JulianDate.addSeconds(_, 1, new Cesium.JulianDate()),
+        T ?? x
+      ), O.addSample(w, x)), r.position = O, y && (y.position = O), r.properties)
+        for (const [R, E] of Object.entries(i.properties ?? {})) {
+          if (R == "speedOverGround") {
+            const S = r.properties.getValue().speedOverGround ?? 0, P = Number(S) > this.IS_MOVING_THRESHOLD, C = Number(E) > this.IS_MOVING_THRESHOLD;
+            if (P !== C && (r.billboard && (r.billboard.image = new Cesium.ConstantProperty(
+              createShipIconUrl(h, C)
+            )), y != null && y.plane)) {
+              const D = ((l = i.properties) == null ? void 0 : l.designBeam) ?? 8, I = ((c = i.properties) == null ? void 0 : c.designLength) ?? 20, $ = createShipIconV2({
+                color: h,
+                isMoving: C,
                 ...i.properties,
-                designBeam: x,
-                designLength: R
-              });
-              r.plane.material = new Cesium.ImageMaterialProperty({
-                image: E.url,
-                transparent: !0,
-                // 关键：让 alpha 生效
-                repeat: new Cesium.Cartesian2(1, 1),
-                color: Cesium.Color.WHITE
-                // 保持原图颜色与 alpha，不要设置不透明的 alpha
-              }), r.plane.dimensions = new Cesium.CallbackProperty(
-                () => new Cesium.Cartesian2(x * E.scale.x, R * E.scale.y),
+                designBeam: D,
+                designLength: I
+              }), q = (d = y.plane) == null ? void 0 : d.material;
+              q && (q.image = new Cesium.ConstantProperty($.url), y.plane.dimensions = new Cesium.ConstantProperty(
+                new Cesium.Cartesian2(D * $.scale.x, I * $.scale.y)
+              )), y.plane.dimensions = new Cesium.CallbackProperty(
+                () => new Cesium.Cartesian2(D * $.scale.x, I * $.scale.y),
                 !0
               );
             }
           }
-          if (b == "courseOverGroundTrue") {
-            const T = ((c = i.properties) == null ? void 0 : c.courseOverGroundTrue) ?? 0;
+          if (R == "courseOverGroundTrue") {
+            const S = ((a = i.properties) == null ? void 0 : a.courseOverGroundTrue) ?? 0;
             r.billboard.rotation = new Cesium.ConstantProperty(
-              typeof _ == "number" ? -1 * _ : 0
-            ), r.orientation = new Cesium.ConstantProperty(
+              typeof E == "number" ? -1 * E : 0
+            );
+            const P = new Cesium.ConstantProperty(
               Cesium.Transforms.headingPitchRollQuaternion(
-                h,
-                new Cesium.HeadingPitchRoll(T, 0, 0)
+                x,
+                new Cesium.HeadingPitchRoll(S, 0, 0)
               )
             );
+            y && (y.orientation = P);
           }
-          if (b == "updateTime") {
-            const T = Cesium.JulianDate.fromDate(new Date(_));
+          if (R == "updateTime") {
+            const S = Cesium.JulianDate.fromDate(new Date(E));
             r.billboard.color = createAlphaSampled({
-              startTime: T
+              startTime: S
             });
-            const w = getHideAfterFiveMinutesProperty(T);
-            r.label.show = w, r.point.show = w;
+            const P = (p = y == null ? void 0 : y.plane) == null ? void 0 : p.material;
+            P && (P.color = createAlphaSampled({
+              startTime: S
+            }));
+            const C = getHideAfterFiveMinutesProperty(S);
+            r.label.show = C, r.point.show = C;
           }
-          r.properties[b] = _;
+          r.properties[R] = E, y != null && y.properties && (y.properties[R] = E);
         }
     } else
       this.renderFeature(i);
   }
   // 判定移动的速度阈值（米/秒）
   renderEntity(i) {
-    var c, d, a, p, y, g, h;
-    const r = (c = i.properties) == null ? void 0 : c.getValue(), l = Number((r == null ? void 0 : r.speedOverGround) ?? 0), m = r != null && r.updateTime ? new Date(r.updateTime) : /* @__PURE__ */ new Date(), o = Cesium.JulianDate.fromDate(m), u = createShipIconUrl("yellow", l > this.IS_MOVING_THRESHOLD);
+    var a, p, y, g, h, v, b;
+    const r = (a = i.properties) == null ? void 0 : a.getValue(), u = (r == null ? void 0 : r.shipTypeId) ?? -1, m = shipTypeColorMap.get(u) ?? shipTypeColorMap.get(-1), o = Number((r == null ? void 0 : r.speedOverGround) ?? 0), l = r != null && r.updateTime ? new Date(r.updateTime) : /* @__PURE__ */ new Date(), c = Cesium.JulianDate.fromDate(l), d = createShipIconUrl(m, o > this.IS_MOVING_THRESHOLD);
     i.point = new Cesium.PointGraphics({
       pixelSize: 4,
       color: Cesium.Color.fromCssColorString("#8AF22C"),
       disableDepthTestDistance: 3e6,
       distanceDisplayCondition: new Cesium.DistanceDisplayCondition(15e3),
-      show: getHideAfterFiveMinutesProperty(o)
+      show: getHideAfterFiveMinutesProperty(c)
     }), i.billboard = new Cesium.BillboardGraphics({
-      image: u,
+      image: d,
       width: 14,
       height: 70,
       disableDepthTestDistance: 3e6,
       distanceDisplayCondition: new Cesium.DistanceDisplayCondition(4e3, 15e3),
       pixelOffset: new Cesium.Cartesian2(0, 0),
       alignedAxis: Cesium.Cartesian3.UNIT_Z,
-      color: createAlphaSampled({ startTime: o }),
+      color: createAlphaSampled({ startTime: c }),
       // 设置透明度
       rotation: new Cesium.ConstantProperty(
-        (a = (d = i.properties) == null ? void 0 : d.getValue()) != null && a.courseOverGroundTrue ? -1 * i.properties.getValue().courseOverGroundTrue : 0
+        (y = (p = i.properties) == null ? void 0 : p.getValue()) != null && y.courseOverGroundTrue ? -1 * i.properties.getValue().courseOverGroundTrue : 0
       )
       // 根据航向设置旋转角度
     }), i.label = new Cesium.LabelGraphics({
@@ -5778,38 +5822,45 @@ class ShipLayer {
       pixelOffset: new Cesium.Cartesian2(0, -20),
       scale: 1,
       scaleByDistance: new Cesium.NearFarScalar(3e3, 1, 1e4, 0.55),
-      text: ((y = (p = i.properties) == null ? void 0 : p.getValue()) == null ? void 0 : y.name) ?? ((g = i.properties) != null && g.getValue().mmsi ? "mmsi:" + ((h = i.properties) == null ? void 0 : h.getValue().mmsi) : "未知"),
+      text: ((h = (g = i.properties) == null ? void 0 : g.getValue()) == null ? void 0 : h.name) ?? ((v = i.properties) != null && v.getValue().mmsi ? "mmsi:" + ((b = i.properties) == null ? void 0 : b.getValue().mmsi) : "未知"),
       horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
       distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 15e3),
       disableDepthTestDistance: 5e3,
-      show: getHideAfterFiveMinutesProperty(o)
+      show: getHideAfterFiveMinutesProperty(c)
     }), this.createShipPlane(i);
   }
   createShipPlane(i) {
-    var a;
-    const r = (a = i.properties) == null ? void 0 : a.getValue(), l = r != null && r.updateTime ? new Date(r.updateTime) : /* @__PURE__ */ new Date(), m = Cesium.JulianDate.fromDate(l), o = Number((r == null ? void 0 : r.speedOverGround) ?? 0), u = (r == null ? void 0 : r.designLength) ?? 20, c = (r == null ? void 0 : r.designBeam) ?? 8, d = createShipIconV2({
-      color: "yellow",
-      isMoving: o > this.IS_MOVING_THRESHOLD,
-      ...r,
-      designBeam: (r == null ? void 0 : r.designBeam) ?? 8,
-      designLength: (r == null ? void 0 : r.designLength) ?? 20
+    var g;
+    const r = new Cesium.Entity({
+      id: i.id + "_shadow",
+      position: i.position,
+      orientation: i.orientation,
+      properties: i.properties
+    });
+    this.shadowEntityMap.set(i, r), this.db.entities.add(r);
+    const u = (g = i.properties) == null ? void 0 : g.getValue(), m = u != null && u.updateTime ? new Date(u.updateTime) : /* @__PURE__ */ new Date(), o = Cesium.JulianDate.fromDate(m), l = Number((u == null ? void 0 : u.speedOverGround) ?? 0), c = (u == null ? void 0 : u.designLength) ?? 20, d = (u == null ? void 0 : u.designBeam) ?? 8, a = (u == null ? void 0 : u.shipTypeId) ?? -1, p = shipTypeColorMap.get(a) ?? shipTypeColorMap.get(-1), y = createShipIconV2({
+      color: p,
+      isMoving: l > this.IS_MOVING_THRESHOLD,
+      ...u,
+      designBeam: (u == null ? void 0 : u.designBeam) ?? 8,
+      designLength: (u == null ? void 0 : u.designLength) ?? 20
     });
-    i.plane = new Cesium.PlaneGraphics({
+    r.plane = new Cesium.PlaneGraphics({
       plane: new Cesium.Plane(Cesium.Cartesian3.UNIT_Z, 0),
-      dimensions: new Cesium.Cartesian2(c * d.scale.x, u * d.scale.y),
+      dimensions: new Cesium.Cartesian2(d * y.scale.x, c * y.scale.y),
       show: new Cesium.CallbackProperty(() => {
-        var h;
+        var _;
         if (!this._viewer) return !0;
-        const p = this._viewer.clock.currentTime, y = (h = i.position) == null ? void 0 : h.getValue(p);
-        return y ? Cesium.Cartesian3.distance(this._viewer.camera.positionWC, y) <= 4e3 : !1;
+        const h = this._viewer.clock.currentTime, v = (_ = i.position) == null ? void 0 : _.getValue(h);
+        return v ? Cesium.Cartesian3.distance(this._viewer.camera.positionWC, v) <= 4e3 : !1;
       }, !1),
       //  用回调按距离控制显示
       material: new Cesium.ImageMaterialProperty({
-        image: d.url,
+        image: y.url,
         transparent: !0,
         // 关键：让 alpha 生效
         repeat: new Cesium.Cartesian2(1, 1),
-        color: createAlphaSampled({ startTime: m })
+        color: createAlphaSampled({ startTime: o })
       })
     });
   }
@@ -5821,17 +5872,17 @@ new Array(4);
 var e$2 = [], t$2 = [];
 function n$2(s, i) {
   if (s && typeof document < "u") {
-    var r, l = i.prepend === !0 ? "prepend" : "append", m = i.singleTag === !0, o = typeof i.container == "string" ? document.querySelector(i.container) : document.getElementsByTagName("head")[0];
+    var r, u = i.prepend === !0 ? "prepend" : "append", m = i.singleTag === !0, o = typeof i.container == "string" ? document.querySelector(i.container) : document.getElementsByTagName("head")[0];
     if (m) {
-      var u = e$2.indexOf(o);
-      u === -1 && (u = e$2.push(o) - 1, t$2[u] = {}), r = t$2[u] && t$2[u][l] ? t$2[u][l] : t$2[u][l] = c();
+      var l = e$2.indexOf(o);
+      l === -1 && (l = e$2.push(o) - 1, t$2[l] = {}), r = t$2[l] && t$2[l][u] ? t$2[l][u] : t$2[l][u] = c();
     } else r = c();
     s.charCodeAt(0) === 65279 && (s = s.substring(1)), r.styleSheet ? r.styleSheet.cssText += s : r.appendChild(document.createTextNode(s));
   }
   function c() {
     var d = document.createElement("style");
     if (d.setAttribute("type", "text/css"), i.attributes) for (var a = Object.keys(i.attributes), p = 0; p < a.length; p++) d.setAttribute(a[p], i.attributes[a[p]]);
-    var y = l === "prepend" ? "afterbegin" : "beforeend";
+    var y = u === "prepend" ? "afterbegin" : "beforeend";
     return o.insertAdjacentElement(y, d), d;
   }
 }
@@ -5854,11 +5905,11 @@ class Popup {
     z(this, "setPosition", () => {
       if (this._position && this._viewer && this._position) {
         if (this._viewer.scene.mode === SceneMode.SCENE3D) {
-          const l = this._viewer.scene.camera.position, m = new BoundingSphere(
+          const u = this._viewer.scene.camera.position, m = new BoundingSphere(
             new Cartesian3(0, 0, 0),
             635e4
           );
-          if (!new Occluder(m, l).isPointVisible(this._position)) {
+          if (!new Occluder(m, u).isPointVisible(this._position)) {
             this.switchElementShow(!1);
             return;
           }
@@ -5871,16 +5922,16 @@ class Popup {
           if (this._screenPosition && this._screenPosition.x === i.x && this._screenPosition.y === i.y)
             return;
           this.switchElementShow(!0);
-          const l = i.x - r.clientWidth / 2 + this._offset[0], m = i.y - r.clientHeight + this._offset[1];
-          r.style.left = `${l}px`, r.style.top = `${m}px`, this._screenPosition = i;
+          const u = i.x - r.clientWidth / 2 + this._offset[0], m = i.y - r.clientHeight + this._offset[1];
+          r.style.left = `${u}px`, r.style.top = `${m}px`, this._screenPosition = i;
         }
       }
     });
     this._viewer = i, this._options = r;
-    const { position: l, element: m, offset: o } = r;
+    const { position: u, element: m, offset: o } = r;
     if (!m)
       throw Error("no element!");
-    this._position = l ? Cartesian3.fromDegrees(l[0], l[1], l[2]) : null, this._element = m, this._offset = [(o == null ? void 0 : o[0]) ?? 0, (o == null ? void 0 : o[1]) ?? 0], this.addMapListener();
+    this._position = u ? Cartesian3.fromDegrees(u[0], u[1], u[2]) : null, this._element = m, this._offset = [(o == null ? void 0 : o[0]) ?? 0, (o == null ? void 0 : o[1]) ?? 0], this.addMapListener();
   }
   set position(i) {
     if (!i) {
@@ -5912,17 +5963,17 @@ class Popup {
 var e$1 = [], t$1 = [];
 function n$1(s, i) {
   if (s && typeof document < "u") {
-    var r, l = i.prepend === !0 ? "prepend" : "append", m = i.singleTag === !0, o = typeof i.container == "string" ? document.querySelector(i.container) : document.getElementsByTagName("head")[0];
+    var r, u = i.prepend === !0 ? "prepend" : "append", m = i.singleTag === !0, o = typeof i.container == "string" ? document.querySelector(i.container) : document.getElementsByTagName("head")[0];
     if (m) {
-      var u = e$1.indexOf(o);
-      u === -1 && (u = e$1.push(o) - 1, t$1[u] = {}), r = t$1[u] && t$1[u][l] ? t$1[u][l] : t$1[u][l] = c();
+      var l = e$1.indexOf(o);
+      l === -1 && (l = e$1.push(o) - 1, t$1[l] = {}), r = t$1[l] && t$1[l][u] ? t$1[l][u] : t$1[l][u] = c();
     } else r = c();
     s.charCodeAt(0) === 65279 && (s = s.substring(1)), r.styleSheet ? r.styleSheet.cssText += s : r.appendChild(document.createTextNode(s));
   }
   function c() {
     var d = document.createElement("style");
     if (d.setAttribute("type", "text/css"), i.attributes) for (var a = Object.keys(i.attributes), p = 0; p < a.length; p++) d.setAttribute(a[p], i.attributes[a[p]]);
-    var y = l === "prepend" ? "afterbegin" : "beforeend";
+    var y = u === "prepend" ? "afterbegin" : "beforeend";
     return o.insertAdjacentElement(y, d), d;
   }
 }
@@ -5931,17 +5982,17 @@ n$1(css$1, {});
 var e = [], t = [];
 function n(s, i) {
   if (s && typeof document < "u") {
-    var r, l = i.prepend === !0 ? "prepend" : "append", m = i.singleTag === !0, o = typeof i.container == "string" ? document.querySelector(i.container) : document.getElementsByTagName("head")[0];
+    var r, u = i.prepend === !0 ? "prepend" : "append", m = i.singleTag === !0, o = typeof i.container == "string" ? document.querySelector(i.container) : document.getElementsByTagName("head")[0];
     if (m) {
-      var u = e.indexOf(o);
-      u === -1 && (u = e.push(o) - 1, t[u] = {}), r = t[u] && t[u][l] ? t[u][l] : t[u][l] = c();
+      var l = e.indexOf(o);
+      l === -1 && (l = e.push(o) - 1, t[l] = {}), r = t[l] && t[l][u] ? t[l][u] : t[l][u] = c();
     } else r = c();
     s.charCodeAt(0) === 65279 && (s = s.substring(1)), r.styleSheet ? r.styleSheet.cssText += s : r.appendChild(document.createTextNode(s));
   }
   function c() {
     var d = document.createElement("style");
     if (d.setAttribute("type", "text/css"), i.attributes) for (var a = Object.keys(i.attributes), p = 0; p < a.length; p++) d.setAttribute(a[p], i.attributes[a[p]]);
-    var y = l === "prepend" ? "afterbegin" : "beforeend";
+    var y = u === "prepend" ? "afterbegin" : "beforeend";
     return o.insertAdjacentElement(y, d), d;
   }
 }
@@ -5950,8 +6001,8 @@ n(css, {});
 var heatmap$1 = { exports: {} }, heatmap = heatmap$1.exports, hasRequiredHeatmap;
 function requireHeatmap() {
   return hasRequiredHeatmap || (hasRequiredHeatmap = 1, function(s) {
-    (function(i, r, l) {
-      s.exports ? s.exports = l() : r[i] = l();
+    (function(i, r, u) {
+      s.exports ? s.exports = u() : r[i] = u();
     })("h337", heatmap, function() {
       var i = {
         defaultRadius: 40,
@@ -5971,14 +6022,14 @@ function requireHeatmap() {
         return a.prototype = {
           // when forceRender = false -> called from setData, omits renderall event
           _organiseData: function(y, g) {
-            var h = y[this._xField], v = y[this._yField], b = this._radi, _ = this._data, T = this._max, w = this._min, O = y[this._valueField] || 1, x = y.radius || this._cfgRadius || p;
-            _[h] || (_[h] = [], b[h] = []), _[h][v] ? _[h][v] += O : (_[h][v] = O, b[h][v] = x);
+            var h = y[this._xField], v = y[this._yField], b = this._radi, _ = this._data, T = this._max, w = this._min, x = y[this._valueField] || 1, O = y.radius || this._cfgRadius || p;
+            _[h] || (_[h] = [], b[h] = []), _[h][v] ? _[h][v] += x : (_[h][v] = x, b[h][v] = O);
             var R = _[h][v];
             return R > T ? (g ? this.setDataMax(R) : this._max = R, !1) : R < w ? (g ? this.setDataMin(R) : this._min = R, !1) : {
               x: h,
               y: v,
-              value: O,
-              radius: x,
+              value: x,
+              radius: O,
               min: w,
               max: T
             };
@@ -6088,7 +6139,7 @@ function requireHeatmap() {
           		      return false;
           		    }*/
         }, a;
-      }(), l = function() {
+      }(), u = function() {
         var a = function(h) {
           var v = h.gradient || h.defaultGradient, b = document.createElement("canvas"), _ = b.getContext("2d", { willReadFrequently: !0 });
           b.width = 256, b.height = 1;
@@ -6101,18 +6152,18 @@ function requireHeatmap() {
           if (b.width = b.height = h * 2, v == 1)
             _.beginPath(), _.arc(T, w, h, 0, 2 * Math.PI, !1), _.fillStyle = "rgba(0,0,0,1)", _.fill();
           else {
-            var O = _.createRadialGradient(T, w, h * v, T, w, h);
-            O.addColorStop(0, "rgba(0,0,0,1)"), O.addColorStop(1, "rgba(0,0,0,0)"), _.fillStyle = O, _.fillRect(0, 0, 2 * h, 2 * h);
+            var x = _.createRadialGradient(T, w, h * v, T, w, h);
+            x.addColorStop(0, "rgba(0,0,0,1)"), x.addColorStop(1, "rgba(0,0,0,0)"), _.fillStyle = x, _.fillRect(0, 0, 2 * h, 2 * h);
           }
           return b;
         }, y = function(w) {
-          for (var v = [], b = w.min, _ = w.max, T = w.radi, w = w.data, O = Object.keys(w), x = O.length; x--; )
-            for (var R = O[x], E = Object.keys(w[R]), A = E.length; A--; ) {
-              var P = E[A], k = w[R][P], D = T[R][P];
+          for (var v = [], b = w.min, _ = w.max, T = w.radi, w = w.data, x = Object.keys(w), O = x.length; O--; )
+            for (var R = x[O], E = Object.keys(w[R]), S = E.length; S--; ) {
+              var P = E[S], C = w[R][P], D = T[R][P];
               v.push({
                 x: R,
                 y: P,
-                value: k,
+                value: C,
                 radius: D
               });
             }
@@ -6152,27 +6203,27 @@ function requireHeatmap() {
           },
           _drawAlpha: function(_) {
             for (var v = this._min = _.min, b = this._max = _.max, _ = _.data || [], T = _.length, w = 1 - this._blur; T--; ) {
-              var O = _[T], x = O.x, R = O.y, E = O.radius, A = Math.min(O.value, b), P = x - E, k = R - E, D = this.shadowCtx, N;
-              this._templates[E] ? N = this._templates[E] : this._templates[E] = N = p(E, w);
-              var L = (A - v) / (b - v);
-              D.globalAlpha = L < 0.01 ? 0.01 : L, D.drawImage(N, P, k), P < this._renderBoundaries[0] && (this._renderBoundaries[0] = P), k < this._renderBoundaries[1] && (this._renderBoundaries[1] = k), P + 2 * E > this._renderBoundaries[2] && (this._renderBoundaries[2] = P + 2 * E), k + 2 * E > this._renderBoundaries[3] && (this._renderBoundaries[3] = k + 2 * E);
+              var x = _[T], O = x.x, R = x.y, E = x.radius, S = Math.min(x.value, b), P = O - E, C = R - E, D = this.shadowCtx, I;
+              this._templates[E] ? I = this._templates[E] : this._templates[E] = I = p(E, w);
+              var $ = (S - v) / (b - v);
+              D.globalAlpha = $ < 0.01 ? 0.01 : $, D.drawImage(I, P, C), P < this._renderBoundaries[0] && (this._renderBoundaries[0] = P), C < this._renderBoundaries[1] && (this._renderBoundaries[1] = C), P + 2 * E > this._renderBoundaries[2] && (this._renderBoundaries[2] = P + 2 * E), C + 2 * E > this._renderBoundaries[3] && (this._renderBoundaries[3] = C + 2 * E);
             }
           },
           _colorize: function() {
-            var h = this._renderBoundaries[0], v = this._renderBoundaries[1], b = this._renderBoundaries[2] - h, _ = this._renderBoundaries[3] - v, T = this._width, w = this._height, O = this._opacity, x = this._maxOpacity, R = this._minOpacity, E = this._useGradientOpacity;
+            var h = this._renderBoundaries[0], v = this._renderBoundaries[1], b = this._renderBoundaries[2] - h, _ = this._renderBoundaries[3] - v, T = this._width, w = this._height, x = this._opacity, O = this._maxOpacity, R = this._minOpacity, E = this._useGradientOpacity;
             h < 0 && (h = 0), v < 0 && (v = 0), h + b > T && (b = T - h), v + _ > w && (_ = w - v);
-            for (var A = this.shadowCtx.getImageData(h, v, b, _), P = A.data, k = P.length, D = this._palette, N = 3; N < k; N += 4) {
-              var L = P[N], F = L * 4;
-              if (F) {
-                var M;
-                O > 0 ? M = O : L < x ? L < R ? M = R : M = L : M = x, P[N - 3] = D[F], P[N - 2] = D[F + 1], P[N - 1] = D[F + 2], P[N] = E ? D[F + 3] : M;
+            for (var S = this.shadowCtx.getImageData(h, v, b, _), P = S.data, C = P.length, D = this._palette, I = 3; I < C; I += 4) {
+              var $ = P[I], q = $ * 4;
+              if (q) {
+                var F;
+                x > 0 ? F = x : $ < O ? $ < R ? F = R : F = $ : F = O, P[I - 3] = D[q], P[I - 2] = D[q + 1], P[I - 1] = D[q + 2], P[I] = E ? D[q + 3] : F;
               }
             }
-            this.ctx.putImageData(A, h, v), this._renderBoundaries = [1e3, 1e3, 0, 0];
+            this.ctx.putImageData(S, h, v), this._renderBoundaries = [1e3, 1e3, 0, 0];
           },
           getValueAt: function(h) {
-            var v, b = this.shadowCtx, _ = b.getImageData(h.x, h.y, 1, 1), T = _.data[3], w = this._max, O = this._min;
-            return v = Math.abs(w - O) * (T / 255) >> 0, v;
+            var v, b = this.shadowCtx, _ = b.getImageData(h.x, h.y, 1, 1), T = _.data[3], w = this._max, x = this._min;
+            return v = Math.abs(w - x) * (T / 255) >> 0, v;
           },
           getDataURL: function() {
             return this.canvas.toDataURL();
@@ -6180,7 +6231,7 @@ function requireHeatmap() {
         }, g;
       }(), m = function() {
         var a = !1;
-        return i.defaultRenderer === "canvas2d" && (a = l), a;
+        return i.defaultRenderer === "canvas2d" && (a = u), a;
       }(), o = {
         merge: function() {
           for (var d = {}, a = arguments.length, p = 0; p < a; p++) {
@@ -6190,7 +6241,7 @@ function requireHeatmap() {
           }
           return d;
         }
-      }, u = function() {
+      }, l = function() {
         var a = function() {
           function h() {
             this.cStore = {};
@@ -6206,8 +6257,8 @@ function requireHeatmap() {
               var _ = this.cStore;
               if (_[v])
                 for (var T = _[v].length, w = 0; w < T; w++) {
-                  var O = _[v][w];
-                  O(b);
+                  var x = _[v][w];
+                  x(b);
                 }
             }
           }, h;
@@ -6268,7 +6319,7 @@ function requireHeatmap() {
         }, y;
       }(), c = {
         create: function(d) {
-          return new u(d);
+          return new l(d);
         },
         register: function(d, a) {
           i.plugins[d] = a;
@@ -6289,25 +6340,25 @@ const G = class G extends EventEmitter {
   }
   popup(r) {
     var c;
-    const l = r.element;
-    l.style.position = "absolute";
+    const u = r.element;
+    u.style.position = "absolute";
     const m = r.viewer.container, o = () => {
-      u && (u.destroy(), m.removeChild(l), this.popupMap.delete(r.id), this.emit("onUnmount", r.id));
+      l && (l.destroy(), m.removeChild(u), this.popupMap.delete(r.id), this.emit("onUnmount", r.id));
     };
-    m.appendChild(l), this.emit("onMount", r.id), (c = this.popupMap.get(r.id)) == null || c.destroy();
-    const u = new Popup(r.viewer, {
+    m.appendChild(u), this.emit("onMount", r.id), (c = this.popupMap.get(r.id)) == null || c.destroy();
+    const l = new Popup(r.viewer, {
       position: r.position,
       offset: r.offset ?? [0, 0],
-      element: l
+      element: u
     });
     this.popupMap.set(r.id, {
-      popup: u,
+      popup: l,
       destroy: o
     });
   }
   close(r) {
-    const l = this.popupMap.get(r);
-    l && (l.destroy(), this.popupMap.delete(r), this.emit("onUnmount", r));
+    const u = this.popupMap.get(r);
+    u && (u.destroy(), this.popupMap.delete(r), this.emit("onUnmount", r));
   }
   closeAll() {
     this.popupMap.forEach((r) => r.destroy()), this.popupMap.clear();
@@ -6342,8 +6393,8 @@ function ListenLeftClick(s) {
   if (memoizeMap.has(s))
     return memoizeMap.get(s);
   const i = new EventEmitter();
-  return new Cesium.ScreenSpaceEventHandler(s.scene.canvas).setInputAction((l) => {
-    i.emit("click", l);
+  return new Cesium.ScreenSpaceEventHandler(s.scene.canvas).setInputAction((u) => {
+    i.emit("click", u);
   }, Cesium.ScreenSpaceEventType.LEFT_CLICK), memoizeMap.set(s, i), i;
 }
 export {