@loaders.gl/tile-converter 4.5.3 → 5.0.0-alpha.10

package/src/{i3s-converter → v4/i3s-converter}/helpers/geometry-converter.ts

@@ -21,7 +21,6 @@ import {Ellipsoid} from '@math.gl/geospatial';
 /* @ts-expect-error TS2732: Cannot find module 'node:module' or its corresponding type declarations. */
 import {createRequire} from 'node:module';
 /* @ts-expect-error TS2732: Cannot find module 'node:module' or its corresponding type declarations. */
-import {dirname, join} from 'node:path';
 
 import {DracoWriterWorker} from '@loaders.gl/draco';
 import {assert, encode} from '@loaders.gl/core';
@@ -34,6 +33,7 @@ import {
 import md5 from 'md5';
 import {v4 as uuidv4} from 'uuid';
 import {generateAttributes} from './geometry-attributes';
+import {encodeStringAttribute} from './encode-string-attribute';
 import {createBoundingVolumesFromGeometry} from './coordinate-converter';
 import {
   ConvertedAttributes,
@@ -52,7 +52,7 @@ import {Geoid} from '@math.gl/geoid';
 import {prepareDataForAttributesConversion} from './gltf-attributes';
 import {getTextureByMetadataClass, handleBatchIdsExtensions} from './batch-ids-extensions';
 import {checkPropertiesLength, flattenPropertyTableByFeatureIds} from './feature-attributes';
-import {GL} from '@loaders.gl/math';
+import {GL} from '@math.gl/geometry-utils';
 
 /*
   At the moment of writing the type TypedArrayConstructor is not exported in '@math.gl/types'.
@@ -304,7 +304,7 @@ async function _makeNodeResources({
       faceRange.buffer
     )
   );
-  // prettier-ignore
+  // biome-ignore format: preserve intentional fixture layout
   const compressedGeometry = draco
     ? generateCompressedGeometry(
       vertexCount,
@@ -1028,15 +1028,18 @@ async function mergeMaterials(
     material1.mergedMaterials &&
     material2.mergedMaterials
   ) {
-    const buffer1 = Buffer.from(material1.texture.bufferView.data);
-    const buffer2 = Buffer.from(material2.texture.bufferView.data);
+    const firstImageBytes = new Uint8Array(material1.texture.bufferView.data);
+    const secondImageBytes = new Uint8Array(material2.texture.bufferView.data);
     try {
       // @ts-ignore
       const {joinImages} = await import('join-images');
-      const sharpData = await joinImages([buffer1, buffer2], {direction: 'horizontal'});
-      material1.texture.bufferView.data = await sharpData
+      const sharpData = await joinImages([firstImageBytes, secondImageBytes], {
+        direction: 'horizontal'
+      });
+      const encodedImage = await sharpData
         .toFormat(material1.texture.mimeType === 'image/png' ? 'png' : 'jpeg')
         .toBuffer();
+      material1.texture.bufferView.data = new Uint8Array(encodedImage);
     } catch (error) {
       // eslint-disable-next-line no-console
       console.log(
@@ -1056,10 +1059,10 @@ async function mergeMaterials(
  * @param sourceMaterial - material object
  * @returns I3S material definition and texture
  */
-function convertMaterial(sourceMaterial: GLTFMaterialPostprocessed): I3SMaterialWithTexture {
+export function convertMaterial(sourceMaterial: GLTFMaterialPostprocessed): I3SMaterialWithTexture {
   const material: I3SMaterialDefinition = {
     doubleSided: sourceMaterial.doubleSided,
-    emissiveFactor: sourceMaterial.emissiveFactor?.map((c) => Math.round(c * 255)) as [
+    emissiveFactor: sourceMaterial.emissiveFactor?.map(c => Math.round(c * 255)) as [
       number,
       number,
       number
@@ -1069,9 +1072,9 @@ function convertMaterial(sourceMaterial: GLTFMaterialPostprocessed): I3SMaterial
     alphaMode: convertAlphaMode(sourceMaterial.alphaMode),
     pbrMetallicRoughness: {
       roughnessFactor:
-        sourceMaterial?.pbrMetallicRoughness?.roughnessFactor || DEFAULT_ROUGHNESS_FACTOR,
+        sourceMaterial?.pbrMetallicRoughness?.roughnessFactor ?? DEFAULT_ROUGHNESS_FACTOR,
       metallicFactor:
-        sourceMaterial?.pbrMetallicRoughness?.metallicFactor || DEFAULT_METALLIC_FACTOR
+        sourceMaterial?.pbrMetallicRoughness?.metallicFactor ?? DEFAULT_METALLIC_FACTOR
     }
   };
 
@@ -1095,8 +1098,10 @@ function convertMaterial(sourceMaterial: GLTFMaterialPostprocessed): I3SMaterial
     // Should use default baseColorFactor if it is not present in source material
     // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#reference-pbrmetallicroughness
     const baseColorFactor = sourceMaterial?.pbrMetallicRoughness?.baseColorFactor;
+    // This converter's I3S storage path uses byte-style color values; the I3S loader normalizes
+    // them when creating the glTF-compatible material consumed by deck/luma.
     material.pbrMetallicRoughness.baseColorFactor =
-      ((baseColorFactor && baseColorFactor.map((c) => Math.round(c * 255))) as [
+      ((baseColorFactor && baseColorFactor.map(c => Math.round(c * 255))) as [
         number,
         number,
         number,
@@ -1456,10 +1461,10 @@ function generateAttributeBuffer(type: string, value: any): ArrayBuffer {
       attributeBuffer = generateDoubleAttributeBuffer(value);
       break;
     case STRING_TYPE:
-      attributeBuffer = generateStringAttributeBuffer(value);
+      attributeBuffer = encodeStringAttribute(value);
       break;
     default:
-      attributeBuffer = generateStringAttributeBuffer(value);
+      attributeBuffer = encodeStringAttribute(value);
   }
 
   return attributeBuffer;
@@ -1472,7 +1477,7 @@ function generateAttributeBuffer(type: string, value: any): ArrayBuffer {
  * @returns attribute type.
  */
 function getAttributeType(key: string, attributeStorageInfo: any[]): string {
-  const attribute = attributeStorageInfo.find((attr) => attr.name === key);
+  const attribute = attributeStorageInfo.find(attr => attr.name === key);
   if (!attribute) {
     // eslint-disable-next-line no-console
     console.error(
@@ -1495,7 +1500,7 @@ function getAttributeType(key: string, attributeStorageInfo: any[]): string {
 /**
  * Convert short integer to attribute arrayBuffer.
  * @param featureIds
- * @returns - Buffer with objectId data.
+ * @returns ArrayBuffer with objectId data.
  */
 function generateShortIntegerAttributeBuffer(featureIds: any[]): ArrayBuffer {
   const count = new Uint32Array([featureIds.length]);
@@ -1506,7 +1511,7 @@ function generateShortIntegerAttributeBuffer(featureIds: any[]): ArrayBuffer {
 /**
  * Convert double to attribute arrayBuffer.
  * @param featureIds
- * @returns - Buffer with objectId data.
+ * @returns ArrayBuffer with objectId data.
  */
 function generateDoubleAttributeBuffer(featureIds: any[]): ArrayBuffer {
   const count = new Uint32Array([featureIds.length]);
@@ -1516,36 +1521,6 @@ function generateDoubleAttributeBuffer(featureIds: any[]): ArrayBuffer {
   return concatenateArrayBuffers(count.buffer, padding.buffer, valuesArray.buffer);
 }
 
-/**
- * Convert batch table attributes to array buffer with batch table data.
- * @param batchAttributes
- * @returns - Buffer with batch table data.
- */
-function generateStringAttributeBuffer(batchAttributes: any[]): ArrayBuffer {
-  const stringCountArray = new Uint32Array([batchAttributes.length]);
-  let totalNumberOfBytes = 0;
-  const stringSizesArray = new Uint32Array(batchAttributes.length);
-  const stringBufferArray: ArrayBuffer[] = [];
-
-  for (let index = 0; index < batchAttributes.length; index++) {
-    const currentString = `${String(batchAttributes[index])}\0`;
-    const currentStringBuffer = Buffer.from(currentString);
-    const currentStringSize = currentStringBuffer.length;
-    totalNumberOfBytes += currentStringSize;
-    stringSizesArray[index] = currentStringSize;
-    stringBufferArray.push(currentStringBuffer);
-  }
-
-  const totalBytes = new Uint32Array([totalNumberOfBytes]);
-
-  return concatenateArrayBuffers(
-    stringCountArray.buffer,
-    totalBytes.buffer,
-    stringSizesArray.buffer,
-    ...stringBufferArray
-  );
-}
-
 /**
  * Convert featureIds to BigUint64Array.
  * @param featureIds
@@ -1560,14 +1535,14 @@ function generateBigUint64Array(featureIds: any[]): BigUint64Array {
 }
 
 /**
- * Generates draco compressed geometry
- * @param vertexCount
- * @param convertedAttributes - get rid of this argument here
- * @param attributes - geometry attributes to compress
- * @param libraries - dynamicaly loaded 3rd-party libraries
- * @returns - Compressed geometry.
+ * Generates Edge Breaker Draco geometry with I3S feature and texture metadata.
+ * @param vertexCount - Number of vertices in the grouped triangle list.
+ * @param convertedAttributes - Original attributes used to size the feature-index array.
+ * @param attributes - Grouped I3S geometry attributes and inclusive face ranges.
+ * @param libraries - Local Draco encoder library locations.
+ * @returns Compressed geometry; the worker transfers the input attribute buffers.
  */
-async function generateCompressedGeometry(
+export async function generateCompressedGeometry(
   vertexCount: number,
   convertedAttributes: Record<string, any>,
   attributes: Record<string, any>,
@@ -1629,7 +1604,7 @@ async function generateCompressedGeometry(
       modules: libraries,
       useLocalLibraries: true,
       draco: {
-        method: 'MESH_SEQUENTIAL_ENCODING',
+        method: 'MESH_EDGEBREAKER_ENCODING',
         attributesMetadata
       },
       ['draco-writer']: {
@@ -1640,14 +1615,14 @@ async function generateCompressedGeometry(
   );
 }
 
+/** Resolve the published Node Draco writer, falling back to the dependency installer destination. */
 function getLocalDracoWriterWorkerUrl(): string {
   try {
     const require = createRequire(import.meta.url);
-    const packageJsonPath = require.resolve('@loaders.gl/draco/package.json');
-    return join(dirname(packageJsonPath), 'src/workers/draco-writer-worker-node.cjs');
+    return require.resolve('@loaders.gl/draco/draco-writer-worker-node.cjs');
   } catch {
     // Fall back to monorepo-local path
-    return './modules/draco/src/workers/draco-writer-worker-node.cjs';
+    return './modules/draco/dist/draco-writer-worker-node.cjs';
   }
 }
 
@@ -1671,7 +1646,7 @@ function generateFeatureIndexAttribute(
     orderedFeatureIndices.fill(fillIndex, startIndex, endIndex);
 
     fillIndex++;
-    startIndex = endIndex + 1;
+    startIndex = endIndex;
   }
 
   return orderedFeatureIndices;

package/src/{i3s-converter → v4/i3s-converter}/helpers/gltf-attributes.ts

@@ -2,6 +2,7 @@ import type {Tiles3DTileContent} from '@loaders.gl/3d-tiles';
 import type {GLTFAccessorPostprocessed, GLTFNodePostprocessed} from '@loaders.gl/gltf';
 import {Matrix4, TypedArray, Vector3} from '@math.gl/core';
 import {BoundingSphere, OrientedBoundingBox} from '@math.gl/culling';
+import {getImageData} from '@loaders.gl/images';
 import {Ellipsoid} from '@math.gl/geospatial';
 import {GLTFAttributesData} from '../types';
 
@@ -25,20 +26,20 @@ export function prepareDataForAttributesConversion(
     [];
 
   const images =
-    tileContent.gltf?.images?.map((imageObject) => {
+    tileContent.gltf?.images?.map(imageObject => {
       // Need data only for uncompressed images because we can't get batchIds from compressed textures.
       if (imageObject?.image?.compressed) {
         return null;
       }
-      const data = imageObject?.image?.data;
+      const {data, width, height} = getImageData(imageObject.image);
       const dataCopy = new Uint8Array(data.length);
       dataCopy.set(data);
       return {
         data: dataCopy,
         compressed: false,
-        height: imageObject.image.height,
-        width: imageObject.image.width,
-        components: imageObject.image.components,
+        height,
+        width,
+        components: data.length / (width * height),
         mimeType: imageObject.mimeType
       };
     }) || [];
@@ -141,7 +142,7 @@ function prepareNodes(nodes: GLTFNodePostprocessed[]): void {
         ...node,
         mesh: {
           ...node.mesh,
-          primitives: node.mesh?.primitives.map((primitive) => ({
+          primitives: node.mesh?.primitives.map(primitive => ({
             ...primitive,
             indices: {value: primitive?.indices?.value},
             attributes: getB3DMAttributesWithoutBufferView(primitive.attributes),

package/src/{i3s-converter → v4/i3s-converter}/helpers/load-3d-tiles.ts

@@ -119,15 +119,11 @@ export async function loadFromArchive(
     const hashTable = await loadHashTable(fileProvider);
     const archive = new Tiles3DArchive(fileProvider, hashTable, tz3Path);
     const fileSystem = new ZipFileSystem(archive);
-    // const loadOptionsWithoutDeprecatedFetch = {...loadOptions} as Tiles3DLoaderOptions & {
-    //   fetch?: unknown;
-    // };
-    // delete loadOptionsWithoutDeprecatedFetch.fetch;
-    // const mergedOptions = {
-    //   ...loadOptionsWithoutDeprecatedFetch,
-    //   core: {...loadOptions?.core, fetch: fileSystem.fetch.bind(fileSystem)}
-    // }
-    const content = await load(filename, loader, loadOptions);
+    const archiveLoadOptions = {
+      ...loadOptions,
+      core: {...loadOptions?.core, fetch: fileSystem.fetch.bind(fileSystem)}
+    };
+    const content = await load(filename, loader, archiveLoadOptions);
     await fileSystem.destroy();
     return content;
   }

package/src/{i3s-converter → v4/i3s-converter}/helpers/node-debug.ts

@@ -3,7 +3,7 @@ import {OrientedBoundingBox, BoundingSphere} from '@math.gl/culling';
 import {Vector3} from '@math.gl/core';
 import {Ellipsoid} from '@math.gl/geospatial';
 
-// prettier-ignore
+// biome-ignore format: preserve intentional fixture layout
 const CUBE_POSITIONS = new Float32Array([
   -1,  -1,  1, 1,  -1,  1,  1,  1,  1,  -1,  1,  1,
   -1,  -1,  -1,  -1,  1,  -1,  1,  1,  -1,  1,  -1,  -1,
@@ -103,11 +103,10 @@ function getTileObbVertices(node: Node3DIndexDocument): number[] {
   let vertices = [];
 
   for (let i = 0; i < positions.length; i += 3) {
-    const positionsVector = new Vector3(
-      (positions[i] *= halfSize[0]),
-      (positions[i + 1] *= halfSize[1]),
-      (positions[i + 2] *= halfSize[2])
-    );
+    positions[i] *= halfSize[0];
+    positions[i + 1] *= halfSize[1];
+    positions[i + 2] *= halfSize[2];
+    const positionsVector = new Vector3(positions[i], positions[i + 1], positions[i + 2]);
     const rotatedPositions = positionsVector
       // @ts-expect-error
       .transformByQuaternion(node.obb.quaternion)

package/src/{i3s-converter → v4/i3s-converter}/i3s-converter.ts

@@ -49,7 +49,7 @@ import {validateNodeBoundingVolumes} from './helpers/node-debug';
 import {KTX2BasisWriterWorker} from '@loaders.gl/textures';
 import {LoaderWithParser} from '@loaders.gl/loader-utils';
 import {I3SMaterialDefinition, TextureSetDefinitionFormats} from '@loaders.gl/i3s';
-import {ImageWriter} from '@loaders.gl/images';
+import {getImageData, ImageWriter} from '@loaders.gl/images';
 import {GLTFImagePostprocessed} from '@loaders.gl/gltf';
 import {
   GLTFPrimitiveModeString,
@@ -143,7 +143,7 @@ export default class I3SConverter {
     basis: {
       format: 'rgba32',
       // We need to load local fs workers because nodejs can't load workers from the Internet
-      workerUrl: './modules/textures/dist/basis-worker-node.js'
+      workerUrl: './modules/textures/dist/basis-worker-node.cjs'
     },
     // We need to load local fs workers because nodejs can't load workers from the Internet
     draco: {workerUrl: './modules/draco/dist/draco-worker-node.js'},
@@ -382,7 +382,7 @@ export default class I3SConverter {
         ...this.loadOptions,
         '3d-tiles': {...this.loadOptions['3d-tiles'], loadGLTF: false}
       });
-    } catch (error) {
+    } catch (_error) {
       // eslint-disable-next-line no-console
       console.log(
         `[warning]: Failed to load ${sourceTile.contentUrl}. An I3S tile with empty content will be added to the output tileset`
@@ -462,7 +462,7 @@ export default class I3SConverter {
       : tilesetPath;
     try {
       await removeDir(removePath);
-    } catch (e) {
+    } catch (_e) {
       // do nothing
     }
 
@@ -532,7 +532,7 @@ export default class I3SConverter {
     this.layers0!.materialDefinitions = this.materialDefinitions;
     // @ts-ignore
     this.layers0.geometryDefinitions = transform(
-      this.geometryConfigs.map((config) => ({
+      this.geometryConfigs.map(config => ({
         geometryConfig: {...config, draco: this.options.draco}
       })),
       geometryDefinitionTemlate()
@@ -540,9 +540,7 @@ export default class I3SConverter {
 
     if (this.layersHasTexture === false) {
       this.layers0!.store.defaultGeometrySchema.ordering =
-        this.layers0!.store.defaultGeometrySchema.ordering.filter(
-          (attribute) => attribute !== 'uv0'
-        );
+        this.layers0!.store.defaultGeometrySchema.ordering.filter(attribute => attribute !== 'uv0');
     }
 
     await this._writeLayers0();
@@ -614,14 +612,14 @@ export default class I3SConverter {
     const slpkTilesetPath = join(tilesetPath, 'SceneServer', 'layers', '0');
     const slpkFileName = `${tilesetPath}.slpk`;
 
-    await createZip(slpkTilesetPath, slpkFileName, async (fileList) => ({
+    await createZip(slpkTilesetPath, slpkFileName, async fileList => ({
       path: '@specialIndexFileHASH128@',
       file: await composeHashFile(fileList)
     }));
 
     try {
       await removeDir(tilesetPath);
-    } catch (e) {
+    } catch (_e) {
       // do nothing
     }
   }
@@ -728,7 +726,7 @@ export default class I3SConverter {
       this.layersHasTexture ||
       Boolean(
         ('texture' in resources && resources.texture) ||
-        ('texelCountHint' in resources && resources.texelCountHint)
+          ('texelCountHint' in resources && resources.texelCountHint)
       );
 
     if (this.generateBoundingVolumes && resources.boundingVolumes) {
@@ -737,7 +735,7 @@ export default class I3SConverter {
 
     const lodSelection = convertGeometricErrorToScreenThreshold(sourceTile, boundingVolumes);
     const maxScreenThresholdSQ = lodSelection.find(
-      (val) => val.metricType === 'maxScreenThresholdSQ'
+      val => val.metricType === 'maxScreenThresholdSQ'
     ) || {maxError: 0};
 
     if (isDumped) {
@@ -837,7 +835,7 @@ export default class I3SConverter {
     let tileContent: Tiles3DTileContent | null = null;
     try {
       tileContent = await loadTile3DContent(this.sourceTileset, sourceTile, this.loadOptions);
-    } catch (error) {
+    } catch (_error) {
       // eslint-disable-next-line no-console
       console.log(`[warning]: Failed to load ${sourceTile.contentUrl}`);
     }
@@ -1017,7 +1015,7 @@ export default class I3SConverter {
           definition: this.findOrCreateGeometryDefinition(
             Boolean(
               ('texture' in resources && resources.texture) ||
-              ('texelCountHint' in resources && resources.texelCountHint)
+                ('texelCountHint' in resources && resources.texelCountHint)
             ),
             hasUvRegions
           ),
@@ -1268,18 +1266,17 @@ export default class I3SConverter {
 
           if (this.generateTextures) {
             formats.push({name: '1', format: 'ktx2'});
-            // For Node.js texture.image.data is type of Buffer
-            const copyArrayBuffer = texture.image.data.subarray();
-            const arrayToEncode = new Uint8Array(copyArrayBuffer);
+            const imageData = getImageData(texture.image);
+            const arrayToEncode = new Uint8Array(imageData.data);
             const ktx2TextureData = encode(
-              {...texture.image, data: arrayToEncode},
+              {...imageData, data: arrayToEncode},
               // @ts-expect-error - Worker encoder typing is still WIP
               KTX2BasisWriterWorker,
               {
                 ...KTX2BasisWriterWorker.options,
                 ['ktx2-basis-writer']: {
                   // We need to load local fs workers because nodejs can't load workers from the Internet
-                  workerUrl: './modules/textures/dist/ktx2-basis-writer-worker-node.js'
+                  workerUrl: './modules/textures/dist/ktx2-basis-writer-worker-node.cjs'
                 },
                 reuseWorkers: true,
                 _nodeWorkers: true,

package/src/{i3s-converter → v4/i3s-converter}/json-templates/geometry-definitions.ts

@@ -18,7 +18,7 @@ const PLAIN_GEOMETRY_DEFINITION = () => ({
   },
   uv0: {
     path: 'hasTexture',
-    transform: (val) => (val && {type: 'Float32', component: 2}) || false,
+    transform: val => (val && {type: 'Float32', component: 2}) || false,
     omitValues: [false]
   },
   color: {
@@ -29,7 +29,7 @@ const PLAIN_GEOMETRY_DEFINITION = () => ({
   },
   uvRegion: {
     path: 'hasUvRegions',
-    transform: (val) => (val && {type: 'UInt16', component: 4}) || false,
+    transform: val => (val && {type: 'UInt16', component: 4}) || false,
     omitValues: [false]
   },
   featureId: {
@@ -54,7 +54,7 @@ const COMPRESSED_GEOMETRY_DEFINITION = () => ({
   },
   'compressedAttributes.attributes': {
     path: 'geometryConfig',
-    transform: (val) => {
+    transform: val => {
       const result = ['position', 'normal'];
       if (val.hasTexture) {
         result.push('uv0');
@@ -72,7 +72,7 @@ const COMPRESSED_GEOMETRY_DEFINITION = () => ({
 export const GEOMETRY_DEFINITION = () => ({
   geometryBuffers: {
     path: 'geometryConfig',
-    transform: (val) => {
+    transform: val => {
       const result = [transform(val, PLAIN_GEOMETRY_DEFINITION())];
       if (val.draco) {
         result.push(transform({geometryConfig: val}, COMPRESSED_GEOMETRY_DEFINITION()));

package/src/{i3s-converter → v4/i3s-converter}/json-templates/layers.ts

@@ -69,7 +69,7 @@ const FULL_EXTENT = () => ({
 export const LAYERS = () => ({
   version: {
     path: 'version',
-    transform: (val) => val.toUpperCase()
+    transform: val => val.toUpperCase()
   },
   id: {
     path: 'id',
@@ -88,7 +88,7 @@ export const LAYERS = () => ({
   },
   spatialReference: {
     path: 'spatialReference',
-    transform: (val) => transform(val, SPATIAL_REFERENCE())
+    transform: val => transform(val, SPATIAL_REFERENCE())
   },
   capabilities: {
     path: 'capabilities',
@@ -96,19 +96,19 @@ export const LAYERS = () => ({
   },
   store: {
     path: 'store',
-    transform: (val) => transform(val, STORE)
+    transform: val => transform(val, STORE)
   },
   fullExtent: {
     path: 'fullExtent',
-    transform: (val) => transform(val, FULL_EXTENT())
+    transform: val => transform(val, FULL_EXTENT())
   },
   heightModelInfo: {
     path: 'heightModelInfo',
-    transform: (val) => transform(val, HEIGHT_MODEL_INFO())
+    transform: val => transform(val, HEIGHT_MODEL_INFO())
   },
   nodePages: {
     path: 'nodePages',
-    transform: (val) => transform(val, NODE_PAGES())
+    transform: val => transform(val, NODE_PAGES())
   },
   materialDefinitions: {
     path: 'materialDefinitions',

package/src/{i3s-converter → v4/i3s-converter}/json-templates/node.ts

@@ -60,7 +60,7 @@ export const NODE = () => ({
   },
   parentNode: {
     path: 'parentNode',
-    transform: (val) => transform(val, PARENT_NODE()),
+    transform: val => transform(val, PARENT_NODE()),
     default: null
   },
   sharedResource: {

package/src/{i3s-converter → v4/i3s-converter}/json-templates/scene-server.ts

@@ -22,6 +22,6 @@ export const SCENE_SERVER = () => ({
   },
   layers: {
     path: 'layers0',
-    transform: (layers0) => [layers0]
+    transform: layers0 => [layers0]
   }
 });

package/src/{i3s-converter → v4/i3s-converter}/json-templates/shared-resources.ts

@@ -94,7 +94,7 @@ const TEXTURE_DEFINITION_INFO = () => ({
   images: {
     path: 'images',
     transform: (val, thisObject, originalObject) =>
-      val.map((image) => transform(image, TEXTURE_DEFINITION_IMAGE()))
+      val.map(image => transform(image, TEXTURE_DEFINITION_IMAGE()))
   }
 });
 

package/src/{i3s-converter → v4/i3s-converter}/json-templates/store.ts

@@ -1,7 +1,7 @@
 export const STORE = {
   id: {
     path: 'id',
-    transform: (val) => val.toUpperCase()
+    transform: val => val.toUpperCase()
   },
   profile: {
     path: 'profile',

package/src/{i3s-server → v4/i3s-server}/README.md

@@ -6,8 +6,8 @@ The server provides I3S Rest endpoints per specification https://github.com/Esri
 ## Development
 
 - install tsx globally `yarn global add tsx`
-- uncomment "local debug" lines in `modules/tile-converter/src/i3s-server/app.ts` and `modules/tile-converter/src/i3s-server/bin/www.ts` (see comments);
-- run `PORT=8080 HTTPS_PORT=4443 I3sLayerPath="./path/to/dataset" DEBUG=i3s-server:* npx tsx ./src/i3s-server/bin/www.ts`
+- uncomment "local debug" lines in `src/v4/i3s-server/app.ts` and `src/v4/i3s-server/bin/www.ts` (see comments);
+- run `PORT=8080 HTTPS_PORT=4443 I3sLayerPath="./path/to/dataset" DEBUG=i3s-server:* npx tsx ./src/v4/i3s-server/bin/www.ts`
 
 ## Usage
 

package/src/{i3s-server → v4/i3s-server}/controllers/slpk-controller.ts

@@ -11,7 +11,7 @@ let slpkArchive: SLPKArchive;
 export async function loadArchive(fullLayerPath: string): Promise<void> {
   slpkArchive = await parseSLPKArchive(
     new NodeFile(fullLayerPath),
-    (msg) => console.log(msg) // eslint-disable-line no-console
+    msg => console.log(msg) // eslint-disable-line no-console
   );
   // eslint-disable-next-line no-console
   console.log('The server is ready to use');

package/src/{i3s-server → v4/i3s-server}/routes/slpk-router.ts

@@ -28,7 +28,8 @@ router.get('*', (req, res, next) => {
       try {
         const json = JSON.parse(textDecoder.decode(file));
         res.send(json);
-      } catch (e) {
+      } catch (_e) {
+        // Express 4 sends typed arrays as JSON; adapt only at this Node.js HTTP boundary.
         res.send(Buffer.from(file));
       }
     } else {

package/src/v4/index.ts

@@ -0,0 +1,2 @@
+export {default as I3SConverter} from './i3s-converter/i3s-converter';
+export {default as Tiles3DConverter} from './3d-tiles-converter/3d-tiles-converter';

package/src/{lib → v4/lib}/utils/compress-util.ts

@@ -1,5 +1,6 @@
 import {createGzip} from 'zlib';
 import {createReadStream, createWriteStream} from 'fs';
+import {pipeline} from 'stream';
 
 /**
  * Compress file to gzip file
@@ -14,15 +15,15 @@ export function compressFileWithGzip(pathFile: string): Promise<string> {
   const output = createWriteStream(compressedPathFile);
 
   return new Promise((resolve, reject) => {
-    input.on('end', () => {
+    pipeline(input, gzip, output, error => {
+      if (error) {
+        console.log(`${compressedPathFile}: compression error!`); // eslint-disable-line no-undef,no-console
+        reject(error);
+        return;
+      }
+
       console.log(`${compressedPathFile} compressed and saved.`); // eslint-disable-line no-undef,no-console
       resolve(compressedPathFile);
     });
-    input.on('error', (error) => {
-      console.log(`${compressedPathFile}: compression error!`); // eslint-disable-line no-undef,no-console
-      reject(error);
-    });
-    // @ts-ignore Seems typescript upgrade triggered this
-    input.pipe(gzip).pipe(output);
   });
 }