@loaders.gl/tile-converter 3.0.10 → 3.0.14
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.
- package/dist/dist.es5.min.js +14 -14
- package/dist/dist.es5.min.js.map +1 -1
- package/dist/dist.min.js +14 -14
- package/dist/dist.min.js.map +1 -1
- package/dist/es5/i3s-converter/i3s-converter.js +27 -16
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/pgm-loader.js +1 -1
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js +11 -11
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js +1 -1
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +2 -2
- package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-debug.js +2 -2
- package/dist/esm/i3s-converter/helpers/node-debug.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-pages.js +2 -2
- package/dist/esm/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/esm/i3s-converter/i3s-converter.js +36 -28
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/shared-resources.js +2 -2
- package/dist/esm/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/esm/i3s-server/controllers/index-controller.js +1 -1
- package/dist/esm/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/esm/lib/utils/compress-util.js +13 -13
- package/dist/esm/lib/utils/compress-util.js.map +1 -1
- package/dist/esm/lib/utils/file-utils.js +1 -1
- package/dist/esm/lib/utils/file-utils.js.map +1 -1
- package/dist/esm/lib/utils/statistic-utills.js +5 -5
- package/dist/esm/lib/utils/statistic-utills.js.map +1 -1
- package/dist/esm/pgm-loader.js +1 -1
- package/package.json +14 -14
- package/src/i3s-converter/i3s-converter.ts +10 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/utils/compress-util.js"],"names":["createGzip","join","promises","fs","createReadStream","createWriteStream","archiver","removeFile","ChildProcessProxy","JSZip","MD5Hash","crypt","getAbsoluteFilePath","compressFileWithGzip","pathFile","compressedPathFile","gzip","input","output","Promise","resolve","reject","on","console","log","error","pipe","compressFilesWithZip","fileMap","outputFile","level","e","archive","zlib","pointer","err","subFileName","subFileData","appendFileToArchive","finalize","compressWithChildProcess","process","platform","compressWithChildProcessWindows","arguments","compressWithChildProcessUnix","inputFolder","inputFiles","fullOutputFile","args","childProcess","start","command","spawn","cwd","wait","sevenZipExe","substr","generateHash128FromZip","inputZipFile","readFile","zip","loadAsync","hashTable","zipFiles","files","relativePath","zipEntry","_data","content","compressedContent","dir","hash","Buffer","from","toLowerCase","push","key","atob","value","byteOffset","sort","prev","next","item","_longToByteArray","write","hexToBytes","concat","close","long","buffer","ArrayBuffer","longNum","Float64Array","Array","Uint8Array","reverse","addFileToZip","fileName","zipFile","fileStream","append","name"],"mappings":"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","sourcesContent":["import {createGzip} from 'zlib';\nimport {join} from 'path';\nimport {promises as fs, createReadStream, createWriteStream} from 'fs';\nimport archiver from 'archiver';\nimport {removeFile} from './file-utils';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\nimport JSZip from 'jszip';\nimport {MD5Hash} from '@loaders.gl/crypto';\nimport crypt from 'crypt';\nimport {getAbsoluteFilePath} from './file-utils';\n\nexport function compressFileWithGzip(pathFile) {\n const compressedPathFile = `${pathFile}.gz`;\n const gzip = createGzip();\n const input = createReadStream(pathFile);\n const output = createWriteStream(compressedPathFile);\n\n return new Promise((resolve, reject) => {\n input.on('end', () => {\n console.log(`${compressedPathFile} compressed and saved.`); // eslint-disable-line no-undef,no-console\n resolve(compressedPathFile);\n });\n input.on('error', (error) => {\n console.log(`${compressedPathFile}: compression error!`); // eslint-disable-line no-undef,no-console\n reject(error);\n });\n input.pipe(gzip).pipe(output);\n });\n}\n\nexport async function compressFilesWithZip(fileMap, outputFile, level = 0) {\n // Before creating a new file, we need to delete the old file\n try {\n await removeFile(outputFile);\n } catch (e) {\n // Do nothing if old file doesn't exist\n }\n\n const output = createWriteStream(outputFile);\n const archive = archiver('zip', {\n zlib: {level} // Sets the compression level.\n });\n\n return new Promise(async (resolve, reject) => {\n // listen for all archive data to be writte\n // 'close' event is fired only when a file descriptor is involved\n output.on('close', function () {\n console.log(`${outputFile} saved.`); // eslint-disable-line no-undef,no-console\n console.log(`${archive.pointer()} total bytes`); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n\n // This event is fired when the data source is drained no matter what was the data source.\n // It is not part of this library but rather from the NodeJS Stream API.\n // @see: https://nodejs.org/api/stream.html#stream_event_end\n output.on('end', function () {\n console.log('Data has been drained'); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n\n // good practice to catch warnings (ie stat failures and other non-blocking errors)\n archive.on('warning', function (err) {\n console.log(err); // eslint-disable-line no-undef,no-console\n reject(err);\n });\n\n // good practice to catch this error explicitly\n archive.on('error', function (err) {\n reject(err);\n });\n\n // pipe archive data to the file\n archive.pipe(output);\n\n for (const subFileName in fileMap) {\n const subFileData = fileMap[subFileName];\n await appendFileToArchive(archive, subFileName, subFileData);\n }\n\n // finalize the archive (ie we are done appending files but streams have to finish yet)\n archive.finalize();\n });\n}\n\nexport async function compressWithChildProcess() {\n // eslint-disable-next-line no-undef\n if (process.platform === 'win32') {\n await compressWithChildProcessWindows(...arguments);\n } else {\n await compressWithChildProcessUnix(...arguments);\n }\n}\n\nasync function compressWithChildProcessUnix(inputFolder, outputFile, level = 0, inputFiles = '.') {\n const fullOutputFile = getAbsoluteFilePath(outputFile);\n const args = [`-${level}`, '-r', fullOutputFile, inputFiles];\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: 'zip',\n arguments: args,\n spawn: {\n cwd: inputFolder\n },\n wait: 0\n });\n}\n\nasync function compressWithChildProcessWindows(\n inputFolder,\n outputFile,\n level = 0,\n inputFiles = join('.', '*'),\n sevenZipExe\n) {\n // Workaround for @listfile issue. In 7z.exe @-leading files are handled as listfiles\n // https://sevenzip.osdn.jp/chm/cmdline/syntax.htm\n if (inputFiles[0] === '@') {\n inputFiles = `*${inputFiles.substr(1)}`;\n }\n\n const fullOutputFile = getAbsoluteFilePath(outputFile);\n const args = ['a', '-tzip', `-mx=${level}`, fullOutputFile, inputFiles];\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: sevenZipExe,\n arguments: args,\n spawn: {\n cwd: `${inputFolder}`\n },\n wait: 0\n });\n}\n\nexport async function generateHash128FromZip(inputZipFile, outputFile) {\n const input = await fs.readFile(inputZipFile);\n const zip = await JSZip.loadAsync(input);\n const hashTable = [];\n const zipFiles = zip.files;\n for (const relativePath in zipFiles) {\n const zipEntry = zipFiles[relativePath];\n // Had to use a workaround because the correct string is getting the wrong data\n // const content = await zipEntry.async('nodebuffer');\n // _data isn't described in the interface, so lint thought it was wrong\n const _data = '_data';\n const content = zipEntry[_data].compressedContent;\n if (zipEntry.dir) continue; // eslint-disable-line no-continue\n // eslint-disable-next-line no-undef\n const hash = await new MD5Hash().hash(Buffer.from(relativePath.toLowerCase()));\n // eslint-disable-next-line no-undef\n hashTable.push({key: atob(hash), value: content.byteOffset});\n }\n\n hashTable.sort((prev, next) => {\n if (prev.key === next.key) {\n return prev.value < next.value ? -1 : 1;\n }\n return prev.key < next.key ? -1 : 1;\n });\n\n const output = createWriteStream(outputFile);\n return new Promise((resolve, reject) => {\n output.on('close', function () {\n console.log(`${outputFile} generated and saved`); // eslint-disable-line\n resolve(null);\n });\n output.on('error', function (err) {\n console.log(err); // eslint-disable-line\n reject(err);\n });\n for (const key in hashTable) {\n const item = hashTable[key];\n const value = _longToByteArray(item.value);\n // TODO: perhaps you need to wait for the 'drain' event if the write returns 'false'\n // eslint-disable-next-line no-undef\n output.write(Buffer.from(crypt.hexToBytes(item.key).concat(value)));\n }\n output.close();\n });\n}\n\nfunction _longToByteArray(long) {\n const buffer = new ArrayBuffer(8); // JS numbers are 8 bytes long, or 64 bits\n const longNum = new Float64Array(buffer); // so equivalent to Float64\n longNum[0] = long;\n return Array.from(new Uint8Array(buffer)).reverse(); // reverse to get little endian\n}\n\nexport async function addFileToZip(inputFolder, fileName, zipFile, sevenZipExe) {\n await compressWithChildProcess(inputFolder, zipFile, 0, fileName, sevenZipExe);\n console.log(`${fileName} added to ${zipFile}.`); // eslint-disable-line\n}\n\nfunction appendFileToArchive(archive, subFileName, subFileData) {\n return new Promise((resolve) => {\n const fileStream = createReadStream(subFileData);\n console.log(`Compression start: ${subFileName}`); // eslint-disable-line no-undef,no-console\n fileStream.on('close', () => {\n console.log(`Compression finish: ${subFileName}`); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n archive.append(fileStream, {name: subFileName});\n });\n}\n"],"file":"compress-util.js"}
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/utils/compress-util.js"],"names":["createGzip","join","promises","fs","createReadStream","createWriteStream","archiver","removeFile","ChildProcessProxy","JSZip","MD5Hash","crypt","getAbsoluteFilePath","compressFileWithGzip","pathFile","compressedPathFile","gzip","input","output","Promise","resolve","reject","on","console","log","error","pipe","compressFilesWithZip","fileMap","outputFile","level","e","archive","zlib","pointer","err","subFileName","subFileData","appendFileToArchive","finalize","compressWithChildProcess","process","platform","compressWithChildProcessWindows","arguments","compressWithChildProcessUnix","inputFolder","inputFiles","fullOutputFile","args","childProcess","start","command","spawn","cwd","wait","sevenZipExe","substr","generateHash128FromZip","inputZipFile","readFile","zip","loadAsync","hashTable","zipFiles","files","relativePath","zipEntry","_data","content","compressedContent","dir","hash","Buffer","from","toLowerCase","push","key","atob","value","byteOffset","sort","prev","next","item","_longToByteArray","write","hexToBytes","concat","close","long","buffer","ArrayBuffer","longNum","Float64Array","Array","Uint8Array","reverse","addFileToZip","fileName","zipFile","fileStream","append","name"],"mappings":"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","sourcesContent":["import {createGzip} from 'zlib';\nimport {join} from 'path';\nimport {promises as fs, createReadStream, createWriteStream} from 'fs';\nimport archiver from 'archiver';\nimport {removeFile} from './file-utils';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\nimport JSZip from 'jszip';\nimport {MD5Hash} from '@loaders.gl/crypto';\nimport crypt from 'crypt';\nimport {getAbsoluteFilePath} from './file-utils';\n\nexport function compressFileWithGzip(pathFile) {\n const compressedPathFile = `${pathFile}.gz`;\n const gzip = createGzip();\n const input = createReadStream(pathFile);\n const output = createWriteStream(compressedPathFile);\n\n return new Promise((resolve, reject) => {\n input.on('end', () => {\n console.log(`${compressedPathFile} compressed and saved.`); // eslint-disable-line no-undef,no-console\n resolve(compressedPathFile);\n });\n input.on('error', (error) => {\n console.log(`${compressedPathFile}: compression error!`); // eslint-disable-line no-undef,no-console\n reject(error);\n });\n input.pipe(gzip).pipe(output);\n });\n}\n\nexport async function compressFilesWithZip(fileMap, outputFile, level = 0) {\n // Before creating a new file, we need to delete the old file\n try {\n await removeFile(outputFile);\n } catch (e) {\n // Do nothing if old file doesn't exist\n }\n\n const output = createWriteStream(outputFile);\n const archive = archiver('zip', {\n zlib: {level} // Sets the compression level.\n });\n\n return new Promise(async (resolve, reject) => {\n // listen for all archive data to be writte\n // 'close' event is fired only when a file descriptor is involved\n output.on('close', function () {\n console.log(`${outputFile} saved.`); // eslint-disable-line no-undef,no-console\n console.log(`${archive.pointer()} total bytes`); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n\n // This event is fired when the data source is drained no matter what was the data source.\n // It is not part of this library but rather from the NodeJS Stream API.\n // @see: https://nodejs.org/api/stream.html#stream_event_end\n output.on('end', function () {\n console.log('Data has been drained'); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n\n // good practice to catch warnings (ie stat failures and other non-blocking errors)\n archive.on('warning', function (err) {\n console.log(err); // eslint-disable-line no-undef,no-console\n reject(err);\n });\n\n // good practice to catch this error explicitly\n archive.on('error', function (err) {\n reject(err);\n });\n\n // pipe archive data to the file\n archive.pipe(output);\n\n for (const subFileName in fileMap) {\n const subFileData = fileMap[subFileName];\n await appendFileToArchive(archive, subFileName, subFileData);\n }\n\n // finalize the archive (ie we are done appending files but streams have to finish yet)\n archive.finalize();\n });\n}\n\nexport async function compressWithChildProcess() {\n // eslint-disable-next-line no-undef\n if (process.platform === 'win32') {\n await compressWithChildProcessWindows(...arguments);\n } else {\n await compressWithChildProcessUnix(...arguments);\n }\n}\n\nasync function compressWithChildProcessUnix(inputFolder, outputFile, level = 0, inputFiles = '.') {\n const fullOutputFile = getAbsoluteFilePath(outputFile);\n const args = [`-${level}`, '-r', fullOutputFile, inputFiles];\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: 'zip',\n arguments: args,\n spawn: {\n cwd: inputFolder\n },\n wait: 0\n });\n}\n\nasync function compressWithChildProcessWindows(\n inputFolder,\n outputFile,\n level = 0,\n inputFiles = join('.', '*'),\n sevenZipExe\n) {\n // Workaround for @listfile issue. In 7z.exe @-leading files are handled as listfiles\n // https://sevenzip.osdn.jp/chm/cmdline/syntax.htm\n if (inputFiles[0] === '@') {\n inputFiles = `*${inputFiles.substr(1)}`;\n }\n\n const fullOutputFile = getAbsoluteFilePath(outputFile);\n const args = ['a', '-tzip', `-mx=${level}`, fullOutputFile, inputFiles];\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: sevenZipExe,\n arguments: args,\n spawn: {\n cwd: `${inputFolder}`\n },\n wait: 0\n });\n}\n\nexport async function generateHash128FromZip(inputZipFile, outputFile) {\n const input = await fs.readFile(inputZipFile);\n const zip = await JSZip.loadAsync(input);\n const hashTable = [];\n const zipFiles = zip.files;\n for (const relativePath in zipFiles) {\n const zipEntry = zipFiles[relativePath];\n // Had to use a workaround because the correct string is getting the wrong data\n // const content = await zipEntry.async('nodebuffer');\n // _data isn't described in the interface, so lint thought it was wrong\n const _data = '_data';\n const content = zipEntry[_data].compressedContent;\n if (zipEntry.dir) continue; // eslint-disable-line no-continue\n // eslint-disable-next-line no-undef\n const hash = await new MD5Hash().hash(Buffer.from(relativePath.toLowerCase()));\n // eslint-disable-next-line no-undef\n hashTable.push({key: atob(hash), value: content.byteOffset});\n }\n\n hashTable.sort((prev, next) => {\n if (prev.key === next.key) {\n return prev.value < next.value ? -1 : 1;\n }\n return prev.key < next.key ? -1 : 1;\n });\n\n const output = createWriteStream(outputFile);\n return new Promise((resolve, reject) => {\n output.on('close', function () {\n console.log(`${outputFile} generated and saved`); // eslint-disable-line\n resolve(null);\n });\n output.on('error', function (err) {\n console.log(err); // eslint-disable-line\n reject(err);\n });\n for (const key in hashTable) {\n const item = hashTable[key];\n const value = _longToByteArray(item.value);\n // TODO: perhaps you need to wait for the 'drain' event if the write returns 'false'\n // eslint-disable-next-line no-undef\n output.write(Buffer.from(crypt.hexToBytes(item.key).concat(value)));\n }\n output.close();\n });\n}\n\nfunction _longToByteArray(long) {\n const buffer = new ArrayBuffer(8); // JS numbers are 8 bytes long, or 64 bits\n const longNum = new Float64Array(buffer); // so equivalent to Float64\n longNum[0] = long;\n return Array.from(new Uint8Array(buffer)).reverse(); // reverse to get little endian\n}\n\nexport async function addFileToZip(inputFolder, fileName, zipFile, sevenZipExe) {\n await compressWithChildProcess(inputFolder, zipFile, 0, fileName, sevenZipExe);\n console.log(`${fileName} added to ${zipFile}.`); // eslint-disable-line\n}\n\nfunction appendFileToArchive(archive, subFileName, subFileData) {\n return new Promise((resolve) => {\n const fileStream = createReadStream(subFileData);\n console.log(`Compression start: ${subFileName}`); // eslint-disable-line no-undef,no-console\n fileStream.on('close', () => {\n console.log(`Compression finish: ${subFileName}`); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n archive.append(fileStream, {name: subFileName});\n });\n}\n"],"file":"compress-util.js"}
|
|
@@ -13,7 +13,7 @@ export async function writeFile(path, data, fileName = 'index.json') {
|
|
|
13
13
|
throw err;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
console.log(
|
|
16
|
+
console.log("".concat(pathFile, " saved."));
|
|
17
17
|
return pathFile;
|
|
18
18
|
}
|
|
19
19
|
export async function writeFileForSlpk(path, data, fileName = 'index.json', compress = true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/utils/file-utils.js"],"names":["promises","fs","isAbsolute","join","compressFileWithGzip","writeFile","path","data","fileName","mkdir","recursive","pathFile","err","console","log","writeFileForSlpk","compress","pathGzFile","removeFile","removeDir","rmdir","unlink","getAbsoluteFilePath","filePath","process","cwd"],"mappings":"AAAA,SAAQA,QAAQ,IAAIC,EAApB,QAA6B,IAA7B;AACA,SAAQC,UAAR,EAAoBC,IAApB,QAA+B,MAA/B;AACA,SAAQC,oBAAR,QAAmC,iBAAnC;AAEA,OAAO,eAAeC,SAAf,CAAyBC,IAAzB,EAA+BC,IAA/B,EAAqCC,QAAQ,GAAG,YAAhD,EAA8D;AACnE,QAAMP,EAAE,CAACQ,KAAH,CAASH,IAAT,EAAe;AAACI,IAAAA,SAAS,EAAE;AAAZ,GAAf,CAAN;AACA,QAAMC,QAAQ,GAAGR,IAAI,CAACG,IAAD,EAAOE,QAAP,CAArB;;AACA,MAAI;AACF,UAAMP,EAAE,CAACI,SAAH,CAAaM,QAAb,EAAuBJ,IAAvB,CAAN;AACD,GAFD,CAEE,OAAOK,GAAP,EAAY;AACZ,UAAMA,GAAN;AACD;;AACDC,EAAAA,OAAO,CAACC,GAAR,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/utils/file-utils.js"],"names":["promises","fs","isAbsolute","join","compressFileWithGzip","writeFile","path","data","fileName","mkdir","recursive","pathFile","err","console","log","writeFileForSlpk","compress","pathGzFile","removeFile","removeDir","rmdir","unlink","getAbsoluteFilePath","filePath","process","cwd"],"mappings":"AAAA,SAAQA,QAAQ,IAAIC,EAApB,QAA6B,IAA7B;AACA,SAAQC,UAAR,EAAoBC,IAApB,QAA+B,MAA/B;AACA,SAAQC,oBAAR,QAAmC,iBAAnC;AAEA,OAAO,eAAeC,SAAf,CAAyBC,IAAzB,EAA+BC,IAA/B,EAAqCC,QAAQ,GAAG,YAAhD,EAA8D;AACnE,QAAMP,EAAE,CAACQ,KAAH,CAASH,IAAT,EAAe;AAACI,IAAAA,SAAS,EAAE;AAAZ,GAAf,CAAN;AACA,QAAMC,QAAQ,GAAGR,IAAI,CAACG,IAAD,EAAOE,QAAP,CAArB;;AACA,MAAI;AACF,UAAMP,EAAE,CAACI,SAAH,CAAaM,QAAb,EAAuBJ,IAAvB,CAAN;AACD,GAFD,CAEE,OAAOK,GAAP,EAAY;AACZ,UAAMA,GAAN;AACD;;AACDC,EAAAA,OAAO,CAACC,GAAR,WAAeH,QAAf;AACA,SAAOA,QAAP;AACD;AAED,OAAO,eAAeI,gBAAf,CAAgCT,IAAhC,EAAsCC,IAAtC,EAA4CC,QAAQ,GAAG,YAAvD,EAAqEQ,QAAQ,GAAG,IAAhF,EAAsF;AAC3F,QAAML,QAAQ,GAAG,MAAMN,SAAS,CAACC,IAAD,EAAOC,IAAP,EAAaC,QAAb,CAAhC;;AACA,MAAIQ,QAAJ,EAAc;AACZ,UAAMC,UAAU,GAAG,MAAMb,oBAAoB,CAACO,QAAD,CAA7C;AAEA,UAAMO,UAAU,CAACP,QAAD,CAAhB;AACA,WAAOM,UAAP;AACD;;AACD,SAAON,QAAP;AACD;AAED,OAAO,SAASQ,SAAT,CAAmBb,IAAnB,EAAyB;AAC9B,SAAOL,EAAE,CAACmB,KAAH,CAASd,IAAT,EAAe;AAACI,IAAAA,SAAS,EAAE;AAAZ,GAAf,CAAP;AACD;AAED,OAAO,SAASQ,UAAT,CAAoBZ,IAApB,EAA0B;AAC/B,SAAOL,EAAE,CAACoB,MAAH,CAAUf,IAAV,CAAP;AACD;AAED,OAAO,SAASgB,mBAAT,CAA6BC,QAA7B,EAAuC;AAC5C,SAAOrB,UAAU,CAACqB,QAAD,CAAV,GAAuBA,QAAvB,GAAkCpB,IAAI,CAACqB,OAAO,CAACC,GAAR,EAAD,EAAgBF,QAAhB,CAA7C;AACD","sourcesContent":["import {promises as fs} from 'fs';\nimport {isAbsolute, join} from 'path';\nimport {compressFileWithGzip} from './compress-util';\n\nexport async function writeFile(path, data, fileName = 'index.json') {\n await fs.mkdir(path, {recursive: true});\n const pathFile = join(path, fileName);\n try {\n await fs.writeFile(pathFile, data);\n } catch (err) {\n throw err;\n }\n console.log(`${pathFile} saved.`); // eslint-disable-line\n return pathFile;\n}\n\nexport async function writeFileForSlpk(path, data, fileName = 'index.json', compress = true) {\n const pathFile = await writeFile(path, data, fileName);\n if (compress) {\n const pathGzFile = await compressFileWithGzip(pathFile);\n // After compression, we don't need an uncompressed file\n await removeFile(pathFile);\n return pathGzFile;\n }\n return pathFile;\n}\n\nexport function removeDir(path) {\n return fs.rmdir(path, {recursive: true});\n}\n\nexport function removeFile(path) {\n return fs.unlink(path);\n}\n\nexport function getAbsoluteFilePath(filePath) {\n return isAbsolute(filePath) ? filePath : join(process.cwd(), filePath); // eslint-disable-line no-undef\n}\n"],"file":"file-utils.js"}
|
|
@@ -13,19 +13,19 @@ export function timeConverter(time) {
|
|
|
13
13
|
let result = '';
|
|
14
14
|
|
|
15
15
|
if (hours) {
|
|
16
|
-
result +=
|
|
16
|
+
result += "".concat(hours, "h ");
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
if (minutes) {
|
|
20
|
-
result +=
|
|
20
|
+
result += "".concat(minutes, "m ");
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
if (seconds) {
|
|
24
|
-
result +=
|
|
24
|
+
result += "".concat(seconds, "s");
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
if (!result) {
|
|
28
|
-
result +=
|
|
28
|
+
result += "".concat(milliseconds, "ms");
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
return result;
|
|
@@ -40,7 +40,7 @@ export async function calculateFilesSize(params) {
|
|
|
40
40
|
|
|
41
41
|
try {
|
|
42
42
|
if (slpk) {
|
|
43
|
-
const slpkPath = join(fullOutputPath,
|
|
43
|
+
const slpkPath = join(fullOutputPath, "".concat(tilesetName, ".slpk"));
|
|
44
44
|
const stat = await fs.stat(slpkPath);
|
|
45
45
|
return stat.size;
|
|
46
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/utils/statistic-utills.js"],"names":["join","promises","fs","getAbsoluteFilePath","timeConverter","time","nanoSecondsInMillisecond","timeInSeconds","hours","Math","floor","minutes","seconds","milliseconds","result","calculateFilesSize","params","slpk","outputPath","tilesetName","fullOutputPath","slpkPath","stat","size","directoryPath","totalSize","getTotalFilesSize","error","console","log","dirPath","totalFileSize","files","readdir","file","fileStat","isDirectory"],"mappings":"AAAA,SAAQA,IAAR,QAAmB,MAAnB;AACA,SAAQC,QAAQ,IAAIC,EAApB,QAA6B,IAA7B;AACA,SAAQC,mBAAR,QAAkC,cAAlC;AAEA,OAAO,SAASC,aAAT,CAAuBC,IAAvB,EAA6B;AAClC,QAAMC,wBAAwB,GAAG,GAAjC;AACA,MAAIC,aAAa,GAAGF,IAAI,CAAC,CAAD,CAAxB;AACA,QAAMG,KAAK,GAAGC,IAAI,CAACC,KAAL,CAAWH,aAAa,GAAG,IAA3B,CAAd;AACAA,EAAAA,aAAa,GAAGA,aAAa,GAAGC,KAAK,GAAG,IAAxC;AACA,QAAMG,OAAO,GAAGF,IAAI,CAACC,KAAL,CAAWH,aAAa,GAAG,EAA3B,CAAhB;AACAA,EAAAA,aAAa,GAAGA,aAAa,GAAGI,OAAO,GAAG,EAA1C;AACA,QAAMC,OAAO,GAAGH,IAAI,CAACC,KAAL,CAAWH,aAAX,CAAhB;AACA,QAAMM,YAAY,GAAGR,IAAI,CAAC,CAAD,CAAJ,GAAUC,wBAA/B;AACA,MAAIQ,MAAM,GAAG,EAAb;;AAEA,MAAIN,KAAJ,EAAW;AACTM,IAAAA,MAAM,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/utils/statistic-utills.js"],"names":["join","promises","fs","getAbsoluteFilePath","timeConverter","time","nanoSecondsInMillisecond","timeInSeconds","hours","Math","floor","minutes","seconds","milliseconds","result","calculateFilesSize","params","slpk","outputPath","tilesetName","fullOutputPath","slpkPath","stat","size","directoryPath","totalSize","getTotalFilesSize","error","console","log","dirPath","totalFileSize","files","readdir","file","fileStat","isDirectory"],"mappings":"AAAA,SAAQA,IAAR,QAAmB,MAAnB;AACA,SAAQC,QAAQ,IAAIC,EAApB,QAA6B,IAA7B;AACA,SAAQC,mBAAR,QAAkC,cAAlC;AAEA,OAAO,SAASC,aAAT,CAAuBC,IAAvB,EAA6B;AAClC,QAAMC,wBAAwB,GAAG,GAAjC;AACA,MAAIC,aAAa,GAAGF,IAAI,CAAC,CAAD,CAAxB;AACA,QAAMG,KAAK,GAAGC,IAAI,CAACC,KAAL,CAAWH,aAAa,GAAG,IAA3B,CAAd;AACAA,EAAAA,aAAa,GAAGA,aAAa,GAAGC,KAAK,GAAG,IAAxC;AACA,QAAMG,OAAO,GAAGF,IAAI,CAACC,KAAL,CAAWH,aAAa,GAAG,EAA3B,CAAhB;AACAA,EAAAA,aAAa,GAAGA,aAAa,GAAGI,OAAO,GAAG,EAA1C;AACA,QAAMC,OAAO,GAAGH,IAAI,CAACC,KAAL,CAAWH,aAAX,CAAhB;AACA,QAAMM,YAAY,GAAGR,IAAI,CAAC,CAAD,CAAJ,GAAUC,wBAA/B;AACA,MAAIQ,MAAM,GAAG,EAAb;;AAEA,MAAIN,KAAJ,EAAW;AACTM,IAAAA,MAAM,cAAON,KAAP,OAAN;AACD;;AAED,MAAIG,OAAJ,EAAa;AACXG,IAAAA,MAAM,cAAOH,OAAP,OAAN;AACD;;AAED,MAAIC,OAAJ,EAAa;AACXE,IAAAA,MAAM,cAAOF,OAAP,MAAN;AACD;;AAED,MAAI,CAACE,MAAL,EAAa;AACXA,IAAAA,MAAM,cAAOD,YAAP,OAAN;AACD;;AAED,SAAOC,MAAP;AACD;AAED,OAAO,eAAeC,kBAAf,CAAkCC,MAAlC,EAA0C;AAC/C,QAAM;AAACC,IAAAA,IAAD;AAAOC,IAAAA,UAAP;AAAmBC,IAAAA;AAAnB,MAAkCH,MAAxC;AACA,QAAMI,cAAc,GAAGjB,mBAAmB,CAACe,UAAD,CAA1C;;AAEA,MAAI;AACF,QAAID,IAAJ,EAAU;AACR,YAAMI,QAAQ,GAAGrB,IAAI,CAACoB,cAAD,YAAoBD,WAApB,WAArB;AACA,YAAMG,IAAI,GAAG,MAAMpB,EAAE,CAACoB,IAAH,CAAQD,QAAR,CAAnB;AACA,aAAOC,IAAI,CAACC,IAAZ;AACD;;AAED,UAAMC,aAAa,GAAGxB,IAAI,CAACoB,cAAD,EAAiBD,WAAjB,CAA1B;AACA,UAAMM,SAAS,GAAG,MAAMC,iBAAiB,CAACF,aAAD,CAAzC;AACA,WAAOC,SAAP;AACD,GAVD,CAUE,OAAOE,KAAP,EAAc;AACdC,IAAAA,OAAO,CAACC,GAAR,CAAY,8BAAZ,EAA4CF,KAA5C;AACA,WAAO,IAAP;AACD;AACF;;AAED,eAAeD,iBAAf,CAAiCI,OAAjC,EAA0C;AACxC,MAAIC,aAAa,GAAG,CAApB;AAEA,QAAMC,KAAK,GAAG,MAAM9B,EAAE,CAAC+B,OAAH,CAAWH,OAAX,CAApB;;AAEA,OAAK,MAAMI,IAAX,IAAmBF,KAAnB,EAA0B;AACxB,UAAMG,QAAQ,GAAG,MAAMjC,EAAE,CAACoB,IAAH,CAAQtB,IAAI,CAAC8B,OAAD,EAAUI,IAAV,CAAZ,CAAvB;;AACA,QAAIC,QAAQ,CAACC,WAAT,EAAJ,EAA4B;AAC1BL,MAAAA,aAAa,IAAI,MAAML,iBAAiB,CAAC1B,IAAI,CAAC8B,OAAD,EAAUI,IAAV,CAAL,CAAxC;AACD,KAFD,MAEO;AACLH,MAAAA,aAAa,IAAII,QAAQ,CAACZ,IAA1B;AACD;AACF;;AACD,SAAOQ,aAAP;AACD","sourcesContent":["import {join} from 'path';\nimport {promises as fs} from 'fs';\nimport {getAbsoluteFilePath} from './file-utils';\n\nexport function timeConverter(time) {\n const nanoSecondsInMillisecond = 1e6;\n let timeInSeconds = time[0];\n const hours = Math.floor(timeInSeconds / 3600);\n timeInSeconds = timeInSeconds - hours * 3600;\n const minutes = Math.floor(timeInSeconds / 60);\n timeInSeconds = timeInSeconds - minutes * 60;\n const seconds = Math.floor(timeInSeconds);\n const milliseconds = time[1] / nanoSecondsInMillisecond;\n let result = '';\n\n if (hours) {\n result += `${hours}h `;\n }\n\n if (minutes) {\n result += `${minutes}m `;\n }\n\n if (seconds) {\n result += `${seconds}s`;\n }\n\n if (!result) {\n result += `${milliseconds}ms`;\n }\n\n return result;\n}\n\nexport async function calculateFilesSize(params) {\n const {slpk, outputPath, tilesetName} = params;\n const fullOutputPath = getAbsoluteFilePath(outputPath);\n\n try {\n if (slpk) {\n const slpkPath = join(fullOutputPath, `${tilesetName}.slpk`);\n const stat = await fs.stat(slpkPath);\n return stat.size;\n }\n\n const directoryPath = join(fullOutputPath, tilesetName);\n const totalSize = await getTotalFilesSize(directoryPath);\n return totalSize;\n } catch (error) {\n console.log('Calculate file sizes error: ', error); // eslint-disable-line\n return null;\n }\n}\n\nasync function getTotalFilesSize(dirPath) {\n let totalFileSize = 0;\n\n const files = await fs.readdir(dirPath);\n\n for (const file of files) {\n const fileStat = await fs.stat(join(dirPath, file));\n if (fileStat.isDirectory()) {\n totalFileSize += await getTotalFilesSize(join(dirPath, file));\n } else {\n totalFileSize += fileStat.size;\n }\n }\n return totalFileSize;\n}\n"],"file":"statistic-utills.js"}
|
package/dist/esm/pgm-loader.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/tile-converter",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.14",
|
|
4
4
|
"description": "Converter",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -39,18 +39,18 @@
|
|
|
39
39
|
"build-converter-bundle": "webpack --config ./converter-webpack/bundle.js"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@loaders.gl/3d-tiles": "3.0.
|
|
43
|
-
"@loaders.gl/core": "3.0.
|
|
44
|
-
"@loaders.gl/crypto": "3.0.
|
|
45
|
-
"@loaders.gl/draco": "3.0.
|
|
46
|
-
"@loaders.gl/gltf": "3.0.
|
|
47
|
-
"@loaders.gl/i3s": "3.0.
|
|
48
|
-
"@loaders.gl/images": "3.0.
|
|
49
|
-
"@loaders.gl/loader-utils": "3.0.
|
|
50
|
-
"@loaders.gl/polyfills": "3.0.
|
|
51
|
-
"@loaders.gl/tiles": "3.0.
|
|
52
|
-
"@loaders.gl/worker-utils": "3.0.
|
|
53
|
-
"@loaders.gl/zip": "3.0.
|
|
42
|
+
"@loaders.gl/3d-tiles": "3.0.14",
|
|
43
|
+
"@loaders.gl/core": "3.0.14",
|
|
44
|
+
"@loaders.gl/crypto": "3.0.14",
|
|
45
|
+
"@loaders.gl/draco": "3.0.14",
|
|
46
|
+
"@loaders.gl/gltf": "3.0.14",
|
|
47
|
+
"@loaders.gl/i3s": "3.0.14",
|
|
48
|
+
"@loaders.gl/images": "3.0.14",
|
|
49
|
+
"@loaders.gl/loader-utils": "3.0.14",
|
|
50
|
+
"@loaders.gl/polyfills": "3.0.14",
|
|
51
|
+
"@loaders.gl/tiles": "3.0.14",
|
|
52
|
+
"@loaders.gl/worker-utils": "3.0.14",
|
|
53
|
+
"@loaders.gl/zip": "3.0.14",
|
|
54
54
|
"@luma.gl/engine": "^8.5.0",
|
|
55
55
|
"@math.gl/core": "^3.5.1",
|
|
56
56
|
"@math.gl/culling": "^3.5.1",
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"morgan": "~1.9.1",
|
|
67
67
|
"uuid": "^8.1.0"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "dc931768fc34de549ef6baeb94e2ee5aa8163baf"
|
|
70
70
|
}
|
|
@@ -21,7 +21,7 @@ import type {
|
|
|
21
21
|
} from '@loaders.gl/i3s';
|
|
22
22
|
import {load} from '@loaders.gl/core';
|
|
23
23
|
import {Tileset3D} from '@loaders.gl/tiles';
|
|
24
|
-
import {CesiumIonLoader} from '@loaders.gl/3d-tiles';
|
|
24
|
+
import {CesiumIonLoader, Tiles3DLoader} from '@loaders.gl/3d-tiles';
|
|
25
25
|
import {join} from 'path';
|
|
26
26
|
import {v4 as uuidv4} from 'uuid';
|
|
27
27
|
import process from 'process';
|
|
@@ -51,6 +51,7 @@ import {SHARED_RESOURCES_TEMPLATE} from './json-templates/shared-resources';
|
|
|
51
51
|
import {validateNodeBoundingVolumes} from './helpers/node-debug';
|
|
52
52
|
import {GeoidHeightModel} from '../lib/geoid-height-model';
|
|
53
53
|
import TileHeader from '@loaders.gl/tiles/src/tileset/tile-3d';
|
|
54
|
+
import {LoaderWithParser} from '@loaders.gl/loader-utils';
|
|
54
55
|
|
|
55
56
|
const ION_DEFAULT_TOKEN =
|
|
56
57
|
process.env.IonToken || // eslint-disable-line
|
|
@@ -63,6 +64,7 @@ const SHORT_INT_TYPE = 'Int32';
|
|
|
63
64
|
const DOUBLE_TYPE = 'double';
|
|
64
65
|
const OBJECT_ID_TYPE = 'OBJECTID';
|
|
65
66
|
const REFRESH_TOKEN_TIMEOUT = 1800; // 30 minutes in seconds
|
|
67
|
+
const CESIUM_DATASET_PREFIX = 'https://';
|
|
66
68
|
// const FS_FILE_TOO_LARGE = 'ERR_FS_FILE_TOO_LARGE';
|
|
67
69
|
|
|
68
70
|
/**
|
|
@@ -88,6 +90,7 @@ export default class I3SConverter {
|
|
|
88
90
|
refreshTokenTime: [number, number];
|
|
89
91
|
sourceTileset: Tileset3D | null;
|
|
90
92
|
geoidHeightModel: GeoidHeightModel | null;
|
|
93
|
+
Loader: LoaderWithParser = Tiles3DLoader;
|
|
91
94
|
|
|
92
95
|
constructor() {
|
|
93
96
|
this.nodePages = new NodePages(writeFile, HARDCODED_NODES_PER_PAGE);
|
|
@@ -148,6 +151,7 @@ export default class I3SConverter {
|
|
|
148
151
|
} = options;
|
|
149
152
|
this.options = {maxDepth, slpk, sevenZipExe, egmFilePath, draco, token, inputUrl};
|
|
150
153
|
this.validate = validate;
|
|
154
|
+
this.Loader = inputUrl.indexOf(CESIUM_DATASET_PREFIX) !== -1 ? CesiumIonLoader : Tiles3DLoader;
|
|
151
155
|
|
|
152
156
|
console.log('Loading egm file...'); // eslint-disable-line
|
|
153
157
|
this.geoidHeightModel = await load(egmFilePath, PGMLoader);
|
|
@@ -163,7 +167,7 @@ export default class I3SConverter {
|
|
|
163
167
|
tilesetOptions.loadOptions.fetch = {headers: preloadOptions.headers};
|
|
164
168
|
}
|
|
165
169
|
Object.assign(tilesetOptions, preloadOptions);
|
|
166
|
-
const sourceTilesetJson = await load(inputUrl,
|
|
170
|
+
const sourceTilesetJson = await load(inputUrl, this.Loader, tilesetOptions.loadOptions);
|
|
167
171
|
// console.log(tilesetJson); // eslint-disable-line
|
|
168
172
|
this.sourceTileset = new Tileset3D(sourceTilesetJson, tilesetOptions);
|
|
169
173
|
|
|
@@ -1159,10 +1163,13 @@ export default class I3SConverter {
|
|
|
1159
1163
|
* Fetch preload options for ION tileset
|
|
1160
1164
|
*/
|
|
1161
1165
|
private async _fetchPreloadOptions(): Promise<any> {
|
|
1166
|
+
if (!this.Loader.preload) {
|
|
1167
|
+
return {};
|
|
1168
|
+
}
|
|
1162
1169
|
const options = {
|
|
1163
1170
|
'cesium-ion': {accessToken: this.options.token || ION_DEFAULT_TOKEN}
|
|
1164
1171
|
};
|
|
1165
|
-
const preloadOptions = await
|
|
1172
|
+
const preloadOptions = await this.Loader.preload(this.options.inputUrl, options);
|
|
1166
1173
|
this.refreshTokenTime = process.hrtime();
|
|
1167
1174
|
return {...options, ...preloadOptions};
|
|
1168
1175
|
}
|