@basemaps/cli 6.35.0 → 6.37.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 +61 -0
- package/README.md +6 -0
- package/build/cli/cogify/__tests__/batch.job.test.js +5 -3
- 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 +20 -41
- package/build/cli/cogify/action.cog.js.map +1 -1
- package/build/cli/cogify/action.job.d.ts +0 -1
- package/build/cli/cogify/action.job.d.ts.map +1 -1
- package/build/cli/cogify/action.job.js +3 -10
- package/build/cli/cogify/action.job.js.map +1 -1
- package/build/cli/cogify/action.make.cog.d.ts +5 -0
- package/build/cli/cogify/action.make.cog.d.ts.map +1 -1
- package/build/cli/cogify/action.make.cog.js +84 -16
- package/build/cli/cogify/action.make.cog.js.map +1 -1
- package/build/cli/cogify/action.make.cog.pr.d.ts +10 -0
- package/build/cli/cogify/action.make.cog.pr.d.ts.map +1 -0
- package/build/cli/cogify/action.make.cog.pr.js +54 -0
- package/build/cli/cogify/action.make.cog.pr.js.map +1 -0
- package/build/cli/cogify/batch.job.js +4 -4
- package/build/cli/cogify/batch.job.js.map +1 -1
- package/build/cli/config/action.bundle.assets.d.ts +1 -0
- package/build/cli/config/action.bundle.assets.d.ts.map +1 -1
- package/build/cli/config/action.cog.mapsheet.d.ts +2 -0
- package/build/cli/config/action.cog.mapsheet.d.ts.map +1 -1
- package/build/cli/config/action.cog.mapsheet.js +18 -0
- package/build/cli/config/action.cog.mapsheet.js.map +1 -1
- package/build/cli/config/action.imagery.config.d.ts +1 -0
- package/build/cli/config/action.imagery.config.d.ts.map +1 -1
- package/build/cli/config/action.imagery.config.js +19 -12
- package/build/cli/config/action.imagery.config.js.map +1 -1
- package/build/cli/config/action.import.d.ts +14 -1
- package/build/cli/config/action.import.d.ts.map +1 -1
- package/build/cli/config/action.import.js +98 -3
- package/build/cli/config/action.import.js.map +1 -1
- package/build/cli/github/github.d.ts +48 -0
- package/build/cli/github/github.d.ts.map +1 -0
- package/build/cli/github/github.js +108 -0
- package/build/cli/github/github.js.map +1 -0
- package/build/cli/github/make.cog.pr.d.ts +20 -0
- package/build/cli/github/make.cog.pr.d.ts.map +1 -0
- package/build/cli/github/make.cog.pr.js +98 -0
- package/build/cli/github/make.cog.pr.js.map +1 -0
- package/build/cli/index.d.ts.map +1 -1
- package/build/cli/index.js +4 -0
- package/build/cli/index.js.map +1 -1
- package/build/cli/overview/action.create.overview.d.ts +17 -0
- package/build/cli/overview/action.create.overview.d.ts.map +1 -0
- package/build/cli/overview/action.create.overview.js +168 -0
- package/build/cli/overview/action.create.overview.js.map +1 -0
- package/build/cli/overview/overview.wmts.d.ts +3 -0
- package/build/cli/overview/overview.wmts.d.ts.map +1 -0
- package/build/cli/overview/overview.wmts.js +31 -0
- package/build/cli/overview/overview.wmts.js.map +1 -0
- package/build/cli/overview/tile.generator.d.ts +13 -0
- package/build/cli/overview/tile.generator.d.ts.map +1 -0
- package/build/cli/overview/tile.generator.js +86 -0
- package/build/cli/overview/tile.generator.js.map +1 -0
- package/build/cli/overview/timer.d.ts +14 -0
- package/build/cli/overview/timer.d.ts.map +1 -0
- package/build/cli/overview/timer.js +21 -0
- package/build/cli/overview/timer.js.map +1 -0
- package/build/cog/__tests__/cog.test.js +1 -1
- package/build/cog/__tests__/cog.test.js.map +1 -1
- package/build/cog/__tests__/cutline.test.js +8 -23
- package/build/cog/__tests__/cutline.test.js.map +1 -1
- package/build/cog/builder.d.ts +1 -1
- package/build/cog/builder.js +2 -2
- package/build/cog/cog.stac.job.d.ts +2 -7
- package/build/cog/cog.stac.job.d.ts.map +1 -1
- package/build/cog/cog.stac.job.js +7 -8
- package/build/cog/cog.stac.job.js.map +1 -1
- package/build/cog/constants.d.ts +2 -2
- package/build/cog/constants.d.ts.map +1 -1
- package/build/cog/constants.js +2 -2
- package/build/cog/constants.js.map +1 -1
- package/build/cog/cutline.d.ts +4 -6
- package/build/cog/cutline.d.ts.map +1 -1
- package/build/cog/cutline.js +7 -19
- package/build/cog/cutline.js.map +1 -1
- package/build/cog/job.factory.d.ts +1 -0
- package/build/cog/job.factory.d.ts.map +1 -1
- package/build/cog/job.factory.js +3 -3
- package/build/cog/job.factory.js.map +1 -1
- package/build/cog/stac.d.ts +2 -2
- package/build/cog/stac.d.ts.map +1 -1
- package/build/cog/types.d.ts +0 -1
- package/build/cog/types.d.ts.map +1 -1
- package/build/gdal/gdal.config.d.ts +1 -1
- package/build/gdal/gdal.config.d.ts.map +1 -1
- package/build/gdal/gdal.progress.d.ts +1 -0
- package/build/gdal/gdal.progress.d.ts.map +1 -1
- package/package.json +15 -9
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,67 @@
|
|
|
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.37.0](https://github.com/linz/basemaps/compare/v6.36.0...v6.37.0) (2022-12-05)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **cli:** NZTM2000Quad PR link ([#2614](https://github.com/linz/basemaps/issues/2614)) ([93545c0](https://github.com/linz/basemaps/commit/93545c0c0e3fffe3a87d080226fdbaf2860ca541))
|
|
12
|
+
* **cli:** Convert overview cli to single thread to fix the import.meta.url not working in cjs ([#2576](https://github.com/linz/basemaps/issues/2576)) ([b92256b](https://github.com/linz/basemaps/commit/b92256b02882b931692fd2dd007cb866c7f1758c))
|
|
13
|
+
* **cli:** do not minify the cli to make it easier to debug ([#2580](https://github.com/linz/basemaps/issues/2580)) ([e5973bd](https://github.com/linz/basemaps/commit/e5973bdb899b08c99d60739c035fc52c90bd3f35))
|
|
14
|
+
* **cli:** ensure only 0 to --max-zoom tiles are created ([#2593](https://github.com/linz/basemaps/issues/2593)) ([7b251d5](https://github.com/linz/basemaps/commit/7b251d50fc0b9057c81b80330694cad19679e0a2))
|
|
15
|
+
* **cli:** Fix the output for the overview cli as fsa.stream corrupt the file write to aws. ([#2585](https://github.com/linz/basemaps/issues/2585)) ([5875514](https://github.com/linz/basemaps/commit/5875514baeb5bbf3905460aad0dcef9ba0887322))
|
|
16
|
+
* **cli:** Fix update the url to load imagery into dev and imagery name as layer. ([#2607](https://github.com/linz/basemaps/issues/2607)) ([1730580](https://github.com/linz/basemaps/commit/1730580af1c42844fa06fba30590baf984ea6b45))
|
|
17
|
+
* **cli:** make tile paths relative not absolute ([#2595](https://github.com/linz/basemaps/issues/2595)) ([dae0e9b](https://github.com/linz/basemaps/commit/dae0e9be274aa53fba7cd933b19dd1eb4f216353))
|
|
18
|
+
* **cli:** remove the insert config in create-cog cli. ([#2597](https://github.com/linz/basemaps/issues/2597)) ([4f9d61b](https://github.com/linz/basemaps/commit/4f9d61bfecf74e1f3e1c627df0f789335dcd39ae))
|
|
19
|
+
* **cli:** tidy up overview creation ensure tar is valid ([#2594](https://github.com/linz/basemaps/issues/2594)) ([754e76a](https://github.com/linz/basemaps/commit/754e76ae0ede669c2127e3284d819f2dab9c21c6))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
### Features
|
|
23
|
+
|
|
24
|
+
* **cli:** Add flag to exclude the all satellite layers for create mapsheet. ([#2613](https://github.com/linz/basemaps/issues/2613)) ([4cf4f28](https://github.com/linz/basemaps/commit/4cf4f28d18eafdfc9be7470ac43e109fa8b1b75d))
|
|
25
|
+
* **cli:** Allow to import config into dev dynamodb from a local config.json file. ([#2604](https://github.com/linz/basemaps/issues/2604)) ([53152aa](https://github.com/linz/basemaps/commit/53152aadd83d70a24ef00d4df990d74b57a8a8cb))
|
|
26
|
+
* **cli:** allow users to specify a title for the imagery config ([#2572](https://github.com/linz/basemaps/issues/2572)) ([59a3e7f](https://github.com/linz/basemaps/commit/59a3e7fa847f64f5c83fc876b071db947407d14d))
|
|
27
|
+
* **cli:** Create-overview determine max zoom overview from the gsd ([#2612](https://github.com/linz/basemaps/issues/2612)) ([59a01e6](https://github.com/linz/basemaps/commit/59a01e665715097b9d3f577fce1258e2d1bc00e9))
|
|
28
|
+
* **cli:** Make cog to output paths for create overviews. ([#2615](https://github.com/linz/basemaps/issues/2615)) ([c50b85c](https://github.com/linz/basemaps/commit/c50b85ccc2c227a1f7ed042f45778094fa2335e5))
|
|
29
|
+
* add overview archive to imagery config ([#2545](https://github.com/linz/basemaps/issues/2545)) ([ac463ef](https://github.com/linz/basemaps/commit/ac463efdaf8b6773c21b011a70327b606e4fafcb))
|
|
30
|
+
* **cli:** create WMTSCapabilties.xml for the overviews cotar ([#2590](https://github.com/linz/basemaps/issues/2590)) ([51421f6](https://github.com/linz/basemaps/commit/51421f60cc9e5b74581434617fca93d03f3fd993))
|
|
31
|
+
* **cli:** Double the number of maximum chunk in single job. ([#2599](https://github.com/linz/basemaps/issues/2599)) ([5583e43](https://github.com/linz/basemaps/commit/5583e439f1f7d746a63347440eaead014b3fb113))
|
|
32
|
+
* **cli:** make cog with aligned level, stop using MaxPixelWitdh to calculate zoom levels. BM-703 ([#2571](https://github.com/linz/basemaps/issues/2571)) ([3a15f37](https://github.com/linz/basemaps/commit/3a15f37d8aa4c9bdc5bf6041a971c5dc4e943939))
|
|
33
|
+
* **cli:** New cli to create github pr for the import imagery workflow. ([#2515](https://github.com/linz/basemaps/issues/2515)) ([8f51284](https://github.com/linz/basemaps/commit/8f51284a48e02b6a0209afb02095351368555f39))
|
|
34
|
+
* **cli:** New cli to create overview of imagery BM-628 ([#2540](https://github.com/linz/basemaps/issues/2540)) ([7c21ca0](https://github.com/linz/basemaps/commit/7c21ca0f56cca472b92972f488380313b3de31ee))
|
|
35
|
+
* **cli:** remove one cog covering logic as its not used ([#2592](https://github.com/linz/basemaps/issues/2592)) ([a8e39a2](https://github.com/linz/basemaps/commit/a8e39a28a36d89fd633483886171ee39e1bc7f07))
|
|
36
|
+
* **cli:** Remove unused github api calls, remove pull request body. ([#2567](https://github.com/linz/basemaps/issues/2567)) ([3728245](https://github.com/linz/basemaps/commit/3728245605e34032bed6d6e8868481f2b41e7ff3))
|
|
37
|
+
* **cli:** track time of each step in overview creation ([#2589](https://github.com/linz/basemaps/issues/2589)) ([0736a83](https://github.com/linz/basemaps/commit/0736a834ddcd2719eb1b2109e04f2ddd8fc99b22))
|
|
38
|
+
* **cli:** use latest version of GDAL ([#2582](https://github.com/linz/basemaps/issues/2582)) ([39e7488](https://github.com/linz/basemaps/commit/39e7488e05d88a23f8f89b3a31dcc80649f23ec4))
|
|
39
|
+
* **config:** remove all the processingJob configuration. ([#2598](https://github.com/linz/basemaps/issues/2598)) ([542401d](https://github.com/linz/basemaps/commit/542401d145f036518c0e14cd0873033122b5c096))
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
# [6.36.0](https://github.com/linz/basemaps/compare/v6.35.0...v6.36.0) (2022-10-18)
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
### Bug Fixes
|
|
49
|
+
|
|
50
|
+
* **cli:** Remove check list aws batch running jobs in the split job cli. ([#2507](https://github.com/linz/basemaps/issues/2507)) ([b376db5](https://github.com/linz/basemaps/commit/b376db56229f8dabbf9fd97d636dac2be11af046))
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
### Features
|
|
54
|
+
|
|
55
|
+
* **cli:** Add asset into config bundle record BM-693 ([#2528](https://github.com/linz/basemaps/issues/2528)) ([72bdd9b](https://github.com/linz/basemaps/commit/72bdd9bbccf6b9d4c865c931f1fafb3f56c98729))
|
|
56
|
+
* **cli:** Allow empty string as null values in the make-cog cli. ([#2504](https://github.com/linz/basemaps/issues/2504)) ([05aadd7](https://github.com/linz/basemaps/commit/05aadd77a2aa4fe30fe4df996c6789abf264155e))
|
|
57
|
+
* **cli:** Find the source and output location with the aws role. ([#2510](https://github.com/linz/basemaps/issues/2510)) ([660a53d](https://github.com/linz/basemaps/commit/660a53da6bc40cdf27888fa0bef0decfd1942f65))
|
|
58
|
+
* **cli:** Make cog to limit the maxImageSize and support local output. ([#2514](https://github.com/linz/basemaps/issues/2514)) ([9673c86](https://github.com/linz/basemaps/commit/9673c86108a6f0475c2b17b50a838107cb0c5c5c))
|
|
59
|
+
* **cli:** Merge make-cog and split-job cli into one cli. ([#2508](https://github.com/linz/basemaps/issues/2508)) ([9599b14](https://github.com/linz/basemaps/commit/9599b14230a5a9749c3147fdccaf401c239b94e2))
|
|
60
|
+
* **cli:** New split job cli to chunk job.json into sub jobs. ([#2502](https://github.com/linz/basemaps/issues/2502)) ([a2ac1ee](https://github.com/linz/basemaps/commit/a2ac1eed03bc589623d9fbe2424be362137b9c32))
|
|
61
|
+
* **cli:** Prepare markdown for config changes to update the pull request BM-605 ([#2520](https://github.com/linz/basemaps/issues/2520)) ([be64a25](https://github.com/linz/basemaps/commit/be64a254ef070a2f8b9fd0841312376434925672))
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
|
|
66
|
+
|
|
6
67
|
# [6.35.0](https://github.com/linz/basemaps/compare/v6.34.0...v6.35.0) (2022-09-14)
|
|
7
68
|
|
|
8
69
|
|
package/README.md
CHANGED
|
@@ -88,6 +88,12 @@ Make cog job json
|
|
|
88
88
|
./bin/bmc.js -V make-cog --imagery s3://imagery_path --target destination_bucket --name imagery_name --tile-matrix NZTM2000Quad --output ./jobs.json
|
|
89
89
|
```
|
|
90
90
|
|
|
91
|
+
Split make cog job into chunked sub-jobs
|
|
92
|
+
|
|
93
|
+
```bash
|
|
94
|
+
./bin/bmc.js -V split-job --job s3://imagery_path/job.json --output jobs.json
|
|
95
|
+
```
|
|
96
|
+
|
|
91
97
|
## Advanced Job creation
|
|
92
98
|
|
|
93
99
|
Useful configuration options for `cogify job`
|
|
@@ -53,6 +53,7 @@ o.spec('action.batch', () => {
|
|
|
53
53
|
o(BatchJob.getJobs(fakeJob, new Set(), LogConfig.get())).deepEquals([
|
|
54
54
|
[fakeFiles[2].name],
|
|
55
55
|
[fakeFiles[5].name],
|
|
56
|
+
[fakeFiles[13].name],
|
|
56
57
|
[
|
|
57
58
|
fakeFiles[0].name,
|
|
58
59
|
fakeFiles[1].name,
|
|
@@ -64,9 +65,9 @@ o.spec('action.batch', () => {
|
|
|
64
65
|
fakeFiles[9].name,
|
|
65
66
|
fakeFiles[10].name,
|
|
66
67
|
fakeFiles[11].name,
|
|
68
|
+
fakeFiles[12].name,
|
|
69
|
+
fakeFiles[14].name,
|
|
67
70
|
],
|
|
68
|
-
[fakeFiles[13].name],
|
|
69
|
-
[fakeFiles[12].name, fakeFiles[14].name], // Second Chunk
|
|
70
71
|
]);
|
|
71
72
|
});
|
|
72
73
|
o('should skip tiffs that exist', () => {
|
|
@@ -87,8 +88,9 @@ o.spec('action.batch', () => {
|
|
|
87
88
|
fakeFiles[9].name,
|
|
88
89
|
fakeFiles[10].name,
|
|
89
90
|
fakeFiles[11].name,
|
|
91
|
+
fakeFiles[12].name,
|
|
92
|
+
fakeFiles[14].name,
|
|
90
93
|
],
|
|
91
|
-
[fakeFiles[12].name, fakeFiles[14].name], // Second Chunk
|
|
92
94
|
]);
|
|
93
95
|
});
|
|
94
96
|
});
|
|
@@ -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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"}
|
|
@@ -8,6 +8,7 @@ export declare class CommandCogCreate extends CommandLineAction {
|
|
|
8
8
|
private commit?;
|
|
9
9
|
private cogIndex?;
|
|
10
10
|
constructor();
|
|
11
|
+
parseName(name: string): string[];
|
|
11
12
|
getNames(job: CogJob): Set<string> | null;
|
|
12
13
|
onExecute(): Promise<void>;
|
|
13
14
|
processTiff(job: CogStacJob, tiffName: string, tmpFolder: string, isCommit: boolean, logger: LogType): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
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,EAKlB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAM5C,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;;IAUnD,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;IAsC1B,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;CA4BrC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Env, fsa,
|
|
1
|
+
import { Env, fsa, LogConfig, LoggerFatalError } from '@basemaps/shared';
|
|
2
2
|
import { CliId } from '@basemaps/shared/build/cli/base.js';
|
|
3
3
|
import { CommandLineAction, } from '@rushstack/ts-command-line';
|
|
4
4
|
import { createReadStream, promises as fs } from 'fs';
|
|
@@ -9,8 +9,6 @@ import { Cutline } from '../../cog/cutline.js';
|
|
|
9
9
|
import { Gdal } from '../../gdal/gdal.js';
|
|
10
10
|
import { makeTempFolder, makeTiffFolder } from '../folder.js';
|
|
11
11
|
import path from 'path';
|
|
12
|
-
import { insertConfigImagery, insertConfigTileSet } from './imagery.config.js';
|
|
13
|
-
import { JobStatus } from '@basemaps/config';
|
|
14
12
|
import { prepareUrl } from '../util.js';
|
|
15
13
|
export class CommandCogCreate extends CommandLineAction {
|
|
16
14
|
constructor() {
|
|
@@ -20,6 +18,15 @@ export class CommandCogCreate extends CommandLineAction {
|
|
|
20
18
|
documentation: 'Create a COG for the specified cog name',
|
|
21
19
|
});
|
|
22
20
|
}
|
|
21
|
+
parseName(name) {
|
|
22
|
+
// Name could both be a string or a array type of string
|
|
23
|
+
try {
|
|
24
|
+
return JSON.parse(name);
|
|
25
|
+
}
|
|
26
|
+
catch (e) {
|
|
27
|
+
return [name];
|
|
28
|
+
}
|
|
29
|
+
}
|
|
23
30
|
getNames(job) {
|
|
24
31
|
var _a, _b;
|
|
25
32
|
const output = new Set();
|
|
@@ -45,12 +52,15 @@ export class CommandCogCreate extends CommandLineAction {
|
|
|
45
52
|
return output;
|
|
46
53
|
}
|
|
47
54
|
const names = (_b = this.name) === null || _b === void 0 ? void 0 : _b.values;
|
|
48
|
-
if (names
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
55
|
+
if (names != null) {
|
|
56
|
+
for (const nameStr of names) {
|
|
57
|
+
const nameArr = this.parseName(nameStr);
|
|
58
|
+
for (const name of nameArr) {
|
|
59
|
+
if (!files.find((r) => r.name === name))
|
|
60
|
+
throw new LoggerFatalError({ name, names: files.map((r) => r.name).join(', ') }, 'Name does not exist inside job');
|
|
61
|
+
output.add(name);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
54
64
|
}
|
|
55
65
|
return output;
|
|
56
66
|
}
|
|
@@ -59,7 +69,6 @@ export class CommandCogCreate extends CommandLineAction {
|
|
|
59
69
|
const jobLocation = (_a = this.job) === null || _a === void 0 ? void 0 : _a.value;
|
|
60
70
|
if (jobLocation == null)
|
|
61
71
|
throw new Error('Missing job name');
|
|
62
|
-
const cfg = getDefaultConfig();
|
|
63
72
|
const isCommit = (_c = (_b = this.commit) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : false;
|
|
64
73
|
const job = await CogStacJob.load(jobLocation);
|
|
65
74
|
const logger = LogConfig.get().child({
|
|
@@ -82,20 +91,6 @@ export class CommandCogCreate extends CommandLineAction {
|
|
|
82
91
|
}
|
|
83
92
|
}
|
|
84
93
|
catch (e) {
|
|
85
|
-
const processingId = job.json.processingId;
|
|
86
|
-
if (processingId != null) {
|
|
87
|
-
// Update job status if this is the processing job.
|
|
88
|
-
const jobConfig = await cfg.ProcessingJob.get(processingId);
|
|
89
|
-
if (jobConfig == null)
|
|
90
|
-
throw new Error('Unable to find Job Processing Config:' + processingId);
|
|
91
|
-
const jobFailed = jobConfig;
|
|
92
|
-
jobFailed.status = JobStatus.Fail;
|
|
93
|
-
jobFailed.error = String(e);
|
|
94
|
-
if (cfg.ProcessingJob.isWriteable())
|
|
95
|
-
await cfg.ProcessingJob.put(jobFailed);
|
|
96
|
-
else
|
|
97
|
-
throw new Error('Unable update the Processing Job status:' + jobFailed.id);
|
|
98
|
-
}
|
|
99
94
|
// Ensure the error is thrown
|
|
100
95
|
throw e;
|
|
101
96
|
}
|
|
@@ -126,7 +121,7 @@ export class CommandCogCreate extends CommandLineAction {
|
|
|
126
121
|
else {
|
|
127
122
|
logger.warn('CutLine:Skip');
|
|
128
123
|
}
|
|
129
|
-
const cutline = new Cutline(job.tileMatrix, cutlineJson, (_a = job.output.cutline) === null || _a === void 0 ? void 0 : _a.blend
|
|
124
|
+
const cutline = new Cutline(job.tileMatrix, cutlineJson, (_a = job.output.cutline) === null || _a === void 0 ? void 0 : _a.blend);
|
|
130
125
|
const tmpVrtPath = await CogVrt.buildVrt(tiffFolder, job, cutline, tiffName, logger);
|
|
131
126
|
if (tmpVrtPath == null) {
|
|
132
127
|
logger.warn('CogCreate:NoMatchingSourceImagery');
|
|
@@ -157,24 +152,8 @@ export class CommandCogCreate extends CommandLineAction {
|
|
|
157
152
|
continue;
|
|
158
153
|
expectedTiffs.delete(basename);
|
|
159
154
|
}
|
|
160
|
-
const cfg = getDefaultConfig();
|
|
161
155
|
if (expectedTiffs.size === 0) {
|
|
162
|
-
// Insert Imagery and TileSet Config
|
|
163
|
-
await insertConfigImagery(cfg, job, logger);
|
|
164
|
-
await insertConfigTileSet(cfg, job, logger);
|
|
165
|
-
// Update job status if this is the processing job.
|
|
166
156
|
const url = await prepareUrl(job);
|
|
167
|
-
const processingId = job.json.processingId;
|
|
168
|
-
if (processingId != null) {
|
|
169
|
-
const jobConfig = await cfg.ProcessingJob.get(processingId);
|
|
170
|
-
if (jobConfig == null)
|
|
171
|
-
throw new Error('Unable to find Job Processing Config:' + processingId);
|
|
172
|
-
const jobComplete = jobConfig;
|
|
173
|
-
jobComplete.status = JobStatus.Complete;
|
|
174
|
-
jobComplete.url = url;
|
|
175
|
-
if (cfg.ProcessingJob.isWriteable())
|
|
176
|
-
await cfg.ProcessingJob.put(jobConfig);
|
|
177
|
-
}
|
|
178
157
|
logger.info({ tiffCount: jobSize, tiffTotal: jobSize, url }, 'CogCreate:JobComplete');
|
|
179
158
|
}
|
|
180
159
|
else {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"action.cog.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.job.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAuB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EACL,iBAAiB,EAGjB,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AAMpC,qBAAa,YAAY;IACvB,IAAI,EAAE,0BAA0B,CAAC;IACjC,OAAO,EAAE,0BAA0B,CAAC;IACpC,UAAU,EAAE,0BAA0B,CAAC;gBAE3B,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM;CAsBtD;AAED,qBAAa,gBAAiB,SAAQ,iBAAiB;IACrD,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,mBAAmB,CAA6B;IACxD,OAAO,CAAC,WAAW,CAA2B;IAC9C,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,QAAQ,CAA6B
|
|
1
|
+
{"version":3,"file":"action.job.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAuB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EACL,iBAAiB,EAGjB,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AAMpC,qBAAa,YAAY;IACvB,IAAI,EAAE,0BAA0B,CAAC;IACjC,OAAO,EAAE,0BAA0B,CAAC;IACpC,UAAU,EAAE,0BAA0B,CAAC;gBAE3B,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM;CAsBtD;AAED,qBAAa,gBAAiB,SAAQ,iBAAiB;IACrD,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,mBAAmB,CAA6B;IACxD,OAAO,CAAC,WAAW,CAA2B;IAC9C,OAAO,CAAC,OAAO,CAA8B;IAC7C,OAAO,CAAC,gBAAgB,CAA8B;IACtD,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,QAAQ,CAA6B;;IAU7C,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU;IAkBpC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyDhC,SAAS,CAAC,kBAAkB,IAAI,IAAI;CAkFrC"}
|
|
@@ -52,7 +52,7 @@ export class CommandJobCreate extends CommandLineAction {
|
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
54
|
async onExecute() {
|
|
55
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s
|
|
55
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
|
|
56
56
|
const sourceLocation = this.fsConfig(this.source);
|
|
57
57
|
const outputLocation = this.fsConfig(this.output);
|
|
58
58
|
fsa.configure(this.fsConfig(this.source));
|
|
@@ -95,10 +95,9 @@ export class CommandJobCreate extends CommandLineAction {
|
|
|
95
95
|
id: (_m = (_l = this.overrideId) === null || _l === void 0 ? void 0 : _l.value) !== null && _m !== void 0 ? _m : CliId,
|
|
96
96
|
projection: Epsg.tryGet((_o = this.sourceProjection) === null || _o === void 0 ? void 0 : _o.value),
|
|
97
97
|
resampling,
|
|
98
|
-
processingId: (_p = this.processingId) === null || _p === void 0 ? void 0 : _p.value,
|
|
99
98
|
},
|
|
100
|
-
batch: (
|
|
101
|
-
oneCogCovering: (
|
|
99
|
+
batch: (_q = (_p = this.submitBatch) === null || _p === void 0 ? void 0 : _p.value) !== null && _q !== void 0 ? _q : false,
|
|
100
|
+
oneCogCovering: (_s = (_r = this.oneCog) === null || _r === void 0 ? void 0 : _r.value) !== null && _s !== void 0 ? _s : false,
|
|
102
101
|
};
|
|
103
102
|
await CogJobFactory.create(ctx);
|
|
104
103
|
}
|
|
@@ -172,12 +171,6 @@ export class CommandJobCreate extends CommandLineAction {
|
|
|
172
171
|
description: 'supply a list of files to use as source imagery',
|
|
173
172
|
required: false,
|
|
174
173
|
});
|
|
175
|
-
this.processingId = this.defineStringParameter({
|
|
176
|
-
argumentName: 'PROCESSING_ID',
|
|
177
|
-
parameterLongName: '--processing-id',
|
|
178
|
-
description: 'pass the job processing id',
|
|
179
|
-
required: false,
|
|
180
|
-
});
|
|
181
174
|
}
|
|
182
175
|
}
|
|
183
176
|
//# sourceMappingURL=action.job.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.job.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAA8B,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EACL,iBAAiB,GAIlB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAA4B,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACpH,OAAO,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAE3D,MAAM,OAAO,YAAY;IAKvB,YAAY,MAAyB,EAAE,MAAc;QACnD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,MAAM,CAAC,WAAW,EAAE;YAClC,iBAAiB,EAAE,KAAK,MAAM,EAAE;YAChC,WAAW,EAAE,qCAAqC;YAClD,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,qBAAqB,CAAC;YAC1C,YAAY,EAAE,MAAM,CAAC,WAAW,EAAE,GAAG,MAAM;YAC3C,iBAAiB,EAAE,KAAK,MAAM,WAAW;YACzC,WAAW,EAAE,uCAAuC;YACpD,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,qBAAqB,CAAC;YAC7C,YAAY,EAAE,MAAM,CAAC,WAAW,EAAE,GAAG,cAAc;YACnD,iBAAiB,EAAE,KAAK,MAAM,mBAAmB;YACjD,WAAW,EAAE,mDAAmD;YAChE,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,iBAAiB;
|
|
1
|
+
{"version":3,"file":"action.job.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.job.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { TileMatrixSet } from '@basemaps/geo';
|
|
2
|
+
import { FileConfigS3Role, LogType } from '@basemaps/shared';
|
|
2
3
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
3
4
|
import { CogStacJob } from '../../cog/cog.stac.job.js';
|
|
4
5
|
export declare class CommandMakeCog extends CommandLineAction {
|
|
@@ -8,10 +9,14 @@ export declare class CommandMakeCog extends CommandLineAction {
|
|
|
8
9
|
private target;
|
|
9
10
|
private cutline;
|
|
10
11
|
private blend;
|
|
12
|
+
private alignedLevel;
|
|
11
13
|
private output;
|
|
14
|
+
private aws;
|
|
12
15
|
constructor();
|
|
13
16
|
protected onDefineParameters(): void;
|
|
14
17
|
onExecute(): Promise<void>;
|
|
15
18
|
makeCog(id: string, imageryName: string, tileMatrix: TileMatrixSet, uri: string): Promise<CogStacJob>;
|
|
19
|
+
splitJob(job: CogStacJob, logger: LogType): Promise<string[][]>;
|
|
20
|
+
findLocation(path: string): Promise<FileConfigS3Role>;
|
|
16
21
|
}
|
|
17
22
|
//# 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;
|
|
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,gBAAgB,EAAkB,OAAO,EAAuB,MAAM,kBAAkB,CAAC;AACvG,OAAO,EACL,iBAAiB,EAIlB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,UAAU,EAAsB,MAAM,2BAA2B,CAAC;AAe3E,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,MAAM,CAA6B;IAC3C,OAAO,CAAC,GAAG,CAA2B;;IAUtC,SAAS,CAAC,kBAAkB,IAAI,IAAI;IA4D9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgD1B,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAkDrG,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,gBAAgB,CAAC;CAS5D"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { Epsg, TileMatrixSets } from '@basemaps/geo';
|
|
2
|
-
import { fsa, LogConfig } from '@basemaps/shared';
|
|
3
|
-
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
2
|
+
import { Env, fsa, LogConfig, titleizeImageryName } from '@basemaps/shared';
|
|
3
|
+
import { CommandLineAction, } from '@rushstack/ts-command-line';
|
|
4
4
|
import { ProjectionLoader } from '../../cog/projection.loader.js';
|
|
5
5
|
import * as ulid from 'ulid';
|
|
6
6
|
import { getCutline } from './cutline.js';
|
|
7
7
|
import { CogJobFactory } from '../../cog/job.factory.js';
|
|
8
|
+
import { basename } from 'path';
|
|
9
|
+
import { BatchJob } from './batch.job.js';
|
|
8
10
|
export class CommandMakeCog extends CommandLineAction {
|
|
9
11
|
constructor() {
|
|
10
12
|
super({
|
|
@@ -53,6 +55,12 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
53
55
|
description: 'Cutline blend',
|
|
54
56
|
required: false,
|
|
55
57
|
});
|
|
58
|
+
this.alignedLevel = this.defineIntegerParameter({
|
|
59
|
+
argumentName: 'ALIGNED_LEVEL',
|
|
60
|
+
parameterLongName: '--aligned-level',
|
|
61
|
+
description: 'Aligned level between resolution and cog',
|
|
62
|
+
required: false,
|
|
63
|
+
});
|
|
56
64
|
this.output = this.defineStringParameter({
|
|
57
65
|
argumentName: 'OUTPUT',
|
|
58
66
|
parameterShortName: '-o',
|
|
@@ -60,11 +68,16 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
60
68
|
description: 'Output job.json path',
|
|
61
69
|
required: false,
|
|
62
70
|
});
|
|
71
|
+
this.aws = this.defineFlagParameter({
|
|
72
|
+
parameterLongName: '--aws',
|
|
73
|
+
description: 'Running the job on aws',
|
|
74
|
+
required: false,
|
|
75
|
+
});
|
|
63
76
|
}
|
|
64
77
|
async onExecute() {
|
|
65
78
|
const logger = LogConfig.get();
|
|
66
79
|
const imagery = this.imagery.value;
|
|
67
|
-
let name = this.name.value;
|
|
80
|
+
let name = this.name.value === '' ? undefined : this.name.value;
|
|
68
81
|
if (imagery == null)
|
|
69
82
|
throw new Error('Please provide a valid imagery source');
|
|
70
83
|
await Promise.all([3791, 3790, 3789, 3788].map((code) => ProjectionLoader.load(code)));
|
|
@@ -74,26 +87,45 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
74
87
|
name = source.split('/').filter(Boolean).pop();
|
|
75
88
|
if (name == null)
|
|
76
89
|
throw new Error('Failed to find imagery set name');
|
|
77
|
-
|
|
78
|
-
const
|
|
79
|
-
|
|
90
|
+
let tileMatrixSets = [];
|
|
91
|
+
const tileMatrix = this.tileMatrix.value;
|
|
92
|
+
if (tileMatrix == null)
|
|
93
|
+
throw new Error('Please provide valid tile set matrix.');
|
|
94
|
+
if (tileMatrix.includes('/'))
|
|
95
|
+
tileMatrixSets = tileMatrixSets.concat(tileMatrix.split('/'));
|
|
96
|
+
else
|
|
97
|
+
tileMatrixSets.push(tileMatrix);
|
|
98
|
+
const outputJobs = [];
|
|
99
|
+
const configLayer = { name, title: titleizeImageryName(name) };
|
|
100
|
+
const paths = [];
|
|
101
|
+
for (const identifier of tileMatrixSets) {
|
|
80
102
|
const id = ulid.ulid();
|
|
81
103
|
const tileMatrix = TileMatrixSets.find(identifier);
|
|
82
104
|
if (tileMatrix == null)
|
|
83
105
|
throw new Error(`Cannot find tile matrix: ${identifier}`);
|
|
84
106
|
logger.info({ id, tileMatrix: tileMatrix.identifier }, 'SetTileMatrix');
|
|
85
107
|
const job = await this.makeCog(id, name, tileMatrix, source);
|
|
86
|
-
|
|
108
|
+
const jobLocation = job.getJobPath('job.json');
|
|
109
|
+
// Split the jobs into chunked tasks
|
|
110
|
+
const chunkedJobs = await this.splitJob(job, logger);
|
|
111
|
+
for (const names of chunkedJobs) {
|
|
112
|
+
outputJobs.push({ job: jobLocation, names });
|
|
113
|
+
}
|
|
114
|
+
// Set config layer for output
|
|
115
|
+
const path = jobLocation.replace('/job.json', '');
|
|
116
|
+
configLayer[tileMatrix.projection.code] = path;
|
|
117
|
+
paths.push(path);
|
|
87
118
|
}
|
|
88
|
-
// Write the output job json
|
|
89
119
|
const output = this.output.value;
|
|
90
120
|
if (output) {
|
|
91
|
-
fsa.write(output, JSON.stringify(
|
|
121
|
+
fsa.write(fsa.join(output, 'jobs.json'), JSON.stringify(outputJobs));
|
|
122
|
+
fsa.write(fsa.join(output, 'layer.json'), JSON.stringify(configLayer));
|
|
123
|
+
fsa.write(fsa.join(output, 'paths.json'), JSON.stringify(paths));
|
|
92
124
|
}
|
|
93
125
|
}
|
|
94
126
|
async makeCog(id, imageryName, tileMatrix, uri) {
|
|
95
127
|
const bucket = this.target.value;
|
|
96
|
-
if (bucket == null)
|
|
128
|
+
if (bucket == null && this.aws.value)
|
|
97
129
|
throw new Error('Please provide a validate bucket for output job.json');
|
|
98
130
|
let resampling;
|
|
99
131
|
/** Process Gebco 2193 as one cog of full extent to avoid antimeridian problems */
|
|
@@ -111,9 +143,11 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
111
143
|
}
|
|
112
144
|
// Prepare the cutline
|
|
113
145
|
let cutline;
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
146
|
+
const cutlinePath = this.cutline.value === '' ? undefined : this.cutline.value;
|
|
147
|
+
const blend = this.blend.value === 0 ? undefined : this.blend.value;
|
|
148
|
+
if (cutlinePath && blend)
|
|
149
|
+
cutline = { href: cutlinePath, blend };
|
|
150
|
+
else if (cutlinePath)
|
|
117
151
|
new Error('Please provide a blend for the cutline');
|
|
118
152
|
else
|
|
119
153
|
cutline = getCutline(imageryName);
|
|
@@ -121,9 +155,16 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
121
155
|
throw new Error(`Cannot found default cutline from imagery name: ${imageryName}`);
|
|
122
156
|
const ctx = {
|
|
123
157
|
imageryName,
|
|
124
|
-
override: {
|
|
125
|
-
|
|
126
|
-
|
|
158
|
+
override: {
|
|
159
|
+
id,
|
|
160
|
+
projection: Epsg.Nztm2000,
|
|
161
|
+
resampling,
|
|
162
|
+
alignedLevel: this.alignedLevel.value,
|
|
163
|
+
},
|
|
164
|
+
outputLocation: this.aws.value
|
|
165
|
+
? await this.findLocation(`s3://${bucket}/`)
|
|
166
|
+
: { type: 'local', path: '.' },
|
|
167
|
+
sourceLocation: await this.findLocation(uri),
|
|
127
168
|
cutline,
|
|
128
169
|
batch: false,
|
|
129
170
|
tileMatrix,
|
|
@@ -132,5 +173,32 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
132
173
|
const job = (await CogJobFactory.create(ctx));
|
|
133
174
|
return job;
|
|
134
175
|
}
|
|
176
|
+
async splitJob(job, logger) {
|
|
177
|
+
// Get all the existing output tiffs
|
|
178
|
+
const existTiffs = new Set();
|
|
179
|
+
for await (const fileName of fsa.list(job.getJobPath())) {
|
|
180
|
+
if (fileName.endsWith('.tiff'))
|
|
181
|
+
existTiffs.add(basename(fileName));
|
|
182
|
+
}
|
|
183
|
+
// Prepare chunk job and individual jobs based on imagery size.
|
|
184
|
+
const jobs = await BatchJob.getJobs(job, existTiffs, logger);
|
|
185
|
+
if (jobs.length === 0) {
|
|
186
|
+
logger.info('NoJobs');
|
|
187
|
+
return [];
|
|
188
|
+
}
|
|
189
|
+
logger.info({ jobTotal: job.output.files.length, jobLeft: jobs.length }, 'SplitJob:ChunkedJobs');
|
|
190
|
+
return jobs;
|
|
191
|
+
}
|
|
192
|
+
async findLocation(path) {
|
|
193
|
+
const configPath = Env.get(Env.AwsRoleConfigPath);
|
|
194
|
+
if (configPath == null)
|
|
195
|
+
throw new Error('No aws config path provided');
|
|
196
|
+
const configs = await fsa.readJson(configPath);
|
|
197
|
+
for (const prefix of configs.prefixes) {
|
|
198
|
+
if (path.startsWith(prefix.prefix))
|
|
199
|
+
return { type: 's3', path, roleArn: prefix.roleArn };
|
|
200
|
+
}
|
|
201
|
+
throw new Error(`No valid role to find the path: ${path}`);
|
|
202
|
+
}
|
|
135
203
|
}
|
|
136
204
|
//# sourceMappingURL=action.make.cog.js.map
|
|
@@ -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,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"action.make.cog.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.ts"],"names":[],"mappings":"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"}
|