@loaders.gl/arcgis 5.0.0-alpha.13 → 5.0.0-alpha.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs CHANGED
@@ -568,7 +568,7 @@ function createAuthenticatedFetch(options) {
568
568
  const authenticatedFetch = async (url, requestOptions = {}) => {
569
569
  var _a2, _b, _c, _d, _e, _f, _g;
570
570
  requestOptions = mergeFetchOptions(fetchOptions, requestOptions);
571
- if ((_a2 = requestOptions.signal) == null ? void 0 : _a2.aborted) throw createAbortError();
571
+ (_a2 = requestOptions.signal) == null ? void 0 : _a2.throwIfAborted();
572
572
  if (!credentials.length) return baseFetch(url, requestOptions);
573
573
  const resolvedURL = parseHTTPURL(url);
574
574
  const authorization = resolvedURL ? await authorizeRequest(resolvedURL, requestOptions, tokenCredentials) : { url, options: requestOptions, credentials: [] };
@@ -587,7 +587,7 @@ function createAuthenticatedFetch(options) {
587
587
  }
588
588
  );
589
589
  if (!refreshableCredentials.length && !shouldRetrySignature) return response;
590
- if ((_e = requestOptions.signal) == null ? void 0 : _e.aborted) throw createAbortError();
590
+ (_e = requestOptions.signal) == null ? void 0 : _e.throwIfAborted();
591
591
  const refreshedTokens = /* @__PURE__ */ new Map();
592
592
  await Promise.all(
593
593
  refreshableCredentials.map(async ({ credential }) => {
@@ -598,7 +598,7 @@ function createAuthenticatedFetch(options) {
598
598
  if (!refreshedTokens.size && !shouldRetrySignature) return response;
599
599
  await ((_f = response.body) == null ? void 0 : _f.cancel().catch(() => {
600
600
  }));
601
- if ((_g = requestOptions.signal) == null ? void 0 : _g.aborted) throw createAbortError();
601
+ (_g = requestOptions.signal) == null ? void 0 : _g.throwIfAborted();
602
602
  const replayAuthorization = resolvedURL ? await authorizeRequest(
603
603
  resolvedURL,
604
604
  requestOptions,
@@ -633,9 +633,10 @@ function getAuthenticatedFetch(options = {}) {
633
633
  } else {
634
634
  fetchFunction = (url, requestOptions) => fetch(url, requestOptions);
635
635
  }
636
+ const fetchOptions = typeof fetchOption === "object" && fetchOption ? fetchOption : void 0;
636
637
  return createAuthenticatedFetch({
637
638
  fetch: fetchFunction,
638
- fetchOptions: typeof fetchOption === "object" && fetchOption ? fetchOption : void 0,
639
+ fetchOptions: options.signal ? { ...fetchOptions, signal: options.signal } : fetchOptions,
639
640
  credentials: ((_b = options.core) == null ? void 0 : _b.credentials) || [],
640
641
  authentications: (_c = options.core) == null ? void 0 : _c.authentications
641
642
  });
@@ -655,7 +656,7 @@ async function authenticateRequest(request, credentials, reason, response) {
655
656
  for (const credential of credentials) {
656
657
  const origin = getRequestOrigin(request.url);
657
658
  if (!origin || !normalizeRequestOrigins(credential.origins).includes(origin)) continue;
658
- if (signal == null ? void 0 : signal.aborted) throw createAbortError();
659
+ signal == null ? void 0 : signal.throwIfAborted();
659
660
  const authenticatedRequest = await credential.authenticate({
660
661
  url: request.url,
661
662
  options: { ...request.options, headers: new Headers(request.options.headers) },
@@ -671,7 +672,7 @@ async function authenticateRequest(request, credentials, reason, response) {
671
672
  };
672
673
  appliedCredentials.push(credential);
673
674
  }
674
- if (signal == null ? void 0 : signal.aborted) throw createAbortError();
675
+ signal == null ? void 0 : signal.throwIfAborted();
675
676
  return { ...request, credentials: appliedCredentials };
676
677
  }
677
678
  function getRequestOrigin(url) {
@@ -771,9 +772,6 @@ function isReplayableRequest(options) {
771
772
  if (!["GET", "HEAD", "OPTIONS", "PUT", "DELETE"].includes(method)) return false;
772
773
  return !(options.body && typeof ReadableStream !== "undefined" && options.body instanceof ReadableStream);
773
774
  }
774
- function createAbortError() {
775
- return new DOMException("The operation was aborted.", "AbortError");
776
- }
777
775
  var DEFAULT_REFRESH_STATUS_CODES, AUTHENTICATED_FETCH, refreshPromises, TokenAuthentication;
778
776
  var init_request_credentials = __esm({
779
777
  "../core/src/loader-utils/lib/request-utils/request-credentials.ts"() {
@@ -1012,7 +1010,7 @@ function getTimestamp() {
1012
1010
  var _a2;
1013
1011
  return ((_a2 = globalThis.performance) == null ? void 0 : _a2.now()) ?? Date.now();
1014
1012
  }
1015
- function createAbortError2() {
1013
+ function createAbortError() {
1016
1014
  if (typeof DOMException !== "undefined") {
1017
1015
  return new DOMException("Request aborted", "AbortError");
1018
1016
  }
@@ -1117,7 +1115,7 @@ var init_range_request_scheduler = __esm({
1117
1115
  return Promise.reject(new Error("Byte range length cannot be negative"));
1118
1116
  }
1119
1117
  if ((_a2 = request.signal) == null ? void 0 : _a2.aborted) {
1120
- return Promise.reject(request.signal.reason ?? createAbortError2());
1118
+ return Promise.reject(request.signal.reason ?? createAbortError());
1121
1119
  }
1122
1120
  if (request.length === 0) {
1123
1121
  return Promise.resolve(new ArrayBuffer(0));
@@ -1386,7 +1384,7 @@ var init_range_request_scheduler = __esm({
1386
1384
  }
1387
1385
  }
1388
1386
  this.transportQueue = this.transportQueue.filter((group) => group.requests.length > 0);
1389
- request.reject(((_a2 = request.signal) == null ? void 0 : _a2.reason) ?? createAbortError2());
1387
+ request.reject(((_a2 = request.signal) == null ? void 0 : _a2.reason) ?? createAbortError());
1390
1388
  this.trackEvent({
1391
1389
  type: "abort",
1392
1390
  sourceId: request.sourceId,
@@ -1984,7 +1982,7 @@ function validateRange(offset, length, byteLength) {
1984
1982
  throw new Error("HTTP byte range extends beyond the end of the file");
1985
1983
  }
1986
1984
  }
1987
- function createAbortError3() {
1985
+ function createAbortError2() {
1988
1986
  if (typeof DOMException !== "undefined") {
1989
1987
  return new DOMException("Request aborted", "AbortError");
1990
1988
  }
@@ -2037,7 +2035,7 @@ var init_http_file = __esm({
2037
2035
  async open(signal) {
2038
2036
  this.assertOpen();
2039
2037
  if (signal == null ? void 0 : signal.aborted) {
2040
- const error = createAbortError3();
2038
+ const error = createAbortError2();
2041
2039
  this.transport.trackFailure(error);
2042
2040
  throw error;
2043
2041
  }
@@ -2079,7 +2077,7 @@ var init_http_file = __esm({
2079
2077
  async read(offset = 0, length = 0, signal) {
2080
2078
  this.assertOpen();
2081
2079
  if (signal == null ? void 0 : signal.aborted) {
2082
- const error = createAbortError3();
2080
+ const error = createAbortError2();
2083
2081
  this.transport.trackFailure(error);
2084
2082
  throw error;
2085
2083
  }
@@ -8460,14 +8458,6 @@ var init_transport = __esm({
8460
8458
  }
8461
8459
  });
8462
8460
 
8463
- // ../arrow/src/transport.ts
8464
- var init_transport2 = __esm({
8465
- "../arrow/src/transport.ts"() {
8466
- "use strict";
8467
- init_transport();
8468
- }
8469
- });
8470
-
8471
8461
  // ../draco/src/draco-loader-options.ts
8472
8462
  var DRACO_LOADER_DEFAULT_OPTIONS;
8473
8463
  var init_draco_loader_options = __esm({
@@ -9118,13 +9108,17 @@ var init_draco_parser = __esm({
9118
9108
  });
9119
9109
 
9120
9110
  // ../draco/src/lib/parse-draco.ts
9121
- async function parseDraco(arrayBuffer, options, loadDecoderModule) {
9122
- var _a2;
9111
+ async function parseDraco(arrayBuffer, options, loadDecoderModule, context) {
9112
+ var _a2, _b;
9113
+ const reportProgress = (context == null ? void 0 : context.reportProgress) || (options == null ? void 0 : options.onProgress);
9114
+ reportProgress == null ? void 0 : reportProgress({ phase: "decode", completed: 0, total: 1, unit: "tasks" });
9123
9115
  const { draco } = await loadDecoderModule();
9116
+ (_a2 = (options == null ? void 0 : options.signal) || (context == null ? void 0 : context.signal)) == null ? void 0 : _a2.throwIfAborted();
9124
9117
  const dracoParser = new DracoParser(draco);
9125
9118
  try {
9126
9119
  const mesh = dracoParser.parseSync(arrayBuffer, options == null ? void 0 : options.draco);
9127
- if (((_a2 = options == null ? void 0 : options.draco) == null ? void 0 : _a2.shape) === "arrow-table") {
9120
+ reportProgress == null ? void 0 : reportProgress({ phase: "decode", completed: 1, total: 1, unit: "tasks" });
9121
+ if (((_b = options == null ? void 0 : options.draco) == null ? void 0 : _b.shape) === "arrow-table") {
9128
9122
  return convertMeshToTable(mesh, "arrow-table");
9129
9123
  }
9130
9124
  return mesh;
@@ -9156,7 +9150,7 @@ var init_draco_wasm_loader_with_parser = __esm({
9156
9150
  ({ preload: _DracoLoaderPreload, ...DracoLoaderMetadataWithoutPreload } = DracoLoader);
9157
9151
  DracoWASMLoaderWithParser = {
9158
9152
  ...DracoLoaderMetadataWithoutPreload,
9159
- parse: async (arrayBuffer, options) => await parseDraco(
9153
+ parse: async (arrayBuffer, options, context) => await parseDraco(
9160
9154
  arrayBuffer,
9161
9155
  options,
9162
9156
  async () => {
@@ -9166,7 +9160,8 @@ var init_draco_wasm_loader_with_parser = __esm({
9166
9160
  "wasm",
9167
9161
  (_a2 = options == null ? void 0 : options.draco) == null ? void 0 : _a2.decoderProfile
9168
9162
  );
9169
- }
9163
+ },
9164
+ context
9170
9165
  )
9171
9166
  };
9172
9167
  }
@@ -9188,10 +9183,11 @@ var init_draco_javascript_loader_with_parser = __esm({
9188
9183
  ({ preload: _DracoLoaderPreload2, ...DracoLoaderMetadataWithoutPreload2 } = DracoLoader);
9189
9184
  DracoJavaScriptLoaderWithParser = {
9190
9185
  ...DracoLoaderMetadataWithoutPreload2,
9191
- parse: async (arrayBuffer, options) => await parseDraco(
9186
+ parse: async (arrayBuffer, options, context) => await parseDraco(
9192
9187
  arrayBuffer,
9193
9188
  options,
9194
- async () => await loadDracoDecoderModule(extractLoadLibraryOptions(options), "js")
9189
+ async () => await loadDracoDecoderModule(extractLoadLibraryOptions(options), "js"),
9190
+ context
9195
9191
  )
9196
9192
  };
9197
9193
  }
@@ -9220,10 +9216,11 @@ var init_draco3d_loader_with_parser = __esm({
9220
9216
  ({ preload: _DracoLoaderPreload3, ...DracoLoaderMetadataWithoutPreload3 } = DracoLoader);
9221
9217
  Draco3DLoaderWithParser = {
9222
9218
  ...DracoLoaderMetadataWithoutPreload3,
9223
- parse: async (arrayBuffer, options) => await parseDraco(
9219
+ parse: async (arrayBuffer, options, context) => await parseDraco(
9224
9220
  arrayBuffer,
9225
9221
  options,
9226
- async () => await loadDracoDecoderModuleFromDraco3D(getDraco3DModule(options))
9222
+ async () => await loadDracoDecoderModuleFromDraco3D(getDraco3DModule(options)),
9223
+ context
9227
9224
  )
9228
9225
  };
9229
9226
  }
@@ -9261,7 +9258,7 @@ var DracoLoader;
9261
9258
  var init_draco_loader = __esm({
9262
9259
  "../draco/src/draco-loader.ts"() {
9263
9260
  "use strict";
9264
- init_transport2();
9261
+ init_transport();
9265
9262
  init_version3();
9266
9263
  init_draco_format();
9267
9264
  init_draco_loader_options();
@@ -11718,7 +11715,7 @@ function getProjectedRadius(tile, frameState) {
11718
11715
  const cameraPositionCartographic = viewport.unprojectPosition(viewport.cameraPosition);
11719
11716
  import_geospatial3.Ellipsoid.WGS84.cartographicToCartesian(cameraPositionCartographic, cameraPositionCartesian);
11720
11717
  toEye.copy(cameraPositionCartesian).subtract(mbsCenterCartesian).normalize();
11721
- import_geospatial3.Ellipsoid.WGS84.eastNorthUpToFixedFrame(mbsCenterCartesian, enuToCartesianMatrix);
11718
+ (0, import_ellipsoid.eastNorthUpToFixedFrame)(import_geospatial3.Ellipsoid.WGS84, mbsCenterCartesian, enuToCartesianMatrix);
11722
11719
  cartesianToEnuMatrix.copy(enuToCartesianMatrix).invert();
11723
11720
  cameraPositionEnu.copy(cameraPositionCartesian).transform(cartesianToEnuMatrix);
11724
11721
  const projection = Math.sqrt(
@@ -11740,12 +11737,13 @@ function getProjectedRadius(tile, frameState) {
11740
11737
  const projectedRadius = projectedOriginVector.copy(projectedOrigin).subtract(projectedMbsBorderVertex).magnitude();
11741
11738
  return projectedRadius;
11742
11739
  }
11743
- var import_core4, import_geospatial3, cameraPositionCartesian, toEye, cameraPositionEnu, extraVertexEnu, projectedOriginVector, enuToCartesianMatrix, cartesianToEnuMatrix;
11740
+ var import_core4, import_geospatial3, import_ellipsoid, cameraPositionCartesian, toEye, cameraPositionEnu, extraVertexEnu, projectedOriginVector, enuToCartesianMatrix, cartesianToEnuMatrix;
11744
11741
  var init_i3s_lod = __esm({
11745
11742
  "../tiles-3d/src/tileset-3d/helpers/i3s-lod.ts"() {
11746
11743
  "use strict";
11747
11744
  import_core4 = require("@math.gl/core");
11748
11745
  import_geospatial3 = require("@math.gl/geospatial");
11746
+ import_ellipsoid = require("@math.gl/geospatial/ellipsoid");
11749
11747
  cameraPositionCartesian = new import_core4.Vector3();
11750
11748
  toEye = new import_core4.Vector3();
11751
11749
  cameraPositionEnu = new import_core4.Vector3();
@@ -15760,7 +15758,7 @@ function parsePositions(attribute, options) {
15760
15758
  const cartographicOrigin = new import_core10.Vector3(mbs[0], mbs[1], mbs[2]);
15761
15759
  const cartesianOrigin = new import_core10.Vector3();
15762
15760
  import_geospatial8.Ellipsoid.WGS84.cartographicToCartesian(cartographicOrigin, cartesianOrigin);
15763
- import_geospatial8.Ellipsoid.WGS84.eastNorthUpToFixedFrame(cartesianOrigin, enuMatrix);
15761
+ (0, import_ellipsoid2.eastNorthUpToFixedFrame)(import_geospatial8.Ellipsoid.WGS84, cartesianOrigin, enuMatrix);
15764
15762
  attribute.value = offsetsToCartesians(value, metadata, cartographicOrigin);
15765
15763
  return enuMatrix;
15766
15764
  }
@@ -15964,13 +15962,14 @@ function getFeatureIdsFromFeatureIndexMetadata(featureIndex) {
15964
15962
  var _a2, _b;
15965
15963
  return (_b = (_a2 = featureIndex == null ? void 0 : featureIndex.metadata) == null ? void 0 : _a2["i3s-feature-ids"]) == null ? void 0 : _b.intArray;
15966
15964
  }
15967
- var import_core10, import_geospatial8, scratchVector3, I3S_ATTRIBUTE_TYPE;
15965
+ var import_core10, import_geospatial8, import_ellipsoid2, scratchVector3, I3S_ATTRIBUTE_TYPE;
15968
15966
  var init_parse_i3s_tile_content = __esm({
15969
15967
  "../tiles-3d/src/i3s/lib/parsers/parse-i3s-tile-content.ts"() {
15970
15968
  "use strict";
15971
15969
  init_schema();
15972
15970
  import_core10 = require("@math.gl/core");
15973
15971
  import_geospatial8 = require("@math.gl/geospatial");
15972
+ import_ellipsoid2 = require("@math.gl/geospatial/ellipsoid");
15974
15973
  init_loader_utils();
15975
15974
  init_src();
15976
15975
  init_src3();
@@ -16622,7 +16621,7 @@ function normalizeTileNonUrlData(tile) {
16622
16621
  ...tile.obb.quaternion
16623
16622
  // quaternion
16624
16623
  ];
16625
- const obb = new import_culling5.OrientedBoundingBox().fromCenterHalfSizeQuaternion(
16624
+ const obb = (0, import_culling5.makeOrientedBoundingBoxFromQuaternion)(
16626
16625
  boundingVolume.box.slice(0, 3),
16627
16626
  tile.obb.halfSize,
16628
16627
  tile.obb.quaternion
@@ -17714,7 +17713,7 @@ var init_src6 = __esm({
17714
17713
  }
17715
17714
  });
17716
17715
 
17717
- // ../zip/src/lib/zip-serialization.ts
17716
+ // ../archives/src/zip/lib/zip-serialization.ts
17718
17717
  function encodeZipLocalHeader(entry) {
17719
17718
  validateHeaderEntry(entry);
17720
17719
  const bytes = new Uint8Array(30 + entry.nameBytes.length + (entry.zip64 ? 20 : 0));
@@ -17838,7 +17837,7 @@ function validateUint64(value) {
17838
17837
  }
17839
17838
  var ZIP32_SENTINEL;
17840
17839
  var init_zip_serialization = __esm({
17841
- "../zip/src/lib/zip-serialization.ts"() {
17840
+ "../archives/src/zip/lib/zip-serialization.ts"() {
17842
17841
  "use strict";
17843
17842
  ZIP32_SENTINEL = 0xffffffffn;
17844
17843
  }
@@ -18009,7 +18008,7 @@ var init_compress_utils_compression = __esm({
18009
18008
  }
18010
18009
  });
18011
18010
 
18012
- // ../zip/src/lib/zip64-extra-field.ts
18011
+ // ../archives/src/zip/lib/zip64-extra-field.ts
18013
18012
  function parseZip64ExtraField(extraField, expectedFields) {
18014
18013
  const values = {};
18015
18014
  if (expectedFields.length === 0) {
@@ -18054,13 +18053,13 @@ function parseZip64ExtraField(extraField, expectedFields) {
18054
18053
  }
18055
18054
  var ZIP64_EXTRA_FIELD_ID;
18056
18055
  var init_zip64_extra_field = __esm({
18057
- "../zip/src/lib/zip64-extra-field.ts"() {
18056
+ "../archives/src/zip/lib/zip64-extra-field.ts"() {
18058
18057
  "use strict";
18059
18058
  ZIP64_EXTRA_FIELD_ID = 1;
18060
18059
  }
18061
18060
  });
18062
18061
 
18063
- // ../zip/src/lib/zip-entry-metadata.ts
18062
+ // ../archives/src/zip/lib/zip-entry-metadata.ts
18064
18063
  function decodeZipHeader(bytes, central) {
18065
18064
  const header = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
18066
18065
  const fixedBytes = central ? 46 : 30;
@@ -18160,7 +18159,7 @@ function encodeUtf8Text(value) {
18160
18159
  }
18161
18160
  var CP437_HIGH;
18162
18161
  var init_zip_entry_metadata = __esm({
18163
- "../zip/src/lib/zip-entry-metadata.ts"() {
18162
+ "../archives/src/zip/lib/zip-entry-metadata.ts"() {
18164
18163
  "use strict";
18165
18164
  init_src6();
18166
18165
  init_zip64_extra_field();
@@ -18319,7 +18318,7 @@ var init_deflate_decompressor = __esm({
18319
18318
  }
18320
18319
  });
18321
18320
 
18322
- // ../zip/src/zip-archive.ts
18321
+ // ../archives/src/zip/zip-archive.ts
18323
18322
  async function openZipArchive(input, options = {}) {
18324
18323
  return await ZipArchive.open(input, options);
18325
18324
  }
@@ -18337,7 +18336,7 @@ function minimumBigInt(left, right) {
18337
18336
  }
18338
18337
  var DEFAULT_OPTIONS, ZipArchive;
18339
18338
  var init_zip_archive = __esm({
18340
- "../zip/src/zip-archive.ts"() {
18339
+ "../archives/src/zip/zip-archive.ts"() {
18341
18340
  "use strict";
18342
18341
  init_loader_utils();
18343
18342
  init_deflate_decompressor();
@@ -18856,7 +18855,7 @@ var init_zip_archive = __esm({
18856
18855
  }
18857
18856
  });
18858
18857
 
18859
- // ../zip/src/hash-file-utility.ts
18858
+ // ../archives/src/zip/hash-file-utility.ts
18860
18859
  function parseHashTable(arrayBuffer) {
18861
18860
  if (arrayBuffer.byteLength % 24) throw new Error("Invalid ZIP index length");
18862
18861
  const dataView = new DataView(arrayBuffer);
@@ -18873,15 +18872,15 @@ function bufferToHex(buffer, start, length) {
18873
18872
  return [...new Uint8Array(buffer, start, length)].map((x) => x.toString(16).padStart(2, "0")).join("");
18874
18873
  }
18875
18874
  var init_hash_file_utility = __esm({
18876
- "../zip/src/hash-file-utility.ts"() {
18875
+ "../archives/src/zip/hash-file-utility.ts"() {
18877
18876
  "use strict";
18878
18877
  }
18879
18878
  });
18880
18879
 
18881
- // ../zip/src/filesystems/IndexedArchive.ts
18880
+ // ../archives/src/zip/filesystems/IndexedArchive.ts
18882
18881
  var IndexedArchive;
18883
18882
  var init_IndexedArchive = __esm({
18884
- "../zip/src/filesystems/IndexedArchive.ts"() {
18883
+ "../archives/src/zip/filesystems/IndexedArchive.ts"() {
18885
18884
  "use strict";
18886
18885
  init_src6();
18887
18886
  init_zip_archive();
@@ -18972,9 +18971,9 @@ var init_IndexedArchive = __esm({
18972
18971
  }
18973
18972
  });
18974
18973
 
18975
- // ../zip/src/index.ts
18976
- var init_src7 = __esm({
18977
- "../zip/src/index.ts"() {
18974
+ // ../archives/src/zip/index.ts
18975
+ var init_zip = __esm({
18976
+ "../archives/src/zip/index.ts"() {
18978
18977
  "use strict";
18979
18978
  init_IndexedArchive();
18980
18979
  }
@@ -19175,7 +19174,7 @@ var init_default_codecs = __esm({
19175
19174
  });
19176
19175
 
19177
19176
  // ../compression/src/index.ts
19178
- var init_src8 = __esm({
19177
+ var init_src7 = __esm({
19179
19178
  "../compression/src/index.ts"() {
19180
19179
  "use strict";
19181
19180
  init_default_codecs();
@@ -19187,8 +19186,8 @@ var PATH_DESCRIPTIONS, SLPKArchive;
19187
19186
  var init_slpk_archieve = __esm({
19188
19187
  "../tiles-3d/src/i3s/lib/parsers/parse-slpk/slpk-archieve.ts"() {
19189
19188
  "use strict";
19189
+ init_zip();
19190
19190
  init_src7();
19191
- init_src8();
19192
19191
  PATH_DESCRIPTIONS = [
19193
19192
  {
19194
19193
  test: /^$/,
@@ -20793,7 +20792,7 @@ function getWorkerTransferBufferCopyMode(options) {
20793
20792
  var init_mvt_worker_transport = __esm({
20794
20793
  "../tiles/src/mvt/lib/mvt-worker-transport.ts"() {
20795
20794
  "use strict";
20796
- init_transport2();
20795
+ init_transport();
20797
20796
  }
20798
20797
  });
20799
20798