@loaders.gl/i3s 4.0.4 → 4.1.0-alpha.10

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.
@@ -1,5 +1,5 @@
1
1
  import { parseWebscene } from "./lib/parsers/parse-arcgis-webscene.js";
2
- const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
2
+ const VERSION = typeof "4.1.0-alpha.10" !== 'undefined' ? "4.1.0-alpha.10" : 'latest';
3
3
  export const ArcGISWebSceneLoader = {
4
4
  name: 'ArcGIS Web Scene Loader',
5
5
  id: 'arcgis-web-scene',
@@ -1 +1 @@
1
- {"version":3,"file":"arcgis-webscene-loader.js","names":["parseWebscene","VERSION","__VERSION__","ArcGISWebSceneLoader","name","id","module","version","mimeTypes","parse","extensions","options","data"],"sources":["../src/arcgis-webscene-loader.ts"],"sourcesContent":["import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {ArcGISWebSceneData} from './types';\n\nimport {parseWebscene} from './lib/parsers/parse-arcgis-webscene';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type ArcGISWebSceneLoaderOptions = LoaderOptions & {};\n\n/**\n * Loader for ArcGIS WebScene\n * Spec - https://developers.arcgis.com/web-scene-specification/objects/webscene/\n */\nexport const ArcGISWebSceneLoader: LoaderWithParser<\n ArcGISWebSceneData,\n never,\n ArcGISWebSceneLoaderOptions\n> = {\n name: 'ArcGIS Web Scene Loader',\n id: 'arcgis-web-scene',\n module: 'i3s',\n version: VERSION,\n mimeTypes: ['application/json'],\n parse,\n extensions: ['json'],\n options: {}\n};\n\n/**\n * Parse ArcGIS webscene\n * @param data\n */\nasync function parse(data: ArrayBuffer): Promise<ArcGISWebSceneData> {\n return parseWebscene(data);\n}\n"],"mappings":"SAGQA,aAAa;AAIrB,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAQ3E,OAAO,MAAMC,oBAIZ,GAAG;EACFC,IAAI,EAAE,yBAAyB;EAC/BC,EAAE,EAAE,kBAAkB;EACtBC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEN,OAAO;EAChBO,SAAS,EAAE,CAAC,kBAAkB,CAAC;EAC/BC,KAAK;EACLC,UAAU,EAAE,CAAC,MAAM,CAAC;EACpBC,OAAO,EAAE,CAAC;AACZ,CAAC;AAMD,eAAeF,KAAKA,CAACG,IAAiB,EAA+B;EACnE,OAAOZ,aAAa,CAACY,IAAI,CAAC;AAC5B"}
1
+ {"version":3,"file":"arcgis-webscene-loader.js","names":["parseWebscene","VERSION","ArcGISWebSceneLoader","name","id","module","version","mimeTypes","parse","extensions","options","data"],"sources":["../src/arcgis-webscene-loader.ts"],"sourcesContent":["import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {ArcGISWebSceneData} from './types';\n\nimport {parseWebscene} from './lib/parsers/parse-arcgis-webscene';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type ArcGISWebSceneLoaderOptions = LoaderOptions & {};\n\n/**\n * Loader for ArcGIS WebScene\n * Spec - https://developers.arcgis.com/web-scene-specification/objects/webscene/\n */\nexport const ArcGISWebSceneLoader: LoaderWithParser<\n ArcGISWebSceneData,\n never,\n ArcGISWebSceneLoaderOptions\n> = {\n name: 'ArcGIS Web Scene Loader',\n id: 'arcgis-web-scene',\n module: 'i3s',\n version: VERSION,\n mimeTypes: ['application/json'],\n parse,\n extensions: ['json'],\n options: {}\n};\n\n/**\n * Parse ArcGIS webscene\n * @param data\n */\nasync function parse(data: ArrayBuffer): Promise<ArcGISWebSceneData> {\n return parseWebscene(data);\n}\n"],"mappings":"SAGQA,aAAa;AAIrB,MAAMC,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAQ3E,OAAO,MAAMC,oBAIZ,GAAG;EACFC,IAAI,EAAE,yBAAyB;EAC/BC,EAAE,EAAE,kBAAkB;EACtBC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEL,OAAO;EAChBM,SAAS,EAAE,CAAC,kBAAkB,CAAC;EAC/BC,KAAK;EACLC,UAAU,EAAE,CAAC,MAAM,CAAC;EACpBC,OAAO,EAAE,CAAC;AACZ,CAAC;AAMD,eAAeF,KAAKA,CAACG,IAAiB,EAA+B;EACnE,OAAOX,aAAa,CAACW,IAAI,CAAC;AAC5B"}
package/dist/dist.dev.js CHANGED
@@ -4328,15 +4328,14 @@ var __exports__ = (() => {
4328
4328
  var nodeVersion = matches && parseFloat(matches[1]) || 0;
4329
4329
 
4330
4330
  // ../worker-utils/src/lib/env-utils/version.ts
4331
- var NPM_TAG = "latest";
4332
4331
  function getVersion() {
4333
4332
  if (!globalThis._loadersgl_?.version) {
4334
4333
  globalThis._loadersgl_ = globalThis._loadersgl_ || {};
4335
- if (typeof __VERSION__ === "undefined") {
4334
+ if (false) {
4336
4335
  console.warn("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
4337
4336
  globalThis._loadersgl_.version = NPM_TAG;
4338
4337
  } else {
4339
- globalThis._loadersgl_.version = __VERSION__;
4338
+ globalThis._loadersgl_.version = "4.1.0-alpha.10";
4340
4339
  }
4341
4340
  }
4342
4341
  return globalThis._loadersgl_.version;
@@ -4465,6 +4464,9 @@ var __exports__ = (() => {
4465
4464
  return true;
4466
4465
  }
4467
4466
  function concatenateArrayBuffers(...sources) {
4467
+ return concatenateArrayBuffersFromArray(sources);
4468
+ }
4469
+ function concatenateArrayBuffersFromArray(sources) {
4468
4470
  const sourceArrays = sources.map((source2) => source2 instanceof ArrayBuffer ? new Uint8Array(source2) : source2);
4469
4471
  const byteLength = sourceArrays.reduce((length4, typedArray) => length4 + typedArray.byteLength, 0);
4470
4472
  const result = new Uint8Array(byteLength);
@@ -9109,7 +9111,7 @@ var __exports__ = (() => {
9109
9111
  _defineProperty(Ellipsoid, "WGS84", new Ellipsoid(WGS84_RADIUS_X, WGS84_RADIUS_Y, WGS84_RADIUS_Z));
9110
9112
 
9111
9113
  // ../images/src/lib/utils/version.ts
9112
- var VERSION2 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
9114
+ var VERSION2 = true ? "4.1.0-alpha.10" : "latest";
9113
9115
 
9114
9116
  // ../images/src/lib/category-api/image-type.ts
9115
9117
  var parseImageNode = globalThis.loaders?.parseImageNode;
@@ -9498,17 +9500,9 @@ var __exports__ = (() => {
9498
9500
  };
9499
9501
 
9500
9502
  // ../draco/src/lib/utils/version.ts
9501
- var VERSION3 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
9503
+ var VERSION3 = true ? "4.1.0-alpha.10" : "latest";
9502
9504
 
9503
9505
  // ../draco/src/draco-loader.ts
9504
- var DEFAULT_DRACO_OPTIONS = {
9505
- draco: {
9506
- decoderType: typeof WebAssembly === "object" ? "wasm" : "js",
9507
- libraryPath: "libs/",
9508
- extraAttributes: {},
9509
- attributeNameEntry: void 0
9510
- }
9511
- };
9512
9506
  var DracoLoader = {
9513
9507
  name: "Draco",
9514
9508
  id: "draco",
@@ -9519,7 +9513,14 @@ var __exports__ = (() => {
9519
9513
  mimeTypes: ["application/octet-stream"],
9520
9514
  binary: true,
9521
9515
  tests: ["DRACO"],
9522
- options: DEFAULT_DRACO_OPTIONS
9516
+ options: {
9517
+ draco: {
9518
+ decoderType: typeof WebAssembly === "object" ? "wasm" : "js",
9519
+ libraryPath: "libs/",
9520
+ extraAttributes: {},
9521
+ attributeNameEntry: void 0
9522
+ }
9523
+ }
9523
9524
  };
9524
9525
 
9525
9526
  // ../schema/src/lib/table/simple-table/data-type.ts
@@ -10074,7 +10075,7 @@ var __exports__ = (() => {
10074
10075
  }
10075
10076
 
10076
10077
  // ../textures/src/lib/utils/version.ts
10077
- var VERSION4 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
10078
+ var VERSION4 = true ? "4.1.0-alpha.10" : "latest";
10078
10079
 
10079
10080
  // ../textures/src/lib/parsers/basis-module-loader.ts
10080
10081
  var BASIS_EXTERNAL_LIBRARIES = {
@@ -11478,7 +11479,7 @@ var __exports__ = (() => {
11478
11479
  }
11479
11480
 
11480
11481
  // src/i3s-content-loader.ts
11481
- var VERSION5 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
11482
+ var VERSION5 = true ? "4.1.0-alpha.10" : "latest";
11482
11483
  var I3SContentLoader = {
11483
11484
  name: "I3S Content (Indexed Scene Layers)",
11484
11485
  id: "i3s-content",
@@ -11988,7 +11989,7 @@ var __exports__ = (() => {
11988
11989
  var import_core16 = __toESM(require_core(), 1);
11989
11990
 
11990
11991
  // src/i3s-node-page-loader.ts
11991
- var VERSION6 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
11992
+ var VERSION6 = true ? "4.1.0-alpha.10" : "latest";
11992
11993
  var I3SNodePageLoader = {
11993
11994
  name: "I3S Node Page",
11994
11995
  id: "i3s-node-page",
@@ -12278,7 +12279,7 @@ var __exports__ = (() => {
12278
12279
  }
12279
12280
 
12280
12281
  // src/i3s-loader.ts
12281
- var VERSION7 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
12282
+ var VERSION7 = true ? "4.1.0-alpha.10" : "latest";
12282
12283
  var TILESET_REGEX = /layers\/[0-9]+$/;
12283
12284
  var TILE_HEADER_REGEX = /nodes\/([0-9-]+|root)$/;
12284
12285
  var SLPK_HEX = "504b0304";
@@ -12388,23 +12389,28 @@ var __exports__ = (() => {
12388
12389
  const zipEoCDOffset = await searchFromTheEnd(file, eoCDSignature);
12389
12390
  let cdRecordsNumber = BigInt(await file.getUint16(zipEoCDOffset + CD_RECORDS_NUMBER_OFFSET));
12390
12391
  let cdStartOffset = BigInt(await file.getUint32(zipEoCDOffset + CD_START_OFFSET_OFFSET));
12391
- if (cdStartOffset === BigInt(4294967295) || cdRecordsNumber === BigInt(4294967295)) {
12392
- const zip64EoCDLocatorOffset = zipEoCDOffset - 20n;
12393
- const magicBytes = await file.slice(zip64EoCDLocatorOffset, zip64EoCDLocatorOffset + 4n);
12394
- if (!compareArrayBuffers(magicBytes, zip64EoCDLocatorSignature)) {
12395
- throw new Error("zip64 EoCD locator not found");
12396
- }
12397
- const zip64EoCDOffset = await file.getBigUint64(zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET);
12392
+ let zip64EoCDLocatorOffset = zipEoCDOffset - 20n;
12393
+ let zip64EoCDOffset = 0n;
12394
+ const magicBytes = await file.slice(zip64EoCDLocatorOffset, zip64EoCDLocatorOffset + 4n);
12395
+ if (compareArrayBuffers(magicBytes, zip64EoCDLocatorSignature)) {
12396
+ zip64EoCDOffset = await file.getBigUint64(zip64EoCDLocatorOffset + ZIP64_EOCD_START_OFFSET_OFFSET);
12398
12397
  const endOfCDMagicBytes = await file.slice(zip64EoCDOffset, zip64EoCDOffset + 4n);
12399
12398
  if (!compareArrayBuffers(endOfCDMagicBytes, zip64EoCDSignature.buffer)) {
12400
12399
  throw new Error("zip64 EoCD not found");
12401
12400
  }
12402
12401
  cdRecordsNumber = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_RECORDS_NUMBER_OFFSET);
12403
12402
  cdStartOffset = await file.getBigUint64(zip64EoCDOffset + ZIP64_CD_START_OFFSET_OFFSET);
12403
+ } else {
12404
+ zip64EoCDLocatorOffset = 0n;
12404
12405
  }
12405
12406
  return {
12406
12407
  cdRecordsNumber,
12407
- cdStartOffset
12408
+ cdStartOffset,
12409
+ offsets: {
12410
+ zip64EoCDOffset,
12411
+ zip64EoCDLocatorOffset,
12412
+ zipEoCDOffset
12413
+ }
12408
12414
  };
12409
12415
  };
12410
12416
 
@@ -12505,6 +12511,76 @@ var __exports__ = (() => {
12505
12511
  }
12506
12512
  return zip64dataList;
12507
12513
  };
12514
+ var ZIP_HEADER_FIELDS = [{
12515
+ offset: 0,
12516
+ size: 4,
12517
+ default: new DataView(signature.buffer).getUint32(0, true)
12518
+ }, {
12519
+ offset: 4,
12520
+ size: 2,
12521
+ default: 45
12522
+ }, {
12523
+ offset: 6,
12524
+ size: 2,
12525
+ default: 45
12526
+ }, {
12527
+ offset: 8,
12528
+ size: 2,
12529
+ default: 0
12530
+ }, {
12531
+ offset: 10,
12532
+ size: 2,
12533
+ default: 0
12534
+ }, {
12535
+ offset: 12,
12536
+ size: 2,
12537
+ default: 0
12538
+ }, {
12539
+ offset: 14,
12540
+ size: 2,
12541
+ default: 0
12542
+ }, {
12543
+ offset: 16,
12544
+ size: 4,
12545
+ name: "crc32"
12546
+ }, {
12547
+ offset: 20,
12548
+ size: 4,
12549
+ name: "length"
12550
+ }, {
12551
+ offset: 24,
12552
+ size: 4,
12553
+ name: "length"
12554
+ }, {
12555
+ offset: 28,
12556
+ size: 2,
12557
+ name: "fnlength"
12558
+ }, {
12559
+ offset: 30,
12560
+ size: 2,
12561
+ default: 0,
12562
+ name: "extraLength"
12563
+ }, {
12564
+ offset: 32,
12565
+ size: 2,
12566
+ default: 0
12567
+ }, {
12568
+ offset: 34,
12569
+ size: 2,
12570
+ default: 0
12571
+ }, {
12572
+ offset: 36,
12573
+ size: 2,
12574
+ default: 0
12575
+ }, {
12576
+ offset: 38,
12577
+ size: 4,
12578
+ default: 0
12579
+ }, {
12580
+ offset: 42,
12581
+ size: 4,
12582
+ name: "offset"
12583
+ }];
12508
12584
 
12509
12585
  // ../zip/src/parse-zip/local-file-header.ts
12510
12586
  var COMPRESSION_METHOD_OFFSET = 8n;
@@ -12548,6 +12624,52 @@ var __exports__ = (() => {
12548
12624
  compressionMethod
12549
12625
  };
12550
12626
  };
12627
+ var ZIP_HEADER_FIELDS2 = [{
12628
+ offset: 0,
12629
+ size: 4,
12630
+ default: new DataView(signature2.buffer).getUint32(0, true)
12631
+ }, {
12632
+ offset: 4,
12633
+ size: 2,
12634
+ default: 45
12635
+ }, {
12636
+ offset: 6,
12637
+ size: 2,
12638
+ default: 0
12639
+ }, {
12640
+ offset: 8,
12641
+ size: 2,
12642
+ default: 0
12643
+ }, {
12644
+ offset: 10,
12645
+ size: 2,
12646
+ default: 0
12647
+ }, {
12648
+ offset: 12,
12649
+ size: 2,
12650
+ default: 0
12651
+ }, {
12652
+ offset: 14,
12653
+ size: 4,
12654
+ name: "crc32"
12655
+ }, {
12656
+ offset: 18,
12657
+ size: 4,
12658
+ name: "length"
12659
+ }, {
12660
+ offset: 22,
12661
+ size: 4,
12662
+ name: "length"
12663
+ }, {
12664
+ offset: 26,
12665
+ size: 2,
12666
+ name: "fnlength"
12667
+ }, {
12668
+ offset: 28,
12669
+ size: 2,
12670
+ default: 0,
12671
+ name: "extraLength"
12672
+ }];
12551
12673
 
12552
12674
  // ../crypto/src/lib/hash.ts
12553
12675
  var Hash = class {
@@ -13373,7 +13495,7 @@ var __exports__ = (() => {
13373
13495
  }
13374
13496
 
13375
13497
  // src/i3s-slpk-loader.ts
13376
- var VERSION8 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
13498
+ var VERSION8 = true ? "4.1.0-alpha.10" : "latest";
13377
13499
  var SLPKLoader = {
13378
13500
  name: "I3S SLPK (Scene Layer Package)",
13379
13501
  id: "slpk",
@@ -13452,7 +13574,7 @@ var __exports__ = (() => {
13452
13574
  }
13453
13575
 
13454
13576
  // src/i3s-attribute-loader.ts
13455
- var VERSION9 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
13577
+ var VERSION9 = true ? "4.1.0-alpha.10" : "latest";
13456
13578
  var EMPTY_VALUE = "";
13457
13579
  var REJECTED_STATUS = "rejected";
13458
13580
  var I3SAttributeLoader = {
@@ -13605,7 +13727,7 @@ var __exports__ = (() => {
13605
13727
  }
13606
13728
 
13607
13729
  // src/i3s-building-scene-layer-loader.ts
13608
- var VERSION10 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
13730
+ var VERSION10 = true ? "4.1.0-alpha.10" : "latest";
13609
13731
  var I3SBuildingSceneLayerLoader = {
13610
13732
  name: "I3S Building Scene Layer",
13611
13733
  id: "i3s-building-scene-layer",
@@ -13693,7 +13815,7 @@ var __exports__ = (() => {
13693
13815
  }
13694
13816
 
13695
13817
  // src/arcgis-webscene-loader.ts
13696
- var VERSION11 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
13818
+ var VERSION11 = true ? "4.1.0-alpha.10" : "latest";
13697
13819
  var ArcGISWebSceneLoader = {
13698
13820
  name: "ArcGIS Web Scene Loader",
13699
13821
  id: "arcgis-web-scene",
@@ -1,7 +1,7 @@
1
1
  import { load } from '@loaders.gl/core';
2
2
  import { parseI3STileAttribute } from "./lib/parsers/parse-i3s-attribute.js";
3
3
  import { getUrlWithToken } from "./lib/utils/url-utils.js";
4
- const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
4
+ const VERSION = typeof "4.1.0-alpha.10" !== 'undefined' ? "4.1.0-alpha.10" : 'latest';
5
5
  const EMPTY_VALUE = '';
6
6
  const REJECTED_STATUS = 'rejected';
7
7
  export const I3SAttributeLoader = {
@@ -1 +1 @@
1
- {"version":3,"file":"i3s-attribute-loader.js","names":["load","parseI3STileAttribute","getUrlWithToken","VERSION","__VERSION__","EMPTY_VALUE","REJECTED_STATUS","I3SAttributeLoader","name","id","module","version","mimeTypes","parse","arrayBuffer","options","extensions","binary","loadFeatureAttributes","tile","featureId","arguments","length","undefined","attributeStorageInfo","attributeUrls","tilesetFields","getAttributesData","attributes","attributeLoadPromises","index","_options$i3s","url","i3s","token","attributeName","attributeType","getAttributeValueType","loadOptions","promise","push","Promise","allSettled","error","generateAttributesByFeatureId","_tile$tileset","_tile$tileset$tileset","_tile$header","_tile$tileset2","_tile$tileset2$tilese","tileset","header","fields","attribute","hasOwnProperty","attributeValues","valueType","getFeatureIdsAttributeName","objectIdsAttribute","find","includes","objectIdsAttributeName","objectIds","value","attributeIndex","indexOf","getFeatureAttributesByIndex","featureIdIndex","attributesObject","codedValues","getAttributeCodedValues","getAttributeByIndexAndAttributeName","formatAttributeValue","_attributeField$domai","attributeField","field","alias","domain","attributesName","attributeObject","status","String","replace","trim","codeValue","codedValue","code","Number"],"sources":["../src/i3s-attribute-loader.ts"],"sourcesContent":["import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {load} from '@loaders.gl/core';\nimport type {I3SLoaderOptions} from './i3s-loader';\nimport type {I3STileAttributes} from './lib/parsers/parse-i3s-attribute';\nimport {parseI3STileAttribute} from './lib/parsers/parse-i3s-attribute';\nimport {getUrlWithToken} from './lib/utils/url-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\nconst EMPTY_VALUE = '';\nconst REJECTED_STATUS = 'rejected';\n\n/**\n * Loader for I3S attributes\n */\nexport const I3SAttributeLoader: LoaderWithParser<I3STileAttributes, never, I3SLoaderOptions> = {\n name: 'I3S Attribute',\n id: 'i3s-attribute',\n module: 'i3s',\n version: VERSION,\n mimeTypes: ['application/binary'],\n parse: async (arrayBuffer: ArrayBuffer, options?: LoaderOptions) => parseI3STileAttribute(arrayBuffer, options),\n extensions: ['bin'],\n options: {},\n binary: true\n};\n\n\n// TODO - these seem to use the loader rather than being part of the loader. Move to different file...\n\n/**\n * Load attributes based on feature id\n * @param {Object} tile\n * @param {number} featureId\n * @param {Object} options\n * @returns {Promise}\n */\n// eslint-disable-next-line complexity\nexport async function loadFeatureAttributes(tile, featureId, options = {}) {\n const {attributeStorageInfo, attributeUrls, tilesetFields} = getAttributesData(tile);\n\n if (!attributeStorageInfo || !attributeUrls || featureId < 0) {\n return null;\n }\n\n let attributes: object[] = [];\n const attributeLoadPromises: Promise<object>[] = [];\n\n for (let index = 0; index < attributeStorageInfo.length; index++) {\n // @ts-ignore\n const url = getUrlWithToken(attributeUrls[index], options.i3s?.token);\n const attributeName = attributeStorageInfo[index].name;\n const attributeType = getAttributeValueType(attributeStorageInfo[index]);\n const loadOptions = {...options, attributeName, attributeType};\n const promise = load(url, I3SAttributeLoader, loadOptions);\n\n attributeLoadPromises.push(promise);\n }\n try {\n attributes = await Promise.allSettled(attributeLoadPromises);\n } catch (error) {\n // do nothing\n }\n\n if (!attributes.length) {\n return null;\n }\n\n return generateAttributesByFeatureId(attributes, attributeStorageInfo, featureId, tilesetFields);\n}\n\n/**\n * Gets attributes data from tile.\n * @param tile \n * @returns \n */\nfunction getAttributesData(tile) {\n const attributeStorageInfo = tile.tileset?.tileset?.attributeStorageInfo;\n const attributeUrls = tile.header?.attributeUrls;\n const tilesetFields = tile.tileset?.tileset?.fields || [];\n\n return {attributeStorageInfo, attributeUrls, tilesetFields};\n}\n\n/**\n * Get attribute value type based on property names\n * @param {Object} attribute\n * @returns {String}\n */\nexport function getAttributeValueType(attribute) {\n if (attribute.hasOwnProperty('objectIds')) {\n return 'Oid32';\n } else if (attribute.hasOwnProperty('attributeValues')) {\n return attribute.attributeValues.valueType;\n }\n return '';\n}\n\n/**\n * Find in attributeStorageInfo attribute name responsible for feature ids list.\n * @param attributeStorageInfo \n * @returns Feature ids attribute name\n */\nfunction getFeatureIdsAttributeName(attributeStorageInfo) {\n const objectIdsAttribute = attributeStorageInfo.find(attribute => attribute.name.includes('OBJECTID'));\n\n return objectIdsAttribute?.name;\n}\n\n/**\n * Generates mapping featureId to feature attributes\n * @param {Array} attributes\n * @param {Object} attributeStorageInfo\n * @param {number} featureId\n * @returns {Object}\n */\nfunction generateAttributesByFeatureId(attributes, attributeStorageInfo, featureId, tilesetFields) {\n const objectIdsAttributeName = getFeatureIdsAttributeName(attributeStorageInfo);\n const objectIds = attributes.find((attribute) => attribute.value[objectIdsAttributeName]);\n\n if (!objectIds) {\n return null;\n }\n\n const attributeIndex = objectIds.value[objectIdsAttributeName].indexOf(featureId);\n\n if (attributeIndex < 0) {\n return null;\n }\n\n return getFeatureAttributesByIndex(attributes, attributeIndex, attributeStorageInfo, tilesetFields);\n}\n\n/**\n * Generates attribute object for feature mapping by feature id\n * @param {Array} attributes\n * @param {Number} featureIdIndex\n * @param {Object} attributeStorageInfo\n * @returns {Object}\n */\nfunction getFeatureAttributesByIndex(attributes, featureIdIndex, attributeStorageInfo, tilesetFields) {\n const attributesObject = {};\n\n for (let index = 0; index < attributeStorageInfo.length; index++) {\n const attributeName = attributeStorageInfo[index].name;\n const codedValues = getAttributeCodedValues(attributeName, tilesetFields);\n const attribute = getAttributeByIndexAndAttributeName(attributes, index, attributeName);\n attributesObject[attributeName] = formatAttributeValue(attribute, featureIdIndex, codedValues);\n }\n\n return attributesObject;\n}\n\n/**\n * Get coded values list from tileset.\n * @param attributeName \n * @param tilesetFields \n */\nfunction getAttributeCodedValues(attributeName, tilesetFields) {\n const attributeField = tilesetFields\n .find(field => field.name === attributeName || field.alias === attributeName);\n\n return attributeField?.domain?.codedValues || [];\n}\n\n/**\n * Return attribute value if it presents in atrributes list\n * @param {array} attributes\n * @param {number} index\n * @param {string} attributesName\n */\nfunction getAttributeByIndexAndAttributeName(attributes, index, attributesName) {\n const attributeObject = attributes[index];\n\n if (attributeObject.status === REJECTED_STATUS) {\n return null;\n }\n\n return attributeObject.value[attributesName];\n}\n\n/**\n * Do formatting of attribute values or return empty string.\n * @param {Array} attribute\n * @param {Number} featureIdIndex\n * @returns {String}\n */\nfunction formatAttributeValue(attribute, featureIdIndex, codedValues) {\n let value = EMPTY_VALUE;\n\n if (attribute && (featureIdIndex in attribute)) {\n // eslint-disable-next-line no-control-regex\n value = String(attribute[featureIdIndex]).replace(/\\u0000|NaN/g, '').trim();\n }\n\n // Check if coded values are existed. If so we use them.\n if (codedValues.length) {\n const codeValue = codedValues.find(codedValue => codedValue.code === Number(value));\n value = codeValue?.name || EMPTY_VALUE;\n }\n\n return value;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"i3s-attribute-loader.js","names":["load","parseI3STileAttribute","getUrlWithToken","VERSION","EMPTY_VALUE","REJECTED_STATUS","I3SAttributeLoader","name","id","module","version","mimeTypes","parse","arrayBuffer","options","extensions","binary","loadFeatureAttributes","tile","featureId","arguments","length","undefined","attributeStorageInfo","attributeUrls","tilesetFields","getAttributesData","attributes","attributeLoadPromises","index","_options$i3s","url","i3s","token","attributeName","attributeType","getAttributeValueType","loadOptions","promise","push","Promise","allSettled","error","generateAttributesByFeatureId","_tile$tileset","_tile$tileset$tileset","_tile$header","_tile$tileset2","_tile$tileset2$tilese","tileset","header","fields","attribute","hasOwnProperty","attributeValues","valueType","getFeatureIdsAttributeName","objectIdsAttribute","find","includes","objectIdsAttributeName","objectIds","value","attributeIndex","indexOf","getFeatureAttributesByIndex","featureIdIndex","attributesObject","codedValues","getAttributeCodedValues","getAttributeByIndexAndAttributeName","formatAttributeValue","_attributeField$domai","attributeField","field","alias","domain","attributesName","attributeObject","status","String","replace","trim","codeValue","codedValue","code","Number"],"sources":["../src/i3s-attribute-loader.ts"],"sourcesContent":["import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {load} from '@loaders.gl/core';\nimport type {I3SLoaderOptions} from './i3s-loader';\nimport type {I3STileAttributes} from './lib/parsers/parse-i3s-attribute';\nimport {parseI3STileAttribute} from './lib/parsers/parse-i3s-attribute';\nimport {getUrlWithToken} from './lib/utils/url-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\nconst EMPTY_VALUE = '';\nconst REJECTED_STATUS = 'rejected';\n\n/**\n * Loader for I3S attributes\n */\nexport const I3SAttributeLoader: LoaderWithParser<I3STileAttributes, never, I3SLoaderOptions> = {\n name: 'I3S Attribute',\n id: 'i3s-attribute',\n module: 'i3s',\n version: VERSION,\n mimeTypes: ['application/binary'],\n parse: async (arrayBuffer: ArrayBuffer, options?: LoaderOptions) => parseI3STileAttribute(arrayBuffer, options),\n extensions: ['bin'],\n options: {},\n binary: true\n};\n\n\n// TODO - these seem to use the loader rather than being part of the loader. Move to different file...\n\n/**\n * Load attributes based on feature id\n * @param {Object} tile\n * @param {number} featureId\n * @param {Object} options\n * @returns {Promise}\n */\n// eslint-disable-next-line complexity\nexport async function loadFeatureAttributes(tile, featureId, options = {}) {\n const {attributeStorageInfo, attributeUrls, tilesetFields} = getAttributesData(tile);\n\n if (!attributeStorageInfo || !attributeUrls || featureId < 0) {\n return null;\n }\n\n let attributes: object[] = [];\n const attributeLoadPromises: Promise<object>[] = [];\n\n for (let index = 0; index < attributeStorageInfo.length; index++) {\n // @ts-ignore\n const url = getUrlWithToken(attributeUrls[index], options.i3s?.token);\n const attributeName = attributeStorageInfo[index].name;\n const attributeType = getAttributeValueType(attributeStorageInfo[index]);\n const loadOptions = {...options, attributeName, attributeType};\n const promise = load(url, I3SAttributeLoader, loadOptions);\n\n attributeLoadPromises.push(promise);\n }\n try {\n attributes = await Promise.allSettled(attributeLoadPromises);\n } catch (error) {\n // do nothing\n }\n\n if (!attributes.length) {\n return null;\n }\n\n return generateAttributesByFeatureId(attributes, attributeStorageInfo, featureId, tilesetFields);\n}\n\n/**\n * Gets attributes data from tile.\n * @param tile \n * @returns \n */\nfunction getAttributesData(tile) {\n const attributeStorageInfo = tile.tileset?.tileset?.attributeStorageInfo;\n const attributeUrls = tile.header?.attributeUrls;\n const tilesetFields = tile.tileset?.tileset?.fields || [];\n\n return {attributeStorageInfo, attributeUrls, tilesetFields};\n}\n\n/**\n * Get attribute value type based on property names\n * @param {Object} attribute\n * @returns {String}\n */\nexport function getAttributeValueType(attribute) {\n if (attribute.hasOwnProperty('objectIds')) {\n return 'Oid32';\n } else if (attribute.hasOwnProperty('attributeValues')) {\n return attribute.attributeValues.valueType;\n }\n return '';\n}\n\n/**\n * Find in attributeStorageInfo attribute name responsible for feature ids list.\n * @param attributeStorageInfo \n * @returns Feature ids attribute name\n */\nfunction getFeatureIdsAttributeName(attributeStorageInfo) {\n const objectIdsAttribute = attributeStorageInfo.find(attribute => attribute.name.includes('OBJECTID'));\n\n return objectIdsAttribute?.name;\n}\n\n/**\n * Generates mapping featureId to feature attributes\n * @param {Array} attributes\n * @param {Object} attributeStorageInfo\n * @param {number} featureId\n * @returns {Object}\n */\nfunction generateAttributesByFeatureId(attributes, attributeStorageInfo, featureId, tilesetFields) {\n const objectIdsAttributeName = getFeatureIdsAttributeName(attributeStorageInfo);\n const objectIds = attributes.find((attribute) => attribute.value[objectIdsAttributeName]);\n\n if (!objectIds) {\n return null;\n }\n\n const attributeIndex = objectIds.value[objectIdsAttributeName].indexOf(featureId);\n\n if (attributeIndex < 0) {\n return null;\n }\n\n return getFeatureAttributesByIndex(attributes, attributeIndex, attributeStorageInfo, tilesetFields);\n}\n\n/**\n * Generates attribute object for feature mapping by feature id\n * @param {Array} attributes\n * @param {Number} featureIdIndex\n * @param {Object} attributeStorageInfo\n * @returns {Object}\n */\nfunction getFeatureAttributesByIndex(attributes, featureIdIndex, attributeStorageInfo, tilesetFields) {\n const attributesObject = {};\n\n for (let index = 0; index < attributeStorageInfo.length; index++) {\n const attributeName = attributeStorageInfo[index].name;\n const codedValues = getAttributeCodedValues(attributeName, tilesetFields);\n const attribute = getAttributeByIndexAndAttributeName(attributes, index, attributeName);\n attributesObject[attributeName] = formatAttributeValue(attribute, featureIdIndex, codedValues);\n }\n\n return attributesObject;\n}\n\n/**\n * Get coded values list from tileset.\n * @param attributeName \n * @param tilesetFields \n */\nfunction getAttributeCodedValues(attributeName, tilesetFields) {\n const attributeField = tilesetFields\n .find(field => field.name === attributeName || field.alias === attributeName);\n\n return attributeField?.domain?.codedValues || [];\n}\n\n/**\n * Return attribute value if it presents in atrributes list\n * @param {array} attributes\n * @param {number} index\n * @param {string} attributesName\n */\nfunction getAttributeByIndexAndAttributeName(attributes, index, attributesName) {\n const attributeObject = attributes[index];\n\n if (attributeObject.status === REJECTED_STATUS) {\n return null;\n }\n\n return attributeObject.value[attributesName];\n}\n\n/**\n * Do formatting of attribute values or return empty string.\n * @param {Array} attribute\n * @param {Number} featureIdIndex\n * @returns {String}\n */\nfunction formatAttributeValue(attribute, featureIdIndex, codedValues) {\n let value = EMPTY_VALUE;\n\n if (attribute && (featureIdIndex in attribute)) {\n // eslint-disable-next-line no-control-regex\n value = String(attribute[featureIdIndex]).replace(/\\u0000|NaN/g, '').trim();\n }\n\n // Check if coded values are existed. If so we use them.\n if (codedValues.length) {\n const codeValue = codedValues.find(codedValue => codedValue.code === Number(value));\n value = codeValue?.name || EMPTY_VALUE;\n }\n\n return value;\n}\n"],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { parseBuildingSceneLayer } from "./lib/parsers/parse-i3s-building-scene-layer.js";
2
- const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
2
+ const VERSION = typeof "4.1.0-alpha.10" !== 'undefined' ? "4.1.0-alpha.10" : 'latest';
3
3
  export const I3SBuildingSceneLayerLoader = {
4
4
  name: 'I3S Building Scene Layer',
5
5
  id: 'i3s-building-scene-layer',
@@ -1 +1 @@
1
- {"version":3,"file":"i3s-building-scene-layer-loader.js","names":["parseBuildingSceneLayer","VERSION","__VERSION__","I3SBuildingSceneLayerLoader","name","id","module","version","mimeTypes","parse","extensions","options","data","context","url","Error"],"sources":["../src/i3s-building-scene-layer-loader.ts"],"sourcesContent":["import type {LoaderWithParser, LoaderOptions, LoaderContext} from '@loaders.gl/loader-utils';\nimport type {I3SLoaderOptions} from './i3s-loader';\nimport type {BuildingSceneLayerTileset} from './types';\n\nimport {parseBuildingSceneLayer} from './lib/parsers/parse-i3s-building-scene-layer';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\n\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n/**\n * Loader for I3S - Building Scene Layer\n */\nexport const I3SBuildingSceneLayerLoader: LoaderWithParser<\n BuildingSceneLayerTileset,\n never,\n I3SLoaderOptions\n> = {\n name: 'I3S Building Scene Layer',\n id: 'i3s-building-scene-layer',\n module: 'i3s',\n version: VERSION,\n mimeTypes: ['application/json'],\n parse,\n extensions: ['json'],\n options: {}\n};\n\nasync function parse(\n data: ArrayBuffer,\n options?: LoaderOptions,\n context?: LoaderContext\n): Promise<BuildingSceneLayerTileset> {\n if (!context?.url) {\n throw new Error('Url is not provided');\n }\n\n return parseBuildingSceneLayer(data, context.url);\n}\n"],"mappings":"SAIQA,uBAAuB;AAK/B,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAI3E,OAAO,MAAMC,2BAIZ,GAAG;EACFC,IAAI,EAAE,0BAA0B;EAChCC,EAAE,EAAE,0BAA0B;EAC9BC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEN,OAAO;EAChBO,SAAS,EAAE,CAAC,kBAAkB,CAAC;EAC/BC,KAAK;EACLC,UAAU,EAAE,CAAC,MAAM,CAAC;EACpBC,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,eAAeF,KAAKA,CAClBG,IAAiB,EACjBD,OAAuB,EACvBE,OAAuB,EACa;EACpC,IAAI,EAACA,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEC,GAAG,GAAE;IACjB,MAAM,IAAIC,KAAK,CAAC,qBAAqB,CAAC;EACxC;EAEA,OAAOf,uBAAuB,CAACY,IAAI,EAAEC,OAAO,CAACC,GAAG,CAAC;AACnD"}
1
+ {"version":3,"file":"i3s-building-scene-layer-loader.js","names":["parseBuildingSceneLayer","VERSION","I3SBuildingSceneLayerLoader","name","id","module","version","mimeTypes","parse","extensions","options","data","context","url","Error"],"sources":["../src/i3s-building-scene-layer-loader.ts"],"sourcesContent":["import type {LoaderWithParser, LoaderOptions, LoaderContext} from '@loaders.gl/loader-utils';\nimport type {I3SLoaderOptions} from './i3s-loader';\nimport type {BuildingSceneLayerTileset} from './types';\n\nimport {parseBuildingSceneLayer} from './lib/parsers/parse-i3s-building-scene-layer';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\n\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n/**\n * Loader for I3S - Building Scene Layer\n */\nexport const I3SBuildingSceneLayerLoader: LoaderWithParser<\n BuildingSceneLayerTileset,\n never,\n I3SLoaderOptions\n> = {\n name: 'I3S Building Scene Layer',\n id: 'i3s-building-scene-layer',\n module: 'i3s',\n version: VERSION,\n mimeTypes: ['application/json'],\n parse,\n extensions: ['json'],\n options: {}\n};\n\nasync function parse(\n data: ArrayBuffer,\n options?: LoaderOptions,\n context?: LoaderContext\n): Promise<BuildingSceneLayerTileset> {\n if (!context?.url) {\n throw new Error('Url is not provided');\n }\n\n return parseBuildingSceneLayer(data, context.url);\n}\n"],"mappings":"SAIQA,uBAAuB;AAK/B,MAAMC,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAI3E,OAAO,MAAMC,2BAIZ,GAAG;EACFC,IAAI,EAAE,0BAA0B;EAChCC,EAAE,EAAE,0BAA0B;EAC9BC,MAAM,EAAE,KAAK;EACbC,OAAO,EAAEL,OAAO;EAChBM,SAAS,EAAE,CAAC,kBAAkB,CAAC;EAC/BC,KAAK;EACLC,UAAU,EAAE,CAAC,MAAM,CAAC;EACpBC,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,eAAeF,KAAKA,CAClBG,IAAiB,EACjBD,OAAuB,EACvBE,OAAuB,EACa;EACpC,IAAI,EAACA,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEC,GAAG,GAAE;IACjB,MAAM,IAAIC,KAAK,CAAC,qBAAqB,CAAC;EACxC;EAEA,OAAOd,uBAAuB,CAACW,IAAI,EAAEC,OAAO,CAACC,GAAG,CAAC;AACnD"}
@@ -1,5 +1,5 @@
1
1
  import { parseI3STileContent } from "./lib/parsers/parse-i3s-tile-content.js";
2
- const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
2
+ const VERSION = typeof "4.1.0-alpha.10" !== 'undefined' ? "4.1.0-alpha.10" : 'latest';
3
3
  export const I3SContentLoader = {
4
4
  name: 'I3S Content (Indexed Scene Layers)',
5
5
  id: 'i3s-content',
@@ -1 +1 @@
1
- {"version":3,"file":"i3s-content-loader.js","names":["parseI3STileContent","VERSION","__VERSION__","I3SContentLoader","name","id","module","worker","version","mimeTypes","parse","extensions","options","data","context","tile","_tileOptions","tileset","_tilesetOptions","i3s","tileOptions","tilesetOptions"],"sources":["../src/i3s-content-loader.ts"],"sourcesContent":["import type {LoaderWithParser, LoaderContext} from '@loaders.gl/loader-utils';\nimport type {I3SLoaderOptions} from './i3s-loader';\nimport {parseI3STileContent} from './lib/parsers/parse-i3s-tile-content';\nimport {I3STileContent, I3STileOptions, I3STilesetOptions} from './types';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\n\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/**\n * Loader for I3S - Indexed 3D Scene Layer\n */\nexport const I3SContentLoader: LoaderWithParser<I3STileContent | null, never, I3SLoaderOptions> = {\n name: 'I3S Content (Indexed Scene Layers)',\n id: 'i3s-content',\n module: 'i3s',\n worker: true,\n version: VERSION,\n mimeTypes: ['application/octet-stream'],\n parse,\n extensions: ['bin'],\n options: {\n 'i3s-content': {}\n }\n};\n\nasync function parse(data, options?: I3SLoaderOptions, context?: LoaderContext) {\n const {tile, _tileOptions, tileset, _tilesetOptions} = options?.i3s || {};\n const tileOptions = _tileOptions || tile;\n const tilesetOptions = _tilesetOptions || tileset;\n if (!tileOptions || !tilesetOptions) {\n return null;\n }\n return await parseI3STileContent(\n data,\n tileOptions as I3STileOptions,\n tilesetOptions as I3STilesetOptions,\n options,\n context\n );\n}\n"],"mappings":"SAEQA,mBAAmB;AAM3B,MAAMC,OAAO,GAAG,OAAOC,WAAW,KAAK,WAAW,GAAGA,WAAW,GAAG,QAAQ;AAK3E,OAAO,MAAMC,gBAAkF,GAAG;EAChGC,IAAI,EAAE,oCAAoC;EAC1CC,EAAE,EAAE,aAAa;EACjBC,MAAM,EAAE,KAAK;EACbC,MAAM,EAAE,IAAI;EACZC,OAAO,EAAEP,OAAO;EAChBQ,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,KAAK;EACLC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,OAAO,EAAE;IACP,aAAa,EAAE,CAAC;EAClB;AACF,CAAC;AAED,eAAeF,KAAKA,CAACG,IAAI,EAAED,OAA0B,EAAEE,OAAuB,EAAE;EAC9E,MAAM;IAACC,IAAI;IAAEC,YAAY;IAAEC,OAAO;IAAEC;EAAe,CAAC,GAAG,CAAAN,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEO,GAAG,KAAI,CAAC,CAAC;EACzE,MAAMC,WAAW,GAAGJ,YAAY,IAAID,IAAI;EACxC,MAAMM,cAAc,GAAGH,eAAe,IAAID,OAAO;EACjD,IAAI,CAACG,WAAW,IAAI,CAACC,cAAc,EAAE;IACnC,OAAO,IAAI;EACb;EACA,OAAO,MAAMrB,mBAAmB,CAC9Ba,IAAI,EACJO,WAAW,EACXC,cAAc,EACdT,OAAO,EACPE,OACF,CAAC;AACH"}
1
+ {"version":3,"file":"i3s-content-loader.js","names":["parseI3STileContent","VERSION","I3SContentLoader","name","id","module","worker","version","mimeTypes","parse","extensions","options","data","context","tile","_tileOptions","tileset","_tilesetOptions","i3s","tileOptions","tilesetOptions"],"sources":["../src/i3s-content-loader.ts"],"sourcesContent":["import type {LoaderWithParser, LoaderContext} from '@loaders.gl/loader-utils';\nimport type {I3SLoaderOptions} from './i3s-loader';\nimport {parseI3STileContent} from './lib/parsers/parse-i3s-tile-content';\nimport {I3STileContent, I3STileOptions, I3STilesetOptions} from './types';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\n\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/**\n * Loader for I3S - Indexed 3D Scene Layer\n */\nexport const I3SContentLoader: LoaderWithParser<I3STileContent | null, never, I3SLoaderOptions> = {\n name: 'I3S Content (Indexed Scene Layers)',\n id: 'i3s-content',\n module: 'i3s',\n worker: true,\n version: VERSION,\n mimeTypes: ['application/octet-stream'],\n parse,\n extensions: ['bin'],\n options: {\n 'i3s-content': {}\n }\n};\n\nasync function parse(data, options?: I3SLoaderOptions, context?: LoaderContext) {\n const {tile, _tileOptions, tileset, _tilesetOptions} = options?.i3s || {};\n const tileOptions = _tileOptions || tile;\n const tilesetOptions = _tilesetOptions || tileset;\n if (!tileOptions || !tilesetOptions) {\n return null;\n }\n return await parseI3STileContent(\n data,\n tileOptions as I3STileOptions,\n tilesetOptions as I3STilesetOptions,\n options,\n context\n );\n}\n"],"mappings":"SAEQA,mBAAmB;AAM3B,MAAMC,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAK3E,OAAO,MAAMC,gBAAkF,GAAG;EAChGC,IAAI,EAAE,oCAAoC;EAC1CC,EAAE,EAAE,aAAa;EACjBC,MAAM,EAAE,KAAK;EACbC,MAAM,EAAE,IAAI;EACZC,OAAO,EAAEN,OAAO;EAChBO,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,KAAK;EACLC,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBC,OAAO,EAAE;IACP,aAAa,EAAE,CAAC;EAClB;AACF,CAAC;AAED,eAAeF,KAAKA,CAACG,IAAI,EAAED,OAA0B,EAAEE,OAAuB,EAAE;EAC9E,MAAM;IAACC,IAAI;IAAEC,YAAY;IAAEC,OAAO;IAAEC;EAAe,CAAC,GAAG,CAAAN,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEO,GAAG,KAAI,CAAC,CAAC;EACzE,MAAMC,WAAW,GAAGJ,YAAY,IAAID,IAAI;EACxC,MAAMM,cAAc,GAAGH,eAAe,IAAID,OAAO;EACjD,IAAI,CAACG,WAAW,IAAI,CAACC,cAAc,EAAE;IACnC,OAAO,IAAI;EACb;EACA,OAAO,MAAMpB,mBAAmB,CAC9BY,IAAI,EACJO,WAAW,EACXC,cAAc,EACdT,OAAO,EACPE,OACF,CAAC;AACH"}