@loaders.gl/tile-converter 3.3.0-alpha.8 → 3.3.1

package/dist/i3s-converter/json-templates/geometry-definitions.d.ts

@@ -0,0 +1,7 @@
+export declare const GEOMETRY_DEFINITION: () => {
+    geometryBuffers: {
+        path: string;
+        transform: (val: any) => any[];
+    };
+};
+//# sourceMappingURL=geometry-definitions.d.ts.map

package/dist/i3s-converter/json-templates/geometry-definitions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"geometry-definitions.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/json-templates/geometry-definitions.ts"],"names":[],"mappings":"AAuEA,eAAO,MAAM,mBAAmB;;;;;CAW9B,CAAC"}

package/dist/i3s-converter/json-templates/geometry-definitions.js

@@ -0,0 +1,87 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GEOMETRY_DEFINITION = void 0;
+const json_map_transform_1 = __importDefault(require("json-map-transform"));
+const PLAIN_GEOMETRY_DEFINITION = () => ({
+    offset: {
+        default: 8
+    },
+    position: {
+        default: {
+            type: 'Float32',
+            component: 3
+        }
+    },
+    normal: {
+        default: {
+            type: 'Float32',
+            component: 3
+        }
+    },
+    uv0: {
+        path: 'hasTexture',
+        transform: (val) => (val && { type: 'Float32', component: 2 }) || false,
+        omitValues: [false]
+    },
+    color: {
+        default: {
+            type: 'UInt8',
+            component: 4
+        }
+    },
+    uvRegion: {
+        path: 'hasUvRegions',
+        transform: (val) => (val && { type: 'UInt16', component: 4 }) || false,
+        omitValues: [false]
+    },
+    featureId: {
+        default: {
+            binding: 'per-feature',
+            type: 'UInt64',
+            component: 1
+        }
+    },
+    faceRange: {
+        default: {
+            binding: 'per-feature',
+            type: 'UInt32',
+            component: 2
+        }
+    }
+});
+const COMPRESSED_GEOMETRY_DEFINITION = () => ({
+    'compressedAttributes.encoding': {
+        default: 'draco'
+    },
+    'compressedAttributes.attributes': {
+        path: 'geometryConfig',
+        transform: (val) => {
+            const result = ['position', 'normal'];
+            if (val.hasTexture) {
+                result.push('uv0');
+            }
+            result.push('color');
+            if (val.hasUvRegions) {
+                result.push('uv-region');
+            }
+            result.push('feature-index');
+            return result;
+        }
+    }
+});
+const GEOMETRY_DEFINITION = () => ({
+    geometryBuffers: {
+        path: 'geometryConfig',
+        transform: (val) => {
+            const result = [(0, json_map_transform_1.default)(val, PLAIN_GEOMETRY_DEFINITION())];
+            if (val.draco) {
+                result.push((0, json_map_transform_1.default)({ geometryConfig: val }, COMPRESSED_GEOMETRY_DEFINITION()));
+            }
+            return result;
+        }
+    }
+});
+exports.GEOMETRY_DEFINITION = GEOMETRY_DEFINITION;

package/dist/i3s-converter/json-templates/layers.d.ts

@@ -52,36 +52,7 @@ export declare const LAYERS: () => {
     };
     geometryDefinitions: {
         path: string;
-        transform: (val: any) => {
-            geometryBuffers: never[];
-        }[];
-        default: {
-            geometryBuffers: {
-                offset: number;
-                position: {
-                    type: string;
-                    component: number;
-                };
-                normal: {
-                    type: string;
-                    component: number;
-                };
-                color: {
-                    type: string;
-                    component: number;
-                };
-                featureId: {
-                    binding: string;
-                    type: string;
-                    component: number;
-                };
-                faceRange: {
-                    binding: string;
-                    type: string;
-                    component: number;
-                };
-            }[];
-        }[];
+        default: never[];
     };
     attributeStorageInfo: {
         path: string;

package/dist/i3s-converter/json-templates/layers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/json-templates/layers.ts"],"names":[],"mappings":"AA0IA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuFjB,CAAC"}
+{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/json-templates/layers.ts"],"names":[],"mappings":"AAoEA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoEjB,CAAC"}

package/dist/i3s-converter/json-templates/layers.js

@@ -6,72 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LAYERS = void 0;
 const json_map_transform_1 = __importDefault(require("json-map-transform"));
 const store_1 = require("./store");
-const PLAIN_GEOMETRY_DEFINITION = () => ({
-    offset: 8,
-    position: {
-        type: 'Float32',
-        component: 3
-    },
-    normal: {
-        type: 'Float32',
-        component: 3
-    },
-    uv0: {
-        type: 'Float32',
-        component: 2
-    },
-    color: {
-        type: 'UInt8',
-        component: 4
-    },
-    featureId: {
-        binding: 'per-feature',
-        type: 'UInt64',
-        component: 1
-    },
-    faceRange: {
-        binding: 'per-feature',
-        type: 'UInt32',
-        component: 2
-    }
-});
-const PLAIN_GEOMETRY_DEFINITION_WITHOUT_UV0 = () => ({
-    offset: 8,
-    position: {
-        type: 'Float32',
-        component: 3
-    },
-    normal: {
-        type: 'Float32',
-        component: 3
-    },
-    color: {
-        type: 'UInt8',
-        component: 4
-    },
-    featureId: {
-        binding: 'per-feature',
-        type: 'UInt64',
-        component: 1
-    },
-    faceRange: {
-        binding: 'per-feature',
-        type: 'UInt32',
-        component: 2
-    }
-});
-const COMPRESSED_GEOMETRY_DEFINITION = () => ({
-    compressedAttributes: {
-        encoding: 'draco',
-        attributes: ['position', 'normal', 'uv0', 'color', 'feature-index']
-    }
-});
-const COMPRESSED_GEOMETRY_DEFINITION_WITHOUT_UV0 = () => ({
-    compressedAttributes: {
-        encoding: 'draco',
-        attributes: ['position', 'normal', 'color', 'feature-index']
-    }
-});
 const SPATIAL_REFERENCE = () => ({
     wkid: {
         path: 'wkid',
@@ -186,26 +120,8 @@ const LAYERS = () => ({
         default: []
     },
     geometryDefinitions: {
-        path: 'compressGeometry',
-        transform: (val) => {
-            const result = [{ geometryBuffers: [] }, { geometryBuffers: [] }];
-            // @ts-expect-error
-            result[0].geometryBuffers.push(PLAIN_GEOMETRY_DEFINITION());
-            // @ts-expect-error
-            result[1].geometryBuffers.push(PLAIN_GEOMETRY_DEFINITION_WITHOUT_UV0());
-            if (val) {
-                // @ts-expect-error
-                result[0].geometryBuffers.push(COMPRESSED_GEOMETRY_DEFINITION());
-                // @ts-expect-error
-                result[1].geometryBuffers.push(COMPRESSED_GEOMETRY_DEFINITION_WITHOUT_UV0());
-            }
-            return result;
-        },
-        default: [
-            {
-                geometryBuffers: [PLAIN_GEOMETRY_DEFINITION(), PLAIN_GEOMETRY_DEFINITION_WITHOUT_UV0()]
-            }
-        ]
+        path: 'geometryDefinitions',
+        default: []
     },
     attributeStorageInfo: {
         path: 'attributeStorageInfo',

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

@@ -20,15 +20,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/i3s-converter/types.d.ts

@@ -1,5 +1,5 @@
+import { GLTFImagePostprocessed } from '@loaders.gl/gltf';
 import { BoundingVolumes, I3SMaterialDefinition, MaterialDefinitionInfo, TextureDefinitionInfo } from '@loaders.gl/i3s';
-import { ImageDataType } from '@loaders.gl/images';
 /** Converted resources for specific node */
 export type I3SConvertedResources = {
     /**
@@ -19,6 +19,10 @@ export type I3SConvertedResources = {
      * Texture image content
      */
     texture: any | null;
+    /**
+     * If the resource has uvRegions geometry attribute
+     */
+    hasUvRegions: boolean;
     /**
      * Shared resources built from GLTF material
      */
@@ -56,6 +60,8 @@ export type ConvertedAttributes = {
     texCoords: Float32Array;
     /** COLOR_0 attribute value */
     colors: Uint8Array;
+    /** uvRegion attribute for a texture atlas */
+    uvRegions: Uint16Array;
     /** Feature indices grouped by ...
      * converted from "batch ids" of GLTF
      */
@@ -66,6 +72,8 @@ export type ConvertedAttributes = {
      * MBS and/or OBB bounding volumes of the node
      */
     boundingVolumes: null | BoundingVolumes;
+    /** merged materials data */
+    mergedMaterials: MergedMaterial[];
 };
 /** Postprocessed geometry and feature attributes
  * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md
@@ -79,6 +87,8 @@ export type GeometryAttributes = {
     texCoords: Float32Array;
     /** COLOR_0 attribute value */
     colors: Uint8Array;
+    /** uvRegion attribute for a texture atlas */
+    uvRegions: Uint16Array;
     /** faceRanges attribute value  */
     faceRange: Uint32Array;
     /** feature Ids attribute value */
@@ -96,6 +106,8 @@ export type GroupedByFeatureIdAttributes = {
     normals: Float32Array;
     /** COLOR_0 attribute value */
     colors: Uint8Array;
+    /** uvRegion attribute for a texture atlas */
+    uvRegions: Uint16Array;
     /** TEXCOORD_0 attribute value */
     texCoords: Float32Array;
 };
@@ -113,6 +125,20 @@ export type I3SMaterialWithTexture = {
     /** Material definition https://github.com/Esri/i3s-spec/blob/master/docs/1.8/materialDefinitions.cmn.md */
     material: I3SMaterialDefinition;
     /** Texture content (image) */
-    texture?: ImageDataType;
+    texture?: GLTFImagePostprocessed;
+    /** Metadata of all merged materials */
+    mergedMaterials: MergedMaterial[];
+};
+/** Metadata of some original texture */
+export type MergedMaterial = {
+    /** Gltf material Id */
+    originalMaterialId: string;
+    /** Original texture size */
+    textureSize?: {
+        width: number;
+        height: number;
+    };
+    /** Uint16Array of 4 elements https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md */
+    uvRegion?: Uint16Array;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/i3s-converter/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEjD,4CAA4C;AAC5C,MAAM,MAAM,qBAAqB,GAAG;IAClC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;IACjD;;OAEG;IACH,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;IACpB;;OAEG;IACH,eAAe,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC9C;;OAEG;IACH,YAAY,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC5C;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;OAEG;IACH,UAAU,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IACjC;;OAEG;IACH,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;OAEG;IACH,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;IAClC,iDAAiD;IACjD,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB;;OAEG;IACH,eAAe,EAAE,IAAI,GAAG,eAAe,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;IACxB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,kCAAkC;IAClC,SAAS,EAAE,WAAW,CAAC;IACvB,kCAAkC;IAClC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,8DAA8D;AAC9D,MAAM,MAAM,4BAA4B,GAAG;IACzC,iBAAiB;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,+BAA+B;IAC/B,SAAS,EAAE,YAAY,CAAC;IACxB,6BAA6B;IAC7B,OAAO,EAAE,YAAY,CAAC;IACtB,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,iCAAiC;IACjC,SAAS,EAAE,YAAY,CAAC;CACzB,CAAC;AAEF,+CAA+C;AAC/C,MAAM,MAAM,qBAAqB,GAAG;IAClC,oHAAoH;IACpH,uBAAuB,CAAC,EAAE,sBAAsB,EAAE,CAAC;IACnD,kHAAkH;IAClH,sBAAsB,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACjD,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,2EAA2E;AAC3E,MAAM,MAAM,sBAAsB,GAAG;IACnC,2GAA2G;IAC3G,QAAQ,EAAE,qBAAqB,CAAC;IAChC,8BAA8B;IAC9B,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/types.ts"],"names":[],"mappings":"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"}

package/dist/lib/utils/file-utils.d.ts

@@ -13,8 +13,24 @@ export declare function writeFile(path: string, data: string | Uint8Array | Arra
  * @param data - file content
  * @param fileName - name of output file (default: index.json)
  * @param compress - if need to compress file with gzip (default: true)
+ * @param compressList - if set - the file should be added to this list and compressed in the end of conversion
  */
-export declare function writeFileForSlpk(path: string, data: string | Uint8Array | ArrayBuffer | Promise<ArrayBuffer>, fileName?: string, compress?: boolean): Promise<string>;
+export declare function writeFileForSlpk(path: string, data: string | Uint8Array | ArrayBuffer | Promise<ArrayBuffer>, fileName?: string, compress?: boolean, compressList?: string[] | null): Promise<string | null>;
+/**
+ * Open json file
+ * @param path - path to the file
+ * @param fileName - file name
+ * @returns object
+ */
+export declare function openJson(path: string, fileName: string): Promise<{
+    [key: string]: any;
+}>;
+/**
+ * Check if the file exists
+ * @param fileName - full name of file
+ * @returns true if file exists, otherwise - false
+ */
+export declare function isFileExists(fileName: string): Promise<boolean>;
 /**
  * Remove dir with path
  *

package/dist/lib/utils/file-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/file-utils.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,GAC9B,OAAO,CAAC,MAAM,CAAC,CAkBjB;AAED;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,EAC/B,QAAQ,GAAE,OAAc,GACvB,OAAO,CAAC,MAAM,CAAC,CASjB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,iBAErC;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,iBAEtC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,UAEnD"}
+{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/file-utils.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,GAC9B,OAAO,CAAC,MAAM,CAAC,CAkBjB;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,EAC9D,QAAQ,GAAE,MAAqB,EAC/B,QAAQ,GAAE,OAAc,EACxB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GAC7B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkBxB;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,CAAC,CAoB5F;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOrE;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,iBAErC;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,iBAEtC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,UAEnD"}

package/dist/lib/utils/file-utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAbsoluteFilePath = exports.removeFile = exports.removeDir = exports.writeFileForSlpk = exports.writeFile = void 0;
+exports.getAbsoluteFilePath = exports.removeFile = exports.removeDir = exports.isFileExists = exports.openJson = exports.writeFileForSlpk = exports.writeFile = void 0;
+const core_1 = require("@loaders.gl/core");
+const loader_utils_1 = require("@loaders.gl/loader-utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const compress_util_1 = require("./compress-util");
@@ -41,18 +43,73 @@ exports.writeFile = writeFile;
  * @param data - file content
  * @param fileName - name of output file (default: index.json)
  * @param compress - if need to compress file with gzip (default: true)
+ * @param compressList - if set - the file should be added to this list and compressed in the end of conversion
  */
-async function writeFileForSlpk(path, data, fileName = 'index.json', compress = true) {
+async function writeFileForSlpk(path, data, fileName = 'index.json', compress = true, compressList) {
     const pathFile = await writeFile(path, data, fileName);
     if (compress) {
-        const pathGzFile = await (0, compress_util_1.compressFileWithGzip)(pathFile);
-        // After compression, we don't need an uncompressed file
-        await removeFile(pathFile);
-        return pathGzFile;
+        if (compressList) {
+            if (!compressList.includes(pathFile)) {
+                compressList.push(pathFile);
+                return `${pathFile}.gz`;
+            }
+            else {
+                return null;
+            }
+        }
+        else {
+            const pathGzFile = await (0, compress_util_1.compressFileWithGzip)(pathFile);
+            // After compression, we don't need an uncompressed file
+            await removeFile(pathFile);
+            return pathGzFile;
+        }
     }
     return pathFile;
 }
 exports.writeFileForSlpk = writeFileForSlpk;
+/**
+ * Open json file
+ * @param path - path to the file
+ * @param fileName - file name
+ * @returns object
+ */
+async function openJson(path, fileName) {
+    return new Promise((resolve, reject) => {
+        let count = 0;
+        console.log(`load ${path}/${fileName}.`); // eslint-disable-line
+        const intervalId = setInterval(() => {
+            const pathFile = (0, path_1.join)(path, fileName);
+            (0, core_1.load)(pathFile, loader_utils_1.JSONLoader)
+                .then((result) => {
+                clearInterval(intervalId);
+                resolve(result);
+            })
+                .catch(() => {
+                count++;
+                if (count > 100) {
+                    clearInterval(intervalId);
+                    reject(new Error(`Cannon load ${path}/${fileName}.`));
+                }
+            });
+        }, 200);
+    });
+}
+exports.openJson = openJson;
+/**
+ * Check if the file exists
+ * @param fileName - full name of file
+ * @returns true if file exists, otherwise - false
+ */
+async function isFileExists(fileName) {
+    try {
+        await fs_1.promises.stat(fileName);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+exports.isFileExists = isFileExists;
 /**
  * Remove dir with path
  *
@@ -76,6 +133,6 @@ exports.removeFile = removeFile;
  * @param filePath
  */
 function getAbsoluteFilePath(filePath) {
-    return (0, path_1.isAbsolute)(filePath) ? filePath : (0, path_1.join)(process.cwd(), filePath); // eslint-disable-line no-undef
+    return (0, path_1.isAbsolute)(filePath) ? filePath : (0, path_1.join)(process.cwd(), filePath);
 }
 exports.getAbsoluteFilePath = getAbsoluteFilePath;

package/dist/lib/utils/write-queue.d.ts

@@ -1,7 +1,23 @@
 import { Queue } from './queue';
 export type WriteQueueItem = {
     archiveKey?: string;
-    writePromise: Promise<string>;
+    /**
+     * writePromise() returns a Promise that will be awaited in Promise.allSettled(promises);
+     * Arguments for this call are specified in writeQueue.enqueue call like this:
+     * await writeQueue.enqueue({
+     *     archiveKey: `nodePages/xxx.json.gz`,
+     *     writePromise: () => writeFileForSlpk(slpkPath, data, `xxx.json`)
+     * });
+     * Note, a function like writeFileForSlpk should NOT be called when initializing the object for enqueue().
+     * If he function is called, the promise will be created
+     * and the function will allocate resources (file descriptors) for file writing.
+     * It will be done for ALL items in the queue, which is not supposed to happen.
+     * That's why the function should be passed as
+     *   writePromise: () => writeFileForSlpk(slpkPath, content, `xxx.json`)
+     * instead of
+     *  writePromise: writeFileForSlpk(slpkPath, content, `xxx.json`) // INCORRECT !
+     */
+    writePromise: () => Promise<string | null>;
 };
 export default class WriteQueue<T extends WriteQueueItem> extends Queue<T> {
     private intervalId?;
@@ -12,7 +28,7 @@ export default class WriteQueue<T extends WriteQueueItem> extends Queue<T> {
     listeningInterval: number;
     writeConcurrency: number;
     constructor(listeningInterval?: number, writeConcurrency?: number);
-    enqueue(val: T): Promise<void>;
+    enqueue(val: T, writeImmediately?: boolean): Promise<void>;
     startListening(): void;
     stopListening(): void;
     startWrite(): Promise<void>;

package/dist/lib/utils/write-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write-queue.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/write-queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAM9B,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,CAAC,SAAS,cAAc,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;IACxE,OAAO,CAAC,UAAU,CAAC,CAAiB;IAC7B,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAQ;IAC1C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;IACtC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;gBAEpB,iBAAiB,GAAE,MAAa,EAAE,gBAAgB,GAAE,MAAY;IAMtE,OAAO,CAAC,GAAG,EAAE,CAAC;IAQpB,cAAc;IAId,aAAa;IAMP,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAKjB,OAAO;IAmBrB,OAAO,CAAC,aAAa;CAWtB"}
+{"version":3,"file":"write-queue.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/write-queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,SAAS,CAAC;AAM9B,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;;;;;;;;;;OAeG;IACH,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAC5C,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,CAAC,SAAS,cAAc,CAAE,SAAQ,KAAK,CAAC,CAAC,CAAC;IACxE,OAAO,CAAC,UAAU,CAAC,CAAiB;IAC7B,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAQ;IAC1C,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;IACtC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;gBAEpB,iBAAiB,GAAE,MAAa,EAAE,gBAAgB,GAAE,MAAY;IAMtE,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,gBAAgB,GAAE,OAAe;IAgBvD,cAAc;IAId,aAAa;IAMP,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAKjB,OAAO;IAmBrB,OAAO,CAAC,aAAa;CAWtB"}

package/dist/lib/utils/write-queue.js

@@ -15,11 +15,20 @@ class WriteQueue extends queue_1.Queue {
         this.listeningInterval = listeningInterval;
         this.writeConcurrency = writeConcurrency;
     }
-    async enqueue(val) {
-        super.enqueue(val);
-        /** https://nodejs.org/docs/latest-v14.x/api/process.html#process_process_memoryusage */
-        if (process_1.default.memoryUsage().rss > MEMORY_LIMIT) {
-            await this.startWrite();
+    async enqueue(val, writeImmediately = false) {
+        if (writeImmediately) {
+            const { archiveKey, writePromise } = val;
+            const result = await writePromise();
+            if (archiveKey && result) {
+                this.fileMap[archiveKey] = result;
+            }
+        }
+        else {
+            super.enqueue(val);
+            /** https://nodejs.org/docs/latest-v14.x/api/process.html#process_process_memoryusage */
+            if (process_1.default.memoryUsage().rss > MEMORY_LIMIT) {
+                await this.startWrite();
+            }
         }
     }
     startListening() {
@@ -31,12 +40,9 @@ class WriteQueue extends queue_1.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;
     }
@@ -55,12 +61,12 @@ class WriteQueue extends queue_1.Queue {
                 }
                 const { archiveKey, 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/workers/i3s-attributes-worker.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const worker_utils_1 = require("@loaders.gl/worker-utils");
 const geometry_converter_1 = require("../i3s-converter/helpers/geometry-converter");
-(0, worker_utils_1.createWorker)(async (data, options = {}) => await (0, geometry_converter_1.convertAttributes)(data, options.useCartesianPositions));
+(0, worker_utils_1.createWorker)(async (data, options = {}) => await (0, geometry_converter_1.convertAttributes)(data, options.materialAndTextureList, options.useCartesianPositions));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.3.0-alpha.8",
+  "version": "3.3.1",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -33,29 +33,30 @@
     "fs": false,
     "path": false,
     "process": false,
-    "archiver": false
+    "archiver": false,
+    "join-images": false
   },
   "scripts": {
     "pre-build": "npm run build-bundle && npm run build-converter-bundle && npm run build-i3s-attributes-worker && npm run build-3d-tiles-attributes-worker",
-    "build-bundle": "esbuild ./src/index.ts --bundle --outfile=dist/dist.min.js --platform=node",
+    "build-bundle": "esbuild ./src/index.ts --bundle --outfile=dist/dist.min.js --platform=node  --external:join-images",
     "build-converter-bundle": "webpack --display errors-only --config ./converter-webpack/bundle.js",
-    "build-i3s-attributes-worker": "esbuild src/workers/i3s-attributes-worker.ts --outfile=dist/i3s-attributes-worker.js --platform=node --target=esnext,node12 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\"",
-    "build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node12 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
+    "build-i3s-attributes-worker": "esbuild src/workers/i3s-attributes-worker.ts --outfile=dist/i3s-attributes-worker.js --platform=node --target=esnext,node12 --external:join-images --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\"",
+    "build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node12 --external:join-images --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "3.3.0-alpha.8",
-    "@loaders.gl/crypto": "3.3.0-alpha.8",
-    "@loaders.gl/draco": "3.3.0-alpha.8",
-    "@loaders.gl/gltf": "3.3.0-alpha.8",
-    "@loaders.gl/i3s": "3.3.0-alpha.8",
-    "@loaders.gl/images": "3.3.0-alpha.8",
-    "@loaders.gl/loader-utils": "3.3.0-alpha.8",
-    "@loaders.gl/polyfills": "3.3.0-alpha.8",
-    "@loaders.gl/schema": "3.3.0-alpha.8",
-    "@loaders.gl/textures": "3.3.0-alpha.8",
-    "@loaders.gl/tiles": "3.3.0-alpha.8",
-    "@loaders.gl/worker-utils": "3.3.0-alpha.8",
-    "@loaders.gl/zip": "3.3.0-alpha.8",
+    "@loaders.gl/3d-tiles": "3.3.1",
+    "@loaders.gl/crypto": "3.3.1",
+    "@loaders.gl/draco": "3.3.1",
+    "@loaders.gl/gltf": "3.3.1",
+    "@loaders.gl/i3s": "3.3.1",
+    "@loaders.gl/images": "3.3.1",
+    "@loaders.gl/loader-utils": "3.3.1",
+    "@loaders.gl/polyfills": "3.3.1",
+    "@loaders.gl/schema": "3.3.1",
+    "@loaders.gl/textures": "3.3.1",
+    "@loaders.gl/tiles": "3.3.1",
+    "@loaders.gl/worker-utils": "3.3.1",
+    "@loaders.gl/zip": "3.3.1",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -65,7 +66,7 @@
     "cors": "^2.8.5",
     "crypt": "^0.0.2",
     "debug": "~2.6.9",
-    "express": "~4.16.1",
+    "express": "~4.17.3",
     "json-map-transform": "^1.2.6",
     "jszip": "^3.5.0",
     "md5": "^2.3.0",
@@ -75,5 +76,9 @@
   "peerDependencies": {
     "@loaders.gl/core": "^3.2.0"
   },
-  "gitHead": "69cfde0340328dd800c7c90151b56b406f47e9ae"
+  "quarantinedDependencies": {
+    "join-images": "^1.1.3",
+    "sharp": "^0.31.3"
+  },
+  "gitHead": "51632b5948e496a4b75e970030ad7579650c129d"
 }