@loaders.gl/tile-converter 3.4.4 → 3.4.6
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/3d-tiles-attributes-worker.js +1 -1
- package/dist/converter.min.js +2 -2
- package/dist/deps-installer/deps-installer.d.ts.map +1 -1
- package/dist/deps-installer/deps-installer.js +4 -3
- package/dist/dist.min.js +4 -2
- package/dist/es5/3d-tiles-attributes-worker.js +1 -1
- package/dist/es5/deps-installer/deps-installer.js +5 -4
- package/dist/es5/deps-installer/deps-installer.js.map +1 -1
- package/dist/es5/i3s-attributes-worker.js +1 -1
- package/dist/es5/pgm-loader.js +1 -1
- package/dist/esm/3d-tiles-attributes-worker.js +1 -1
- package/dist/esm/deps-installer/deps-installer.js +5 -4
- package/dist/esm/deps-installer/deps-installer.js.map +1 -1
- package/dist/esm/i3s-attributes-worker.js +1 -1
- package/dist/esm/pgm-loader.js +1 -1
- package/dist/i3s-converter/helpers/node-pages.js +1 -1
- package/package.json +15 -15
- package/src/deps-installer/deps-installer.ts +4 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps-installer.d.ts","sourceRoot":"","sources":["../../src/deps-installer/deps-installer.ts"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH,qBAAa,aAAa;IACxB;;;;;;OAMG;IACG,OAAO,CAAC,IAAI,GAAE,MAAW,EAAE,WAAW,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"deps-installer.d.ts","sourceRoot":"","sources":["../../src/deps-installer/deps-installer.ts"],"names":[],"mappings":"AAWA;;;;;GAKG;AACH,qBAAa,aAAa;IACxB;;;;;;OAMG;IACG,OAAO,CAAC,IAAI,GAAE,MAAW,EAAE,WAAW,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC;YAmC3D,aAAa;CAW5B"}
|
|
@@ -40,12 +40,13 @@ class DepsInstaller {
|
|
|
40
40
|
console.log('Installing "join-images" npm package');
|
|
41
41
|
const childProcess = new worker_utils_1.ChildProcessProxy();
|
|
42
42
|
await childProcess.start({
|
|
43
|
-
command: 'npm',
|
|
43
|
+
command: process.platform === 'win32' ? 'npm.cmd' : 'npm',
|
|
44
44
|
// `npm install sharp join-images` works unstable. It fails because installed `sharp` version
|
|
45
45
|
// may be different from the version required by `join-images`. Pointing to specific versions
|
|
46
46
|
// resolve this issue
|
|
47
|
-
arguments: ['install', 'sharp
|
|
48
|
-
wait: 0
|
|
47
|
+
arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],
|
|
48
|
+
wait: 0,
|
|
49
|
+
ignoreStderr: true
|
|
49
50
|
});
|
|
50
51
|
console.log('All dependencies were installed succesfully.'); // eslint-disable-line no-console
|
|
51
52
|
}
|
package/dist/dist.min.js
CHANGED
|
@@ -47225,8 +47225,10 @@ var ChildProcessProxy = class {
|
|
|
47225
47225
|
});
|
|
47226
47226
|
childProcess.stderr.on("data", (data) => {
|
|
47227
47227
|
console.log(`Child process wrote to stderr: "${data}".`);
|
|
47228
|
-
|
|
47229
|
-
|
|
47228
|
+
if (!props.ignoreStderr) {
|
|
47229
|
+
this._clearTimeout();
|
|
47230
|
+
reject(new Error(data));
|
|
47231
|
+
}
|
|
47230
47232
|
});
|
|
47231
47233
|
childProcess.on("error", (error) => {
|
|
47232
47234
|
console.log(`Child process errored with ${error}`);
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports._typecheckI3SAttributesWorker = exports.Tile3dAttributesWorker = void 0;
|
|
7
7
|
exports.transform3DTilesAttributesOnWorker = transform3DTilesAttributesOnWorker;
|
|
8
8
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
9
|
-
var VERSION = typeof "3.4.
|
|
9
|
+
var VERSION = typeof "3.4.6" !== 'undefined' ? "3.4.6" : 'latest';
|
|
10
10
|
var Tile3dAttributesWorker = {
|
|
11
11
|
id: '3d-tiles-attributes',
|
|
12
12
|
name: '3DTiles Attributes Worker',
|
|
@@ -14,7 +14,7 @@ var _zip = require("@loaders.gl/zip");
|
|
|
14
14
|
var _fileUtils = require("../lib/utils/file-utils");
|
|
15
15
|
var _path = require("path");
|
|
16
16
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
17
|
-
var VERSION = typeof "3.4.
|
|
17
|
+
var VERSION = typeof "3.4.6" !== 'undefined' ? "3.4.6" : 'latest';
|
|
18
18
|
var PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
|
|
19
19
|
var DepsInstaller = function () {
|
|
20
20
|
function DepsInstaller() {
|
|
@@ -63,9 +63,10 @@ var DepsInstaller = function () {
|
|
|
63
63
|
childProcess = new _workerUtils.ChildProcessProxy();
|
|
64
64
|
_context.next = 23;
|
|
65
65
|
return childProcess.start({
|
|
66
|
-
command: 'npm',
|
|
67
|
-
arguments: ['install', 'sharp
|
|
68
|
-
wait: 0
|
|
66
|
+
command: process.platform === 'win32' ? 'npm.cmd' : 'npm',
|
|
67
|
+
arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],
|
|
68
|
+
wait: 0,
|
|
69
|
+
ignoreStderr: true
|
|
69
70
|
});
|
|
70
71
|
case 23:
|
|
71
72
|
console.log('All dependencies were installed succesfully.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps-installer.js","names":["_core","require","_zip","_fileUtils","_path","_workerUtils","VERSION","PGM_LINK","DepsInstaller","_classCallCheck2","default","_createClass2","key","value","_install","_asyncToGenerator2","_regenerator","mark","_callee","path","workersPath","fileMap","depsPath","childProcess","_args","arguments","wrap","_callee$","_context","prev","next","length","undefined","console","log","load","ZipLoader","sent","process","cwd","join","writeFile","Uint8Array","installWorker","ChildProcessProxy","start","command","wait","stop","install","apply","_installWorker","_callee2","module","name","extraPath","fileResponse","fileData","_callee2$","_context2","fetchFile","concat","arrayBuffer","abrupt","_x","_x2","_x3","exports"],"sources":["../../../src/deps-installer/deps-installer.ts"],"sourcesContent":["import {load, fetchFile} from '@loaders.gl/core';\nimport {ZipLoader} from '@loaders.gl/zip';\nimport {writeFile} from '../lib/utils/file-utils';\nimport {join} from 'path';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\n\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\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 * @param workersPath destination folder for workers.\n * This path is '' by default and is not used by tile-converter.\n * It is used in tests to prevent rewriting actual workers during tests running\n */\n async install(path: string = '', workersPath: 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('Installing \"I3S Content Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('i3s', 'i3s-content-nodejs-worker.js', workersPath);\n\n console.log('Installing \"Draco Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('draco', 'draco-nodejs-worker.js', workersPath);\n\n console.log('Installing \"Basis Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('textures', 'basis-nodejs-worker.js', workersPath);\n\n console.log('Installing \"join-images\" npm package');\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: 'npm',\n // `npm install sharp join-images` works unstable. It fails because installed `sharp` version\n // may be different from the version required by `join-images`. Pointing to specific versions\n // resolve this issue\n arguments: ['install', 'sharp
|
|
1
|
+
{"version":3,"file":"deps-installer.js","names":["_core","require","_zip","_fileUtils","_path","_workerUtils","VERSION","PGM_LINK","DepsInstaller","_classCallCheck2","default","_createClass2","key","value","_install","_asyncToGenerator2","_regenerator","mark","_callee","path","workersPath","fileMap","depsPath","childProcess","_args","arguments","wrap","_callee$","_context","prev","next","length","undefined","console","log","load","ZipLoader","sent","process","cwd","join","writeFile","Uint8Array","installWorker","ChildProcessProxy","start","command","platform","wait","ignoreStderr","stop","install","apply","_installWorker","_callee2","module","name","extraPath","fileResponse","fileData","_callee2$","_context2","fetchFile","concat","arrayBuffer","abrupt","_x","_x2","_x3","exports"],"sources":["../../../src/deps-installer/deps-installer.ts"],"sourcesContent":["import {load, fetchFile} from '@loaders.gl/core';\nimport {ZipLoader} from '@loaders.gl/zip';\nimport {writeFile} from '../lib/utils/file-utils';\nimport {join} from 'path';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\n\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\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 * @param workersPath destination folder for workers.\n * This path is '' by default and is not used by tile-converter.\n * It is used in tests to prevent rewriting actual workers during tests running\n */\n async install(path: string = '', workersPath: 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('Installing \"I3S Content Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('i3s', 'i3s-content-nodejs-worker.js', workersPath);\n\n console.log('Installing \"Draco Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('draco', 'draco-nodejs-worker.js', workersPath);\n\n console.log('Installing \"Basis Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('textures', 'basis-nodejs-worker.js', workersPath);\n\n console.log('Installing \"join-images\" npm package');\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: process.platform === 'win32' ? 'npm.cmd' : 'npm',\n // `npm install sharp join-images` works unstable. It fails because installed `sharp` version\n // may be different from the version required by `join-images`. Pointing to specific versions\n // resolve this issue\n arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],\n wait: 0,\n ignoreStderr: true\n });\n\n console.log('All dependencies were installed succesfully.'); // eslint-disable-line no-console\n }\n\n private async installWorker(module: string, name: string, extraPath: string) {\n const fileResponse = await fetchFile(\n `https://unpkg.com/@loaders.gl/${module}@${VERSION}/dist/${name}`\n );\n const fileData = await fileResponse.arrayBuffer();\n if (!fileData) {\n return;\n }\n const path = join(process.cwd(), extraPath, 'modules', module, 'dist');\n await writeFile(path, fileData, name);\n }\n}\n"],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports._typecheckI3SAttributesWorker = exports.I3SAttributesWorker = void 0;
|
|
7
7
|
exports.transformI3SAttributesOnWorker = transformI3SAttributesOnWorker;
|
|
8
8
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
9
|
-
var VERSION = typeof "3.4.
|
|
9
|
+
var VERSION = typeof "3.4.6" !== 'undefined' ? "3.4.6" : 'latest';
|
|
10
10
|
var I3SAttributesWorker = {
|
|
11
11
|
id: 'i3s-attributes',
|
|
12
12
|
name: 'I3S Attributes Worker',
|
package/dist/es5/pgm-loader.js
CHANGED
|
@@ -8,7 +8,7 @@ exports.PGMLoader = void 0;
|
|
|
8
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
10
10
|
var _geoid = require("@math.gl/geoid");
|
|
11
|
-
var VERSION = typeof "3.4.
|
|
11
|
+
var VERSION = typeof "3.4.6" !== 'undefined' ? "3.4.6" : 'latest';
|
|
12
12
|
var PGMLoader = {
|
|
13
13
|
name: 'PGM - Netpbm grayscale image format',
|
|
14
14
|
id: 'pgm',
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { processOnWorker } from '@loaders.gl/worker-utils';
|
|
2
|
-
const VERSION = typeof "3.4.
|
|
2
|
+
const VERSION = typeof "3.4.6" !== 'undefined' ? "3.4.6" : 'latest';
|
|
3
3
|
export const Tile3dAttributesWorker = {
|
|
4
4
|
id: '3d-tiles-attributes',
|
|
5
5
|
name: '3DTiles Attributes Worker',
|
|
@@ -3,7 +3,7 @@ import { ZipLoader } from '@loaders.gl/zip';
|
|
|
3
3
|
import { writeFile } from '../lib/utils/file-utils';
|
|
4
4
|
import { join } from 'path';
|
|
5
5
|
import { ChildProcessProxy } from '@loaders.gl/worker-utils';
|
|
6
|
-
const VERSION = typeof "3.4.
|
|
6
|
+
const VERSION = typeof "3.4.6" !== 'undefined' ? "3.4.6" : 'latest';
|
|
7
7
|
const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
|
|
8
8
|
export class DepsInstaller {
|
|
9
9
|
async install() {
|
|
@@ -25,9 +25,10 @@ export class DepsInstaller {
|
|
|
25
25
|
console.log('Installing "join-images" npm package');
|
|
26
26
|
const childProcess = new ChildProcessProxy();
|
|
27
27
|
await childProcess.start({
|
|
28
|
-
command: 'npm',
|
|
29
|
-
arguments: ['install', 'sharp
|
|
30
|
-
wait: 0
|
|
28
|
+
command: process.platform === 'win32' ? 'npm.cmd' : 'npm',
|
|
29
|
+
arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],
|
|
30
|
+
wait: 0,
|
|
31
|
+
ignoreStderr: true
|
|
31
32
|
});
|
|
32
33
|
console.log('All dependencies were installed succesfully.');
|
|
33
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deps-installer.js","names":["load","fetchFile","ZipLoader","writeFile","join","ChildProcessProxy","VERSION","PGM_LINK","DepsInstaller","install","path","arguments","length","undefined","workersPath","console","log","fileMap","depsPath","process","cwd","Uint8Array","installWorker","childProcess","start","command","wait","module","name","extraPath","fileResponse","concat","fileData","arrayBuffer"],"sources":["../../../src/deps-installer/deps-installer.ts"],"sourcesContent":["import {load, fetchFile} from '@loaders.gl/core';\nimport {ZipLoader} from '@loaders.gl/zip';\nimport {writeFile} from '../lib/utils/file-utils';\nimport {join} from 'path';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\n\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\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 * @param workersPath destination folder for workers.\n * This path is '' by default and is not used by tile-converter.\n * It is used in tests to prevent rewriting actual workers during tests running\n */\n async install(path: string = '', workersPath: 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('Installing \"I3S Content Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('i3s', 'i3s-content-nodejs-worker.js', workersPath);\n\n console.log('Installing \"Draco Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('draco', 'draco-nodejs-worker.js', workersPath);\n\n console.log('Installing \"Basis Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('textures', 'basis-nodejs-worker.js', workersPath);\n\n console.log('Installing \"join-images\" npm package');\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: 'npm',\n // `npm install sharp join-images` works unstable. It fails because installed `sharp` version\n // may be different from the version required by `join-images`. Pointing to specific versions\n // resolve this issue\n arguments: ['install', 'sharp
|
|
1
|
+
{"version":3,"file":"deps-installer.js","names":["load","fetchFile","ZipLoader","writeFile","join","ChildProcessProxy","VERSION","PGM_LINK","DepsInstaller","install","path","arguments","length","undefined","workersPath","console","log","fileMap","depsPath","process","cwd","Uint8Array","installWorker","childProcess","start","command","platform","wait","ignoreStderr","module","name","extraPath","fileResponse","concat","fileData","arrayBuffer"],"sources":["../../../src/deps-installer/deps-installer.ts"],"sourcesContent":["import {load, fetchFile} from '@loaders.gl/core';\nimport {ZipLoader} from '@loaders.gl/zip';\nimport {writeFile} from '../lib/utils/file-utils';\nimport {join} from 'path';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\n\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\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 * @param workersPath destination folder for workers.\n * This path is '' by default and is not used by tile-converter.\n * It is used in tests to prevent rewriting actual workers during tests running\n */\n async install(path: string = '', workersPath: 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('Installing \"I3S Content Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('i3s', 'i3s-content-nodejs-worker.js', workersPath);\n\n console.log('Installing \"Draco Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('draco', 'draco-nodejs-worker.js', workersPath);\n\n console.log('Installing \"Basis Loader worker\"'); // eslint-disable-line no-console\n await this.installWorker('textures', 'basis-nodejs-worker.js', workersPath);\n\n console.log('Installing \"join-images\" npm package');\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: process.platform === 'win32' ? 'npm.cmd' : 'npm',\n // `npm install sharp join-images` works unstable. It fails because installed `sharp` version\n // may be different from the version required by `join-images`. Pointing to specific versions\n // resolve this issue\n arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],\n wait: 0,\n ignoreStderr: true\n });\n\n console.log('All dependencies were installed succesfully.'); // eslint-disable-line no-console\n }\n\n private async installWorker(module: string, name: string, extraPath: string) {\n const fileResponse = await fetchFile(\n `https://unpkg.com/@loaders.gl/${module}@${VERSION}/dist/${name}`\n );\n const fileData = await fileResponse.arrayBuffer();\n if (!fileData) {\n return;\n }\n const path = join(process.cwd(), extraPath, 'modules', module, 'dist');\n await writeFile(path, fileData, name);\n }\n}\n"],"mappings":"AAAA,SAAQA,IAAI,EAAEC,SAAS,QAAO,kBAAkB;AAChD,SAAQC,SAAS,QAAO,iBAAiB;AACzC,SAAQC,SAAS,QAAO,yBAAyB;AACjD,SAAQC,IAAI,QAAO,MAAM;AACzB,SAAQC,iBAAiB,QAAO,0BAA0B;AAG1D,MAAMC,OAAO,GAAG,cAAkB,KAAK,WAAW,aAAiB,QAAQ;AAE3E,MAAMC,QAAQ,GAAG,+EAA+E;AAQhG,OAAO,MAAMC,aAAa,CAAC;EAQzB,MAAMC,OAAOA,CAAA,EAA6D;IAAA,IAA5DC,IAAY,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;IAAA,IAAEG,WAAmB,GAAAH,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;IACvDI,OAAO,CAACC,GAAG,CAAC,iCAAiC,CAAC;IAC9C,MAAMC,OAAO,GAAG,MAAMjB,IAAI,CAACO,QAAQ,EAAEL,SAAS,EAAE,CAAC,CAAC,CAAC;IAEnD,IAAIgB,QAAQ,GAAGC,OAAO,CAACC,GAAG,CAAC,CAAC;IAC5B,IAAIV,IAAI,EAAE;MACRQ,QAAQ,GAAGd,IAAI,CAACc,QAAQ,EAAER,IAAI,CAAC;IACjC;IAEA,MAAMP,SAAS,CAACe,QAAQ,EAAE,IAAIG,UAAU,CAACJ,OAAO,CAAC,sBAAsB,CAAC,CAAC,EAAE,eAAe,CAAC;IAE3FF,OAAO,CAACC,GAAG,CAAC,wCAAwC,CAAC;IACrD,MAAM,IAAI,CAACM,aAAa,CAAC,KAAK,EAAE,8BAA8B,EAAER,WAAW,CAAC;IAE5EC,OAAO,CAACC,GAAG,CAAC,kCAAkC,CAAC;IAC/C,MAAM,IAAI,CAACM,aAAa,CAAC,OAAO,EAAE,wBAAwB,EAAER,WAAW,CAAC;IAExEC,OAAO,CAACC,GAAG,CAAC,kCAAkC,CAAC;IAC/C,MAAM,IAAI,CAACM,aAAa,CAAC,UAAU,EAAE,wBAAwB,EAAER,WAAW,CAAC;IAE3EC,OAAO,CAACC,GAAG,CAAC,sCAAsC,CAAC;IACnD,MAAMO,YAAY,GAAG,IAAIlB,iBAAiB,CAAC,CAAC;IAC5C,MAAMkB,YAAY,CAACC,KAAK,CAAC;MACvBC,OAAO,EAAEN,OAAO,CAACO,QAAQ,KAAK,OAAO,GAAG,SAAS,GAAG,KAAK;MAIzDf,SAAS,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,mBAAmB,CAAC;MAC3DgB,IAAI,EAAE,CAAC;MACPC,YAAY,EAAE;IAChB,CAAC,CAAC;IAEFb,OAAO,CAACC,GAAG,CAAC,8CAA8C,CAAC;EAC7D;EAEA,MAAcM,aAAaA,CAACO,MAAc,EAAEC,IAAY,EAAEC,SAAiB,EAAE;IAC3E,MAAMC,YAAY,GAAG,MAAM/B,SAAS,kCAAAgC,MAAA,CACDJ,MAAM,OAAAI,MAAA,CAAI3B,OAAO,YAAA2B,MAAA,CAASH,IAAI,CACjE,CAAC;IACD,MAAMI,QAAQ,GAAG,MAAMF,YAAY,CAACG,WAAW,CAAC,CAAC;IACjD,IAAI,CAACD,QAAQ,EAAE;MACb;IACF;IACA,MAAMxB,IAAI,GAAGN,IAAI,CAACe,OAAO,CAACC,GAAG,CAAC,CAAC,EAAEW,SAAS,EAAE,SAAS,EAAEF,MAAM,EAAE,MAAM,CAAC;IACtE,MAAM1B,SAAS,CAACO,IAAI,EAAEwB,QAAQ,EAAEJ,IAAI,CAAC;EACvC;AACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { processOnWorker } from '@loaders.gl/worker-utils';
|
|
2
|
-
const VERSION = typeof "3.4.
|
|
2
|
+
const VERSION = typeof "3.4.6" !== 'undefined' ? "3.4.6" : 'latest';
|
|
3
3
|
export const I3SAttributesWorker = {
|
|
4
4
|
id: 'i3s-attributes',
|
|
5
5
|
name: 'I3S Attributes Worker',
|
package/dist/esm/pgm-loader.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { parsePGM } from '@math.gl/geoid';
|
|
2
|
-
const VERSION = typeof "3.4.
|
|
2
|
+
const VERSION = typeof "3.4.6" !== 'undefined' ? "3.4.6" : 'latest';
|
|
3
3
|
export const PGMLoader = {
|
|
4
4
|
name: 'PGM - Netpbm grayscale image format',
|
|
5
5
|
id: 'pgm',
|
|
@@ -11,7 +11,7 @@ const file_utils_1 = require("../../lib/utils/file-utils");
|
|
|
11
11
|
* class NodePages - wrapper of nodePages array
|
|
12
12
|
*
|
|
13
13
|
* @example
|
|
14
|
-
* import {writeFile} from './helpers/write-file
|
|
14
|
+
* import {writeFile} from './helpers/write-file';
|
|
15
15
|
*
|
|
16
16
|
* // create an instance of the class
|
|
17
17
|
* const nodePages = new NodePages(writeFile, HARDCODED_NODES_PER_PAGE);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/tile-converter",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.6",
|
|
4
4
|
"description": "Converter",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -44,19 +44,19 @@
|
|
|
44
44
|
"build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node14 --external:join-images --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@loaders.gl/3d-tiles": "3.4.
|
|
48
|
-
"@loaders.gl/crypto": "3.4.
|
|
49
|
-
"@loaders.gl/draco": "3.4.
|
|
50
|
-
"@loaders.gl/gltf": "3.4.
|
|
51
|
-
"@loaders.gl/i3s": "3.4.
|
|
52
|
-
"@loaders.gl/images": "3.4.
|
|
53
|
-
"@loaders.gl/loader-utils": "3.4.
|
|
54
|
-
"@loaders.gl/polyfills": "3.4.
|
|
55
|
-
"@loaders.gl/schema": "3.4.
|
|
56
|
-
"@loaders.gl/textures": "3.4.
|
|
57
|
-
"@loaders.gl/tiles": "3.4.
|
|
58
|
-
"@loaders.gl/worker-utils": "3.4.
|
|
59
|
-
"@loaders.gl/zip": "3.4.
|
|
47
|
+
"@loaders.gl/3d-tiles": "3.4.6",
|
|
48
|
+
"@loaders.gl/crypto": "3.4.6",
|
|
49
|
+
"@loaders.gl/draco": "3.4.6",
|
|
50
|
+
"@loaders.gl/gltf": "3.4.6",
|
|
51
|
+
"@loaders.gl/i3s": "3.4.6",
|
|
52
|
+
"@loaders.gl/images": "3.4.6",
|
|
53
|
+
"@loaders.gl/loader-utils": "3.4.6",
|
|
54
|
+
"@loaders.gl/polyfills": "3.4.6",
|
|
55
|
+
"@loaders.gl/schema": "3.4.6",
|
|
56
|
+
"@loaders.gl/textures": "3.4.6",
|
|
57
|
+
"@loaders.gl/tiles": "3.4.6",
|
|
58
|
+
"@loaders.gl/worker-utils": "3.4.6",
|
|
59
|
+
"@loaders.gl/zip": "3.4.6",
|
|
60
60
|
"@math.gl/core": "^3.5.1",
|
|
61
61
|
"@math.gl/culling": "^3.5.1",
|
|
62
62
|
"@math.gl/geoid": "^3.5.1",
|
|
@@ -79,5 +79,5 @@
|
|
|
79
79
|
"join-images": "^1.1.3",
|
|
80
80
|
"sharp": "^0.31.3"
|
|
81
81
|
},
|
|
82
|
-
"gitHead": "
|
|
82
|
+
"gitHead": "f878cbf97013ab99866390ef58e6ca26717af6cb"
|
|
83
83
|
}
|
|
@@ -46,12 +46,13 @@ export class DepsInstaller {
|
|
|
46
46
|
console.log('Installing "join-images" npm package');
|
|
47
47
|
const childProcess = new ChildProcessProxy();
|
|
48
48
|
await childProcess.start({
|
|
49
|
-
command: 'npm',
|
|
49
|
+
command: process.platform === 'win32' ? 'npm.cmd' : 'npm',
|
|
50
50
|
// `npm install sharp join-images` works unstable. It fails because installed `sharp` version
|
|
51
51
|
// may be different from the version required by `join-images`. Pointing to specific versions
|
|
52
52
|
// resolve this issue
|
|
53
|
-
arguments: ['install', 'sharp
|
|
54
|
-
wait: 0
|
|
53
|
+
arguments: ['install', 'sharp@0.30.4', 'join-images@1.1.3'],
|
|
54
|
+
wait: 0,
|
|
55
|
+
ignoreStderr: true
|
|
55
56
|
});
|
|
56
57
|
|
|
57
58
|
console.log('All dependencies were installed succesfully.'); // eslint-disable-line no-console
|