@poor-knight/cesium-utils 0.5.4 → 0.5.5

package/dist/cesium-utils.js

@@ -35,89 +35,89 @@ const makeTable = () => {
 var crc32_1 = crc32$1;
 const BAD$1 = 16209, TYPE$1 = 16191;
 var inffast = function(i, r) {
-  let a, c, o, u, h, d, l, m, y, g, p, v, _, w, O, b, x, T, C, E, R, P, D, k;
-  const I = i.state;
-  a = i.next_in, D = i.input, c = a + (i.avail_in - 5), o = i.next_out, k = i.output, u = o - (r - i.avail_out), h = o + (i.avail_out - 257), d = I.dmax, l = I.wsize, m = I.whave, y = I.wnext, g = I.window, p = I.hold, v = I.bits, _ = I.lencode, w = I.distcode, O = (1 << I.lenbits) - 1, b = (1 << I.distbits) - 1;
+  let a, c, o, u, h, d, l, m, y, g, p, v, _, w, O, b, T, x, E, C, R, P, k, A;
+  const N = i.state;
+  a = i.next_in, k = i.input, c = a + (i.avail_in - 5), o = i.next_out, A = i.output, u = o - (r - i.avail_out), h = o + (i.avail_out - 257), d = N.dmax, l = N.wsize, m = N.whave, y = N.wnext, g = N.window, p = N.hold, v = N.bits, _ = N.lencode, w = N.distcode, O = (1 << N.lenbits) - 1, b = (1 << N.distbits) - 1;
   e: do {
-    v < 15 && (p += D[a++] << v, v += 8, p += D[a++] << v, v += 8), x = _[p & O];
+    v < 15 && (p += k[a++] << v, v += 8, p += k[a++] << v, v += 8), T = _[p & O];
     t: for (; ; ) {
-      if (T = x >>> 24, p >>>= T, v -= T, T = x >>> 16 & 255, T === 0)
-        k[o++] = x & 65535;
-      else if (T & 16) {
-        C = x & 65535, T &= 15, T && (v < T && (p += D[a++] << v, v += 8), C += p & (1 << T) - 1, p >>>= T, v -= T), v < 15 && (p += D[a++] << v, v += 8, p += D[a++] << v, v += 8), x = w[p & b];
+      if (x = T >>> 24, p >>>= x, v -= x, x = T >>> 16 & 255, x === 0)
+        A[o++] = T & 65535;
+      else if (x & 16) {
+        E = T & 65535, x &= 15, x && (v < x && (p += k[a++] << v, v += 8), E += p & (1 << x) - 1, p >>>= x, v -= x), v < 15 && (p += k[a++] << v, v += 8, p += k[a++] << v, v += 8), T = w[p & b];
         r: for (; ; ) {
-          if (T = x >>> 24, p >>>= T, v -= T, T = x >>> 16 & 255, T & 16) {
-            if (E = x & 65535, T &= 15, v < T && (p += D[a++] << v, v += 8, v < T && (p += D[a++] << v, v += 8)), E += p & (1 << T) - 1, E > d) {
-              i.msg = "invalid distance too far back", I.mode = BAD$1;
+          if (x = T >>> 24, p >>>= x, v -= x, x = T >>> 16 & 255, x & 16) {
+            if (C = T & 65535, x &= 15, v < x && (p += k[a++] << v, v += 8, v < x && (p += k[a++] << v, v += 8)), C += p & (1 << x) - 1, C > d) {
+              i.msg = "invalid distance too far back", N.mode = BAD$1;
               break e;
             }
-            if (p >>>= T, v -= T, T = o - u, E > T) {
-              if (T = E - T, T > m && I.sane) {
-                i.msg = "invalid distance too far back", I.mode = BAD$1;
+            if (p >>>= x, v -= x, x = o - u, C > x) {
+              if (x = C - x, x > m && N.sane) {
+                i.msg = "invalid distance too far back", N.mode = BAD$1;
                 break e;
               }
               if (R = 0, P = g, y === 0) {
-                if (R += l - T, T < C) {
-                  C -= T;
+                if (R += l - x, x < E) {
+                  E -= x;
                   do
-                    k[o++] = g[R++];
-                  while (--T);
-                  R = o - E, P = k;
+                    A[o++] = g[R++];
+                  while (--x);
+                  R = o - C, P = A;
                 }
-              } else if (y < T) {
-                if (R += l + y - T, T -= y, T < C) {
-                  C -= T;
+              } else if (y < x) {
+                if (R += l + y - x, x -= y, x < E) {
+                  E -= x;
                   do
-                    k[o++] = g[R++];
-                  while (--T);
-                  if (R = 0, y < C) {
-                    T = y, C -= T;
+                    A[o++] = g[R++];
+                  while (--x);
+                  if (R = 0, y < E) {
+                    x = y, E -= x;
                     do
-                      k[o++] = g[R++];
-                    while (--T);
-                    R = o - E, P = k;
+                      A[o++] = g[R++];
+                    while (--x);
+                    R = o - C, P = A;
                   }
                 }
-              } else if (R += y - T, T < C) {
-                C -= T;
+              } else if (R += y - x, x < E) {
+                E -= x;
                 do
-                  k[o++] = g[R++];
-                while (--T);
-                R = o - E, P = k;
+                  A[o++] = g[R++];
+                while (--x);
+                R = o - C, P = A;
               }
-              for (; C > 2; )
-                k[o++] = P[R++], k[o++] = P[R++], k[o++] = P[R++], C -= 3;
-              C && (k[o++] = P[R++], C > 1 && (k[o++] = P[R++]));
+              for (; E > 2; )
+                A[o++] = P[R++], A[o++] = P[R++], A[o++] = P[R++], E -= 3;
+              E && (A[o++] = P[R++], E > 1 && (A[o++] = P[R++]));
             } else {
-              R = o - E;
+              R = o - C;
               do
-                k[o++] = k[R++], k[o++] = k[R++], k[o++] = k[R++], C -= 3;
-              while (C > 2);
-              C && (k[o++] = k[R++], C > 1 && (k[o++] = k[R++]));
+                A[o++] = A[R++], A[o++] = A[R++], A[o++] = A[R++], E -= 3;
+              while (E > 2);
+              E && (A[o++] = A[R++], E > 1 && (A[o++] = A[R++]));
             }
-          } else if ((T & 64) === 0) {
-            x = w[(x & 65535) + (p & (1 << T) - 1)];
+          } else if ((x & 64) === 0) {
+            T = w[(T & 65535) + (p & (1 << x) - 1)];
             continue r;
           } else {
-            i.msg = "invalid distance code", I.mode = BAD$1;
+            i.msg = "invalid distance code", N.mode = BAD$1;
             break e;
           }
           break;
         }
-      } else if ((T & 64) === 0) {
-        x = _[(x & 65535) + (p & (1 << T) - 1)];
+      } else if ((x & 64) === 0) {
+        T = _[(T & 65535) + (p & (1 << x) - 1)];
         continue t;
-      } else if (T & 32) {
-        I.mode = TYPE$1;
+      } else if (x & 32) {
+        N.mode = TYPE$1;
         break e;
       } else {
-        i.msg = "invalid literal/length code", I.mode = BAD$1;
+        i.msg = "invalid literal/length code", N.mode = BAD$1;
         break e;
       }
       break;
     }
   } while (a < c && o < h);
-  C = v >> 3, a -= C, v -= C << 3, p &= (1 << v) - 1, i.next_in = a, i.next_out = o, i.avail_in = a < c ? 5 + (c - a) : 5 - (a - c), i.avail_out = o < h ? 257 + (h - o) : 257 - (o - h), I.hold = p, I.bits = v;
+  E = v >> 3, a -= E, v -= E << 3, p &= (1 << v) - 1, i.next_in = a, i.next_out = o, i.avail_in = a < c ? 5 + (c - a) : 5 - (a - c), i.avail_out = o < h ? 257 + (h - o) : 257 - (o - h), N.hold = p, N.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,48 +255,48 @@ const MAXBITS = 15, ENOUGH_LENS$1 = 852, ENOUGH_DISTS$1 = 592, CODES$1 = 0, LENS
   64
 ]), inflate_table$1 = (s, i, r, a, c, o, u, h) => {
   const d = h.bits;
-  let l = 0, m = 0, y = 0, g = 0, p = 0, v = 0, _ = 0, w = 0, O = 0, b = 0, x, T, C, E, R, P = null, D;
-  const k = new Uint16Array(MAXBITS + 1), I = new Uint16Array(MAXBITS + 1);
-  let B = null, H, q, U;
+  let l = 0, m = 0, y = 0, g = 0, p = 0, v = 0, _ = 0, w = 0, O = 0, b = 0, T, x, E, C, R, P = null, k;
+  const A = new Uint16Array(MAXBITS + 1), N = new Uint16Array(MAXBITS + 1);
+  let B = null, q, H, Z;
   for (l = 0; l <= MAXBITS; l++)
-    k[l] = 0;
+    A[l] = 0;
   for (m = 0; m < a; m++)
-    k[i[r + m]]++;
-  for (p = d, g = MAXBITS; g >= 1 && k[g] === 0; g--)
+    A[i[r + m]]++;
+  for (p = d, g = MAXBITS; g >= 1 && A[g] === 0; g--)
     ;
   if (p > g && (p = g), g === 0)
     return c[o++] = 1 << 24 | 64 << 16 | 0, c[o++] = 1 << 24 | 64 << 16 | 0, h.bits = 1, 0;
-  for (y = 1; y < g && k[y] === 0; y++)
+  for (y = 1; y < g && A[y] === 0; y++)
     ;
   for (p < y && (p = y), w = 1, l = 1; l <= MAXBITS; l++)
-    if (w <<= 1, w -= k[l], w < 0)
+    if (w <<= 1, w -= A[l], w < 0)
       return -1;
   if (w > 0 && (s === CODES$1 || g !== 1))
     return -1;
-  for (I[1] = 0, l = 1; l < MAXBITS; l++)
-    I[l + 1] = I[l] + k[l];
+  for (N[1] = 0, l = 1; l < MAXBITS; l++)
+    N[l + 1] = N[l] + A[l];
   for (m = 0; m < a; m++)
-    i[r + m] !== 0 && (u[I[i[r + m]]++] = m);
-  if (s === CODES$1 ? (P = B = u, D = 20) : s === LENS$1 ? (P = lbase, B = lext, D = 257) : (P = dbase, B = dext, D = 0), b = 0, m = 0, l = y, R = o, v = p, _ = 0, C = -1, O = 1 << p, E = O - 1, s === LENS$1 && O > ENOUGH_LENS$1 || s === DISTS$1 && O > ENOUGH_DISTS$1)
+    i[r + m] !== 0 && (u[N[i[r + m]]++] = m);
+  if (s === CODES$1 ? (P = B = u, k = 20) : s === LENS$1 ? (P = lbase, B = lext, k = 257) : (P = dbase, B = dext, k = 0), b = 0, m = 0, l = y, R = o, v = p, _ = 0, E = -1, O = 1 << p, C = O - 1, s === LENS$1 && O > ENOUGH_LENS$1 || s === DISTS$1 && O > ENOUGH_DISTS$1)
     return 1;
   for (; ; ) {
-    H = l - _, u[m] + 1 < D ? (q = 0, U = u[m]) : u[m] >= D ? (q = B[u[m] - D], U = P[u[m] - D]) : (q = 96, U = 0), x = 1 << l - _, T = 1 << v, y = T;
+    q = l - _, u[m] + 1 < k ? (H = 0, Z = u[m]) : u[m] >= k ? (H = B[u[m] - k], Z = P[u[m] - k]) : (H = 96, Z = 0), T = 1 << l - _, x = 1 << v, y = x;
     do
-      T -= x, c[R + (b >> _) + T] = H << 24 | q << 16 | U | 0;
-    while (T !== 0);
-    for (x = 1 << l - 1; b & x; )
-      x >>= 1;
-    if (x !== 0 ? (b &= x - 1, b += x) : b = 0, m++, --k[l] === 0) {
+      x -= T, c[R + (b >> _) + x] = q << 24 | H << 16 | Z | 0;
+    while (x !== 0);
+    for (T = 1 << l - 1; b & T; )
+      T >>= 1;
+    if (T !== 0 ? (b &= T - 1, b += T) : b = 0, m++, --A[l] === 0) {
       if (l === g)
         break;
       l = i[r + u[m]];
     }
-    if (l > p && (b & E) !== C) {
-      for (_ === 0 && (_ = p), R += y, v = l - _, w = 1 << v; v + _ < g && (w -= k[v + _], !(w <= 0)); )
+    if (l > p && (b & C) !== E) {
+      for (_ === 0 && (_ = p), R += y, v = l - _, w = 1 << v; v + _ < g && (w -= A[v + _], !(w <= 0)); )
         v++, w <<= 1;
       if (O += 1 << v, s === LENS$1 && O > ENOUGH_LENS$1 || s === DISTS$1 && O > ENOUGH_DISTS$1)
         return 1;
-      C = b & E, c[C] = p << 24 | v << 16 | R - o | 0;
+      E = b & C, c[E] = p << 24 | v << 16 | R - o | 0;
     }
   }
   return b !== 0 && (c[R + b] = l - _ << 24 | 64 << 16 | 0), h.bits = p, 0;
@@ -393,9 +393,9 @@ const fixedtables = (s) => {
   const o = s.state;
   return o.window === null && (o.wsize = 1 << o.wbits, o.wnext = 0, o.whave = 0, o.window = new Uint8Array(o.wsize)), a >= o.wsize ? (o.window.set(i.subarray(r - o.wsize, r), 0), o.wnext = 0, o.whave = o.wsize) : (c = o.wsize - o.wnext, c > a && (c = a), o.window.set(i.subarray(r - a, r - a + c), o.wnext), a -= c, a ? (o.window.set(i.subarray(r - a, r), 0), o.wnext = a, o.whave = o.wsize) : (o.wnext += c, o.wnext === o.wsize && (o.wnext = 0), o.whave < o.wsize && (o.whave += c))), 0;
 }, inflate$1 = (s, i) => {
-  let r, a, c, o, u, h, d, l, m, y, g, p, v, _, w = 0, O, b, x, T, C, E, R, P;
-  const D = new Uint8Array(4);
-  let k, I;
+  let r, a, c, o, u, h, d, l, m, y, g, p, v, _, w = 0, O, b, T, x, E, C, R, P;
+  const k = new Uint8Array(4);
+  let A, N;
   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])
@@ -416,7 +416,7 @@ const fixedtables = (s) => {
           h--, l += a[o++] << m, m += 8;
         }
         if (r.wrap & 2 && l === 35615) {
-          r.wbits === 0 && (r.wbits = 15), r.check = 0, D[0] = l & 255, D[1] = l >>> 8 & 255, r.check = crc32(r.check, D, 2, 0), l = 0, m = 0, r.mode = FLAGS;
+          r.wbits === 0 && (r.wbits = 15), r.check = 0, k[0] = l & 255, k[1] = l >>> 8 & 255, r.check = crc32(r.check, k, 2, 0), l = 0, m = 0, r.mode = FLAGS;
           break;
         }
         if (r.head && (r.head.done = !1), !(r.wrap & 1) || (((l & 255) << 8) + (l >> 8)) % 31) {
@@ -447,7 +447,7 @@ const fixedtables = (s) => {
           s.msg = "unknown header flags set", r.mode = BAD;
           break;
         }
-        r.head && (r.head.text = l >> 8 & 1), r.flags & 512 && r.wrap & 4 && (D[0] = l & 255, D[1] = l >>> 8 & 255, r.check = crc32(r.check, D, 2, 0)), l = 0, m = 0, r.mode = TIME;
+        r.head && (r.head.text = l >> 8 & 1), r.flags & 512 && r.wrap & 4 && (k[0] = l & 255, k[1] = l >>> 8 & 255, r.check = crc32(r.check, k, 2, 0)), l = 0, m = 0, r.mode = TIME;
       /* falls through */
       case TIME:
         for (; m < 32; ) {
@@ -455,7 +455,7 @@ const fixedtables = (s) => {
             break e;
           h--, l += a[o++] << m, m += 8;
         }
-        r.head && (r.head.time = l), r.flags & 512 && r.wrap & 4 && (D[0] = l & 255, D[1] = l >>> 8 & 255, D[2] = l >>> 16 & 255, D[3] = l >>> 24 & 255, r.check = crc32(r.check, D, 4, 0)), l = 0, m = 0, r.mode = OS;
+        r.head && (r.head.time = l), r.flags & 512 && r.wrap & 4 && (k[0] = l & 255, k[1] = l >>> 8 & 255, k[2] = l >>> 16 & 255, k[3] = l >>> 24 & 255, r.check = crc32(r.check, k, 4, 0)), l = 0, m = 0, r.mode = OS;
       /* falls through */
       case OS:
         for (; m < 16; ) {
@@ -463,7 +463,7 @@ const fixedtables = (s) => {
             break e;
           h--, l += a[o++] << m, m += 8;
         }
-        r.head && (r.head.xflags = l & 255, r.head.os = l >> 8), r.flags & 512 && r.wrap & 4 && (D[0] = l & 255, D[1] = l >>> 8 & 255, r.check = crc32(r.check, D, 2, 0)), l = 0, m = 0, r.mode = EXLEN;
+        r.head && (r.head.xflags = l & 255, r.head.os = l >> 8), r.flags & 512 && r.wrap & 4 && (k[0] = l & 255, k[1] = l >>> 8 & 255, r.check = crc32(r.check, k, 2, 0)), l = 0, m = 0, r.mode = EXLEN;
       /* falls through */
       case EXLEN:
         if (r.flags & 1024) {
@@ -472,7 +472,7 @@ const fixedtables = (s) => {
               break e;
             h--, l += a[o++] << m, m += 8;
           }
-          r.length = l, r.head && (r.head.extra_len = l), r.flags & 512 && r.wrap & 4 && (D[0] = l & 255, D[1] = l >>> 8 & 255, r.check = crc32(r.check, D, 2, 0)), l = 0, m = 0;
+          r.length = l, r.head && (r.head.extra_len = l), r.flags & 512 && r.wrap & 4 && (k[0] = l & 255, k[1] = l >>> 8 & 255, r.check = crc32(r.check, k, 2, 0)), l = 0, m = 0;
         } else r.head && (r.head.extra = null);
         r.mode = EXTRA;
       /* falls through */
@@ -623,9 +623,9 @@ const fixedtables = (s) => {
         }
         for (; r.have < 19; )
           r.lens[B[r.have++]] = 0;
-        if (r.lencode = r.lendyn, r.lenbits = 7, k = {
+        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, k), r.lenbits = k.bits, P) {
+        }, P = inflate_table(CODES, r.lens, 0, 19, r.lencode, 0, r.work, A), r.lenbits = A.bits, P) {
           s.msg = "invalid code lengths set", r.mode = BAD;
           break;
         }
@@ -633,16 +633,16 @@ const fixedtables = (s) => {
       /* falls through */
       case CODELENS:
         for (; r.have < r.nlen + r.ndist; ) {
-          for (; w = r.lencode[l & (1 << r.lenbits) - 1], O = w >>> 24, b = w >>> 16 & 255, x = w & 65535, !(O <= m); ) {
+          for (; w = r.lencode[l & (1 << r.lenbits) - 1], O = w >>> 24, b = w >>> 16 & 255, T = w & 65535, !(O <= m); ) {
             if (h === 0)
               break e;
             h--, l += a[o++] << m, m += 8;
           }
-          if (x < 16)
-            l >>>= O, m -= O, r.lens[r.have++] = x;
+          if (T < 16)
+            l >>>= O, m -= O, r.lens[r.have++] = T;
           else {
-            if (x === 16) {
-              for (I = O + 2; m < I; ) {
+            if (T === 16) {
+              for (N = O + 2; m < N; ) {
                 if (h === 0)
                   break e;
                 h--, l += a[o++] << m, m += 8;
@@ -652,15 +652,15 @@ const fixedtables = (s) => {
                 break;
               }
               R = r.lens[r.have - 1], p = 3 + (l & 3), l >>>= 2, m -= 2;
-            } else if (x === 17) {
-              for (I = O + 3; m < I; ) {
+            } else if (T === 17) {
+              for (N = O + 3; m < N; ) {
                 if (h === 0)
                   break e;
                 h--, l += a[o++] << m, m += 8;
               }
               l >>>= O, m -= O, R = 0, p = 3 + (l & 7), l >>>= 3, m -= 3;
             } else {
-              for (I = O + 7; m < I; ) {
+              for (N = O + 7; m < N; ) {
                 if (h === 0)
                   break e;
                 h--, l += a[o++] << m, m += 8;
@@ -681,13 +681,13 @@ const fixedtables = (s) => {
           s.msg = "invalid code -- missing end-of-block", r.mode = BAD;
           break;
         }
-        if (r.lenbits = 9, k = {
+        if (r.lenbits = 9, A = {
           bits: r.lenbits
-        }, P = inflate_table(LENS, r.lens, 0, r.nlen, r.lencode, 0, r.work, k), r.lenbits = k.bits, P) {
+        }, P = inflate_table(LENS, r.lens, 0, r.nlen, r.lencode, 0, r.work, A), r.lenbits = A.bits, P) {
           s.msg = "invalid literal/lengths set", r.mode = BAD;
           break;
         }
-        if (r.distbits = 6, r.distcode = r.distdyn, k = {
+        if (r.distbits = 6, r.distcode = r.distdyn, A = {
           bits: r.distbits
         }, P = inflate_table(
           DISTS,
@@ -697,8 +697,8 @@ const fixedtables = (s) => {
           r.distcode,
           0,
           r.work,
-          k
-        ), r.distbits = k.bits, P) {
+          A
+        ), r.distbits = A.bits, P) {
           s.msg = "invalid distances set", r.mode = BAD;
           break;
         }
@@ -713,20 +713,20 @@ const fixedtables = (s) => {
           s.next_out = u, s.avail_out = d, s.next_in = o, s.avail_in = h, r.hold = l, r.bits = m, inflate_fast(s, g), u = s.next_out, c = s.output, d = s.avail_out, o = s.next_in, a = s.input, h = s.avail_in, l = r.hold, m = r.bits, r.mode === TYPE && (r.back = -1);
           break;
         }
-        for (r.back = 0; w = r.lencode[l & (1 << r.lenbits) - 1], O = w >>> 24, b = w >>> 16 & 255, x = w & 65535, !(O <= m); ) {
+        for (r.back = 0; w = r.lencode[l & (1 << r.lenbits) - 1], O = w >>> 24, b = w >>> 16 & 255, T = w & 65535, !(O <= m); ) {
           if (h === 0)
             break e;
           h--, l += a[o++] << m, m += 8;
         }
         if (b && (b & 240) === 0) {
-          for (T = O, C = b, E = x; w = r.lencode[E + ((l & (1 << T + C) - 1) >> T)], O = w >>> 24, b = w >>> 16 & 255, x = w & 65535, !(T + O <= m); ) {
+          for (x = O, E = b, C = T; w = r.lencode[C + ((l & (1 << x + E) - 1) >> x)], O = w >>> 24, b = w >>> 16 & 255, T = w & 65535, !(x + O <= m); ) {
             if (h === 0)
               break e;
             h--, l += a[o++] << m, m += 8;
           }
-          l >>>= T, m -= T, r.back += T;
+          l >>>= x, m -= x, r.back += x;
         }
-        if (l >>>= O, m -= O, r.back += O, r.length = x, b === 0) {
+        if (l >>>= O, m -= O, r.back += O, r.length = T, b === 0) {
           r.mode = LIT;
           break;
         }
@@ -742,7 +742,7 @@ const fixedtables = (s) => {
       /* falls through */
       case LENEXT:
         if (r.extra) {
-          for (I = r.extra; m < I; ) {
+          for (N = r.extra; m < N; ) {
             if (h === 0)
               break e;
             h--, l += a[o++] << m, m += 8;
@@ -752,28 +752,28 @@ const fixedtables = (s) => {
         r.was = r.length, r.mode = DIST;
       /* falls through */
       case DIST:
-        for (; w = r.distcode[l & (1 << r.distbits) - 1], O = w >>> 24, b = w >>> 16 & 255, x = w & 65535, !(O <= m); ) {
+        for (; w = r.distcode[l & (1 << r.distbits) - 1], O = w >>> 24, b = w >>> 16 & 255, T = w & 65535, !(O <= m); ) {
           if (h === 0)
             break e;
           h--, l += a[o++] << m, m += 8;
         }
         if ((b & 240) === 0) {
-          for (T = O, C = b, E = x; w = r.distcode[E + ((l & (1 << T + C) - 1) >> T)], O = w >>> 24, b = w >>> 16 & 255, x = w & 65535, !(T + O <= m); ) {
+          for (x = O, E = b, C = T; w = r.distcode[C + ((l & (1 << x + E) - 1) >> x)], O = w >>> 24, b = w >>> 16 & 255, T = w & 65535, !(x + O <= m); ) {
             if (h === 0)
               break e;
             h--, l += a[o++] << m, m += 8;
           }
-          l >>>= T, m -= T, r.back += T;
+          l >>>= x, m -= x, r.back += x;
         }
         if (l >>>= O, m -= O, r.back += O, b & 64) {
           s.msg = "invalid distance code", r.mode = BAD;
           break;
         }
-        r.offset = x, r.extra = b & 15, r.mode = DISTEXT;
+        r.offset = T, r.extra = b & 15, r.mode = DISTEXT;
       /* falls through */
       case DISTEXT:
         if (r.extra) {
-          for (I = r.extra; m < I; ) {
+          for (N = r.extra; m < N; ) {
             if (h === 0)
               break e;
             h--, l += a[o++] << m, m += 8;
@@ -3295,9 +3295,9 @@ function requireType() {
         if (this._fieldsById) return this._fieldsById;
         this._fieldsById = {};
         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] = x;
+          var T = this.fields[O[b]], x = T.id;
+          if (this._fieldsById[x]) throw Error("duplicate id " + x + " in " + this);
+          this._fieldsById[x] = T;
         }
         return this._fieldsById;
       }
@@ -3337,22 +3337,22 @@ function requireType() {
       set: function(O) {
         var b = O.prototype;
         b instanceof u || ((O.prototype = new u()).constructor = O, l.merge(O.prototype, b)), O.$type = O.prototype.$type = this, l.merge(O, u, !0), this._ctor = O;
-        for (var x = 0; x < /* initializes */
-        this.fieldsArray.length; ++x) this._fieldsArray[x].resolve();
-        var T = {};
-        for (x = 0; x < /* initializes */
-        this.oneofsArray.length; ++x)
-          T[this._oneofsArray[x].resolve().name] = {
-            get: l.oneOfGetter(this._oneofsArray[x].oneof),
-            set: l.oneOfSetter(this._oneofsArray[x].oneof)
+        for (var T = 0; T < /* initializes */
+        this.fieldsArray.length; ++T) this._fieldsArray[T].resolve();
+        var x = {};
+        for (T = 0; T < /* initializes */
+        this.oneofsArray.length; ++T)
+          x[this._oneofsArray[T].resolve().name] = {
+            get: l.oneOfGetter(this._oneofsArray[T].oneof),
+            set: l.oneOfSetter(this._oneofsArray[T].oneof)
           };
-        x && Object.defineProperties(O.prototype, T);
+        T && Object.defineProperties(O.prototype, x);
       }
     }
   }), _.generateConstructor = function(b) {
-    for (var x = l.codegen(["p"], b.name), T = 0, C; T < b.fieldsArray.length; ++T)
-      (C = b._fieldsArray[T]).map ? x("this%s={}", l.safeProp(C.name)) : C.repeated && x("this%s=[]", l.safeProp(C.name));
-    return x("if(p)for(var ks=Object.keys(p),i=0;i<ks.length;++i)if(p[ks[i]]!=null)")(
+    for (var T = l.codegen(["p"], b.name), x = 0, E; x < b.fieldsArray.length; ++x)
+      (E = b._fieldsArray[x]).map ? T("this%s={}", l.safeProp(E.name)) : E.repeated && T("this%s=[]", l.safeProp(E.name));
+    return T("if(p)for(var ks=Object.keys(p),i=0;i<ks.length;++i)if(p[ks[i]]!=null)")(
       // omit undefined or null
       "this[ks[i]]=p[ks[i]]"
     );
@@ -3360,39 +3360,39 @@ function requireType() {
   function w(O) {
     return O._fieldsById = O._fieldsArray = O._oneofsArray = null, delete O.encode, delete O.decode, delete O.verify, O;
   }
-  return _.fromJSON = function(b, x) {
-    var T = new _(b, x.options);
-    T.extensions = x.extensions, T.reserved = x.reserved;
-    for (var C = Object.keys(x.fields), E = 0; E < C.length; ++E)
-      T.add(
-        (typeof x.fields[C[E]].keyType < "u" ? c.fromJSON : a.fromJSON)(
-          C[E],
-          x.fields[C[E]]
+  return _.fromJSON = function(b, T) {
+    var x = new _(b, T.options);
+    x.extensions = T.extensions, x.reserved = T.reserved;
+    for (var E = Object.keys(T.fields), C = 0; C < E.length; ++C)
+      x.add(
+        (typeof T.fields[E[C]].keyType < "u" ? c.fromJSON : a.fromJSON)(
+          E[C],
+          T.fields[E[C]]
         )
       );
-    if (x.oneofs)
-      for (C = Object.keys(x.oneofs), E = 0; E < C.length; ++E)
-        T.add(r.fromJSON(C[E], x.oneofs[C[E]]));
-    if (x.nested)
-      for (C = Object.keys(x.nested), E = 0; E < C.length; ++E) {
-        var R = x.nested[C[E]];
-        T.add(
+    if (T.oneofs)
+      for (E = Object.keys(T.oneofs), C = 0; C < E.length; ++C)
+        x.add(r.fromJSON(E[C], T.oneofs[E[C]]));
+    if (T.nested)
+      for (E = Object.keys(T.nested), C = 0; C < E.length; ++C) {
+        var R = T.nested[E[C]];
+        x.add(
           // most to least likely
-          (R.id !== void 0 ? a.fromJSON : R.fields !== void 0 ? _.fromJSON : R.values !== void 0 ? i.fromJSON : R.methods !== void 0 ? o.fromJSON : s.fromJSON)(C[E], R)
+          (R.id !== void 0 ? a.fromJSON : R.fields !== void 0 ? _.fromJSON : R.values !== void 0 ? i.fromJSON : R.methods !== void 0 ? o.fromJSON : s.fromJSON)(E[C], R)
         );
       }
-    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;
+    return T.extensions && T.extensions.length && (x.extensions = T.extensions), T.reserved && T.reserved.length && (x.reserved = T.reserved), T.group && (x.group = !0), T.comment && (x.comment = T.comment), x;
   }, _.prototype.toJSON = function(b) {
-    var x = s.prototype.toJSON.call(this, b), T = b ? !!b.keepComments : !1;
+    var T = s.prototype.toJSON.call(this, b), x = b ? !!b.keepComments : !1;
     return l.toObject([
       "options",
-      x && x.options || void 0,
+      T && T.options || void 0,
       "oneofs",
       s.arrayToJSON(this.oneofsArray, b),
       "fields",
       s.arrayToJSON(
-        this.fieldsArray.filter(function(C) {
-          return !C.declaringField;
+        this.fieldsArray.filter(function(E) {
+          return !E.declaringField;
         }),
         b
       ) || {},
@@ -3403,14 +3403,14 @@ function requireType() {
       "group",
       this.group || void 0,
       "nested",
-      x && x.nested || void 0,
+      T && T.nested || void 0,
       "comment",
-      T ? this.comment : void 0
+      x ? this.comment : void 0
     ]);
   }, _.prototype.resolveAll = function() {
-    for (var b = this.fieldsArray, x = 0; x < b.length; ) b[x++].resolve();
-    var T = this.oneofsArray;
-    for (x = 0; x < T.length; ) T[x++].resolve();
+    for (var b = this.fieldsArray, T = 0; T < b.length; ) b[T++].resolve();
+    var x = this.oneofsArray;
+    for (T = 0; T < x.length; ) x[T++].resolve();
     return s.prototype.resolveAll.call(this);
   }, _.prototype.get = function(b) {
     return this.fields[b] || this.oneofs && this.oneofs[b] || this.nested && this.nested[b] || null;
@@ -3447,50 +3447,50 @@ function requireType() {
   }, _.prototype.create = function(b) {
     return new this.ctor(b);
   }, _.prototype.setup = function() {
-    for (var b = this.fullName, x = [], T = 0; T < /* initializes */
-    this.fieldsArray.length; ++T)
-      x.push(this._fieldsArray[T].resolve().resolvedType);
+    for (var b = this.fullName, T = [], x = 0; x < /* initializes */
+    this.fieldsArray.length; ++x)
+      T.push(this._fieldsArray[x].resolve().resolvedType);
     this.encode = m(this)({
       Writer: d,
-      types: x,
+      types: T,
       util: l
     }), this.decode = y(this)({
       Reader: h,
-      types: x,
+      types: T,
       util: l
     }), this.verify = g(this)({
-      types: x,
+      types: T,
       util: l
     }), this.fromObject = p.fromObject(this)({
-      types: x,
+      types: T,
       util: l
     }), this.toObject = p.toObject(this)({
-      types: x,
+      types: T,
       util: l
     });
-    var C = v[b];
-    if (C) {
-      var E = Object.create(this);
-      E.fromObject = this.fromObject, this.fromObject = C.fromObject.bind(E), E.toObject = this.toObject, this.toObject = C.toObject.bind(E);
+    var E = v[b];
+    if (E) {
+      var C = Object.create(this);
+      C.fromObject = this.fromObject, this.fromObject = E.fromObject.bind(C), C.toObject = this.toObject, this.toObject = E.toObject.bind(C);
     }
     return this;
-  }, _.prototype.encode = function(b, x) {
-    return this.setup().encode(b, x);
-  }, _.prototype.encodeDelimited = function(b, x) {
-    return this.encode(b, x && x.len ? x.fork() : x).ldelim();
-  }, _.prototype.decode = function(b, x) {
-    return this.setup().decode(b, x);
+  }, _.prototype.encode = function(b, T) {
+    return this.setup().encode(b, T);
+  }, _.prototype.encodeDelimited = function(b, T) {
+    return this.encode(b, T && T.len ? T.fork() : T).ldelim();
+  }, _.prototype.decode = function(b, T) {
+    return this.setup().decode(b, T);
   }, _.prototype.decodeDelimited = function(b) {
     return b instanceof h || (b = h.create(b)), this.decode(b, b.uint32());
   }, _.prototype.verify = function(b) {
     return this.setup().verify(b);
   }, _.prototype.fromObject = function(b) {
     return this.setup().fromObject(b);
-  }, _.prototype.toObject = function(b, x) {
-    return this.setup().toObject(b, x);
+  }, _.prototype.toObject = function(b, T) {
+    return this.setup().toObject(b, T);
   }, _.d = function(b) {
-    return function(T) {
-      l.decorateType(T, b);
+    return function(x) {
+      l.decorateType(x, b);
     };
   }, type;
 }
@@ -3514,74 +3514,74 @@ function requireRoot() {
     var w = this;
     if (!_) return c.asPromise(g, w, p, v);
     var O = _ === l;
-    function b(D, k) {
+    function b(k, A) {
       if (_) {
-        if (O) throw D;
-        var I = _;
-        _ = null, I(D, k);
+        if (O) throw k;
+        var N = _;
+        _ = null, N(k, A);
       }
     }
-    function x(D) {
-      var k = D.lastIndexOf("google/protobuf/");
-      if (k > -1) {
-        var I = D.substring(k);
-        if (I in h) return I;
+    function T(k) {
+      var A = k.lastIndexOf("google/protobuf/");
+      if (A > -1) {
+        var N = k.substring(A);
+        if (N in h) return N;
       }
       return null;
     }
-    function T(D, k) {
+    function x(k, A) {
       try {
-        if (c.isString(k) && k.charAt(0) === "{" && (k = JSON.parse(k)), !c.isString(k)) w.setOptions(k.options).addJSON(k.nested);
+        if (c.isString(A) && A.charAt(0) === "{" && (A = JSON.parse(A)), !c.isString(A)) w.setOptions(A.options).addJSON(A.nested);
         else {
-          u.filename = D;
-          var I = u(k, w, v), B, H = 0;
-          if (I.imports)
-            for (; H < I.imports.length; ++H)
-              (B = x(I.imports[H]) || w.resolvePath(D, I.imports[H])) && C(B);
-          if (I.weakImports)
-            for (H = 0; H < I.weakImports.length; ++H)
-              (B = x(I.weakImports[H]) || w.resolvePath(D, I.weakImports[H])) && C(B, !0);
+          u.filename = k;
+          var N = u(A, w, v), B, q = 0;
+          if (N.imports)
+            for (; q < N.imports.length; ++q)
+              (B = T(N.imports[q]) || w.resolvePath(k, N.imports[q])) && E(B);
+          if (N.weakImports)
+            for (q = 0; q < N.weakImports.length; ++q)
+              (B = T(N.weakImports[q]) || w.resolvePath(k, N.weakImports[q])) && E(B, !0);
         }
-      } catch (q) {
-        b(q);
+      } catch (H) {
+        b(H);
       }
-      !O && !E && b(null, w);
+      !O && !C && b(null, w);
     }
-    function C(D, k) {
-      if (D = x(D) || D, !(w.files.indexOf(D) > -1)) {
-        if (w.files.push(D), D in h) {
-          O ? T(D, h[D]) : (++E, setTimeout(function() {
-            --E, T(D, h[D]);
+    function E(k, A) {
+      if (k = T(k) || k, !(w.files.indexOf(k) > -1)) {
+        if (w.files.push(k), k in h) {
+          O ? x(k, h[k]) : (++C, setTimeout(function() {
+            --C, x(k, h[k]);
           }));
           return;
         }
         if (O) {
-          var I;
+          var N;
           try {
-            I = c.fs.readFileSync(D).toString("utf8");
+            N = c.fs.readFileSync(k).toString("utf8");
           } catch (B) {
-            k || b(B);
+            A || b(B);
             return;
           }
-          T(D, I);
+          x(k, N);
         } else
-          ++E, w.fetch(D, function(B, H) {
-            if (--E, !!_) {
+          ++C, w.fetch(k, function(B, q) {
+            if (--C, !!_) {
               if (B) {
-                k ? E || b(null, w) : b(B);
+                A ? C || b(null, w) : b(B);
                 return;
               }
-              T(D, H);
+              x(k, q);
             }
           });
       }
     }
-    var E = 0;
+    var C = 0;
     c.isString(p) && (p = [p]);
     for (var R = 0, P; R < p.length; ++R)
-      (P = w.resolvePath("", p[R])) && C(P);
+      (P = w.resolvePath("", p[R])) && E(P);
     if (O) return w;
-    E || b(null, w);
+    C || b(null, w);
   }, d.prototype.loadSync = function(p, v) {
     if (!c.isNode) throw Error("not supported");
     return this.load(p, v, l);
@@ -3973,58 +3973,58 @@ tokenize$1.unescape = unescape;
 function tokenize$1(s, i) {
   s = s.toString();
   var r = 0, a = s.length, c = 1, o = 0, u = {}, h = [], d = null;
-  function l(T) {
-    return Error("illegal " + T + " (line " + c + ")");
+  function l(x) {
+    return Error("illegal " + x + " (line " + c + ")");
   }
   function m() {
-    var T = d === "'" ? stringSingleRe : stringDoubleRe;
-    T.lastIndex = r - 1;
-    var C = T.exec(s);
-    if (!C) throw l("string");
-    return r = T.lastIndex, w(d), d = null, unescape(C[1]);
+    var x = d === "'" ? stringSingleRe : stringDoubleRe;
+    x.lastIndex = r - 1;
+    var E = x.exec(s);
+    if (!E) throw l("string");
+    return r = x.lastIndex, w(d), d = null, unescape(E[1]);
   }
-  function y(T) {
-    return s.charAt(T);
+  function y(x) {
+    return s.charAt(x);
   }
-  function g(T, C, E) {
+  function g(x, E, C) {
     var R = {
-      type: s.charAt(T++),
+      type: s.charAt(x++),
       lineEmpty: !1,
-      leading: E
+      leading: C
     }, P;
     i ? P = 2 : P = 3;
-    var D = T - P, k;
+    var k = x - P, A;
     do
-      if (--D < 0 || (k = s.charAt(D)) === `
+      if (--k < 0 || (A = s.charAt(k)) === `
 `) {
         R.lineEmpty = !0;
         break;
       }
-    while (k === " " || k === "	");
-    for (var I = s.substring(T, C).split(setCommentSplitRe), B = 0; B < I.length; ++B)
-      I[B] = I[B].replace(i ? setCommentAltRe : setCommentRe, "").trim();
-    R.text = I.join(`
+    while (A === " " || A === "	");
+    for (var N = s.substring(x, E).split(setCommentSplitRe), B = 0; B < N.length; ++B)
+      N[B] = N[B].replace(i ? setCommentAltRe : setCommentRe, "").trim();
+    R.text = N.join(`
 `).trim(), u[c] = R, o = c;
   }
-  function p(T) {
-    var C = v(T), E = s.substring(T, C), R = /^\s*\/\//.test(E);
+  function p(x) {
+    var E = v(x), C = s.substring(x, E), R = /^\s*\/\//.test(C);
     return R;
   }
-  function v(T) {
-    for (var C = T; C < a && y(C) !== `
+  function v(x) {
+    for (var E = x; E < a && y(E) !== `
 `; )
-      C++;
-    return C;
+      E++;
+    return E;
   }
   function _() {
     if (h.length > 0) return h.shift();
     if (d) return m();
-    var T, C, E, R, P, D = r === 0;
+    var x, E, C, R, P, k = r === 0;
     do {
       if (r === a) return null;
-      for (T = !1; whitespaceRe.test(E = y(r)); )
-        if (E === `
-` && (D = !0, ++c), ++r === a) return null;
+      for (x = !1; whitespaceRe.test(C = y(r)); )
+        if (C === `
+` && (k = !0, ++c), ++r === a) return null;
       if (y(r) === "/") {
         if (++r === a)
           throw l("comment");
@@ -4033,60 +4033,60 @@ function tokenize$1(s, i) {
             if (R = r, P = !1, p(r - 1)) {
               P = !0;
               do
-                if (r = v(r), r === a || (r++, !D))
+                if (r = v(r), r === a || (r++, !k))
                   break;
               while (p(r));
             } else
               r = Math.min(a, v(r) + 1);
-            P && (g(R, r, D), D = !0), c++, T = !0;
+            P && (g(R, r, k), k = !0), c++, x = !0;
           } else {
             for (P = y(R = r + 1) === "/"; y(++r) !== `
 `; )
               if (r === a)
                 return null;
-            ++r, P && (g(R, r - 1, D), D = !0), ++c, T = !0;
+            ++r, P && (g(R, r - 1, k), k = !0), ++c, x = !0;
           }
-        else if ((E = y(r)) === "*") {
+        else if ((C = y(r)) === "*") {
           R = r + 1, P = i || y(R) === "*";
           do {
-            if (E === `
+            if (C === `
 ` && ++c, ++r === a)
               throw l("comment");
-            C = E, E = y(r);
-          } while (C !== "*" || E !== "/");
-          ++r, P && (g(R, r - 2, D), D = !0), T = !0;
+            E = C, C = y(r);
+          } while (E !== "*" || C !== "/");
+          ++r, P && (g(R, r - 2, k), k = !0), x = !0;
         } else
           return "/";
       }
-    } while (T);
-    var k = r;
+    } while (x);
+    var A = r;
     delimRe.lastIndex = 0;
-    var I = delimRe.test(y(k++));
-    if (!I) for (; k < a && !delimRe.test(y(k)); ) ++k;
-    var B = s.substring(r, r = k);
+    var N = delimRe.test(y(A++));
+    if (!N) for (; A < a && !delimRe.test(y(A)); ) ++A;
+    var B = s.substring(r, r = A);
     return (B === '"' || B === "'") && (d = B), B;
   }
-  function w(T) {
-    h.push(T);
+  function w(x) {
+    h.push(x);
   }
   function O() {
     if (!h.length) {
-      var T = _();
-      if (T === null) return null;
-      w(T);
+      var x = _();
+      if (x === null) return null;
+      w(x);
     }
     return h[0];
   }
-  function b(T, C) {
-    var E = O(), R = E === T;
+  function b(x, E) {
+    var C = O(), R = C === x;
     if (R)
       return _(), !0;
-    if (!C) throw l("token '" + E + "', '" + T + "' expected");
+    if (!E) throw l("token '" + C + "', '" + x + "' expected");
     return !1;
   }
-  function x(T) {
-    var C = null, E;
-    return T === void 0 ? (E = u[c - 1], delete u[c - 1], E && (i || E.type === "*" || E.lineEmpty) && (C = E.leading ? E.text : null)) : (o < T && O(), E = u[T], delete u[T], E && !E.lineEmpty && (i || E.type === "/") && (C = E.leading ? null : E.text)), C;
+  function T(x) {
+    var E = null, C;
+    return x === void 0 ? (C = u[c - 1], delete u[c - 1], C && (i || C.type === "*" || C.lineEmpty) && (E = C.leading ? C.text : null)) : (o < x && O(), C = u[x], delete u[x], C && !C.lineEmpty && (i || C.type === "/") && (E = C.leading ? null : C.text)), E;
   }
   return Object.defineProperty(
     {
@@ -4094,7 +4094,7 @@ function tokenize$1(s, i) {
       peek: O,
       push: w,
       skip: b,
-      cmnt: x
+      cmnt: T
     },
     "line",
     {
@@ -4115,26 +4115,26 @@ function parse(s, i, r) {
   var a = r.preferTrailingComment || !1, c = tokenize(s, r.alternateCommentMode || !1), o = c.next, u = c.push, h = c.peek, d = c.skip, l = c.cmnt, m = !0, y, g, p, v, _ = !1, w = i, O = r.keepCase ? function(S) {
     return S;
   } : util.camelCase;
-  function b(S, A, N) {
+  function b(S, D, I) {
     var F = parse.filename;
-    return N || (parse.filename = null), Error(
-      "illegal " + (A || "token") + " '" + S + "' (" + (F ? F + ", " : "") + "line " + c.line + ")"
+    return I || (parse.filename = null), Error(
+      "illegal " + (D || "token") + " '" + S + "' (" + (F ? F + ", " : "") + "line " + c.line + ")"
     );
   }
-  function x() {
-    var S = [], A;
+  function T() {
+    var S = [], D;
     do {
-      if ((A = o()) !== '"' && A !== "'") throw b(A);
-      S.push(o()), d(A), A = h();
-    } while (A === '"' || A === "'");
+      if ((D = o()) !== '"' && D !== "'") throw b(D);
+      S.push(o()), d(D), D = h();
+    } while (D === '"' || D === "'");
     return S.join("");
   }
-  function T() {
+  function x() {
     var S = o();
     switch (S) {
       case "'":
       case '"':
-        return u(S), x();
+        return u(S), T();
       case "true":
       case "TRUE":
         return !0;
@@ -4143,7 +4143,7 @@ function parse(s, i, r) {
         return !1;
     }
     try {
-      return E(
+      return C(
         S,
         /* insideTryCatch */
         !0
@@ -4153,10 +4153,10 @@ function parse(s, i, r) {
       throw b(S, "value");
     }
   }
-  function C(S, A) {
-    var N, F;
+  function E(S, D) {
+    var I, F;
     do
-      A && ((N = h()) === '"' || N === "'") ? S.push(x()) : S.push([F = R(o()), d("to", !0) ? R(o()) : F]);
+      D && ((I = h()) === '"' || I === "'") ? S.push(T()) : S.push([F = R(o()), d("to", !0) ? R(o()) : F]);
     while (d(",", !0));
     var M = {
       options: void 0
@@ -4171,17 +4171,17 @@ function parse(s, i, r) {
         else throw b(z);
       },
       function() {
-        Z(M);
+        ee(M);
       }
     );
   }
-  function E(S, A) {
-    var N = 1;
-    switch (S.charAt(0) === "-" && (N = -1, S = S.substring(1)), S) {
+  function C(S, D) {
+    var I = 1;
+    switch (S.charAt(0) === "-" && (I = -1, S = S.substring(1)), S) {
       case "inf":
       case "INF":
       case "Inf":
-        return N * (1 / 0);
+        return I * (1 / 0);
       case "nan":
       case "NAN":
       case "Nan":
@@ -4190,13 +4190,13 @@ function parse(s, i, r) {
       case "0":
         return 0;
     }
-    if (base10Re.test(S)) return N * parseInt(S, 10);
-    if (base16Re.test(S)) return N * parseInt(S, 16);
-    if (base8Re.test(S)) return N * parseInt(S, 8);
-    if (numberRe.test(S)) return N * parseFloat(S);
-    throw b(S, "number", A);
+    if (base10Re.test(S)) return I * parseInt(S, 10);
+    if (base16Re.test(S)) return I * parseInt(S, 16);
+    if (base8Re.test(S)) return I * parseInt(S, 8);
+    if (numberRe.test(S)) return I * parseFloat(S);
+    throw b(S, "number", D);
   }
-  function R(S, A) {
+  function R(S, D) {
     switch (S) {
       case "max":
       case "MAX":
@@ -4205,7 +4205,7 @@ function parse(s, i, r) {
       case "0":
         return 0;
     }
-    if (!A && S.charAt(0) === "-") throw b(S, "id");
+    if (!D && S.charAt(0) === "-") throw b(S, "id");
     if (base10NegRe.test(S)) return parseInt(S, 10);
     if (base16NegRe.test(S)) return parseInt(S, 16);
     if (base8NegRe.test(S)) return parseInt(S, 8);
@@ -4216,83 +4216,83 @@ function parse(s, i, r) {
     if (y = o(), !typeRefRe.test(y)) throw b(y, "name");
     w = w.define(y), d(";");
   }
-  function D() {
-    var S = h(), A;
+  function k() {
+    var S = h(), D;
     switch (S) {
       case "weak":
-        A = p || (p = []), o();
+        D = p || (p = []), o();
         break;
       case "public":
         o();
       default:
-        A = g || (g = []);
+        D = g || (g = []);
         break;
     }
-    S = x(), d(";"), A.push(S);
+    S = T(), d(";"), D.push(S);
   }
-  function k() {
-    if (d("="), v = x(), _ = v === "proto3", !_ && v !== "proto2") throw b(v, "syntax");
+  function A() {
+    if (d("="), v = T(), _ = v === "proto3", !_ && v !== "proto2") throw b(v, "syntax");
     i.setOption("syntax", v), d(";");
   }
-  function I(S, A) {
-    switch (A) {
+  function N(S, D) {
+    switch (D) {
       case "option":
-        return j(S, A), d(";"), !0;
+        return j(S, D), d(";"), !0;
       case "message":
-        return H(S, A), !0;
+        return q(S, D), !0;
       case "enum":
-        return J(S, A), !0;
+        return W(S, D), !0;
       case "service":
-        return ie(S, A), !0;
+        return se(S, D), !0;
       case "extend":
-        return oe(S, A), !0;
+        return oe(S, D), !0;
     }
     return !1;
   }
-  function B(S, A, N) {
+  function B(S, D, I) {
     var F = c.line;
     if (S && (typeof S.comment != "string" && (S.comment = l()), S.filename = parse.filename), d("{", !0)) {
-      for (var M; (M = o()) !== "}"; ) A(M);
+      for (var M; (M = o()) !== "}"; ) D(M);
       d(";", !0);
     } else
-      N && N(), d(";"), S && (typeof S.comment != "string" || a) && (S.comment = l(F) || S.comment);
+      I && I(), d(";"), S && (typeof S.comment != "string" || a) && (S.comment = l(F) || S.comment);
   }
-  function H(S, A) {
-    if (!nameRe.test(A = o())) throw b(A, "type name");
-    var N = new Type(A);
-    B(N, function(M) {
-      if (!I(N, M))
+  function q(S, D) {
+    if (!nameRe.test(D = o())) throw b(D, "type name");
+    var I = new Type(D);
+    B(I, function(M) {
+      if (!N(I, M))
         switch (M) {
           case "map":
-            re(N);
+            U(I);
             break;
           case "required":
           case "repeated":
-            q(N, M);
+            H(I, M);
             break;
           case "optional":
-            _ ? q(N, "proto3_optional") : q(N, "optional");
+            _ ? H(I, "proto3_optional") : H(I, "optional");
             break;
           case "oneof":
-            X(N, M);
+            X(I, M);
             break;
           case "extensions":
-            C(N.extensions || (N.extensions = []));
+            E(I.extensions || (I.extensions = []));
             break;
           case "reserved":
-            C(N.reserved || (N.reserved = []), !0);
+            E(I.reserved || (I.reserved = []), !0);
             break;
           default:
             if (!_ || !typeRefRe.test(M)) throw b(M);
-            u(M), q(N, "optional");
+            u(M), H(I, "optional");
             break;
         }
-    }), S.add(N);
+    }), S.add(I);
   }
-  function q(S, A, N) {
+  function H(S, D, I) {
     var F = o();
     if (F === "group") {
-      U(S, A);
+      Z(S, D);
       return;
     }
     for (; F.endsWith(".") || h().startsWith("."); )
@@ -4301,7 +4301,7 @@ function parse(s, i, r) {
     var M = o();
     if (!nameRe.test(M)) throw b(M, "name");
     M = O(M), d("=");
-    var $ = new Field(M, R(o()), F, A, N);
+    var $ = new Field(M, R(o()), F, D, I);
     if (B(
       $,
       function(V) {
@@ -4310,9 +4310,9 @@ function parse(s, i, r) {
         else throw b(V);
       },
       function() {
-        Z($);
+        ee($);
       }
-    ), A === "proto3_optional") {
+    ), D === "proto3_optional") {
       var z = new OneOf("_" + M);
       $.setOption("proto3_optional", !0), z.add($), S.add(z);
     } else
@@ -4324,14 +4324,14 @@ function parse(s, i, r) {
       !0
     );
   }
-  function U(S, A) {
-    var N = o();
-    if (!nameRe.test(N)) throw b(N, "name");
-    var F = util.lcFirst(N);
-    N === F && (N = util.ucFirst(N)), d("=");
-    var M = R(o()), $ = new Type(N);
+  function Z(S, D) {
+    var I = o();
+    if (!nameRe.test(I)) throw b(I, "name");
+    var F = util.lcFirst(I);
+    I === F && (I = util.ucFirst(I)), d("=");
+    var M = R(o()), $ = new Type(I);
     $.group = !0;
-    var z = new Field(F, M, N, A);
+    var z = new Field(F, M, I, D);
     z.filename = parse.filename, B($, function(V) {
       switch (V) {
         case "option":
@@ -4339,16 +4339,16 @@ function parse(s, i, r) {
           break;
         case "required":
         case "repeated":
-          q($, V);
+          H($, V);
           break;
         case "optional":
-          _ ? q($, "proto3_optional") : q($, "optional");
+          _ ? H($, "proto3_optional") : H($, "optional");
           break;
         case "message":
-          H($, V);
+          q($, V);
           break;
         case "enum":
-          J($, V);
+          W($, V);
           break;
         /* istanbul ignore next */
         default:
@@ -4356,18 +4356,18 @@ function parse(s, i, r) {
       }
     }), S.add($).add(z);
   }
-  function re(S) {
+  function U(S) {
     d("<");
-    var A = o();
-    if (types.mapKey[A] === void 0) throw b(A, "type");
+    var D = o();
+    if (types.mapKey[D] === void 0) throw b(D, "type");
     d(",");
-    var N = o();
-    if (!typeRefRe.test(N)) throw b(N, "type");
+    var I = o();
+    if (!typeRefRe.test(I)) throw b(I, "type");
     d(">");
     var F = o();
     if (!nameRe.test(F)) throw b(F, "name");
     d("=");
-    var M = new MapField(O(F), R(o()), A, N);
+    var M = new MapField(O(F), R(o()), D, I);
     B(
       M,
       function(z) {
@@ -4376,37 +4376,37 @@ function parse(s, i, r) {
         else throw b(z);
       },
       function() {
-        Z(M);
+        ee(M);
       }
     ), S.add(M);
   }
-  function X(S, A) {
-    if (!nameRe.test(A = o())) throw b(A, "name");
-    var N = new OneOf(O(A));
-    B(N, function(M) {
-      M === "option" ? (j(N, M), d(";")) : (u(M), q(N, "optional"));
-    }), S.add(N);
-  }
-  function J(S, A) {
-    if (!nameRe.test(A = o())) throw b(A, "name");
-    var N = new Enum(A);
-    B(N, function(M) {
+  function X(S, D) {
+    if (!nameRe.test(D = o())) throw b(D, "name");
+    var I = new OneOf(O(D));
+    B(I, function(M) {
+      M === "option" ? (j(I, M), d(";")) : (u(M), H(I, "optional"));
+    }), S.add(I);
+  }
+  function W(S, D) {
+    if (!nameRe.test(D = o())) throw b(D, "name");
+    var I = new Enum(D);
+    B(I, function(M) {
       switch (M) {
         case "option":
-          j(N, M), d(";");
+          j(I, M), d(";");
           break;
         case "reserved":
-          C(N.reserved || (N.reserved = []), !0);
+          E(I.reserved || (I.reserved = []), !0);
           break;
         default:
-          W(N, M);
+          J(I, M);
       }
-    }), S.add(N);
+    }), S.add(I);
   }
-  function W(S, A) {
-    if (!nameRe.test(A)) throw b(A, "name");
+  function J(S, D) {
+    if (!nameRe.test(D)) throw b(D, "name");
     d("=");
-    var N = R(o(), !0), F = {
+    var I = R(o(), !0), F = {
       options: void 0
     };
     F.setOption = function(M, $) {
@@ -4419,53 +4419,53 @@ function parse(s, i, r) {
         else throw b($);
       },
       function() {
-        Z(F);
+        ee(F);
       }
-    ), S.add(A, N, F.comment, F.options);
+    ), S.add(D, I, F.comment, F.options);
   }
-  function j(S, A) {
-    var N = d("(", !0);
-    if (!typeRefRe.test(A = o())) throw b(A, "name");
-    var F = A, M = F, $;
-    N && (d(")"), F = "(" + F + ")", M = F, A = h(), fqTypeRefRe.test(A) && ($ = A.slice(1), F += A, o())), d("=");
-    var z = K(S, F);
-    te(S, M, z, $);
+  function j(S, D) {
+    var I = d("(", !0);
+    if (!typeRefRe.test(D = o())) throw b(D, "name");
+    var F = D, M = F, $;
+    I && (d(")"), F = "(" + F + ")", M = F, D = h(), fqTypeRefRe.test(D) && ($ = D.slice(1), F += D, o())), d("=");
+    var z = re(S, F);
+    Q(S, M, z, $);
   }
-  function K(S, A) {
+  function re(S, D) {
     if (d("{", !0)) {
-      for (var N = {}; !d("}", !0); ) {
+      for (var I = {}; !d("}", !0); ) {
         if (!nameRe.test(G = o()))
           throw b(G, "name");
         if (G === null)
           throw b(G, "end of input");
         var F, M = G;
-        if (d(":", !0), h() === "{") F = K(S, A + "." + G);
+        if (d(":", !0), h() === "{") F = re(S, D + "." + G);
         else if (h() === "[") {
           F = [];
           var $;
           if (d("[", !0)) {
             do
-              $ = T(), F.push($);
+              $ = x(), F.push($);
             while (d(",", !0));
-            d("]"), typeof $ < "u" && Q(S, A + "." + G, $);
+            d("]"), typeof $ < "u" && Y(S, D + "." + G, $);
           }
         } else
-          F = T(), Q(S, A + "." + G, F);
-        var z = N[M];
-        z && (F = [].concat(z).concat(F)), N[M] = F, d(",", !0), d(";", !0);
+          F = x(), Y(S, D + "." + G, F);
+        var z = I[M];
+        z && (F = [].concat(z).concat(F)), I[M] = F, d(",", !0), d(";", !0);
       }
-      return N;
+      return I;
     }
-    var Y = T();
-    return Q(S, A, Y), Y;
+    var K = x();
+    return Y(S, D, K), K;
   }
-  function Q(S, A, N) {
-    S.setOption && S.setOption(A, N);
+  function Y(S, D, I) {
+    S.setOption && S.setOption(D, I);
   }
-  function te(S, A, N, F) {
-    S.setParsedOption && S.setParsedOption(A, N, F);
+  function Q(S, D, I, F) {
+    S.setParsedOption && S.setParsedOption(D, I, F);
   }
-  function Z(S) {
+  function ee(S) {
     if (d("[", !0)) {
       do
         j(S, "option");
@@ -4474,43 +4474,43 @@ function parse(s, i, r) {
     }
     return S;
   }
-  function ie(S, A) {
-    if (!nameRe.test(A = o())) throw b(A, "service name");
-    var N = new Service(A);
-    B(N, function(M) {
-      if (!I(N, M))
-        if (M === "rpc") ae(N, M);
+  function se(S, D) {
+    if (!nameRe.test(D = o())) throw b(D, "service name");
+    var I = new Service(D);
+    B(I, function(M) {
+      if (!N(I, M))
+        if (M === "rpc") ae(I, M);
         else throw b(M);
-    }), S.add(N);
-  }
-  function ae(S, A) {
-    var N = l(), F = A;
-    if (!nameRe.test(A = o())) throw b(A, "name");
-    var M = A, $, z, Y, V;
-    if (d("("), d("stream", !0) && (z = !0), !typeRefRe.test(A = o()) || ($ = A, d(")"), d("returns"), d("("), d("stream", !0) && (V = !0), !typeRefRe.test(A = o()))) throw b(A);
-    Y = A, d(")");
-    var ne = new Method(M, F, $, Y, z, V);
-    ne.comment = N, B(ne, function(se) {
-      if (se === "option")
-        j(ne, se), d(";");
-      else throw b(se);
-    }), S.add(ne);
-  }
-  function oe(S, A) {
-    if (!typeRefRe.test(A = o())) throw b(A, "reference");
-    var N = A;
+    }), S.add(I);
+  }
+  function ae(S, D) {
+    var I = l(), F = D;
+    if (!nameRe.test(D = o())) throw b(D, "name");
+    var M = D, $, z, K, V;
+    if (d("("), d("stream", !0) && (z = !0), !typeRefRe.test(D = o()) || ($ = D, d(")"), d("returns"), d("("), d("stream", !0) && (V = !0), !typeRefRe.test(D = o()))) throw b(D);
+    K = D, d(")");
+    var ie = new Method(M, F, $, K, z, V);
+    ie.comment = I, B(ie, function(ne) {
+      if (ne === "option")
+        j(ie, ne), d(";");
+      else throw b(ne);
+    }), S.add(ie);
+  }
+  function oe(S, D) {
+    if (!typeRefRe.test(D = o())) throw b(D, "reference");
+    var I = D;
     B(null, function(M) {
       switch (M) {
         case "required":
         case "repeated":
-          q(S, M, N);
+          H(S, M, I);
           break;
         case "optional":
-          _ ? q(S, "proto3_optional", N) : q(S, "optional", N);
+          _ ? H(S, "proto3_optional", I) : H(S, "optional", I);
           break;
         default:
           if (!_ || !typeRefRe.test(M)) throw b(M);
-          u(M), q(S, "optional", N);
+          u(M), H(S, "optional", I);
           break;
       }
     });
@@ -4523,17 +4523,17 @@ function parse(s, i, r) {
         break;
       case "import":
         if (!m) throw b(G);
-        D();
+        k();
         break;
       case "syntax":
         if (!m) throw b(G);
-        k();
+        A();
         break;
       case "option":
         j(w, G), d(";");
         break;
       default:
-        if (I(w, G)) {
+        if (N(w, G)) {
           m = !1;
           continue;
         }
@@ -5341,39 +5341,39 @@ function debounce(s, i, r) {
   if (typeof s != "function")
     throw new TypeError(FUNC_ERROR_TEXT);
   i = toNumber(i) || 0, isObject(r) && (m = !!r.leading, y = "maxWait" in r, o = y ? nativeMax(toNumber(r.maxWait) || 0, i) : o, g = "trailing" in r ? !!r.trailing : g);
-  function p(E) {
+  function p(C) {
     var R = a, P = c;
-    return a = c = void 0, l = E, u = s.apply(P, R), u;
+    return a = c = void 0, l = C, u = s.apply(P, R), u;
   }
-  function v(E) {
-    return l = E, h = setTimeout(O, i), m ? p(E) : u;
+  function v(C) {
+    return l = C, h = setTimeout(O, i), m ? p(C) : u;
   }
-  function _(E) {
-    var R = E - d, P = E - l, D = i - R;
-    return y ? nativeMin(D, o - P) : D;
+  function _(C) {
+    var R = C - d, P = C - l, k = i - R;
+    return y ? nativeMin(k, o - P) : k;
   }
-  function w(E) {
-    var R = E - d, P = E - l;
+  function w(C) {
+    var R = C - d, P = C - l;
     return d === void 0 || R >= i || R < 0 || y && P >= o;
   }
   function O() {
-    var E = now();
-    if (w(E))
-      return b(E);
-    h = setTimeout(O, _(E));
+    var C = now();
+    if (w(C))
+      return b(C);
+    h = setTimeout(O, _(C));
   }
-  function b(E) {
-    return h = void 0, g && a ? p(E) : (a = c = void 0, u);
+  function b(C) {
+    return h = void 0, g && a ? p(C) : (a = c = void 0, u);
   }
-  function x() {
+  function T() {
     h !== void 0 && clearTimeout(h), l = 0, a = d = c = h = void 0;
   }
-  function T() {
+  function x() {
     return h === void 0 ? u : b(now());
   }
-  function C() {
-    var E = now(), R = w(E);
-    if (a = arguments, c = this, d = E, R) {
+  function E() {
+    var C = now(), R = w(C);
+    if (a = arguments, c = this, d = C, R) {
       if (h === void 0)
         return v(d);
       if (y)
@@ -5381,7 +5381,7 @@ function debounce(s, i, r) {
     }
     return h === void 0 && (h = setTimeout(O, i)), u;
   }
-  return C.cancel = x, C.flush = T, C;
+  return E.cancel = T, E.flush = x, E;
 }
 var objectProto = Object.prototype, hasOwnProperty = objectProto.hasOwnProperty, defaults = baseRest(function(s, i) {
   s = Object(s);
@@ -5437,7 +5437,7 @@ function requireEventemitter3() {
     }, h.prototype.emit = function(l, m, y, g, p, v) {
       var _ = r ? r + l : l;
       if (!this._events[_]) return !1;
-      var w = this._events[_], O = arguments.length, b, x;
+      var w = this._events[_], O = arguments.length, b, T;
       if (w.fn) {
         switch (w.once && this.removeListener(l, w.fn, void 0, !0), O) {
           case 1:
@@ -5453,29 +5453,29 @@ function requireEventemitter3() {
           case 6:
             return w.fn.call(w.context, m, y, g, p, v), !0;
         }
-        for (x = 1, b = new Array(O - 1); x < O; x++)
-          b[x - 1] = arguments[x];
+        for (T = 1, b = new Array(O - 1); T < O; T++)
+          b[T - 1] = arguments[T];
         w.fn.apply(w.context, b);
       } else {
-        var T = w.length, C;
-        for (x = 0; x < T; x++)
-          switch (w[x].once && this.removeListener(l, w[x].fn, void 0, !0), O) {
+        var x = w.length, E;
+        for (T = 0; T < x; T++)
+          switch (w[T].once && this.removeListener(l, w[T].fn, void 0, !0), O) {
             case 1:
-              w[x].fn.call(w[x].context);
+              w[T].fn.call(w[T].context);
               break;
             case 2:
-              w[x].fn.call(w[x].context, m);
+              w[T].fn.call(w[T].context, m);
               break;
             case 3:
-              w[x].fn.call(w[x].context, m, y);
+              w[T].fn.call(w[T].context, m, y);
               break;
             case 4:
-              w[x].fn.call(w[x].context, m, y, g);
+              w[T].fn.call(w[T].context, m, y, g);
               break;
             default:
-              if (!b) for (C = 1, b = new Array(O - 1); C < O; C++)
-                b[C - 1] = arguments[C];
-              w[x].fn.apply(w[x].context, b);
+              if (!b) for (E = 1, b = new Array(O - 1); E < O; E++)
+                b[E - 1] = arguments[E];
+              w[T].fn.apply(w[T].context, b);
           }
       }
       return !0;
@@ -5720,17 +5720,6 @@ function getHideAfterSomeMinutesProperty(s, i) {
   const r = i ?? Cesium.JulianDate.now(), a = Cesium.JulianDate.addMinutes(r, s, new Cesium.JulianDate());
   return new Cesium.CallbackProperty((c) => c ? Cesium.JulianDate.lessThan(c, a) : !0, !1);
 }
-function getHideAfterSomeMinutesAndByDistance(s, i, r, a, c) {
-  const o = c ?? Cesium.JulianDate.now(), u = Cesium.JulianDate.addMinutes(o, s, new Cesium.JulianDate());
-  return new Cesium.CallbackProperty((h) => {
-    var m;
-    if (!a) return !0;
-    if (!h || !Cesium.JulianDate.lessThan(h, u))
-      return !1;
-    const d = (m = r.position) == null ? void 0 : m.getValue(h);
-    return d ? Cesium.Cartesian3.distance(a.positionWC, d) <= (i ?? 4e3) : !1;
-  }, !1);
-}
 function createRoundedRectImage({
   text: s = "未知",
   fill: i = "#5582DF",
@@ -5751,12 +5740,12 @@ function createRoundedRectImage({
   const O = w.getContext("2d");
   if (!O) throw new Error("无法获取2D绘图上下文");
   O.scale(g, g), O.clearRect(0, 0, v, _), O.lineJoin = "round", O.lineCap = "round";
-  const b = p, x = p, T = v - p, C = _ - p, E = T - b, R = C - x, P = Math.min(l, Math.min(E, R) / 2);
-  O.beginPath(), O.moveTo(b + P, x), O.lineTo(T - P, x), O.quadraticCurveTo(T, x, T, x + P), O.lineTo(T, C - P), O.quadraticCurveTo(T, C, T - P, C), O.lineTo(b + P, C), O.quadraticCurveTo(b, C, b, C - 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 = a, O.strokeStyle = r, O.stroke();
-  const D = Math.max(0, m - d * 2);
-  let k = h;
-  for (O.fillStyle = c, O.textAlign = "center", O.textBaseline = "middle", O.font = `${u} ${k}px ${o}`; O.measureText(s).width > D && k > 10; )
-    k -= 1, O.font = `${u} ${k}px ${o}`;
+  const b = p, T = p, x = v - p, E = _ - p, C = x - b, R = E - T, P = Math.min(l, Math.min(C, R) / 2);
+  O.beginPath(), O.moveTo(b + P, T), O.lineTo(x - P, T), O.quadraticCurveTo(x, T, x, T + P), O.lineTo(x, E - P), O.quadraticCurveTo(x, E, x - P, E), O.lineTo(b + P, E), O.quadraticCurveTo(b, E, b, E - P), O.lineTo(b, T + P), O.quadraticCurveTo(b, T, b + P, T), O.closePath(), i && i !== "transparent" && (O.fillStyle = i, O.fill()), O.lineWidth = a, O.strokeStyle = r, O.stroke();
+  const k = Math.max(0, m - d * 2);
+  let A = h;
+  for (O.fillStyle = c, O.textAlign = "center", O.textBaseline = "middle", O.font = `${u} ${A}px ${o}`; O.measureText(s).width > k && A > 10; )
+    A -= 1, O.font = `${u} ${A}px ${o}`;
   return O.fillText(s, v / 2, _ / 2 + 1), w;
 }
 function hookClusterEvent(s) {
@@ -5860,82 +5849,84 @@ class ShipLayer extends EventEmitter {
   }
   /**更新or新增feature */
   update(r) {
-    var c, o, u, h, d, l, m, y, g, p, v, _, w, O, b, x, T;
+    var c, o, u, h, d, l, m, y, g, p, v, _, w, O, b, T;
     const a = this.db.entities.getById(this.getIdByFeature(r));
     if (a) {
-      const C = this.labelDataSource.entities.getById(a.id + "_shadow1"), E = this.shadowEntityMap.get(a), R = ((c = r.properties) == null ? void 0 : c.shipTypeId) ?? -1, P = shipTypeColorMap.get(R) ?? shipTypeColorMap.get(-1), [D, k] = r.geometry.coordinates, I = ((o = this._viewer) == null ? void 0 : o.clock.currentTime) ?? Cesium.JulianDate.now(), B = (u = a.position) == null ? void 0 : u.getValue(I), H = Cesium.Cartesian3.fromDegrees(D, k), q = new Cesium.SampledPositionProperty();
+      const x = this.labelDataSource.entities.getById(a.id + "_shadow1"), E = this.shadowEntityMap.get(a), C = ((c = r.properties) == null ? void 0 : c.shipTypeId) ?? -1, R = shipTypeColorMap.get(C) ?? shipTypeColorMap.get(-1), [P, k] = r.geometry.coordinates, A = ((o = this._viewer) == null ? void 0 : o.clock.currentTime) ?? Cesium.JulianDate.now(), N = (u = a.position) == null ? void 0 : u.getValue(A), B = Cesium.Cartesian3.fromDegrees(P, k), q = new Cesium.SampledPositionProperty();
       q.backwardExtrapolationType = Cesium.ExtrapolationType.HOLD, q.forwardExtrapolationType = Cesium.ExtrapolationType.HOLD;
-      const U = (h = a.properties) == null ? void 0 : h.getValue().updateTime, re = (d = r.properties) == null ? void 0 : d.updateTime;
-      if (U && re && new Date(re).getTime() - new Date(U).getTime() >= 3 * 1e3 * 60)
-        q.addSample(I, H);
+      const H = (h = a.properties) == null ? void 0 : h.getValue().updateTime, Z = (d = r.properties) == null ? void 0 : d.updateTime;
+      if (H && Z && new Date(Z).getTime() - new Date(H).getTime() >= 3 * 1e3 * 60)
+        q.addSample(A, B);
       else {
-        const X = Cesium.JulianDate.addSeconds(I, 3, new Cesium.JulianDate());
+        const U = Cesium.JulianDate.addSeconds(A, 3, new Cesium.JulianDate());
         q.addSample(
-          Cesium.JulianDate.addSeconds(I, 1, new Cesium.JulianDate()),
-          B ?? H
-        ), q.addSample(X, H);
+          Cesium.JulianDate.addSeconds(A, 1, new Cesium.JulianDate()),
+          N ?? B
+        ), q.addSample(U, B);
       }
-      if (a.position = q, E && (E.position = q), C && (C.position = q), a.properties)
-        for (const [X, J] of Object.entries(r.properties ?? {})) {
-          if (X == "speedOverGround") {
-            const W = a.properties.getValue().speedOverGround ?? 0, j = Number(W) > this.IS_MOVING_THRESHOLD, K = Number(J) > this.IS_MOVING_THRESHOLD;
-            if (j !== K && (a.billboard && (a.billboard.image = new Cesium.ConstantProperty(
-              createShipIconUrl(P, K)
+      if (a.position = q, E && (E.position = q), x && (x.position = q), a.properties)
+        for (const [U, X] of Object.entries(r.properties ?? {})) {
+          if (U == "speedOverGround") {
+            const W = a.properties.getValue().speedOverGround ?? 0, J = Number(W) > this.IS_MOVING_THRESHOLD, j = Number(X) > this.IS_MOVING_THRESHOLD;
+            if (J !== j && (a.billboard && (a.billboard.image = new Cesium.ConstantProperty(
+              createShipIconUrl(R, j)
             )), E != null && E.plane)) {
-              const Q = ((l = r.properties) == null ? void 0 : l.designBeam) ?? ((y = (m = this.opt) == null ? void 0 : m.defaultValue) == null ? void 0 : y.designBeam) ?? 12, te = ((g = r.properties) == null ? void 0 : g.designLength) ?? ((v = (p = this.opt) == null ? void 0 : p.defaultValue) == null ? void 0 : v.designLength) ?? 35, Z = createShipIconV2({
-                color: P,
-                isMoving: K,
+              const re = ((l = r.properties) == null ? void 0 : l.designBeam) ?? ((y = (m = this.opt) == null ? void 0 : m.defaultValue) == null ? void 0 : y.designBeam) ?? 12, Y = ((g = r.properties) == null ? void 0 : g.designLength) ?? ((v = (p = this.opt) == null ? void 0 : p.defaultValue) == null ? void 0 : v.designLength) ?? 35, Q = createShipIconV2({
+                color: R,
+                isMoving: j,
                 ...r.properties,
-                designBeam: Q,
-                designLength: te
-              }), ie = (_ = E.plane) == null ? void 0 : _.material;
-              ie && (ie.image = new Cesium.ConstantProperty(Z.url), E.plane.dimensions = new Cesium.ConstantProperty(
-                new Cesium.Cartesian2(Q * Z.scale.x, te * Z.scale.y)
+                designBeam: re,
+                designLength: Y
+              }), ee = (_ = E.plane) == null ? void 0 : _.material;
+              ee && (ee.image = new Cesium.ConstantProperty(Q.url), E.plane.dimensions = new Cesium.ConstantProperty(
+                new Cesium.Cartesian2(re * Q.scale.x, Y * Q.scale.y)
               )), E.plane.dimensions = new Cesium.CallbackProperty(
-                () => new Cesium.Cartesian2(Q * Z.scale.x, te * Z.scale.y),
+                () => new Cesium.Cartesian2(re * Q.scale.x, Y * Q.scale.y),
                 !0
               );
             }
           }
-          if (X == "courseOverGroundTrue") {
+          if (U == "courseOverGroundTrue") {
             const W = ((w = r.properties) == null ? void 0 : w.courseOverGroundTrue) ?? 0;
             a.billboard.rotation = new Cesium.ConstantProperty(
-              typeof J == "number" ? -1 * J : 0
+              typeof X == "number" ? -1 * X : 0
             );
-            const j = new Cesium.ConstantProperty(
+            const J = new Cesium.ConstantProperty(
               Cesium.Transforms.headingPitchRollQuaternion(
-                H,
+                B,
                 new Cesium.HeadingPitchRoll(W, 0, 0)
               )
             );
-            E && (E.orientation = j);
+            E && (E.orientation = J);
           }
-          if (X == "updateTime") {
-            const W = Cesium.JulianDate.fromDate(new Date(J));
-            a.billboard.color = createAlphaSampled({
+          if (U == "updateTime") {
+            const W = Cesium.JulianDate.fromDate(new Date(X));
+            a.billboard && (a.billboard.color = createAlphaSampled({
               startTime: W,
               startFadeMinutes: this.shipDisplayOptions.startFadeMinutes,
               endFadeMinutes: this.shipDisplayOptions.endFadeMinutes
-            });
-            const j = (O = E == null ? void 0 : E.plane) == null ? void 0 : O.material;
-            j && (j.color = createAlphaSampled({
+            }), a.billboard.show = getHideAfterSomeMinutesProperty(
+              this.shipDisplayOptions.hideMinutes,
+              W
+            ));
+            const J = (O = E == null ? void 0 : E.plane) == null ? void 0 : O.material;
+            J && (J.color = createAlphaSampled({
               startTime: W,
               startFadeMinutes: this.shipDisplayOptions.startFadeMinutes,
               endFadeMinutes: this.shipDisplayOptions.endFadeMinutes
             }));
-            const K = getHideAfterSomeMinutesProperty(
-              this.shipDisplayOptions.endFadeMinutes,
+            const j = getHideAfterSomeMinutesProperty(
+              Math.min(this.shipDisplayOptions.endFadeMinutes, this.shipDisplayOptions.hideMinutes),
               W
             );
-            C != null && C.billboard && (C.billboard.show = K), a.point.show = K, E != null && E.plane && (E.plane.show = getHideAfterSomeMinutesAndByDistance(
+            x != null && x.billboard && (x.billboard.show = j), a.point.show = j, E != null && E.plane && (E.plane.show = this.getHideAfterSomeMinutesAndByDistance(
               this.shipDisplayOptions.hideMinutes,
-              ((x = (b = this.opt) == null ? void 0 : b.distanceDisplayConditions) == null ? void 0 : x.near) ?? 4e3,
+              ((T = (b = this.opt) == null ? void 0 : b.distanceDisplayConditions) == null ? void 0 : T.near) ?? 4e3,
               a,
-              (T = this._viewer) == null ? void 0 : T.camera,
               W
             ));
           }
-          a.properties[X] = J, E != null && E.properties && (E.properties[X] = J);
+          a.properties[U] = X, E != null && E.properties && (E.properties[U] = X);
         }
     } else
       this.renderFeature(r);
@@ -5951,7 +5942,7 @@ class ShipLayer extends EventEmitter {
         ((g = (y = this.opt) == null ? void 0 : y.distanceDisplayConditions) == null ? void 0 : g.far) ?? 15e3
       ),
       show: getHideAfterSomeMinutesProperty(
-        this.shipDisplayOptions.endFadeMinutes,
+        Math.min(this.shipDisplayOptions.endFadeMinutes, this.shipDisplayOptions.hideMinutes),
         d
       )
     }), r.billboard = new Cesium.BillboardGraphics({
@@ -5963,6 +5954,7 @@ class ShipLayer extends EventEmitter {
         ((v = (p = this.opt) == null ? void 0 : p.distanceDisplayConditions) == null ? void 0 : v.near) ?? 4e3,
         ((w = (_ = this.opt) == null ? void 0 : _.distanceDisplayConditions) == null ? void 0 : w.far) ?? 15e3
       ),
+      show: getHideAfterSomeMinutesProperty(this.shipDisplayOptions.hideMinutes, d),
       pixelOffset: new Cesium.Cartesian2(0, 0),
       alignedAxis: Cesium.Cartesian3.UNIT_Z,
       color: createAlphaSampled({
@@ -5997,13 +5989,13 @@ class ShipLayer extends EventEmitter {
       ),
       disableDepthTestDistance: 5e3,
       show: getHideAfterSomeMinutesProperty(
-        this.shipDisplayOptions.endFadeMinutes,
+        Math.min(this.shipDisplayOptions.endFadeMinutes, this.shipDisplayOptions.hideMinutes),
         o
       )
     });
   }
   createShipPlane(r) {
-    var p, v, _, w, O, b, x, T;
+    var p, v, _, w, O, b, T;
     const a = new Cesium.Entity({
       id: r.id + "_shadow",
       position: r.position,
@@ -6021,11 +6013,10 @@ class ShipLayer extends EventEmitter {
     a.plane = new Cesium.PlaneGraphics({
       plane: new Cesium.Plane(Cesium.Cartesian3.UNIT_Z, 0),
       dimensions: new Cesium.Cartesian2(d * g.scale.x, l * g.scale.y),
-      show: getHideAfterSomeMinutesAndByDistance(
+      show: this.getHideAfterSomeMinutesAndByDistance(
         this.shipDisplayOptions.hideMinutes,
-        ((x = (b = this.opt) == null ? void 0 : b.distanceDisplayConditions) == null ? void 0 : x.near) ?? 4e3,
+        ((T = (b = this.opt) == null ? void 0 : b.distanceDisplayConditions) == null ? void 0 : T.near) ?? 4e3,
         r,
-        (T = this._viewer) == null ? void 0 : T.camera,
         u
       ),
       material: new Cesium.ImageMaterialProperty({
@@ -6054,6 +6045,17 @@ class ShipLayer extends EventEmitter {
       (c = this.hookFilterEntityFn) == null || c.call(this, a);
     }), r && this.on("createEntity", this.hookFilterEntityFn);
   }
+  getHideAfterSomeMinutesAndByDistance(r, a, c, o) {
+    const u = o ?? Cesium.JulianDate.now(), h = Cesium.JulianDate.addMinutes(u, r, new Cesium.JulianDate());
+    return new Cesium.CallbackProperty((d) => {
+      var y, g;
+      if (!((y = this._viewer) != null && y.camera)) return !0;
+      if (!d || !Cesium.JulianDate.lessThan(d, h))
+        return !1;
+      const l = (g = c.position) == null ? void 0 : g.getValue(d);
+      return l ? Cesium.Cartesian3.distance(this._viewer.camera.positionWC, l) <= (a ?? 4e3) : !1;
+    }, !1);
+  }
 }
 Color.fromCssColorString("#FC4C02");
 Color.WHITE;
@@ -6212,14 +6214,14 @@ function requireHeatmap() {
         return l.prototype = {
           // when forceRender = false -> called from setData, omits renderall event
           _organiseData: function(y, g) {
-            var p = y[this._xField], v = y[this._yField], _ = this._radi, w = this._data, O = this._max, b = this._min, x = y[this._valueField] || 1, T = y.radius || this._cfgRadius || m;
-            w[p] || (w[p] = [], _[p] = []), w[p][v] ? w[p][v] += x : (w[p][v] = x, _[p][v] = T);
-            var C = w[p][v];
-            return C > O ? (g ? this.setDataMax(C) : this._max = C, !1) : C < b ? (g ? this.setDataMin(C) : this._min = C, !1) : {
+            var p = y[this._xField], v = y[this._yField], _ = this._radi, w = this._data, O = this._max, b = this._min, T = y[this._valueField] || 1, x = y.radius || this._cfgRadius || m;
+            w[p] || (w[p] = [], _[p] = []), w[p][v] ? w[p][v] += T : (w[p][v] = T, _[p][v] = x);
+            var E = w[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: v,
-              value: x,
-              radius: T,
+              value: T,
+              radius: x,
               min: b,
               max: O
             };
@@ -6342,19 +6344,19 @@ function requireHeatmap() {
           if (_.width = _.height = p * 2, v == 1)
             w.beginPath(), w.arc(O, b, p, 0, 2 * Math.PI, !1), w.fillStyle = "rgba(0,0,0,1)", w.fill();
           else {
-            var x = w.createRadialGradient(O, b, p * v, O, b, p);
-            x.addColorStop(0, "rgba(0,0,0,1)"), x.addColorStop(1, "rgba(0,0,0,0)"), w.fillStyle = x, w.fillRect(0, 0, 2 * p, 2 * p);
+            var T = w.createRadialGradient(O, b, p * v, O, b, p);
+            T.addColorStop(0, "rgba(0,0,0,1)"), T.addColorStop(1, "rgba(0,0,0,0)"), w.fillStyle = T, w.fillRect(0, 0, 2 * p, 2 * p);
           }
           return _;
         }, y = function(b) {
-          for (var v = [], _ = b.min, w = b.max, O = b.radi, b = b.data, x = Object.keys(b), T = x.length; T--; )
-            for (var C = x[T], E = Object.keys(b[C]), R = E.length; R--; ) {
-              var P = E[R], D = b[C][P], k = O[C][P];
+          for (var v = [], _ = b.min, w = b.max, O = b.radi, b = b.data, T = Object.keys(b), x = T.length; x--; )
+            for (var E = T[x], C = Object.keys(b[E]), R = C.length; R--; ) {
+              var P = C[R], k = b[E][P], A = O[E][P];
               v.push({
-                x: C,
+                x: E,
                 y: P,
-                value: D,
-                radius: k
+                value: k,
+                radius: A
               });
             }
           return {
@@ -6393,27 +6395,27 @@ function requireHeatmap() {
           },
           _drawAlpha: function(w) {
             for (var v = this._min = w.min, _ = this._max = w.max, w = w.data || [], O = w.length, b = 1 - this._blur; O--; ) {
-              var x = w[O], T = x.x, C = x.y, E = x.radius, R = Math.min(x.value, _), P = T - E, D = C - E, k = this.shadowCtx, I;
-              this._templates[E] ? I = this._templates[E] : this._templates[E] = I = m(E, b);
+              var T = w[O], x = T.x, E = T.y, C = T.radius, R = Math.min(T.value, _), P = x - C, k = E - C, A = this.shadowCtx, N;
+              this._templates[C] ? N = this._templates[C] : this._templates[C] = N = m(C, b);
               var B = (R - v) / (_ - v);
-              k.globalAlpha = B < 0.01 ? 0.01 : B, k.drawImage(I, P, D), P < this._renderBoundaries[0] && (this._renderBoundaries[0] = P), D < this._renderBoundaries[1] && (this._renderBoundaries[1] = D), P + 2 * E > this._renderBoundaries[2] && (this._renderBoundaries[2] = P + 2 * E), D + 2 * E > this._renderBoundaries[3] && (this._renderBoundaries[3] = D + 2 * E);
+              A.globalAlpha = B < 0.01 ? 0.01 : B, A.drawImage(N, P, k), P < this._renderBoundaries[0] && (this._renderBoundaries[0] = P), k < this._renderBoundaries[1] && (this._renderBoundaries[1] = k), P + 2 * C > this._renderBoundaries[2] && (this._renderBoundaries[2] = P + 2 * C), k + 2 * C > this._renderBoundaries[3] && (this._renderBoundaries[3] = k + 2 * C);
             }
           },
           _colorize: function() {
-            var p = this._renderBoundaries[0], v = this._renderBoundaries[1], _ = this._renderBoundaries[2] - p, w = this._renderBoundaries[3] - v, O = this._width, b = this._height, x = this._opacity, T = this._maxOpacity, C = this._minOpacity, E = this._useGradientOpacity;
+            var p = this._renderBoundaries[0], v = this._renderBoundaries[1], _ = this._renderBoundaries[2] - p, w = this._renderBoundaries[3] - v, O = this._width, b = this._height, T = this._opacity, x = this._maxOpacity, E = this._minOpacity, C = this._useGradientOpacity;
             p < 0 && (p = 0), v < 0 && (v = 0), p + _ > O && (_ = O - p), v + w > b && (w = b - v);
-            for (var R = this.shadowCtx.getImageData(p, v, _, w), P = R.data, D = P.length, k = this._palette, I = 3; I < D; I += 4) {
-              var B = P[I], H = B * 4;
-              if (H) {
-                var q;
-                x > 0 ? q = x : B < T ? B < C ? q = C : q = B : q = T, P[I - 3] = k[H], P[I - 2] = k[H + 1], P[I - 1] = k[H + 2], P[I] = E ? k[H + 3] : q;
+            for (var R = this.shadowCtx.getImageData(p, v, _, w), P = R.data, k = P.length, A = this._palette, N = 3; N < k; N += 4) {
+              var B = P[N], q = B * 4;
+              if (q) {
+                var H;
+                T > 0 ? H = T : B < x ? B < E ? H = E : H = B : H = x, P[N - 3] = A[q], P[N - 2] = A[q + 1], P[N - 1] = A[q + 2], P[N] = C ? A[q + 3] : H;
               }
             }
             this.ctx.putImageData(R, p, v), this._renderBoundaries = [1e3, 1e3, 0, 0];
           },
           getValueAt: function(p) {
-            var v, _ = this.shadowCtx, w = _.getImageData(p.x, p.y, 1, 1), O = w.data[3], b = this._max, x = this._min;
-            return v = Math.abs(b - x) * (O / 255) >> 0, v;
+            var v, _ = this.shadowCtx, w = _.getImageData(p.x, p.y, 1, 1), O = w.data[3], b = this._max, T = this._min;
+            return v = Math.abs(b - T) * (O / 255) >> 0, v;
           },
           getDataURL: function() {
             return this.canvas.toDataURL();
@@ -6447,8 +6449,8 @@ function requireHeatmap() {
               var w = this.cStore;
               if (w[v])
                 for (var O = w[v].length, b = 0; b < O; b++) {
-                  var x = w[v][b];
-                  x(_);
+                  var T = w[v][b];
+                  T(_);
                 }
             }
           }, p;
@@ -6520,13 +6522,13 @@ function requireHeatmap() {
   }(heatmap$1)), heatmap$1.exports;
 }
 requireHeatmap();
-const ee = class ee extends EventEmitter {
+const te = class te extends EventEmitter {
   constructor() {
     super();
     L(this, "popupMap", /* @__PURE__ */ new Map());
   }
   static getInstance() {
-    return ee.instance || (ee.instance = new ee()), ee.instance;
+    return te.instance || (te.instance = new te()), te.instance;
   }
   popup(r) {
     var h;
@@ -6554,8 +6556,8 @@ const ee = class ee extends EventEmitter {
     this.popupMap.forEach((r) => r.destroy()), this.popupMap.clear();
   }
 };
-L(ee, "instance", null);
-let PopupCtrl = ee;
+L(te, "instance", null);
+let PopupCtrl = te;
 function saveCameraParams(s) {
   const i = s.camera;
   return {