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

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":"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"}
+{"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;AA87BD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAoBlF"}

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

@@ -634,7 +634,9 @@ function extractSharedResourcesMaterialInfo(baseColorFactor, metallicFactor = 1)
     const specular = dielectricSpecular.lerp(dielectricSpecular, baseColorVector, metallicFactor);
     return {
         params: {
+            // @ts-expect-error NumericArray
             diffuse: diffuse.toArray(),
+            // @ts-expect-error NumericArray
             specular: specular.toArray(),
             renderMode: 'solid'
         }

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/pgm-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pgm-loader.d.ts","sourceRoot":"","sources":["../src/pgm-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAQ/D;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAYvB,CAAC"}
+{"version":3,"file":"pgm-loader.d.ts","sourceRoot":"","sources":["../src/pgm-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAO/D;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAavB,CAAC"}

package/dist/pgm-loader.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PGMLoader = void 0;
+const geoid_1 = require("@math.gl/geoid");
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
-const geoid_1 = require("@math.gl/geoid");
 /**
  * Loader for PGM - Netpbm grayscale image format
  */
@@ -14,6 +14,7 @@ exports.PGMLoader = {
     module: 'tile-converter',
     version: VERSION,
     mimeTypes: ['image/x-portable-graymap'],
+    // @ts-expect-error LoaderOptions does not have cubic parameter
     parse: async (arrayBuffer, options) => (0, geoid_1.parsePGM)(new Uint8Array(arrayBuffer), options),
     extensions: ['pgm'],
     options: {

package/dist/workers/3d-tiles-attributes-worker.js

@@ -6,4 +6,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const worker_utils_1 = require("@loaders.gl/worker-utils");
 const b3dm_converter_1 = __importDefault(require("../3d-tiles-converter/helpers/b3dm-converter"));
 const b3dmConverter = new b3dm_converter_1.default();
-(0, worker_utils_1.createWorker)(async (data, options = {}) => b3dmConverter.convert(data, options.attributes));
+(0, worker_utils_1.createWorker)(async (data, options = {}) => b3dmConverter.convert(data, options.featureAttributes));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.3.0-alpha.4",
+  "version": "3.3.0-alpha.6",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -43,19 +43,19 @@
     "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\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "3.3.0-alpha.4",
-    "@loaders.gl/crypto": "3.3.0-alpha.4",
-    "@loaders.gl/draco": "3.3.0-alpha.4",
-    "@loaders.gl/gltf": "3.3.0-alpha.4",
-    "@loaders.gl/i3s": "3.3.0-alpha.4",
-    "@loaders.gl/images": "3.3.0-alpha.4",
-    "@loaders.gl/loader-utils": "3.3.0-alpha.4",
-    "@loaders.gl/polyfills": "3.3.0-alpha.4",
-    "@loaders.gl/schema": "3.3.0-alpha.4",
-    "@loaders.gl/textures": "3.3.0-alpha.4",
-    "@loaders.gl/tiles": "3.3.0-alpha.4",
-    "@loaders.gl/worker-utils": "3.3.0-alpha.4",
-    "@loaders.gl/zip": "3.3.0-alpha.4",
+    "@loaders.gl/3d-tiles": "3.3.0-alpha.6",
+    "@loaders.gl/crypto": "3.3.0-alpha.6",
+    "@loaders.gl/draco": "3.3.0-alpha.6",
+    "@loaders.gl/gltf": "3.3.0-alpha.6",
+    "@loaders.gl/i3s": "3.3.0-alpha.6",
+    "@loaders.gl/images": "3.3.0-alpha.6",
+    "@loaders.gl/loader-utils": "3.3.0-alpha.6",
+    "@loaders.gl/polyfills": "3.3.0-alpha.6",
+    "@loaders.gl/schema": "3.3.0-alpha.6",
+    "@loaders.gl/textures": "3.3.0-alpha.6",
+    "@loaders.gl/tiles": "3.3.0-alpha.6",
+    "@loaders.gl/worker-utils": "3.3.0-alpha.6",
+    "@loaders.gl/zip": "3.3.0-alpha.6",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -75,5 +75,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^3.2.0"
   },
-  "gitHead": "d1c524fd3cb9296ecd1bf7d185765c4f6aaef6a1"
+  "gitHead": "718a2998a26883247461ff05f01dcbef8d8c2417"
 }

package/src/3d-tiles-attributes-worker.ts

@@ -26,7 +26,7 @@ export const Tile3dAttributesWorker = {
   module: 'tile-converter',
   version: VERSION,
   options: {
-    attributes: null
+    featureAttributes: null
   }
 };
 

package/src/3d-tiles-converter/helpers/b3dm-converter.ts

@@ -27,7 +27,7 @@ export default class B3dmConverter {
     i3sAttributesData: I3SAttributesData,
     featureAttributes: any = null
   ): Promise<ArrayBuffer> {
-    const gltf = await this.buildGltf(i3sAttributesData);
+    const gltf = await this.buildGltf(i3sAttributesData, featureAttributes);
     const b3dm = encodeSync(
       {
         gltfEncoded: new Uint8Array(gltf),
@@ -45,7 +45,10 @@ export default class B3dmConverter {
    * @param i3sTile - Tile3D instance for I3S node
    * @returns - encoded glb content
    */
-  async buildGltf(i3sAttributesData: I3SAttributesData): Promise<ArrayBuffer> {
+  async buildGltf(
+    i3sAttributesData: I3SAttributesData,
+    featureAttributes: any
+  ): Promise<ArrayBuffer> {
     const {tileContent, textureFormat} = i3sAttributesData;
     const {
       material,
@@ -77,6 +80,7 @@ export default class B3dmConverter {
       cartographicOrigin,
       modelMatrix
     );
+    this._createBatchIds(tileContent, featureAttributes);
     if (attributes.normals && !this._checkNormals(attributes.normals.value)) {
       delete attributes.normals;
     }
@@ -163,25 +167,28 @@ export default class B3dmConverter {
   }
 
   /**
-   * Generate batchId attribute from faceRanges.
-   * @param {Uint32Array} faceRanges - the source array
-   * @returns {Float32Array} batchId list.
+   * Create _BATCHID attribute
+   * @param {Object} i3sContent - the source object
+   * @returns {void}
    */
-  _generateBatchId(faceRanges) {
-    const batchIdArraySize = (faceRanges[faceRanges.length - 1] + 1) * 3;
-    const batchId = new Float32Array(batchIdArraySize);
-    let rangeIndex = 0;
-    let currentBatchId = 0;
-
-    for (let index = 0; index < faceRanges.length / 2; index++) {
-      const fromIndex = faceRanges[rangeIndex] * 3;
-      const untilPosition = (faceRanges[rangeIndex + 1] + 1) * 3;
+  _createBatchIds(i3sContent, featureAttributes) {
+    const {featureIds} = i3sContent;
+    const {OBJECTID: objectIds} = featureAttributes || {};
+    if (!featureIds || !objectIds) {
+      return;
+    }
 
-      batchId.fill(currentBatchId, fromIndex, untilPosition);
-      rangeIndex += 2;
-      currentBatchId += 1;
+    for (let i = 0; i < featureIds.length; i++) {
+      const featureId = featureIds[i];
+      const batchId = objectIds.indexOf(featureId);
+      featureIds[i] = batchId;
     }
-    return batchId;
+
+    i3sContent.attributes._BATCHID = {
+      size: 1,
+      byteOffset: 0,
+      value: featureIds
+    };
   }
 
   /**

package/src/i3s-converter/helpers/geometry-converter.ts

@@ -934,7 +934,9 @@ function extractSharedResourcesMaterialInfo(
   const specular = dielectricSpecular.lerp(dielectricSpecular, baseColorVector, metallicFactor);
   return {
     params: {
+      // @ts-expect-error NumericArray
       diffuse: diffuse.toArray(),
+      // @ts-expect-error NumericArray
       specular: specular.toArray(),
       renderMode: 'solid'
     }

package/src/pgm-loader.ts

@@ -1,11 +1,10 @@
 import type {LoaderWithParser} from '@loaders.gl/loader-utils';
+import {parsePGM} from '@math.gl/geoid';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
-import {parsePGM} from '@math.gl/geoid';
-
 /**
  * Loader for PGM - Netpbm grayscale image format
  */
@@ -15,6 +14,7 @@ export const PGMLoader: LoaderWithParser = {
   module: 'tile-converter',
   version: VERSION,
   mimeTypes: ['image/x-portable-graymap'],
+  // @ts-expect-error LoaderOptions does not have cubic parameter
   parse: async (arrayBuffer, options) => parsePGM(new Uint8Array(arrayBuffer), options),
   extensions: ['pgm'],
   options: {

package/src/workers/3d-tiles-attributes-worker.ts

@@ -3,4 +3,4 @@ import B3dmConverter from '../3d-tiles-converter/helpers/b3dm-converter';
 
 const b3dmConverter = new B3dmConverter();
 
-createWorker(async (data, options = {}) => b3dmConverter.convert(data, options.attributes));
+createWorker(async (data, options = {}) => b3dmConverter.convert(data, options.featureAttributes));