@loaders.gl/tile-converter 3.3.0-alpha.11 → 3.3.0-alpha.13

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;AAsBxE,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EAGvB,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;;;;;;;;;;;;;;GAcG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACxC,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,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,GACpC,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CA0DzC;AA6ID;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAgD3C;AAulCD;;;;;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;AAsBxE,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EAGvB,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;;;;;;;;;;;;;;GAcG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACxC,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,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,GACpC,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CA0DzC;AA6ID;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAgD3C;AA8lCD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAoBlF"}

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

@@ -613,12 +613,18 @@ async function mergeMaterials(material1, material2) {
         material2.mergedMaterials) {
         const buffer1 = Buffer.from(material1.texture.bufferView.data);
         const buffer2 = Buffer.from(material2.texture.bufferView.data);
-        // @ts-ignore
-        const { joinImages } = await Promise.resolve().then(() => __importStar(require('join-images')));
-        const sharpData = await joinImages([buffer1, buffer2], { direction: 'horizontal' });
-        material1.texture.bufferView.data = await sharpData
-            .toFormat(material1.texture.mimeType === 'image/png' ? 'png' : 'jpeg')
-            .toBuffer();
+        try {
+            // @ts-ignore
+            const { joinImages } = await Promise.resolve().then(() => __importStar(require('join-images')));
+            const sharpData = await joinImages([buffer1, buffer2], { direction: 'horizontal' });
+            material1.texture.bufferView.data = await sharpData
+                .toFormat(material1.texture.mimeType === 'image/png' ? 'png' : 'jpeg')
+                .toBuffer();
+        }
+        catch (error) {
+            console.log('Join images into a texture atlas has failed. Consider usage `--split-nodes` option. (See documentation https://loaders.gl/modules/tile-converter/docs/cli-reference/tile-converter)');
+            throw error;
+        }
         // @ts-ignore
         material1.material.pbrMetallicRoughness.baseColorTexture.textureSetDefinitionId = 1;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.3.0-alpha.11",
+  "version": "3.3.0-alpha.13",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -37,25 +37,25 @@
   },
   "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.11",
-    "@loaders.gl/crypto": "3.3.0-alpha.11",
-    "@loaders.gl/draco": "3.3.0-alpha.11",
-    "@loaders.gl/gltf": "3.3.0-alpha.11",
-    "@loaders.gl/i3s": "3.3.0-alpha.11",
-    "@loaders.gl/images": "3.3.0-alpha.11",
-    "@loaders.gl/loader-utils": "3.3.0-alpha.11",
-    "@loaders.gl/polyfills": "3.3.0-alpha.11",
-    "@loaders.gl/schema": "3.3.0-alpha.11",
-    "@loaders.gl/textures": "3.3.0-alpha.11",
-    "@loaders.gl/tiles": "3.3.0-alpha.11",
-    "@loaders.gl/worker-utils": "3.3.0-alpha.11",
-    "@loaders.gl/zip": "3.3.0-alpha.11",
+    "@loaders.gl/3d-tiles": "3.3.0-alpha.13",
+    "@loaders.gl/crypto": "3.3.0-alpha.13",
+    "@loaders.gl/draco": "3.3.0-alpha.13",
+    "@loaders.gl/gltf": "3.3.0-alpha.13",
+    "@loaders.gl/i3s": "3.3.0-alpha.13",
+    "@loaders.gl/images": "3.3.0-alpha.13",
+    "@loaders.gl/loader-utils": "3.3.0-alpha.13",
+    "@loaders.gl/polyfills": "3.3.0-alpha.13",
+    "@loaders.gl/schema": "3.3.0-alpha.13",
+    "@loaders.gl/textures": "3.3.0-alpha.13",
+    "@loaders.gl/tiles": "3.3.0-alpha.13",
+    "@loaders.gl/worker-utils": "3.3.0-alpha.13",
+    "@loaders.gl/zip": "3.3.0-alpha.13",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -66,16 +66,18 @@
     "crypt": "^0.0.2",
     "debug": "~2.6.9",
     "express": "~4.17.3",
-    "join-images": "^1.1.3",
     "json-map-transform": "^1.2.6",
     "jszip": "^3.5.0",
     "md5": "^2.3.0",
     "morgan": "~1.9.1",
-    "sharp": "^0.31.3",
     "uuid": "^8.1.0"
   },
   "peerDependencies": {
     "@loaders.gl/core": "^3.2.0"
   },
-  "gitHead": "1863a8875f63d578c0fdf5bdb3b7d6827f799db9"
+  "quarantinedDependencies": {
+    "join-images": "^1.1.3",
+    "sharp": "^0.31.3"
+  },
+  "gitHead": "429a5667c9903cc2de4d1f3e55e1c2f2e58a3ff6"
 }

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

@@ -876,12 +876,19 @@ async function mergeMaterials(
   ) {
     const buffer1 = Buffer.from(material1.texture.bufferView.data);
     const buffer2 = Buffer.from(material2.texture.bufferView.data);
-    // @ts-ignore
-    const {joinImages} = await import('join-images');
-    const sharpData = await joinImages([buffer1, buffer2], {direction: 'horizontal'});
-    material1.texture.bufferView.data = await sharpData
-      .toFormat(material1.texture.mimeType === 'image/png' ? 'png' : 'jpeg')
-      .toBuffer();
+    try {
+      // @ts-ignore
+      const {joinImages} = await import('join-images');
+      const sharpData = await joinImages([buffer1, buffer2], {direction: 'horizontal'});
+      material1.texture.bufferView.data = await sharpData
+        .toFormat(material1.texture.mimeType === 'image/png' ? 'png' : 'jpeg')
+        .toBuffer();
+    } catch (error) {
+      console.log(
+        'Join images into a texture atlas has failed. Consider usage `--split-nodes` option. (See documentation https://loaders.gl/modules/tile-converter/docs/cli-reference/tile-converter)'
+      );
+      throw error;
+    }
     // @ts-ignore
     material1.material.pbrMetallicRoughness.baseColorTexture.textureSetDefinitionId = 1;
   }