@loaders.gl/tile-converter 4.0.0-alpha.20 → 4.0.0-alpha.22

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

@@ -16,7 +16,7 @@ var _path = require("path");
 var _workerUtils = require("@loaders.gl/worker-utils");
 var _draco = require("@loaders.gl/draco");
 var _textures = require("@loaders.gl/textures");
-var VERSION = typeof "4.0.0-alpha.20" !== 'undefined' ? "4.0.0-alpha.20" : 'beta';
+var VERSION = typeof "4.0.0-alpha.22" !== 'undefined' ? "4.0.0-alpha.22" : '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-converter/helpers/load-3d-tiles.js

@@ -4,10 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.isNestedTileset = isNestedTileset;
+exports.loadFromArchive = loadFromArchive;
 exports.loadTile3DContent = exports.loadNestedTileset = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _dTiles = require("@loaders.gl/3d-tiles");
 var _core = require("@loaders.gl/core");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -17,7 +20,7 @@ var loadNestedTileset = function () {
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          isTileset = sourceTile.type === 'json';
+          isTileset = isNestedTileset(sourceTile);
           if (!(!sourceTileset || !sourceTile.contentUrl || !isTileset)) {
             _context.next = 3;
             break;
@@ -29,7 +32,7 @@ var loadNestedTileset = function () {
             assetGltfUpAxis: sourceTileset.asset && sourceTileset.asset.gltfUpAxis || 'Y'
           }));
           _context.next = 6;
-          return (0, _core.load)(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
+          return loadFromArchive(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
         case 6:
           tileContent = _context.sent;
           if (tileContent.root) {
@@ -52,7 +55,7 @@ var loadTile3DContent = function () {
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          isTileset = sourceTile.type === 'json';
+          isTileset = isNestedTileset(sourceTile);
           if (!(!sourceTileset || !sourceTile.contentUrl || isTileset)) {
             _context2.next = 3;
             break;
@@ -64,7 +67,7 @@ var loadTile3DContent = function () {
             assetGltfUpAxis: sourceTileset.asset && sourceTileset.asset.gltfUpAxis || 'Y'
           })));
           _context2.next = 6;
-          return (0, _core.load)(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
+          return loadFromArchive(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
         case 6:
           tileContent = _context2.sent;
           return _context2.abrupt("return", tileContent);
@@ -79,4 +82,67 @@ var loadTile3DContent = function () {
   };
 }();
 exports.loadTile3DContent = loadTile3DContent;
+function loadFromArchive(_x7, _x8, _x9) {
+  return _loadFromArchive.apply(this, arguments);
+}
+function _loadFromArchive() {
+  _loadFromArchive = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(url, loader, loadOptions) {
+    var tz3UrlParts, filename, tz3Path, fileSystem, content;
+    return _regenerator.default.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          tz3UrlParts = url.split('.3tz');
+          if (!(tz3UrlParts.length === 1)) {
+            _context3.next = 5;
+            break;
+          }
+          filename = null;
+          _context3.next = 11;
+          break;
+        case 5:
+          if (!(tz3UrlParts.length === 2)) {
+            _context3.next = 10;
+            break;
+          }
+          filename = tz3UrlParts[1].slice(1);
+          if (filename === '') {
+            filename = 'tileset.json';
+          }
+          _context3.next = 11;
+          break;
+        case 10:
+          throw new Error('Unexpected URL format');
+        case 11:
+          if (!filename) {
+            _context3.next = 20;
+            break;
+          }
+          tz3Path = "".concat(tz3UrlParts[0], ".3tz");
+          fileSystem = new _dTiles.Tiles3DArchiveFileSystem(tz3Path);
+          _context3.next = 16;
+          return (0, _core.load)(filename, loader, _objectSpread(_objectSpread({}, loadOptions), {}, {
+            fetch: fileSystem.fetch.bind(fileSystem)
+          }));
+        case 16:
+          content = _context3.sent;
+          _context3.next = 19;
+          return fileSystem.destroy();
+        case 19:
+          return _context3.abrupt("return", content);
+        case 20:
+          _context3.next = 22;
+          return (0, _core.load)(url, loader, loadOptions);
+        case 22:
+          return _context3.abrupt("return", _context3.sent);
+        case 23:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _loadFromArchive.apply(this, arguments);
+}
+function isNestedTileset(tile) {
+  return (tile === null || tile === void 0 ? void 0 : tile.type) === 'json' || (tile === null || tile === void 0 ? void 0 : tile.type) === '3tz';
+}
 //# sourceMappingURL=load-3d-tiles.js.map

package/dist/es5/i3s-converter/helpers/load-3d-tiles.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-3d-tiles.js","names":["_core","require","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","loadNestedTileset","_ref","_asyncToGenerator2","_regenerator","mark","_callee","sourceTileset","sourceTile","tilesetLoadOptions","isTileset","loadOptions","tileContent","wrap","_callee$","_context","prev","next","type","contentUrl","abrupt","loader","id","assetGltfUpAxis","asset","gltfUpAxis","load","sent","root","children","stop","_x","_x2","_x3","exports","loadTile3DContent","_ref2","_callee2","_callee2$","_context2","_x4","_x5","_x6"],"sources":["../../../../src/i3s-converter/helpers/load-3d-tiles.ts"],"sourcesContent":["import type {\n  Tiles3DLoaderOptions,\n  Tiles3DTileContent,\n  Tiles3DTileJSONPostprocessed,\n  Tiles3DTilesetJSONPostprocessed\n} from '@loaders.gl/3d-tiles';\nimport {load} from '@loaders.gl/core';\n\n/**\n * Load nested 3DTiles tileset. If the sourceTile is not nested tileset - do nothing\n * @param sourceTileset - source root tileset JSON\n * @param sourceTile - source tile JSON that is supposed to has link to nested tileset\n * @param tilesetLoadOptions - load options for Tiles3DLoader\n * @returns nothing\n */\nexport const loadNestedTileset = async (\n  sourceTileset: Tiles3DTilesetJSONPostprocessed | null,\n  sourceTile: Tiles3DTileJSONPostprocessed,\n  tilesetLoadOptions: Tiles3DLoaderOptions\n): Promise<void> => {\n  const isTileset = sourceTile.type === 'json';\n  if (!sourceTileset || !sourceTile.contentUrl || !isTileset) {\n    return;\n  }\n\n  const loadOptions = {\n    ...tilesetLoadOptions,\n    [sourceTileset.loader.id]: {\n      isTileset,\n      assetGltfUpAxis: (sourceTileset.asset && sourceTileset.asset.gltfUpAxis) || 'Y'\n    }\n  };\n  const tileContent = await load(sourceTile.contentUrl, sourceTileset.loader, loadOptions);\n\n  if (tileContent.root) {\n    sourceTile.children = [tileContent.root];\n  }\n};\n\n/**\n * Load 3DTiles tile content, that includes glTF object\n * @param sourceTileset - source root tileset JSON\n * @param sourceTile - source tile JSON that has link to content data\n * @param tilesetLoadOptions - load options for Tiles3DLoader\n * @returns - 3DTiles tile content or null\n */\nexport const loadTile3DContent = async (\n  sourceTileset: Tiles3DTilesetJSONPostprocessed | null,\n  sourceTile: Tiles3DTileJSONPostprocessed,\n  tilesetLoadOptions: Tiles3DLoaderOptions\n): Promise<Tiles3DTileContent | null> => {\n  const isTileset = sourceTile.type === 'json';\n  if (!sourceTileset || !sourceTile.contentUrl || isTileset) {\n    return null;\n  }\n\n  const loadOptions = {\n    ...tilesetLoadOptions,\n    [sourceTileset.loader.id]: {\n      ...(tilesetLoadOptions[sourceTileset.loader.id] || {}),\n      isTileset,\n      assetGltfUpAxis: (sourceTileset.asset && sourceTileset.asset.gltfUpAxis) || 'Y'\n    }\n  };\n  const tileContent = await load(sourceTile.contentUrl, sourceTileset.loader, loadOptions);\n\n  return tileContent;\n};\n"],"mappings":"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"}
+{"version":3,"file":"load-3d-tiles.js","names":["_dTiles","require","_core","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","loadNestedTileset","_ref","_asyncToGenerator2","_regenerator","mark","_callee","sourceTileset","sourceTile","tilesetLoadOptions","isTileset","loadOptions","tileContent","wrap","_callee$","_context","prev","next","isNestedTileset","contentUrl","abrupt","loader","id","assetGltfUpAxis","asset","gltfUpAxis","loadFromArchive","sent","root","children","stop","_x","_x2","_x3","exports","loadTile3DContent","_ref2","_callee2","_callee2$","_context2","_x4","_x5","_x6","_x7","_x8","_x9","_loadFromArchive","_callee3","url","tz3UrlParts","filename","tz3Path","fileSystem","content","_callee3$","_context3","split","slice","Error","concat","Tiles3DArchiveFileSystem","load","fetch","bind","destroy","tile","type"],"sources":["../../../../src/i3s-converter/helpers/load-3d-tiles.ts"],"sourcesContent":["import type {\n  Tiles3DLoaderOptions,\n  Tiles3DTileContent,\n  Tiles3DTileJSONPostprocessed,\n  Tiles3DTilesetJSONPostprocessed\n} from '@loaders.gl/3d-tiles';\nimport {Tiles3DArchiveFileSystem} from '@loaders.gl/3d-tiles';\nimport {LoaderWithParser, load} from '@loaders.gl/core';\n\n/**\n * Load nested 3DTiles tileset. If the sourceTile is not nested tileset - do nothing\n * @param sourceTileset - source root tileset JSON\n * @param sourceTile - source tile JSON that is supposed to has link to nested tileset\n * @param tilesetLoadOptions - load options for Tiles3DLoader\n * @returns nothing\n */\nexport const loadNestedTileset = async (\n  sourceTileset: Tiles3DTilesetJSONPostprocessed | null,\n  sourceTile: Tiles3DTileJSONPostprocessed,\n  tilesetLoadOptions: Tiles3DLoaderOptions\n): Promise<void> => {\n  const isTileset = isNestedTileset(sourceTile);\n  if (!sourceTileset || !sourceTile.contentUrl || !isTileset) {\n    return;\n  }\n\n  const loadOptions = {\n    ...tilesetLoadOptions,\n    [sourceTileset.loader.id]: {\n      isTileset,\n      assetGltfUpAxis: (sourceTileset.asset && sourceTileset.asset.gltfUpAxis) || 'Y'\n    }\n  };\n  const tileContent = await loadFromArchive(\n    sourceTile.contentUrl,\n    sourceTileset.loader,\n    loadOptions\n  );\n\n  if (tileContent.root) {\n    sourceTile.children = [tileContent.root];\n  }\n};\n\n/**\n * Load 3DTiles tile content, that includes glTF object\n * @param sourceTileset - source root tileset JSON\n * @param sourceTile - source tile JSON that has link to content data\n * @param tilesetLoadOptions - load options for Tiles3DLoader\n * @returns - 3DTiles tile content or null\n */\nexport const loadTile3DContent = async (\n  sourceTileset: Tiles3DTilesetJSONPostprocessed | null,\n  sourceTile: Tiles3DTileJSONPostprocessed,\n  tilesetLoadOptions: Tiles3DLoaderOptions\n): Promise<Tiles3DTileContent | null> => {\n  const isTileset = isNestedTileset(sourceTile);\n  if (!sourceTileset || !sourceTile.contentUrl || isTileset) {\n    return null;\n  }\n\n  const loadOptions = {\n    ...tilesetLoadOptions,\n    [sourceTileset.loader.id]: {\n      ...(tilesetLoadOptions[sourceTileset.loader.id] || {}),\n      isTileset,\n      assetGltfUpAxis: (sourceTileset.asset && sourceTileset.asset.gltfUpAxis) || 'Y'\n    }\n  };\n  const tileContent = await loadFromArchive(\n    sourceTile.contentUrl,\n    sourceTileset.loader,\n    loadOptions\n  );\n\n  return tileContent;\n};\n\n/**\n * Load a resource with load options and .3tz format support\n * @param url - resource URL\n * @param loader - loader to parse data (Tiles3DLoader / CesiumIonLoader)\n * @param loadOptions - 3d-tiles loader options\n * @returns 3d-tiles resource\n */\nexport async function loadFromArchive(\n  url: string,\n  loader: LoaderWithParser,\n  loadOptions: Tiles3DLoaderOptions\n) {\n  const tz3UrlParts = url.split('.3tz');\n  let filename: string | null;\n  // No '.3tz'. The file will be loaded with global fetch function\n  if (tz3UrlParts.length === 1) {\n    filename = null;\n  } else if (tz3UrlParts.length === 2) {\n    filename = tz3UrlParts[1].slice(1);\n    if (filename === '') {\n      filename = 'tileset.json';\n    }\n  } else {\n    throw new Error('Unexpected URL format');\n  }\n  if (filename) {\n    const tz3Path = `${tz3UrlParts[0]}.3tz`;\n    const fileSystem = new Tiles3DArchiveFileSystem(tz3Path);\n    const content = await load(filename, loader, {\n      ...loadOptions,\n      fetch: fileSystem.fetch.bind(fileSystem)\n    });\n    await fileSystem.destroy();\n    return content;\n  }\n  return await load(url, loader, loadOptions);\n}\n\n/**\n * Check if tile is nested tileset\n * @param tile - 3DTiles header data\n * @returns true if tile is nested tileset\n */\nexport function isNestedTileset(tile: Tiles3DTileJSONPostprocessed) {\n  return tile?.type === 'json' || tile?.type === '3tz';\n}\n"],"mappings":"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"}

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

@@ -185,7 +185,7 @@ var I3SConverter = function () {
                 };
               }
               _context.next = 28;
-              return (0, _core.load)(tilesetUrl, this.Loader, this.loadOptions);
+              return (0, _load3dTiles.loadFromArchive)(tilesetUrl, this.Loader, this.loadOptions);
             case 28:
               this.sourceTileset = _context.sent;
               _context.next = 31;
@@ -314,50 +314,51 @@ var I3SConverter = function () {
     key: "analyzeTile",
     value: function () {
       var _analyzeTile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(sourceTile, traversalProps) {
-        var tileContent, tilePreprocessData;
+        var isTileset, tileContent, tilePreprocessData;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              if (!(sourceTile.type === 'json')) {
-                _context3.next = 4;
+              isTileset = (0, _load3dTiles.isNestedTileset)(sourceTile);
+              if (!isTileset) {
+                _context3.next = 5;
                 break;
               }
-              _context3.next = 3;
+              _context3.next = 4;
               return (0, _load3dTiles.loadNestedTileset)(this.sourceTileset, sourceTile, this.loadOptions);
-            case 3:
-              return _context3.abrupt("return", null);
             case 4:
+              return _context3.abrupt("return", null);
+            case 5:
               if (sourceTile.id) {
                 console.log("[analyze]: ".concat(sourceTile.id));
               }
               tileContent = null;
-              _context3.prev = 6;
-              _context3.next = 9;
+              _context3.prev = 7;
+              _context3.next = 10;
               return (0, _load3dTiles.loadTile3DContent)(this.sourceTileset, sourceTile, _objectSpread(_objectSpread({}, this.loadOptions), {}, {
                 '3d-tiles': _objectSpread(_objectSpread({}, this.loadOptions['3d-tiles']), {}, {
                   loadGLTF: false
                 })
               }));
-            case 9:
+            case 10:
               tileContent = _context3.sent;
-              _context3.next = 15;
+              _context3.next = 16;
               break;
-            case 12:
-              _context3.prev = 12;
-              _context3.t0 = _context3["catch"](6);
+            case 13:
+              _context3.prev = 13;
+              _context3.t0 = _context3["catch"](7);
               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;
+            case 16:
+              _context3.next = 18;
               return (0, _preprocess3dTiles.analyzeTileContent)(tileContent);
-            case 17:
+            case 18:
               tilePreprocessData = _context3.sent;
               (0, _preprocess3dTiles.mergePreprocessData)(this.preprocessData, tilePreprocessData);
               return _context3.abrupt("return", null);
-            case 20:
+            case 21:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[6, 12]]);
+        }, _callee3, this, [[7, 13]]);
       }));
       function analyzeTile(_x2, _x3) {
         return _analyzeTile.apply(this, arguments);
@@ -588,26 +589,27 @@ var I3SConverter = function () {
     key: "convertTile",
     value: function () {
       var _convertTile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee7(sourceTile, traversalProps) {
-        var parentNodes, transform, transformationMatrix, parentNode, childNodes, newTraversalProps;
+        var isTileset, parentNodes, transform, transformationMatrix, parentNode, childNodes, newTraversalProps;
         return _regenerator.default.wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              if (!(sourceTile.type === 'json' || sourceTile.type === 'empty')) {
-                _context7.next = 6;
+              isTileset = (0, _load3dTiles.isNestedTileset)(sourceTile);
+              if (!(isTileset || sourceTile.type === 'empty')) {
+                _context7.next = 7;
                 break;
               }
-              if (!(sourceTile.type === 'json')) {
-                _context7.next = 5;
+              if (!isTileset) {
+                _context7.next = 6;
                 break;
               }
               if (sourceTile.id) {
                 console.log("[load]: ".concat(sourceTile.id));
               }
-              _context7.next = 5;
+              _context7.next = 6;
               return (0, _load3dTiles.loadNestedTileset)(this.sourceTileset, sourceTile, this.loadOptions);
-            case 5:
-              return _context7.abrupt("return", traversalProps);
             case 6:
+              return _context7.abrupt("return", traversalProps);
+            case 7:
               if (sourceTile.id) {
                 console.log("[convert]: ".concat(sourceTile.id));
               }
@@ -617,19 +619,19 @@ var I3SConverter = function () {
                 transformationMatrix = transformationMatrix.multiplyRight(sourceTile.transform);
               }
               parentNode = parentNodes[0];
-              _context7.next = 13;
+              _context7.next = 14;
               return this._createNode(parentNode, sourceTile, transformationMatrix);
-            case 13:
+            case 14:
               childNodes = _context7.sent;
-              _context7.next = 16;
+              _context7.next = 17;
               return parentNode.addChildren(childNodes);
-            case 16:
+            case 17:
               newTraversalProps = {
                 transform: transformationMatrix,
                 parentNodes: childNodes
               };
               return _context7.abrupt("return", newTraversalProps);
-            case 18:
+            case 19:
             case "end":
               return _context7.stop();
           }