@basemaps/cli 6.38.0 → 6.40.0
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/CHANGELOG.md +45 -0
- package/build/cli/__tests__/util.test.d.ts +2 -0
- package/build/cli/__tests__/util.test.d.ts.map +1 -0
- package/build/cli/__tests__/util.test.js +14 -0
- package/build/cli/__tests__/util.test.js.map +1 -0
- package/build/cli/cogify/__tests__/batch.job.test.js +5 -11
- package/build/cli/cogify/__tests__/batch.job.test.js.map +1 -1
- package/build/cli/cogify/action.cog.d.ts +1 -0
- package/build/cli/cogify/action.cog.d.ts.map +1 -1
- package/build/cli/cogify/action.cog.js +13 -4
- package/build/cli/cogify/action.cog.js.map +1 -1
- package/build/cli/cogify/action.job.js +1 -1
- package/build/cli/cogify/action.make.cog.d.ts +4 -2
- package/build/cli/cogify/action.make.cog.d.ts.map +1 -1
- package/build/cli/cogify/action.make.cog.js +33 -12
- package/build/cli/cogify/action.make.cog.js.map +1 -1
- package/build/cli/cogify/action.make.cog.pr.d.ts +8 -0
- package/build/cli/cogify/action.make.cog.pr.d.ts.map +1 -1
- package/build/cli/cogify/action.make.cog.pr.js +26 -1
- package/build/cli/cogify/action.make.cog.pr.js.map +1 -1
- package/build/cli/cogify/batch.job.d.ts +1 -1
- package/build/cli/cogify/batch.job.d.ts.map +1 -1
- package/build/cli/cogify/batch.job.js +4 -3
- package/build/cli/cogify/batch.job.js.map +1 -1
- package/build/cli/config/action.imagery.config.d.ts.map +1 -1
- package/build/cli/config/action.imagery.config.js +14 -9
- package/build/cli/config/action.imagery.config.js.map +1 -1
- package/build/cli/config/action.import.d.ts +2 -0
- package/build/cli/config/action.import.d.ts.map +1 -1
- package/build/cli/config/action.import.js +46 -13
- package/build/cli/config/action.import.js.map +1 -1
- package/build/cli/github/make.cog.pr.d.ts +3 -2
- package/build/cli/github/make.cog.pr.d.ts.map +1 -1
- package/build/cli/github/make.cog.pr.js +18 -15
- package/build/cli/github/make.cog.pr.js.map +1 -1
- package/build/cli/overview/action.create.overview.d.ts.map +1 -1
- package/build/cli/overview/action.create.overview.js +12 -12
- package/build/cli/overview/action.create.overview.js.map +1 -1
- package/build/cli/overview/overview.wmts.d.ts.map +1 -1
- package/build/cli/overview/overview.wmts.js +0 -1
- package/build/cli/overview/overview.wmts.js.map +1 -1
- package/build/cli/server/action.serve.d.ts +2 -1
- package/build/cli/server/action.serve.d.ts.map +1 -1
- package/build/cli/server/action.serve.js +1 -1
- package/build/cli/server/action.serve.js.map +1 -1
- package/build/cli/util.d.ts +6 -0
- package/build/cli/util.d.ts.map +1 -1
- package/build/cli/util.js +14 -1
- package/build/cli/util.js.map +1 -1
- package/build/cog/__tests__/cog.vrt.test.js +12 -10
- package/build/cog/__tests__/cog.vrt.test.js.map +1 -1
- package/build/cog/__tests__/cutline.test.js +18 -26
- package/build/cog/__tests__/cutline.test.js.map +1 -1
- package/build/cog/cog.stac.job.d.ts +3 -4
- package/build/cog/cog.stac.job.d.ts.map +1 -1
- package/build/cog/cog.stac.job.js +5 -7
- package/build/cog/cog.stac.job.js.map +1 -1
- package/build/cog/constants.d.ts +1 -1
- package/build/cog/constants.js +1 -1
- package/build/cog/cutline.d.ts.map +1 -1
- package/build/cog/cutline.js +1 -1
- package/build/cog/cutline.js.map +1 -1
- package/build/cog/job.factory.d.ts +2 -3
- package/build/cog/job.factory.d.ts.map +1 -1
- package/build/cog/job.factory.js +2 -2
- package/build/cog/job.factory.js.map +1 -1
- package/build/gdal/gdal.docker.js +1 -1
- package/package.json +9 -8
- package/build/cli/cogify/imagery.config.d.ts +0 -14
- package/build/cli/cogify/imagery.config.d.ts.map +0 -1
- package/build/cli/cogify/imagery.config.js +0 -45
- package/build/cli/cogify/imagery.config.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,51 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [6.40.0](https://github.com/linz/basemaps/compare/v6.39.0...v6.40.0) (2023-03-16)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* increase PixelPadding to 200 ([#2723](https://github.com/linz/basemaps/issues/2723)) ([265e03a](https://github.com/linz/basemaps/commit/265e03a5350880125c411426dbc04e14eb2c2e1a))
|
|
12
|
+
* **cli:** use the STAC title if it exists as the imagery title BM-784 ([#2692](https://github.com/linz/basemaps/issues/2692)) ([f7d45f6](https://github.com/linz/basemaps/commit/f7d45f6657e636750d61cdde951c20bd57c2e160))
|
|
13
|
+
* **server:** make --no-config actually load the configuration from tiffs ([#2682](https://github.com/linz/basemaps/issues/2682)) ([019ee50](https://github.com/linz/basemaps/commit/019ee50ee22cda2ce143f9a012d4aaa9ffc0edc9))
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
### Features
|
|
17
|
+
|
|
18
|
+
* **cli:** Double the padding for low resolution imagery. ([#2713](https://github.com/linz/basemaps/issues/2713)) ([b6dafa1](https://github.com/linz/basemaps/commit/b6dafa170903a9c822351b99fc6a2c46e3db6c69))
|
|
19
|
+
* **cli:** Update a preview url for zoom level changes. ([#2699](https://github.com/linz/basemaps/issues/2699)) ([74ce320](https://github.com/linz/basemaps/commit/74ce3205a4317ae543a96432721a3f0f9ce4bf2c))
|
|
20
|
+
* **config:** Make the config title as not null. ([#2667](https://github.com/linz/basemaps/issues/2667)) ([5e54854](https://github.com/linz/basemaps/commit/5e54854c10327385037122f7b7aada6adf312fae))
|
|
21
|
+
* **server:** change CLI interface to support multiple tiff folders ([#2688](https://github.com/linz/basemaps/issues/2688)) ([7fcd310](https://github.com/linz/basemaps/commit/7fcd310425aaf02bbadab2bb3b89cce5b7462c8f))
|
|
22
|
+
* filter layers by date ([#2662](https://github.com/linz/basemaps/issues/2662)) ([745b6b6](https://github.com/linz/basemaps/commit/745b6b6e0ae40c5094647cf602ddf2bdd29a7d5f))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
# [6.39.0](https://github.com/linz/basemaps/compare/v6.38.0...v6.39.0) (2023-01-25)
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
### Bug Fixes
|
|
32
|
+
|
|
33
|
+
* **cli:** Create config to parse the title back to imagery name ([#2622](https://github.com/linz/basemaps/issues/2622)) ([1c304a2](https://github.com/linz/basemaps/commit/1c304a206170a2a4469411e5edfda370ef513e55))
|
|
34
|
+
* **cli:** Fix NZTM aligned level adjustment and allow to chunk more large jobs ([#2648](https://github.com/linz/basemaps/issues/2648)) ([ce1990b](https://github.com/linz/basemaps/commit/ce1990b3c21847e23fdae3011e3b705144479a27))
|
|
35
|
+
* **cli:** Fix the TileSet id for the create-config output url. ([#2641](https://github.com/linz/basemaps/issues/2641)) ([3ed158d](https://github.com/linz/basemaps/commit/3ed158d9f917700d2bc58dcf6b483f293ba4b2d1))
|
|
36
|
+
* **cli:** Remove the special charactors from title to the imagery name. ([#2643](https://github.com/linz/basemaps/issues/2643)) ([dc6d8cd](https://github.com/linz/basemaps/commit/dc6d8cdaca9b92d7efa303b9bb935be6dfae8d64))
|
|
37
|
+
* **cli:** restrict WMTSCapabilities to the maxZoom of the tiles generated ([#2650](https://github.com/linz/basemaps/issues/2650)) ([657ddb2](https://github.com/linz/basemaps/commit/657ddb257187fb8ed6d37a685816e6723917cf16))
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
### Features
|
|
41
|
+
|
|
42
|
+
* **cli:** Add category when creating imagery import pull request. ([#2647](https://github.com/linz/basemaps/issues/2647)) ([4113f21](https://github.com/linz/basemaps/commit/4113f213cb459da9f3ed5c34ce64d4a7a8d7c25c))
|
|
43
|
+
* **cli:** Add Concurrency for the make cog cli. ([#2640](https://github.com/linz/basemaps/issues/2640)) ([d95537f](https://github.com/linz/basemaps/commit/d95537ff7051ee3468b70aa441410b74e9dcf39f))
|
|
44
|
+
* **cli:** Remove the nztm aligned level offset adjustment. ([#2655](https://github.com/linz/basemaps/issues/2655)) ([d4715ac](https://github.com/linz/basemaps/commit/d4715ac0b57171da4d97787d59b0b11d63ac94fb))
|
|
45
|
+
* **cli:** Update urls for the vector data and style changes. ([#2626](https://github.com/linz/basemaps/issues/2626)) ([6eab1a8](https://github.com/linz/basemaps/commit/6eab1a8f81749f60fbff881597bede31fb5db6b4))
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
|
|
6
51
|
# [6.38.0](https://github.com/linz/basemaps/compare/v6.37.0...v6.38.0) (2022-12-11)
|
|
7
52
|
|
|
8
53
|
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"util.test.d.ts","sourceRoot":"","sources":["../../../src/cli/__tests__/util.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import o from 'ospec';
|
|
2
|
+
import { nameImageryTitle } from '../util.js';
|
|
3
|
+
o.spec('util', () => {
|
|
4
|
+
o('nameImageryTitle', () => {
|
|
5
|
+
o(nameImageryTitle('Palmerston-north urban 2016-17 12.125m')).equals('palmerston-north_urban_2016-17_12-125m');
|
|
6
|
+
o(nameImageryTitle('Palmerston-north urban 2016-17 12-125')).equals('palmerston-north_urban_2016-17_12-125');
|
|
7
|
+
o(nameImageryTitle('Palmerston-north / urban 2016-17 12.125')).equals('palmerston-north_urban_2016-17_12-125');
|
|
8
|
+
o(nameImageryTitle('Palmerston.north / urban 2016-17 12.125')).equals('palmerston-north_urban_2016-17_12-125');
|
|
9
|
+
o(nameImageryTitle('Manawatū urban 2016-17 12.125m')).equals('manawatu_urban_2016-17_12-125m');
|
|
10
|
+
o(nameImageryTitle('ĀāĒēĪīŌōŪū urban 2016-17 12.125m')).equals('aaeeiioouu_urban_2016-17_12-125m');
|
|
11
|
+
o(nameImageryTitle('Marlborough / Wellington 0.75m SNC50451 (2004-2005)')).equals('marlborough_wellington_0-75m_snc50451_2004-2005');
|
|
12
|
+
});
|
|
13
|
+
});
|
|
14
|
+
//# sourceMappingURL=util.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"util.test.js","sourceRoot":"","sources":["../../../src/cli/__tests__/util.test.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;IAClB,CAAC,CAAC,kBAAkB,EAAE,GAAG,EAAE;QACzB,CAAC,CAAC,gBAAgB,CAAC,wCAAwC,CAAC,CAAC,CAAC,MAAM,CAAC,wCAAwC,CAAC,CAAC;QAC/G,CAAC,CAAC,gBAAgB,CAAC,uCAAuC,CAAC,CAAC,CAAC,MAAM,CAAC,uCAAuC,CAAC,CAAC;QAC7G,CAAC,CAAC,gBAAgB,CAAC,yCAAyC,CAAC,CAAC,CAAC,MAAM,CAAC,uCAAuC,CAAC,CAAC;QAC/G,CAAC,CAAC,gBAAgB,CAAC,yCAAyC,CAAC,CAAC,CAAC,MAAM,CAAC,uCAAuC,CAAC,CAAC;QAC/G,CAAC,CAAC,gBAAgB,CAAC,gCAAgC,CAAC,CAAC,CAAC,MAAM,CAAC,gCAAgC,CAAC,CAAC;QAC/F,CAAC,CAAC,gBAAgB,CAAC,kCAAkC,CAAC,CAAC,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC;QACnG,CAAC,CAAC,gBAAgB,CAAC,qDAAqD,CAAC,CAAC,CAAC,MAAM,CAC/E,iDAAiD,CAClD,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -51,14 +51,9 @@ o.spec('action.batch', () => {
|
|
|
51
51
|
const fakeJob = { id: '01FHRPYJ5FV1XAARZAC4T4K6MC', output: { files: fakeFiles, gsd: fakeGsd } };
|
|
52
52
|
o('should prepare valid chunk jobs', async () => {
|
|
53
53
|
o(BatchJob.getJobs(fakeJob, new Set(), LogConfig.get())).deepEquals([
|
|
54
|
-
[fakeFiles[2].name],
|
|
55
|
-
[fakeFiles[5].name],
|
|
56
|
-
[fakeFiles[13].name],
|
|
54
|
+
[fakeFiles[0].name, fakeFiles[1].name, fakeFiles[2].name],
|
|
55
|
+
[fakeFiles[3].name, fakeFiles[4].name, fakeFiles[5].name],
|
|
57
56
|
[
|
|
58
|
-
fakeFiles[0].name,
|
|
59
|
-
fakeFiles[1].name,
|
|
60
|
-
fakeFiles[3].name,
|
|
61
|
-
fakeFiles[4].name,
|
|
62
57
|
fakeFiles[6].name,
|
|
63
58
|
fakeFiles[7].name,
|
|
64
59
|
fakeFiles[8].name,
|
|
@@ -66,8 +61,9 @@ o.spec('action.batch', () => {
|
|
|
66
61
|
fakeFiles[10].name,
|
|
67
62
|
fakeFiles[11].name,
|
|
68
63
|
fakeFiles[12].name,
|
|
69
|
-
fakeFiles[
|
|
64
|
+
fakeFiles[13].name,
|
|
70
65
|
],
|
|
66
|
+
[fakeFiles[14].name],
|
|
71
67
|
]);
|
|
72
68
|
});
|
|
73
69
|
o('should skip tiffs that exist', () => {
|
|
@@ -78,10 +74,8 @@ o.spec('action.batch', () => {
|
|
|
78
74
|
]);
|
|
79
75
|
o(BatchJob.getJobs(fakeJob, existing, LogConfig.get())).deepEquals([
|
|
80
76
|
[fakeFiles[2].name],
|
|
81
|
-
[fakeFiles[5].name],
|
|
77
|
+
[fakeFiles[3].name, fakeFiles[4].name, fakeFiles[5].name],
|
|
82
78
|
[
|
|
83
|
-
fakeFiles[3].name,
|
|
84
|
-
fakeFiles[4].name,
|
|
85
79
|
fakeFiles[6].name,
|
|
86
80
|
fakeFiles[7].name,
|
|
87
81
|
fakeFiles[8].name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch.job.test.js","sourceRoot":"","sources":["../../../../src/cli/cogify/__tests__/batch.job.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"batch.job.test.js","sourceRoot":"","sources":["../../../../src/cli/cogify/__tests__/batch.job.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElF,OAAO,EACL,iBAAiB,
|
|
1
|
+
{"version":3,"file":"action.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElF,OAAO,EACL,iBAAiB,EAMlB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAS5C,qBAAa,gBAAiB,SAAQ,iBAAiB;IACrD,OAAO,CAAC,GAAG,CAAC,CAA6B;IACzC,OAAO,CAAC,IAAI,CAAC,CAAiC;IAC9C,OAAO,CAAC,MAAM,CAAC,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAAkC;IACnD,OAAO,CAAC,WAAW,CAAC,CAA8B;;IAUlD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE;IASjC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI;IA+CnC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA4C1B,WAAW,CACf,GAAG,EAAE,UAAU,EACf,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC;IA2ChB,2DAA2D;IACrD,cAAc,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBrE,SAAS,CAAC,kBAAkB,IAAI,IAAI;CAmCrC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Env, fsa, LogConfig, LoggerFatalError } from '@basemaps/shared';
|
|
2
|
-
import { CliId } from '@basemaps/shared/build/cli/
|
|
2
|
+
import { CliId } from '@basemaps/shared/build/cli/info.js';
|
|
3
3
|
import { CommandLineAction, } from '@rushstack/ts-command-line';
|
|
4
4
|
import { createReadStream, promises as fs } from 'fs';
|
|
5
5
|
import { buildCogForName } from '../../cog/cog.js';
|
|
@@ -10,6 +10,8 @@ import { Gdal } from '../../gdal/gdal.js';
|
|
|
10
10
|
import { makeTempFolder, makeTiffFolder } from '../folder.js';
|
|
11
11
|
import path from 'path';
|
|
12
12
|
import { prepareUrl } from '../util.js';
|
|
13
|
+
import pLimit from 'p-limit';
|
|
14
|
+
const DefaultConcurrency = 2;
|
|
13
15
|
export class CommandCogCreate extends CommandLineAction {
|
|
14
16
|
constructor() {
|
|
15
17
|
super({
|
|
@@ -65,7 +67,7 @@ export class CommandCogCreate extends CommandLineAction {
|
|
|
65
67
|
return output;
|
|
66
68
|
}
|
|
67
69
|
async onExecute() {
|
|
68
|
-
var _a, _b, _c;
|
|
70
|
+
var _a, _b, _c, _d, _e;
|
|
69
71
|
const jobLocation = (_a = this.job) === null || _a === void 0 ? void 0 : _a.value;
|
|
70
72
|
if (jobLocation == null)
|
|
71
73
|
throw new Error('Missing job name');
|
|
@@ -84,11 +86,12 @@ export class CommandCogCreate extends CommandLineAction {
|
|
|
84
86
|
if (names == null || names.size === 0)
|
|
85
87
|
return;
|
|
86
88
|
const tmpFolder = await makeTempFolder(`basemaps-${job.id}-${CliId}`);
|
|
89
|
+
const Q = pLimit((_e = (_d = this.concurrency) === null || _d === void 0 ? void 0 : _d.value) !== null && _e !== void 0 ? _e : DefaultConcurrency);
|
|
87
90
|
try {
|
|
88
|
-
|
|
91
|
+
Promise.all(Array.from(names).map((name) => Q(async () => {
|
|
89
92
|
const tiffJob = await CogStacJob.load(jobLocation);
|
|
90
93
|
await this.processTiff(tiffJob, name, tmpFolder, isCommit, logger.child({ tiffName: name }));
|
|
91
|
-
}
|
|
94
|
+
})));
|
|
92
95
|
}
|
|
93
96
|
catch (e) {
|
|
94
97
|
// Ensure the error is thrown
|
|
@@ -179,6 +182,12 @@ export class CommandCogCreate extends CommandLineAction {
|
|
|
179
182
|
description: 'list of cog indexes to process',
|
|
180
183
|
required: false,
|
|
181
184
|
});
|
|
185
|
+
this.concurrency = this.defineIntegerParameter({
|
|
186
|
+
argumentName: 'CONCURRENCY',
|
|
187
|
+
parameterLongName: '--concurrency',
|
|
188
|
+
description: 'Number of concurrency create cog jobs',
|
|
189
|
+
required: false,
|
|
190
|
+
});
|
|
182
191
|
this.commit = this.defineFlagParameter({
|
|
183
192
|
parameterLongName: '--commit',
|
|
184
193
|
description: 'Begin the transformation',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.cog.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,gBAAgB,EAAW,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAC3D,OAAO,EACL,iBAAiB,
|
|
1
|
+
{"version":3,"file":"action.cog.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { fsa } from '@basemaps/shared';
|
|
|
3
3
|
import { CommandLineAction, } from '@rushstack/ts-command-line';
|
|
4
4
|
import { CogJobFactory, MaxConcurrencyDefault } from '../../cog/job.factory.js';
|
|
5
5
|
import { GdalCogBuilderDefaults, GdalResamplingOptions } from '../../gdal/gdal.config.js';
|
|
6
|
-
import { CliId } from '@basemaps/shared/build/cli/
|
|
6
|
+
import { CliId } from '@basemaps/shared/build/cli/info.js';
|
|
7
7
|
export class CLiInputData {
|
|
8
8
|
constructor(parent, prefix) {
|
|
9
9
|
this.path = parent.defineStringParameter({
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { TileMatrixSet } from '@basemaps/geo';
|
|
2
|
-
import {
|
|
2
|
+
import { FileConfig, LogType } from '@basemaps/shared';
|
|
3
3
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
4
4
|
import { CogStacJob } from '../../cog/cog.stac.job.js';
|
|
5
5
|
export declare class CommandMakeCog extends CommandLineAction {
|
|
@@ -10,13 +10,15 @@ export declare class CommandMakeCog extends CommandLineAction {
|
|
|
10
10
|
private cutline;
|
|
11
11
|
private blend;
|
|
12
12
|
private alignedLevel;
|
|
13
|
+
private maxChunkUnit;
|
|
13
14
|
private output;
|
|
14
15
|
private aws;
|
|
16
|
+
private disabled;
|
|
15
17
|
constructor();
|
|
16
18
|
protected onDefineParameters(): void;
|
|
17
19
|
onExecute(): Promise<void>;
|
|
18
20
|
makeCog(id: string, imageryName: string, tileMatrix: TileMatrixSet, uri: string): Promise<CogStacJob>;
|
|
19
21
|
splitJob(job: CogStacJob, logger: LogType): Promise<string[][]>;
|
|
20
|
-
findLocation(path: string): Promise<
|
|
22
|
+
findLocation(path: string): Promise<FileConfig>;
|
|
21
23
|
}
|
|
22
24
|
//# sourceMappingURL=action.make.cog.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.make.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,aAAa,EAAkB,MAAM,eAAe,CAAC;AACpE,OAAO,EAAO,
|
|
1
|
+
{"version":3,"file":"action.make.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,aAAa,EAAkB,MAAM,eAAe,CAAC;AACpE,OAAO,EAAO,UAAU,EAAkB,OAAO,EAAuB,MAAM,kBAAkB,CAAC;AACjG,OAAO,EACL,iBAAiB,EAIlB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,UAAU,EAAsB,MAAM,2BAA2B,CAAC;AAgB3E,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,GAAG,CAA2B;IACtC,OAAO,CAAC,QAAQ,CAA2B;;IAU3C,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAuE9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmD1B,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAmDrG,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAiB/D,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;CActD"}
|
|
@@ -7,6 +7,7 @@ import { getCutline } from './cutline.js';
|
|
|
7
7
|
import { CogJobFactory } from '../../cog/job.factory.js';
|
|
8
8
|
import { basename } from 'path';
|
|
9
9
|
import { BatchJob } from './batch.job.js';
|
|
10
|
+
import { AlignedLevel } from '../../cog/constants.js';
|
|
10
11
|
export class CommandMakeCog extends CommandLineAction {
|
|
11
12
|
constructor() {
|
|
12
13
|
super({
|
|
@@ -34,7 +35,7 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
34
35
|
argumentName: 'NAME',
|
|
35
36
|
parameterShortName: '-n',
|
|
36
37
|
parameterLongName: '--name',
|
|
37
|
-
description: '
|
|
38
|
+
description: 'Custom imagery name',
|
|
38
39
|
required: false,
|
|
39
40
|
});
|
|
40
41
|
this.tileMatrix = this.defineStringParameter({
|
|
@@ -61,6 +62,12 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
61
62
|
description: 'Aligned level between resolution and cog',
|
|
62
63
|
required: false,
|
|
63
64
|
});
|
|
65
|
+
this.maxChunkUnit = this.defineIntegerParameter({
|
|
66
|
+
argumentName: 'MAX_CHUNK_UNIT',
|
|
67
|
+
parameterLongName: '--max-chunk-unit',
|
|
68
|
+
description: 'Number of small jobs are chunked into one job',
|
|
69
|
+
required: false,
|
|
70
|
+
});
|
|
64
71
|
this.output = this.defineStringParameter({
|
|
65
72
|
argumentName: 'OUTPUT',
|
|
66
73
|
parameterShortName: '-o',
|
|
@@ -73,6 +80,11 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
73
80
|
description: 'Running the job on aws',
|
|
74
81
|
required: false,
|
|
75
82
|
});
|
|
83
|
+
this.disabled = this.defineFlagParameter({
|
|
84
|
+
parameterLongName: '--disable',
|
|
85
|
+
description: 'Add disable flag for the new inserted layer.',
|
|
86
|
+
required: false,
|
|
87
|
+
});
|
|
76
88
|
}
|
|
77
89
|
async onExecute() {
|
|
78
90
|
const logger = LogConfig.get();
|
|
@@ -105,6 +117,7 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
105
117
|
throw new Error(`Cannot find tile matrix: ${identifier}`);
|
|
106
118
|
logger.info({ id, tileMatrix: tileMatrix.identifier }, 'SetTileMatrix');
|
|
107
119
|
const job = await this.makeCog(id, name, tileMatrix, source);
|
|
120
|
+
configLayer.title = job.title;
|
|
108
121
|
const jobLocation = job.getJobPath('job.json');
|
|
109
122
|
// Split the jobs into chunked tasks
|
|
110
123
|
const chunkedJobs = await this.splitJob(job, logger);
|
|
@@ -114,6 +127,8 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
114
127
|
// Set config layer for output
|
|
115
128
|
const path = jobLocation.replace('/job.json', '');
|
|
116
129
|
configLayer[tileMatrix.projection.code] = path;
|
|
130
|
+
if (this.disabled.value)
|
|
131
|
+
configLayer.disabled = true;
|
|
117
132
|
paths.push(path);
|
|
118
133
|
}
|
|
119
134
|
const output = this.output.value;
|
|
@@ -124,6 +139,7 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
124
139
|
}
|
|
125
140
|
}
|
|
126
141
|
async makeCog(id, imageryName, tileMatrix, uri) {
|
|
142
|
+
var _a;
|
|
127
143
|
const bucket = this.target.value;
|
|
128
144
|
if (bucket == null && this.aws.value)
|
|
129
145
|
throw new Error('Please provide a validate bucket for output job.json');
|
|
@@ -153,13 +169,14 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
153
169
|
cutline = getCutline(imageryName);
|
|
154
170
|
if (cutline == null)
|
|
155
171
|
throw new Error(`Cannot found default cutline from imagery name: ${imageryName}`);
|
|
172
|
+
const alignedLevel = (_a = this.alignedLevel.value) !== null && _a !== void 0 ? _a : AlignedLevel;
|
|
156
173
|
const ctx = {
|
|
157
174
|
imageryName,
|
|
158
175
|
override: {
|
|
159
176
|
id,
|
|
160
177
|
projection: Epsg.Nztm2000,
|
|
161
178
|
resampling,
|
|
162
|
-
alignedLevel
|
|
179
|
+
alignedLevel,
|
|
163
180
|
},
|
|
164
181
|
outputLocation: this.aws.value
|
|
165
182
|
? await this.findLocation(`s3://${bucket}/`)
|
|
@@ -170,8 +187,7 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
170
187
|
tileMatrix,
|
|
171
188
|
oneCogCovering: false,
|
|
172
189
|
};
|
|
173
|
-
|
|
174
|
-
return job;
|
|
190
|
+
return await CogJobFactory.create(ctx);
|
|
175
191
|
}
|
|
176
192
|
async splitJob(job, logger) {
|
|
177
193
|
// Get all the existing output tiffs
|
|
@@ -181,7 +197,7 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
181
197
|
existTiffs.add(basename(fileName));
|
|
182
198
|
}
|
|
183
199
|
// Prepare chunk job and individual jobs based on imagery size.
|
|
184
|
-
const jobs = await BatchJob.getJobs(job, existTiffs, logger);
|
|
200
|
+
const jobs = await BatchJob.getJobs(job, existTiffs, logger, this.maxChunkUnit.value);
|
|
185
201
|
if (jobs.length === 0) {
|
|
186
202
|
logger.info('NoJobs');
|
|
187
203
|
return [];
|
|
@@ -190,13 +206,18 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
190
206
|
return jobs;
|
|
191
207
|
}
|
|
192
208
|
async findLocation(path) {
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
209
|
+
if (path.startsWith('s3://')) {
|
|
210
|
+
const configPath = Env.get(Env.AwsRoleConfigPath);
|
|
211
|
+
if (configPath == null)
|
|
212
|
+
throw new Error('No aws config path provided');
|
|
213
|
+
const configs = await fsa.readJson(configPath);
|
|
214
|
+
for (const prefix of configs.prefixes) {
|
|
215
|
+
if (path.startsWith(prefix.prefix))
|
|
216
|
+
return { type: 's3', path, roleArn: prefix.roleArn };
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
else {
|
|
220
|
+
return { type: 'local', path: path };
|
|
200
221
|
}
|
|
201
222
|
throw new Error(`No valid role to find the path: ${path}`);
|
|
202
223
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.make.cog.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAiB,cAAc,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"action.make.cog.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,16 @@
|
|
|
1
1
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
2
|
+
export declare enum Category {
|
|
3
|
+
Urban = "Urban Aerial Photos",
|
|
4
|
+
Rural = "Rural Aerial Photos",
|
|
5
|
+
Satellite = "Satellite Imagery",
|
|
6
|
+
Other = "New Aerial Photos"
|
|
7
|
+
}
|
|
8
|
+
export declare function parseCategory(category: string): Category;
|
|
2
9
|
export declare class CommandCogPullRequest extends CommandLineAction {
|
|
3
10
|
private layer;
|
|
4
11
|
private output;
|
|
5
12
|
private jira;
|
|
13
|
+
private category;
|
|
6
14
|
constructor();
|
|
7
15
|
protected onDefineParameters(): void;
|
|
8
16
|
onExecute(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.make.cog.pr.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.pr.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA8B,MAAM,4BAA4B,CAAC;AAI3F,qBAAa,qBAAsB,SAAQ,iBAAiB;IAC1D,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,IAAI,CAA6B;;
|
|
1
|
+
{"version":3,"file":"action.make.cog.pr.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.pr.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA8B,MAAM,4BAA4B,CAAC;AAI3F,oBAAY,QAAQ;IAClB,KAAK,wBAAwB;IAC7B,KAAK,wBAAwB;IAC7B,SAAS,sBAAsB;IAC/B,KAAK,sBAAsB;CAC5B;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAMxD;AAED,qBAAa,qBAAsB,SAAQ,iBAAiB;IAC1D,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,QAAQ,CAA6B;;IAU7C,SAAS,CAAC,kBAAkB,IAAI,IAAI;IA2B9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAqBjC"}
|
|
@@ -2,6 +2,24 @@ import { fsa, LogConfig } from '@basemaps/shared';
|
|
|
2
2
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
3
3
|
import { owner, repo } from '../github/github.js';
|
|
4
4
|
import { MakeCogGithub } from '../github/make.cog.pr.js';
|
|
5
|
+
export var Category;
|
|
6
|
+
(function (Category) {
|
|
7
|
+
Category["Urban"] = "Urban Aerial Photos";
|
|
8
|
+
Category["Rural"] = "Rural Aerial Photos";
|
|
9
|
+
Category["Satellite"] = "Satellite Imagery";
|
|
10
|
+
Category["Other"] = "New Aerial Photos";
|
|
11
|
+
})(Category || (Category = {}));
|
|
12
|
+
export function parseCategory(category) {
|
|
13
|
+
const c = category.toLocaleLowerCase();
|
|
14
|
+
if (c.includes('urban'))
|
|
15
|
+
return Category.Urban;
|
|
16
|
+
else if (c.includes('rural'))
|
|
17
|
+
return Category.Rural;
|
|
18
|
+
else if (c.includes('satellite'))
|
|
19
|
+
return Category.Satellite;
|
|
20
|
+
else
|
|
21
|
+
return Category.Other;
|
|
22
|
+
}
|
|
5
23
|
export class CommandCogPullRequest extends CommandLineAction {
|
|
6
24
|
constructor() {
|
|
7
25
|
super({
|
|
@@ -29,10 +47,17 @@ export class CommandCogPullRequest extends CommandLineAction {
|
|
|
29
47
|
description: 'Jira number to add to pull request title',
|
|
30
48
|
required: false,
|
|
31
49
|
});
|
|
50
|
+
this.category = this.defineStringParameter({
|
|
51
|
+
argumentName: 'CATEGORY',
|
|
52
|
+
parameterLongName: '--category',
|
|
53
|
+
description: 'New Imagery Category, like Rural Aerial Photos, Urban Aerial Photos, Satellite Imagery',
|
|
54
|
+
required: false,
|
|
55
|
+
});
|
|
32
56
|
}
|
|
33
57
|
async onExecute() {
|
|
34
58
|
const logger = LogConfig.get();
|
|
35
59
|
const layerStr = this.layer.value;
|
|
60
|
+
const category = this.category.value ? parseCategory(this.category.value) : Category.Other;
|
|
36
61
|
if (layerStr == null)
|
|
37
62
|
throw new Error('Please provide a valid input layer and urls');
|
|
38
63
|
let layer;
|
|
@@ -43,7 +68,7 @@ export class CommandCogPullRequest extends CommandLineAction {
|
|
|
43
68
|
throw new Error('Please provide a valid input layer');
|
|
44
69
|
}
|
|
45
70
|
const git = new MakeCogGithub(layer.name, logger);
|
|
46
|
-
const prNumber = await git.createTileSetPullRequest(layer, this.jira.value);
|
|
71
|
+
const prNumber = await git.createTileSetPullRequest(layer, this.jira.value, category);
|
|
47
72
|
const output = this.output.value;
|
|
48
73
|
if (output) {
|
|
49
74
|
const prUrl = `https://github.com/${owner}/${repo}/pull/${prNumber}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.make.cog.pr.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.pr.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAA8B,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,MAAM,OAAO,qBAAsB,SAAQ,iBAAiB;
|
|
1
|
+
{"version":3,"file":"action.make.cog.pr.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.pr.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,6 @@ export declare class BatchJob {
|
|
|
35
35
|
* Prepare the jobs from job files, and chunk the small images into single
|
|
36
36
|
* @returns List of jobs including single job and chunk jobs.
|
|
37
37
|
*/
|
|
38
|
-
static getJobs(job: CogJob, existing: Set<string>, log: LogType): string[][];
|
|
38
|
+
static getJobs(job: CogJob, existing: Set<string>, log: LogType, maxChunkUnit?: number): string[][];
|
|
39
39
|
}
|
|
40
40
|
//# sourceMappingURL=batch.job.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch.job.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/batch.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,OAAO,EAAc,MAAM,kBAAkB,CAAC;AAC5E,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAG7C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAa5C;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,qBAAa,QAAQ;IACnB,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;IACrB,MAAM,KAAK,KAAK,IAAI,KAAK,CAKxB;IACD;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM;WAQvC,QAAQ,CACnB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EAAE,EACf,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAmC9D;;;OAGG;WACU,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;WA0CrE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,qBAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA+ClF;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"batch.job.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/batch.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,OAAO,EAAc,MAAM,kBAAkB,CAAC;AAC5E,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAG7C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAa5C;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,qBAAa,QAAQ;IACnB,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC;IACrB,MAAM,KAAK,KAAK,IAAI,KAAK,CAKxB;IACD;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM;WAQvC,QAAQ,CACnB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EAAE,EACf,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAmC9D;;;OAGG;WACU,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;WA0CrE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,qBAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA+ClF;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,SAAc,GAAG,MAAM,EAAE,EAAE;CAmCzG"}
|
|
@@ -164,7 +164,7 @@ export class BatchJob {
|
|
|
164
164
|
* Prepare the jobs from job files, and chunk the small images into single
|
|
165
165
|
* @returns List of jobs including single job and chunk jobs.
|
|
166
166
|
*/
|
|
167
|
-
static getJobs(job, existing, log) {
|
|
167
|
+
static getJobs(job, existing, log, maxChunkUnit = ChunkJobMax) {
|
|
168
168
|
const jobs = [];
|
|
169
169
|
let chunkJob = [];
|
|
170
170
|
let chunkUnit = 0; // Calculate the chunkUnit based on the size
|
|
@@ -176,7 +176,8 @@ export class BatchJob {
|
|
|
176
176
|
}
|
|
177
177
|
const imageSize = file.width / job.output.gsd;
|
|
178
178
|
if (imageSize > 16385) {
|
|
179
|
-
|
|
179
|
+
chunkJob.push(file.name);
|
|
180
|
+
chunkUnit += ChunkJobMax;
|
|
180
181
|
}
|
|
181
182
|
else if (imageSize > 8193) {
|
|
182
183
|
chunkJob.push(file.name);
|
|
@@ -190,7 +191,7 @@ export class BatchJob {
|
|
|
190
191
|
chunkJob.push(file.name);
|
|
191
192
|
chunkUnit += ChunkSmallUnit;
|
|
192
193
|
}
|
|
193
|
-
if (chunkUnit >=
|
|
194
|
+
if (chunkUnit >= maxChunkUnit) {
|
|
194
195
|
jobs.push(chunkJob);
|
|
195
196
|
chunkJob = [];
|
|
196
197
|
chunkUnit = 0;
|