@loaders.gl/tile-converter 4.0.0-alpha.11 → 4.0.0-alpha.12

package/dist/dist.min.js

@@ -57466,16 +57466,6 @@ async function parse3DTilesSubtree(data, options, context) {
   }
   return subtree;
 }
-function resolveBufferUri(bitstreamRelativeUri, basePath) {
-  const hasProtocol = basePath.startsWith("http");
-  if (hasProtocol) {
-    const resolvedUri2 = new URL(bitstreamRelativeUri, basePath);
-    return decodeURI(resolvedUri2.toString());
-  }
-  const basePathWithProtocol = `http://${basePath}`;
-  const resolvedUri = new URL(bitstreamRelativeUri, basePathWithProtocol);
-  return `/${resolvedUri.host}${resolvedUri.pathname}`;
-}
 async function getExplicitBitstream(subtree, name10, internalBinaryBuffer, context) {
   const bufferViewIndex = subtree[name10].bufferView;
   const bufferView = subtree.bufferViews[bufferViewIndex];
@@ -57487,7 +57477,7 @@ async function getExplicitBitstream(subtree, name10, internalBinaryBuffer, conte
     throw new Error("fetch is not provided");
   }
   if (buffer.uri) {
-    const bufferUri = resolveBufferUri(buffer.uri, context?.url);
+    const bufferUri = `${context?.baseUrl || ""}/${buffer.uri}`;
     const response = await context.fetch(bufferUri);
     const data = await response.arrayBuffer();
     return new Uint8Array(data, bufferView.byteOffset, bufferView.byteLength);
@@ -62286,10 +62276,15 @@ var I3SConverter = class {
     if (sourceTile.id) {
       console.log(`[analyze]: ${sourceTile.id}`);
     }
-    const tileContent = await loadTile3DContent(this.sourceTileset, sourceTile, {
-      ...this.loadOptions,
-      "3d-tiles": { ...this.loadOptions["3d-tiles"], loadGLTF: false }
-    });
+    let tileContent = null;
+    try {
+      tileContent = await loadTile3DContent(this.sourceTileset, sourceTile, {
+        ...this.loadOptions,
+        "3d-tiles": { ...this.loadOptions["3d-tiles"], loadGLTF: false }
+      });
+    } catch (error) {
+      console.log(`[warning]: Failed to load ${sourceTile.contentUrl}. An I3S tile with empty content will be added to the output tileset`);
+    }
     const tilePreprocessData = await analyzeTileContent(tileContent);
     mergePreprocessData(this.preprocessData, tilePreprocessData);
     return null;
@@ -62425,7 +62420,12 @@ var I3SConverter = class {
   async _createNode(parentNode, sourceTile, transformationMatrix) {
     this._checkAddRefinementTypeForTile(sourceTile);
     await this._updateTilesetOptions();
-    const tileContent = await loadTile3DContent(this.sourceTileset, sourceTile, this.loadOptions);
+    let tileContent = null;
+    try {
+      tileContent = await loadTile3DContent(this.sourceTileset, sourceTile, this.loadOptions);
+    } catch (error) {
+      console.log(`[warning]: Failed to load ${sourceTile.contentUrl}`);
+    }
     const sourceBoundingVolume = createBoundingVolume(sourceTile.boundingVolume, transformationMatrix, null);
     let boundingVolumes = createBoundingVolumes(sourceBoundingVolume, this.geoidHeightModel);
     const propertyTable = getPropertyTable(tileContent);
@@ -62514,6 +62514,9 @@ var I3SConverter = class {
     } else {
       node2 = await this.nodePages.getNodeById(nodeId);
     }
+    if (!nodeInPage.mesh) {
+      console.log(`[warning]: node ${node2.index} is created with empty content`);
+    }
     NodePages.updateAll(node2, nodeInPage);
     if (meshMaterial) {
       NodePages.updateMaterialByNodeId(node2, this._findOrCreateMaterial(meshMaterial));

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports._typecheckI3SAttributesWorker = exports.Tile3dAttributesWorker = void 0;
 exports.transform3DTilesAttributesOnWorker = transform3DTilesAttributesOnWorker;
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "4.0.0-alpha.11" !== 'undefined' ? "4.0.0-alpha.11" : 'latest';
+var VERSION = typeof "4.0.0-alpha.12" !== 'undefined' ? "4.0.0-alpha.12" : 'latest';
 var Tile3dAttributesWorker = {
   id: '3d-tiles-attributes',
   name: '3DTiles Attributes Worker',

package/dist/es5/deps-installer/deps-installer.js

@@ -14,7 +14,7 @@ var _zip = require("@loaders.gl/zip");
 var _fileUtils = require("../lib/utils/file-utils");
 var _path = require("path");
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "4.0.0-alpha.11" !== 'undefined' ? "4.0.0-alpha.11" : 'beta';
+var VERSION = typeof "4.0.0-alpha.12" !== 'undefined' ? "4.0.0-alpha.12" : 'beta';
 var PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 var DepsInstaller = function () {
   function DepsInstaller() {

package/dist/es5/i3s-attributes-worker.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports._typecheckI3SAttributesWorker = exports.I3SAttributesWorker = void 0;
 exports.transformI3SAttributesOnWorker = transformI3SAttributesOnWorker;
 var _workerUtils = require("@loaders.gl/worker-utils");
-var VERSION = typeof "4.0.0-alpha.11" !== 'undefined' ? "4.0.0-alpha.11" : 'latest';
+var VERSION = typeof "4.0.0-alpha.12" !== 'undefined' ? "4.0.0-alpha.12" : 'latest';
 var I3SAttributesWorker = {
   id: 'i3s-attributes',
   name: 'I3S Attributes Worker',

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

@@ -287,25 +287,34 @@ var I3SConverter = function () {
               if (sourceTile.id) {
                 console.log("[analyze]: ".concat(sourceTile.id));
               }
-              _context3.next = 7;
+              tileContent = null;
+              _context3.prev = 6;
+              _context3.next = 9;
               return (0, _load3dTiles.loadTile3DContent)(this.sourceTileset, sourceTile, _objectSpread(_objectSpread({}, this.loadOptions), {}, {
                 '3d-tiles': _objectSpread(_objectSpread({}, this.loadOptions['3d-tiles']), {}, {
                   loadGLTF: false
                 })
               }));
-            case 7:
+            case 9:
               tileContent = _context3.sent;
-              _context3.next = 10;
+              _context3.next = 15;
+              break;
+            case 12:
+              _context3.prev = 12;
+              _context3.t0 = _context3["catch"](6);
+              console.log("[warning]: Failed to load ".concat(sourceTile.contentUrl, ". An I3S tile with empty content will be added to the output tileset"));
+            case 15:
+              _context3.next = 17;
               return (0, _preprocess3dTiles.analyzeTileContent)(tileContent);
-            case 10:
+            case 17:
               tilePreprocessData = _context3.sent;
               (0, _preprocess3dTiles.mergePreprocessData)(this.preprocessData, tilePreprocessData);
               return _context3.abrupt("return", null);
-            case 13:
+            case 20:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this);
+        }, _callee3, this, [[6, 12]]);
       }));
       function analyzeTile(_x2, _x3) {
         return _analyzeTile.apply(this, arguments);
@@ -694,19 +703,28 @@ var I3SConverter = function () {
               _context9.next = 3;
               return this._updateTilesetOptions();
             case 3:
-              _context9.next = 5;
+              tileContent = null;
+              _context9.prev = 4;
+              _context9.next = 7;
               return (0, _load3dTiles.loadTile3DContent)(this.sourceTileset, sourceTile, this.loadOptions);
-            case 5:
+            case 7:
               tileContent = _context9.sent;
+              _context9.next = 13;
+              break;
+            case 10:
+              _context9.prev = 10;
+              _context9.t0 = _context9["catch"](4);
+              console.log("[warning]: Failed to load ".concat(sourceTile.contentUrl));
+            case 13:
               sourceBoundingVolume = (0, _tiles.createBoundingVolume)(sourceTile.boundingVolume, transformationMatrix, null);
               boundingVolumes = (0, _coordinateConverter.createBoundingVolumes)(sourceBoundingVolume, this.geoidHeightModel);
               propertyTable = (0, _geometryConverter.getPropertyTable)(tileContent);
               if (propertyTable && !((_this$layers = this.layers0) !== null && _this$layers !== void 0 && (_this$layers$attribut = _this$layers.attributeStorageInfo) !== null && _this$layers$attribut !== void 0 && _this$layers$attribut.length)) {
                 this._convertPropertyTableToNodeAttributes(propertyTable);
               }
-              _context9.next = 12;
+              _context9.next = 19;
               return this._convertResources(sourceTile, transformationMatrix, sourceBoundingVolume, tileContent, parentNode.inPageId, propertyTable);
-            case 12:
+            case 19:
               resourcesData = _context9.sent;
               nodes = [];
               nodeIds = [];
@@ -724,11 +742,11 @@ var I3SConverter = function () {
                 boundingVolumes: null
               };
               _iterator5 = _createForOfIteratorHelper(resourcesData || [emptyResources]);
-              _context9.prev = 18;
+              _context9.prev = 25;
               _iterator5.s();
-            case 20:
+            case 27:
               if ((_step5 = _iterator5.n()).done) {
-                _context9.next = 44;
+                _context9.next = 51;
                 break;
               }
               resources = _step5.value;
@@ -742,26 +760,26 @@ var I3SConverter = function () {
               }) || {
                 maxError: 0
               };
-              _context9.next = 28;
+              _context9.next = 35;
               return this._updateNodeInNodePages(maxScreenThresholdSQ, boundingVolumes, sourceTile, parentNode.inPageId, resources);
-            case 28:
+            case 35:
               nodeInPage = _context9.sent;
-              _context9.next = 31;
+              _context9.next = 38;
               return _nodeIndexDocument.NodeIndexDocument.createNodeIndexDocument(parentNode, boundingVolumes, lodSelection, nodeInPage, resources);
-            case 31:
+            case 38:
               nodeData = _context9.sent;
-              _context9.next = 34;
+              _context9.next = 41;
               return new _nodeIndexDocument.NodeIndexDocument(nodeInPage.index, this).addData(nodeData);
-            case 34:
+            case 41:
               node = _context9.sent;
               nodes.push(node);
               if (!nodeInPage.mesh) {
-                _context9.next = 39;
+                _context9.next = 46;
                 break;
               }
-              _context9.next = 39;
+              _context9.next = 46;
               return this._writeResources(resources, node.id);
-            case 39:
+            case 46:
               if (this.validate) {
                 this.boundingVolumeWarnings = (0, _nodeDebug.validateNodeBoundingVolumes)(nodeData);
                 if (this.boundingVolumeWarnings && this.boundingVolumeWarnings.length) {
@@ -770,27 +788,27 @@ var I3SConverter = function () {
               }
               nodeIds.push(nodeInPage.index);
               nodesInPage.push(nodeInPage);
-            case 42:
-              _context9.next = 20;
+            case 49:
+              _context9.next = 27;
               break;
-            case 44:
-              _context9.next = 49;
+            case 51:
+              _context9.next = 56;
               break;
-            case 46:
-              _context9.prev = 46;
-              _context9.t0 = _context9["catch"](18);
-              _iterator5.e(_context9.t0);
-            case 49:
-              _context9.prev = 49;
+            case 53:
+              _context9.prev = 53;
+              _context9.t1 = _context9["catch"](25);
+              _iterator5.e(_context9.t1);
+            case 56:
+              _context9.prev = 56;
               _iterator5.f();
-              return _context9.finish(49);
-            case 52:
+              return _context9.finish(56);
+            case 59:
               return _context9.abrupt("return", nodes);
-            case 53:
+            case 60:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[18, 46, 49, 52]]);
+        }, _callee9, this, [[4, 10], [25, 53, 56, 59]]);
       }));
       function _createNode(_x11, _x12, _x13) {
         return _createNode2.apply(this, arguments);
@@ -896,6 +914,9 @@ var I3SConverter = function () {
             case 12:
               node = _context12.sent;
             case 13:
+              if (!nodeInPage.mesh) {
+                console.log("[warning]: node ".concat(node.index, " is created with empty content"));
+              }
               _nodePages.default.updateAll(node, nodeInPage);
               if (meshMaterial) {
                 _nodePages.default.updateMaterialByNodeId(node, this._findOrCreateMaterial(meshMaterial));
@@ -914,7 +935,7 @@ var I3SConverter = function () {
               }
               this.nodePages.saveNode(node);
               return _context12.abrupt("return", node);
-            case 21:
+            case 22:
             case "end":
               return _context12.stop();
           }