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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (56) hide show
  1. package/dist/3d-tiles-attributes-worker.js +1 -1
  2. package/dist/3d-tiles-converter/3d-tiles-converter.d.ts +1 -1
  3. package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map +1 -1
  4. package/dist/converter-cli.d.ts +2 -0
  5. package/dist/converter-cli.d.ts.map +1 -0
  6. package/dist/converter-cli.js +232 -0
  7. package/dist/converter.min.js +68 -68
  8. package/dist/deps-installer/deps-installer.d.ts +11 -1
  9. package/dist/deps-installer/deps-installer.d.ts.map +1 -1
  10. package/dist/deps-installer/deps-installer.js +10 -0
  11. package/dist/dist.min.js +95 -162
  12. package/dist/es5/3d-tiles-attributes-worker.js +1 -1
  13. package/dist/es5/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
  14. package/dist/es5/converter-cli.js +306 -0
  15. package/dist/es5/converter-cli.js.map +1 -0
  16. package/dist/es5/deps-installer/deps-installer.js.map +1 -1
  17. package/dist/es5/i3s-attributes-worker.js +1 -1
  18. package/dist/es5/i3s-converter/helpers/geometry-converter.js +4 -4
  19. package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
  20. package/dist/es5/i3s-converter/i3s-converter.js +64 -43
  21. package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
  22. package/dist/es5/index.js +0 -24
  23. package/dist/es5/index.js.map +1 -1
  24. package/dist/es5/pgm-loader.js +1 -1
  25. package/dist/esm/3d-tiles-attributes-worker.js +1 -1
  26. package/dist/esm/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
  27. package/dist/esm/converter-cli.js +230 -0
  28. package/dist/esm/converter-cli.js.map +1 -0
  29. package/dist/esm/deps-installer/deps-installer.js.map +1 -1
  30. package/dist/esm/i3s-attributes-worker.js +1 -1
  31. package/dist/esm/i3s-converter/helpers/geometry-converter.js +4 -4
  32. package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
  33. package/dist/esm/i3s-converter/i3s-converter.js +44 -26
  34. package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
  35. package/dist/esm/index.js +0 -3
  36. package/dist/esm/index.js.map +1 -1
  37. package/dist/esm/pgm-loader.js +1 -1
  38. package/dist/i3s-attributes-worker.js +1 -1
  39. package/dist/i3s-attributes-worker.js.map +2 -2
  40. package/dist/i3s-converter/helpers/geometry-converter.js +3 -3
  41. package/dist/i3s-converter/i3s-converter.d.ts +0 -2
  42. package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
  43. package/dist/i3s-converter/i3s-converter.js +34 -16
  44. package/dist/index.d.ts +0 -3
  45. package/dist/index.d.ts.map +1 -1
  46. package/dist/index.js +1 -7
  47. package/package.json +16 -17
  48. package/src/3d-tiles-converter/3d-tiles-converter.ts +1 -1
  49. package/src/converter-cli.ts +310 -0
  50. package/src/deps-installer/{deps-installer.js → deps-installer.ts} +11 -1
  51. package/src/i3s-converter/helpers/geometry-converter.ts +4 -4
  52. package/src/i3s-converter/i3s-converter.ts +37 -25
  53. package/src/index.ts +0 -5
  54. package/dist/es5/deps-installer/deps-installer.d.ts +0 -10
  55. package/dist/esm/deps-installer/deps-installer.d.ts +0 -10
  56. package/src/deps-installer/deps-installer.d.ts +0 -10
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":["join","process","transform","fetchFile","getLoaderOptions","load","I3SLoader","I3SAttributeLoader","COORDINATE_SYSTEM","Tileset3D","Tile3D","PGMLoader","i3sObbTo3dTilesObb","convertScreenThresholdToGeometricError","writeFile","removeDir","calculateFilesSize","timeConverter","TILESET","tilesetTemplate","B3dmConverter","createObbFromMbs","Tile3dAttributesWorker","getWorkerURL","WorkerFarm","I3S","Tiles3DConverter","constructor","options","tilesetPath","vertexCounter","conversionStartTime","geoidHeightModel","sourceTileset","attributeStorageInfo","workerSource","convert","inputUrl","outputPath","tilesetName","maxDepth","egmFilePath","hrtime","console","log","loadWorkers","sourceTilesetJson","loadOptions","i3s","coordinateSystem","LNGLAT_OFFSETS","decodeTextures","tilesetInitializationPromise","rootNode","root","header","obb","mbs","e","rootTile","boundingVolume","box","geometricError","children","_addChildren","tileset","JSON","stringify","_finishConversion","slpk","workerFarm","getWorkerFarm","destroy","parentSourceNode","parentNode","level","childNodeInfo","sourceChild","_loadChildNode","push","contentUrl","_loadTile","content","vertexCount","featureAttributes","_loadChildAttributes","child","i3sAttributesData","tileContent","textureFormat","b3dm","uri","id","Uint8Array","unloadContent","nodePages","nodePagesTile","formTileFromNodePages","loader","nodeUrl","_relativeUrlToFullUrl","url","href","isTileHeader","loadContent","baseUrl","relativeUrl","resultArray","split","relativeUrlArray","folder","slice","promises","attributeUrls","index","length","attribute","attributeName","name","attributeType","_getAttributeType","attributesList","Promise","all","_replaceNestedArrays","Object","assign","attributeValues","valueType","objectIds","attributeObject","key","Array","from","params","filesSize","diff","conversionTime","tile3dAttributesWorkerUrl","sourceResponse","source","text","tile3dWorkerSource"],"mappings":"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","sourcesContent":["import type {AttributeStorageInfo, FeatureAttribute, NodeReference} from '@loaders.gl/i3s';\nimport type {Node3D} from '@loaders.gl/3d-tiles';\n\nimport {join} from 'path';\nimport process from 'process';\nimport transform from 'json-map-transform';\nimport {fetchFile, getLoaderOptions, load} from '@loaders.gl/core';\nimport {I3SLoader, I3SAttributeLoader, COORDINATE_SYSTEM} from '@loaders.gl/i3s';\nimport {Tileset3D, Tile3D} from '@loaders.gl/tiles';\nimport {Geoid} from '@math.gl/geoid';\n\nimport {PGMLoader} from '../pgm-loader';\nimport {i3sObbTo3dTilesObb} from './helpers/i3s-obb-to-3d-tiles-obb';\nimport {convertScreenThresholdToGeometricError} from '../lib/utils/lod-conversion-utils';\nimport {writeFile, removeDir} from '../lib/utils/file-utils';\nimport {calculateFilesSize, timeConverter} from '../lib/utils/statistic-utills';\nimport {TILESET as tilesetTemplate} from './json-templates/tileset';\nimport B3dmConverter from './helpers/b3dm-converter';\nimport {createObbFromMbs} from '../i3s-converter/helpers/coordinate-converter';\nimport {\n I3SAttributesData,\n Tile3dAttributesWorker\n /*transform3DTilesAttributesOnWorker*/\n} from '../3d-tiles-attributes-worker';\nimport {getWorkerURL, WorkerFarm} from '@loaders.gl/worker-utils';\n\nconst I3S = 'I3S';\n\n/**\n * Converter from i3s to 3d-tiles\n */\nexport default class Tiles3DConverter {\n options: any;\n tilesetPath: string;\n vertexCounter: number;\n conversionStartTime: [number, number];\n geoidHeightModel: Geoid | null;\n sourceTileset: Tileset3D | null;\n attributeStorageInfo: AttributeStorageInfo | null;\n workerSource: {[key: string]: string} = {};\n\n constructor() {\n this.options = {};\n this.tilesetPath = '';\n this.vertexCounter = 0;\n this.conversionStartTime = [0, 0];\n this.geoidHeightModel = null;\n this.sourceTileset = null;\n this.attributeStorageInfo = null;\n this.workerSource = {};\n }\n\n /**\n * Convert i3s format data to 3dTiles\n * @param options\n * @param options.inputUrl the url to read the tileset from\n * @param options.outputPath the output filename\n * @param options.tilesetName the output name of the tileset\n * @param options.egmFilePath location of *.pgm file to convert heights from ellipsoidal to gravity-related format\n * @param options.maxDepth The max tree depth of conversion\n */\n public async convert(options: {\n inputUrl: string;\n outputPath: string;\n tilesetName: string;\n maxDepth: number;\n egmFilePath: string;\n }): Promise<any> {\n const {inputUrl, outputPath, tilesetName, maxDepth, egmFilePath} = options;\n this.conversionStartTime = process.hrtime();\n this.options = {maxDepth};\n\n console.log('Loading egm file...'); // eslint-disable-line\n this.geoidHeightModel = await load(egmFilePath, PGMLoader);\n console.log('Loading egm file completed!'); // eslint-disable-line\n\n await this.loadWorkers();\n\n const sourceTilesetJson = await load(inputUrl, I3SLoader, {});\n\n this.sourceTileset = new Tileset3D(sourceTilesetJson, {\n loadOptions: {\n i3s: {coordinateSystem: COORDINATE_SYSTEM.LNGLAT_OFFSETS, decodeTextures: false}\n }\n });\n\n await this.sourceTileset.tilesetInitializationPromise;\n const rootNode = this.sourceTileset.root!;\n if (!rootNode.header.obb) {\n rootNode.header.obb = createObbFromMbs(rootNode.header.mbs);\n }\n\n this.tilesetPath = join(`${outputPath}`, `${tilesetName}`);\n this.attributeStorageInfo = sourceTilesetJson.attributeStorageInfo;\n // Removing the tilesetPath needed to exclude erroneous files after conversion\n try {\n await removeDir(this.tilesetPath);\n } catch (e) {\n // do nothing\n }\n\n const rootTile: Node3D = {\n boundingVolume: {\n box: i3sObbTo3dTilesObb(rootNode.header.obb, this.geoidHeightModel)\n },\n geometricError: convertScreenThresholdToGeometricError(rootNode),\n children: []\n };\n\n await this._addChildren(rootNode, rootTile, 1);\n\n const tileset = transform({root: rootTile}, tilesetTemplate());\n await writeFile(this.tilesetPath, JSON.stringify(tileset), 'tileset.json');\n\n this._finishConversion({slpk: false, outputPath, tilesetName});\n\n // Clean up worker pools\n const workerFarm = WorkerFarm.getWorkerFarm({});\n workerFarm.destroy();\n }\n\n /**\n * The recursive function of traversal of a nodes tree\n * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)\n * @param parentNode object in resulting tileset\n * @param level a current level of a tree depth\n */\n private async _addChildren(\n parentSourceNode: Tile3D,\n parentNode: Node3D,\n level: number\n ): Promise<void> {\n if (this.options.maxDepth && level > this.options.maxDepth) {\n return;\n }\n for (const childNodeInfo of parentSourceNode.header.children || []) {\n const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);\n parentSourceNode.children.push(sourceChild);\n if (sourceChild.contentUrl) {\n await this.sourceTileset!._loadTile(sourceChild);\n this.vertexCounter += sourceChild.content.vertexCount;\n\n let featureAttributes: FeatureAttribute | null = null;\n if (this.attributeStorageInfo) {\n featureAttributes = await this._loadChildAttributes(\n sourceChild,\n this.attributeStorageInfo\n );\n }\n\n if (!sourceChild.header.obb) {\n sourceChild.header.obb = createObbFromMbs(sourceChild.header.mbs);\n }\n\n const boundingVolume = {\n box: i3sObbTo3dTilesObb(sourceChild.header.obb, this.geoidHeightModel)\n };\n const child: Node3D = {\n boundingVolume,\n geometricError: convertScreenThresholdToGeometricError(sourceChild),\n children: []\n };\n\n const i3sAttributesData: I3SAttributesData = {\n tileContent: sourceChild.content,\n textureFormat: sourceChild?.header?.textureFormat\n };\n\n // TODO Uncomment when 3d-tiles-attributes-worker will be published on CDN.\n // const b3dm = await transform3DTilesAttributesOnWorker(i3sAttributesData, {\n // source: this.workerSource.tile3dWorkerSource,\n // featureAttributes\n // });\n\n const b3dm = await new B3dmConverter().convert(i3sAttributesData, featureAttributes);\n\n child.content = {\n uri: `${sourceChild.id}.b3dm`,\n boundingVolume\n };\n await writeFile(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);\n parentNode.children.push(child);\n\n sourceChild.unloadContent();\n await this._addChildren(sourceChild, child, level + 1);\n } else {\n await this._addChildren(sourceChild, parentNode, level + 1);\n }\n }\n }\n\n /**\n * Load a child node having information from the node header\n * @param parentNode a parent node tile object (@loaders.gl/tiles/Tile3D)\n * @param childNodeInfo child information from 3DNodeIndexDocument\n * (https://github.com/Esri/i3s-spec/blob/master/docs/1.7/nodeReference.cmn.md)\n */\n private async _loadChildNode(parentNode: Tile3D, childNodeInfo: NodeReference): Promise<Tile3D> {\n let header;\n if (this.sourceTileset!.tileset.nodePages) {\n console.log(`Node conversion: ${childNodeInfo.id}`); // eslint-disable-line no-console,no-undef\n header = await this.sourceTileset!.tileset.nodePagesTile.formTileFromNodePages(\n childNodeInfo.id\n );\n } else {\n const {loader} = this.sourceTileset!;\n const nodeUrl = this._relativeUrlToFullUrl(parentNode.url, childNodeInfo.href!);\n // load metadata\n const options = {\n i3s: {\n ...this.sourceTileset!.loadOptions,\n isTileHeader: true,\n loadContent: false\n }\n };\n\n console.log(`Node conversion: ${nodeUrl}`); // eslint-disable-line no-console,no-undef\n header = await load(nodeUrl, loader, options);\n }\n return new Tile3D(this.sourceTileset!, header, parentNode);\n }\n\n /**\n * Make an url of a resource from its relative url having the base url\n * @param baseUrl the base url. A resulting url will be related from this url\n * @param relativeUrl a realtive url of a resource\n */\n private _relativeUrlToFullUrl(baseUrl: string, relativeUrl: string): string {\n let resultArray = baseUrl.split('/');\n const relativeUrlArray = relativeUrl.split('/');\n for (const folder of relativeUrlArray) {\n switch (folder) {\n case '.':\n continue; // eslint-disable-line no-continue\n case '..':\n resultArray = resultArray.slice(0, -1);\n break;\n default:\n resultArray.push(folder);\n }\n }\n return resultArray.join('/');\n }\n\n /**\n * Do loading all attributes related to particular node.\n * @param sourceChild\n * @param attributeStorageInfo\n * @returns Promise of attributes object.\n */\n private async _loadChildAttributes(\n sourceChild: Tile3D,\n attributeStorageInfo: AttributeStorageInfo\n ): Promise<FeatureAttribute> {\n const promises: any[] = [];\n const {attributeUrls} = sourceChild.header;\n\n for (let index = 0; index < attributeUrls.length; index++) {\n const inputUrl = attributeUrls[index];\n const attribute = attributeStorageInfo[index];\n const options = {\n attributeName: attribute.name,\n attributeType: this._getAttributeType(attribute)\n };\n\n promises.push(load(inputUrl, I3SAttributeLoader, options));\n }\n const attributesList = await Promise.all(promises);\n this._replaceNestedArrays(attributesList);\n return Object.assign({}, ...attributesList);\n }\n\n /**\n * Returns attribute type for loading attributes\n * @param attribute\n * Workaround for I3S v1.6. There is no attribute.attributeValues.valueType field in attribute.\n * There is an 'Oid32' type if attribute has objectIds property.\n * Doc: https://github.com/Esri/i3s-spec/blob/master/docs/1.6/attributeStorageInfo.cmn.md\n */\n private _getAttributeType(attribute: AttributeStorageInfo): string {\n if (attribute.attributeValues) {\n return attribute.attributeValues.valueType;\n } else if (attribute.objectIds) {\n return 'Oid32';\n }\n return '';\n }\n\n /**\n * Make simple arrays from attribute typed arrays.\n * @param attributesList\n */\n private _replaceNestedArrays(attributesList: FeatureAttribute[]): void {\n for (let index = 0; index < attributesList.length; index++) {\n const attributeObject = attributesList[index];\n\n for (const key in attributeObject) {\n attributeObject[key] = Array.from(attributeObject[key]);\n }\n }\n }\n\n /**\n * Print statistics in the end of conversion\n * @param params - output files data\n */\n private async _finishConversion(params: {\n slpk: boolean;\n outputPath: string;\n tilesetName: string;\n }): Promise<void> {\n const filesSize = await calculateFilesSize(params);\n const diff = process.hrtime(this.conversionStartTime);\n const conversionTime = timeConverter(diff);\n\n console.log(`------------------------------------------------`); // eslint-disable-line\n console.log(`Finish conversion of ${I3S}`); // eslint-disable-line\n console.log(`Total conversion time: ${conversionTime}`); // eslint-disable-line\n console.log(`Vertex count: `, this.vertexCounter); // eslint-disable-line\n console.log(`File(s) size: `, filesSize, ' bytes'); // eslint-disable-line\n console.log(`------------------------------------------------`); // eslint-disable-line\n }\n\n private async loadWorkers(): Promise<void> {\n console.log(`Loading workers source...`); // eslint-disable-line no-undef, no-console\n const tile3dAttributesWorkerUrl = getWorkerURL(Tile3dAttributesWorker, {...getLoaderOptions()});\n const sourceResponse = await fetchFile(tile3dAttributesWorkerUrl);\n const source = await sourceResponse.text();\n\n this.workerSource.tile3dWorkerSource = source;\n console.log(`Loading workers source completed!`); // eslint-disable-line no-undef, no-console\n }\n}\n"],"file":"3d-tiles-converter.js"}
1
+ {"version":3,"sources":["../../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":["join","process","transform","fetchFile","getLoaderOptions","load","I3SLoader","I3SAttributeLoader","COORDINATE_SYSTEM","Tileset3D","Tile3D","PGMLoader","i3sObbTo3dTilesObb","convertScreenThresholdToGeometricError","writeFile","removeDir","calculateFilesSize","timeConverter","TILESET","tilesetTemplate","B3dmConverter","createObbFromMbs","Tile3dAttributesWorker","getWorkerURL","WorkerFarm","I3S","Tiles3DConverter","constructor","options","tilesetPath","vertexCounter","conversionStartTime","geoidHeightModel","sourceTileset","attributeStorageInfo","workerSource","convert","inputUrl","outputPath","tilesetName","maxDepth","egmFilePath","hrtime","console","log","loadWorkers","sourceTilesetJson","loadOptions","i3s","coordinateSystem","LNGLAT_OFFSETS","decodeTextures","tilesetInitializationPromise","rootNode","root","header","obb","mbs","e","rootTile","boundingVolume","box","geometricError","children","_addChildren","tileset","JSON","stringify","_finishConversion","slpk","workerFarm","getWorkerFarm","destroy","parentSourceNode","parentNode","level","childNodeInfo","sourceChild","_loadChildNode","push","contentUrl","_loadTile","content","vertexCount","featureAttributes","_loadChildAttributes","child","i3sAttributesData","tileContent","textureFormat","b3dm","uri","id","Uint8Array","unloadContent","nodePages","nodePagesTile","formTileFromNodePages","loader","nodeUrl","_relativeUrlToFullUrl","url","href","isTileHeader","loadContent","baseUrl","relativeUrl","resultArray","split","relativeUrlArray","folder","slice","promises","attributeUrls","index","length","attribute","attributeName","name","attributeType","_getAttributeType","attributesList","Promise","all","_replaceNestedArrays","Object","assign","attributeValues","valueType","objectIds","attributeObject","key","Array","from","params","filesSize","diff","conversionTime","tile3dAttributesWorkerUrl","sourceResponse","source","text","tile3dWorkerSource"],"mappings":"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","sourcesContent":["import type {AttributeStorageInfo, FeatureAttribute, NodeReference} from '@loaders.gl/i3s';\nimport type {Node3D} from '@loaders.gl/3d-tiles';\n\nimport {join} from 'path';\nimport process from 'process';\nimport transform from 'json-map-transform';\nimport {fetchFile, getLoaderOptions, load} from '@loaders.gl/core';\nimport {I3SLoader, I3SAttributeLoader, COORDINATE_SYSTEM} from '@loaders.gl/i3s';\nimport {Tileset3D, Tile3D} from '@loaders.gl/tiles';\nimport {Geoid} from '@math.gl/geoid';\n\nimport {PGMLoader} from '../pgm-loader';\nimport {i3sObbTo3dTilesObb} from './helpers/i3s-obb-to-3d-tiles-obb';\nimport {convertScreenThresholdToGeometricError} from '../lib/utils/lod-conversion-utils';\nimport {writeFile, removeDir} from '../lib/utils/file-utils';\nimport {calculateFilesSize, timeConverter} from '../lib/utils/statistic-utills';\nimport {TILESET as tilesetTemplate} from './json-templates/tileset';\nimport B3dmConverter from './helpers/b3dm-converter';\nimport {createObbFromMbs} from '../i3s-converter/helpers/coordinate-converter';\nimport {\n I3SAttributesData,\n Tile3dAttributesWorker\n /*transform3DTilesAttributesOnWorker*/\n} from '../3d-tiles-attributes-worker';\nimport {getWorkerURL, WorkerFarm} from '@loaders.gl/worker-utils';\n\nconst I3S = 'I3S';\n\n/**\n * Converter from i3s to 3d-tiles\n */\nexport default class Tiles3DConverter {\n options: any;\n tilesetPath: string;\n vertexCounter: number;\n conversionStartTime: [number, number];\n geoidHeightModel: Geoid | null;\n sourceTileset: Tileset3D | null;\n attributeStorageInfo: AttributeStorageInfo | null;\n workerSource: {[key: string]: string} = {};\n\n constructor() {\n this.options = {};\n this.tilesetPath = '';\n this.vertexCounter = 0;\n this.conversionStartTime = [0, 0];\n this.geoidHeightModel = null;\n this.sourceTileset = null;\n this.attributeStorageInfo = null;\n this.workerSource = {};\n }\n\n /**\n * Convert i3s format data to 3dTiles\n * @param options\n * @param options.inputUrl the url to read the tileset from\n * @param options.outputPath the output filename\n * @param options.tilesetName the output name of the tileset\n * @param options.egmFilePath location of *.pgm file to convert heights from ellipsoidal to gravity-related format\n * @param options.maxDepth The max tree depth of conversion\n */\n public async convert(options: {\n inputUrl: string;\n outputPath: string;\n tilesetName: string;\n maxDepth?: number;\n egmFilePath: string;\n }): Promise<any> {\n const {inputUrl, outputPath, tilesetName, maxDepth, egmFilePath} = options;\n this.conversionStartTime = process.hrtime();\n this.options = {maxDepth};\n\n console.log('Loading egm file...'); // eslint-disable-line\n this.geoidHeightModel = await load(egmFilePath, PGMLoader);\n console.log('Loading egm file completed!'); // eslint-disable-line\n\n await this.loadWorkers();\n\n const sourceTilesetJson = await load(inputUrl, I3SLoader, {});\n\n this.sourceTileset = new Tileset3D(sourceTilesetJson, {\n loadOptions: {\n i3s: {coordinateSystem: COORDINATE_SYSTEM.LNGLAT_OFFSETS, decodeTextures: false}\n }\n });\n\n await this.sourceTileset.tilesetInitializationPromise;\n const rootNode = this.sourceTileset.root!;\n if (!rootNode.header.obb) {\n rootNode.header.obb = createObbFromMbs(rootNode.header.mbs);\n }\n\n this.tilesetPath = join(`${outputPath}`, `${tilesetName}`);\n this.attributeStorageInfo = sourceTilesetJson.attributeStorageInfo;\n // Removing the tilesetPath needed to exclude erroneous files after conversion\n try {\n await removeDir(this.tilesetPath);\n } catch (e) {\n // do nothing\n }\n\n const rootTile: Node3D = {\n boundingVolume: {\n box: i3sObbTo3dTilesObb(rootNode.header.obb, this.geoidHeightModel)\n },\n geometricError: convertScreenThresholdToGeometricError(rootNode),\n children: []\n };\n\n await this._addChildren(rootNode, rootTile, 1);\n\n const tileset = transform({root: rootTile}, tilesetTemplate());\n await writeFile(this.tilesetPath, JSON.stringify(tileset), 'tileset.json');\n\n this._finishConversion({slpk: false, outputPath, tilesetName});\n\n // Clean up worker pools\n const workerFarm = WorkerFarm.getWorkerFarm({});\n workerFarm.destroy();\n }\n\n /**\n * The recursive function of traversal of a nodes tree\n * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)\n * @param parentNode object in resulting tileset\n * @param level a current level of a tree depth\n */\n private async _addChildren(\n parentSourceNode: Tile3D,\n parentNode: Node3D,\n level: number\n ): Promise<void> {\n if (this.options.maxDepth && level > this.options.maxDepth) {\n return;\n }\n for (const childNodeInfo of parentSourceNode.header.children || []) {\n const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);\n parentSourceNode.children.push(sourceChild);\n if (sourceChild.contentUrl) {\n await this.sourceTileset!._loadTile(sourceChild);\n this.vertexCounter += sourceChild.content.vertexCount;\n\n let featureAttributes: FeatureAttribute | null = null;\n if (this.attributeStorageInfo) {\n featureAttributes = await this._loadChildAttributes(\n sourceChild,\n this.attributeStorageInfo\n );\n }\n\n if (!sourceChild.header.obb) {\n sourceChild.header.obb = createObbFromMbs(sourceChild.header.mbs);\n }\n\n const boundingVolume = {\n box: i3sObbTo3dTilesObb(sourceChild.header.obb, this.geoidHeightModel)\n };\n const child: Node3D = {\n boundingVolume,\n geometricError: convertScreenThresholdToGeometricError(sourceChild),\n children: []\n };\n\n const i3sAttributesData: I3SAttributesData = {\n tileContent: sourceChild.content,\n textureFormat: sourceChild?.header?.textureFormat\n };\n\n // TODO Uncomment when 3d-tiles-attributes-worker will be published on CDN.\n // const b3dm = await transform3DTilesAttributesOnWorker(i3sAttributesData, {\n // source: this.workerSource.tile3dWorkerSource,\n // featureAttributes\n // });\n\n const b3dm = await new B3dmConverter().convert(i3sAttributesData, featureAttributes);\n\n child.content = {\n uri: `${sourceChild.id}.b3dm`,\n boundingVolume\n };\n await writeFile(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);\n parentNode.children.push(child);\n\n sourceChild.unloadContent();\n await this._addChildren(sourceChild, child, level + 1);\n } else {\n await this._addChildren(sourceChild, parentNode, level + 1);\n }\n }\n }\n\n /**\n * Load a child node having information from the node header\n * @param parentNode a parent node tile object (@loaders.gl/tiles/Tile3D)\n * @param childNodeInfo child information from 3DNodeIndexDocument\n * (https://github.com/Esri/i3s-spec/blob/master/docs/1.7/nodeReference.cmn.md)\n */\n private async _loadChildNode(parentNode: Tile3D, childNodeInfo: NodeReference): Promise<Tile3D> {\n let header;\n if (this.sourceTileset!.tileset.nodePages) {\n console.log(`Node conversion: ${childNodeInfo.id}`); // eslint-disable-line no-console,no-undef\n header = await this.sourceTileset!.tileset.nodePagesTile.formTileFromNodePages(\n childNodeInfo.id\n );\n } else {\n const {loader} = this.sourceTileset!;\n const nodeUrl = this._relativeUrlToFullUrl(parentNode.url, childNodeInfo.href!);\n // load metadata\n const options = {\n i3s: {\n ...this.sourceTileset!.loadOptions,\n isTileHeader: true,\n loadContent: false\n }\n };\n\n console.log(`Node conversion: ${nodeUrl}`); // eslint-disable-line no-console,no-undef\n header = await load(nodeUrl, loader, options);\n }\n return new Tile3D(this.sourceTileset!, header, parentNode);\n }\n\n /**\n * Make an url of a resource from its relative url having the base url\n * @param baseUrl the base url. A resulting url will be related from this url\n * @param relativeUrl a realtive url of a resource\n */\n private _relativeUrlToFullUrl(baseUrl: string, relativeUrl: string): string {\n let resultArray = baseUrl.split('/');\n const relativeUrlArray = relativeUrl.split('/');\n for (const folder of relativeUrlArray) {\n switch (folder) {\n case '.':\n continue; // eslint-disable-line no-continue\n case '..':\n resultArray = resultArray.slice(0, -1);\n break;\n default:\n resultArray.push(folder);\n }\n }\n return resultArray.join('/');\n }\n\n /**\n * Do loading all attributes related to particular node.\n * @param sourceChild\n * @param attributeStorageInfo\n * @returns Promise of attributes object.\n */\n private async _loadChildAttributes(\n sourceChild: Tile3D,\n attributeStorageInfo: AttributeStorageInfo\n ): Promise<FeatureAttribute> {\n const promises: any[] = [];\n const {attributeUrls} = sourceChild.header;\n\n for (let index = 0; index < attributeUrls.length; index++) {\n const inputUrl = attributeUrls[index];\n const attribute = attributeStorageInfo[index];\n const options = {\n attributeName: attribute.name,\n attributeType: this._getAttributeType(attribute)\n };\n\n promises.push(load(inputUrl, I3SAttributeLoader, options));\n }\n const attributesList = await Promise.all(promises);\n this._replaceNestedArrays(attributesList);\n return Object.assign({}, ...attributesList);\n }\n\n /**\n * Returns attribute type for loading attributes\n * @param attribute\n * Workaround for I3S v1.6. There is no attribute.attributeValues.valueType field in attribute.\n * There is an 'Oid32' type if attribute has objectIds property.\n * Doc: https://github.com/Esri/i3s-spec/blob/master/docs/1.6/attributeStorageInfo.cmn.md\n */\n private _getAttributeType(attribute: AttributeStorageInfo): string {\n if (attribute.attributeValues) {\n return attribute.attributeValues.valueType;\n } else if (attribute.objectIds) {\n return 'Oid32';\n }\n return '';\n }\n\n /**\n * Make simple arrays from attribute typed arrays.\n * @param attributesList\n */\n private _replaceNestedArrays(attributesList: FeatureAttribute[]): void {\n for (let index = 0; index < attributesList.length; index++) {\n const attributeObject = attributesList[index];\n\n for (const key in attributeObject) {\n attributeObject[key] = Array.from(attributeObject[key]);\n }\n }\n }\n\n /**\n * Print statistics in the end of conversion\n * @param params - output files data\n */\n private async _finishConversion(params: {\n slpk: boolean;\n outputPath: string;\n tilesetName: string;\n }): Promise<void> {\n const filesSize = await calculateFilesSize(params);\n const diff = process.hrtime(this.conversionStartTime);\n const conversionTime = timeConverter(diff);\n\n console.log(`------------------------------------------------`); // eslint-disable-line\n console.log(`Finish conversion of ${I3S}`); // eslint-disable-line\n console.log(`Total conversion time: ${conversionTime}`); // eslint-disable-line\n console.log(`Vertex count: `, this.vertexCounter); // eslint-disable-line\n console.log(`File(s) size: `, filesSize, ' bytes'); // eslint-disable-line\n console.log(`------------------------------------------------`); // eslint-disable-line\n }\n\n private async loadWorkers(): Promise<void> {\n console.log(`Loading workers source...`); // eslint-disable-line no-undef, no-console\n const tile3dAttributesWorkerUrl = getWorkerURL(Tile3dAttributesWorker, {...getLoaderOptions()});\n const sourceResponse = await fetchFile(tile3dAttributesWorkerUrl);\n const source = await sourceResponse.text();\n\n this.workerSource.tile3dWorkerSource = source;\n console.log(`Loading workers source completed!`); // eslint-disable-line no-undef, no-console\n }\n}\n"],"file":"3d-tiles-converter.js"}
@@ -0,0 +1,230 @@
1
+ import '@loaders.gl/polyfills';
2
+ import { join } from 'path';
3
+ import { I3SConverter, Tiles3DConverter } from '@loaders.gl/tile-converter';
4
+ import { DepsInstaller } from './deps-installer/deps-installer';
5
+ const TILESET_TYPE = {
6
+ I3S: 'I3S',
7
+ _3DTILES: '3DTILES'
8
+ };
9
+
10
+ async function main() {
11
+ const [,, ...args] = process.argv;
12
+
13
+ if (args.length === 0) {
14
+ printHelp();
15
+ }
16
+
17
+ const options = parseOptions(args);
18
+
19
+ if (options.installDependencies) {
20
+ const depthInstaller = new DepsInstaller();
21
+ depthInstaller.install('deps');
22
+ return;
23
+ }
24
+
25
+ const validatedOptions = validateOptions(options);
26
+ await convert(validatedOptions);
27
+ }
28
+
29
+ main().catch(error => {
30
+ console.log(error);
31
+ process.exit(1);
32
+ });
33
+
34
+ function printHelp() {
35
+ console.log('cli: converter 3dTiles to I3S or I3S to 3dTiles...');
36
+ console.log('--install-dependencies [Run the script for installing dependencies. Run this options separate from others. Now "*.pgm" file installation is implemented]');
37
+ console.log('--max-depth [Maximal depth of hierarchical tiles tree traversal, default: infinite]');
38
+ console.log('--name [Tileset name]');
39
+ console.log('--output [Output folder, default: "data" folder]');
40
+ console.log('--slpk [Generate slpk (Scene Layer Packages) I3S output file]');
41
+ console.log('--tileset [tileset.json file (3DTiles) / http://..../SceneServer/layers/0 resource (I3S)]');
42
+ console.log('--input-type [tileset input type: I3S or 3DTILES]');
43
+ console.log('--7zExe [location of 7z.exe archiver to create slpk on Windows, default: "C:\\Program Files\\7-Zip\\7z.exe"]');
44
+ 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"');
45
+ console.log('--token [Token for Cesium ION tilesets authentication]');
46
+ console.log('--no-draco [Disable draco compression for geometry]');
47
+ 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]');
48
+ console.log('--generate-bounding-volumes [Will generate obb and mbs bounding volumes from geometry]');
49
+ console.log('--validate [Enable validation]');
50
+ process.exit(0);
51
+ }
52
+
53
+ async function convert(options) {
54
+ console.log("------------------------------------------------");
55
+ console.log("Starting conversion of ".concat(options.inputType));
56
+ console.log("------------------------------------------------");
57
+ const inputType = options.inputType.toUpperCase();
58
+
59
+ switch (inputType) {
60
+ case TILESET_TYPE.I3S:
61
+ const tiles3DConverter = new Tiles3DConverter();
62
+ tiles3DConverter.convert({
63
+ inputUrl: options.tileset,
64
+ outputPath: options.output,
65
+ tilesetName: options.name,
66
+ maxDepth: options.maxDepth,
67
+ egmFilePath: options.egm
68
+ });
69
+ break;
70
+
71
+ case TILESET_TYPE._3DTILES:
72
+ const converter = new I3SConverter();
73
+ await converter.convert({
74
+ inputUrl: options.tileset,
75
+ outputPath: options.output,
76
+ tilesetName: options.name,
77
+ maxDepth: options.maxDepth,
78
+ slpk: options.slpk,
79
+ sevenZipExe: options.sevenZipExe,
80
+ egmFilePath: options.egm,
81
+ token: options.token,
82
+ draco: options.draco,
83
+ generateTextures: options.generateTextures,
84
+ generateBoundingVolumes: options.generateBoundingVolumes,
85
+ validate: options.validate
86
+ });
87
+ break;
88
+
89
+ default:
90
+ printHelp();
91
+ }
92
+ }
93
+
94
+ function validateOptions(options) {
95
+ const mandatoryOptionsWithExceptions = {
96
+ name: () => console.log('Missed: --name [Tileset name]'),
97
+ output: () => console.log('Missed: --output [Output path name]'),
98
+ sevenZipExe: () => console.log('Missed: --7zExe [7z archiver executable path]'),
99
+ egm: () => console.log('Missed: --egm [*.pgm earth gravity model file path]'),
100
+ tileset: () => console.log('Missed: --tileset [tileset.json file]'),
101
+ inputType: () => console.log('Missed/Incorrect: --input-type [tileset input type: I3S or 3DTILES]')
102
+ };
103
+ const exceptions = [];
104
+
105
+ for (const mandatoryOption in mandatoryOptionsWithExceptions) {
106
+ const optionValue = options[mandatoryOption];
107
+ const isWrongInputType = Boolean(optionValue) && mandatoryOption === 'inputType' && !Object.values(TILESET_TYPE).includes(optionValue.toUpperCase());
108
+
109
+ if (!optionValue || isWrongInputType) {
110
+ exceptions.push(mandatoryOptionsWithExceptions[mandatoryOption]);
111
+ }
112
+ }
113
+
114
+ if (exceptions.length) {
115
+ exceptions.forEach(exeption => exeption());
116
+ process.exit(0);
117
+ }
118
+
119
+ return options;
120
+ }
121
+
122
+ function parseOptions(args) {
123
+ const opts = {
124
+ output: 'data',
125
+ sevenZipExe: 'C:\\Program Files\\7-Zip\\7z.exe',
126
+ egm: join(process.cwd(), 'deps', 'egm2008-5.pgm'),
127
+ draco: true,
128
+ installDependencies: false,
129
+ generateTextures: false,
130
+ generateBoundingVolumes: false,
131
+ validate: false,
132
+ slpk: false
133
+ };
134
+ args.forEach((arg, index) => {
135
+ if (arg.indexOf('--') === 0) {
136
+ switch (arg) {
137
+ case '--input-type':
138
+ opts.inputType = getStringValue(index, args);
139
+ break;
140
+
141
+ case '--tileset':
142
+ opts.tileset = getStringValue(index, args);
143
+ break;
144
+
145
+ case '--name':
146
+ opts.name = getStringValue(index, args);
147
+ break;
148
+
149
+ case '--output':
150
+ opts.output = getStringValue(index, args);
151
+ break;
152
+
153
+ case '--max-depth':
154
+ opts.maxDepth = getIntegerValue(index, args);
155
+ break;
156
+
157
+ case '--slpk':
158
+ opts.slpk = true;
159
+ break;
160
+
161
+ case '--7zExe':
162
+ opts.sevenZipExe = getStringValue(index, args);
163
+ break;
164
+
165
+ case '--egm':
166
+ opts.egm = getStringValue(index, args);
167
+ break;
168
+
169
+ case '--token':
170
+ opts.token = getStringValue(index, args);
171
+ break;
172
+
173
+ case '--no-draco':
174
+ opts.draco = false;
175
+ break;
176
+
177
+ case '--validate':
178
+ opts.validate = true;
179
+ break;
180
+
181
+ case '--install-dependencies':
182
+ opts.installDependencies = true;
183
+ break;
184
+
185
+ case '--generate-textures':
186
+ opts.generateTextures = true;
187
+ break;
188
+
189
+ case '--generate-bounding-volumes':
190
+ opts.generateBoundingVolumes = true;
191
+ break;
192
+
193
+ case '--help':
194
+ printHelp();
195
+ break;
196
+
197
+ default:
198
+ console.warn("Unknown option ".concat(arg));
199
+ process.exit(0);
200
+ }
201
+ }
202
+ });
203
+ return opts;
204
+ }
205
+
206
+ function getStringValue(index, args) {
207
+ if (index + 1 >= args.length) {
208
+ return '';
209
+ }
210
+
211
+ const value = args[index + 1];
212
+
213
+ if (value.indexOf('--') === 0) {
214
+ return '';
215
+ }
216
+
217
+ return value;
218
+ }
219
+
220
+ function getIntegerValue(index, args) {
221
+ const stringValue = getStringValue(index, args);
222
+ const result = Number.parseInt(stringValue);
223
+
224
+ if (isFinite(result)) {
225
+ return result;
226
+ }
227
+
228
+ return NaN;
229
+ }
230
+ //# sourceMappingURL=converter-cli.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../src/converter-cli.ts"],"names":["join","I3SConverter","Tiles3DConverter","DepsInstaller","TILESET_TYPE","I3S","_3DTILES","main","args","process","argv","length","printHelp","options","parseOptions","installDependencies","depthInstaller","install","validatedOptions","validateOptions","convert","catch","error","console","log","exit","inputType","toUpperCase","tiles3DConverter","inputUrl","tileset","outputPath","output","tilesetName","name","maxDepth","egmFilePath","egm","converter","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"}
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/deps-installer/deps-installer.js"],"names":["load","ZipLoader","writeFile","join","PGM_LINK","DepsInstaller","install","path","console","log","fileMap","depsPath","process","cwd","Uint8Array"],"mappings":"AAAA,SAAQA,IAAR,QAAmB,kBAAnB;AACA,SAAQC,SAAR,QAAwB,iBAAxB;AACA,SAAQC,SAAR,QAAwB,yBAAxB;AACA,SAAQC,IAAR,QAAmB,MAAnB;AAEA,MAAMC,QAAQ,GAAG,+EAAjB;AAEA,OAAO,MAAMC,aAAN,CAAoB;AACZ,QAAPC,OAAO,CAACC,IAAI,GAAG,EAAR,EAAY;AACvBC,IAAAA,OAAO,CAACC,GAAR,CAAY,iCAAZ;AACA,UAAMC,OAAO,GAAG,MAAMV,IAAI,CAACI,QAAD,EAAWH,SAAX,EAAsB,EAAtB,CAA1B;AAEA,QAAIU,QAAQ,GAAGC,OAAO,CAACC,GAAR,EAAf;;AACA,QAAIN,IAAJ,EAAU;AACRI,MAAAA,QAAQ,GAAGR,IAAI,CAACQ,QAAD,EAAWJ,IAAX,CAAf;AACD;;AAED,UAAML,SAAS,CAACS,QAAD,EAAW,IAAIG,UAAJ,CAAeJ,OAAO,CAAC,sBAAD,CAAtB,CAAX,EAA4D,eAA5D,CAAf;AAEAF,IAAAA,OAAO,CAACC,GAAR,CAAY,8CAAZ;AACD;;AAbwB","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"}
1
+ {"version":3,"sources":["../../../src/deps-installer/deps-installer.ts"],"names":["load","ZipLoader","writeFile","join","PGM_LINK","DepsInstaller","install","path","console","log","fileMap","depsPath","process","cwd","Uint8Array"],"mappings":"AAAA,SAAQA,IAAR,QAAmB,kBAAnB;AACA,SAAQC,SAAR,QAAwB,iBAAxB;AACA,SAAQC,SAAR,QAAwB,yBAAxB;AACA,SAAQC,IAAR,QAAmB,MAAnB;AAEA,MAAMC,QAAQ,GAAG,+EAAjB;AAQA,OAAO,MAAMC,aAAN,CAAoB;AAKZ,QAAPC,OAAO,CAACC,IAAY,GAAG,EAAhB,EAAmC;AAC9CC,IAAAA,OAAO,CAACC,GAAR,CAAY,iCAAZ;AACA,UAAMC,OAAO,GAAG,MAAMV,IAAI,CAACI,QAAD,EAAWH,SAAX,EAAsB,EAAtB,CAA1B;AAEA,QAAIU,QAAQ,GAAGC,OAAO,CAACC,GAAR,EAAf;;AACA,QAAIN,IAAJ,EAAU;AACRI,MAAAA,QAAQ,GAAGR,IAAI,CAACQ,QAAD,EAAWJ,IAAX,CAAf;AACD;;AAED,UAAML,SAAS,CAACS,QAAD,EAAW,IAAIG,UAAJ,CAAeJ,OAAO,CAAC,sBAAD,CAAtB,CAAX,EAA4D,eAA5D,CAAf;AAEAF,IAAAA,OAAO,CAACC,GAAR,CAAY,8CAAZ;AACD;;AAjBwB","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"}
@@ -1,5 +1,5 @@
1
1
  import { processOnWorker } from '@loaders.gl/worker-utils';
2
- const VERSION = typeof "3.2.0-alpha.2" !== 'undefined' ? "3.2.0-alpha.2" : 'latest';
2
+ const VERSION = typeof "3.2.0-alpha.3" !== 'undefined' ? "3.2.0-alpha.3" : 'latest';
3
3
  export const I3SAttributesWorker = {
4
4
  id: 'i3s-attributes',
5
5
  name: 'I3S Attributes Worker',
@@ -226,6 +226,10 @@ function getCompositeTransformationMatrix(node, matrix) {
226
226
  transformationMatrix = matrix.multiplyRight(nodeMatrix);
227
227
  }
228
228
 
229
+ if (translation) {
230
+ transformationMatrix = transformationMatrix.translate(translation);
231
+ }
232
+
229
233
  if (rotation) {
230
234
  transformationMatrix = transformationMatrix.rotateXYZ(rotation);
231
235
  }
@@ -234,10 +238,6 @@ function getCompositeTransformationMatrix(node, matrix) {
234
238
  transformationMatrix = transformationMatrix.scale(scale);
235
239
  }
236
240
 
237
- if (translation) {
238
- transformationMatrix = transformationMatrix.translate(translation);
239
- }
240
-
241
241
  return transformationMatrix;
242
242
  }
243
243