@loaders.gl/tile-converter 3.3.0-alpha.2 → 3.3.0-alpha.4

package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts

@@ -1,5 +1,4 @@
-import type { GLTFAccessorPostprocessed } from 'modules/gltf/src/lib/types/gltf-types';
-import type { Image, MeshPrimitive } from 'modules/gltf/src/lib/types/gltf-postprocessed-schema';
+import { GLTFAccessorPostprocessed, GLTFImagePostprocessed, GLTFMeshPrimitivePostprocessed } from '@loaders.gl/gltf';
 /**
  * Getting batchIds from 3DTilesNext extensions.
  * @param attributes
@@ -8,5 +7,5 @@ import type { Image, MeshPrimitive } from 'modules/gltf/src/lib/types/gltf-postp
  */
 export declare function handleBatchIdsExtensions(attributes: {
     [key: string]: GLTFAccessorPostprocessed;
-}, primitive: MeshPrimitive, images: Image[]): number[];
+}, primitive: GLTFMeshPrimitivePostprocessed, images: GLTFImagePostprocessed[]): number[];
 //# sourceMappingURL=batch-ids-extensions.d.ts.map

package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batch-ids-extensions.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,yBAAyB,EAAC,MAAM,uCAAuC,CAAC;AACrF,OAAO,KAAK,EAAC,KAAK,EAAE,aAAa,EAAC,MAAM,sDAAsD,CAAC;AAS/F;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE;IACV,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAC;CAC1C,EACD,SAAS,EAAE,aAAa,EACxB,MAAM,EAAE,KAAK,EAAE,GACd,MAAM,EAAE,CAwBV"}
+{"version":3,"file":"batch-ids-extensions.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACtB,8BAA8B,EAC/B,MAAM,kBAAkB,CAAC;AAS1B;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE;IACV,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAC;CAC1C,EACD,SAAS,EAAE,8BAA8B,EACzC,MAAM,EAAE,sBAAsB,EAAE,GAC/B,MAAM,EAAE,CAwBV"}

package/dist/i3s-converter/helpers/batch-ids-extensions.js

@@ -98,6 +98,9 @@ function generateImplicitFeatureIds(featuresCount, constant = 0, divisor = 0) {
  * @param featureIdTextures
  */
 function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images) {
+    if (!images?.length) {
+        return [];
+    }
     const CHANNELS_MAP = {
         r: 0,
         g: 1,

package/dist/i3s-converter/helpers/coordinate-converter.d.ts

@@ -1,7 +1,7 @@
 import type { BoundingVolumes, FullExtent, Mbs, Obb } from '@loaders.gl/i3s';
 import { Vector3 } from '@math.gl/core';
 import { OrientedBoundingBox, BoundingSphere } from '@math.gl/culling';
-import TileHeader from '@loaders.gl/tiles/src/tileset/tile-3d';
+import { Tile3D } from '@loaders.gl/tiles';
 import { Geoid } from '@math.gl/geoid';
 /**
  * Create bounding volumes object from tile and geoid height model.
@@ -9,7 +9,7 @@ import { Geoid } from '@math.gl/geoid';
  * @param geoidHeightModel
  * @returns - Bounding volumes object
  */
-export declare function createBoundingVolumes(tile: TileHeader, geoidHeightModel: Geoid): BoundingVolumes;
+export declare function createBoundingVolumes(tile: Tile3D, geoidHeightModel: Geoid): BoundingVolumes;
 /**
  * Generates bounding volumes from geometry positions
  * @param cartesianPositions

package/dist/i3s-converter/helpers/coordinate-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coordinate-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/coordinate-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAE3E,OAAO,EAAsB,OAAO,EAAC,MAAM,eAAe,CAAC;AAE3D,OAAO,EACL,mBAAmB,EAGnB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,UAAU,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAErC;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAE,KAAK,GAAG,eAAe,CAiChG;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,kBAAkB,EAAE,YAAY,EAChC,gBAAgB,EAAE,KAAK,GACtB;IAAC,GAAG,EAAE,GAAG,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,CAoBtB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,EAAE,CAW5E;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,cAAc,EAAE,mBAAmB,GAAG,cAAc,GACnD,UAAU,CA0BZ;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAK9C"}
+{"version":3,"file":"coordinate-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/coordinate-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAE3E,OAAO,EAAsB,OAAO,EAAC,MAAM,eAAe,CAAC;AAE3D,OAAO,EACL,mBAAmB,EAGnB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAErC;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,GAAG,eAAe,CAiC5F;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,kBAAkB,EAAE,YAAY,EAChC,gBAAgB,EAAE,KAAK,GACtB;IAAC,GAAG,EAAE,GAAG,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,CAoBtB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,EAAE,CAW5E;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,cAAc,EAAE,mBAAmB,GAAG,cAAc,GACnD,UAAU,CA0BZ;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAK9C"}

package/dist/i3s-converter/helpers/feature-attributes.d.ts

@@ -1,4 +1,5 @@
 import type { FeatureTableJson } from '@loaders.gl/3d-tiles';
+import { Attribute, AttributeStorageInfo, ESRIField, Field, PopupInfo } from '@loaders.gl/i3s';
 /**
  * Takes attributes from property table based on featureIds.
  * If there is no property value for particular featureId (index) the property will be null.
@@ -21,4 +22,35 @@ export declare function flattenPropertyTableByFeatureIds(featureIds: number[], p
  * @returns
  */
 export declare function checkPropertiesLength(featureIds: number[], propertyTable: FeatureTableJson): boolean;
+/**
+ * Get the attribute type for attributeStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
+ * @param key - attribute's key
+ * @param attribute - attribute's type in propertyTable
+ */
+export declare function getAttributeType(key: string, attribute: string): string;
+/**
+ * Generate storage attribute for map segmentation.
+ * @param attributeIndex - order index of attribute (f_0, f_1 ...).
+ * @param key - attribute key from propertyTable.
+ * @param attributeType - attribute type.
+ * @return Updated storageAttribute.
+ */
+export declare function createdStorageAttribute(attributeIndex: number, key: string, attributeType: Attribute): AttributeStorageInfo;
+/**
+ * Find and return attribute type based on key form propertyTable.
+ * @param attributeType
+ */
+export declare function getFieldAttributeType(attributeType: Attribute): ESRIField;
+/**
+ * Setup field attribute for map segmentation.
+ * @param key - attribute for map segmentation.
+ * @param fieldAttributeType - esri attribute type ('esriFieldTypeString' or 'esriFieldTypeOID').
+ */
+export declare function createFieldAttribute(key: string, fieldAttributeType: ESRIField): Field;
+/**
+ * Generate popup info to show metadata on the map.
+ * @param propertyTable - table data with OBJECTID.
+ * @return data for correct rendering of popup.
+ */
+export declare function createPopupInfo(propertyTable: FeatureTableJson): PopupInfo;
 //# sourceMappingURL=feature-attributes.d.ts.map

package/dist/i3s-converter/helpers/feature-attributes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/feature-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAE3D;;;;;;;;;;;;GAYG;AACH,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,gBAAgB,CAQlB;AAkBD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAUT"}
+{"version":3,"file":"feature-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/feature-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,SAAS,EACT,oBAAoB,EACpB,SAAS,EACT,KAAK,EAEL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB;;;;;;;;;;;;GAYG;AACH,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,gBAAgB,CAQlB;AAkBD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAUT;AAUD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAUvE;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,SAAS,GACvB,oBAAoB,CA0BtB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,SAAS,GAAG,SAAS,CAazE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,SAAS,GAAG,KAAK,CAMtF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,aAAa,EAAE,gBAAgB,GAAG,SAAS,CA8B1E"}

package/dist/i3s-converter/helpers/feature-attributes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkPropertiesLength = exports.flattenPropertyTableByFeatureIds = void 0;
+exports.createPopupInfo = exports.createFieldAttribute = exports.getFieldAttributeType = exports.createdStorageAttribute = exports.getAttributeType = exports.checkPropertiesLength = exports.flattenPropertyTableByFeatureIds = void 0;
 /**
  * Takes attributes from property table based on featureIds.
  * If there is no property value for particular featureId (index) the property will be null.
@@ -53,3 +53,164 @@ function checkPropertiesLength(featureIds, propertyTable) {
     return needFlatten;
 }
 exports.checkPropertiesLength = checkPropertiesLength;
+/** String data type name for feature attributes */
+const STRING_TYPE = 'string';
+/** Integer data type name for feature attributes */
+const SHORT_INT_TYPE = 'Int32';
+/** Double data type name for feature attributes */
+const DOUBLE_TYPE = 'double';
+/** Type of attribute that is linked with feature ids */
+const OBJECT_ID_TYPE = 'OBJECTID';
+/**
+ * Get the attribute type for attributeStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
+ * @param key - attribute's key
+ * @param attribute - attribute's type in propertyTable
+ */
+function getAttributeType(key, attribute) {
+    if (key === OBJECT_ID_TYPE) {
+        return OBJECT_ID_TYPE;
+    }
+    if (typeof attribute === STRING_TYPE) {
+        return STRING_TYPE;
+    }
+    else if (typeof attribute === 'number') {
+        return Number.isInteger(attribute) ? SHORT_INT_TYPE : DOUBLE_TYPE;
+    }
+    return STRING_TYPE;
+}
+exports.getAttributeType = getAttributeType;
+/**
+ * Generate storage attribute for map segmentation.
+ * @param attributeIndex - order index of attribute (f_0, f_1 ...).
+ * @param key - attribute key from propertyTable.
+ * @param attributeType - attribute type.
+ * @return Updated storageAttribute.
+ */
+function createdStorageAttribute(attributeIndex, key, attributeType) {
+    const storageAttribute = {
+        key: `f_${attributeIndex}`,
+        name: key,
+        ordering: ['attributeValues'],
+        header: [{ property: 'count', valueType: 'UInt32' }],
+        attributeValues: { valueType: 'Int32', valuesPerElement: 1 }
+    };
+    switch (attributeType) {
+        case OBJECT_ID_TYPE:
+            setupIdAttribute(storageAttribute);
+            break;
+        case STRING_TYPE:
+            setupStringAttribute(storageAttribute);
+            break;
+        case DOUBLE_TYPE:
+            setupDoubleAttribute(storageAttribute);
+            break;
+        case SHORT_INT_TYPE:
+            break;
+        default:
+            setupStringAttribute(storageAttribute);
+    }
+    return storageAttribute;
+}
+exports.createdStorageAttribute = createdStorageAttribute;
+/**
+ * Find and return attribute type based on key form propertyTable.
+ * @param attributeType
+ */
+function getFieldAttributeType(attributeType) {
+    switch (attributeType) {
+        case OBJECT_ID_TYPE:
+            return 'esriFieldTypeOID';
+        case STRING_TYPE:
+            return 'esriFieldTypeString';
+        case SHORT_INT_TYPE:
+            return 'esriFieldTypeInteger';
+        case DOUBLE_TYPE:
+            return 'esriFieldTypeDouble';
+        default:
+            return 'esriFieldTypeString';
+    }
+}
+exports.getFieldAttributeType = getFieldAttributeType;
+/**
+ * Setup field attribute for map segmentation.
+ * @param key - attribute for map segmentation.
+ * @param fieldAttributeType - esri attribute type ('esriFieldTypeString' or 'esriFieldTypeOID').
+ */
+function createFieldAttribute(key, fieldAttributeType) {
+    return {
+        name: key,
+        type: fieldAttributeType,
+        alias: key
+    };
+}
+exports.createFieldAttribute = createFieldAttribute;
+/**
+ * Generate popup info to show metadata on the map.
+ * @param propertyTable - table data with OBJECTID.
+ * @return data for correct rendering of popup.
+ */
+function createPopupInfo(propertyTable) {
+    const title = '{OBJECTID}';
+    const mediaInfos = [];
+    const fieldInfos = [];
+    const popupElements = [];
+    const expressionInfos = [];
+    for (const key in propertyTable) {
+        fieldInfos.push({
+            fieldName: key,
+            visible: true,
+            isEditable: false,
+            label: key
+        });
+    }
+    popupElements.push({
+        fieldInfos,
+        type: 'fields'
+    });
+    return {
+        title,
+        mediaInfos,
+        popupElements,
+        fieldInfos,
+        expressionInfos
+    };
+}
+exports.createPopupInfo = createPopupInfo;
+/**
+ * Setup storage attribute as string.
+ * @param storageAttribute - attribute for map segmentation.
+ */
+function setupStringAttribute(storageAttribute) {
+    // @ts-expect-error
+    storageAttribute.ordering.unshift('attributeByteCounts');
+    storageAttribute.header.push({ property: 'attributeValuesByteCount', valueType: 'UInt32' });
+    storageAttribute.attributeValues = {
+        valueType: 'String',
+        encoding: 'UTF-8',
+        valuesPerElement: 1
+    };
+    storageAttribute.attributeByteCounts = {
+        valueType: 'UInt32',
+        valuesPerElement: 1
+    };
+}
+/**
+ * Setup Id attribute for map segmentation.
+ * @param storageAttribute - attribute for map segmentation .
+ */
+function setupIdAttribute(storageAttribute) {
+    storageAttribute.attributeValues = {
+        valueType: 'Oid32',
+        valuesPerElement: 1
+    };
+}
+/**
+ * Setup double attribute for map segmentation.
+ * @param storageAttribute - attribute for map segmentation .
+ */
+function setupDoubleAttribute(storageAttribute) {
+    storageAttribute.attributeValues = {
+        valueType: 'Float64',
+        valuesPerElement: 1
+    };
+}

package/dist/i3s-converter/helpers/geometry-converter.d.ts

@@ -1,14 +1,14 @@
 import type { B3DMContent, FeatureTableJson } from '@loaders.gl/3d-tiles';
-import { Tile3D } from '@loaders.gl/tiles';
 import { ConvertedAttributes, I3SConvertedResources } from '../types';
 import { AttributeStorageInfo } from '@loaders.gl/i3s';
 import { Geoid } from '@math.gl/geoid';
+/** Usage of worker here brings more overhead than advantage */
 import { B3DMAttributesData } from '../../i3s-attributes-worker';
 /**
  * Convert binary data from b3dm file to i3s resources
  *
  * @param tileContent - 3d tile content
- * @param nodeId - target nodeId. If a few nodes will be created - ids will be nodeId+n where n - index in the resulting array
+ * @param addNodeToNodePage - function to add new node to node pages
  * @param featuresHashArray - hash array of features that is needed to not to mix up same features in parent and child nodes
  * @param attributeStorageInfo - attributes metadata from 3DSceneLayer json
  * @param draco - is converter should create draco compressed geometry
@@ -16,7 +16,7 @@ import { B3DMAttributesData } from '../../i3s-attributes-worker';
  * @param geoidHeightModel - model to convert elevation from elipsoidal to geoid
  * @returns Array of node resources to create one or more i3s nodes
  */
-export default function convertB3dmToI3sGeometry(tileContent: B3DMContent, nodeId: number, propertyTable: FeatureTableJson | null, featuresHashArray: string[], attributeStorageInfo: AttributeStorageInfo[] | undefined, draco: boolean, generateBoundingVolumes: boolean, geoidHeightModel: Geoid, workerSource: {
+export default function convertB3dmToI3sGeometry(tileContent: B3DMContent, addNodeToNodePage: () => number, propertyTable: FeatureTableJson | null, featuresHashArray: string[], attributeStorageInfo: AttributeStorageInfo[] | undefined, draco: boolean, generateBoundingVolumes: boolean, geoidHeightModel: Geoid, workerSource: {
     [key: string]: string;
 }): Promise<I3SConvertedResources[] | null>;
 /**
@@ -31,6 +31,7 @@ export declare function convertAttributes(attributesData: B3DMAttributesData, us
  * Find property table in tile
  * For example it can be batchTable for b3dm files or property table in gLTF extension.
  * @param sourceTile
+ * @return batch table from b3dm / feature properties from EXT_FEATURE_METADATA
  */
-export declare function getPropertyTable(sourceTile: Tile3D): FeatureTableJson | null;
+export declare function getPropertyTable(tileContent: B3DMContent): FeatureTableJson | null;
 //# sourceMappingURL=geometry-converter.d.ts.map

package/dist/i3s-converter/helpers/geometry-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAQxE,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAKzC,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAMrC,OAAO,EAAC,kBAAkB,EAAqC,MAAM,6BAA6B,CAAC;AA6BnG;;;;;;;;;;;GAWG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,gBAAgB,GAAG,IAAI,EACtC,iBAAiB,EAAE,MAAM,EAAE,EAC3B,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,SAAS,EACxD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,2CAqEtC;AAuID;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CA0C3C;AAu7BD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAoB5E"}
+{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAqBxE,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AACrC,+DAA+D;AAC/D,OAAO,EAAC,kBAAkB,EAAsC,MAAM,6BAA6B,CAAC;AA6BpG;;;;;;;;;;;GAWG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,MAAM,MAAM,EAC/B,aAAa,EAAE,gBAAgB,GAAG,IAAI,EACtC,iBAAiB,EAAE,MAAM,EAAE,EAC3B,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,SAAS,EACxD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,GACpC,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CAmEzC;AAwID;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CA2C3C;AA47BD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAoBlF"}

package/dist/i3s-converter/helpers/geometry-converter.js

@@ -38,7 +38,7 @@ let scratchVector = new core_1.Vector3();
  * Convert binary data from b3dm file to i3s resources
  *
  * @param tileContent - 3d tile content
- * @param nodeId - target nodeId. If a few nodes will be created - ids will be nodeId+n where n - index in the resulting array
+ * @param addNodeToNodePage - function to add new node to node pages
  * @param featuresHashArray - hash array of features that is needed to not to mix up same features in parent and child nodes
  * @param attributeStorageInfo - attributes metadata from 3DSceneLayer json
  * @param draco - is converter should create draco compressed geometry
@@ -46,19 +46,19 @@ let scratchVector = new core_1.Vector3();
  * @param geoidHeightModel - model to convert elevation from elipsoidal to geoid
  * @returns Array of node resources to create one or more i3s nodes
  */
-async function convertB3dmToI3sGeometry(tileContent, nodeId, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
+async function convertB3dmToI3sGeometry(tileContent, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
     const useCartesianPositions = generateBoundingVolumes;
     const materialAndTextureList = convertMaterials(tileContent.gltf?.materials);
     const dataForAttributesConversion = (0, gltf_attributes_1.prepareDataForAttributesConversion)(tileContent);
     const convertedAttributesMap = await convertAttributes(dataForAttributesConversion, useCartesianPositions);
-    // TODO uncomment it when worker will be published on CDN.
-    /*
-    const convertedAttributesMap: Map<string, ConvertedAttributes> =
-      await transformI3SAttributesOnWorker(dataForAttributesConversion, {
-        useCartesianPositions,
-        source: workerSource.I3SAttributes
-      });
-    */
+    /** Usage of worker here brings more overhead than advantage */
+    // const convertedAttributesMap: Map<string, ConvertedAttributes> =
+    //   await transformI3SAttributesOnWorker(dataForAttributesConversion, {
+    //     reuseWorkers: true,
+    //     _nodeWorkers: true,
+    //     useCartesianPositions,
+    //     source: workerSource.I3SAttributes
+    //   });
     if (generateBoundingVolumes) {
         _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeightModel);
     }
@@ -68,7 +68,6 @@ async function convertB3dmToI3sGeometry(tileContent, nodeId, propertyTable, feat
         });
     }
     const result = [];
-    let nodesCounter = nodeId;
     let { materials = [] } = tileContent.gltf || { materials: [] };
     if (!materials?.length) {
         materials.push({ id: 'default' });
@@ -83,19 +82,19 @@ async function convertB3dmToI3sGeometry(tileContent, nodeId, propertyTable, feat
             continue;
         }
         const { material, texture } = materialAndTextureList[i];
+        const nodeId = addNodeToNodePage();
         result.push(await _makeNodeResources({
             convertedAttributes,
             material,
             texture,
             tileContent,
-            nodeId: nodesCounter,
+            nodeId,
             featuresHashArray,
             propertyTable,
             attributeStorageInfo,
             draco,
             workerSource
         }));
-        nodesCounter++;
     }
     if (!result.length) {
         return null;
@@ -162,6 +161,7 @@ async function _makeNodeResources({ convertedAttributes, material, texture, tile
         attributes = convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo);
     }
     return {
+        nodeId,
         geometry: fileBuffer,
         compressedGeometry,
         texture,
@@ -181,7 +181,7 @@ async function _makeNodeResources({ convertedAttributes, material, texture, tile
  * @returns map of converted geometry attributes
  */
 async function convertAttributes(attributesData, useCartesianPositions) {
-    const { gltfMaterials, nodes, cartographicOrigin, cartesianModelMatrix } = attributesData;
+    const { gltfMaterials, nodes, images, cartographicOrigin, cartesianModelMatrix } = attributesData;
     const attributesMap = new Map();
     for (const material of gltfMaterials || [{ id: 'default' }]) {
         attributesMap.set(material.id, {
@@ -194,7 +194,7 @@ async function convertAttributes(attributesData, useCartesianPositions) {
             boundingVolumes: null
         });
     }
-    convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
+    convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions);
     for (const attrKey of attributesMap.keys()) {
         const attributes = attributesMap.get(attrKey);
         if (!attributes) {
@@ -216,6 +216,7 @@ exports.convertAttributes = convertAttributes;
  * Gltf has hierarchical structure of nodes. This function converts nodes starting from those which are in gltf scene object.
  *   The goal is applying tranformation matrix for all children. Functions "convertNodes" and "convertNode" work together recursively.
  * @param nodes - gltf nodes array
+ * @param images - gltf images array
  * @param tileContent - 3d tile content
  * @param attributesMap - for recursive concatenation of attributes
  * @param useCartesianPositions - convert positions to absolute cartesian coordinates instead of cartographic offsets.
@@ -223,10 +224,10 @@ exports.convertAttributes = convertAttributes;
  * @param matrix - transformation matrix - cumulative transformation matrix formed from all parent node matrices
  * @returns {void}
  */
-function convertNodes(nodes, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix = new core_1.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
+function convertNodes(nodes, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix = new core_1.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
     if (nodes) {
         for (const node of nodes) {
-            convertNode(node, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
+            convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix);
         }
     }
 }
@@ -256,6 +257,7 @@ function getCompositeTransformationMatrix(node, matrix) {
 /**
  * Convert all primitives of node and all children nodes
  * @param node - gltf node
+ * @param images - gltf images array
  * @param {Object} tileContent - 3d tile content
  * @param {Map} attributesMap Map<{positions: Float32Array, normals: Float32Array, texCoords: Float32Array, colors: Uint8Array, featureIndices: Array}> - for recursive concatenation of
  *   attributes
@@ -263,14 +265,13 @@ function getCompositeTransformationMatrix(node, matrix) {
  * Cartesian coordinates will be required for creating bounding voulmest from geometry positions
  * @param {Matrix4} matrix - transformation matrix - cumulative transformation matrix formed from all parent node matrices
  */
-function convertNode(node, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix = new core_1.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
+function convertNode(node, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, matrix = new core_1.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
     const transformationMatrix = getCompositeTransformationMatrix(node, matrix);
     const mesh = node.mesh;
-    const images = node.images;
     if (mesh) {
         convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
     }
-    convertNodes(node.children || [], cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
+    convertNodes(node.children || [], images, cartographicOrigin, cartesianModelMatrix, attributesMap, useCartesianPositions, transformationMatrix);
 }
 /**
  * Convert all primitives of node and all children nodes
@@ -925,13 +926,14 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
  * Find property table in tile
  * For example it can be batchTable for b3dm files or property table in gLTF extension.
  * @param sourceTile
+ * @return batch table from b3dm / feature properties from EXT_FEATURE_METADATA
  */
-function getPropertyTable(sourceTile) {
-    const batchTableJson = sourceTile?.content?.batchTableJson;
+function getPropertyTable(tileContent) {
+    const batchTableJson = tileContent?.batchTableJson;
     if (batchTableJson) {
         return batchTableJson;
     }
-    const { extensionName, extension } = getPropertyTableExtension(sourceTile);
+    const { extensionName, extension } = getPropertyTableExtension(tileContent);
     switch (extensionName) {
         case EXT_MESH_FEATURES: {
             console.warn('The I3S converter does not yet support the EXT_mesh_features extension');
@@ -949,20 +951,20 @@ exports.getPropertyTable = getPropertyTable;
  * Check extensions which can be with property table inside.
  * @param sourceTile
  */
-function getPropertyTableExtension(sourceTile) {
+function getPropertyTableExtension(tileContent) {
     const extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_MESH_FEATURES];
-    const extensionsUsed = sourceTile?.content?.gltf?.extensionsUsed;
+    const extensionsUsed = tileContent?.gltf?.extensionsUsed;
     if (!extensionsUsed) {
         return { extensionName: null, extension: null };
     }
     let extensionName = '';
-    for (const extensionItem of sourceTile?.content?.gltf?.extensionsUsed) {
+    for (const extensionItem of tileContent?.gltf?.extensionsUsed || []) {
         if (extensionsWithPropertyTables.includes(extensionItem)) {
             extensionName = extensionItem;
             break;
         }
     }
-    const extension = sourceTile?.content?.gltf?.extensions?.[extensionName];
+    const extension = tileContent?.gltf?.extensions?.[extensionName];
     return { extensionName, extension };
 }
 /**

package/dist/i3s-converter/helpers/gltf-attributes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gltf-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/gltf-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAsBpE;;;;GAIG;AACH,wBAAgB,kCAAkC,CAAC,WAAW,EAAE,WAAW,GAAG,kBAAkB,CAqD/F"}
+{"version":3,"file":"gltf-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/gltf-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAsBpE;;;;GAIG;AACH,wBAAgB,kCAAkC,CAAC,WAAW,EAAE,WAAW,GAAG,kBAAkB,CA2C/F"}

package/dist/i3s-converter/helpers/gltf-attributes.js

@@ -27,43 +27,63 @@ function prepareDataForAttributesConversion(tileContent) {
         [];
     const images = tileContent.gltf?.images?.map((imageObject) => {
         // Need data only for uncompressed images because we can't get batchIds from compressed textures.
-        const data = imageObject?.image?.compressed ? null : imageObject?.image?.data.subarray();
-        return {
-            data,
-            compressed: Boolean(imageObject?.image?.compressed),
-            height: imageObject.image.height,
-            width: imageObject.image.width,
-            components: imageObject.image.components,
-            mimeType: imageObject.mimeType
-        };
-    }) || [];
-    const prepearedNodes = nodes.map((node) => {
-        if (!node.mesh) {
-            return node;
+        if (imageObject?.image?.compressed) {
+            return {
+                data: null,
+                compressed: true
+            };
         }
-        return {
-            ...node,
-            images,
-            mesh: {
-                ...node.mesh,
-                primitives: node.mesh?.primitives.map((primitive) => ({
-                    ...primitive,
-                    indices: { value: primitive?.indices?.value },
-                    attributes: getB3DMAttributesWithoutBufferView(primitive.attributes),
-                    material: {
-                        id: primitive?.material?.id
-                    }
-                }))
-            }
-        };
-    });
+        else {
+            const data = imageObject?.image?.data;
+            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,
+                mimeType: imageObject.mimeType
+            };
+        }
+    }) || [];
+    prepareNodes(nodes);
     const cartographicOrigin = tileContent.cartographicOrigin;
     const cartesianModelMatrix = tileContent.cartesianModelMatrix;
     return {
         gltfMaterials,
-        nodes: prepearedNodes,
+        nodes,
+        images,
         cartographicOrigin,
         cartesianModelMatrix
     };
 }
 exports.prepareDataForAttributesConversion = prepareDataForAttributesConversion;
+/**
+ * Traverse all nodes to replace all sensible data with copy to avoid data corruption in worker.
+ * @param nodes
+ */
+function prepareNodes(nodes) {
+    for (let index = 0; index < nodes.length; index++) {
+        const node = nodes[index];
+        if (node.mesh) {
+            nodes[index] = {
+                ...node,
+                mesh: {
+                    ...node.mesh,
+                    primitives: node.mesh?.primitives.map((primitive) => ({
+                        ...primitive,
+                        indices: { value: primitive?.indices?.value },
+                        attributes: getB3DMAttributesWithoutBufferView(primitive.attributes),
+                        material: {
+                            id: primitive?.material?.id
+                        }
+                    }))
+                }
+            };
+        }
+        if (node.children) {
+            prepareNodes(node.children);
+        }
+    }
+}

package/dist/i3s-converter/helpers/node-pages.d.ts

@@ -58,6 +58,10 @@ export default class NodePages {
      * @return the node object
      */
     getNodeById(id: number): NodeInPage;
+    /**
+     * Update all fields in the node excluding id
+     */
+    updateAll(id: number, data: NodeInPage): void;
     /**
      * Update material in node.mesh object by node id
      * @param id - end-to-end index of the node

package/dist/i3s-converter/helpers/node-pages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-pages.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/node-pages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAKhE,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,UAAU,MAAM,6BAA6B,CAAC;AAGrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,SAAS,EAAE;QAAC,KAAK,EAAE,UAAU,EAAE,CAAA;KAAC,EAAE,CAAC;IAE5C;;;;;OAKG;gBACS,aAAa,KAAA,EAAE,YAAY,KAAA;IASvC;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAItC;;;;OAIG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU;IAMnC;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAW5D;;;;OAIG;IACH,yBAAyB,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAQhE;;;OAGG;IACH,2BAA2B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAQ7C;;;;OAIG;IACH,0BAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAQlE;;;;OAIG;IACH,4BAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI;IAQtE;;;;OAIG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAQrE;;;OAGG;IACH,oBAAoB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAM5C;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAajD;;;;;;OAMG;IACG,IAAI,CACR,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,UAAU,CAAC,cAAc,CAAC,EACtC,IAAI,GAAE,OAAe,GACpB,OAAO,CAAC,IAAI,CAAC;CA6BjB"}
+{"version":3,"file":"node-pages.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/node-pages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAKhE,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,UAAU,MAAM,6BAA6B,CAAC;AAGrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,SAAS,EAAE;QAAC,KAAK,EAAE,UAAU,EAAE,CAAA;KAAC,EAAE,CAAC;IAE5C;;;;;OAKG;gBACS,aAAa,KAAA,EAAE,YAAY,KAAA;IASvC;;;OAGG;IACH,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAItC;;;;OAIG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU;IAMnC;;OAEG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI;IAK7C;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAW5D;;;;OAIG;IACH,yBAAyB,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAQhE;;;OAGG;IACH,2BAA2B,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAQ7C;;;;OAIG;IACH,0BAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAQlE;;;;OAIG;IACH,4BAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI;IAQtE;;;;OAIG;IACH,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAQrE;;;OAGG;IACH,oBAAoB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAM5C;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAajD;;;;;;OAMG;IACG,IAAI,CACR,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,UAAU,CAAC,cAAc,CAAC,EACtC,IAAI,GAAE,OAAe,GACpB,OAAO,CAAC,IAAI,CAAC;CA6BjB"}