@loaders.gl/tile-converter 3.2.0-alpha.2 → 3.2.0-alpha.3

package/dist/es5/converter-cli.js

@@ -0,0 +1,306 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+require("@loaders.gl/polyfills");
+
+var _path = require("path");
+
+var _tileConverter = require("@loaders.gl/tile-converter");
+
+var _depsInstaller = require("./deps-installer/deps-installer");
+
+var TILESET_TYPE = {
+  I3S: 'I3S',
+  _3DTILES: '3DTILES'
+};
+
+function main() {
+  return _main.apply(this, arguments);
+}
+
+function _main() {
+  _main = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee() {
+    var _process$argv, args, options, depthInstaller, validatedOptions;
+
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _process$argv = (0, _toArray2.default)(process.argv), args = _process$argv.slice(2);
+
+            if (args.length === 0) {
+              printHelp();
+            }
+
+            options = parseOptions(args);
+
+            if (!options.installDependencies) {
+              _context.next = 7;
+              break;
+            }
+
+            depthInstaller = new _depsInstaller.DepsInstaller();
+            depthInstaller.install('deps');
+            return _context.abrupt("return");
+
+          case 7:
+            validatedOptions = validateOptions(options);
+            _context.next = 10;
+            return convert(validatedOptions);
+
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _main.apply(this, arguments);
+}
+
+main().catch(function (error) {
+  console.log(error);
+  process.exit(1);
+});
+
+function printHelp() {
+  console.log('cli: converter 3dTiles to I3S or I3S to 3dTiles...');
+  console.log('--install-dependencies [Run the script for installing dependencies. Run this options separate from others. Now "*.pgm" file installation is implemented]');
+  console.log('--max-depth [Maximal depth of hierarchical tiles tree traversal, default: infinite]');
+  console.log('--name [Tileset name]');
+  console.log('--output [Output folder, default: "data" folder]');
+  console.log('--slpk [Generate slpk (Scene Layer Packages) I3S output file]');
+  console.log('--tileset [tileset.json file (3DTiles) / http://..../SceneServer/layers/0 resource (I3S)]');
+  console.log('--input-type [tileset input type: I3S or 3DTILES]');
+  console.log('--7zExe [location of 7z.exe archiver to create slpk on Windows, default: "C:\\Program Files\\7-Zip\\7z.exe"]');
+  console.log('--egm [location of Earth Gravity Model *.pgm file to convert heights from ellipsoidal to gravity-related format. A model file can be loaded from GeographicLib https://geographiclib.sourceforge.io/html/geoid.html], default: "./deps/egm2008-5.zip"');
+  console.log('--token [Token for Cesium ION tilesets authentication]');
+  console.log('--no-draco [Disable draco compression for geometry]');
+  console.log('--generate-textures [Enable KTX2 textures generation if only one of (JPG, PNG) texture is provided or generate JPG texture if only KTX2 is provided]');
+  console.log('--generate-bounding-volumes [Will generate obb and mbs bounding volumes from geometry]');
+  console.log('--validate [Enable validation]');
+  process.exit(0);
+}
+
+function convert(_x) {
+  return _convert.apply(this, arguments);
+}
+
+function _convert() {
+  _convert = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(options) {
+    var inputType, tiles3DConverter, converter;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            console.log("------------------------------------------------");
+            console.log("Starting conversion of ".concat(options.inputType));
+            console.log("------------------------------------------------");
+            inputType = options.inputType.toUpperCase();
+            _context2.t0 = inputType;
+            _context2.next = _context2.t0 === TILESET_TYPE.I3S ? 7 : _context2.t0 === TILESET_TYPE._3DTILES ? 10 : 14;
+            break;
+
+          case 7:
+            tiles3DConverter = new _tileConverter.Tiles3DConverter();
+            tiles3DConverter.convert({
+              inputUrl: options.tileset,
+              outputPath: options.output,
+              tilesetName: options.name,
+              maxDepth: options.maxDepth,
+              egmFilePath: options.egm
+            });
+            return _context2.abrupt("break", 15);
+
+          case 10:
+            converter = new _tileConverter.I3SConverter();
+            _context2.next = 13;
+            return converter.convert({
+              inputUrl: options.tileset,
+              outputPath: options.output,
+              tilesetName: options.name,
+              maxDepth: options.maxDepth,
+              slpk: options.slpk,
+              sevenZipExe: options.sevenZipExe,
+              egmFilePath: options.egm,
+              token: options.token,
+              draco: options.draco,
+              generateTextures: options.generateTextures,
+              generateBoundingVolumes: options.generateBoundingVolumes,
+              validate: options.validate
+            });
+
+          case 13:
+            return _context2.abrupt("break", 15);
+
+          case 14:
+            printHelp();
+
+          case 15:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _convert.apply(this, arguments);
+}
+
+function validateOptions(options) {
+  var mandatoryOptionsWithExceptions = {
+    name: function name() {
+      return console.log('Missed: --name [Tileset name]');
+    },
+    output: function output() {
+      return console.log('Missed: --output [Output path name]');
+    },
+    sevenZipExe: function sevenZipExe() {
+      return console.log('Missed: --7zExe [7z archiver executable path]');
+    },
+    egm: function egm() {
+      return console.log('Missed: --egm [*.pgm earth gravity model file path]');
+    },
+    tileset: function tileset() {
+      return console.log('Missed: --tileset [tileset.json file]');
+    },
+    inputType: function inputType() {
+      return console.log('Missed/Incorrect: --input-type [tileset input type: I3S or 3DTILES]');
+    }
+  };
+  var exceptions = [];
+
+  for (var mandatoryOption in mandatoryOptionsWithExceptions) {
+    var optionValue = options[mandatoryOption];
+    var isWrongInputType = Boolean(optionValue) && mandatoryOption === 'inputType' && !Object.values(TILESET_TYPE).includes(optionValue.toUpperCase());
+
+    if (!optionValue || isWrongInputType) {
+      exceptions.push(mandatoryOptionsWithExceptions[mandatoryOption]);
+    }
+  }
+
+  if (exceptions.length) {
+    exceptions.forEach(function (exeption) {
+      return exeption();
+    });
+    process.exit(0);
+  }
+
+  return options;
+}
+
+function parseOptions(args) {
+  var opts = {
+    output: 'data',
+    sevenZipExe: 'C:\\Program Files\\7-Zip\\7z.exe',
+    egm: (0, _path.join)(process.cwd(), 'deps', 'egm2008-5.pgm'),
+    draco: true,
+    installDependencies: false,
+    generateTextures: false,
+    generateBoundingVolumes: false,
+    validate: false,
+    slpk: false
+  };
+  args.forEach(function (arg, index) {
+    if (arg.indexOf('--') === 0) {
+      switch (arg) {
+        case '--input-type':
+          opts.inputType = getStringValue(index, args);
+          break;
+
+        case '--tileset':
+          opts.tileset = getStringValue(index, args);
+          break;
+
+        case '--name':
+          opts.name = getStringValue(index, args);
+          break;
+
+        case '--output':
+          opts.output = getStringValue(index, args);
+          break;
+
+        case '--max-depth':
+          opts.maxDepth = getIntegerValue(index, args);
+          break;
+
+        case '--slpk':
+          opts.slpk = true;
+          break;
+
+        case '--7zExe':
+          opts.sevenZipExe = getStringValue(index, args);
+          break;
+
+        case '--egm':
+          opts.egm = getStringValue(index, args);
+          break;
+
+        case '--token':
+          opts.token = getStringValue(index, args);
+          break;
+
+        case '--no-draco':
+          opts.draco = false;
+          break;
+
+        case '--validate':
+          opts.validate = true;
+          break;
+
+        case '--install-dependencies':
+          opts.installDependencies = true;
+          break;
+
+        case '--generate-textures':
+          opts.generateTextures = true;
+          break;
+
+        case '--generate-bounding-volumes':
+          opts.generateBoundingVolumes = true;
+          break;
+
+        case '--help':
+          printHelp();
+          break;
+
+        default:
+          console.warn("Unknown option ".concat(arg));
+          process.exit(0);
+      }
+    }
+  });
+  return opts;
+}
+
+function getStringValue(index, args) {
+  if (index + 1 >= args.length) {
+    return '';
+  }
+
+  var value = args[index + 1];
+
+  if (value.indexOf('--') === 0) {
+    return '';
+  }
+
+  return value;
+}
+
+function getIntegerValue(index, args) {
+  var stringValue = getStringValue(index, args);
+  var result = Number.parseInt(stringValue);
+
+  if (isFinite(result)) {
+    return result;
+  }
+
+  return NaN;
+}
+//# sourceMappingURL=converter-cli.js.map

package/dist/es5/converter-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/converter-cli.ts"],"names":["TILESET_TYPE","I3S","_3DTILES","main","process","argv","args","length","printHelp","options","parseOptions","installDependencies","depthInstaller","DepsInstaller","install","validatedOptions","validateOptions","convert","catch","error","console","log","exit","inputType","toUpperCase","tiles3DConverter","Tiles3DConverter","inputUrl","tileset","outputPath","output","tilesetName","name","maxDepth","egmFilePath","egm","converter","I3SConverter","slpk","sevenZipExe","token","draco","generateTextures","generateBoundingVolumes","validate","mandatoryOptionsWithExceptions","exceptions","mandatoryOption","optionValue","isWrongInputType","Boolean","Object","values","includes","push","forEach","exeption","opts","cwd","arg","index","indexOf","getStringValue","getIntegerValue","warn","value","stringValue","result","Number","parseInt","isFinite","NaN"],"mappings":"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","sourcesContent":["/* eslint-disable no-console */\nimport '@loaders.gl/polyfills';\nimport {join} from 'path';\nimport {I3SConverter, Tiles3DConverter} from '@loaders.gl/tile-converter';\nimport {DepsInstaller} from './deps-installer/deps-installer';\n\ntype TileConversionOptions = {\n  /** \"I3S\" - for I3S to 3DTiles conversion, \"3DTILES\" for 3DTiles to I3S conversion */\n  inputType?: string;\n  /** \"tileset.json\" file (3DTiles) / \"http://..../SceneServer/layers/0\" resource (I3S) */\n  tileset?: string;\n  /** Tileset name. This option is used for naming in resulting json resouces and for resulting path/*.slpk file naming */\n  name?: string;\n  /** Output folder. This folder will be created by converter if doesn't exist. It is relative to the converter path.\n   * Default: \"data\" folder */\n  output: string;\n  /** 3DTiles->I3S only. location of 7z.exe archiver to create slpk on Windows OS, default: \"C:\\Program Files\\7-Zip\\7z.exe\" */\n  sevenZipExe: string;\n  /** location of the Earth Gravity Model (*.pgm) file to convert heights from ellipsoidal to gravity-related format,\n   * default: \"./deps/egm2008-5.pgm\". A model file can be loaded from GeographicLib\n   * https://geographiclib.sourceforge.io/html/geoid.html */\n  egm: string;\n  /** 3DTile->I3S only. Token for Cesium ION tileset authentication. */\n  token?: string;\n  /** 3DTiles->I3S only. Enable draco compression for geometry. Default: true */\n  draco: boolean;\n  /** Run the script for installing dependencies. Run this options separate from others. Now \"*.pgm\" file installation is\n   * implemented */\n  installDependencies: boolean;\n  /** 3DTile->I3S only. Enable KTX2 textures generation if only one of (JPG, PNG) texture is provided or generate JPG texture\n   * if only KTX2 is provided */\n  generateTextures: boolean;\n  /** 3DTile->I3S only. Will generate obb and mbs bounding volumes from geometry */\n  generateBoundingVolumes: boolean;\n  /** Validate the dataset during conversion. Validation messages will be posted in the console output */\n  validate: boolean;\n  /** Maximal depth of the hierarchical tiles tree traversal, default: infinite */\n  maxDepth?: number;\n  /** 3DTiles->I3S only. Whether the converter generates *.slpk (Scene Layer Package) I3S output file */\n  slpk: boolean;\n};\n\n/* During validation we check that particular options are defined so they can't be undefined */\ntype ValidatedTileConversionOptions = TileConversionOptions & {\n  /** \"I3S\" - for I3S to 3DTiles conversion, \"3DTILES\" for 3DTiles to I3S conversion */\n  inputType: string;\n  /** \"tileset.json\" file (3DTiles) / \"http://..../SceneServer/layers/0\" resource (I3S) */\n  tileset: string;\n  /** Tileset name. This option is used for naming in resulting json resouces and for resulting path/*.slpk file naming */\n  name: string;\n};\n\nconst TILESET_TYPE = {\n  I3S: 'I3S',\n  _3DTILES: '3DTILES'\n};\n\n/**\n * CLI entry\n * @returns\n */\nasync function main() {\n  const [, , ...args] = process.argv;\n\n  if (args.length === 0) {\n    printHelp();\n  }\n\n  const options: TileConversionOptions = parseOptions(args);\n\n  if (options.installDependencies) {\n    const depthInstaller = new DepsInstaller();\n    depthInstaller.install('deps');\n    return;\n  }\n\n  const validatedOptions: ValidatedTileConversionOptions = validateOptions(options);\n\n  await convert(validatedOptions);\n}\n\nmain().catch((error) => {\n  console.log(error);\n  process.exit(1); // eslint-disable-line\n});\n\n/**\n * Output for `npx tile-converter --help`\n */\nfunction printHelp(): void {\n  console.log('cli: converter 3dTiles to I3S or I3S to 3dTiles...');\n  console.log(\n    '--install-dependencies [Run the script for installing dependencies. Run this options separate from others. Now \"*.pgm\" file installation is implemented]'\n  );\n  console.log(\n    '--max-depth [Maximal depth of hierarchical tiles tree traversal, default: infinite]'\n  );\n  console.log('--name [Tileset name]');\n  console.log('--output [Output folder, default: \"data\" folder]');\n  console.log('--slpk [Generate slpk (Scene Layer Packages) I3S output file]');\n  console.log(\n    '--tileset [tileset.json file (3DTiles) / http://..../SceneServer/layers/0 resource (I3S)]'\n  );\n  console.log('--input-type [tileset input type: I3S or 3DTILES]');\n  console.log(\n    '--7zExe [location of 7z.exe archiver to create slpk on Windows, default: \"C:\\\\Program Files\\\\7-Zip\\\\7z.exe\"]'\n  );\n  console.log(\n    '--egm [location of Earth Gravity Model *.pgm file to convert heights from ellipsoidal to gravity-related format. A model file can be loaded from GeographicLib https://geographiclib.sourceforge.io/html/geoid.html], default: \"./deps/egm2008-5.zip\"'\n  );\n  console.log('--token [Token for Cesium ION tilesets authentication]');\n  console.log('--no-draco [Disable draco compression for geometry]');\n  console.log(\n    '--generate-textures [Enable KTX2 textures generation if only one of (JPG, PNG) texture is provided or generate JPG texture if only KTX2 is provided]'\n  );\n  console.log(\n    '--generate-bounding-volumes [Will generate obb and mbs bounding volumes from geometry]'\n  );\n  console.log('--validate [Enable validation]');\n  process.exit(0); // eslint-disable-line\n}\n\n/**\n * Run conversion process\n * @param options validated tile-converter options\n */\nasync function convert(options: ValidatedTileConversionOptions) {\n  console.log(`------------------------------------------------`); // eslint-disable-line\n  console.log(`Starting conversion of ${options.inputType}`); // eslint-disable-line\n  console.log(`------------------------------------------------`); // eslint-disable-line\n  const inputType = options.inputType.toUpperCase();\n  switch (inputType) {\n    case TILESET_TYPE.I3S:\n      const tiles3DConverter = new Tiles3DConverter();\n      tiles3DConverter.convert({\n        inputUrl: options.tileset,\n        outputPath: options.output,\n        tilesetName: options.name,\n        maxDepth: options.maxDepth,\n        egmFilePath: options.egm\n      });\n      break;\n    case TILESET_TYPE._3DTILES:\n      const converter = new I3SConverter();\n      await converter.convert({\n        inputUrl: options.tileset,\n        outputPath: options.output,\n        tilesetName: options.name,\n        maxDepth: options.maxDepth,\n        slpk: options.slpk,\n        sevenZipExe: options.sevenZipExe,\n        egmFilePath: options.egm,\n        token: options.token,\n        draco: options.draco,\n        generateTextures: options.generateTextures,\n        generateBoundingVolumes: options.generateBoundingVolumes,\n        validate: options.validate\n      });\n      break;\n    default:\n      printHelp();\n  }\n}\n\n// OPTIONS\n/**\n * Validate input options of the CLI command\n * @param options - input options of the CLI command\n * @returns validated options\n */\nfunction validateOptions(options: TileConversionOptions): ValidatedTileConversionOptions {\n  const mandatoryOptionsWithExceptions: {\n    [key: string]: () => void;\n  } = {\n    name: () => console.log('Missed: --name [Tileset name]'),\n    output: () => console.log('Missed: --output [Output path name]'),\n    sevenZipExe: () => console.log('Missed: --7zExe [7z archiver executable path]'),\n    egm: () => console.log('Missed: --egm [*.pgm earth gravity model file path]'),\n    tileset: () => console.log('Missed: --tileset [tileset.json file]'),\n    inputType: () =>\n      console.log('Missed/Incorrect: --input-type [tileset input type: I3S or 3DTILES]')\n  };\n  const exceptions: (() => void)[] = [];\n  for (const mandatoryOption in mandatoryOptionsWithExceptions) {\n    const optionValue = options[mandatoryOption];\n    const isWrongInputType =\n      Boolean(optionValue) &&\n      mandatoryOption === 'inputType' &&\n      !Object.values(TILESET_TYPE).includes(optionValue.toUpperCase());\n\n    if (!optionValue || isWrongInputType) {\n      exceptions.push(mandatoryOptionsWithExceptions[mandatoryOption]);\n    }\n  }\n  if (exceptions.length) {\n    exceptions.forEach((exeption) => exeption());\n    process.exit(0); // eslint-disable-line\n  }\n  return <ValidatedTileConversionOptions>options;\n}\n\n/**\n * Parse option from the cli arguments array\n * @param args\n * @returns\n */\nfunction parseOptions(args: string[]): TileConversionOptions {\n  const opts: TileConversionOptions = {\n    output: 'data',\n    sevenZipExe: 'C:\\\\Program Files\\\\7-Zip\\\\7z.exe',\n    egm: join(process.cwd(), 'deps', 'egm2008-5.pgm'),\n    draco: true,\n    installDependencies: false,\n    generateTextures: false,\n    generateBoundingVolumes: false,\n    validate: false,\n    slpk: false\n  };\n\n  // eslint-disable-next-line complexity\n  args.forEach((arg, index) => {\n    if (arg.indexOf('--') === 0) {\n      switch (arg) {\n        case '--input-type':\n          opts.inputType = getStringValue(index, args);\n          break;\n        case '--tileset':\n          opts.tileset = getStringValue(index, args);\n          break;\n        case '--name':\n          opts.name = getStringValue(index, args);\n          break;\n        case '--output':\n          opts.output = getStringValue(index, args);\n          break;\n        case '--max-depth':\n          opts.maxDepth = getIntegerValue(index, args);\n          break;\n        case '--slpk':\n          opts.slpk = true;\n          break;\n        case '--7zExe':\n          opts.sevenZipExe = getStringValue(index, args);\n          break;\n        case '--egm':\n          opts.egm = getStringValue(index, args);\n          break;\n        case '--token':\n          opts.token = getStringValue(index, args);\n          break;\n        case '--no-draco':\n          opts.draco = false;\n          break;\n        case '--validate':\n          opts.validate = true;\n          break;\n        case '--install-dependencies':\n          opts.installDependencies = true;\n          break;\n        case '--generate-textures':\n          opts.generateTextures = true;\n          break;\n        case '--generate-bounding-volumes':\n          opts.generateBoundingVolumes = true;\n          break;\n        case '--help':\n          printHelp();\n          break;\n        default:\n          console.warn(`Unknown option ${arg}`);\n          process.exit(0); // eslint-disable-line\n      }\n    }\n  });\n  return opts;\n}\n\n/**\n * Get string option value from cli arguments\n * @param index - option's name index in the argument's array.\n *                The value of the option should be next to name of the option.\n * @param args - cli arguments array\n * @returns - string value of the option\n */\nfunction getStringValue(index: number, args: string[]): string {\n  if (index + 1 >= args.length) {\n    return '';\n  }\n  const value = args[index + 1];\n  if (value.indexOf('--') === 0) {\n    return '';\n  }\n  return value;\n}\n\n/**\n * Get integer option value from cli arguments\n * @param index - option's name index in the argument's array\n *                The value of the option should be next to name of the option.\n * @param args - cli arguments array\n * @returns - number value of the option\n */\nfunction getIntegerValue(index: number, args: string[]): number {\n  const stringValue: string = getStringValue(index, args);\n  const result: number = Number.parseInt(stringValue);\n  if (isFinite(result)) {\n    return result;\n  }\n  return NaN;\n}\n"],"file":"converter-cli.js"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/deps-installer/deps-installer.js"],"names":["PGM_LINK","DepsInstaller","path","console","log","ZipLoader","fileMap","depsPath","process","cwd","Uint8Array"],"mappings":";;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AAEA,IAAMA,QAAQ,GAAG,+EAAjB;;IAEaC,a;;;;;;;;+EACX;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAcC,gBAAAA,IAAd,2DAAqB,EAArB;AACEC,gBAAAA,OAAO,CAACC,GAAR,CAAY,iCAAZ;AADF;AAAA,uBAEwB,gBAAKJ,QAAL,EAAeK,cAAf,EAA0B,EAA1B,CAFxB;;AAAA;AAEQC,gBAAAA,OAFR;AAIMC,gBAAAA,QAJN,GAIiBC,OAAO,CAACC,GAAR,EAJjB;;AAKE,oBAAIP,IAAJ,EAAU;AACRK,kBAAAA,QAAQ,GAAG,gBAAKA,QAAL,EAAeL,IAAf,CAAX;AACD;;AAPH;AAAA,uBASQ,0BAAUK,QAAV,EAAoB,IAAIG,UAAJ,CAAeJ,OAAO,CAAC,sBAAD,CAAtB,CAApB,EAAqE,eAArE,CATR;;AAAA;AAWEH,gBAAAA,OAAO,CAACC,GAAR,CAAY,8CAAZ;;AAXF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,O","sourcesContent":["import {load} from '@loaders.gl/core';\nimport {ZipLoader} from '@loaders.gl/zip';\nimport {writeFile} from '../lib/utils/file-utils';\nimport {join} from 'path';\n\nconst PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';\n\nexport class DepsInstaller {\n  async install(path = '') {\n    console.log('Installing \"EGM2008-5\" model...'); // eslint-disable-line no-console\n    const fileMap = await load(PGM_LINK, ZipLoader, {});\n\n    let depsPath = process.cwd();\n    if (path) {\n      depsPath = join(depsPath, path);\n    }\n\n    await writeFile(depsPath, new Uint8Array(fileMap['geoids/egm2008-5.pgm']), 'egm2008-5.pgm');\n\n    console.log('All dependencies were installed succesfully.'); // eslint-disable-line no-console\n  }\n}\n"],"file":"deps-installer.js"}
+{"version":3,"sources":["../../../src/deps-installer/deps-installer.ts"],"names":["PGM_LINK","DepsInstaller","path","console","log","ZipLoader","fileMap","depsPath","process","cwd","Uint8Array"],"mappings":";;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AAEA,IAAMA,QAAQ,GAAG,+EAAjB;;IAQaC,a;;;;;;;;+EAKX;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAcC,gBAAAA,IAAd,2DAA6B,EAA7B;AACEC,gBAAAA,OAAO,CAACC,GAAR,CAAY,iCAAZ;AADF;AAAA,uBAEwB,gBAAKJ,QAAL,EAAeK,cAAf,EAA0B,EAA1B,CAFxB;;AAAA;AAEQC,gBAAAA,OAFR;AAIMC,gBAAAA,QAJN,GAIiBC,OAAO,CAACC,GAAR,EAJjB;;AAKE,oBAAIP,IAAJ,EAAU;AACRK,kBAAAA,QAAQ,GAAG,gBAAKA,QAAL,EAAeL,IAAf,CAAX;AACD;;AAPH;AAAA,uBASQ,0BAAUK,QAAV,EAAoB,IAAIG,UAAJ,CAAeJ,OAAO,CAAC,sBAAD,CAAtB,CAApB,EAAqE,eAArE,CATR;;AAAA;AAWEH,gBAAAA,OAAO,CAACC,GAAR,CAAY,8CAAZ;;AAXF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,O","sourcesContent":["import {load} from '@loaders.gl/core';\nimport {ZipLoader} from '@loaders.gl/zip';\nimport {writeFile} from '../lib/utils/file-utils';\nimport {join} from 'path';\n\nconst PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';\n\n/**\n * Install external dependencies for converter:\n * * PGM file (implemented);\n * * Draco library (not implemented);\n * * 7z archiver (not implemented);\n */\nexport class DepsInstaller {\n  /**\n   * Run instalation\n   * @param path destination folder\n   */\n  async install(path: string = ''): Promise<void> {\n    console.log('Installing \"EGM2008-5\" model...'); // eslint-disable-line no-console\n    const fileMap = await load(PGM_LINK, ZipLoader, {});\n\n    let depsPath = process.cwd();\n    if (path) {\n      depsPath = join(depsPath, path);\n    }\n\n    await writeFile(depsPath, new Uint8Array(fileMap['geoids/egm2008-5.pgm']), 'egm2008-5.pgm');\n\n    console.log('All dependencies were installed succesfully.'); // eslint-disable-line no-console\n  }\n}\n"],"file":"deps-installer.js"}

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

@@ -8,7 +8,7 @@ exports._typecheckI3SAttributesWorker = exports.I3SAttributesWorker = void 0;
 
 var _workerUtils = require("@loaders.gl/worker-utils");
 
-var VERSION = typeof "3.2.0-alpha.2" !== 'undefined' ? "3.2.0-alpha.2" : 'latest';
+var VERSION = typeof "3.2.0-alpha.3" !== 'undefined' ? "3.2.0-alpha.3" : 'latest';
 var I3SAttributesWorker = {
   id: 'i3s-attributes',
   name: 'I3S Attributes Worker',

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

@@ -402,6 +402,10 @@ function getCompositeTransformationMatrix(node, matrix) {
     transformationMatrix = matrix.multiplyRight(nodeMatrix);
   }
 
+  if (translation) {
+    transformationMatrix = transformationMatrix.translate(translation);
+  }
+
   if (rotation) {
     transformationMatrix = transformationMatrix.rotateXYZ(rotation);
   }
@@ -410,10 +414,6 @@ function getCompositeTransformationMatrix(node, matrix) {
     transformationMatrix = transformationMatrix.scale(scale);
   }
 
-  if (translation) {
-    transformationMatrix = transformationMatrix.translate(translation);
-  }
-
   return transformationMatrix;
 }