@loaders.gl/i3s 3.2.6 → 3.3.0-alpha.2

package/dist/es5/i3s-loader.js

@@ -21,7 +21,7 @@ var _parseI3s = require("./lib/parsers/parse-i3s");
 
 var _constants = require("./lib/parsers/constants");
 
-var VERSION = typeof "3.2.6" !== 'undefined' ? "3.2.6" : 'latest';
+var VERSION = typeof "3.3.0-alpha.2" !== 'undefined' ? "3.3.0-alpha.2" : 'latest';
 var TILESET_REGEX = /layers\/[0-9]+$/;
 var TILE_HEADER_REGEX = /nodes\/([0-9-]+|root)$/;
 var SLPK_HEX = '504b0304';
@@ -35,12 +35,13 @@ var I3SLoader = {
   extensions: ['bin'],
   options: {
     i3s: {
-      loadContent: true,
       token: null,
       isTileset: 'auto',
       isTileHeader: 'auto',
       tile: null,
       tileset: null,
+      _tileOptions: null,
+      _tilesetOptions: null,
       useDracoGeometry: true,
       useCompressedTextures: true,
       decodeTextures: true,
@@ -50,29 +51,37 @@ var I3SLoader = {
 };
 exports.I3SLoader = I3SLoader;
 
-function parseI3S(_x, _x2, _x3) {
+function parseI3S(_x) {
   return _parseI3S.apply(this, arguments);
 }
 
 function _parseI3S() {
-  _parseI3S = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(data, options, context) {
-    var url, magicNumber, isTileset, isTileHeader;
+  _parseI3S = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(data) {
+    var options,
+        context,
+        url,
+        magicNumber,
+        isTileset,
+        isTileHeader,
+        _args = arguments;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
+            options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+            context = _args.length > 2 ? _args[2] : undefined;
             url = context.url;
             options.i3s = options.i3s || {};
             magicNumber = getMagicNumber(data);
 
             if (!(magicNumber === SLPK_HEX)) {
-              _context.next = 5;
+              _context.next = 7;
               break;
             }
 
             throw new Error('Files with .slpk extention currently are not supported by I3SLoader');
 
-          case 5:
+          case 7:
             if (options.i3s.isTileset === 'auto') {
               isTileset = TILESET_REGEX.test(url);
             } else {
@@ -86,54 +95,43 @@ function _parseI3S() {
             }
 
             if (!isTileset) {
-              _context.next = 13;
+              _context.next = 15;
               break;
             }
 
-            _context.next = 10;
+            _context.next = 12;
             return parseTileset(data, options, context);
 
-          case 10:
+          case 12:
             data = _context.sent;
-            _context.next = 26;
+            _context.next = 24;
             break;
 
-          case 13:
+          case 15:
             if (!isTileHeader) {
-              _context.next = 23;
-              break;
-            }
-
-            _context.next = 16;
-            return parseTile(data, options, context);
-
-          case 16:
-            data = _context.sent;
-
-            if (!options.i3s.loadContent) {
               _context.next = 21;
               break;
             }
 
-            options.i3s.tile = data;
-            _context.next = 21;
-            return (0, _core.load)(data.contentUrl, I3SLoader, options);
+            _context.next = 18;
+            return parseTile(data, context);
 
-          case 21:
-            _context.next = 26;
+          case 18:
+            data = _context.sent;
+            _context.next = 24;
             break;
 
-          case 23:
-            _context.next = 25;
+          case 21:
+            _context.next = 23;
             return parseTileContent(data, options);
 
-          case 25:
+          case 23:
             data = _context.sent;
 
-          case 26:
+          case 24:
             return _context.abrupt("return", data);
 
-          case 27:
+          case 25:
           case "end":
             return _context.stop();
         }
@@ -143,7 +141,7 @@ function _parseI3S() {
   return _parseI3S.apply(this, arguments);
 }
 
-function parseTileContent(_x4, _x5) {
+function parseTileContent(_x2, _x3) {
   return _parseTileContent.apply(this, arguments);
 }
 
@@ -169,7 +167,7 @@ function _parseTileContent() {
   return _parseTileContent.apply(this, arguments);
 }
 
-function parseTileset(_x6, _x7, _x8) {
+function parseTileset(_x4, _x5, _x6) {
   return _parseTileset.apply(this, arguments);
 }
 
@@ -198,18 +196,18 @@ function _parseTileset() {
   return _parseTileset.apply(this, arguments);
 }
 
-function parseTile(_x9, _x10, _x11) {
+function parseTile(_x7, _x8) {
   return _parseTile.apply(this, arguments);
 }
 
 function _parseTile() {
-  _parseTile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee4(data, options, context) {
+  _parseTile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee4(data, context) {
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
             data = JSON.parse(new TextDecoder().decode(data));
-            return _context4.abrupt("return", (0, _parseI3s.normalizeTileData)(data, options, context));
+            return _context4.abrupt("return", (0, _parseI3s.normalizeTileData)(data, context));
 
           case 2:
           case "end":

package/dist/es5/i3s-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/i3s-loader.ts"],"names":["VERSION","TILESET_REGEX","TILE_HEADER_REGEX","SLPK_HEX","I3SLoader","name","id","module","version","mimeTypes","parse","parseI3S","extensions","options","i3s","loadContent","token","isTileset","isTileHeader","tile","tileset","useDracoGeometry","useCompressedTextures","decodeTextures","coordinateSystem","COORDINATE_SYSTEM","METER_OFFSETS","data","context","url","magicNumber","getMagicNumber","Error","test","parseTileset","parseTile","contentUrl","parseTileContent","arrayBuffer","I3SContentLoader","tilesetJson","JSON","TextDecoder","decode","loader","ArrayBuffer","Uint8Array","map","value","toString","padStart","join"],"mappings":"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","sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {load, parse} from '@loaders.gl/core';\nimport {I3SContentLoader} from './i3s-content-loader';\nimport {normalizeTileData, normalizeTilesetData} from './lib/parsers/parse-i3s';\nimport {COORDINATE_SYSTEM} from './lib/parsers/constants';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nconst TILESET_REGEX = /layers\\/[0-9]+$/;\nconst TILE_HEADER_REGEX = /nodes\\/([0-9-]+|root)$/;\nconst SLPK_HEX = '504b0304';\n\n/**\n * Loader for I3S - Indexed 3D Scene Layer\n */\nexport const I3SLoader: LoaderWithParser = {\n  name: 'I3S (Indexed Scene Layers)',\n  id: 'i3s',\n  module: 'i3s',\n  version: VERSION,\n  mimeTypes: ['application/octet-stream'],\n  parse: parseI3S,\n  extensions: ['bin'],\n  options: {\n    i3s: {\n      loadContent: true,\n      token: null,\n      isTileset: 'auto',\n      isTileHeader: 'auto',\n      tile: null,\n      tileset: null,\n      useDracoGeometry: true,\n      useCompressedTextures: true,\n      decodeTextures: true,\n      coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS\n    }\n  }\n};\n\nasync function parseI3S(data, options, context) {\n  const url = context.url;\n  options.i3s = options.i3s || {};\n  const magicNumber = getMagicNumber(data);\n\n  // check if file is slpk\n  if (magicNumber === SLPK_HEX) {\n    throw new Error('Files with .slpk extention currently are not supported by I3SLoader');\n  }\n\n  // auto detect file type based on url\n  let isTileset;\n  if (options.i3s.isTileset === 'auto') {\n    isTileset = TILESET_REGEX.test(url);\n  } else {\n    isTileset = options.i3s.isTileset;\n  }\n\n  let isTileHeader;\n  if (options.isTileHeader === 'auto') {\n    isTileHeader = TILE_HEADER_REGEX.test(url);\n  } else {\n    isTileHeader = options.i3s.isTileHeader;\n  }\n\n  if (isTileset) {\n    data = await parseTileset(data, options, context);\n  } else if (isTileHeader) {\n    data = await parseTile(data, options, context);\n    if (options.i3s.loadContent) {\n      options.i3s.tile = data;\n      await load(data.contentUrl, I3SLoader, options);\n    }\n  } else {\n    data = await parseTileContent(data, options);\n  }\n\n  return data;\n}\n\nasync function parseTileContent(arrayBuffer, options) {\n  return await parse(arrayBuffer, I3SContentLoader, options);\n}\n\nasync function parseTileset(data, options, context) {\n  const tilesetJson = JSON.parse(new TextDecoder().decode(data));\n  // eslint-disable-next-line no-use-before-define\n  tilesetJson.loader = I3SLoader;\n  await normalizeTilesetData(tilesetJson, options, context);\n\n  return tilesetJson;\n}\n\nasync function parseTile(data, options, context) {\n  data = JSON.parse(new TextDecoder().decode(data));\n  return normalizeTileData(data, options, context);\n}\n\nfunction getMagicNumber(data) {\n  if (data instanceof ArrayBuffer) {\n    // slice binary data (4 bytes from the beginning) and transform it to hexadecimal numeral system\n    return [...new Uint8Array(data, 0, 4)]\n      .map((value) => value.toString(16).padStart(2, '0'))\n      .join('');\n  }\n  return null;\n}\n"],"file":"i3s-loader.js"}
+{"version":3,"sources":["../../src/i3s-loader.ts"],"names":["VERSION","TILESET_REGEX","TILE_HEADER_REGEX","SLPK_HEX","I3SLoader","name","id","module","version","mimeTypes","parse","parseI3S","extensions","options","i3s","token","isTileset","isTileHeader","tile","tileset","_tileOptions","_tilesetOptions","useDracoGeometry","useCompressedTextures","decodeTextures","coordinateSystem","COORDINATE_SYSTEM","METER_OFFSETS","data","context","url","magicNumber","getMagicNumber","Error","test","parseTileset","parseTile","parseTileContent","arrayBuffer","I3SContentLoader","tilesetJson","JSON","TextDecoder","decode","loader","ArrayBuffer","Uint8Array","map","value","toString","padStart","join"],"mappings":"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","sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parse} from '@loaders.gl/core';\nimport {I3SContentLoader} from './i3s-content-loader';\nimport {normalizeTileData, normalizeTilesetData} from './lib/parsers/parse-i3s';\nimport {COORDINATE_SYSTEM} from './lib/parsers/constants';\nimport {I3SParseOptions} from './types';\nimport {LoaderOptions} from './../../loader-utils/src/types';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nconst TILESET_REGEX = /layers\\/[0-9]+$/;\nconst TILE_HEADER_REGEX = /nodes\\/([0-9-]+|root)$/;\nconst SLPK_HEX = '504b0304';\n\nexport type I3SLoaderOptions = LoaderOptions & {\n  i3s?: I3SParseOptions;\n};\n\n/**\n * Loader for I3S - Indexed 3D Scene Layer\n */\nexport const I3SLoader: LoaderWithParser = {\n  name: 'I3S (Indexed Scene Layers)',\n  id: 'i3s',\n  module: 'i3s',\n  version: VERSION,\n  mimeTypes: ['application/octet-stream'],\n  parse: parseI3S,\n  extensions: ['bin'],\n  options: {\n    i3s: {\n      token: null,\n      isTileset: 'auto',\n      isTileHeader: 'auto',\n      tile: null,\n      tileset: null,\n      _tileOptions: null,\n      _tilesetOptions: null,\n      useDracoGeometry: true,\n      useCompressedTextures: true,\n      decodeTextures: true,\n      coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS\n    }\n  }\n};\n\nasync function parseI3S(data, options: I3SLoaderOptions = {}, context) {\n  const url = context.url;\n  options.i3s = options.i3s || {};\n  const magicNumber = getMagicNumber(data);\n\n  // check if file is slpk\n  if (magicNumber === SLPK_HEX) {\n    throw new Error('Files with .slpk extention currently are not supported by I3SLoader');\n  }\n\n  // auto detect file type based on url\n  let isTileset;\n  if (options.i3s.isTileset === 'auto') {\n    isTileset = TILESET_REGEX.test(url);\n  } else {\n    isTileset = options.i3s.isTileset;\n  }\n\n  let isTileHeader;\n  if (options.isTileHeader === 'auto') {\n    isTileHeader = TILE_HEADER_REGEX.test(url);\n  } else {\n    isTileHeader = options.i3s.isTileHeader;\n  }\n\n  if (isTileset) {\n    data = await parseTileset(data, options, context);\n  } else if (isTileHeader) {\n    data = await parseTile(data, context);\n  } else {\n    data = await parseTileContent(data, options);\n  }\n\n  return data;\n}\n\nasync function parseTileContent(arrayBuffer, options: I3SLoaderOptions) {\n  return await parse(arrayBuffer, I3SContentLoader, options);\n}\n\nasync function parseTileset(data, options: I3SLoaderOptions, context) {\n  const tilesetJson = JSON.parse(new TextDecoder().decode(data));\n  // eslint-disable-next-line no-use-before-define\n  tilesetJson.loader = I3SLoader;\n  await normalizeTilesetData(tilesetJson, options, context);\n\n  return tilesetJson;\n}\n\nasync function parseTile(data, context) {\n  data = JSON.parse(new TextDecoder().decode(data));\n  return normalizeTileData(data, context);\n}\n\nfunction getMagicNumber(data) {\n  if (data instanceof ArrayBuffer) {\n    // slice binary data (4 bytes from the beginning) and transform it to hexadecimal numeral system\n    return [...new Uint8Array(data, 0, 4)]\n      .map((value) => value.toString(16).padStart(2, '0'))\n      .join('');\n  }\n  return null;\n}\n"],"file":"i3s-loader.js"}

package/dist/es5/i3s-node-page-loader.js

@@ -11,7 +11,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var VERSION = typeof "3.2.6" !== 'undefined' ? "3.2.6" : 'latest';
+var VERSION = typeof "3.3.0-alpha.2" !== 'undefined' ? "3.3.0-alpha.2" : 'latest';
 
 function parseNodePage(_x) {
   return _parseNodePage.apply(this, arguments);

package/dist/es5/i3s-node-page-loader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/i3s-node-page-loader.ts"],"names":["VERSION","parseNodePage","data","JSON","parse","TextDecoder","decode","I3SNodePageLoader","name","id","module","version","mimeTypes","extensions","options"],"mappings":";;;;;;;;;;;;;AAIA,IAAMA,OAAO,GAAG,mBAAuB,WAAvB,aAAmD,QAAnE;;SAEeC,a;;;;;6EAAf,iBAA6BC,IAA7B;AAAA;AAAA;AAAA;AAAA;AAAA,6CACSC,IAAI,CAACC,KAAL,CAAW,IAAIC,WAAJ,GAAkBC,MAAlB,CAAyBJ,IAAzB,CAAX,CADT;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G;;;;AAOO,IAAMK,iBAAmC,GAAG;AACjDC,EAAAA,IAAI,EAAE,eAD2C;AAEjDC,EAAAA,EAAE,EAAE,eAF6C;AAGjDC,EAAAA,MAAM,EAAE,KAHyC;AAIjDC,EAAAA,OAAO,EAAEX,OAJwC;AAKjDY,EAAAA,SAAS,EAAE,CAAC,kBAAD,CALsC;AAMjDR,EAAAA,KAAK,EAALA,KANiD;AAOjDS,EAAAA,UAAU,EAAE,CAAC,MAAD,CAPqC;AAQjDC,EAAAA,OAAO,EAAE;AARwC,CAA5C;;;SAWQV,K;;;;;qEAAf,kBAAqBF,IAArB;AAAA;AAAA;AAAA;AAAA;AACEA,YAAAA,IAAI,GAAGD,aAAa,CAACC,IAAD,CAApB;AADF,8CAESA,IAFT;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nasync function parseNodePage(data) {\n  return JSON.parse(new TextDecoder().decode(data));\n}\n\n/**\n * Loader for I3S node pages\n */\nexport const I3SNodePageLoader: LoaderWithParser = {\n  name: 'I3S Node Page',\n  id: 'i3s-node-page',\n  module: 'i3s',\n  version: VERSION,\n  mimeTypes: ['application/json'],\n  parse,\n  extensions: ['json'],\n  options: {}\n};\n\nasync function parse(data) {\n  data = parseNodePage(data);\n  return data;\n}\n"],"file":"i3s-node-page-loader.js"}
+{"version":3,"sources":["../../src/i3s-node-page-loader.ts"],"names":["VERSION","parseNodePage","data","JSON","parse","TextDecoder","decode","I3SNodePageLoader","name","id","module","version","mimeTypes","extensions","options"],"mappings":";;;;;;;;;;;;;AAIA,IAAMA,OAAO,GAAG,2BAAuB,WAAvB,qBAAmD,QAAnE;;SAEeC,a;;;;;6EAAf,iBAA6BC,IAA7B;AAAA;AAAA;AAAA;AAAA;AAAA,6CACSC,IAAI,CAACC,KAAL,CAAW,IAAIC,WAAJ,GAAkBC,MAAlB,CAAyBJ,IAAzB,CAAX,CADT;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G;;;;AAOO,IAAMK,iBAAmC,GAAG;AACjDC,EAAAA,IAAI,EAAE,eAD2C;AAEjDC,EAAAA,EAAE,EAAE,eAF6C;AAGjDC,EAAAA,MAAM,EAAE,KAHyC;AAIjDC,EAAAA,OAAO,EAAEX,OAJwC;AAKjDY,EAAAA,SAAS,EAAE,CAAC,kBAAD,CALsC;AAMjDR,EAAAA,KAAK,EAALA,KANiD;AAOjDS,EAAAA,UAAU,EAAE,CAAC,MAAD,CAPqC;AAQjDC,EAAAA,OAAO,EAAE;AARwC,CAA5C;;;SAWQV,K;;;;;qEAAf,kBAAqBF,IAArB;AAAA;AAAA;AAAA;AAAA;AACEA,YAAAA,IAAI,GAAGD,aAAa,CAACC,IAAD,CAApB;AADF,8CAESA,IAFT;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nasync function parseNodePage(data) {\n  return JSON.parse(new TextDecoder().decode(data));\n}\n\n/**\n * Loader for I3S node pages\n */\nexport const I3SNodePageLoader: LoaderWithParser = {\n  name: 'I3S Node Page',\n  id: 'i3s-node-page',\n  module: 'i3s',\n  version: VERSION,\n  mimeTypes: ['application/json'],\n  parse,\n  extensions: ['json'],\n  options: {}\n};\n\nasync function parse(data) {\n  data = parseNodePage(data);\n  return data;\n}\n"],"file":"i3s-node-page-loader.js"}

package/dist/es5/lib/parsers/parse-i3s-tile-content.js

@@ -62,95 +62,103 @@ function getLoaderForTextureFormat(textureFormat) {
 }
 
 var I3S_ATTRIBUTE_TYPE = 'i3s-attribute-type';
+var defaultContent = {
+  attributes: {},
+  indices: null,
+  featureIds: [],
+  vertexCount: 0,
+  modelMatrix: new _core2.Matrix4(),
+  coordinateSystem: 0,
+  byteLength: 0,
+  texture: null
+};
 
 function parseI3STileContent(_x, _x2, _x3, _x4, _x5) {
   return _parseI3STileContent.apply(this, arguments);
 }
 
 function _parseI3STileContent() {
-  _parseI3STileContent = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(arrayBuffer, tile, tileset, options, context) {
-    var _options$i3s, url, loader, response, _arrayBuffer, _options, texture;
+  _parseI3STileContent = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(arrayBuffer, tileOptions, tilesetOptions, options, context) {
+    var content, _options$i3s, url, loader, response, _arrayBuffer, _options, texture;
 
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            tile.content = tile.content || {};
-            tile.content.featureIds = tile.content.featureIds || null;
-            tile.content.attributes = {};
+            content = defaultContent;
 
-            if (!tile.textureUrl) {
-              _context.next = 37;
+            if (!tileOptions.textureUrl) {
+              _context.next = 35;
               break;
             }
 
-            url = (0, _urlUtils.getUrlWithToken)(tile.textureUrl, options === null || options === void 0 ? void 0 : (_options$i3s = options.i3s) === null || _options$i3s === void 0 ? void 0 : _options$i3s.token);
-            loader = getLoaderForTextureFormat(tile.textureFormat);
-            _context.next = 8;
+            url = (0, _urlUtils.getUrlWithToken)(tileOptions.textureUrl, options === null || options === void 0 ? void 0 : (_options$i3s = options.i3s) === null || _options$i3s === void 0 ? void 0 : _options$i3s.token);
+            loader = getLoaderForTextureFormat(tileOptions.textureFormat);
+            _context.next = 6;
             return fetch(url, options === null || options === void 0 ? void 0 : options.fetch);
 
-          case 8:
+          case 6:
             response = _context.sent;
-            _context.next = 11;
+            _context.next = 9;
             return response.arrayBuffer();
 
-          case 11:
+          case 9:
             _arrayBuffer = _context.sent;
 
             if (!(options !== null && options !== void 0 && options.i3s.decodeTextures)) {
-              _context.next = 36;
+              _context.next = 34;
               break;
             }
 
             if (!(loader === _images.ImageLoader)) {
-              _context.next = 28;
+              _context.next = 26;
               break;
             }
 
-            _options = _objectSpread(_objectSpread({}, tile.textureLoaderOptions), {}, {
+            _options = _objectSpread(_objectSpread({}, tileOptions.textureLoaderOptions), {}, {
               image: {
                 type: 'data'
               }
             });
-            _context.prev = 15;
-            _context.next = 18;
+            _context.prev = 13;
+            _context.next = 16;
             return context.parse(_arrayBuffer, _options);
 
-          case 18:
-            tile.content.texture = _context.sent;
-            _context.next = 26;
+          case 16:
+            content.texture = _context.sent;
+            _context.next = 24;
             break;
 
-          case 21:
-            _context.prev = 21;
-            _context.t0 = _context["catch"](15);
-            _context.next = 25;
+          case 19:
+            _context.prev = 19;
+            _context.t0 = _context["catch"](13);
+            _context.next = 23;
             return (0, _core.parse)(_arrayBuffer, loader, _options);
 
-          case 25:
-            tile.content.texture = _context.sent;
+          case 23:
+            content.texture = _context.sent;
 
-          case 26:
-            _context.next = 34;
+          case 24:
+            _context.next = 32;
             break;
 
-          case 28:
+          case 26:
             if (!(loader === _textures.CompressedTextureLoader || loader === _textures.BasisLoader)) {
-              _context.next = 34;
+              _context.next = 32;
               break;
             }
 
-            _context.next = 31;
-            return (0, _core.load)(_arrayBuffer, loader, tile.textureLoaderOptions);
+            _context.next = 29;
+            return (0, _core.load)(_arrayBuffer, loader, tileOptions.textureLoaderOptions);
 
-          case 31:
+          case 29:
             texture = _context.sent;
 
             if (loader === _textures.BasisLoader) {
               texture = texture[0];
             }
 
-            tile.content.texture = {
+            content.texture = {
               compressed: true,
               mipmaps: false,
               width: texture[0].width,
@@ -158,76 +166,67 @@ function _parseI3STileContent() {
               data: texture
             };
 
-          case 34:
-            _context.next = 37;
+          case 32:
+            _context.next = 35;
             break;
 
-          case 36:
-            tile.content.texture = _arrayBuffer;
+          case 34:
+            content.texture = _arrayBuffer;
 
-          case 37:
-            tile.content.material = makePbrMaterial(tile.materialDefinition, tile.content.texture);
+          case 35:
+            content.material = makePbrMaterial(tileOptions.materialDefinition, content.texture);
 
-            if (tile.content.material) {
-              tile.content.texture = null;
+            if (content.material) {
+              content.texture = null;
             }
 
-            _context.next = 41;
-            return parseI3SNodeGeometry(arrayBuffer, tile, tileset, options);
+            _context.next = 39;
+            return parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options);
 
-          case 41:
+          case 39:
             return _context.abrupt("return", _context.sent);
 
-          case 42:
+          case 40:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[15, 21]]);
+    }, _callee, null, [[13, 19]]);
   }));
   return _parseI3STileContent.apply(this, arguments);
 }
 
-function parseI3SNodeGeometry(_x6, _x7, _x8, _x9) {
+function parseI3SNodeGeometry(_x6, _x7, _x8, _x9, _x10) {
   return _parseI3SNodeGeometry.apply(this, arguments);
 }
 
 function _parseI3SNodeGeometry() {
-  _parseI3SNodeGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(arrayBuffer, tile, tileset, options) {
+  _parseI3SNodeGeometry = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(arrayBuffer, content, tileOptions, tilesetOptions, options) {
     var _options$i3s2;
 
-    var content, contentByteLength, attributes, vertexCount, byteOffset, featureCount, indices, _decompressedGeometry, decompressedGeometry, _decompressedGeometry2, POSITION, NORMAL, COLOR_0, TEXCOORD_0, featureIndex, uvRegion, featureIds, _tileset$store$defaul, vertexAttributes, attributesOrder, featureAttributes, featureAttributeOrder, headers, _normalizeAttributes, normalizedVertexAttributes, offset, _normalizeAttributes2, normalizedFeatureAttributes, enuMatrix, attributeIndex;
+    var contentByteLength, attributes, vertexCount, byteOffset, featureCount, indices, _decompressedGeometry, decompressedGeometry, _decompressedGeometry2, POSITION, NORMAL, COLOR_0, TEXCOORD_0, featureIndex, uvRegion, featureIds, _tilesetOptions$store, vertexAttributes, attributesOrder, featureAttributes, featureAttributeOrder, headers, _normalizeAttributes, normalizedVertexAttributes, offset, _normalizeAttributes2, normalizedFeatureAttributes, enuMatrix, attributeIndex;
 
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            if (tile.content) {
-              _context2.next = 2;
-              break;
-            }
-
-            return _context2.abrupt("return", tile);
-
-          case 2:
-            content = tile.content;
             contentByteLength = arrayBuffer.byteLength;
             byteOffset = 0;
             featureCount = 0;
 
-            if (!tile.isDracoGeometry) {
-              _context2.next = 19;
+            if (!tileOptions.isDracoGeometry) {
+              _context2.next = 16;
               break;
             }
 
-            _context2.next = 9;
+            _context2.next = 6;
             return (0, _core.parse)(arrayBuffer, _draco.DracoLoader, {
               draco: {
                 attributeNameEntry: I3S_ATTRIBUTE_TYPE
               }
             });
 
-          case 9:
+          case 6:
             decompressedGeometry = _context2.sent;
             vertexCount = decompressedGeometry.header.vertexCount;
             indices = (_decompressedGeometry = decompressedGeometry.indices) === null || _decompressedGeometry === void 0 ? void 0 : _decompressedGeometry.value;
@@ -247,12 +246,12 @@ function _parseI3SNodeGeometry() {
               flattenFeatureIdsByFeatureIndices(attributes, featureIds);
             }
 
-            _context2.next = 28;
+            _context2.next = 25;
             break;
 
-          case 19:
-            _tileset$store$defaul = tileset.store.defaultGeometrySchema, vertexAttributes = _tileset$store$defaul.vertexAttributes, attributesOrder = _tileset$store$defaul.ordering, featureAttributes = _tileset$store$defaul.featureAttributes, featureAttributeOrder = _tileset$store$defaul.featureAttributeOrder;
-            headers = parseHeaders(tileset, arrayBuffer);
+          case 16:
+            _tilesetOptions$store = tilesetOptions.store.defaultGeometrySchema, vertexAttributes = _tilesetOptions$store.vertexAttributes, attributesOrder = _tilesetOptions$store.ordering, featureAttributes = _tilesetOptions$store.featureAttributes, featureAttributeOrder = _tilesetOptions$store.featureAttributeOrder;
+            headers = parseHeaders(arrayBuffer, tilesetOptions);
             byteOffset = headers.byteOffset;
             vertexCount = headers.vertexCount;
             featureCount = headers.featureCount;
@@ -261,9 +260,9 @@ function _parseI3SNodeGeometry() {
             flattenFeatureIdsByFaceRanges(normalizedFeatureAttributes);
             attributes = concatAttributes(normalizedVertexAttributes, normalizedFeatureAttributes);
 
-          case 28:
+          case 25:
             if (!(options !== null && options !== void 0 && (_options$i3s2 = options.i3s) !== null && _options$i3s2 !== void 0 && _options$i3s2.coordinateSystem) || options.i3s.coordinateSystem === _constants.COORDINATE_SYSTEM.METER_OFFSETS) {
-              enuMatrix = parsePositions(attributes.position, tile);
+              enuMatrix = parsePositions(attributes.position, tileOptions);
               content.modelMatrix = enuMatrix.invert();
               content.coordinateSystem = _constants.COORDINATE_SYSTEM.METER_OFFSETS;
             } else {
@@ -281,7 +280,7 @@ function _parseI3SNodeGeometry() {
             content.indices = indices || null;
 
             if (attributes.id && attributes.id.value) {
-              tile.content.featureIds = attributes.id.value;
+              content.featureIds = attributes.id.value;
             }
 
             for (attributeIndex in content.attributes) {
@@ -292,9 +291,9 @@ function _parseI3SNodeGeometry() {
 
             content.vertexCount = vertexCount;
             content.byteLength = contentByteLength;
-            return _context2.abrupt("return", tile);
+            return _context2.abrupt("return", content);
 
-          case 36:
+          case 33:
           case "end":
             return _context2.stop();
         }
@@ -336,12 +335,12 @@ function normalizeAttribute(attribute) {
   return attribute;
 }
 
-function parseHeaders(tileset, arrayBuffer) {
+function parseHeaders(arrayBuffer, options) {
   var byteOffset = 0;
   var vertexCount = 0;
   var featureCount = 0;
 
-  var _iterator = _createForOfIteratorHelper(tileset.store.defaultGeometrySchema.header),
+  var _iterator = _createForOfIteratorHelper(options.store.defaultGeometrySchema.header),
       _step;
 
   try {
@@ -456,8 +455,8 @@ function parseUint64Values(buffer, elementsCount, attributeSize) {
   return new Uint32Array(values);
 }
 
-function parsePositions(attribute, tile) {
-  var mbs = tile.mbs;
+function parsePositions(attribute, options) {
+  var mbs = options.mbs;
   var value = attribute.value;
   var metadata = attribute.metadata;
   var enuMatrix = new _core2.Matrix4();