@poor-knight/cesium-utils 0.4.4 → 0.4.6

package/dist/cesium-utils.js

@@ -35,32 +35,32 @@ const makeTable = () => {
 var crc32_1 = crc32$1;
 const BAD$1 = 16209, TYPE$1 = 16191;
 var inffast = function(i, r) {
-  let o, d, u, l, c, h, a, m, y, v, p, g, b, _, x, w, O, T, E, R, S, P, k, A;
+  let o, d, u, l, c, h, a, m, y, g, p, v, w, _, O, b, x, T, E, R, S, P, D, A;
   const I = i.state;
-  o = i.next_in, k = i.input, d = o + (i.avail_in - 5), u = i.next_out, A = i.output, l = u - (r - i.avail_out), c = u + (i.avail_out - 257), h = I.dmax, a = I.wsize, m = I.whave, y = I.wnext, v = I.window, p = I.hold, g = I.bits, b = I.lencode, _ = I.distcode, x = (1 << I.lenbits) - 1, w = (1 << I.distbits) - 1;
+  o = i.next_in, D = i.input, d = o + (i.avail_in - 5), u = i.next_out, A = i.output, l = u - (r - i.avail_out), c = u + (i.avail_out - 257), h = I.dmax, a = I.wsize, m = I.whave, y = I.wnext, g = I.window, p = I.hold, v = I.bits, w = I.lencode, _ = I.distcode, O = (1 << I.lenbits) - 1, b = (1 << I.distbits) - 1;
   e: do {
-    g < 15 && (p += k[o++] << g, g += 8, p += k[o++] << g, g += 8), O = b[p & x];
+    v < 15 && (p += D[o++] << v, v += 8, p += D[o++] << v, v += 8), x = w[p & O];
     t: for (; ; ) {
-      if (T = O >>> 24, p >>>= T, g -= T, T = O >>> 16 & 255, T === 0)
-        A[u++] = O & 65535;
+      if (T = x >>> 24, p >>>= T, v -= T, T = x >>> 16 & 255, T === 0)
+        A[u++] = x & 65535;
       else if (T & 16) {
-        E = O & 65535, T &= 15, T && (g < T && (p += k[o++] << g, g += 8), E += p & (1 << T) - 1, p >>>= T, g -= T), g < 15 && (p += k[o++] << g, g += 8, p += k[o++] << g, g += 8), O = _[p & w];
+        E = x & 65535, T &= 15, T && (v < T && (p += D[o++] << v, v += 8), E += p & (1 << T) - 1, p >>>= T, v -= T), v < 15 && (p += D[o++] << v, v += 8, p += D[o++] << v, v += 8), x = _[p & b];
         r: for (; ; ) {
-          if (T = O >>> 24, p >>>= T, g -= T, T = O >>> 16 & 255, T & 16) {
-            if (R = O & 65535, T &= 15, g < T && (p += k[o++] << g, g += 8, g < T && (p += k[o++] << g, g += 8)), R += p & (1 << T) - 1, R > h) {
+          if (T = x >>> 24, p >>>= T, v -= T, T = x >>> 16 & 255, T & 16) {
+            if (R = x & 65535, T &= 15, v < T && (p += D[o++] << v, v += 8, v < T && (p += D[o++] << v, v += 8)), R += p & (1 << T) - 1, R > h) {
               i.msg = "invalid distance too far back", I.mode = BAD$1;
               break e;
             }
-            if (p >>>= T, g -= T, T = u - l, R > T) {
+            if (p >>>= T, v -= T, T = u - l, R > T) {
               if (T = R - T, T > m && I.sane) {
                 i.msg = "invalid distance too far back", I.mode = BAD$1;
                 break e;
               }
-              if (S = 0, P = v, y === 0) {
+              if (S = 0, P = g, y === 0) {
                 if (S += a - T, T < E) {
                   E -= T;
                   do
-                    A[u++] = v[S++];
+                    A[u++] = g[S++];
                   while (--T);
                   S = u - R, P = A;
                 }
@@ -68,12 +68,12 @@ var inffast = function(i, r) {
                 if (S += a + y - T, T -= y, T < E) {
                   E -= T;
                   do
-                    A[u++] = v[S++];
+                    A[u++] = g[S++];
                   while (--T);
                   if (S = 0, y < E) {
                     T = y, E -= T;
                     do
-                      A[u++] = v[S++];
+                      A[u++] = g[S++];
                     while (--T);
                     S = u - R, P = A;
                   }
@@ -81,7 +81,7 @@ var inffast = function(i, r) {
               } else if (S += y - T, T < E) {
                 E -= T;
                 do
-                  A[u++] = v[S++];
+                  A[u++] = g[S++];
                 while (--T);
                 S = u - R, P = A;
               }
@@ -96,7 +96,7 @@ var inffast = function(i, r) {
               E && (A[u++] = A[S++], E > 1 && (A[u++] = A[S++]));
             }
           } else if ((T & 64) === 0) {
-            O = _[(O & 65535) + (p & (1 << T) - 1)];
+            x = _[(x & 65535) + (p & (1 << T) - 1)];
             continue r;
           } else {
             i.msg = "invalid distance code", I.mode = BAD$1;
@@ -105,7 +105,7 @@ var inffast = function(i, r) {
           break;
         }
       } else if ((T & 64) === 0) {
-        O = b[(O & 65535) + (p & (1 << T) - 1)];
+        x = w[(x & 65535) + (p & (1 << T) - 1)];
         continue t;
       } else if (T & 32) {
         I.mode = TYPE$1;
@@ -117,7 +117,7 @@ var inffast = function(i, r) {
       break;
     }
   } while (o < d && u < c);
-  E = g >> 3, o -= E, g -= E << 3, p &= (1 << g) - 1, i.next_in = o, i.next_out = u, i.avail_in = o < d ? 5 + (d - o) : 5 - (o - d), i.avail_out = u < c ? 257 + (c - u) : 257 - (u - c), I.hold = p, I.bits = g;
+  E = v >> 3, o -= E, v -= E << 3, p &= (1 << v) - 1, i.next_in = o, i.next_out = u, i.avail_in = o < d ? 5 + (d - o) : 5 - (o - d), i.avail_out = u < c ? 257 + (c - u) : 257 - (u - c), I.hold = p, 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 */
@@ -255,51 +255,51 @@ const MAXBITS = 15, ENOUGH_LENS$1 = 852, ENOUGH_DISTS$1 = 592, CODES$1 = 0, LENS
   64
 ]), inflate_table$1 = (s, i, r, o, d, u, l, c) => {
   const h = c.bits;
-  let a = 0, m = 0, y = 0, v = 0, p = 0, g = 0, b = 0, _ = 0, x = 0, w = 0, O, T, E, R, S, P = null, k;
+  let a = 0, m = 0, y = 0, g = 0, p = 0, v = 0, w = 0, _ = 0, O = 0, b = 0, x, T, E, R, S, P = null, D;
   const A = new Uint16Array(MAXBITS + 1), I = new Uint16Array(MAXBITS + 1);
-  let $ = null, F, q, V;
+  let B = null, F, q, V;
   for (a = 0; a <= MAXBITS; a++)
     A[a] = 0;
   for (m = 0; m < o; m++)
     A[i[r + m]]++;
-  for (p = h, v = MAXBITS; v >= 1 && A[v] === 0; v--)
+  for (p = h, g = MAXBITS; g >= 1 && A[g] === 0; g--)
     ;
-  if (p > v && (p = v), v === 0)
+  if (p > g && (p = g), g === 0)
     return d[u++] = 1 << 24 | 64 << 16 | 0, d[u++] = 1 << 24 | 64 << 16 | 0, c.bits = 1, 0;
-  for (y = 1; y < v && A[y] === 0; y++)
+  for (y = 1; y < g && A[y] === 0; y++)
     ;
   for (p < y && (p = y), _ = 1, a = 1; a <= MAXBITS; a++)
     if (_ <<= 1, _ -= A[a], _ < 0)
       return -1;
-  if (_ > 0 && (s === CODES$1 || v !== 1))
+  if (_ > 0 && (s === CODES$1 || g !== 1))
     return -1;
   for (I[1] = 0, a = 1; a < MAXBITS; a++)
     I[a + 1] = I[a] + A[a];
   for (m = 0; m < o; m++)
     i[r + m] !== 0 && (l[I[i[r + m]]++] = m);
-  if (s === CODES$1 ? (P = $ = l, k = 20) : s === LENS$1 ? (P = lbase, $ = lext, k = 257) : (P = dbase, $ = dext, k = 0), w = 0, m = 0, a = y, S = u, g = p, b = 0, E = -1, x = 1 << p, R = x - 1, s === LENS$1 && x > ENOUGH_LENS$1 || s === DISTS$1 && x > ENOUGH_DISTS$1)
+  if (s === CODES$1 ? (P = B = l, D = 20) : s === LENS$1 ? (P = lbase, B = lext, D = 257) : (P = dbase, B = dext, D = 0), b = 0, m = 0, a = y, S = u, v = p, w = 0, E = -1, O = 1 << p, R = O - 1, s === LENS$1 && O > ENOUGH_LENS$1 || s === DISTS$1 && O > ENOUGH_DISTS$1)
     return 1;
   for (; ; ) {
-    F = a - b, l[m] + 1 < k ? (q = 0, V = l[m]) : l[m] >= k ? (q = $[l[m] - k], V = P[l[m] - k]) : (q = 96, V = 0), O = 1 << a - b, T = 1 << g, y = T;
+    F = a - w, l[m] + 1 < D ? (q = 0, V = l[m]) : l[m] >= D ? (q = B[l[m] - D], V = P[l[m] - D]) : (q = 96, V = 0), x = 1 << a - w, T = 1 << v, y = T;
     do
-      T -= O, d[S + (w >> b) + T] = F << 24 | q << 16 | V | 0;
+      T -= x, d[S + (b >> w) + T] = F << 24 | q << 16 | V | 0;
     while (T !== 0);
-    for (O = 1 << a - 1; w & O; )
-      O >>= 1;
-    if (O !== 0 ? (w &= O - 1, w += O) : w = 0, m++, --A[a] === 0) {
-      if (a === v)
+    for (x = 1 << a - 1; b & x; )
+      x >>= 1;
+    if (x !== 0 ? (b &= x - 1, b += x) : b = 0, m++, --A[a] === 0) {
+      if (a === g)
         break;
       a = i[r + l[m]];
     }
-    if (a > p && (w & R) !== E) {
-      for (b === 0 && (b = p), S += y, g = a - b, _ = 1 << g; g + b < v && (_ -= A[g + b], !(_ <= 0)); )
-        g++, _ <<= 1;
-      if (x += 1 << g, s === LENS$1 && x > ENOUGH_LENS$1 || s === DISTS$1 && x > ENOUGH_DISTS$1)
+    if (a > p && (b & R) !== E) {
+      for (w === 0 && (w = p), S += y, v = a - w, _ = 1 << v; v + w < g && (_ -= A[v + w], !(_ <= 0)); )
+        v++, _ <<= 1;
+      if (O += 1 << v, s === LENS$1 && O > ENOUGH_LENS$1 || s === DISTS$1 && O > ENOUGH_DISTS$1)
         return 1;
-      E = w & R, d[E] = p << 24 | g << 16 | S - u | 0;
+      E = b & R, d[E] = p << 24 | v << 16 | S - u | 0;
     }
   }
-  return w !== 0 && (d[S + w] = a - b << 24 | 64 << 16 | 0), c.bits = p, 0;
+  return b !== 0 && (d[S + b] = a - w << 24 | 64 << 16 | 0), c.bits = p, 0;
 };
 var inftrees = inflate_table$1, constants = {
   /* Allowed flush values; see deflate() and inflate() below for details */
@@ -393,16 +393,16 @@ const fixedtables = (s) => {
   const u = s.state;
   return u.window === null && (u.wsize = 1 << u.wbits, u.wnext = 0, u.whave = 0, u.window = new Uint8Array(u.wsize)), o >= u.wsize ? (u.window.set(i.subarray(r - u.wsize, r), 0), u.wnext = 0, u.whave = u.wsize) : (d = u.wsize - u.wnext, d > o && (d = o), u.window.set(i.subarray(r - o, r - o + d), u.wnext), o -= d, o ? (u.window.set(i.subarray(r - o, r), 0), u.wnext = o, u.whave = u.wsize) : (u.wnext += d, u.wnext === u.wsize && (u.wnext = 0), u.whave < u.wsize && (u.whave += d))), 0;
 }, inflate$1 = (s, i) => {
-  let r, o, d, u, l, c, h, a, m, y, v, p, g, b, _ = 0, x, w, O, T, E, R, S, P;
-  const k = new Uint8Array(4);
+  let r, o, d, u, l, c, h, a, m, y, g, p, v, w, _ = 0, O, b, x, T, E, R, S, P;
+  const D = new Uint8Array(4);
   let A, I;
-  const $ = (
+  const B = (
     /* 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), l = s.next_out, d = s.output, h = s.avail_out, u = s.next_in, o = s.input, c = s.avail_in, a = r.hold, m = r.bits, y = c, v = h, P = Z_OK$1;
+  r = s.state, r.mode === TYPE && (r.mode = TYPEDO), l = s.next_out, d = s.output, h = s.avail_out, u = s.next_in, o = s.input, c = s.avail_in, a = r.hold, m = r.bits, y = c, g = h, P = Z_OK$1;
   e: for (; ; )
     switch (r.mode) {
       case HEAD:
@@ -416,7 +416,7 @@ const fixedtables = (s) => {
           c--, a += o[u++] << m, m += 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, m = 0, r.mode = FLAGS;
+          r.wbits === 0 && (r.wbits = 15), r.check = 0, D[0] = a & 255, D[1] = a >>> 8 & 255, r.check = crc32(r.check, D, 2, 0), a = 0, m = 0, r.mode = FLAGS;
           break;
         }
         if (r.head && (r.head.done = !1), !(r.wrap & 1) || (((a & 255) << 8) + (a >> 8)) % 31) {
@@ -447,7 +447,7 @@ 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, m = 0, r.mode = TIME;
+        r.head && (r.head.text = a >> 8 & 1), r.flags & 512 && r.wrap & 4 && (D[0] = a & 255, D[1] = a >>> 8 & 255, r.check = crc32(r.check, D, 2, 0)), a = 0, m = 0, r.mode = TIME;
       /* falls through */
       case TIME:
         for (; m < 32; ) {
@@ -455,7 +455,7 @@ const fixedtables = (s) => {
             break e;
           c--, a += o[u++] << m, m += 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, m = 0, r.mode = OS;
+        r.head && (r.head.time = a), r.flags & 512 && r.wrap & 4 && (D[0] = a & 255, D[1] = a >>> 8 & 255, D[2] = a >>> 16 & 255, D[3] = a >>> 24 & 255, r.check = crc32(r.check, D, 4, 0)), a = 0, m = 0, r.mode = OS;
       /* falls through */
       case OS:
         for (; m < 16; ) {
@@ -463,7 +463,7 @@ const fixedtables = (s) => {
             break e;
           c--, a += o[u++] << m, m += 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, m = 0, r.mode = EXLEN;
+        r.head && (r.head.xflags = a & 255, r.head.os = a >> 8), r.flags & 512 && r.wrap & 4 && (D[0] = a & 255, D[1] = a >>> 8 & 255, r.check = crc32(r.check, D, 2, 0)), a = 0, m = 0, r.mode = EXLEN;
       /* falls through */
       case EXLEN:
         if (r.flags & 1024) {
@@ -472,7 +472,7 @@ const fixedtables = (s) => {
               break e;
             c--, a += o[u++] << m, m += 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, m = 0;
+          r.length = a, r.head && (r.head.extra_len = a), r.flags & 512 && r.wrap & 4 && (D[0] = a & 255, D[1] = a >>> 8 & 255, r.check = crc32(r.check, D, 2, 0)), a = 0, m = 0;
         } else r.head && (r.head.extra = null);
         r.mode = EXTRA;
       /* falls through */
@@ -619,10 +619,10 @@ const fixedtables = (s) => {
               break e;
             c--, a += o[u++] << m, m += 8;
           }
-          r.lens[$[r.have++]] = a & 7, a >>>= 3, m -= 3;
+          r.lens[B[r.have++]] = a & 7, a >>>= 3, m -= 3;
         }
         for (; r.have < 19; )
-          r.lens[$[r.have++]] = 0;
+          r.lens[B[r.have++]] = 0;
         if (r.lencode = r.lendyn, r.lenbits = 7, A = {
           bits: r.lenbits
         }, P = inflate_table(CODES, r.lens, 0, 19, r.lencode, 0, r.work, A), r.lenbits = A.bits, P) {
@@ -633,39 +633,39 @@ const fixedtables = (s) => {
       /* falls through */
       case CODELENS:
         for (; r.have < r.nlen + r.ndist; ) {
-          for (; _ = r.lencode[a & (1 << r.lenbits) - 1], x = _ >>> 24, w = _ >>> 16 & 255, O = _ & 65535, !(x <= m); ) {
+          for (; _ = r.lencode[a & (1 << r.lenbits) - 1], O = _ >>> 24, b = _ >>> 16 & 255, x = _ & 65535, !(O <= m); ) {
             if (c === 0)
               break e;
             c--, a += o[u++] << m, m += 8;
           }
-          if (O < 16)
-            a >>>= x, m -= x, r.lens[r.have++] = O;
+          if (x < 16)
+            a >>>= O, m -= O, r.lens[r.have++] = x;
           else {
-            if (O === 16) {
-              for (I = x + 2; m < I; ) {
+            if (x === 16) {
+              for (I = O + 2; m < I; ) {
                 if (c === 0)
                   break e;
                 c--, a += o[u++] << m, m += 8;
               }
-              if (a >>>= x, m -= x, r.have === 0) {
+              if (a >>>= O, m -= O, r.have === 0) {
                 s.msg = "invalid bit length repeat", r.mode = BAD;
                 break;
               }
               S = r.lens[r.have - 1], p = 3 + (a & 3), a >>>= 2, m -= 2;
-            } else if (O === 17) {
-              for (I = x + 3; m < I; ) {
+            } else if (x === 17) {
+              for (I = O + 3; m < I; ) {
                 if (c === 0)
                   break e;
                 c--, a += o[u++] << m, m += 8;
               }
-              a >>>= x, m -= x, S = 0, p = 3 + (a & 7), a >>>= 3, m -= 3;
+              a >>>= O, m -= O, S = 0, p = 3 + (a & 7), a >>>= 3, m -= 3;
             } else {
-              for (I = x + 7; m < I; ) {
+              for (I = O + 7; m < I; ) {
                 if (c === 0)
                   break e;
                 c--, a += o[u++] << m, m += 8;
               }
-              a >>>= x, m -= x, S = 0, p = 11 + (a & 127), a >>>= 7, m -= 7;
+              a >>>= O, m -= O, S = 0, p = 11 + (a & 127), a >>>= 7, m -= 7;
             }
             if (r.have + p > r.nlen + r.ndist) {
               s.msg = "invalid bit length repeat", r.mode = BAD;
@@ -710,35 +710,35 @@ const fixedtables = (s) => {
       /* falls through */
       case LEN:
         if (c >= 6 && h >= 258) {
-          s.next_out = l, s.avail_out = h, s.next_in = u, s.avail_in = c, r.hold = a, r.bits = m, inflate_fast(s, v), l = s.next_out, d = s.output, h = s.avail_out, u = s.next_in, o = s.input, c = s.avail_in, a = r.hold, m = r.bits, r.mode === TYPE && (r.back = -1);
+          s.next_out = l, s.avail_out = h, s.next_in = u, s.avail_in = c, r.hold = a, r.bits = m, inflate_fast(s, g), l = s.next_out, d = s.output, h = s.avail_out, u = s.next_in, o = s.input, c = s.avail_in, a = r.hold, m = r.bits, r.mode === TYPE && (r.back = -1);
           break;
         }
-        for (r.back = 0; _ = r.lencode[a & (1 << r.lenbits) - 1], x = _ >>> 24, w = _ >>> 16 & 255, O = _ & 65535, !(x <= m); ) {
+        for (r.back = 0; _ = r.lencode[a & (1 << r.lenbits) - 1], O = _ >>> 24, b = _ >>> 16 & 255, x = _ & 65535, !(O <= m); ) {
           if (c === 0)
             break e;
           c--, a += o[u++] << m, m += 8;
         }
-        if (w && (w & 240) === 0) {
-          for (T = x, E = w, R = O; _ = r.lencode[R + ((a & (1 << T + E) - 1) >> T)], x = _ >>> 24, w = _ >>> 16 & 255, O = _ & 65535, !(T + x <= m); ) {
+        if (b && (b & 240) === 0) {
+          for (T = O, E = b, R = x; _ = r.lencode[R + ((a & (1 << T + E) - 1) >> T)], O = _ >>> 24, b = _ >>> 16 & 255, x = _ & 65535, !(T + O <= m); ) {
             if (c === 0)
               break e;
             c--, a += o[u++] << m, m += 8;
           }
           a >>>= T, m -= T, r.back += T;
         }
-        if (a >>>= x, m -= x, r.back += x, r.length = O, w === 0) {
+        if (a >>>= O, m -= O, r.back += O, r.length = x, b === 0) {
           r.mode = LIT;
           break;
         }
-        if (w & 32) {
+        if (b & 32) {
           r.back = -1, r.mode = TYPE;
           break;
         }
-        if (w & 64) {
+        if (b & 64) {
           s.msg = "invalid literal/length code", r.mode = BAD;
           break;
         }
-        r.extra = w & 15, r.mode = LENEXT;
+        r.extra = b & 15, r.mode = LENEXT;
       /* falls through */
       case LENEXT:
         if (r.extra) {
@@ -752,24 +752,24 @@ const fixedtables = (s) => {
         r.was = r.length, r.mode = DIST;
       /* falls through */
       case DIST:
-        for (; _ = r.distcode[a & (1 << r.distbits) - 1], x = _ >>> 24, w = _ >>> 16 & 255, O = _ & 65535, !(x <= m); ) {
+        for (; _ = r.distcode[a & (1 << r.distbits) - 1], O = _ >>> 24, b = _ >>> 16 & 255, x = _ & 65535, !(O <= m); ) {
           if (c === 0)
             break e;
           c--, a += o[u++] << m, m += 8;
         }
-        if ((w & 240) === 0) {
-          for (T = x, E = w, R = O; _ = r.distcode[R + ((a & (1 << T + E) - 1) >> T)], x = _ >>> 24, w = _ >>> 16 & 255, O = _ & 65535, !(T + x <= m); ) {
+        if ((b & 240) === 0) {
+          for (T = O, E = b, R = x; _ = r.distcode[R + ((a & (1 << T + E) - 1) >> T)], O = _ >>> 24, b = _ >>> 16 & 255, x = _ & 65535, !(T + O <= m); ) {
             if (c === 0)
               break e;
             c--, a += o[u++] << m, m += 8;
           }
           a >>>= T, m -= T, r.back += T;
         }
-        if (a >>>= x, m -= x, r.back += x, w & 64) {
+        if (a >>>= O, m -= O, r.back += O, b & 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 = b & 15, r.mode = DISTEXT;
       /* falls through */
       case DISTEXT:
         if (r.extra) {
@@ -789,17 +789,17 @@ const fixedtables = (s) => {
       case MATCH:
         if (h === 0)
           break e;
-        if (p = v - h, r.offset > p) {
+        if (p = g - h, r.offset > p) {
           if (p = r.offset - p, p > r.whave && r.sane) {
             s.msg = "invalid distance too far back", r.mode = BAD;
             break;
           }
-          p > r.wnext ? (p -= r.wnext, g = r.wsize - p) : g = r.wnext - p, p > r.length && (p = r.length), b = r.window;
+          p > r.wnext ? (p -= r.wnext, v = r.wsize - p) : v = r.wnext - p, p > r.length && (p = r.length), w = r.window;
         } else
-          b = d, g = l - r.offset, p = r.length;
+          w = d, v = l - r.offset, p = r.length;
         p > h && (p = h), h -= p, r.length -= p;
         do
-          d[l++] = b[g++];
+          d[l++] = w[v++];
         while (--p);
         r.length === 0 && (r.mode = LEN);
         break;
@@ -815,8 +815,8 @@ const fixedtables = (s) => {
               break e;
             c--, a |= o[u++] << m, m += 8;
           }
-          if (v -= h, s.total_out += v, r.total += v, r.wrap & 4 && v && (s.adler = r.check = /*UPDATE_CHECK(state.check, put - _out, _out);*/
-          r.flags ? crc32(r.check, d, v, l - v) : adler32(r.check, d, v, l - v)), v = h, r.wrap & 4 && (r.flags ? a : zswap32(a)) !== r.check) {
+          if (g -= h, 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, d, g, l - g) : adler32(r.check, d, g, l - g)), g = h, r.wrap & 4 && (r.flags ? a : zswap32(a)) !== r.check) {
             s.msg = "incorrect data check", r.mode = BAD;
             break;
           }
@@ -852,8 +852,8 @@ const fixedtables = (s) => {
       default:
         return Z_STREAM_ERROR$1;
     }
-  return s.next_out = l, s.avail_out = h, s.next_in = u, s.avail_in = c, r.hold = a, r.bits = m, (r.wsize || v !== s.avail_out && r.mode < BAD && (r.mode < CHECK || i !== Z_FINISH$1)) && updatewindow(s, s.output, s.next_out, v - s.avail_out), y -= s.avail_in, v -= s.avail_out, s.total_in += y, s.total_out += v, r.total += v, r.wrap & 4 && v && (s.adler = r.check = /*UPDATE_CHECK(state.check, strm.next_out - _out, _out);*/
-  r.flags ? crc32(r.check, d, v, s.next_out - v) : adler32(r.check, d, v, s.next_out - v)), s.data_type = r.bits + (r.last ? 64 : 0) + (r.mode === TYPE ? 128 : 0) + (r.mode === LEN_ || r.mode === COPY_ ? 256 : 0), (y === 0 && v === 0 || i === Z_FINISH$1) && P === Z_OK$1 && (P = Z_BUF_ERROR), P;
+  return s.next_out = l, s.avail_out = h, s.next_in = u, s.avail_in = c, r.hold = a, r.bits = m, (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, d, g, s.next_out - g) : adler32(r.check, d, 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))
     return Z_STREAM_ERROR$1;
@@ -1158,14 +1158,14 @@ class GeoTerrainProvider {
     this._dataType === "int" ? r = 2 : this._dataType === "float" && (r = 4);
     let o = i;
     if (o.length !== 22500 * r) return null;
-    let d, u, l, c, h = new ArrayBuffer(r), a = new DataView(h), m = this._heightmapWidth, y = this._heightmapHeight, v = new Uint8Array(m * y * 4);
+    let d, u, l, c, h = new ArrayBuffer(r), a = new DataView(h), m = this._heightmapWidth, y = this._heightmapHeight, g = new Uint8Array(m * y * 4);
     for (let p = 0; p < y; p++)
-      for (let g = 0; g < m; g++) {
-        l = parseInt(149 * p / (y - 1)), c = parseInt(149 * g / (m - 1)), u = r * (150 * l + c), r === 4 ? (a.setInt8(0, o[u]), a.setInt8(1, o[u + 1]), a.setInt8(2, o[u + 2]), a.setInt8(3, o[u + 3]), d = a.getFloat32(0, !0)) : d = o[u] + 256 * o[u + 1], (1e4 < d || d < -2e3) && (d = 0);
-        let b = (d + 1e3) / 1e-3, _ = 4 * (p * m + g);
-        v[_] = b / 65536, v[1 + _] = (b - 256 * v[_] * 256) / 256, v[2 + _] = b - 256 * v[_] * 256 - 256 * v[1 + _], v[3 + _] = 255;
+      for (let v = 0; v < m; v++) {
+        l = parseInt(149 * p / (y - 1)), c = parseInt(149 * v / (m - 1)), u = r * (150 * l + c), r === 4 ? (a.setInt8(0, o[u]), a.setInt8(1, o[u + 1]), a.setInt8(2, o[u + 2]), a.setInt8(3, o[u + 3]), d = a.getFloat32(0, !0)) : d = o[u] + 256 * o[u + 1], (1e4 < d || d < -2e3) && (d = 0);
+        let w = (d + 1e3) / 1e-3, _ = 4 * (p * m + v);
+        g[_] = w / 65536, g[1 + _] = (w - 256 * g[_] * 256) / 256, g[2 + _] = w - 256 * g[_] * 256 - 256 * g[1 + _], g[3 + _] = 255;
       }
-    return v;
+    return g;
   }
   getVHeightBuffer() {
     let i = this._vHeightBuffer;
@@ -1182,8 +1182,8 @@ class GeoTerrainProvider {
     for (let a = 0; a < l.length && h !== 15; ++a) {
       let m = l[a];
       if (!(m.maxLevel <= o)) {
-        let y = m.rectangle, v = Rectangle$1.intersection(y, c, d);
-        defined(v) && (f(u, y, 2 * i, 2 * r, o + 1, d) && (h |= 4), f(u, y, 2 * i + 1, 2 * r, o + 1, d) && (h |= 8), f(u, y, 2 * i, 2 * r + 1, o + 1, d) && (h |= 1), f(u, y, 2 * i + 1, 2 * r + 1, o + 1, d) && (h |= 2));
+        let y = m.rectangle, g = Rectangle$1.intersection(y, c, d);
+        defined(g) && (f(u, y, 2 * i, 2 * r, o + 1, d) && (h |= 4), f(u, y, 2 * i + 1, 2 * r, o + 1, d) && (h |= 8), f(u, y, 2 * i, 2 * r + 1, o + 1, d) && (h |= 1), f(u, y, 2 * i + 1, 2 * r + 1, o + 1, d) && (h |= 2));
       }
     }
     return h;
@@ -1200,8 +1200,8 @@ function requireAspromise() {
         if (l)
           if (l = !1, y) a(y);
           else {
-            for (var v = new Array(arguments.length - 1), p = 0; p < v.length; ) v[p++] = arguments[p];
-            h.apply(null, v);
+            for (var g = new Array(arguments.length - 1), p = 0; p < g.length; ) g[p++] = arguments[p];
+            h.apply(null, g);
           }
       };
       try {
@@ -1226,41 +1226,41 @@ function requireBase64() {
     for (var r = new Array(64), o = new Array(123), d = 0; d < 64; )
       o[r[d] = d < 26 ? d + 65 : d < 52 ? d + 71 : d < 62 ? d - 4 : d - 59 | 43] = d++;
     i.encode = function(c, h, a) {
-      for (var m = null, y = [], v = 0, p = 0, g; h < a; ) {
-        var b = c[h++];
+      for (var m = null, y = [], g = 0, p = 0, v; h < a; ) {
+        var w = c[h++];
         switch (p) {
           case 0:
-            y[v++] = r[b >> 2], g = (b & 3) << 4, p = 1;
+            y[g++] = r[w >> 2], v = (w & 3) << 4, p = 1;
             break;
           case 1:
-            y[v++] = r[g | b >> 4], g = (b & 15) << 2, p = 2;
+            y[g++] = r[v | w >> 4], v = (w & 15) << 2, p = 2;
             break;
           case 2:
-            y[v++] = r[g | b >> 6], y[v++] = r[b & 63], p = 0;
+            y[g++] = r[v | w >> 6], y[g++] = r[w & 63], p = 0;
             break;
         }
-        v > 8191 && ((m || (m = [])).push(String.fromCharCode.apply(String, y)), v = 0);
+        g > 8191 && ((m || (m = [])).push(String.fromCharCode.apply(String, y)), g = 0);
       }
-      return p && (y[v++] = r[g], y[v++] = 61, p === 1 && (y[v++] = 61)), m ? (v && m.push(String.fromCharCode.apply(String, y.slice(0, v))), m.join("")) : String.fromCharCode.apply(String, y.slice(0, v));
+      return p && (y[g++] = r[v], y[g++] = 61, p === 1 && (y[g++] = 61)), m ? (g && m.push(String.fromCharCode.apply(String, y.slice(0, g))), m.join("")) : String.fromCharCode.apply(String, y.slice(0, g));
     };
     var u = "invalid encoding";
     i.decode = function(c, h, a) {
-      for (var m = a, y = 0, v, p = 0; p < c.length; ) {
-        var g = c.charCodeAt(p++);
-        if (g === 61 && y > 1) break;
-        if ((g = o[g]) === void 0) throw Error(u);
+      for (var m = a, y = 0, g, p = 0; p < c.length; ) {
+        var v = c.charCodeAt(p++);
+        if (v === 61 && y > 1) break;
+        if ((v = o[v]) === void 0) throw Error(u);
         switch (y) {
           case 0:
-            v = g, y = 1;
+            g = v, y = 1;
             break;
           case 1:
-            h[a++] = v << 2 | (g & 48) >> 4, v = g, y = 2;
+            h[a++] = g << 2 | (v & 48) >> 4, g = v, y = 2;
             break;
           case 2:
-            h[a++] = (v & 15) << 4 | (g & 60) >> 2, v = g, y = 3;
+            h[a++] = (g & 15) << 4 | (v & 60) >> 2, g = v, y = 3;
             break;
           case 3:
-            h[a++] = (v & 3) << 6 | g, y = 0;
+            h[a++] = (g & 3) << 6 | v, y = 0;
             break;
         }
       }
@@ -1306,24 +1306,24 @@ function requireFloat() {
   function s(u) {
     return typeof Float32Array < "u" ? function() {
       var l = new Float32Array([-0]), c = new Uint8Array(l.buffer), h = c[3] === 128;
-      function a(p, g, b) {
-        l[0] = p, g[b] = c[0], g[b + 1] = c[1], g[b + 2] = c[2], g[b + 3] = c[3];
+      function a(p, v, w) {
+        l[0] = p, v[w] = c[0], v[w + 1] = c[1], v[w + 2] = c[2], v[w + 3] = c[3];
       }
-      function m(p, g, b) {
-        l[0] = p, g[b] = c[3], g[b + 1] = c[2], g[b + 2] = c[1], g[b + 3] = c[0];
+      function m(p, v, w) {
+        l[0] = p, v[w] = c[3], v[w + 1] = c[2], v[w + 2] = c[1], v[w + 3] = c[0];
       }
       u.writeFloatLE = h ? a : m, u.writeFloatBE = h ? m : a;
-      function y(p, g) {
-        return c[0] = p[g], c[1] = p[g + 1], c[2] = p[g + 2], c[3] = p[g + 3], l[0];
+      function y(p, v) {
+        return c[0] = p[v], c[1] = p[v + 1], c[2] = p[v + 2], c[3] = p[v + 3], l[0];
       }
-      function v(p, g) {
-        return c[3] = p[g], c[2] = p[g + 1], c[1] = p[g + 2], c[0] = p[g + 3], l[0];
+      function g(p, v) {
+        return c[3] = p[v], c[2] = p[v + 1], c[1] = p[v + 2], c[0] = p[v + 3], l[0];
       }
-      u.readFloatLE = h ? y : v, u.readFloatBE = h ? v : y;
+      u.readFloatLE = h ? y : g, u.readFloatBE = h ? g : y;
     }() : function() {
       function l(h, a, m, y) {
-        var v = a < 0 ? 1 : 0;
-        if (v && (a = -a), a === 0)
+        var g = a < 0 ? 1 : 0;
+        if (g && (a = -a), a === 0)
           h(1 / a > 0 ? (
             /* positive */
             0
@@ -1333,69 +1333,69 @@ function requireFloat() {
           ), m, y);
         else if (isNaN(a)) h(2143289344, m, y);
         else if (a > 34028234663852886e22)
-          h((v << 31 | 2139095040) >>> 0, m, y);
+          h((g << 31 | 2139095040) >>> 0, m, y);
         else if (a < 11754943508222875e-54)
-          h((v << 31 | Math.round(a / 1401298464324817e-60)) >>> 0, m, y);
+          h((g << 31 | Math.round(a / 1401298464324817e-60)) >>> 0, m, y);
         else {
-          var p = Math.floor(Math.log(a) / Math.LN2), g = Math.round(a * Math.pow(2, -p) * 8388608) & 8388607;
-          h((v << 31 | p + 127 << 23 | g) >>> 0, m, y);
+          var p = Math.floor(Math.log(a) / Math.LN2), v = Math.round(a * Math.pow(2, -p) * 8388608) & 8388607;
+          h((g << 31 | p + 127 << 23 | v) >>> 0, m, y);
         }
       }
       u.writeFloatLE = l.bind(null, i), u.writeFloatBE = l.bind(null, r);
       function c(h, a, m) {
-        var y = h(a, m), v = (y >> 31) * 2 + 1, p = y >>> 23 & 255, g = y & 8388607;
-        return p === 255 ? g ? NaN : v * (1 / 0) : p === 0 ? v * 1401298464324817e-60 * g : v * Math.pow(2, p - 150) * (g + 8388608);
+        var y = h(a, m), g = (y >> 31) * 2 + 1, p = y >>> 23 & 255, v = y & 8388607;
+        return p === 255 ? v ? NaN : g * (1 / 0) : p === 0 ? g * 1401298464324817e-60 * v : g * Math.pow(2, p - 150) * (v + 8388608);
       }
       u.readFloatLE = c.bind(null, o), u.readFloatBE = c.bind(null, d);
     }(), typeof Float64Array < "u" ? function() {
       var l = new Float64Array([-0]), c = new Uint8Array(l.buffer), h = c[7] === 128;
-      function a(p, g, b) {
-        l[0] = p, g[b] = c[0], g[b + 1] = c[1], g[b + 2] = c[2], g[b + 3] = c[3], g[b + 4] = c[4], g[b + 5] = c[5], g[b + 6] = c[6], g[b + 7] = c[7];
+      function a(p, v, w) {
+        l[0] = p, v[w] = c[0], v[w + 1] = c[1], v[w + 2] = c[2], v[w + 3] = c[3], v[w + 4] = c[4], v[w + 5] = c[5], v[w + 6] = c[6], v[w + 7] = c[7];
       }
-      function m(p, g, b) {
-        l[0] = p, g[b] = c[7], g[b + 1] = c[6], g[b + 2] = c[5], g[b + 3] = c[4], g[b + 4] = c[3], g[b + 5] = c[2], g[b + 6] = c[1], g[b + 7] = c[0];
+      function m(p, v, w) {
+        l[0] = p, v[w] = c[7], v[w + 1] = c[6], v[w + 2] = c[5], v[w + 3] = c[4], v[w + 4] = c[3], v[w + 5] = c[2], v[w + 6] = c[1], v[w + 7] = c[0];
       }
       u.writeDoubleLE = h ? a : m, u.writeDoubleBE = h ? m : a;
-      function y(p, g) {
-        return c[0] = p[g], c[1] = p[g + 1], c[2] = p[g + 2], c[3] = p[g + 3], c[4] = p[g + 4], c[5] = p[g + 5], c[6] = p[g + 6], c[7] = p[g + 7], l[0];
+      function y(p, v) {
+        return c[0] = p[v], c[1] = p[v + 1], c[2] = p[v + 2], c[3] = p[v + 3], c[4] = p[v + 4], c[5] = p[v + 5], c[6] = p[v + 6], c[7] = p[v + 7], l[0];
       }
-      function v(p, g) {
-        return c[7] = p[g], c[6] = p[g + 1], c[5] = p[g + 2], c[4] = p[g + 3], c[3] = p[g + 4], c[2] = p[g + 5], c[1] = p[g + 6], c[0] = p[g + 7], l[0];
+      function g(p, v) {
+        return c[7] = p[v], c[6] = p[v + 1], c[5] = p[v + 2], c[4] = p[v + 3], c[3] = p[v + 4], c[2] = p[v + 5], c[1] = p[v + 6], c[0] = p[v + 7], l[0];
       }
-      u.readDoubleLE = h ? y : v, u.readDoubleBE = h ? v : y;
+      u.readDoubleLE = h ? y : g, u.readDoubleBE = h ? g : y;
     }() : function() {
-      function l(h, a, m, y, v, p) {
-        var g = y < 0 ? 1 : 0;
-        if (g && (y = -y), y === 0)
-          h(0, v, p + a), h(1 / y > 0 ? (
+      function l(h, a, m, y, g, p) {
+        var v = y < 0 ? 1 : 0;
+        if (v && (y = -y), y === 0)
+          h(0, g, p + a), h(1 / y > 0 ? (
             /* positive */
             0
           ) : (
             /* negative 0 */
             2147483648
-          ), v, p + m);
+          ), g, p + m);
         else if (isNaN(y))
-          h(0, v, p + a), h(2146959360, v, p + m);
+          h(0, g, p + a), h(2146959360, g, p + m);
         else if (y > 17976931348623157e292)
-          h(0, v, p + a), h((g << 31 | 2146435072) >>> 0, v, p + m);
+          h(0, g, p + a), h((v << 31 | 2146435072) >>> 0, g, p + m);
         else {
-          var b;
+          var w;
           if (y < 22250738585072014e-324)
-            b = y / 5e-324, h(b >>> 0, v, p + a), h((g << 31 | b / 4294967296) >>> 0, v, p + m);
+            w = y / 5e-324, h(w >>> 0, g, p + a), h((v << 31 | w / 4294967296) >>> 0, g, p + m);
           else {
             var _ = Math.floor(Math.log(y) / Math.LN2);
-            _ === 1024 && (_ = 1023), b = y * Math.pow(2, -_), h(b * 4503599627370496 >>> 0, v, p + a), h(
-              (g << 31 | _ + 1023 << 20 | b * 1048576 & 1048575) >>> 0,
-              v,
+            _ === 1024 && (_ = 1023), w = y * Math.pow(2, -_), h(w * 4503599627370496 >>> 0, g, p + a), h(
+              (v << 31 | _ + 1023 << 20 | w * 1048576 & 1048575) >>> 0,
+              g,
               p + m
             );
           }
         }
       }
       u.writeDoubleLE = l.bind(null, i, 0, 4), u.writeDoubleBE = l.bind(null, r, 4, 0);
-      function c(h, a, m, y, v) {
-        var p = h(y, v + a), g = h(y, v + m), b = (g >> 31) * 2 + 1, _ = g >>> 20 & 2047, x = 4294967296 * (g & 1048575) + p;
-        return _ === 2047 ? x ? NaN : b * (1 / 0) : _ === 0 ? b * 5e-324 * x : b * Math.pow(2, _ - 1075) * (x + 4503599627370496);
+      function c(h, a, m, y, g) {
+        var p = h(y, g + a), v = h(y, g + m), w = (v >> 31) * 2 + 1, _ = v >>> 20 & 2047, O = 4294967296 * (v & 1048575) + p;
+        return _ === 2047 ? O ? NaN : w * (1 / 0) : _ === 0 ? w * 5e-324 * O : w * Math.pow(2, _ - 1075) * (O + 4503599627370496);
       }
       u.readDoubleLE = c.bind(null, o, 0, 4), u.readDoubleBE = c.bind(null, d, 4, 0);
     }(), u;
@@ -2097,11 +2097,11 @@ function codegen(s, i) {
       }
       return Function(l)();
     }
-    for (var y = new Array(arguments.length - 1), v = 0; v < y.length; )
-      y[v] = arguments[++v];
-    if (v = 0, u = u.replace(/%([%dfijs])/g, function(g, b) {
-      var _ = y[v++];
-      switch (b) {
+    for (var y = new Array(arguments.length - 1), g = 0; g < y.length; )
+      y[g] = arguments[++g];
+    if (g = 0, u = u.replace(/%([%dfijs])/g, function(v, w) {
+      var _ = y[g++];
+      switch (w) {
         case "d":
         case "f":
           return String(Number(_));
@@ -2113,7 +2113,7 @@ function codegen(s, i) {
           return String(_);
       }
       return "%";
-    }), v !== y.length) throw Error("parameter count mismatch");
+    }), g !== y.length) throw Error("parameter count mismatch");
     return r.push(u), o;
   }
   function d(u) {
@@ -2365,8 +2365,8 @@ function requireField() {
   l.fromJSON = function(h, a) {
     return new l(h, a.id, a.type, a.rule, a.extend, a.options, a.comment);
   };
-  function l(c, h, a, m, y, v, p) {
-    if (o.isObject(m) ? (p = y, v = m, m = y = void 0) : o.isObject(y) && (p = v, v = y, y = void 0), s.call(this, c, v), !o.isInteger(h) || h < 0) throw TypeError("id must be a non-negative integer");
+  function l(c, h, a, m, y, g, p) {
+    if (o.isObject(m) ? (p = y, g = m, m = y = void 0) : o.isObject(y) && (p = g, g = y, y = void 0), s.call(this, c, g), !o.isInteger(h) || h < 0) throw TypeError("id must be a non-negative integer");
     if (!o.isString(a)) throw TypeError("type must be a string");
     if (m !== void 0 && !u.test(m = m.toString().toLowerCase()))
       throw TypeError("rule must be a string rule");
@@ -2416,9 +2416,9 @@ function requireField() {
     }
     return this.map ? this.defaultValue = o.emptyObject : this.repeated ? this.defaultValue = o.emptyArray : this.defaultValue = this.typeDefault, this.parent instanceof d && (this.parent.ctor.prototype[this.name] = this.defaultValue), s.prototype.resolve.call(this);
   }, l.d = function(h, a, m, y) {
-    return typeof a == "function" ? a = o.decorateType(a).name : a && typeof a == "object" && (a = o.decorateEnum(a).name), function(p, g) {
+    return typeof a == "function" ? a = o.decorateType(a).name : a && typeof a == "object" && (a = o.decorateEnum(a).name), function(p, v) {
       o.decorateType(p.constructor).add(
-        new l(g, h, a, m, {
+        new l(v, h, a, m, {
           default: y
         })
       );
@@ -2493,25 +2493,25 @@ function requireNamespace() {
   var s = requireObject();
   ((h.prototype = Object.create(s.prototype)).constructor = h).className = "Namespace";
   var i = requireField(), r = requireUtil(), o = requireOneof(), d, u, l;
-  h.fromJSON = function(y, v) {
-    return new h(y, v.options).addJSON(v.nested);
+  h.fromJSON = function(y, g) {
+    return new h(y, g.options).addJSON(g.nested);
   };
   function c(m, y) {
     if (m && m.length) {
-      for (var v = {}, p = 0; p < m.length; ++p) v[m[p].name] = m[p].toJSON(y);
-      return v;
+      for (var g = {}, p = 0; p < m.length; ++p) g[m[p].name] = m[p].toJSON(y);
+      return g;
     }
   }
-  h.arrayToJSON = c, h.isReservedId = function(y, v) {
+  h.arrayToJSON = c, h.isReservedId = function(y, g) {
     if (y) {
       for (var p = 0; p < y.length; ++p)
-        if (typeof y[p] != "string" && y[p][0] <= v && y[p][1] > v)
+        if (typeof y[p] != "string" && y[p][0] <= g && y[p][1] > g)
           return !0;
     }
     return !1;
-  }, h.isReservedName = function(y, v) {
+  }, h.isReservedName = function(y, g) {
     if (y) {
-      for (var p = 0; p < y.length; ++p) if (y[p] === v) return !0;
+      for (var p = 0; p < y.length; ++p) if (y[p] === g) return !0;
     }
     return !1;
   };
@@ -2533,12 +2533,12 @@ function requireNamespace() {
       c(this.nestedArray, y)
     ]);
   }, h.prototype.addJSON = function(y) {
-    var v = this;
+    var g = this;
     if (y)
-      for (var p = Object.keys(y), g = 0, b; g < p.length; ++g)
-        b = y[p[g]], v.add(
+      for (var p = Object.keys(y), v = 0, w; v < p.length; ++v)
+        w = y[p[v]], g.add(
           // most to least likely
-          (b.fields !== void 0 ? d.fromJSON : b.values !== void 0 ? l.fromJSON : b.methods !== void 0 ? u.fromJSON : b.id !== void 0 ? i.fromJSON : h.fromJSON)(p[g], b)
+          (w.fields !== void 0 ? d.fromJSON : w.values !== void 0 ? l.fromJSON : w.methods !== void 0 ? u.fromJSON : w.id !== void 0 ? i.fromJSON : h.fromJSON)(p[v], w)
         );
     return this;
   }, h.prototype.get = function(y) {
@@ -2551,11 +2551,11 @@ function requireNamespace() {
       throw TypeError("object must be a valid nested object");
     if (!this.nested) this.nested = {};
     else {
-      var v = this.get(y.name);
-      if (v)
-        if (v instanceof h && y instanceof h && !(v instanceof d || v instanceof u)) {
-          for (var p = v.nestedArray, g = 0; g < p.length; ++g) y.add(p[g]);
-          this.remove(v), this.nested || (this.nested = {}), y.setOptions(v.options, !0);
+      var g = this.get(y.name);
+      if (g)
+        if (g instanceof h && y instanceof h && !(g instanceof d || g instanceof u)) {
+          for (var p = g.nestedArray, v = 0; v < p.length; ++v) y.add(p[v]);
+          this.remove(g), this.nested || (this.nested = {}), y.setOptions(g.options, !0);
         } else throw Error("duplicate name '" + y.name + "' in " + this);
     }
     return this.nested[y.name] = y, y.onAdd(this), a(this);
@@ -2563,56 +2563,56 @@ function requireNamespace() {
     if (!(y instanceof s)) throw TypeError("object must be a ReflectionObject");
     if (y.parent !== this) throw Error(y + " is not a member of " + this);
     return delete this.nested[y.name], Object.keys(this.nested).length || (this.nested = void 0), y.onRemove(this), a(this);
-  }, h.prototype.define = function(y, v) {
+  }, h.prototype.define = function(y, g) {
     if (r.isString(y)) y = y.split(".");
     else if (!Array.isArray(y)) throw TypeError("illegal path");
     if (y && y.length && y[0] === "") throw Error("path must be relative");
     for (var p = this; y.length > 0; ) {
-      var g = y.shift();
-      if (p.nested && p.nested[g]) {
-        if (p = p.nested[g], !(p instanceof h)) throw Error("path conflicts with non-namespace objects");
-      } else p.add(p = new h(g));
+      var v = y.shift();
+      if (p.nested && p.nested[v]) {
+        if (p = p.nested[v], !(p instanceof h)) throw Error("path conflicts with non-namespace objects");
+      } else p.add(p = new h(v));
     }
-    return v && p.addJSON(v), p;
+    return g && p.addJSON(g), p;
   }, h.prototype.resolveAll = function() {
-    for (var y = this.nestedArray, v = 0; v < y.length; )
-      y[v] instanceof h ? y[v++].resolveAll() : y[v++].resolve();
+    for (var y = this.nestedArray, g = 0; g < y.length; )
+      y[g] instanceof h ? y[g++].resolveAll() : y[g++].resolve();
     return this.resolve();
-  }, h.prototype.lookup = function(y, v, p) {
-    if (typeof v == "boolean" ? (p = v, v = void 0) : v && !Array.isArray(v) && (v = [v]), r.isString(y) && y.length) {
+  }, h.prototype.lookup = function(y, g, p) {
+    if (typeof g == "boolean" ? (p = g, g = void 0) : g && !Array.isArray(g) && (g = [g]), r.isString(y) && y.length) {
       if (y === ".") return this.root;
       y = y.split(".");
     } else if (!y.length) return this;
-    if (y[0] === "") return this.root.lookup(y.slice(1), v);
-    var g = this.get(y[0]);
-    if (g) {
+    if (y[0] === "") return this.root.lookup(y.slice(1), g);
+    var v = this.get(y[0]);
+    if (v) {
       if (y.length === 1) {
-        if (!v || v.indexOf(g.constructor) > -1) return g;
-      } else if (g instanceof h && (g = g.lookup(y.slice(1), v, !0)))
-        return g;
+        if (!g || g.indexOf(v.constructor) > -1) return v;
+      } else if (v instanceof h && (v = v.lookup(y.slice(1), g, !0)))
+        return v;
     } else
-      for (var b = 0; b < this.nestedArray.length; ++b)
-        if (this._nestedArray[b] instanceof h && (g = this._nestedArray[b].lookup(y, v, !0)))
-          return g;
-    return this.parent === null || p ? null : this.parent.lookup(y, v);
+      for (var w = 0; w < this.nestedArray.length; ++w)
+        if (this._nestedArray[w] instanceof h && (v = this._nestedArray[w].lookup(y, g, !0)))
+          return v;
+    return this.parent === null || p ? null : this.parent.lookup(y, g);
   }, h.prototype.lookupType = function(y) {
-    var v = this.lookup(y, [d]);
-    if (!v) throw Error("no such type: " + y);
-    return v;
+    var g = this.lookup(y, [d]);
+    if (!g) throw Error("no such type: " + y);
+    return g;
   }, h.prototype.lookupEnum = function(y) {
-    var v = this.lookup(y, [l]);
-    if (!v) throw Error("no such Enum '" + y + "' in " + this);
-    return v;
+    var g = this.lookup(y, [l]);
+    if (!g) throw Error("no such Enum '" + y + "' in " + this);
+    return g;
   }, h.prototype.lookupTypeOrEnum = function(y) {
-    var v = this.lookup(y, [d, l]);
-    if (!v) throw Error("no such Type or Enum '" + y + "' in " + this);
-    return v;
+    var g = this.lookup(y, [d, l]);
+    if (!g) throw Error("no such Type or Enum '" + y + "' in " + this);
+    return g;
   }, h.prototype.lookupService = function(y) {
-    var v = this.lookup(y, [u]);
-    if (!v) throw Error("no such Service '" + y + "' in " + this);
-    return v;
-  }, h._configure = function(m, y, v) {
-    d = m, u = y, l = v;
+    var g = this.lookup(y, [u]);
+    if (!g) throw Error("no such Service '" + y + "' in " + this);
+    return g;
+  }, h._configure = function(m, y, g) {
+    d = m, u = y, l = g;
   }, namespace;
 }
 var mapfield, hasRequiredMapfield;
@@ -2756,16 +2756,16 @@ function requireService() {
     }
     return s.prototype.remove.call(this, c);
   }, d.prototype.create = function(c, h, a) {
-    for (var m = new o.Service(c, h, a), y = 0, v; y < /* initializes */
+    for (var m = new o.Service(c, h, a), y = 0, g; y < /* initializes */
     this.methodsArray.length; ++y) {
-      var p = r.lcFirst((v = this._methodsArray[y]).resolve().name).replace(/[^$\w_]/g, "");
+      var p = r.lcFirst((g = this._methodsArray[y]).resolve().name).replace(/[^$\w_]/g, "");
       m[p] = r.codegen(
         ["r", "c"],
         r.isReserved(p) ? p + "_" : p
       )("return this.rpcCall(m,q,s,r,c)")({
-        m: v,
-        q: v.resolvedRequestType.ctor,
-        s: v.resolvedResponseType.ctor
+        m: g,
+        q: g.resolvedRequestType.ctor,
+        s: g.resolvedResponseType.ctor
       });
     }
     return m;
@@ -2816,8 +2816,8 @@ function requireDecoder() {
     var l = r.codegen(["r", "l"], u.name + "$decode")("if(!(r instanceof Reader))")(
       "r=Reader.create(r)"
     )(
-      "var c=l===undefined?r.len:r.pos+l,m=new this.ctor" + (u.fieldsArray.filter(function(v) {
-        return v.map;
+      "var c=l===undefined?r.len:r.pos+l,m=new this.ctor" + (u.fieldsArray.filter(function(g) {
+        return g.map;
       }).length ? ",k,value" : "")
     )("while(r.pos<c){")("var t=r.uint32()");
     u.group && l("if((t&7)===4)")("break"), l("switch(t>>>3){");
@@ -2949,23 +2949,23 @@ function requireVerifier() {
     h.length && c("var p={}");
     for (var m = 0; m < /* initializes */
     l.fieldsArray.length; ++m) {
-      var y = l._fieldsArray[m].resolve(), v = "m" + i.safeProp(y.name);
-      if (y.optional && c("if(%s!=null&&m.hasOwnProperty(%j)){", v, y.name), y.map)
-        c("if(!util.isObject(%s))", v)("return%j", r(y, "object"))(
+      var y = l._fieldsArray[m].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)",
-          v
-        )("for(var i=0;i<k.length;++i){"), d(c, y, "k[i]"), o(c, y, m, v + "[k[i]]")("}");
+          g
+        )("for(var i=0;i<k.length;++i){"), d(c, y, "k[i]"), o(c, y, m, g + "[k[i]]")("}");
       else if (y.repeated)
-        c("if(!Array.isArray(%s))", v)("return%j", r(y, "array"))(
+        c("if(!Array.isArray(%s))", g)("return%j", r(y, "array"))(
           "for(var i=0;i<%s.length;++i){",
-          v
-        ), o(c, y, m, v + "[i]")("}");
+          g
+        ), o(c, y, m, g + "[i]")("}");
       else {
         if (y.partOf) {
           var p = i.safeProp(y.partOf.name);
           a[y.partOf.name] === 1 && c("if(p%s===1)", p)("return%j", y.partOf.name + ": multiple values"), a[y.partOf.name] = 1, c("p%s=1", p);
         }
-        o(c, y, m, v);
+        o(c, y, m, g);
       }
       y.optional && c("}");
     }
@@ -2982,12 +2982,12 @@ function requireConverter() {
       if (c.resolvedType)
         if (c.resolvedType instanceof r) {
           l("switch(d%s){", a);
-          for (var y = c.resolvedType.values, v = Object.keys(y), p = 0; p < v.length; ++p)
-            y[v[p]] === c.typeDefault && !m && (l("default:")('if(typeof(d%s)==="number"){m%s=d%s;break}', a, a, a), c.repeated || l(
+          for (var y = c.resolvedType.values, g = Object.keys(y), p = 0; p < g.length; ++p)
+            y[g[p]] === c.typeDefault && !m && (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"
-            ), m = !0), l("case%j:", v[p])("case %i:", y[v[p]])("m%s=%j", a, y[v[p]])(
+            ), m = !0), l("case%j:", g[p])("case %i:", y[g[p]])("m%s=%j", a, y[g[p]])(
               "break"
             );
           l("}");
@@ -2997,7 +2997,7 @@ function requireConverter() {
             c.fullName + ": object expected"
           )("m%s=types[%i].fromObject(d%s)", a, h, a);
       else {
-        var g = !1;
+        var v = !1;
         switch (c.type) {
           case "double":
           case "float":
@@ -3013,7 +3013,7 @@ function requireConverter() {
             l("m%s=d%s|0", a, a);
             break;
           case "uint64":
-            g = !0;
+            v = !0;
           case "int64":
           case "sint64":
           case "fixed64":
@@ -3022,7 +3022,7 @@ function requireConverter() {
               "(m%s=util.Long.fromValue(d%s)).unsigned=%j",
               a,
               a,
-              g
+              v
             )('else if(typeof d%s==="string")', a)(
               "m%s=parseInt(d%s,10)",
               a,
@@ -3036,7 +3036,7 @@ function requireConverter() {
               a,
               a,
               a,
-              g ? "true" : ""
+              v ? "true" : ""
             );
             break;
           case "bytes":
@@ -3064,35 +3064,35 @@ function requireConverter() {
       if (!h.length) return a("return new this.ctor");
       a("var m=new this.ctor");
       for (var m = 0; m < h.length; ++m) {
-        var y = h[m].resolve(), v = o.safeProp(y.name);
-        y.map ? (a("if(d%s){", v)('if(typeof d%s!=="object")', v)(
+        var y = h[m].resolve(), g = o.safeProp(y.name);
+        y.map ? (a("if(d%s){", g)('if(typeof d%s!=="object")', g)(
           "throw TypeError(%j)",
           y.fullName + ": object expected"
-        )("m%s={}", v)("for(var ks=Object.keys(d%s),i=0;i<ks.length;++i){", v), d(
+        )("m%s={}", g)("for(var ks=Object.keys(d%s),i=0;i<ks.length;++i){", g), d(
           a,
           y,
           /* not sorted */
           m,
-          v + "[ks[i]]"
-        )("}")("}")) : y.repeated ? (a("if(d%s){", v)("if(!Array.isArray(d%s))", v)(
+          g + "[ks[i]]"
+        )("}")("}")) : y.repeated ? (a("if(d%s){", g)("if(!Array.isArray(d%s))", g)(
           "throw TypeError(%j)",
           y.fullName + ": array expected"
-        )("m%s=[]", v)("for(var i=0;i<d%s.length;++i){", v), d(
+        )("m%s=[]", g)("for(var i=0;i<d%s.length;++i){", g), d(
           a,
           y,
           /* not sorted */
           m,
-          v + "[i]"
+          g + "[i]"
         )("}")("}")) : (y.resolvedType instanceof r || a(
           // no need to test for null/undefined if an enum (uses switch)
           "if(d%s!=null){",
-          v
+          g
         ), d(
           a,
           y,
           /* not sorted */
           m,
-          v
+          g
         ), y.resolvedType instanceof r || a("}"));
       }
       return a("return m");
@@ -3158,8 +3158,8 @@ function requireConverter() {
     i.toObject = function(c) {
       var h = c.fieldsArray.slice().sort(o.compareFieldsById);
       if (!h.length) return o.codegen()("return {}");
-      for (var a = o.codegen(["m", "o"], c.name + "$toObject")("if(!o)")("o={}")("var d={}"), m = [], y = [], v = [], p = 0; p < h.length; ++p)
-        h[p].partOf || (h[p].resolve().repeated ? m : h[p].map ? y : v).push(h[p]);
+      for (var a = o.codegen(["m", "o"], c.name + "$toObject")("if(!o)")("o={}")("var d={}"), m = [], y = [], g = [], p = 0; p < h.length; ++p)
+        h[p].partOf || (h[p].resolve().repeated ? m : h[p].map ? y : g).push(h[p]);
       if (m.length) {
         for (a("if(o.arrays||o.defaults){"), p = 0; p < m.length; ++p)
           a("d%s=[]", o.safeProp(m[p].name));
@@ -3169,73 +3169,73 @@ function requireConverter() {
         for (a("if(o.objects||o.defaults){"), p = 0; p < y.length; ++p) a("d%s={}", o.safeProp(y[p].name));
         a("}");
       }
-      if (v.length) {
-        for (a("if(o.defaults){"), p = 0; p < v.length; ++p) {
-          var g = v[p], b = o.safeProp(g.name);
-          if (g.resolvedType instanceof r)
+      if (g.length) {
+        for (a("if(o.defaults){"), p = 0; p < g.length; ++p) {
+          var v = g[p], w = o.safeProp(v.name);
+          if (v.resolvedType instanceof r)
             a(
               "d%s=o.enums===String?%j:%j",
-              b,
-              g.resolvedType.valuesById[g.typeDefault],
-              g.typeDefault
+              w,
+              v.resolvedType.valuesById[v.typeDefault],
+              v.typeDefault
             );
-          else if (g.long)
+          else if (v.long)
             a("if(util.Long){")(
               "var n=new util.Long(%i,%i,%j)",
-              g.typeDefault.low,
-              g.typeDefault.high,
-              g.typeDefault.unsigned
+              v.typeDefault.low,
+              v.typeDefault.high,
+              v.typeDefault.unsigned
             )(
               "d%s=o.longs===String?n.toString():o.longs===Number?n.toNumber():n",
-              b
+              w
             )("}else")(
               "d%s=o.longs===String?%j:%i",
-              b,
-              g.typeDefault.toString(),
-              g.typeDefault.toNumber()
+              w,
+              v.typeDefault.toString(),
+              v.typeDefault.toNumber()
             );
-          else if (g.bytes) {
-            var _ = "[" + Array.prototype.slice.call(g.typeDefault).join(",") + "]";
+          else if (v.bytes) {
+            var _ = "[" + Array.prototype.slice.call(v.typeDefault).join(",") + "]";
             a(
               "if(o.bytes===String)d%s=%j",
-              b,
-              String.fromCharCode.apply(String, g.typeDefault)
-            )("else{")("d%s=%s", b, _)(
+              w,
+              String.fromCharCode.apply(String, v.typeDefault)
+            )("else{")("d%s=%s", w, _)(
               "if(o.bytes!==Array)d%s=util.newBuffer(d%s)",
-              b,
-              b
+              w,
+              w
             )("}");
-          } else a("d%s=%j", b, g.typeDefault);
+          } else a("d%s=%j", w, v.typeDefault);
         }
         a("}");
       }
-      var x = !1;
+      var O = !1;
       for (p = 0; p < h.length; ++p) {
-        var g = h[p], w = c._fieldsArray.indexOf(g), b = o.safeProp(g.name);
-        g.map ? (x || (x = !0, a("var ks2")), a("if(m%s&&(ks2=Object.keys(m%s)).length){", b, b)("d%s={}", b)(
+        var v = h[p], b = c._fieldsArray.indexOf(v), w = o.safeProp(v.name);
+        v.map ? (O || (O = !0, a("var ks2")), a("if(m%s&&(ks2=Object.keys(m%s)).length){", w, w)("d%s={}", w)(
           "for(var j=0;j<ks2.length;++j){"
         ), u(
           a,
-          g,
+          v,
           /* sorted */
-          w,
-          b + "[ks2[j]]"
-        )("}")) : g.repeated ? (a("if(m%s&&m%s.length){", b, b)("d%s=[]", b)(
+          b,
+          w + "[ks2[j]]"
+        )("}")) : v.repeated ? (a("if(m%s&&m%s.length){", w, w)("d%s=[]", w)(
           "for(var j=0;j<m%s.length;++j){",
-          b
+          w
         ), u(
           a,
-          g,
+          v,
           /* sorted */
-          w,
-          b + "[j]"
-        )("}")) : (a("if(m%s!=null&&m.hasOwnProperty(%j)){", b, g.name), u(
+          b,
+          w + "[j]"
+        )("}")) : (a("if(m%s!=null&&m.hasOwnProperty(%j)){", w, v.name), u(
           a,
-          g,
+          v,
           /* sorted */
-          w,
-          b
-        ), g.partOf && a("if(o.oneofs)")("d%s=%j", o.safeProp(g.partOf.name), g.name)), a("}");
+          b,
+          w
+        ), v.partOf && a("if(o.oneofs)")("d%s=%j", o.safeProp(v.partOf.name), v.name)), a("}");
       }
       return a("return d");
     };
@@ -3276,14 +3276,14 @@ var wrappers = {};
 var type, hasRequiredType;
 function requireType() {
   if (hasRequiredType) return type;
-  hasRequiredType = 1, type = b;
+  hasRequiredType = 1, type = w;
   var s = requireNamespace();
-  ((b.prototype = Object.create(s.prototype)).constructor = b).className = "Type";
-  var i = require_enum(), r = requireOneof(), o = requireField(), d = requireMapfield(), u = requireService(), l = message, c = reader, h = writer, a = requireUtil(), m = requireEncoder(), y = requireDecoder(), v = requireVerifier(), p = requireConverter(), g = wrappers;
-  function b(x, w) {
-    s.call(this, x, 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;
+  ((w.prototype = Object.create(s.prototype)).constructor = w).className = "Type";
+  var i = require_enum(), r = requireOneof(), o = requireField(), d = requireMapfield(), u = requireService(), l = message, c = reader, h = writer, a = requireUtil(), m = requireEncoder(), y = requireDecoder(), g = requireVerifier(), p = requireConverter(), v = wrappers;
+  function w(O, b) {
+    s.call(this, O, b), 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;
   }
-  Object.defineProperties(b.prototype, {
+  Object.defineProperties(w.prototype, {
     /**
      * Message fields by id.
      * @name Type#fieldsById
@@ -3294,10 +3294,10 @@ function requireType() {
       get: function() {
         if (this._fieldsById) return this._fieldsById;
         this._fieldsById = {};
-        for (var x = Object.keys(this.fields), w = 0; w < x.length; ++w) {
-          var O = this.fields[x[w]], T = O.id;
+        for (var O = Object.keys(this.fields), b = 0; b < O.length; ++b) {
+          var x = this.fields[O[b]], T = x.id;
           if (this._fieldsById[T]) throw Error("duplicate id " + T + " in " + this);
-          this._fieldsById[T] = O;
+          this._fieldsById[T] = x;
         }
         return this._fieldsById;
       }
@@ -3332,69 +3332,69 @@ function requireType() {
      */
     ctor: {
       get: function() {
-        return this._ctor || (this.ctor = b.generateConstructor(this)());
+        return this._ctor || (this.ctor = w.generateConstructor(this)());
       },
-      set: function(x) {
-        var w = x.prototype;
-        w instanceof l || ((x.prototype = new l()).constructor = x, a.merge(x.prototype, w)), x.$type = x.prototype.$type = this, a.merge(x, l, !0), this._ctor = x;
-        for (var O = 0; O < /* initializes */
-        this.fieldsArray.length; ++O) this._fieldsArray[O].resolve();
+      set: function(O) {
+        var b = O.prototype;
+        b instanceof l || ((O.prototype = new l()).constructor = O, a.merge(O.prototype, b)), O.$type = O.prototype.$type = this, a.merge(O, l, !0), this._ctor = O;
+        for (var x = 0; x < /* initializes */
+        this.fieldsArray.length; ++x) this._fieldsArray[x].resolve();
         var T = {};
-        for (O = 0; O < /* initializes */
-        this.oneofsArray.length; ++O)
-          T[this._oneofsArray[O].resolve().name] = {
-            get: a.oneOfGetter(this._oneofsArray[O].oneof),
-            set: a.oneOfSetter(this._oneofsArray[O].oneof)
+        for (x = 0; x < /* initializes */
+        this.oneofsArray.length; ++x)
+          T[this._oneofsArray[x].resolve().name] = {
+            get: a.oneOfGetter(this._oneofsArray[x].oneof),
+            set: a.oneOfSetter(this._oneofsArray[x].oneof)
           };
-        O && Object.defineProperties(x.prototype, T);
+        x && Object.defineProperties(O.prototype, T);
       }
     }
-  }), b.generateConstructor = function(w) {
-    for (var O = a.codegen(["p"], w.name), T = 0, E; T < w.fieldsArray.length; ++T)
-      (E = w._fieldsArray[T]).map ? O("this%s={}", a.safeProp(E.name)) : E.repeated && O("this%s=[]", a.safeProp(E.name));
-    return O("if(p)for(var ks=Object.keys(p),i=0;i<ks.length;++i)if(p[ks[i]]!=null)")(
+  }), w.generateConstructor = function(b) {
+    for (var x = a.codegen(["p"], b.name), T = 0, E; T < b.fieldsArray.length; ++T)
+      (E = b._fieldsArray[T]).map ? x("this%s={}", a.safeProp(E.name)) : E.repeated && x("this%s=[]", a.safeProp(E.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]]"
     );
   };
-  function _(x) {
-    return x._fieldsById = x._fieldsArray = x._oneofsArray = null, delete x.encode, delete x.decode, delete x.verify, x;
+  function _(O) {
+    return O._fieldsById = O._fieldsArray = O._oneofsArray = null, delete O.encode, delete O.decode, delete O.verify, O;
   }
-  return b.fromJSON = function(w, O) {
-    var T = new b(w, O.options);
-    T.extensions = O.extensions, T.reserved = O.reserved;
-    for (var E = Object.keys(O.fields), R = 0; R < E.length; ++R)
+  return w.fromJSON = function(b, x) {
+    var T = new w(b, x.options);
+    T.extensions = x.extensions, T.reserved = x.reserved;
+    for (var E = Object.keys(x.fields), R = 0; R < E.length; ++R)
       T.add(
-        (typeof O.fields[E[R]].keyType < "u" ? d.fromJSON : o.fromJSON)(
+        (typeof x.fields[E[R]].keyType < "u" ? d.fromJSON : o.fromJSON)(
           E[R],
-          O.fields[E[R]]
+          x.fields[E[R]]
         )
       );
-    if (O.oneofs)
-      for (E = Object.keys(O.oneofs), R = 0; R < E.length; ++R)
-        T.add(r.fromJSON(E[R], O.oneofs[E[R]]));
-    if (O.nested)
-      for (E = Object.keys(O.nested), R = 0; R < E.length; ++R) {
-        var S = O.nested[E[R]];
+    if (x.oneofs)
+      for (E = Object.keys(x.oneofs), R = 0; R < E.length; ++R)
+        T.add(r.fromJSON(E[R], x.oneofs[E[R]]));
+    if (x.nested)
+      for (E = Object.keys(x.nested), R = 0; R < E.length; ++R) {
+        var S = x.nested[E[R]];
         T.add(
           // most to least likely
-          (S.id !== void 0 ? o.fromJSON : S.fields !== void 0 ? b.fromJSON : S.values !== void 0 ? i.fromJSON : S.methods !== void 0 ? u.fromJSON : s.fromJSON)(E[R], S)
+          (S.id !== void 0 ? o.fromJSON : S.fields !== void 0 ? w.fromJSON : S.values !== void 0 ? i.fromJSON : S.methods !== void 0 ? u.fromJSON : s.fromJSON)(E[R], S)
         );
       }
-    return O.extensions && O.extensions.length && (T.extensions = O.extensions), O.reserved && O.reserved.length && (T.reserved = O.reserved), O.group && (T.group = !0), O.comment && (T.comment = O.comment), T;
-  }, b.prototype.toJSON = function(w) {
-    var O = s.prototype.toJSON.call(this, w), T = w ? !!w.keepComments : !1;
+    return x.extensions && x.extensions.length && (T.extensions = x.extensions), x.reserved && x.reserved.length && (T.reserved = x.reserved), x.group && (T.group = !0), x.comment && (T.comment = x.comment), T;
+  }, w.prototype.toJSON = function(b) {
+    var x = s.prototype.toJSON.call(this, b), T = b ? !!b.keepComments : !1;
     return a.toObject([
       "options",
-      O && O.options || void 0,
+      x && x.options || void 0,
       "oneofs",
-      s.arrayToJSON(this.oneofsArray, w),
+      s.arrayToJSON(this.oneofsArray, b),
       "fields",
       s.arrayToJSON(
         this.fieldsArray.filter(function(E) {
           return !E.declaringField;
         }),
-        w
+        b
       ) || {},
       "extensions",
       this.extensions && this.extensions.length ? this.extensions : void 0,
@@ -3403,94 +3403,94 @@ function requireType() {
       "group",
       this.group || void 0,
       "nested",
-      O && O.nested || void 0,
+      x && x.nested || void 0,
       "comment",
       T ? this.comment : void 0
     ]);
-  }, b.prototype.resolveAll = function() {
-    for (var w = this.fieldsArray, O = 0; O < w.length; ) w[O++].resolve();
+  }, w.prototype.resolveAll = function() {
+    for (var b = this.fieldsArray, x = 0; x < b.length; ) b[x++].resolve();
     var T = this.oneofsArray;
-    for (O = 0; O < T.length; ) T[O++].resolve();
+    for (x = 0; x < T.length; ) T[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 o && w.extend === void 0) {
+  }, w.prototype.get = function(b) {
+    return this.fields[b] || this.oneofs && this.oneofs[b] || this.nested && this.nested[b] || null;
+  }, w.prototype.add = function(b) {
+    if (this.get(b.name)) throw Error("duplicate name '" + b.name + "' in " + this);
+    if (b instanceof o && b.extend === void 0) {
       if (this._fieldsById ? (
         /* istanbul ignore next */
-        this._fieldsById[w.id]
-      ) : this.fieldsById[w.id])
-        throw Error("duplicate id " + w.id + " in " + this);
-      if (this.isReservedId(w.id)) throw Error("id " + w.id + " is reserved in " + this);
-      if (this.isReservedName(w.name))
-        throw Error("name '" + w.name + "' is reserved in " + this);
-      return w.parent && w.parent.remove(w), this.fields[w.name] = w, w.message = this, w.onAdd(this), _(this);
+        this._fieldsById[b.id]
+      ) : this.fieldsById[b.id])
+        throw Error("duplicate id " + b.id + " in " + this);
+      if (this.isReservedId(b.id)) throw Error("id " + b.id + " is reserved in " + this);
+      if (this.isReservedName(b.name))
+        throw Error("name '" + b.name + "' is reserved in " + this);
+      return b.parent && b.parent.remove(b), this.fields[b.name] = b, b.message = this, b.onAdd(this), _(this);
     }
-    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 o && 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);
+    return b instanceof r ? (this.oneofs || (this.oneofs = {}), this.oneofs[b.name] = b, b.onAdd(this), _(this)) : s.prototype.add.call(this, b);
+  }, w.prototype.remove = function(b) {
+    if (b instanceof o && b.extend === void 0) {
+      if (!this.fields || this.fields[b.name] !== b)
+        throw Error(b + " is not a member of " + this);
+      return delete this.fields[b.name], b.parent = null, b.onRemove(this), _(this);
     }
-    if (w instanceof r) {
-      if (!this.oneofs || this.oneofs[w.name] !== w)
-        throw Error(w + " is not a member of " + this);
-      return delete this.oneofs[w.name], w.parent = null, w.onRemove(this), _(this);
+    if (b instanceof r) {
+      if (!this.oneofs || this.oneofs[b.name] !== b)
+        throw Error(b + " is not a member of " + this);
+      return delete this.oneofs[b.name], b.parent = null, b.onRemove(this), _(this);
     }
-    return s.prototype.remove.call(this, w);
-  }, b.prototype.isReservedId = function(w) {
-    return s.isReservedId(this.reserved, w);
-  }, b.prototype.isReservedName = function(w) {
-    return s.isReservedName(this.reserved, w);
-  }, b.prototype.create = function(w) {
-    return new this.ctor(w);
-  }, b.prototype.setup = function() {
-    for (var w = this.fullName, O = [], T = 0; T < /* initializes */
+    return s.prototype.remove.call(this, b);
+  }, w.prototype.isReservedId = function(b) {
+    return s.isReservedId(this.reserved, b);
+  }, w.prototype.isReservedName = function(b) {
+    return s.isReservedName(this.reserved, b);
+  }, w.prototype.create = function(b) {
+    return new this.ctor(b);
+  }, w.prototype.setup = function() {
+    for (var b = this.fullName, x = [], T = 0; T < /* initializes */
     this.fieldsArray.length; ++T)
-      O.push(this._fieldsArray[T].resolve().resolvedType);
+      x.push(this._fieldsArray[T].resolve().resolvedType);
     this.encode = m(this)({
       Writer: h,
-      types: O,
+      types: x,
       util: a
     }), this.decode = y(this)({
       Reader: c,
-      types: O,
+      types: x,
       util: a
-    }), this.verify = v(this)({
-      types: O,
+    }), this.verify = g(this)({
+      types: x,
       util: a
     }), this.fromObject = p.fromObject(this)({
-      types: O,
+      types: x,
       util: a
     }), this.toObject = p.toObject(this)({
-      types: O,
+      types: x,
       util: a
     });
-    var E = g[w];
+    var E = v[b];
     if (E) {
       var R = Object.create(this);
       R.fromObject = this.fromObject, this.fromObject = E.fromObject.bind(R), R.toObject = this.toObject, this.toObject = E.toObject.bind(R);
     }
     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.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.d = function(w) {
+  }, w.prototype.encode = function(b, x) {
+    return this.setup().encode(b, x);
+  }, w.prototype.encodeDelimited = function(b, x) {
+    return this.encode(b, x && x.len ? x.fork() : x).ldelim();
+  }, w.prototype.decode = function(b, x) {
+    return this.setup().decode(b, x);
+  }, w.prototype.decodeDelimited = function(b) {
+    return b instanceof c || (b = c.create(b)), this.decode(b, b.uint32());
+  }, w.prototype.verify = function(b) {
+    return this.setup().verify(b);
+  }, w.prototype.fromObject = function(b) {
+    return this.setup().fromObject(b);
+  }, w.prototype.toObject = function(b, x) {
+    return this.setup().toObject(b, x);
+  }, w.d = function(b) {
     return function(T) {
-      a.decorateType(T, w);
+      a.decorateType(T, b);
     };
   }, type;
 }
@@ -3501,77 +3501,77 @@ function requireRoot() {
   var s = requireNamespace();
   ((h.prototype = Object.create(s.prototype)).constructor = h).className = "Root";
   var i = requireField(), r = require_enum(), o = requireOneof(), d = requireUtil(), u, l, c;
-  function h(v) {
-    s.call(this, "", v), this.deferred = [], this.files = [];
+  function h(g) {
+    s.call(this, "", g), this.deferred = [], this.files = [];
   }
-  h.fromJSON = function(p, g) {
-    return g || (g = new h()), p.options && g.setOptions(p.options), g.addJSON(p.nested);
+  h.fromJSON = function(p, v) {
+    return v || (v = new h()), p.options && v.setOptions(p.options), v.addJSON(p.nested);
   }, h.prototype.resolvePath = d.path.resolve, h.prototype.fetch = d.fetch;
   function a() {
   }
-  h.prototype.load = function v(p, g, b) {
-    typeof g == "function" && (b = g, g = void 0);
+  h.prototype.load = function g(p, v, w) {
+    typeof v == "function" && (w = v, v = void 0);
     var _ = this;
-    if (!b) return d.asPromise(v, _, p, g);
-    var x = b === a;
-    function w(k, A) {
-      if (b) {
-        if (x) throw k;
-        var I = b;
-        b = null, I(k, A);
+    if (!w) return d.asPromise(g, _, p, v);
+    var O = w === a;
+    function b(D, A) {
+      if (w) {
+        if (O) throw D;
+        var I = w;
+        w = null, I(D, A);
       }
     }
-    function O(k) {
-      var A = k.lastIndexOf("google/protobuf/");
+    function x(D) {
+      var A = D.lastIndexOf("google/protobuf/");
       if (A > -1) {
-        var I = k.substring(A);
+        var I = D.substring(A);
         if (I in c) return I;
       }
       return null;
     }
-    function T(k, A) {
+    function T(D, A) {
       try {
         if (d.isString(A) && A.charAt(0) === "{" && (A = JSON.parse(A)), !d.isString(A)) _.setOptions(A.options).addJSON(A.nested);
         else {
-          l.filename = k;
-          var I = l(A, _, g), $, F = 0;
+          l.filename = D;
+          var I = l(A, _, v), B, F = 0;
           if (I.imports)
             for (; F < I.imports.length; ++F)
-              ($ = O(I.imports[F]) || _.resolvePath(k, I.imports[F])) && E($);
+              (B = x(I.imports[F]) || _.resolvePath(D, I.imports[F])) && E(B);
           if (I.weakImports)
             for (F = 0; F < I.weakImports.length; ++F)
-              ($ = O(I.weakImports[F]) || _.resolvePath(k, I.weakImports[F])) && E($, !0);
+              (B = x(I.weakImports[F]) || _.resolvePath(D, I.weakImports[F])) && E(B, !0);
         }
       } catch (q) {
-        w(q);
+        b(q);
       }
-      !x && !R && w(null, _);
+      !O && !R && b(null, _);
     }
-    function E(k, A) {
-      if (k = O(k) || k, !(_.files.indexOf(k) > -1)) {
-        if (_.files.push(k), k in c) {
-          x ? T(k, c[k]) : (++R, setTimeout(function() {
-            --R, T(k, c[k]);
+    function E(D, A) {
+      if (D = x(D) || D, !(_.files.indexOf(D) > -1)) {
+        if (_.files.push(D), D in c) {
+          O ? T(D, c[D]) : (++R, setTimeout(function() {
+            --R, T(D, c[D]);
           }));
           return;
         }
-        if (x) {
+        if (O) {
           var I;
           try {
-            I = d.fs.readFileSync(k).toString("utf8");
-          } catch ($) {
-            A || w($);
+            I = d.fs.readFileSync(D).toString("utf8");
+          } catch (B) {
+            A || b(B);
             return;
           }
-          T(k, I);
+          T(D, I);
         } else
-          ++R, _.fetch(k, function($, F) {
-            if (--R, !!b) {
-              if ($) {
-                A ? R || w(null, _) : w($);
+          ++R, _.fetch(D, function(B, F) {
+            if (--R, !!w) {
+              if (B) {
+                A ? R || b(null, _) : b(B);
                 return;
               }
-              T(k, F);
+              T(D, F);
             }
           });
       }
@@ -3580,11 +3580,11 @@ function requireRoot() {
     d.isString(p) && (p = [p]);
     for (var S = 0, P; S < p.length; ++S)
       (P = _.resolvePath("", p[S])) && E(P);
-    if (x) return _;
-    R || w(null, _);
-  }, h.prototype.loadSync = function(p, g) {
+    if (O) return _;
+    R || b(null, _);
+  }, h.prototype.loadSync = function(p, v) {
     if (!d.isNode) throw Error("not supported");
-    return this.load(p, g, a);
+    return this.load(p, v, a);
   }, h.prototype.resolveAll = function() {
     if (this.deferred.length)
       throw Error(
@@ -3595,10 +3595,10 @@ function requireRoot() {
     return s.prototype.resolveAll.call(this);
   };
   var m = /^[A-Z]/;
-  function y(v, p) {
-    var g = p.parent.lookup(p.extend);
-    if (g) {
-      var b = new i(
+  function y(g, p) {
+    var v = p.parent.lookup(p.extend);
+    if (v) {
+      var w = new i(
         p.fullName,
         p.id,
         p.type,
@@ -3606,7 +3606,7 @@ function requireRoot() {
         void 0,
         p.options
       );
-      return g.get(b.name) || (b.declaringField = p, p.extensionField = b, g.add(b)), !0;
+      return v.get(w.name) || (w.declaringField = p, p.extensionField = w, v.add(w)), !0;
     }
     return !1;
   }
@@ -3619,11 +3619,11 @@ function requireRoot() {
       m.test(p.name) && (p.parent[p.name] = p.values);
     else if (!(p instanceof o)) {
       if (p instanceof u)
-        for (var g = 0; g < this.deferred.length; )
-          y(this, this.deferred[g]) ? this.deferred.splice(g, 1) : ++g;
-      for (var b = 0; b < /* initializes */
-      p.nestedArray.length; ++b)
-        this._handleAdd(p._nestedArray[b]);
+        for (var v = 0; v < this.deferred.length; )
+          y(this, this.deferred[v]) ? this.deferred.splice(v, 1) : ++v;
+      for (var w = 0; w < /* initializes */
+      p.nestedArray.length; ++w)
+        this._handleAdd(p._nestedArray[w]);
       m.test(p.name) && (p.parent[p.name] = p);
     }
   }, h.prototype._handleRemove = function(p) {
@@ -3638,19 +3638,19 @@ function requireRoot() {
         )
           p.extensionField.parent.remove(p.extensionField), p.extensionField = null;
         else {
-          var g = this.deferred.indexOf(p);
-          g > -1 && this.deferred.splice(g, 1);
+          var v = this.deferred.indexOf(p);
+          v > -1 && this.deferred.splice(v, 1);
         }
     } else if (p instanceof r)
       m.test(p.name) && delete p.parent[p.name];
     else if (p instanceof s) {
-      for (var b = 0; b < /* initializes */
-      p.nestedArray.length; ++b)
-        this._handleRemove(p._nestedArray[b]);
+      for (var w = 0; w < /* initializes */
+      p.nestedArray.length; ++w)
+        this._handleRemove(p._nestedArray[w]);
       m.test(p.name) && delete p.parent[p.name];
     }
-  }, h._configure = function(v, p, g) {
-    u = v, l = p, c = g;
+  }, h._configure = function(g, p, v) {
+    u = g, l = p, c = v;
   }, root$1;
 }
 var hasRequiredUtil;
@@ -3660,14 +3660,14 @@ function requireUtil() {
   var s = util$2.exports = requireMinimal(), i = roots, r, o;
   s.codegen = codegen_1, s.fetch = fetch_1, s.path = path, s.fs = s.inquire("fs"), s.toArray = function(a) {
     if (a) {
-      for (var m = Object.keys(a), y = new Array(m.length), v = 0; v < m.length; ) y[v] = a[m[v++]];
+      for (var m = Object.keys(a), y = new Array(m.length), g = 0; g < m.length; ) y[g] = a[m[g++]];
       return y;
     }
     return [];
   }, s.toObject = function(a) {
     for (var m = {}, y = 0; y < a.length; ) {
-      var v = a[y++], p = a[y++];
-      p !== void 0 && (m[v] = p);
+      var g = a[y++], p = a[y++];
+      p !== void 0 && (m[g] = p);
     }
     return m;
   };
@@ -3711,21 +3711,21 @@ function requireUtil() {
       enumerable: !1
     }), m;
   }, s.setProperty = function(a, m, y) {
-    function v(p, g, b) {
-      var _ = g.shift();
+    function g(p, v, w) {
+      var _ = v.shift();
       if (_ === "__proto__" || _ === "prototype")
         return p;
-      if (g.length > 0)
-        p[_] = v(p[_] || {}, g, b);
+      if (v.length > 0)
+        p[_] = g(p[_] || {}, v, w);
       else {
-        var x = p[_];
-        x && (b = [].concat(x).concat(b)), p[_] = b;
+        var O = p[_];
+        O && (w = [].concat(O).concat(w)), p[_] = w;
       }
       return p;
     }
     if (typeof a != "object") throw TypeError("dst must be an object");
     if (!m) throw TypeError("path must be specified");
-    return m = m.split("."), v(a, m, y);
+    return m = m.split("."), g(a, m, y);
   }, Object.defineProperty(s, "decorateRoot", {
     get: function() {
       return i.decorated || (i.decorated = new (requireRoot())());
@@ -3892,7 +3892,7 @@ function requireEncoder() {
       /* initializes */
       u.fieldsArray.slice().sort(r.compareFieldsById)
     ), c = 0; c < a.length; ++c) {
-      var m = a[c].resolve(), y = u._fieldsArray.indexOf(m), v = m.resolvedType instanceof s ? "int32" : m.type, p = i.basic[v];
+      var m = a[c].resolve(), y = u._fieldsArray.indexOf(m), g = m.resolvedType instanceof s ? "int32" : m.type, p = i.basic[g];
       h = "m" + r.safeProp(m.name), m.map ? (l(
         "if(%s!=null&&Object.hasOwnProperty.call(m,%j)){",
         h,
@@ -3906,14 +3906,14 @@ function requireEncoder() {
         (m.id << 3 | 2) >>> 0,
         8 | i.mapKey[m.keyType],
         m.keyType
-      ), p === void 0 ? l("types[%i].encode(%s[ks[i]],w.uint32(18).fork()).ldelim().ldelim()", y, h) : l(".uint32(%i).%s(%s[ks[i]]).ldelim()", 16 | p, v, h), l("}")("}")) : m.repeated ? (l("if(%s!=null&&%s.length){", h, h), m.packed && i.packed[v] !== void 0 ? l("w.uint32(%i).fork()", (m.id << 3 | 2) >>> 0)(
+      ), p === void 0 ? l("types[%i].encode(%s[ks[i]],w.uint32(18).fork()).ldelim().ldelim()", y, h) : l(".uint32(%i).%s(%s[ks[i]]).ldelim()", 16 | p, g, h), l("}")("}")) : m.repeated ? (l("if(%s!=null&&%s.length){", h, h), m.packed && i.packed[g] !== void 0 ? l("w.uint32(%i).fork()", (m.id << 3 | 2) >>> 0)(
         "for(var i=0;i<%s.length;++i)",
         h
       )(
         "w.%s(%s[i])",
-        v,
+        g,
         h
-      )("w.ldelim()") : (l("for(var i=0;i<%s.length;++i)", h), p === void 0 ? o(l, m, y, h + "[i]") : l("w.uint32(%i).%s(%s[i])", (m.id << 3 | p) >>> 0, v, h)), l("}")) : (m.optional && l("if(%s!=null&&Object.hasOwnProperty.call(m,%j))", h, m.name), p === void 0 ? o(l, m, y, h) : l("w.uint32(%i).%s(%s)", (m.id << 3 | p) >>> 0, v, h));
+      )("w.ldelim()") : (l("for(var i=0;i<%s.length;++i)", h), p === void 0 ? o(l, m, y, h + "[i]") : l("w.uint32(%i).%s(%s[i])", (m.id << 3 | p) >>> 0, g, h)), l("}")) : (m.optional && l("if(%s!=null&&Object.hasOwnProperty.call(m,%j))", h, m.name), p === void 0 ? o(l, m, y, h) : l("w.uint32(%i).%s(%s)", (m.id << 3 | p) >>> 0, g, h));
     }
     return l("return w");
   }
@@ -3986,45 +3986,45 @@ function tokenize$1(s, i) {
   function y(T) {
     return s.charAt(T);
   }
-  function v(T, E, R) {
+  function g(T, E, R) {
     var S = {
       type: s.charAt(T++),
       lineEmpty: !1,
       leading: R
     }, P;
     i ? P = 2 : P = 3;
-    var k = T - P, A;
+    var D = T - P, A;
     do
-      if (--k < 0 || (A = s.charAt(k)) === `
+      if (--D < 0 || (A = s.charAt(D)) === `
 `) {
         S.lineEmpty = !0;
         break;
       }
     while (A === " " || A === "	");
-    for (var I = s.substring(T, E).split(setCommentSplitRe), $ = 0; $ < I.length; ++$)
-      I[$] = I[$].replace(i ? setCommentAltRe : setCommentRe, "").trim();
+    for (var I = s.substring(T, E).split(setCommentSplitRe), B = 0; B < I.length; ++B)
+      I[B] = I[B].replace(i ? setCommentAltRe : setCommentRe, "").trim();
     S.text = I.join(`
 `).trim(), l[d] = S, u = d;
   }
   function p(T) {
-    var E = g(T), R = s.substring(T, E), S = /^\s*\/\//.test(R);
+    var E = v(T), R = s.substring(T, E), S = /^\s*\/\//.test(R);
     return S;
   }
-  function g(T) {
+  function v(T) {
     for (var E = T; E < o && y(E) !== `
 `; )
       E++;
     return E;
   }
-  function b() {
+  function w() {
     if (c.length > 0) return c.shift();
     if (h) return m();
-    var T, E, R, S, P, k = r === 0;
+    var T, E, R, S, P, D = r === 0;
     do {
       if (r === o) return null;
       for (T = !1; whitespaceRe.test(R = y(r)); )
         if (R === `
-` && (k = !0, ++d), ++r === o) return null;
+` && (D = !0, ++d), ++r === o) return null;
       if (y(r) === "/") {
         if (++r === o)
           throw a("comment");
@@ -4033,18 +4033,18 @@ function tokenize$1(s, i) {
             if (S = r, P = !1, p(r - 1)) {
               P = !0;
               do
-                if (r = g(r), r === o || (r++, !k))
+                if (r = v(r), r === o || (r++, !D))
                   break;
               while (p(r));
             } else
-              r = Math.min(o, g(r) + 1);
-            P && (v(S, r, k), k = !0), d++, T = !0;
+              r = Math.min(o, v(r) + 1);
+            P && (g(S, r, D), D = !0), d++, T = !0;
           } else {
             for (P = y(S = r + 1) === "/"; y(++r) !== `
 `; )
               if (r === o)
                 return null;
-            ++r, P && (v(S, r - 1, k), k = !0), ++d, T = !0;
+            ++r, P && (g(S, r - 1, D), D = !0), ++d, T = !0;
           }
         else if ((R = y(r)) === "*") {
           S = r + 1, P = i || y(S) === "*";
@@ -4054,7 +4054,7 @@ function tokenize$1(s, i) {
               throw a("comment");
             E = R, R = y(r);
           } while (E !== "*" || R !== "/");
-          ++r, P && (v(S, r - 2, k), k = !0), T = !0;
+          ++r, P && (g(S, r - 2, D), D = !0), T = !0;
         } else
           return "/";
       }
@@ -4063,38 +4063,38 @@ function tokenize$1(s, i) {
     delimRe.lastIndex = 0;
     var I = delimRe.test(y(A++));
     if (!I) for (; A < o && !delimRe.test(y(A)); ) ++A;
-    var $ = s.substring(r, r = A);
-    return ($ === '"' || $ === "'") && (h = $), $;
+    var B = s.substring(r, r = A);
+    return (B === '"' || B === "'") && (h = B), B;
   }
   function _(T) {
     c.push(T);
   }
-  function x() {
+  function O() {
     if (!c.length) {
-      var T = b();
+      var T = w();
       if (T === null) return null;
       _(T);
     }
     return c[0];
   }
-  function w(T, E) {
-    var R = x(), S = R === T;
+  function b(T, E) {
+    var R = O(), S = R === T;
     if (S)
-      return b(), !0;
+      return w(), !0;
     if (!E) throw a("token '" + R + "', '" + T + "' expected");
     return !1;
   }
-  function O(T) {
+  function x(T) {
     var E = null, R;
-    return T === void 0 ? (R = l[d - 1], delete l[d - 1], R && (i || R.type === "*" || R.lineEmpty) && (E = R.leading ? R.text : null)) : (u < T && x(), R = l[T], delete l[T], R && !R.lineEmpty && (i || R.type === "/") && (E = R.leading ? null : R.text)), E;
+    return T === void 0 ? (R = l[d - 1], delete l[d - 1], R && (i || R.type === "*" || R.lineEmpty) && (E = R.leading ? R.text : null)) : (u < T && O(), R = l[T], delete l[T], R && !R.lineEmpty && (i || R.type === "/") && (E = R.leading ? null : R.text)), E;
   }
   return Object.defineProperty(
     {
-      next: b,
-      peek: x,
+      next: w,
+      peek: O,
       push: _,
-      skip: w,
-      cmnt: O
+      skip: b,
+      cmnt: x
     },
     "line",
     {
@@ -4112,21 +4112,21 @@ 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 o = r.preferTrailingComment || !1, d = tokenize(s, r.alternateCommentMode || !1), u = d.next, l = d.push, c = d.peek, h = d.skip, a = d.cmnt, m = !0, y, v, p, g, b = !1, _ = i, x = r.keepCase ? function(C) {
+  var o = r.preferTrailingComment || !1, d = tokenize(s, r.alternateCommentMode || !1), u = d.next, l = d.push, c = d.peek, h = d.skip, a = d.cmnt, m = !0, y, g, p, v, w = !1, _ = i, O = r.keepCase ? function(C) {
     return C;
   } : util.camelCase;
-  function w(C, D, N) {
-    var B = parse.filename;
+  function b(C, k, N) {
+    var $ = parse.filename;
     return N || (parse.filename = null), Error(
-      "illegal " + (D || "token") + " '" + C + "' (" + (B ? B + ", " : "") + "line " + d.line + ")"
+      "illegal " + (k || "token") + " '" + C + "' (" + ($ ? $ + ", " : "") + "line " + d.line + ")"
     );
   }
-  function O() {
-    var C = [], D;
+  function x() {
+    var C = [], k;
     do {
-      if ((D = u()) !== '"' && D !== "'") throw w(D);
-      C.push(u()), h(D), D = c();
-    } while (D === '"' || D === "'");
+      if ((k = u()) !== '"' && k !== "'") throw b(k);
+      C.push(u()), h(k), k = c();
+    } while (k === '"' || k === "'");
     return C.join("");
   }
   function T() {
@@ -4134,7 +4134,7 @@ function parse(s, i, r) {
     switch (C) {
       case "'":
       case '"':
-        return l(C), O();
+        return l(C), x();
       case "true":
       case "TRUE":
         return !0;
@@ -4150,32 +4150,32 @@ function parse(s, i, r) {
       );
     } catch {
       if (typeRefRe.test(C)) return C;
-      throw w(C, "value");
+      throw b(C, "value");
     }
   }
-  function E(C, D) {
-    var N, B;
+  function E(C, k) {
+    var N, $;
     do
-      D && ((N = c()) === '"' || N === "'") ? C.push(O()) : C.push([B = S(u()), h("to", !0) ? S(u()) : B]);
+      k && ((N = c()) === '"' || N === "'") ? C.push(x()) : C.push([$ = S(u()), h("to", !0) ? S(u()) : $]);
     while (h(",", !0));
     var M = {
       options: void 0
     };
     M.setOption = function(L, z) {
       this.options === void 0 && (this.options = {}), this.options[L] = z;
-    }, $(
+    }, B(
       M,
       function(z) {
         if (z === "option")
-          Z(M, z), h(";");
-        else throw w(z);
+          W(M, z), h(";");
+        else throw b(z);
       },
       function() {
-        Y(M);
+        te(M);
       }
     );
   }
-  function R(C, D) {
+  function R(C, k) {
     var N = 1;
     switch (C.charAt(0) === "-" && (N = -1, C = C.substring(1)), C) {
       case "inf":
@@ -4194,9 +4194,9 @@ function parse(s, i, r) {
     if (base16Re.test(C)) return N * parseInt(C, 16);
     if (base8Re.test(C)) return N * parseInt(C, 8);
     if (numberRe.test(C)) return N * parseFloat(C);
-    throw w(C, "number", D);
+    throw b(C, "number", k);
   }
-  function S(C, D) {
+  function S(C, k) {
     switch (C) {
       case "max":
       case "MAX":
@@ -4205,76 +4205,76 @@ function parse(s, i, r) {
       case "0":
         return 0;
     }
-    if (!D && C.charAt(0) === "-") throw w(C, "id");
+    if (!k && C.charAt(0) === "-") throw b(C, "id");
     if (base10NegRe.test(C)) return parseInt(C, 10);
     if (base16NegRe.test(C)) return parseInt(C, 16);
     if (base8NegRe.test(C)) return parseInt(C, 8);
-    throw w(C, "id");
+    throw b(C, "id");
   }
   function P() {
-    if (y !== void 0) throw w("package");
-    if (y = u(), !typeRefRe.test(y)) throw w(y, "name");
+    if (y !== void 0) throw b("package");
+    if (y = u(), !typeRefRe.test(y)) throw b(y, "name");
     _ = _.define(y), h(";");
   }
-  function k() {
-    var C = c(), D;
+  function D() {
+    var C = c(), k;
     switch (C) {
       case "weak":
-        D = p || (p = []), u();
+        k = p || (p = []), u();
         break;
       case "public":
         u();
       default:
-        D = v || (v = []);
+        k = g || (g = []);
         break;
     }
-    C = O(), h(";"), D.push(C);
+    C = x(), h(";"), k.push(C);
   }
   function A() {
-    if (h("="), g = O(), b = g === "proto3", !b && g !== "proto2") throw w(g, "syntax");
-    i.setOption("syntax", g), h(";");
+    if (h("="), v = x(), w = v === "proto3", !w && v !== "proto2") throw b(v, "syntax");
+    i.setOption("syntax", v), h(";");
   }
-  function I(C, D) {
-    switch (D) {
+  function I(C, k) {
+    switch (k) {
       case "option":
-        return Z(C, D), h(";"), !0;
+        return W(C, k), h(";"), !0;
       case "message":
-        return F(C, D), !0;
+        return F(C, k), !0;
       case "enum":
-        return K(C, D), !0;
+        return U(C, k), !0;
       case "service":
-        return se(C, D), !0;
+        return se(C, k), !0;
       case "extend":
-        return oe(C, D), !0;
+        return oe(C, k), !0;
     }
     return !1;
   }
-  function $(C, D, N) {
-    var B = d.line;
+  function B(C, k, N) {
+    var $ = d.line;
     if (C && (typeof C.comment != "string" && (C.comment = a()), C.filename = parse.filename), h("{", !0)) {
-      for (var M; (M = u()) !== "}"; ) D(M);
+      for (var M; (M = u()) !== "}"; ) k(M);
       h(";", !0);
     } else
-      N && N(), h(";"), C && (typeof C.comment != "string" || o) && (C.comment = a(B) || C.comment);
+      N && N(), h(";"), C && (typeof C.comment != "string" || o) && (C.comment = a($) || C.comment);
   }
-  function F(C, D) {
-    if (!nameRe.test(D = u())) throw w(D, "type name");
-    var N = new Type(D);
-    $(N, function(M) {
+  function F(C, k) {
+    if (!nameRe.test(k = u())) throw b(k, "type name");
+    var N = new Type(k);
+    B(N, function(M) {
       if (!I(N, M))
         switch (M) {
           case "map":
-            J(N);
+            G(N);
             break;
           case "required":
           case "repeated":
             q(N, M);
             break;
           case "optional":
-            b ? q(N, "proto3_optional") : q(N, "optional");
+            w ? q(N, "proto3_optional") : q(N, "optional");
             break;
           case "oneof":
-            U(N, M);
+            X(N, M);
             break;
           case "extensions":
             E(N.extensions || (N.extensions = []));
@@ -4283,233 +4283,233 @@ function parse(s, i, r) {
             E(N.reserved || (N.reserved = []), !0);
             break;
           default:
-            if (!b || !typeRefRe.test(M)) throw w(M);
+            if (!w || !typeRefRe.test(M)) throw b(M);
             l(M), q(N, "optional");
             break;
         }
     }), C.add(N);
   }
-  function q(C, D, N) {
-    var B = u();
-    if (B === "group") {
-      V(C, D);
+  function q(C, k, N) {
+    var $ = u();
+    if ($ === "group") {
+      V(C, k);
       return;
     }
-    for (; B.endsWith(".") || c().startsWith("."); )
-      B += u();
-    if (!typeRefRe.test(B)) throw w(B, "type");
+    for (; $.endsWith(".") || c().startsWith("."); )
+      $ += u();
+    if (!typeRefRe.test($)) throw b($, "type");
     var M = u();
-    if (!nameRe.test(M)) throw w(M, "name");
-    M = x(M), h("=");
-    var L = new Field(M, S(u()), B, D, N);
-    if ($(
+    if (!nameRe.test(M)) throw b(M, "name");
+    M = O(M), h("=");
+    var L = new Field(M, S(u()), $, k, N);
+    if (B(
       L,
-      function(W) {
-        if (W === "option")
-          Z(L, W), h(";");
-        else throw w(W);
+      function(Z) {
+        if (Z === "option")
+          W(L, Z), h(";");
+        else throw b(Z);
       },
       function() {
-        Y(L);
+        te(L);
       }
-    ), D === "proto3_optional") {
+    ), k === "proto3_optional") {
       var z = new OneOf("_" + M);
       L.setOption("proto3_optional", !0), z.add(L), C.add(z);
     } else
       C.add(L);
-    !b && L.repeated && (types.packed[B] !== void 0 || types.basic[B] === void 0) && L.setOption(
+    !w && L.repeated && (types.packed[$] !== void 0 || types.basic[$] === void 0) && L.setOption(
       "packed",
       !1,
       /* ifNotSet */
       !0
     );
   }
-  function V(C, D) {
+  function V(C, k) {
     var N = u();
-    if (!nameRe.test(N)) throw w(N, "name");
-    var B = util.lcFirst(N);
-    N === B && (N = util.ucFirst(N)), h("=");
+    if (!nameRe.test(N)) throw b(N, "name");
+    var $ = util.lcFirst(N);
+    N === $ && (N = util.ucFirst(N)), h("=");
     var M = S(u()), L = new Type(N);
     L.group = !0;
-    var z = new Field(B, M, N, D);
-    z.filename = parse.filename, $(L, function(W) {
-      switch (W) {
+    var z = new Field($, M, N, k);
+    z.filename = parse.filename, B(L, function(Z) {
+      switch (Z) {
         case "option":
-          Z(L, W), h(";");
+          W(L, Z), h(";");
           break;
         case "required":
         case "repeated":
-          q(L, W);
+          q(L, Z);
           break;
         case "optional":
-          b ? q(L, "proto3_optional") : q(L, "optional");
+          w ? q(L, "proto3_optional") : q(L, "optional");
           break;
         case "message":
-          F(L, W);
+          F(L, Z);
           break;
         case "enum":
-          K(L, W);
+          U(L, Z);
           break;
         /* istanbul ignore next */
         default:
-          throw w(W);
+          throw b(Z);
       }
     }), C.add(L).add(z);
   }
-  function J(C) {
+  function G(C) {
     h("<");
-    var D = u();
-    if (types.mapKey[D] === void 0) throw w(D, "type");
+    var k = u();
+    if (types.mapKey[k] === void 0) throw b(k, "type");
     h(",");
     var N = u();
-    if (!typeRefRe.test(N)) throw w(N, "type");
+    if (!typeRefRe.test(N)) throw b(N, "type");
     h(">");
-    var B = u();
-    if (!nameRe.test(B)) throw w(B, "name");
+    var $ = u();
+    if (!nameRe.test($)) throw b($, "name");
     h("=");
-    var M = new MapField(x(B), S(u()), D, N);
-    $(
+    var M = new MapField(O($), S(u()), k, N);
+    B(
       M,
       function(z) {
         if (z === "option")
-          Z(M, z), h(";");
-        else throw w(z);
+          W(M, z), h(";");
+        else throw b(z);
       },
       function() {
-        Y(M);
+        te(M);
       }
     ), C.add(M);
   }
-  function U(C, D) {
-    if (!nameRe.test(D = u())) throw w(D, "name");
-    var N = new OneOf(x(D));
-    $(N, function(M) {
-      M === "option" ? (Z(N, M), h(";")) : (l(M), q(N, "optional"));
+  function X(C, k) {
+    if (!nameRe.test(k = u())) throw b(k, "name");
+    var N = new OneOf(O(k));
+    B(N, function(M) {
+      M === "option" ? (W(N, M), h(";")) : (l(M), q(N, "optional"));
     }), C.add(N);
   }
-  function K(C, D) {
-    if (!nameRe.test(D = u())) throw w(D, "name");
-    var N = new Enum(D);
-    $(N, function(M) {
+  function U(C, k) {
+    if (!nameRe.test(k = u())) throw b(k, "name");
+    var N = new Enum(k);
+    B(N, function(M) {
       switch (M) {
         case "option":
-          Z(N, M), h(";");
+          W(N, M), h(";");
           break;
         case "reserved":
           E(N.reserved || (N.reserved = []), !0);
           break;
         default:
-          ie(N, M);
+          ee(N, M);
       }
     }), C.add(N);
   }
-  function ie(C, D) {
-    if (!nameRe.test(D)) throw w(D, "name");
+  function ee(C, k) {
+    if (!nameRe.test(k)) throw b(k, "name");
     h("=");
-    var N = S(u(), !0), B = {
+    var N = S(u(), !0), $ = {
       options: void 0
     };
-    B.setOption = function(M, L) {
+    $.setOption = function(M, L) {
       this.options === void 0 && (this.options = {}), this.options[M] = L;
-    }, $(
-      B,
+    }, B(
+      $,
       function(L) {
         if (L === "option")
-          Z(B, L), h(";");
-        else throw w(L);
+          W($, L), h(";");
+        else throw b(L);
       },
       function() {
-        Y(B);
+        te($);
       }
-    ), C.add(D, N, B.comment, B.options);
+    ), C.add(k, N, $.comment, $.options);
   }
-  function Z(C, D) {
+  function W(C, k) {
     var N = h("(", !0);
-    if (!typeRefRe.test(D = u())) throw w(D, "name");
-    var B = D, M = B, L;
-    N && (h(")"), B = "(" + B + ")", M = B, D = c(), fqTypeRefRe.test(D) && (L = D.slice(1), B += D, u())), h("=");
-    var z = re(C, B);
+    if (!typeRefRe.test(k = u())) throw b(k, "name");
+    var $ = k, M = $, L;
+    N && (h(")"), $ = "(" + $ + ")", M = $, k = c(), fqTypeRefRe.test(k) && (L = k.slice(1), $ += k, u())), h("=");
+    var z = J(C, $);
     ne(C, M, z, L);
   }
-  function re(C, D) {
+  function J(C, k) {
     if (h("{", !0)) {
       for (var N = {}; !h("}", !0); ) {
         if (!nameRe.test(H = u()))
-          throw w(H, "name");
+          throw b(H, "name");
         if (H === null)
-          throw w(H, "end of input");
-        var B, M = H;
-        if (h(":", !0), c() === "{") B = re(C, D + "." + H);
+          throw b(H, "end of input");
+        var $, M = H;
+        if (h(":", !0), c() === "{") $ = J(C, k + "." + H);
         else if (c() === "[") {
-          B = [];
+          $ = [];
           var L;
           if (h("[", !0)) {
             do
-              L = T(), B.push(L);
+              L = T(), $.push(L);
             while (h(",", !0));
-            h("]"), typeof L < "u" && ee(C, D + "." + H, L);
+            h("]"), typeof L < "u" && Q(C, k + "." + H, L);
           }
         } else
-          B = T(), ee(C, D + "." + H, B);
+          $ = T(), Q(C, k + "." + H, $);
         var z = N[M];
-        z && (B = [].concat(z).concat(B)), N[M] = B, h(",", !0), h(";", !0);
+        z && ($ = [].concat(z).concat($)), N[M] = $, h(",", !0), h(";", !0);
       }
       return N;
     }
-    var G = T();
-    return ee(C, D, G), G;
+    var K = T();
+    return Q(C, k, K), K;
   }
-  function ee(C, D, N) {
-    C.setOption && C.setOption(D, N);
+  function Q(C, k, N) {
+    C.setOption && C.setOption(k, N);
   }
-  function ne(C, D, N, B) {
-    C.setParsedOption && C.setParsedOption(D, N, B);
+  function ne(C, k, N, $) {
+    C.setParsedOption && C.setParsedOption(k, N, $);
   }
-  function Y(C) {
+  function te(C) {
     if (h("[", !0)) {
       do
-        Z(C, "option");
+        W(C, "option");
       while (h(",", !0));
       h("]");
     }
     return C;
   }
-  function se(C, D) {
-    if (!nameRe.test(D = u())) throw w(D, "service name");
-    var N = new Service(D);
-    $(N, function(M) {
+  function se(C, k) {
+    if (!nameRe.test(k = u())) throw b(k, "service name");
+    var N = new Service(k);
+    B(N, function(M) {
       if (!I(N, M))
         if (M === "rpc") ae(N, M);
-        else throw w(M);
+        else throw b(M);
     }), C.add(N);
   }
-  function ae(C, D) {
-    var N = a(), B = D;
-    if (!nameRe.test(D = u())) throw w(D, "name");
-    var M = D, L, z, G, W;
-    if (h("("), h("stream", !0) && (z = !0), !typeRefRe.test(D = u()) || (L = D, h(")"), h("returns"), h("("), h("stream", !0) && (W = !0), !typeRefRe.test(D = u()))) throw w(D);
-    G = D, h(")");
-    var Q = new Method(M, B, L, G, z, W);
-    Q.comment = N, $(Q, function(te) {
-      if (te === "option")
-        Z(Q, te), h(";");
-      else throw w(te);
-    }), C.add(Q);
-  }
-  function oe(C, D) {
-    if (!typeRefRe.test(D = u())) throw w(D, "reference");
-    var N = D;
-    $(null, function(M) {
+  function ae(C, k) {
+    var N = a(), $ = k;
+    if (!nameRe.test(k = u())) throw b(k, "name");
+    var M = k, L, z, K, Z;
+    if (h("("), h("stream", !0) && (z = !0), !typeRefRe.test(k = u()) || (L = k, h(")"), h("returns"), h("("), h("stream", !0) && (Z = !0), !typeRefRe.test(k = u()))) throw b(k);
+    K = k, h(")");
+    var re = new Method(M, $, L, K, z, Z);
+    re.comment = N, B(re, function(ie) {
+      if (ie === "option")
+        W(re, ie), h(";");
+      else throw b(ie);
+    }), C.add(re);
+  }
+  function oe(C, k) {
+    if (!typeRefRe.test(k = u())) throw b(k, "reference");
+    var N = k;
+    B(null, function(M) {
       switch (M) {
         case "required":
         case "repeated":
           q(C, M, N);
           break;
         case "optional":
-          b ? q(C, "proto3_optional", N) : q(C, "optional", N);
+          w ? q(C, "proto3_optional", N) : q(C, "optional", N);
           break;
         default:
-          if (!b || !typeRefRe.test(M)) throw w(M);
+          if (!w || !typeRefRe.test(M)) throw b(M);
           l(M), q(C, "optional", N);
           break;
       }
@@ -4518,32 +4518,32 @@ function parse(s, i, r) {
   for (var H; (H = u()) !== null; )
     switch (H) {
       case "package":
-        if (!m) throw w(H);
+        if (!m) throw b(H);
         P();
         break;
       case "import":
-        if (!m) throw w(H);
-        k();
+        if (!m) throw b(H);
+        D();
         break;
       case "syntax":
-        if (!m) throw w(H);
+        if (!m) throw b(H);
         A();
         break;
       case "option":
-        Z(_, H), h(";");
+        W(_, H), h(";");
         break;
       default:
         if (I(_, H)) {
           m = !1;
           continue;
         }
-        throw w(H);
+        throw b(H);
     }
   return parse.filename = null, {
     package: y,
-    imports: v,
+    imports: g,
     weakImports: p,
-    syntax: g,
+    syntax: v,
     root: i
   };
 }
@@ -5337,51 +5337,51 @@ 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 o, d, u, l, c, h, a = 0, m = !1, y = !1, v = !0;
+  var o, d, u, l, c, h, a = 0, m = !1, y = !1, g = !0;
   if (typeof s != "function")
     throw new TypeError(FUNC_ERROR_TEXT);
-  i = toNumber(i) || 0, isObject(r) && (m = !!r.leading, y = "maxWait" in r, u = y ? nativeMax(toNumber(r.maxWait) || 0, i) : u, v = "trailing" in r ? !!r.trailing : v);
+  i = toNumber(i) || 0, isObject(r) && (m = !!r.leading, y = "maxWait" in r, u = y ? nativeMax(toNumber(r.maxWait) || 0, i) : u, g = "trailing" in r ? !!r.trailing : g);
   function p(R) {
     var S = o, P = d;
     return o = d = void 0, a = R, l = s.apply(P, S), l;
   }
-  function g(R) {
-    return a = R, c = setTimeout(x, i), m ? p(R) : l;
+  function v(R) {
+    return a = R, c = setTimeout(O, i), m ? p(R) : l;
   }
-  function b(R) {
-    var S = R - h, P = R - a, k = i - S;
-    return y ? nativeMin(k, u - P) : k;
+  function w(R) {
+    var S = R - h, P = R - a, D = i - S;
+    return y ? nativeMin(D, u - P) : D;
   }
   function _(R) {
     var S = R - h, P = R - a;
     return h === void 0 || S >= i || S < 0 || y && P >= u;
   }
-  function x() {
+  function O() {
     var R = now();
     if (_(R))
-      return w(R);
-    c = setTimeout(x, b(R));
+      return b(R);
+    c = setTimeout(O, w(R));
   }
-  function w(R) {
-    return c = void 0, v && o ? p(R) : (o = d = void 0, l);
+  function b(R) {
+    return c = void 0, g && o ? p(R) : (o = d = void 0, l);
   }
-  function O() {
+  function x() {
     c !== void 0 && clearTimeout(c), a = 0, o = h = d = c = void 0;
   }
   function T() {
-    return c === void 0 ? l : w(now());
+    return c === void 0 ? l : b(now());
   }
   function E() {
     var R = now(), S = _(R);
     if (o = arguments, d = this, h = R, S) {
       if (c === void 0)
-        return g(h);
+        return v(h);
       if (y)
-        return clearTimeout(c), c = setTimeout(x, i), p(h);
+        return clearTimeout(c), c = setTimeout(O, i), p(h);
     }
-    return c === void 0 && (c = setTimeout(x, i)), l;
+    return c === void 0 && (c = setTimeout(O, i)), l;
   }
-  return E.cancel = O, E.flush = T, E;
+  return E.cancel = x, E.flush = T, E;
 }
 var objectProto = Object.prototype, hasOwnProperty = objectProto.hasOwnProperty, defaults = baseRest(function(s, i) {
   s = Object(s);
@@ -5406,11 +5406,11 @@ function requireEventemitter3() {
     function d(h, a, m) {
       this.fn = h, this.context = a, this.once = m || !1;
     }
-    function u(h, a, m, y, v) {
+    function u(h, a, m, y, g) {
       if (typeof m != "function")
         throw new TypeError("The listener must be a function");
-      var p = new d(m, y || h, v), g = r ? r + a : a;
-      return h._events[g] ? h._events[g].fn ? h._events[g] = [h._events[g], p] : h._events[g].push(p) : (h._events[g] = p, h._eventsCount++), h;
+      var p = new d(m, y || h, g), v = r ? r + a : a;
+      return h._events[v] ? h._events[v].fn ? h._events[v] = [h._events[v], p] : h._events[v].push(p) : (h._events[v] = p, h._eventsCount++), h;
     }
     function l(h, a) {
       --h._eventsCount === 0 ? h._events = new o() : delete h._events[a];
@@ -5428,18 +5428,18 @@ function requireEventemitter3() {
       var m = r ? r + a : a, y = this._events[m];
       if (!y) return [];
       if (y.fn) return [y.fn];
-      for (var v = 0, p = y.length, g = new Array(p); v < p; v++)
-        g[v] = y[v].fn;
-      return g;
+      for (var g = 0, p = y.length, v = new Array(p); g < p; g++)
+        v[g] = y[g].fn;
+      return v;
     }, c.prototype.listenerCount = function(a) {
       var m = r ? r + a : a, y = this._events[m];
       return y ? y.fn ? 1 : y.length : 0;
-    }, c.prototype.emit = function(a, m, y, v, p, g) {
-      var b = r ? r + a : a;
-      if (!this._events[b]) return !1;
-      var _ = this._events[b], x = arguments.length, w, O;
+    }, c.prototype.emit = function(a, m, y, g, p, v) {
+      var w = r ? r + a : a;
+      if (!this._events[w]) return !1;
+      var _ = this._events[w], O = arguments.length, b, x;
       if (_.fn) {
-        switch (_.once && this.removeListener(a, _.fn, void 0, !0), x) {
+        switch (_.once && this.removeListener(a, _.fn, void 0, !0), O) {
           case 1:
             return _.fn.call(_.context), !0;
           case 2:
@@ -5447,35 +5447,35 @@ function requireEventemitter3() {
           case 3:
             return _.fn.call(_.context, m, y), !0;
           case 4:
-            return _.fn.call(_.context, m, y, v), !0;
+            return _.fn.call(_.context, m, y, g), !0;
           case 5:
-            return _.fn.call(_.context, m, y, v, p), !0;
+            return _.fn.call(_.context, m, y, g, p), !0;
           case 6:
-            return _.fn.call(_.context, m, y, v, p, g), !0;
+            return _.fn.call(_.context, m, y, g, p, v), !0;
         }
-        for (O = 1, w = new Array(x - 1); O < x; O++)
-          w[O - 1] = arguments[O];
-        _.fn.apply(_.context, w);
+        for (x = 1, b = new Array(O - 1); x < O; x++)
+          b[x - 1] = arguments[x];
+        _.fn.apply(_.context, b);
       } else {
         var T = _.length, E;
-        for (O = 0; O < T; O++)
-          switch (_[O].once && this.removeListener(a, _[O].fn, void 0, !0), x) {
+        for (x = 0; x < T; x++)
+          switch (_[x].once && this.removeListener(a, _[x].fn, void 0, !0), O) {
             case 1:
-              _[O].fn.call(_[O].context);
+              _[x].fn.call(_[x].context);
               break;
             case 2:
-              _[O].fn.call(_[O].context, m);
+              _[x].fn.call(_[x].context, m);
               break;
             case 3:
-              _[O].fn.call(_[O].context, m, y);
+              _[x].fn.call(_[x].context, m, y);
               break;
             case 4:
-              _[O].fn.call(_[O].context, m, y, v);
+              _[x].fn.call(_[x].context, m, y, g);
               break;
             default:
-              if (!w) for (E = 1, w = new Array(x - 1); E < x; E++)
-                w[E - 1] = arguments[E];
-              _[O].fn.apply(_[O].context, w);
+              if (!b) for (E = 1, b = new Array(O - 1); E < O; E++)
+                b[E - 1] = arguments[E];
+              _[x].fn.apply(_[x].context, b);
           }
       }
       return !0;
@@ -5483,17 +5483,17 @@ function requireEventemitter3() {
       return u(this, a, m, y, !1);
     }, c.prototype.once = function(a, m, y) {
       return u(this, a, m, y, !0);
-    }, c.prototype.removeListener = function(a, m, y, v) {
+    }, c.prototype.removeListener = function(a, m, y, g) {
       var p = r ? r + a : a;
       if (!this._events[p]) return this;
       if (!m)
         return l(this, p), this;
-      var g = this._events[p];
-      if (g.fn)
-        g.fn === m && (!v || g.once) && (!y || g.context === y) && l(this, p);
+      var v = this._events[p];
+      if (v.fn)
+        v.fn === m && (!g || v.once) && (!y || v.context === y) && l(this, p);
       else {
-        for (var b = 0, _ = [], x = g.length; b < x; b++)
-          (g[b].fn !== m || v && !g[b].once || y && g[b].context !== y) && _.push(g[b]);
+        for (var w = 0, _ = [], O = v.length; w < O; w++)
+          (v[w].fn !== m || g && !v[w].once || y && v[w].context !== y) && _.push(v[w]);
         _.length ? this._events[p] = _.length === 1 ? _[0] : _ : l(this, p);
       }
       return this;
@@ -5619,10 +5619,10 @@ const createShipIconUrl = memoize(
     C${i / 2 + o.x} ${o.y - h - a} ${2 + o.x} ${-r + o.y} ${c}
     C${-2 + o.x} ${-r + o.y} ${-i / 2 + o.x} ${o.y - h - a} ${-i / 2 + o.x} ${-h + o.y}
     V${-3 + o.y}
-    C${u} ${u} ${l}`, y = Math.max(Math.abs(i / 2 + o.x), Math.abs(-i / 2 + o.x)), v = Math.max(
+    C${u} ${u} ${l}`, y = Math.max(Math.abs(i / 2 + o.x), Math.abs(-i / 2 + o.x)), g = Math.max(
       Math.abs(-r + o.y + (s.isMoving ? -5 : 0)),
       Math.abs(o.y + (s.isMoving ? 146 / 124 * i : 0))
-    ), p = [-y * 1.2, -v, 2 * y * 1.2, 2 * v], g = { x: 2 * 1.2 * y / i, y: 2 * v / r }, b = `<?xml version="1.0" encoding="UTF-8"?>
+    ), p = [-y * 1.2, -g, 2 * y * 1.2, 2 * g], v = { x: 2 * 1.2 * y / i, y: 2 * g / r }, w = `<?xml version="1.0" encoding="UTF-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="${p.join(" ")}">
   <defs>
     <style>
@@ -5653,7 +5653,7 @@ const createShipIconUrl = memoize(
   </g>
   <image id="img_1" width="${i}" height="${146 / 124 * i}" transform="translate(${-i / 2 + o.x} ${o.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: p, scale: g };
+    return { url: URL.createObjectURL(new Blob([w], { type: "image/svg+xml" })), viewBox: p, scale: v };
   },
   (s) => `${s.color},${s.isMoving},${s.designBeam ?? 0},${s.designLength ?? 0},${s.aisFromBow ?? 0},${s.aisFromCenter ?? 0}`
 ), shipTypeColorMap = /* @__PURE__ */ new Map([
@@ -5727,18 +5727,18 @@ function createRoundedRectImage({
   padding: h = 6,
   radius: a = 5
 } = {}) {
-  const m = Math.max(0, s.length * c * 0.6 + h * 2), y = c * 1.6, v = 2, p = Math.ceil(o / 2) + 1, g = m + p * 2, b = y + p * 2, _ = document.createElement("canvas");
-  _.width = Math.round(g * v), _.height = Math.round(b * v), _.style.width = `${g}px`, _.style.height = `${b}px`;
-  const x = _.getContext("2d");
-  if (!x) throw new Error("无法获取2D绘图上下文");
-  x.scale(v, v), x.clearRect(0, 0, g, b), x.lineJoin = "round", x.lineCap = "round";
-  const w = p, O = p, T = g - p, E = b - p, R = T - w, S = E - O, P = Math.min(a, Math.min(R, S) / 2);
-  x.beginPath(), x.moveTo(w + P, O), x.lineTo(T - P, O), x.quadraticCurveTo(T, O, T, O + P), x.lineTo(T, E - P), x.quadraticCurveTo(T, E, T - P, E), x.lineTo(w + P, E), x.quadraticCurveTo(w, E, w, E - P), x.lineTo(w, O + P), x.quadraticCurveTo(w, O, w + P, O), x.closePath(), i && i !== "transparent" && (x.fillStyle = i, x.fill()), x.lineWidth = o, x.strokeStyle = r, x.stroke();
-  const k = Math.max(0, m - h * 2);
+  const m = Math.max(0, s.length * c * 0.6 + h * 2), y = c * 1.6, g = 2, p = Math.ceil(o / 2) + 1, v = m + p * 2, w = y + p * 2, _ = document.createElement("canvas");
+  _.width = Math.round(v * g), _.height = Math.round(w * g), _.style.width = `${v}px`, _.style.height = `${w}px`;
+  const O = _.getContext("2d");
+  if (!O) throw new Error("无法获取2D绘图上下文");
+  O.scale(g, g), O.clearRect(0, 0, v, w), O.lineJoin = "round", O.lineCap = "round";
+  const b = p, x = p, T = v - p, E = w - p, R = T - b, S = E - x, P = Math.min(a, Math.min(R, S) / 2);
+  O.beginPath(), O.moveTo(b + P, x), O.lineTo(T - P, x), O.quadraticCurveTo(T, x, T, x + P), O.lineTo(T, E - P), O.quadraticCurveTo(T, E, T - P, E), O.lineTo(b + P, E), O.quadraticCurveTo(b, E, b, E - P), O.lineTo(b, x + P), O.quadraticCurveTo(b, x, b + P, x), O.closePath(), i && i !== "transparent" && (O.fillStyle = i, O.fill()), O.lineWidth = o, O.strokeStyle = r, O.stroke();
+  const D = Math.max(0, m - h * 2);
   let A = c;
-  for (x.fillStyle = d, x.textAlign = "center", x.textBaseline = "middle", x.font = `${l} ${A}px ${u}`; x.measureText(s).width > k && A > 10; )
-    A -= 1, x.font = `${l} ${A}px ${u}`;
-  return x.fillText(s, g / 2, b / 2 + 1), _;
+  for (O.fillStyle = d, O.textAlign = "center", O.textBaseline = "middle", O.font = `${l} ${A}px ${u}`; O.measureText(s).width > D && A > 10; )
+    A -= 1, O.font = `${l} ${A}px ${u}`;
+  return O.fillText(s, v / 2, w / 2 + 1), _;
 }
 function hookClusterEvent(s) {
   s.clustering.clusterEvent.addEventListener((r, o) => {
@@ -5815,83 +5815,83 @@ class ShipLayer extends EventEmitter {
   }
   /**更新or新增feature */
   update(r) {
-    var d, u, l, c, h, a, m, y, v, p;
+    var d, u, l, c, h, a, m, y, g, p, v, w, _, O;
     const o = this.db.entities.getById(this.getIdByFeature(r));
     if (o) {
-      const g = this.labelDataSource.entities.getById(o.id + "_shadow1"), b = this.shadowEntityMap.get(o), _ = ((d = r.properties) == null ? void 0 : d.shipTypeId) ?? -1, x = shipTypeColorMap.get(_) ?? shipTypeColorMap.get(-1), [w, O] = r.geometry.coordinates, T = ((u = this._viewer) == null ? void 0 : u.clock.currentTime) ?? Cesium.JulianDate.now(), E = (l = o.position) == null ? void 0 : l.getValue(T), R = Cesium.Cartesian3.fromDegrees(w, O), S = new Cesium.SampledPositionProperty();
-      S.backwardExtrapolationType = Cesium.ExtrapolationType.HOLD, S.forwardExtrapolationType = Cesium.ExtrapolationType.HOLD;
-      const P = (c = o.properties) == null ? void 0 : c.getValue().updateTime, k = (h = r.properties) == null ? void 0 : h.updateTime;
-      if (P && k && new Date(k).getTime() - new Date(P).getTime() >= 3 * 1e3 * 60)
-        S.addSample(T, R);
+      const b = this.labelDataSource.entities.getById(o.id + "_shadow1"), x = this.shadowEntityMap.get(o), T = ((d = r.properties) == null ? void 0 : d.shipTypeId) ?? -1, E = shipTypeColorMap.get(T) ?? shipTypeColorMap.get(-1), [R, S] = r.geometry.coordinates, P = ((u = this._viewer) == null ? void 0 : u.clock.currentTime) ?? Cesium.JulianDate.now(), D = (l = o.position) == null ? void 0 : l.getValue(P), A = Cesium.Cartesian3.fromDegrees(R, S), I = new Cesium.SampledPositionProperty();
+      I.backwardExtrapolationType = Cesium.ExtrapolationType.HOLD, I.forwardExtrapolationType = Cesium.ExtrapolationType.HOLD;
+      const B = (c = o.properties) == null ? void 0 : c.getValue().updateTime, F = (h = r.properties) == null ? void 0 : h.updateTime;
+      if (B && F && new Date(F).getTime() - new Date(B).getTime() >= 3 * 1e3 * 60)
+        I.addSample(P, A);
       else {
-        const A = Cesium.JulianDate.addSeconds(T, 3, new Cesium.JulianDate());
-        S.addSample(
-          Cesium.JulianDate.addSeconds(T, 1, new Cesium.JulianDate()),
-          E ?? R
-        ), S.addSample(A, R);
+        const q = Cesium.JulianDate.addSeconds(P, 3, new Cesium.JulianDate());
+        I.addSample(
+          Cesium.JulianDate.addSeconds(P, 1, new Cesium.JulianDate()),
+          D ?? A
+        ), I.addSample(q, A);
       }
-      if (o.position = S, b && (b.position = S), g && (g.position = S), o.properties)
-        for (const [A, I] of Object.entries(r.properties ?? {})) {
-          if (A == "speedOverGround") {
-            const $ = o.properties.getValue().speedOverGround ?? 0, F = Number($) > this.IS_MOVING_THRESHOLD, q = Number(I) > this.IS_MOVING_THRESHOLD;
-            if (F !== q && (o.billboard && (o.billboard.image = new Cesium.ConstantProperty(
-              createShipIconUrl(x, q)
-            )), b != null && b.plane)) {
-              const V = ((a = r.properties) == null ? void 0 : a.designBeam) ?? 8, J = ((m = r.properties) == null ? void 0 : m.designLength) ?? 20, U = createShipIconV2({
-                color: x,
-                isMoving: q,
+      if (o.position = I, x && (x.position = I), b && (b.position = I), o.properties)
+        for (const [q, V] of Object.entries(r.properties ?? {})) {
+          if (q == "speedOverGround") {
+            const G = o.properties.getValue().speedOverGround ?? 0, X = Number(G) > this.IS_MOVING_THRESHOLD, U = Number(V) > this.IS_MOVING_THRESHOLD;
+            if (X !== U && (o.billboard && (o.billboard.image = new Cesium.ConstantProperty(
+              createShipIconUrl(E, U)
+            )), x != null && x.plane)) {
+              const ee = ((a = r.properties) == null ? void 0 : a.designBeam) ?? ((y = (m = this.opt) == null ? void 0 : m.defaultValue) == null ? void 0 : y.designBeam) ?? 12, W = ((g = r.properties) == null ? void 0 : g.designLength) ?? ((v = (p = this.opt) == null ? void 0 : p.defaultValue) == null ? void 0 : v.designLength) ?? 35, J = createShipIconV2({
+                color: E,
+                isMoving: U,
                 ...r.properties,
-                designBeam: V,
-                designLength: J
-              }), K = (y = b.plane) == null ? void 0 : y.material;
-              K && (K.image = new Cesium.ConstantProperty(U.url), b.plane.dimensions = new Cesium.ConstantProperty(
-                new Cesium.Cartesian2(V * U.scale.x, J * U.scale.y)
-              )), b.plane.dimensions = new Cesium.CallbackProperty(
-                () => new Cesium.Cartesian2(V * U.scale.x, J * U.scale.y),
+                designBeam: ee,
+                designLength: W
+              }), Q = (w = x.plane) == null ? void 0 : w.material;
+              Q && (Q.image = new Cesium.ConstantProperty(J.url), x.plane.dimensions = new Cesium.ConstantProperty(
+                new Cesium.Cartesian2(ee * J.scale.x, W * J.scale.y)
+              )), x.plane.dimensions = new Cesium.CallbackProperty(
+                () => new Cesium.Cartesian2(ee * J.scale.x, W * J.scale.y),
                 !0
               );
             }
           }
-          if (A == "courseOverGroundTrue") {
-            const $ = ((v = r.properties) == null ? void 0 : v.courseOverGroundTrue) ?? 0;
+          if (q == "courseOverGroundTrue") {
+            const G = ((_ = r.properties) == null ? void 0 : _.courseOverGroundTrue) ?? 0;
             o.billboard.rotation = new Cesium.ConstantProperty(
-              typeof I == "number" ? -1 * I : 0
+              typeof V == "number" ? -1 * V : 0
             );
-            const F = new Cesium.ConstantProperty(
+            const X = new Cesium.ConstantProperty(
               Cesium.Transforms.headingPitchRollQuaternion(
-                R,
-                new Cesium.HeadingPitchRoll($, 0, 0)
+                A,
+                new Cesium.HeadingPitchRoll(G, 0, 0)
               )
             );
-            b && (b.orientation = F);
+            x && (x.orientation = X);
           }
-          if (A == "updateTime") {
-            const $ = Cesium.JulianDate.fromDate(new Date(I));
+          if (q == "updateTime") {
+            const G = Cesium.JulianDate.fromDate(new Date(V));
             o.billboard.color = createAlphaSampled({
-              startTime: $
+              startTime: G
             });
-            const F = (p = b == null ? void 0 : b.plane) == null ? void 0 : p.material;
-            F && (F.color = createAlphaSampled({
-              startTime: $
+            const X = (O = x == null ? void 0 : x.plane) == null ? void 0 : O.material;
+            X && (X.color = createAlphaSampled({
+              startTime: G
             }));
-            const q = getHideAfterFiveMinutesProperty($);
-            g != null && g.billboard && (g.billboard.show = q), o.point.show = q;
+            const U = getHideAfterFiveMinutesProperty(G);
+            b != null && b.billboard && (b.billboard.show = U), o.point.show = U;
           }
-          o.properties[A] = I, b != null && b.properties && (b.properties[A] = I);
+          o.properties[q] = V, x != null && x.properties && (x.properties[q] = V);
         }
     } else
       this.renderFeature(r);
   }
   // 判定移动的速度阈值（米/秒）
   renderEntity(r) {
-    var m, y, v, p, g, b, _, x, w;
+    var m, y, g, p, v, w, _, O, b;
     const o = (m = r.properties) == null ? void 0 : m.getValue(), d = (o == null ? void 0 : o.shipTypeId) ?? -1, u = shipTypeColorMap.get(d) ?? shipTypeColorMap.get(-1), l = Number((o == null ? void 0 : o.speedOverGround) ?? 0), c = o != null && o.updateTime ? new Date(o.updateTime) : /* @__PURE__ */ new Date(), h = Cesium.JulianDate.fromDate(c), a = createShipIconUrl(u, l > this.IS_MOVING_THRESHOLD);
     r.point = new Cesium.PointGraphics({
       pixelSize: 4,
       color: Cesium.Color.fromCssColorString("#8AF22C"),
       disableDepthTestDistance: 3e6,
       distanceDisplayCondition: new Cesium.DistanceDisplayCondition(
-        ((v = (y = this.opt) == null ? void 0 : y.distanceDisplayConditions) == null ? void 0 : v.far) ?? 15e3
+        ((g = (y = this.opt) == null ? void 0 : y.distanceDisplayConditions) == null ? void 0 : g.far) ?? 15e3
       ),
       show: getHideAfterFiveMinutesProperty(h)
     }), r.billboard = new Cesium.BillboardGraphics({
@@ -5900,22 +5900,22 @@ class ShipLayer extends EventEmitter {
       height: 70,
       disableDepthTestDistance: 3e6,
       distanceDisplayCondition: new Cesium.DistanceDisplayCondition(
-        ((g = (p = this.opt) == null ? void 0 : p.distanceDisplayConditions) == null ? void 0 : g.near) ?? 4e3,
-        ((_ = (b = this.opt) == null ? void 0 : b.distanceDisplayConditions) == null ? void 0 : _.far) ?? 15e3
+        ((v = (p = this.opt) == null ? void 0 : p.distanceDisplayConditions) == null ? void 0 : v.near) ?? 4e3,
+        ((_ = (w = this.opt) == null ? void 0 : w.distanceDisplayConditions) == null ? void 0 : _.far) ?? 15e3
       ),
       pixelOffset: new Cesium.Cartesian2(0, 0),
       alignedAxis: Cesium.Cartesian3.UNIT_Z,
       color: createAlphaSampled({ startTime: h }),
       // 设置透明度
       rotation: new Cesium.ConstantProperty(
-        (w = (x = r.properties) == null ? void 0 : x.getValue()) != null && w.courseOverGroundTrue ? -1 * r.properties.getValue().courseOverGroundTrue : 0
+        (b = (O = r.properties) == null ? void 0 : O.getValue()) != null && b.courseOverGroundTrue ? -1 * r.properties.getValue().courseOverGroundTrue : 0
       )
       // 根据航向设置旋转角度
     }), this.createShipPlane(r);
   }
   renderLabelEntity(r) {
-    var h, a, m, y, v, p, g;
-    const o = (h = r.properties) == null ? void 0 : h.getValue(), d = o != null && o.updateTime ? new Date(o.updateTime) : /* @__PURE__ */ new Date(), u = Cesium.JulianDate.fromDate(d), l = ((m = (a = r.properties) == null ? void 0 : a.getValue()) == null ? void 0 : m.name) ?? ((y = r.properties) != null && y.getValue().mmsi ? "mmsi:" + ((v = r.properties) == null ? void 0 : v.getValue().mmsi) : "未知"), c = createRoundedRectImage({ text: l });
+    var h, a, m, y, g, p, v;
+    const o = (h = r.properties) == null ? void 0 : h.getValue(), d = o != null && o.updateTime ? new Date(o.updateTime) : /* @__PURE__ */ new Date(), u = Cesium.JulianDate.fromDate(d), l = ((m = (a = r.properties) == null ? void 0 : a.getValue()) == null ? void 0 : m.name) ?? ((y = r.properties) != null && y.getValue().mmsi ? "mmsi:" + ((g = r.properties) == null ? void 0 : g.getValue().mmsi) : "未知"), c = createRoundedRectImage({ text: l });
     r.billboard = new Cesium.BillboardGraphics({
       image: new Cesium.ConstantProperty(c),
       width: new Cesium.ConstantProperty(Number(c.style.width.replace("px", ""))),
@@ -5929,7 +5929,7 @@ class ShipLayer extends EventEmitter {
       verticalOrigin: new Cesium.ConstantProperty(Cesium.VerticalOrigin.CENTER),
       distanceDisplayCondition: new Cesium.DistanceDisplayCondition(
         0,
-        ((g = (p = this.opt) == null ? void 0 : p.distanceDisplayConditions) == null ? void 0 : g.far) ?? 15e3
+        ((v = (p = this.opt) == null ? void 0 : p.distanceDisplayConditions) == null ? void 0 : v.far) ?? 15e3
       ),
       disableDepthTestDistance: 5e3,
       show: getHideAfterFiveMinutesProperty(u)
@@ -5944,7 +5944,7 @@ class ShipLayer extends EventEmitter {
       properties: r.properties
     });
     this.shadowEntityMap.set(r, o), this.db.entities.add(o);
-    const d = (p = r.properties) == null ? void 0 : p.getValue(), u = d != null && d.updateTime ? new Date(d.updateTime) : /* @__PURE__ */ new Date(), l = Cesium.JulianDate.fromDate(u), c = Number((d == null ? void 0 : d.speedOverGround) ?? 0), h = (d == null ? void 0 : d.designLength) ?? 20, a = (d == null ? void 0 : d.designBeam) ?? 8, m = (d == null ? void 0 : d.shipTypeId) ?? -1, y = shipTypeColorMap.get(m) ?? shipTypeColorMap.get(-1), v = createShipIconV2({
+    const d = (p = r.properties) == null ? void 0 : p.getValue(), u = d != null && d.updateTime ? new Date(d.updateTime) : /* @__PURE__ */ new Date(), l = Cesium.JulianDate.fromDate(u), c = Number((d == null ? void 0 : d.speedOverGround) ?? 0), h = (d == null ? void 0 : d.designLength) ?? 20, a = (d == null ? void 0 : d.designBeam) ?? 8, m = (d == null ? void 0 : d.shipTypeId) ?? -1, y = shipTypeColorMap.get(m) ?? shipTypeColorMap.get(-1), g = createShipIconV2({
       color: y,
       isMoving: c > this.IS_MOVING_THRESHOLD,
       ...d,
@@ -5953,16 +5953,16 @@ class ShipLayer extends EventEmitter {
     });
     o.plane = new Cesium.PlaneGraphics({
       plane: new Cesium.Plane(Cesium.Cartesian3.UNIT_Z, 0),
-      dimensions: new Cesium.Cartesian2(a * v.scale.x, h * v.scale.y),
+      dimensions: new Cesium.Cartesian2(a * g.scale.x, h * g.scale.y),
       show: new Cesium.CallbackProperty(() => {
-        var x, w, O;
+        var O, b, x;
         if (!this._viewer) return !0;
-        const g = this._viewer.clock.currentTime, b = (x = r.position) == null ? void 0 : x.getValue(g);
-        return b ? Cesium.Cartesian3.distance(this._viewer.camera.positionWC, b) <= (((O = (w = this.opt) == null ? void 0 : w.distanceDisplayConditions) == null ? void 0 : O.near) ?? 4e3) : !1;
+        const v = this._viewer.clock.currentTime, w = (O = r.position) == null ? void 0 : O.getValue(v);
+        return w ? Cesium.Cartesian3.distance(this._viewer.camera.positionWC, w) <= (((x = (b = this.opt) == null ? void 0 : b.distanceDisplayConditions) == null ? void 0 : x.near) ?? 4e3) : !1;
       }, !1),
       //  用回调按距离控制显示
       material: new Cesium.ImageMaterialProperty({
-        image: v.url,
+        image: g.url,
         transparent: !0,
         // 关键：让 alpha 生效
         repeat: new Cesium.Cartesian2(1, 1),
@@ -6135,33 +6135,33 @@ function requireHeatmap() {
         defaultValueField: "value",
         plugins: {}
       }, r = function() {
-        var a = function(v) {
-          this._coordinator = {}, this._data = [], this._radi = [], this._min = 10, this._max = 1, this._xField = v.xField || v.defaultXField, this._yField = v.yField || v.defaultYField, this._valueField = v.valueField || v.defaultValueField, v.radius && (this._cfgRadius = v.radius);
+        var a = function(g) {
+          this._coordinator = {}, this._data = [], this._radi = [], this._min = 10, this._max = 1, this._xField = g.xField || g.defaultXField, this._yField = g.yField || g.defaultYField, this._valueField = g.valueField || g.defaultValueField, g.radius && (this._cfgRadius = g.radius);
         }, m = i.defaultRadius;
         return a.prototype = {
           // when forceRender = false -> called from setData, omits renderall event
-          _organiseData: function(y, v) {
-            var p = y[this._xField], g = y[this._yField], b = this._radi, _ = this._data, x = this._max, w = this._min, O = y[this._valueField] || 1, T = y.radius || this._cfgRadius || m;
-            _[p] || (_[p] = [], b[p] = []), _[p][g] ? _[p][g] += O : (_[p][g] = O, b[p][g] = T);
-            var E = _[p][g];
-            return E > x ? (v ? this.setDataMax(E) : this._max = E, !1) : E < w ? (v ? this.setDataMin(E) : this._min = E, !1) : {
+          _organiseData: function(y, g) {
+            var p = y[this._xField], v = y[this._yField], w = this._radi, _ = this._data, O = this._max, b = this._min, x = y[this._valueField] || 1, T = y.radius || this._cfgRadius || m;
+            _[p] || (_[p] = [], w[p] = []), _[p][v] ? _[p][v] += x : (_[p][v] = x, w[p][v] = T);
+            var E = _[p][v];
+            return E > O ? (g ? this.setDataMax(E) : this._max = E, !1) : E < b ? (g ? this.setDataMin(E) : this._min = E, !1) : {
               x: p,
-              y: g,
-              value: O,
+              y: v,
+              value: x,
               radius: T,
-              min: w,
-              max: x
+              min: b,
+              max: O
             };
           },
           _unOrganizeData: function() {
-            var y = [], v = this._data, p = this._radi;
-            for (var g in v)
-              for (var b in v[g])
+            var y = [], g = this._data, p = this._radi;
+            for (var v in g)
+              for (var w in g[v])
                 y.push({
-                  x: g,
-                  y: b,
-                  radius: p[g][b],
-                  value: v[g][b]
+                  x: v,
+                  y: w,
+                  radius: p[v][w],
+                  value: g[v][w]
                 });
             return {
               min: this._min,
@@ -6177,8 +6177,8 @@ function requireHeatmap() {
           },
           addData: function() {
             if (arguments[0].length > 0)
-              for (var y = arguments[0], v = y.length; v--; )
-                this.addData.call(this, y[v]);
+              for (var y = arguments[0], g = y.length; g--; )
+                this.addData.call(this, y[g]);
             else {
               var p = this._organiseData(arguments[0], !0);
               p && (this._data.length === 0 && (this._min = this._max = p.value), this._coordinator.emit("renderpartial", {
@@ -6190,10 +6190,10 @@ function requireHeatmap() {
             return this;
           },
           setData: function(y) {
-            var v = y.data, p = v.length;
+            var g = y.data, p = g.length;
             this._data = [], this._radi = [];
-            for (var g = 0; g < p; g++)
-              this._organiseData(v[g], !1);
+            for (var v = 0; v < p; v++)
+              this._organiseData(g[v], !1);
             return this._max = y.max, this._min = y.min || 0, this._onExtremaChange(), this._coordinator.emit("renderall", this._getInternalData()), this;
           },
           removeData: function() {
@@ -6260,45 +6260,45 @@ function requireHeatmap() {
         }, a;
       }(), o = function() {
         var a = function(p) {
-          var g = p.gradient || p.defaultGradient, b = document.createElement("canvas"), _ = b.getContext("2d", { willReadFrequently: !0 });
-          b.width = 256, b.height = 1;
-          var x = _.createLinearGradient(0, 0, 256, 1);
-          for (var w in g)
-            x.addColorStop(w, g[w]);
-          return _.fillStyle = x, _.fillRect(0, 0, 256, 1), _.getImageData(0, 0, 256, 1).data;
-        }, m = function(p, g) {
-          var b = document.createElement("canvas"), _ = b.getContext("2d", { willReadFrequently: !0 }), x = p, w = p;
-          if (b.width = b.height = p * 2, g == 1)
-            _.beginPath(), _.arc(x, w, p, 0, 2 * Math.PI, !1), _.fillStyle = "rgba(0,0,0,1)", _.fill();
+          var v = p.gradient || p.defaultGradient, w = document.createElement("canvas"), _ = w.getContext("2d", { willReadFrequently: !0 });
+          w.width = 256, w.height = 1;
+          var O = _.createLinearGradient(0, 0, 256, 1);
+          for (var b in v)
+            O.addColorStop(b, v[b]);
+          return _.fillStyle = O, _.fillRect(0, 0, 256, 1), _.getImageData(0, 0, 256, 1).data;
+        }, m = function(p, v) {
+          var w = document.createElement("canvas"), _ = w.getContext("2d", { willReadFrequently: !0 }), O = p, b = p;
+          if (w.width = w.height = p * 2, v == 1)
+            _.beginPath(), _.arc(O, b, p, 0, 2 * Math.PI, !1), _.fillStyle = "rgba(0,0,0,1)", _.fill();
           else {
-            var O = _.createRadialGradient(x, w, p * g, x, w, p);
-            O.addColorStop(0, "rgba(0,0,0,1)"), O.addColorStop(1, "rgba(0,0,0,0)"), _.fillStyle = O, _.fillRect(0, 0, 2 * p, 2 * p);
+            var x = _.createRadialGradient(O, b, p * v, O, b, p);
+            x.addColorStop(0, "rgba(0,0,0,1)"), x.addColorStop(1, "rgba(0,0,0,0)"), _.fillStyle = x, _.fillRect(0, 0, 2 * p, 2 * p);
           }
-          return b;
-        }, y = function(w) {
-          for (var g = [], b = w.min, _ = w.max, x = w.radi, w = w.data, O = Object.keys(w), T = O.length; T--; )
-            for (var E = O[T], R = Object.keys(w[E]), S = R.length; S--; ) {
-              var P = R[S], k = w[E][P], A = x[E][P];
-              g.push({
+          return w;
+        }, y = function(b) {
+          for (var v = [], w = b.min, _ = b.max, O = b.radi, b = b.data, x = Object.keys(b), T = x.length; T--; )
+            for (var E = x[T], R = Object.keys(b[E]), S = R.length; S--; ) {
+              var P = R[S], D = b[E][P], A = O[E][P];
+              v.push({
                 x: E,
                 y: P,
-                value: k,
+                value: D,
                 radius: A
               });
             }
           return {
-            min: b,
+            min: w,
             max: _,
-            data: g
+            data: v
           };
         };
-        function v(p) {
-          var g = p.container, b = this.shadowCanvas = document.createElement("canvas"), _ = this.canvas = p.canvas || document.createElement("canvas");
+        function g(p) {
+          var v = p.container, w = this.shadowCanvas = document.createElement("canvas"), _ = this.canvas = p.canvas || document.createElement("canvas");
           this._renderBoundaries = [1e4, 1e4, 0, 0];
-          var x = getComputedStyle(p.container) || {};
-          _.className = "heatmap-canvas", this._width = _.width = b.width = p.width || +x.width.replace(/px/, ""), this._height = _.height = b.height = p.height || +x.height.replace(/px/, ""), this.shadowCtx = b.getContext("2d", { willReadFrequently: !0 }), this.ctx = _.getContext("2d", { willReadFrequently: !0 }), _.style.cssText = b.style.cssText = "position:absolute;left:0;top:0;", g.style.position = "relative", g.appendChild(_), this._palette = a(p), this._templates = {}, this._setStyles(p);
+          var O = getComputedStyle(p.container) || {};
+          _.className = "heatmap-canvas", this._width = _.width = w.width = p.width || +O.width.replace(/px/, ""), this._height = _.height = w.height = p.height || +O.height.replace(/px/, ""), this.shadowCtx = w.getContext("2d", { willReadFrequently: !0 }), this.ctx = _.getContext("2d", { willReadFrequently: !0 }), _.style.cssText = w.style.cssText = "position:absolute;left:0;top:0;", v.style.position = "relative", v.appendChild(_), this._palette = a(p), this._templates = {}, this._setStyles(p);
         }
-        return v.prototype = {
+        return g.prototype = {
           renderPartial: function(p) {
             p.data.length > 0 && (this._drawAlpha(p), this._colorize());
           },
@@ -6311,8 +6311,8 @@ function requireHeatmap() {
           updateConfig: function(p) {
             p.gradient && this._updateGradient(p), this._setStyles(p);
           },
-          setDimensions: function(p, g) {
-            this._width = p, this._height = g, this.canvas.width = this.shadowCanvas.width = p, this.canvas.height = this.shadowCanvas.height = g;
+          setDimensions: function(p, v) {
+            this._width = p, this._height = v, this.canvas.width = this.shadowCanvas.width = p, this.canvas.height = this.shadowCanvas.height = v;
           },
           _clear: function() {
             this.shadowCtx.clearRect(0, 0, this._width, this._height), this.ctx.clearRect(0, 0, this._width, this._height);
@@ -6321,33 +6321,33 @@ function requireHeatmap() {
             this._blur = p.blur == 0 ? 0 : p.blur || p.defaultBlur, p.backgroundColor && (this.canvas.style.backgroundColor = p.backgroundColor), this._width = this.canvas.width = this.shadowCanvas.width = p.width || this._width, this._height = this.canvas.height = this.shadowCanvas.height = p.height || this._height, this._opacity = (p.opacity || 0) * 255, this._maxOpacity = (p.maxOpacity || p.defaultMaxOpacity) * 255, this._minOpacity = (p.minOpacity || p.defaultMinOpacity) * 255, this._useGradientOpacity = !!p.useGradientOpacity;
           },
           _drawAlpha: function(_) {
-            for (var g = this._min = _.min, b = this._max = _.max, _ = _.data || [], x = _.length, w = 1 - this._blur; x--; ) {
-              var O = _[x], T = O.x, E = O.y, R = O.radius, S = Math.min(O.value, b), P = T - R, k = E - R, A = this.shadowCtx, I;
-              this._templates[R] ? I = this._templates[R] : this._templates[R] = I = m(R, w);
-              var $ = (S - g) / (b - g);
-              A.globalAlpha = $ < 0.01 ? 0.01 : $, A.drawImage(I, P, k), P < this._renderBoundaries[0] && (this._renderBoundaries[0] = P), k < this._renderBoundaries[1] && (this._renderBoundaries[1] = k), P + 2 * R > this._renderBoundaries[2] && (this._renderBoundaries[2] = P + 2 * R), k + 2 * R > this._renderBoundaries[3] && (this._renderBoundaries[3] = k + 2 * R);
+            for (var v = this._min = _.min, w = this._max = _.max, _ = _.data || [], O = _.length, b = 1 - this._blur; O--; ) {
+              var x = _[O], T = x.x, E = x.y, R = x.radius, S = Math.min(x.value, w), P = T - R, D = E - R, A = this.shadowCtx, I;
+              this._templates[R] ? I = this._templates[R] : this._templates[R] = I = m(R, b);
+              var B = (S - v) / (w - v);
+              A.globalAlpha = B < 0.01 ? 0.01 : B, A.drawImage(I, P, D), P < this._renderBoundaries[0] && (this._renderBoundaries[0] = P), D < this._renderBoundaries[1] && (this._renderBoundaries[1] = D), P + 2 * R > this._renderBoundaries[2] && (this._renderBoundaries[2] = P + 2 * R), D + 2 * R > this._renderBoundaries[3] && (this._renderBoundaries[3] = D + 2 * R);
             }
           },
           _colorize: function() {
-            var p = this._renderBoundaries[0], g = this._renderBoundaries[1], b = this._renderBoundaries[2] - p, _ = this._renderBoundaries[3] - g, x = this._width, w = this._height, O = this._opacity, T = this._maxOpacity, E = this._minOpacity, R = this._useGradientOpacity;
-            p < 0 && (p = 0), g < 0 && (g = 0), p + b > x && (b = x - p), g + _ > w && (_ = w - g);
-            for (var S = this.shadowCtx.getImageData(p, g, b, _), P = S.data, k = P.length, A = this._palette, I = 3; I < k; I += 4) {
-              var $ = P[I], F = $ * 4;
+            var p = this._renderBoundaries[0], v = this._renderBoundaries[1], w = this._renderBoundaries[2] - p, _ = this._renderBoundaries[3] - v, O = this._width, b = this._height, x = this._opacity, T = this._maxOpacity, E = this._minOpacity, R = this._useGradientOpacity;
+            p < 0 && (p = 0), v < 0 && (v = 0), p + w > O && (w = O - p), v + _ > b && (_ = b - v);
+            for (var S = this.shadowCtx.getImageData(p, v, w, _), P = S.data, D = P.length, A = this._palette, I = 3; I < D; I += 4) {
+              var B = P[I], F = B * 4;
               if (F) {
                 var q;
-                O > 0 ? q = O : $ < T ? $ < E ? q = E : q = $ : q = T, P[I - 3] = A[F], P[I - 2] = A[F + 1], P[I - 1] = A[F + 2], P[I] = R ? A[F + 3] : q;
+                x > 0 ? q = x : B < T ? B < E ? q = E : q = B : q = T, P[I - 3] = A[F], P[I - 2] = A[F + 1], P[I - 1] = A[F + 2], P[I] = R ? A[F + 3] : q;
               }
             }
-            this.ctx.putImageData(S, p, g), this._renderBoundaries = [1e3, 1e3, 0, 0];
+            this.ctx.putImageData(S, p, v), this._renderBoundaries = [1e3, 1e3, 0, 0];
           },
           getValueAt: function(p) {
-            var g, b = this.shadowCtx, _ = b.getImageData(p.x, p.y, 1, 1), x = _.data[3], w = this._max, O = this._min;
-            return g = Math.abs(w - O) * (x / 255) >> 0, g;
+            var v, w = this.shadowCtx, _ = w.getImageData(p.x, p.y, 1, 1), O = _.data[3], b = this._max, x = this._min;
+            return v = Math.abs(b - x) * (O / 255) >> 0, v;
           },
           getDataURL: function() {
             return this.canvas.toDataURL();
           }
-        }, v;
+        }, g;
       }(), d = function() {
         var a = !1;
         return i.defaultRenderer === "canvas2d" && (a = o), a;
@@ -6355,8 +6355,8 @@ function requireHeatmap() {
         merge: function() {
           for (var h = {}, a = arguments.length, m = 0; m < a; m++) {
             var y = arguments[m];
-            for (var v in y)
-              h[v] = y[v];
+            for (var g in y)
+              h[g] = y[g];
           }
           return h;
         }
@@ -6366,42 +6366,42 @@ function requireHeatmap() {
             this.cStore = {};
           }
           return p.prototype = {
-            on: function(g, b, _) {
-              var x = this.cStore;
-              x[g] || (x[g] = []), x[g].push(function(w) {
-                return b.call(_, w);
+            on: function(v, w, _) {
+              var O = this.cStore;
+              O[v] || (O[v] = []), O[v].push(function(b) {
+                return w.call(_, b);
               });
             },
-            emit: function(g, b) {
+            emit: function(v, w) {
               var _ = this.cStore;
-              if (_[g])
-                for (var x = _[g].length, w = 0; w < x; w++) {
-                  var O = _[g][w];
-                  O(b);
+              if (_[v])
+                for (var O = _[v].length, b = 0; b < O; b++) {
+                  var x = _[v][b];
+                  x(w);
                 }
             }
           }, p;
-        }(), m = function(v) {
-          var p = v._renderer, g = v._coordinator, b = v._store;
-          g.on("renderpartial", p.renderPartial, p), g.on("renderall", p.renderAll, p), g.on("extremachange", function(_) {
-            v._config.onExtremaChange && v._config.onExtremaChange({
+        }(), m = function(g) {
+          var p = g._renderer, v = g._coordinator, w = g._store;
+          v.on("renderpartial", p.renderPartial, p), v.on("renderall", p.renderAll, p), v.on("extremachange", function(_) {
+            g._config.onExtremaChange && g._config.onExtremaChange({
               min: _.min,
               max: _.max,
-              gradient: v._config.gradient || v._config.defaultGradient
+              gradient: g._config.gradient || g._config.defaultGradient
             });
-          }), b.setCoordinator(g);
+          }), w.setCoordinator(v);
         };
         function y() {
-          var v = this._config = u.merge(i, arguments[0] || {});
-          if (this._coordinator = new a(), v.plugin) {
-            var p = v.plugin;
+          var g = this._config = u.merge(i, arguments[0] || {});
+          if (this._coordinator = new a(), g.plugin) {
+            var p = g.plugin;
             if (i.plugins[p]) {
-              var g = i.plugins[p];
-              this._renderer = new g.renderer(v), this._store = new g.store(v);
+              var v = i.plugins[p];
+              this._renderer = new v.renderer(g), this._store = new v.store(g);
             } else
               throw new Error("Plugin '" + p + "' not found. Maybe it was not registered.");
           } else
-            this._renderer = new d(v), this._store = new r(v);
+            this._renderer = new d(g), this._store = new r(g);
           m(this);
         }
         return y.prototype = {
@@ -6420,8 +6420,8 @@ function requireHeatmap() {
           setDataMin: function() {
             return this._store.setDataMin.apply(this._store, arguments), this;
           },
-          configure: function(v) {
-            return this._config = u.merge(this._config, v), this._renderer.updateConfig(this._config), this._coordinator.emit("renderall", this._store._getInternalData()), this;
+          configure: function(g) {
+            return this._config = u.merge(this._config, g), this._renderer.updateConfig(this._config), this._coordinator.emit("renderall", this._store._getInternalData()), this;
           },
           repaint: function() {
             return this._coordinator.emit("renderall", this._store._getInternalData()), this;
@@ -6432,8 +6432,8 @@ function requireHeatmap() {
           getDataURL: function() {
             return this._renderer.getDataURL();
           },
-          getValueAt: function(v) {
-            return this._store.getValueAt ? this._store.getValueAt(v) : this._renderer.getValueAt ? this._renderer.getValueAt(v) : null;
+          getValueAt: function(g) {
+            return this._store.getValueAt ? this._store.getValueAt(g) : this._renderer.getValueAt ? this._renderer.getValueAt(g) : null;
           }
         }, y;
       }(), c = {
@@ -6449,13 +6449,13 @@ function requireHeatmap() {
   }(heatmap$1)), heatmap$1.exports;
 }
 requireHeatmap();
-const X = class X extends EventEmitter {
+const Y = class Y extends EventEmitter {
   constructor() {
     super();
     j(this, "popupMap", /* @__PURE__ */ new Map());
   }
   static getInstance() {
-    return X.instance || (X.instance = new X()), X.instance;
+    return Y.instance || (Y.instance = new Y()), Y.instance;
   }
   popup(r) {
     var c;
@@ -6483,8 +6483,8 @@ const X = class X extends EventEmitter {
     this.popupMap.forEach((r) => r.destroy()), this.popupMap.clear();
   }
 };
-j(X, "instance", null);
-let PopupCtrl = X;
+j(Y, "instance", null);
+let PopupCtrl = Y;
 function saveCameraParams(s) {
   const i = s.camera;
   return {