npm - @loaders.gl/tile-converter - Versions diffs - 3.3.0-alpha.7 → 3.3.0 - Mend

@loaders.gl/tile-converter 3.3.0-alpha.7 → 3.3.0

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.

Files changed (136) hide show

package/dist/esm/i3s-converter/json-templates/shared-resources.js CHANGED Viewed

@@ -14,15 +14,15 @@ const MATERIAL_DEFINITION_INFO_PARAMS = () => ({
   },
   ambient: {
     path: 'ambient',
-    default: [1, 1, 1, 1]
+    default: [1, 1, 1]
   },
   diffuse: {
     path: 'diffuse',
-    default: [1, 1, 1, 1]
+    default: [1, 1, 1]
   },
   specular: {
     path: 'specular',
-    default: [0, 0, 0, 0]
+    default: [0, 0, 0]
   },
   useVertexColorAlpha: {
     path: 'useVertexColorAlpha',

package/dist/esm/i3s-converter/json-templates/shared-resources.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"shared-resources.js","names":["transform","MATERIAL_DEFINITION_INFO_PARAMS","renderMode","path","default","shininess","reflectivity","ambient","diffuse","specular","useVertexColorAlpha","vertexRegions","vertexColors","MATERIAL_DEFINITION_INFO","name","type","params","val","thisObject","originalObject","TEXTURE_DEFINITION_IMAGE","id","size","href","length","TEXTURE_DEFINITION_INFO","encoding","wrap","atlas","uvSet","channels","images","map","image","SHARED_RESOURCES","materialDefinitions","transfromMaterialDefinitions","textureDefinitions","transfromTextureDefinitions","materialDefinitionInfos","result","index","materialDefinitionInfo","entries","nodePath","textureDefinitionInfos","textureDefinitionInfo","imageIndex"],"sources":["../../../../src/i3s-converter/json-templates/shared-resources.ts"],"sourcesContent":["import transform from 'json-map-transform';\n\nconst MATERIAL_DEFINITION_INFO_PARAMS = () => ({\n renderMode: {\n path: 'renderMode',\n default: 'solid'\n },\n shininess: {\n path: 'shininess',\n default: 1\n },\n reflectivity: {\n path: 'reflectivity',\n default: 0\n },\n ambient: {\n path: 'ambient',\n default: [1, 1, 1~~, 1~~]\n },\n diffuse: {\n path: 'diffuse',\n default: [1, 1, 1~~, 1~~]\n },\n specular: {\n path: 'specular',\n default: [0, 0, 0~~, 0~~]\n },\n useVertexColorAlpha: {\n path: 'useVertexColorAlpha',\n default: false\n },\n vertexRegions: {\n path: 'vertexRegions',\n default: false\n },\n vertexColors: {\n path: 'vertexColors',\n default: true\n }\n});\n\nconst MATERIAL_DEFINITION_INFO = () => ({\n name: {\n path: 'name',\n default: 'standard'\n },\n type: {\n path: 'type',\n default: 'standard'\n },\n params: {\n path: 'params',\n transform: (val, thisObject, originalObject) =>\n transform(originalObject, MATERIAL_DEFINITION_INFO_PARAMS())\n }\n});\n\nconst TEXTURE_DEFINITION_IMAGE = () => ({\n id: {\n path: 'id'\n },\n size: {\n path: 'size'\n },\n href: {\n path: 'href',\n default: ['../textures/0']\n },\n length: {\n path: 'length'\n }\n});\n\nconst TEXTURE_DEFINITION_INFO = () => ({\n encoding: {\n path: 'encoding'\n },\n wrap: {\n path: 'wrap',\n default: ['none']\n },\n atlas: {\n path: 'atlas',\n default: false\n },\n uvSet: {\n path: 'uvSet',\n default: 'uv0'\n },\n channels: {\n path: 'channels',\n default: 'rgb'\n },\n images: {\n path: 'images',\n transform: (val, thisObject, originalObject) =>\n val.map((image) => transform(image, TEXTURE_DEFINITION_IMAGE()))\n }\n});\n\nexport const SHARED_RESOURCES = () => ({\n materialDefinitions: {\n path: 'materialDefinitionInfos',\n transform: transfromMaterialDefinitions\n },\n textureDefinitions: {\n path: 'textureDefinitionInfos',\n transform: transfromTextureDefinitions\n }\n});\n\nfunction transfromMaterialDefinitions(materialDefinitionInfos, thisObject, originalObject) {\n const result = {};\n for (const [index, materialDefinitionInfo] of materialDefinitionInfos.entries()) {\n result[`Mat${originalObject.nodePath}${index}`] = transform(\n materialDefinitionInfo,\n MATERIAL_DEFINITION_INFO()\n );\n }\n return result;\n}\n\nfunction transfromTextureDefinitions(textureDefinitionInfos, thisObject, originalObject) {\n if (!textureDefinitionInfos) {\n return null;\n }\n const result = {};\n for (const [index, textureDefinitionInfo] of textureDefinitionInfos.entries()) {\n const imageIndex = `${originalObject.nodePath}${index}`;\n textureDefinitionInfo.imageIndex = imageIndex;\n result[imageIndex] = transform(textureDefinitionInfo, TEXTURE_DEFINITION_INFO());\n }\n return result;\n}\n"],"mappings":"AAAA,OAAOA,SAAS,MAAM,oBAAoB;AAE1C,MAAMC,+BAA+B,GAAG,OAAO;EAC7CC,UAAU,EAAE;IACVC,IAAI,EAAE,YAAY;IAClBC,OAAO,EAAE;EACX,CAAC;EACDC,SAAS,EAAE;IACTF,IAAI,EAAE,WAAW;IACjBC,OAAO,EAAE;EACX,CAAC;EACDE,YAAY,EAAE;IACZH,IAAI,EAAE,cAAc;IACpBC,OAAO,EAAE;EACX,CAAC;EACDG,OAAO,EAAE;IACPJ,IAAI,EAAE,SAAS;IACfC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC~~,EAAE,CAAC~~;~~EACtB~~,CAAC;EACDI,OAAO,EAAE;IACPL,IAAI,EAAE,SAAS;IACfC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC~~,EAAE,CAAC~~;~~EACtB~~,CAAC;EACDK,QAAQ,EAAE;IACRN,IAAI,EAAE,UAAU;IAChBC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC~~,EAAE,CAAC~~;~~EACtB~~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"}
1	+ {"version":3,"file":"shared-resources.js","names":["transform","MATERIAL_DEFINITION_INFO_PARAMS","renderMode","path","default","shininess","reflectivity","ambient","diffuse","specular","useVertexColorAlpha","vertexRegions","vertexColors","MATERIAL_DEFINITION_INFO","name","type","params","val","thisObject","originalObject","TEXTURE_DEFINITION_IMAGE","id","size","href","length","TEXTURE_DEFINITION_INFO","encoding","wrap","atlas","uvSet","channels","images","map","image","SHARED_RESOURCES","materialDefinitions","transfromMaterialDefinitions","textureDefinitions","transfromTextureDefinitions","materialDefinitionInfos","result","index","materialDefinitionInfo","entries","nodePath","textureDefinitionInfos","textureDefinitionInfo","imageIndex"],"sources":["../../../../src/i3s-converter/json-templates/shared-resources.ts"],"sourcesContent":["import transform from 'json-map-transform';\n\nconst MATERIAL_DEFINITION_INFO_PARAMS = () => ({\n renderMode: {\n path: 'renderMode',\n default: 'solid'\n },\n shininess: {\n path: 'shininess',\n default: 1\n },\n reflectivity: {\n path: 'reflectivity',\n default: 0\n },\n ambient: {\n path: 'ambient',\n default: [1, 1, 1]\n },\n diffuse: {\n path: 'diffuse',\n default: [1, 1, 1]\n },\n specular: {\n path: 'specular',\n default: [0, 0, 0]\n },\n useVertexColorAlpha: {\n path: 'useVertexColorAlpha',\n default: false\n },\n vertexRegions: {\n path: 'vertexRegions',\n default: false\n },\n vertexColors: {\n path: 'vertexColors',\n default: true\n }\n});\n\nconst MATERIAL_DEFINITION_INFO = () => ({\n name: {\n path: 'name',\n default: 'standard'\n },\n type: {\n path: 'type',\n default: 'standard'\n },\n params: {\n path: 'params',\n transform: (val, thisObject, originalObject) =>\n transform(originalObject, MATERIAL_DEFINITION_INFO_PARAMS())\n }\n});\n\nconst TEXTURE_DEFINITION_IMAGE = () => ({\n id: {\n path: 'id'\n },\n size: {\n path: 'size'\n },\n href: {\n path: 'href',\n default: ['../textures/0']\n },\n length: {\n path: 'length'\n }\n});\n\nconst TEXTURE_DEFINITION_INFO = () => ({\n encoding: {\n path: 'encoding'\n },\n wrap: {\n path: 'wrap',\n default: ['none']\n },\n atlas: {\n path: 'atlas',\n default: false\n },\n uvSet: {\n path: 'uvSet',\n default: 'uv0'\n },\n channels: {\n path: 'channels',\n default: 'rgb'\n },\n images: {\n path: 'images',\n transform: (val, thisObject, originalObject) =>\n val.map((image) => transform(image, TEXTURE_DEFINITION_IMAGE()))\n }\n});\n\nexport const SHARED_RESOURCES = () => ({\n materialDefinitions: {\n path: 'materialDefinitionInfos',\n transform: transfromMaterialDefinitions\n },\n textureDefinitions: {\n path: 'textureDefinitionInfos',\n transform: transfromTextureDefinitions\n }\n});\n\nfunction transfromMaterialDefinitions(materialDefinitionInfos, thisObject, originalObject) {\n const result = {};\n for (const [index, materialDefinitionInfo] of materialDefinitionInfos.entries()) {\n result[`Mat${originalObject.nodePath}${index}`] = transform(\n materialDefinitionInfo,\n MATERIAL_DEFINITION_INFO()\n );\n }\n return result;\n}\n\nfunction transfromTextureDefinitions(textureDefinitionInfos, thisObject, originalObject) {\n if (!textureDefinitionInfos) {\n return null;\n }\n const result = {};\n for (const [index, textureDefinitionInfo] of textureDefinitionInfos.entries()) {\n const imageIndex = `${originalObject.nodePath}${index}`;\n textureDefinitionInfo.imageIndex = imageIndex;\n result[imageIndex] = transform(textureDefinitionInfo, TEXTURE_DEFINITION_INFO());\n }\n return result;\n}\n"],"mappings":"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"}

package/dist/esm/i3s-converter/types.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.js","names":[],"sources":["../../../src/i3s-converter/types.ts"],"sourcesContent":["import {\n BoundingVolumes,\n I3SMaterialDefinition,\n MaterialDefinitionInfo,\n TextureDefinitionInfo\n} from '@loaders.gl/i3s';\~~nimport {ImageDataType} from '@loaders.gl/images';\~~n\n/** Converted resources for specific node /\nexport type I3SConvertedResources = {\n /\n Node id\n /\n nodeId?: number;\n /* Non-compressed geometry buffer that have structure met\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md\n * (Geometry buffer)\n /\n geometry: ArrayBuffer \| null;\n /\n Draco compressed geometry\n /\n compressedGeometry?: Promise<ArrayBuffer> \| null;\n /\n Texture image content\n /\n texture: any \| null;\n /\n Shared resources built from GLTF material\n /\n sharedResources: SharedResourcesArrays \| null;\n /\n Material definition of the node\n /\n meshMaterial?: I3SMaterialDefinition \| null;\n /\n Number of vertices in the node\n /\n vertexCount: number \| null;\n /\n Feature attributes contents\n /\n attributes: ArrayBuffer[] \| null;\n /\n Number of features in the node\n /\n featureCount: number \| null;\n /\n MBS and/or OBB bounding volumes of the node\n /\n boundingVolumes: BoundingVolumes \| null;\n};\n\n/\n Geometry and feature attributes converted from GLTF primitives\n /\nexport type ConvertedAttributes = {\n /* POSITION attribute value /\n positions: Float32Array;\n /* NORMAL attribute value /\n normals: Float32Array;\n /* TEXCOORD_0 attribute value /\n texCoords: Float32Array;\n /* COLOR_0 attribute value /\n colors: Uint8Array;\n /* Feature indices grouped by ...\n * converted from \"batch ids\" of GLTF\n /\n featureIndicesGroups?: number[][];\n /* Feature indices converted from \"batch ids\" /\n featureIndices: number[];\n /\n MBS and/or OBB bounding volumes of the node\n /\n boundingVolumes: null \| BoundingVolumes;\n};\n\n/* Postprocessed geometry and feature attributes\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md\n /\nexport type GeometryAttributes = {\n /* POSITION attribute value /\n positions: Float32Array;\n /* NORMAL attribute value /\n normals: Float32Array;\n /* TEXCOORD_0 attribute value /\n texCoords: Float32Array;\n /* COLOR_0 attribute value /\n colors: Uint8Array;\n /* faceRanges attribute value /\n faceRange: Uint32Array;\n /* feature Ids attribute value /\n featureIds: number[];\n /* number of features in the node /\n featureCount: number;\n};\n\n/* Geometry attributes specific for the particular feature /\nexport type GroupedByFeatureIdAttributes = {\n /* Feature Id /\n featureId: number;\n /* POSITION attribute value /\n positions: Float32Array;\n /* NORMAL attribute value /\n normals: Float32Array;\n /* COLOR_0 attribute value /\n colors: Uint8Array;\n /* TEXCOORD_0 attribute value /\n texCoords: Float32Array;\n};\n\n/* Shared resources made from GLTF material /\nexport type SharedResourcesArrays = {\n /* material definitions list https://github.com/Esri/i3s-spec/blob/master/docs/1.8/materialDefinitionInfo.cmn.md /\n materialDefinitionInfos?: MaterialDefinitionInfo[];\n /* texture definitions list https://github.com/Esri/i3s-spec/blob/master/docs/1.8/textureDefinitionInfo.cmn.md/\n textureDefinitionInfos?: TextureDefinitionInfo[];\n /* node id to make unique SharedResource ids /\n nodePath?: string;\n};\n\n/* I3S material definition and texture content taken from GLTF material /\nexport type I3SMaterialWithTexture = {\n /* Material definition https://github.com/Esri/i3s-spec/blob/master/docs/1.8/materialDefinitions.cmn.md /\n material: I3SMaterialDefinition;\n /* Texture content (image) */\n texture?: ~~ImageDataType~~;\n};\n"],"mappings":""}
1	+ {"version":3,"file":"types.js","names":[],"sources":["../../../src/i3s-converter/types.ts"],"sourcesContent":["import {GLTFImagePostprocessed} from '@loaders.gl/gltf';\nimport {\n BoundingVolumes,\n I3SMaterialDefinition,\n MaterialDefinitionInfo,\n TextureDefinitionInfo\n} from '@loaders.gl/i3s';\n\n/** Converted resources for specific node /\nexport type I3SConvertedResources = {\n /\n Node id\n /\n nodeId?: number;\n /* Non-compressed geometry buffer that have structure met\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md\n * (Geometry buffer)\n /\n geometry: ArrayBuffer \| null;\n /\n Draco compressed geometry\n /\n compressedGeometry?: Promise<ArrayBuffer> \| null;\n /\n Texture image content\n /\n texture: any \| null;\n /\n If the resource has uvRegions geometry attribute\n /\n hasUvRegions: boolean;\n /\n Shared resources built from GLTF material\n /\n sharedResources: SharedResourcesArrays \| null;\n /\n Material definition of the node\n /\n meshMaterial?: I3SMaterialDefinition \| null;\n /\n Number of vertices in the node\n /\n vertexCount: number \| null;\n /\n Feature attributes contents\n /\n attributes: ArrayBuffer[] \| null;\n /\n Number of features in the node\n /\n featureCount: number \| null;\n /\n MBS and/or OBB bounding volumes of the node\n /\n boundingVolumes: BoundingVolumes \| null;\n};\n\n/\n Geometry and feature attributes converted from GLTF primitives\n /\nexport type ConvertedAttributes = {\n /* POSITION attribute value /\n positions: Float32Array;\n /* NORMAL attribute value /\n normals: Float32Array;\n /* TEXCOORD_0 attribute value /\n texCoords: Float32Array;\n /* COLOR_0 attribute value /\n colors: Uint8Array;\n /* uvRegion attribute for a texture atlas /\n uvRegions: Uint16Array;\n /* Feature indices grouped by ...\n * converted from \"batch ids\" of GLTF\n /\n featureIndicesGroups?: number[][];\n /* Feature indices converted from \"batch ids\" /\n featureIndices: number[];\n /\n MBS and/or OBB bounding volumes of the node\n /\n boundingVolumes: null \| BoundingVolumes;\n /* merged materials data /\n mergedMaterials: MergedMaterial[];\n};\n\n/* Postprocessed geometry and feature attributes\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md\n /\nexport type GeometryAttributes = {\n /* POSITION attribute value /\n positions: Float32Array;\n /* NORMAL attribute value /\n normals: Float32Array;\n /* TEXCOORD_0 attribute value /\n texCoords: Float32Array;\n /* COLOR_0 attribute value /\n colors: Uint8Array;\n /* uvRegion attribute for a texture atlas /\n uvRegions: Uint16Array;\n /* faceRanges attribute value /\n faceRange: Uint32Array;\n /* feature Ids attribute value /\n featureIds: number[];\n /* number of features in the node /\n featureCount: number;\n};\n\n/* Geometry attributes specific for the particular feature /\nexport type GroupedByFeatureIdAttributes = {\n /* Feature Id /\n featureId: number;\n /* POSITION attribute value /\n positions: Float32Array;\n /* NORMAL attribute value /\n normals: Float32Array;\n /* COLOR_0 attribute value /\n colors: Uint8Array;\n /* uvRegion attribute for a texture atlas /\n uvRegions: Uint16Array;\n /* TEXCOORD_0 attribute value /\n texCoords: Float32Array;\n};\n\n/* Shared resources made from GLTF material /\nexport type SharedResourcesArrays = {\n /* material definitions list https://github.com/Esri/i3s-spec/blob/master/docs/1.8/materialDefinitionInfo.cmn.md /\n materialDefinitionInfos?: MaterialDefinitionInfo[];\n /* texture definitions list https://github.com/Esri/i3s-spec/blob/master/docs/1.8/textureDefinitionInfo.cmn.md/\n textureDefinitionInfos?: TextureDefinitionInfo[];\n /* node id to make unique SharedResource ids /\n nodePath?: string;\n};\n\n/* I3S material definition and texture content taken from GLTF material /\nexport type I3SMaterialWithTexture = {\n /* Material definition https://github.com/Esri/i3s-spec/blob/master/docs/1.8/materialDefinitions.cmn.md /\n material: I3SMaterialDefinition;\n /* Texture content (image) /\n texture?: GLTFImagePostprocessed;\n /* Metadata of all merged materials /\n mergedMaterials: MergedMaterial[];\n};\n\n/* Metadata of some original texture /\nexport type MergedMaterial = {\n /* Gltf material Id /\n originalMaterialId: string;\n /* Original texture size /\n textureSize?: {\n width: number;\n height: number;\n };\n /* Uint16Array of 4 elements https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md */\n uvRegion?: Uint16Array;\n};\n"],"mappings":""}

package/dist/esm/lib/utils/file-utils.js CHANGED Viewed

@@ -1,3 +1,5 @@
+import { load } from '@loaders.gl/core';
+import { JSONLoader } from '@loaders.gl/loader-utils';
 import { promises as fs } from 'fs';
 import { isAbsolute, join } from 'path';
 import { compressFileWithGzip } from './compress-util';
@@ -28,15 +30,54 @@ export async function writeFile(path, data) {
 export async function writeFileForSlpk(path, data) {
   let fileName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'index.json';
   let compress = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  let compressList = arguments.length > 4 ? arguments[4] : undefined;
   const pathFile = await writeFile(path, data, fileName);
   if (compress) {
-    const pathGzFile = await compressFileWithGzip(pathFile);
-    await removeFile(pathFile);
-    return pathGzFile;
+    if (compressList) {
+      if (!compressList.includes(pathFile)) {
+        compressList.push(pathFile);
+        return "".concat(pathFile, ".gz");
+      } else {
+        return null;
+      }
+    } else {
+      const pathGzFile = await compressFileWithGzip(pathFile);
+      await removeFile(pathFile);
+      return pathGzFile;
+    }
   }
   return pathFile;
 }
+export async function openJson(path, fileName) {
+  return new Promise((resolve, reject) => {
+    let count = 0;
+    console.log("load ".concat(path, "/").concat(fileName, "."));
+    const intervalId = setInterval(() => {
+      const pathFile = join(path, fileName);
+      load(pathFile, JSONLoader).then(result => {
+        clearInterval(intervalId);
+        resolve(result);
+      }).catch(() => {
+        count++;
+        if (count > 100) {
+          clearInterval(intervalId);
+          reject(new Error("Cannon load ".concat(path, "/").concat(fileName, ".")));
+        }
+      });
+    }, 200);
+  });
+}
+export async function isFileExists(fileName) {
+  try {
+    await fs.stat(fileName);
+    return true;
+  } catch {
+    return false;
+  }
+}
 export function removeDir(path) {
   return fs.rmdir(path, {
     recursive: true

package/dist/esm/lib/utils/file-utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"file-utils.js","names":["promises","fs","isAbsolute","join","compressFileWithGzip","writeFile","path","data","fileName","toWriteData","Promise","Uint8Array","ArrayBuffer","mkdir","recursive","pathFile","err","console","log","writeFileForSlpk","compress","pathGzFile","removeFile","removeDir","rmdir","unlink","getAbsoluteFilePath","filePath","process","cwd"],"sources":["../../../../src/lib/utils/file-utils.ts"],"sourcesContent":["import {promises as fs} from 'fs';\nimport {isAbsolute, join} from 'path';\nimport {compressFileWithGzip} from './compress-util';\n\n/*\n Write a file with data and name fileName to path\n \n @param path - output path\n * @param data - file content\n * @param fileName - name of output file (default: index.json)\n /\nexport async function writeFile(\n path: string,\n data: string \| Uint8Array \| ArrayBuffer \| Promise<ArrayBuffer>,\n fileName: string = 'index.json'\n): Promise<string> {\n let toWriteData: string \| Uint8Array;\n if (data instanceof Promise) {\n toWriteData = new Uint8Array(await data);\n } else if (data instanceof ArrayBuffer) {\n toWriteData = new Uint8Array(data as ArrayBuffer);\n } else {\n toWriteData = data;\n }\n await fs.mkdir(path, {recursive: true});\n const pathFile = join(path, fileName);\n try {\n await fs.writeFile(pathFile, toWriteData);\n } catch (err) {\n throw err;\n }\n console.log(`${pathFile} saved.`); // eslint-disable-line\n return pathFile;\n}\n\n/\n Write a file with data and name fileName to path - specific one for further packaging into slpk\n \n @param path - output path\n * @param data - file content\n * @param fileName - name of output file (default: index.json)\n * @param compress - if need to compress file with gzip (default: true)\n /\nexport async function writeFileForSlpk(\n path: string,\n data: string \| Uint8Array \| ArrayBuffer \| Promise<ArrayBuffer>,\n fileName: string = 'index.json',\n compress: boolean = true\n): Promise<string> {\n const pathFile = await writeFile(path, data, fileName);\n if (compress) {\n const pathGzFile = await compressFileWithGzip(pathFile);\n // After compression, we don't need an uncompressed file\n await removeFile(pathFile);\n return pathGzFile;\n }\n return pathFile;\n}\n\n/\n Remove dir with path\n \n @param path\n /\nexport function removeDir(path: string) {\n return fs.rmdir(path, {recursive: true});\n}\n\n/\n Remove file with path\n \n @param path\n /\nexport function removeFile(path: string) {\n return fs.unlink(path);\n}\n\n/\n Generates absolute file path\n * @param filePath\n */\nexport function getAbsoluteFilePath(filePath: string) {\n return isAbsolute(filePath) ? filePath : join(process.cwd(), filePath)~~; // eslint-disable-line no-undef\~~n}\n"],"mappings":"AAAA,SAAQA,QAAQ,IAAIC,EAAE,QAAO,IAAI;AACjC,SAAQC,UAAU,EAAEC,IAAI,QAAO,MAAM;AACrC,SAAQC,oBAAoB,QAAO,iBAAiB;;AASpD,OAAO,eAAeC,SAAS,CAC7BC,IAAY,EACZC,IAA8D,EAE7C;EAAA,IADjBC,QAAgB,uEAAG,YAAY;EAE/B,IAAIC,WAAgC;EACpC,IAAIF,IAAI,YAAYG,OAAO,EAAE;IAC3BD,WAAW,GAAG,IAAIE,UAAU,CAAC,MAAMJ,IAAI,CAAC;EAC1C,CAAC,MAAM,IAAIA,IAAI,YAAYK,WAAW,EAAE;IACtCH,WAAW,GAAG,IAAIE,UAAU,CAACJ,IAAI,CAAgB;EACnD,CAAC,MAAM;IACLE,WAAW,GAAGF,IAAI;EACpB;EACA,MAAMN,EAAE,CAACY,KAAK,CAACP,IAAI,EAAE;IAACQ,SAAS,EAAE;EAAI,CAAC,CAAC;EACvC,MAAMC,QAAQ,GAAGZ,IAAI,CAACG,IAAI,EAAEE,QAAQ,CAAC;EACrC,IAAI;IACF,MAAMP,EAAE,CAACI,SAAS,CAACU,QAAQ,EAAEN,WAAW,CAAC;EAC3C,CAAC,CAAC,OAAOO,GAAG,EAAE;IACZ,MAAMA,GAAG;EACX;EACAC,OAAO,CAACC,GAAG,WAAIH,QAAQ,aAAU;EACjC,OAAOA,QAAQ;AACjB;;~~AAUA~~,OAAO,eAAeI,gBAAgB,CACpCb,IAAY,EACZC,IAA8D,~~EAG7C~~;EAAA,~~IAFjBC~~,QAAgB,uEAAG,YAAY;EAAA,IAC/BY,QAAiB,uEAAG,IAAI;~~EAExB~~,~~MAAML~~,QAAQ,GAAG,MAAMV,SAAS,CAACC,IAAI,EAAEC,IAAI,EAAEC,QAAQ,CAAC;EACtD,IAAIY,QAAQ,EAAE;IACZ,~~MAAMC~~,UAAU,GAAG,~~MAAMjB~~,oBAAoB,CAACW,QAAQ,CAAC;~~IAEvD~~,~~MAAMO~~,UAAU,~~CAACP~~,QAAQ,CAAC;~~IAC1B~~,~~OAAOM~~,UAAU;~~EACnB~~;EACA,~~OAAON~~,QAAQ;AACjB;;AAOA,OAAO,~~SAASQ~~,SAAS,~~CAACjB~~,IAAY,EAAE;EACtC,OAAOL,EAAE,~~CAACuB~~,KAAK,~~CAAClB~~,IAAI,EAAE;IAACQ,SAAS,EAAE;EAAI,CAAC,CAAC;AAC1C;;AAOA,OAAO,~~SAASQ~~,UAAU,~~CAAChB~~,IAAY,EAAE;EACvC,OAAOL,EAAE,~~CAACwB~~,MAAM,~~CAACnB~~,IAAI,CAAC;AACxB;;AAMA,OAAO,~~SAASoB~~,mBAAmB,CAACC,QAAgB,EAAE;EACpD,~~OAAOzB~~,UAAU,~~CAACyB~~,QAAQ,CAAC,GAAGA,QAAQ,~~GAAGxB~~,IAAI,~~CAACyB~~,OAAO,CAACC,GAAG,EAAE,EAAEF,QAAQ,CAAC;AACxE"}
1	+ {"version":3,"file":"file-utils.js","names":["load","JSONLoader","promises","fs","isAbsolute","join","compressFileWithGzip","writeFile","path","data","fileName","toWriteData","Promise","Uint8Array","ArrayBuffer","mkdir","recursive","pathFile","err","console","log","writeFileForSlpk","compress","compressList","includes","push","pathGzFile","removeFile","openJson","resolve","reject","count","intervalId","setInterval","then","result","clearInterval","catch","Error","isFileExists","stat","removeDir","rmdir","unlink","getAbsoluteFilePath","filePath","process","cwd"],"sources":["../../../../src/lib/utils/file-utils.ts"],"sourcesContent":["import {load} from '@loaders.gl/core';\nimport {JSONLoader} from '@loaders.gl/loader-utils';\nimport {promises as fs} from 'fs';\nimport {isAbsolute, join} from 'path';\nimport {compressFileWithGzip} from './compress-util';\n\n/*\n Write a file with data and name fileName to path\n \n @param path - output path\n * @param data - file content\n * @param fileName - name of output file (default: index.json)\n /\nexport async function writeFile(\n path: string,\n data: string \| Uint8Array \| ArrayBuffer \| Promise<ArrayBuffer>,\n fileName: string = 'index.json'\n): Promise<string> {\n let toWriteData: string \| Uint8Array;\n if (data instanceof Promise) {\n toWriteData = new Uint8Array(await data);\n } else if (data instanceof ArrayBuffer) {\n toWriteData = new Uint8Array(data as ArrayBuffer);\n } else {\n toWriteData = data;\n }\n await fs.mkdir(path, {recursive: true});\n const pathFile = join(path, fileName);\n try {\n await fs.writeFile(pathFile, toWriteData);\n } catch (err) {\n throw err;\n }\n console.log(`${pathFile} saved.`); // eslint-disable-line\n return pathFile;\n}\n\n/\n Write a file with data and name fileName to path - specific one for further packaging into slpk\n \n @param path - output path\n * @param data - file content\n * @param fileName - name of output file (default: index.json)\n * @param compress - if need to compress file with gzip (default: true)\n * @param compressList - if set - the file should be added to this list and compressed in the end of conversion\n /\nexport async function writeFileForSlpk(\n path: string,\n data: string \| Uint8Array \| ArrayBuffer \| Promise<ArrayBuffer>,\n fileName: string = 'index.json',\n compress: boolean = true,\n compressList?: string[] \| null\n): Promise<string \| null> {\n const pathFile = await writeFile(path, data, fileName);\n if (compress) {\n if (compressList) {\n if (!compressList.includes(pathFile)) {\n compressList.push(pathFile);\n return `${pathFile}.gz`;\n } else {\n return null;\n }\n } else {\n const pathGzFile = await compressFileWithGzip(pathFile);\n // After compression, we don't need an uncompressed file\n await removeFile(pathFile);\n return pathGzFile;\n }\n }\n return pathFile;\n}\n\n/\n Open json file\n * @param path - path to the file\n * @param fileName - file name\n * @returns object\n /\nexport async function openJson(path: string, fileName: string): Promise<{[key: string]: any}> {\n return new Promise((resolve, reject) => {\n let count = 0;\n console.log(`load ${path}/${fileName}.`); // eslint-disable-line\n const intervalId = setInterval(() => {\n const pathFile = join(path, fileName);\n load(pathFile, JSONLoader)\n .then((result) => {\n clearInterval(intervalId);\n resolve(result);\n })\n .catch(() => {\n count++;\n if (count > 100) {\n clearInterval(intervalId);\n reject(new Error(`Cannon load ${path}/${fileName}.`));\n }\n });\n }, 200);\n });\n}\n\n/\n Check if the file exists\n * @param fileName - full name of file\n * @returns true if file exists, otherwise - false\n /\nexport async function isFileExists(fileName: string): Promise<boolean> {\n try {\n await fs.stat(fileName);\n return true;\n } catch {\n return false;\n }\n}\n\n/\n Remove dir with path\n \n @param path\n /\nexport function removeDir(path: string) {\n return fs.rmdir(path, {recursive: true});\n}\n\n/\n Remove file with path\n \n @param path\n /\nexport function removeFile(path: string) {\n return fs.unlink(path);\n}\n\n/\n Generates absolute file path\n * @param filePath\n */\nexport function getAbsoluteFilePath(filePath: string) {\n return isAbsolute(filePath) ? filePath : join(process.cwd(), filePath);\n}\n"],"mappings":"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"}

package/dist/esm/lib/utils/write-queue.js CHANGED Viewed

@@ -18,9 +18,21 @@ export default class WriteQueue extends Queue {
     this.writeConcurrency = writeConcurrency;
   }
   async enqueue(val) {
-    super.enqueue(val);
-    if (process.memoryUsage().rss > MEMORY_LIMIT) {
-      await this.startWrite();
+    let writeImmediately = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    if (writeImmediately) {
+      const {
+        archiveKey,
+        writePromise
+      } = val;
+      const result = await writePromise();
+      if (archiveKey && result) {
+        this.fileMap[archiveKey] = result;
+      }
+    } else {
+      super.enqueue(val);
+      if (process.memoryUsage().rss > MEMORY_LIMIT) {
+        await this.startWrite();
+      }
     }
   }
   startListening() {
@@ -32,12 +44,9 @@ export default class WriteQueue extends Queue {
     }
   }
   async startWrite() {
-    if (this.writePromise) {
-      await this.writePromise;
-      this.writePromise = null;
-      return;
+    if (!this.writePromise) {
+      this.writePromise = this.doWrite();
     }
-    this.writePromise = this.doWrite();
     await this.writePromise;
     this.writePromise = null;
   }
@@ -59,12 +68,12 @@ export default class WriteQueue extends Queue {
           writePromise
         } = item;
         archiveKeys.push(archiveKey);
-        promises.push(writePromise);
+        const promise = writePromise();
+        promises.push(promise);
       }
       const writeResults = await Promise.allSettled(promises);
       this.updateFileMap(archiveKeys, writeResults);
     }
-    this.writePromise = null;
   }
   updateFileMap(archiveKeys, writeResults) {
     for (let i = 0; i < archiveKeys.length; i++) {

package/dist/esm/lib/utils/write-queue.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"write-queue.js","names":["Queue","process","MEMORY_LIMIT","WriteQueue","constructor","listeningInterval","writeConcurrency","enqueue","val","memoryUsage","rss","startWrite","startListening","intervalId","setInterval","bind","stopListening","clearInterval","~~writePromise","~~doWrite","finalize","length","promises","archiveKeys","i","item","dequeue","~~archiveKey~~","~~push~~","writeResults","Promise","allSettled","updateFileMap","~~fileMap","~~value"],"sources":["../../../../src/lib/utils/write-queue.ts"],"sourcesContent":["import {Queue} from './queue';\nimport process from 'process';\n\n/** Memory limit size is based on testing /\nconst MEMORY_LIMIT = 4 1024 * 1024 * 1024; // 4GB\n\nexport type WriteQueueItem = {\n archiveKey?: string;\n writePromise: Promise<string>;\n};\n\nexport default class WriteQueue<T extends WriteQueueItem> extends Queue<T> {\n private intervalId?: NodeJS.Timeout;\n public writePromise: Promise<void> \| null = null;\n public fileMap: {[key: string]: string} = {};\n public listeningInterval: number;\n public writeConcurrency: number;\n\n constructor(listeningInterval: number = 2000, writeConcurrency: number = 400) {\n super();\n this.listeningInterval = listeningInterval;\n this.writeConcurrency = writeConcurrency;\n }\n\n async enqueue(val: T) {\n super.enqueue(val);\n /** https://nodejs.org/docs/latest-v14.x/api/process.html#process_process_memoryusage */\n if (process.memoryUsage().rss > MEMORY_LIMIT) {\n await this.startWrite();\n }\n }\n\n startListening() {\n this.intervalId = setInterval(this.startWrite.bind(this), this.listeningInterval);\n }\n\n stopListening() {\n if (this.intervalId) {\n clearInterval(this.intervalId);\n }\n }\n\n async startWrite(): Promise<void> {\n if (this.writePromise) {\n ~~await~~ this.writePromise~~;\n this.writePromise~~ = ~~null;\n return;\n }\n~~ this.~~writePromise = this.~~doWrite();\n await this.writePromise;\n this.writePromise = null;\n }\n\n async finalize(): Promise<void> {\n this.stopListening();\n await this.startWrite();\n }\n\n private async doWrite(): Promise<void> {\n while (this.length) {\n const promises: Promise<string>[] = [];\n const archiveKeys: (string \| undefined)[] = [];\n for (let i = 0; i < this.writeConcurrency; i++) {\n const item = this.dequeue();\n if (!item) {\n break;\n }\n const {archiveKey, writePromise} = item as WriteQueueItem;\n archiveKeys.push(archiveKey);\n promises.push(~~writePromise~~);\n }\n const writeResults = await Promise.allSettled(promises);\n this.updateFileMap(archiveKeys, writeResults);\n }\n ~~this.writePromise = null;\n~~ }\n\n private updateFileMap(\n archiveKeys: (string \| undefined)[],\n writeResults: PromiseSettledResult<string>[]\n ) {\n for (let i = 0; i < archiveKeys.length; i++) {\n const archiveKey = archiveKeys[i];\n if (archiveKey && 'value' in writeResults[i]) {\n this.fileMap[archiveKey] = (writeResults[i] as PromiseFulfilledResult<string>).value;\n }\n }\n }\n}\n"],"mappings":";AAAA,SAAQA,KAAK,QAAO,SAAS;AAC7B,OAAOC,OAAO,MAAM,SAAS;;AAG7B,MAAMC,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI;;~~AAO3C~~,eAAe,MAAMC,UAAU,SAAmCH,KAAK,CAAI;EAOzEI,WAAW,GAAmE;IAAA,IAAlEC,iBAAyB,uEAAG,IAAI;IAAA,IAAEC,gBAAwB,uEAAG,GAAG;IAC1E,KAAK,EAAE;IAAC;IAAA,sCANkC,IAAI;IAAA,iCACN,CAAC,CAAC;IAAA;IAAA;IAM1C,IAAI,CAACD,iBAAiB,GAAGA,iBAAiB;IAC1C,IAAI,CAACC,gBAAgB,GAAGA,gBAAgB;EAC1C;EAEA,MAAMC,OAAO,CAACC,GAAM,EAAE;~~IACpB~~,KAAK,~~CAACD~~,OAAO,CAACC,GAAG,CAAC;~~IAElB~~,IAAIP,OAAO,~~CAACQ~~,WAAW,EAAE,CAACC,GAAG,~~GAAGR~~,YAAY,EAAE;~~MAC5C~~,MAAM,IAAI,~~CAACS~~,UAAU,EAAE;~~IACzB~~;EACF;EAEAC,cAAc,GAAG;IACf,IAAI,CAACC,UAAU,GAAGC,WAAW,CAAC,IAAI,CAACH,UAAU,CAACI,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,~~CAACV~~,iBAAiB,CAAC;EACnF;~~EAEAW~~,aAAa,GAAG;IACd,IAAI,IAAI,CAACH,UAAU,EAAE;MACnBI,aAAa,CAAC,IAAI,CAACJ,UAAU,CAAC;IAChC;EACF;EAEA,MAAMF,UAAU,GAAkB;IAChC,IAAI,IAAI,~~CAACO~~,YAAY,EAAE;~~MACrB~~,~~MAAM,~~IAAI,CAACA,YAAY~~;MACvB~~,~~IAAI,CAACA,YAAY,~~GAAG,IAAI~~;MACxB;IACF;IACA~~,~~IAAI~~,~~CAACA,YAAY,GAAG,IAAI,CAACC,~~OAAO,EAAE;~~IAClC~~,MAAM,IAAI,~~CAACD~~,YAAY;IACvB,IAAI,CAACA,YAAY,GAAG,IAAI;EAC1B;EAEA,~~MAAME~~,QAAQ,GAAkB;IAC9B,IAAI,~~CAACJ~~,aAAa,EAAE;IACpB,MAAM,IAAI,CAACL,UAAU,EAAE;EACzB;EAEA,~~MAAcQ~~,OAAO,GAAkB;IACrC,OAAO,IAAI,CAACE,MAAM,EAAE;MAClB,MAAMC,~~QAA2B~~,GAAG,EAAE;~~MACtC~~,MAAMC,WAAmC,GAAG,EAAE;MAC9C,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAG,IAAI,~~CAAClB~~,gBAAgB,~~EAAEkB~~,CAAC,EAAE,EAAE;QAC9C,MAAMC,IAAI,GAAG,IAAI,CAACC,OAAO,EAAE;QAC3B,IAAI,CAACD,IAAI,EAAE;UACT;QACF;QACA,MAAM;~~UAACE~~,UAAU;~~UAAET~~;QAAY,CAAC,~~GAAGO~~,IAAsB;QACzDF,WAAW,~~CAACK~~,IAAI,~~CAACD~~,UAAU,CAAC;~~QAC5BL~~,QAAQ,~~CAACM~~,IAAI,~~CAACV~~,~~YAAY~~,CAAC;~~MAC7B~~;MACA,~~MAAMW~~,YAAY,GAAG,MAAMC,OAAO,CAACC,UAAU,CAACT,QAAQ,CAAC;MACvD,IAAI,CAACU,aAAa,CAACT,WAAW,EAAEM,YAAY,CAAC;IAC/C;~~IACA,IAAI,CAACX,YAAY,GAAG,IAAI~~;~~EAC1B;EAEQc~~,aAAa,CACnBT,WAAmC,EACnCM,~~YAA4C~~,~~EAC5C~~;IACA,KAAK,IAAIL,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGD,WAAW,CAACF,MAAM,EAAEG,CAAC,EAAE,EAAE;MAC3C,~~MAAMG~~,UAAU,~~GAAGJ~~,WAAW,CAACC,CAAC,CAAC;MACjC,~~IAAIG~~,UAAU,IAAI,OAAO,~~IAAIE~~,YAAY,CAACL,CAAC,CAAC,EAAE;QAC5C,IAAI,~~CAACS~~,OAAO,~~CAACN~~,UAAU,CAAC,~~GAAIE~~,YAAY,CAACL,CAAC,CAAC,~~CAAoCU~~,KAAK;MACtF;IACF;EACF;AACF"}
1	+ {"version":3,"file":"write-queue.js","names":["Queue","process","MEMORY_LIMIT","WriteQueue","constructor","listeningInterval","writeConcurrency","enqueue","val","writeImmediately","archiveKey","writePromise","result","fileMap","memoryUsage","rss","startWrite","startListening","intervalId","setInterval","bind","stopListening","clearInterval","doWrite","finalize","length","promises","archiveKeys","i","item","dequeue","push","promise","writeResults","Promise","allSettled","updateFileMap","value"],"sources":["../../../../src/lib/utils/write-queue.ts"],"sourcesContent":["import {Queue} from './queue';\nimport process from 'process';\n\n/** Memory limit size is based on testing /\nconst MEMORY_LIMIT = 4 1024 * 1024 * 1024; // 4GB\n\nexport type WriteQueueItem = {\n archiveKey?: string;\n /*\n writePromise() returns a Promise that will be awaited in Promise.allSettled(promises);\n * Arguments for this call are specified in writeQueue.enqueue call like this:\n * await writeQueue.enqueue({\n * archiveKey: `nodePages/xxx.json.gz`,\n * writePromise: () => writeFileForSlpk(slpkPath, data, `xxx.json`)\n * });\n * Note, a function like writeFileForSlpk should NOT be called when initializing the object for enqueue().\n * If he function is called, the promise will be created\n * and the function will allocate resources (file descriptors) for file writing.\n * It will be done for ALL items in the queue, which is not supposed to happen.\n * That's why the function should be passed as\n * writePromise: () => writeFileForSlpk(slpkPath, content, `xxx.json`)\n * instead of\n * writePromise: writeFileForSlpk(slpkPath, content, `xxx.json`) // INCORRECT !\n /\n writePromise: () => Promise<string \| null>;\n};\n\nexport default class WriteQueue<T extends WriteQueueItem> extends Queue<T> {\n private intervalId?: NodeJS.Timeout;\n public writePromise: Promise<void> \| null = null;\n public fileMap: {[key: string]: string} = {};\n public listeningInterval: number;\n public writeConcurrency: number;\n\n constructor(listeningInterval: number = 2000, writeConcurrency: number = 400) {\n super();\n this.listeningInterval = listeningInterval;\n this.writeConcurrency = writeConcurrency;\n }\n\n async enqueue(val: T, writeImmediately: boolean = false) {\n if (writeImmediately) {\n const {archiveKey, writePromise} = val as WriteQueueItem;\n const result = await writePromise();\n if (archiveKey && result) {\n this.fileMap[archiveKey] = result;\n }\n } else {\n super.enqueue(val);\n /* https://nodejs.org/docs/latest-v14.x/api/process.html#process_process_memoryusage */\n if (process.memoryUsage().rss > MEMORY_LIMIT) {\n await this.startWrite();\n }\n }\n }\n\n startListening() {\n this.intervalId = setInterval(this.startWrite.bind(this), this.listeningInterval);\n }\n\n stopListening() {\n if (this.intervalId) {\n clearInterval(this.intervalId);\n }\n }\n\n async startWrite(): Promise<void> {\n if (!this.writePromise) {\n this.writePromise = this.doWrite();\n }\n await this.writePromise;\n this.writePromise = null;\n }\n\n async finalize(): Promise<void> {\n this.stopListening();\n await this.startWrite();\n }\n\n private async doWrite(): Promise<void> {\n while (this.length) {\n const promises: Promise<string \| null>[] = [];\n const archiveKeys: (string \| undefined)[] = [];\n for (let i = 0; i < this.writeConcurrency; i++) {\n const item = this.dequeue();\n if (!item) {\n break;\n }\n const {archiveKey, writePromise} = item as WriteQueueItem;\n archiveKeys.push(archiveKey);\n const promise = writePromise();\n promises.push(promise);\n }\n const writeResults = await Promise.allSettled(promises);\n this.updateFileMap(archiveKeys, writeResults);\n }\n }\n\n private updateFileMap(\n archiveKeys: (string \| undefined)[],\n writeResults: PromiseSettledResult<string \| null>[]\n ) {\n for (let i = 0; i < archiveKeys.length; i++) {\n const archiveKey = archiveKeys[i];\n if (archiveKey && 'value' in writeResults[i]) {\n this.fileMap[archiveKey] = (writeResults[i] as PromiseFulfilledResult<string>).value;\n }\n }\n }\n}\n"],"mappings":"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"}

package/dist/esm/pgm-loader.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { parsePGM } from '@math.gl/geoid';
-const VERSION = typeof "3.3.0-alpha.7" !== 'undefined' ? "3.3.0-alpha.7" : 'latest';
+const VERSION = typeof "3.3.0" !== 'undefined' ? "3.3.0" : 'latest';
 export const PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',

package/dist/esm/pgm-loader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pgm-loader.js","names":["parsePGM","VERSION","PGMLoader","name","id","module","version","mimeTypes","parse","arrayBuffer","options","Uint8Array","extensions","cubic"],"sources":["../../src/pgm-loader.ts"],"sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parsePGM} from '@math.gl/geoid';\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\n/*\n Loader for PGM - Netpbm grayscale image format\n */\nexport const PGMLoader: LoaderWithParser = {\n name: 'PGM - Netpbm grayscale image format',\n id: 'pgm',\n module: 'tile-converter',\n version: VERSION,\n mimeTypes: ['image/x-portable-graymap'],\n // @ts-expect-error LoaderOptions does not have cubic parameter\n parse: async (arrayBuffer, options) => parsePGM(new Uint8Array(arrayBuffer), options),\n extensions: ['pgm'],\n options: {\n // TODO - use pgm namespace\n cubic: false\n }\n};\n"],"mappings":"AACA,SAAQA,QAAQ,QAAO,gBAAgB;;AAIvC,MAAMC,OAAO,GAAG,~~sBAAkB~~,KAAK,WAAW,~~qBAAiB~~,QAAQ;;AAK3E,OAAO,MAAMC,SAA2B,GAAG;EACzCC,IAAI,EAAE,qCAAqC;EAC3CC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,gBAAgB;EACxBC,OAAO,EAAEL,OAAO;EAChBM,SAAS,EAAE,CAAC,0BAA0B,CAAC;EAEvCC,KAAK,EAAE,OAAOC,WAAW,EAAEC,OAAO,KAAKV,QAAQ,CAAC,IAAIW,UAAU,CAACF,WAAW,CAAC,EAAEC,OAAO,CAAC;EACrFE,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBF,OAAO,EAAE;IAEPG,KAAK,EAAE;EACT;AACF,CAAC"}
1	+ {"version":3,"file":"pgm-loader.js","names":["parsePGM","VERSION","PGMLoader","name","id","module","version","mimeTypes","parse","arrayBuffer","options","Uint8Array","extensions","cubic"],"sources":["../../src/pgm-loader.ts"],"sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parsePGM} from '@math.gl/geoid';\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\n/*\n Loader for PGM - Netpbm grayscale image format\n */\nexport const PGMLoader: LoaderWithParser = {\n name: 'PGM - Netpbm grayscale image format',\n id: 'pgm',\n module: 'tile-converter',\n version: VERSION,\n mimeTypes: ['image/x-portable-graymap'],\n // @ts-expect-error LoaderOptions does not have cubic parameter\n parse: async (arrayBuffer, options) => parsePGM(new Uint8Array(arrayBuffer), options),\n extensions: ['pgm'],\n options: {\n // TODO - use pgm namespace\n cubic: false\n }\n};\n"],"mappings":"AACA,SAAQA,QAAQ,QAAO,gBAAgB;;AAIvC,MAAMC,OAAO,GAAG,cAAkB,KAAK,WAAW,aAAiB,QAAQ;;AAK3E,OAAO,MAAMC,SAA2B,GAAG;EACzCC,IAAI,EAAE,qCAAqC;EAC3CC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,gBAAgB;EACxBC,OAAO,EAAEL,OAAO;EAChBM,SAAS,EAAE,CAAC,0BAA0B,CAAC;EAEvCC,KAAK,EAAE,OAAOC,WAAW,EAAEC,OAAO,KAAKV,QAAQ,CAAC,IAAIW,UAAU,CAACF,WAAW,CAAC,EAAEC,OAAO,CAAC;EACrFE,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBF,OAAO,EAAE;IAEPG,KAAK,EAAE;EACT;AACF,CAAC"}

package/dist/esm/workers/i3s-attributes-worker.js CHANGED Viewed

@@ -2,6 +2,6 @@ import { createWorker } from '@loaders.gl/worker-utils';
 import { convertAttributes } from '../i3s-converter/helpers/geometry-converter';
 createWorker(async function (data) {
   let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return await convertAttributes(data, options.useCartesianPositions);
+  return await convertAttributes(data, options.materialAndTextureList, options.useCartesianPositions);
 });
 //# sourceMappingURL=i3s-attributes-worker.js.map

package/dist/esm/workers/i3s-attributes-worker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"i3s-attributes-worker.js","names":["createWorker","convertAttributes","data","options","useCartesianPositions"],"sources":["../../../src/workers/i3s-attributes-worker.ts"],"sourcesContent":["import {createWorker} from '@loaders.gl/worker-utils';\nimport {convertAttributes} from '../i3s-converter/helpers/geometry-converter';\n\ncreateWorker(\n async (data, options = {}) => await convertAttributes(data, options.useCartesianPositions)\n);\n"],"mappings":"AAAA,SAAQA,YAAY,QAAO,0BAA0B;AACrD,SAAQC,iBAAiB,QAAO,6CAA6C;AAE7ED,YAAY,CACV,gBAAOE,IAAI;EAAA,IAAEC,OAAO,uEAAG,CAAC,CAAC;EAAA,~~OAAK~~,MAAMF,iBAAiB,CAACC,IAAI,EAAEC,OAAO,CAACC,qBAAqB,CAAC;AAAA,~~EAC3F~~"}
1	+ {"version":3,"file":"i3s-attributes-worker.js","names":["createWorker","convertAttributes","data","options","materialAndTextureList","useCartesianPositions"],"sources":["../../../src/workers/i3s-attributes-worker.ts"],"sourcesContent":["import {createWorker} from '@loaders.gl/worker-utils';\nimport {convertAttributes} from '../i3s-converter/helpers/geometry-converter';\n\ncreateWorker(\n async (data, options = {}) =>\n await convertAttributes(data, options.materialAndTextureList, options.useCartesianPositions)\n);\n"],"mappings":"AAAA,SAAQA,YAAY,QAAO,0BAA0B;AACrD,SAAQC,iBAAiB,QAAO,6CAA6C;AAE7ED,YAAY,CACV,gBAAOE,IAAI;EAAA,IAAEC,OAAO,uEAAG,CAAC,CAAC;EAAA,OACvB,MAAMF,iBAAiB,CAACC,IAAI,EAAEC,OAAO,CAACC,sBAAsB,EAAED,OAAO,CAACE,qBAAqB,CAAC;AAAA,EAC/F"}

package/dist/i3s-attributes-worker.d.ts CHANGED Viewed

@@ -2,13 +2,13 @@ import type { WorkerObject } from '@loaders.gl/worker-utils';
 import type { ConvertedAttributes } from './i3s-converter/types';
 import type { Matrix4, Vector3 } from '@math.gl/core';
 import type { GLTFImagePostprocessed, GLTFNodePostprocessed } from '@loaders.gl/gltf';
-export declare type I3SAttributesWorkerOptions = {
+export type I3SAttributesWorkerOptions = {
     _nodeWorkers: boolean;
     reuseWorkers: boolean;
     useCartesianPositions: boolean;
     source: string;
 };
-export declare type B3DMAttributesData = {
+export type B3DMAttributesData = {
     gltfMaterials?: {
         id: string;
     }[];

package/dist/i3s-attributes-worker.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"i3s-attributes-worker.d.ts","sourceRoot":"","sources":["../src/i3s-attributes-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC/D,OAAO,KAAK,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAC,sBAAsB,EAAE,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AAQpF,~~oBAAY~~,0BAA0B,GAAG;IACvC,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,~~oBAAY~~,kBAAkB,GAAG;IAC/B,aAAa,CAAC,EAAE;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IAC/B,KAAK,EAAE,qBAAqB,EAAE,CAAC;IAC/B,MAAM,EAAE,sBAAsB,EAAE,CAAC;IACjC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;CAQ/B,CAAC;AAEF;;GAEG;AACH,wBAAgB,8BAA8B,CAC5C,cAAc,EAAE,kBAAkB,EAClC,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAE3C;AAED,eAAO,MAAM,6BAA6B,EAAE,YAAkC,CAAC"}
1	+ {"version":3,"file":"i3s-attributes-worker.d.ts","sourceRoot":"","sources":["../src/i3s-attributes-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC/D,OAAO,KAAK,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAC,sBAAsB,EAAE,qBAAqB,EAAC,MAAM,kBAAkB,CAAC;AAQpF,MAAM,MAAM,0BAA0B,GAAG;IACvC,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,aAAa,CAAC,EAAE;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IAC/B,KAAK,EAAE,qBAAqB,EAAE,CAAC;IAC/B,MAAM,EAAE,sBAAsB,EAAE,CAAC;IACjC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,oBAAoB,EAAE,OAAO,CAAC;CAC/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;CAQ/B,CAAC;AAEF;;GAEG;AACH,wBAAgB,8BAA8B,CAC5C,cAAc,EAAE,kBAAkB,EAClC,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAE3C;AAED,eAAO,MAAM,6BAA6B,EAAE,YAAkC,CAAC"}