@basemaps/cli 6.35.0 → 6.36.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 +22 -0
- package/README.md +6 -0
- 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 +18 -6
- package/build/cli/cogify/action.cog.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 +69 -14
- package/build/cli/cogify/action.make.cog.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 +96 -2
- package/build/cli/config/action.import.js.map +1 -1
- package/package.json +6 -5
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,28 @@
|
|
|
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.36.0](https://github.com/linz/basemaps/compare/v6.35.0...v6.36.0) (2022-10-18)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **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))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
* **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))
|
|
17
|
+
* **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))
|
|
18
|
+
* **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))
|
|
19
|
+
* **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))
|
|
20
|
+
* **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))
|
|
21
|
+
* **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))
|
|
22
|
+
* **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))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
6
28
|
# [6.35.0](https://github.com/linz/basemaps/compare/v6.34.0...v6.35.0) (2022-09-14)
|
|
7
29
|
|
|
8
30
|
|
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`
|
|
@@ -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,EAA2D,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEpG,OAAO,EACL,iBAAiB,EAKlB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAQ5C,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,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"action.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2D,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEpG,OAAO,EACL,iBAAiB,EAKlB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAQ5C,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;IAoD1B,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;IAqCrE,SAAS,CAAC,kBAAkB,IAAI,IAAI;CA4BrC"}
|
|
@@ -20,6 +20,15 @@ export class CommandCogCreate extends CommandLineAction {
|
|
|
20
20
|
documentation: 'Create a COG for the specified cog name',
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
|
+
parseName(name) {
|
|
24
|
+
// Name could both be a string or a array type of string
|
|
25
|
+
try {
|
|
26
|
+
return JSON.parse(name);
|
|
27
|
+
}
|
|
28
|
+
catch (e) {
|
|
29
|
+
return [name];
|
|
30
|
+
}
|
|
31
|
+
}
|
|
23
32
|
getNames(job) {
|
|
24
33
|
var _a, _b;
|
|
25
34
|
const output = new Set();
|
|
@@ -45,12 +54,15 @@ export class CommandCogCreate extends CommandLineAction {
|
|
|
45
54
|
return output;
|
|
46
55
|
}
|
|
47
56
|
const names = (_b = this.name) === null || _b === void 0 ? void 0 : _b.values;
|
|
48
|
-
if (names
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
57
|
+
if (names != null) {
|
|
58
|
+
for (const nameStr of names) {
|
|
59
|
+
const nameArr = this.parseName(nameStr);
|
|
60
|
+
for (const name of nameArr) {
|
|
61
|
+
if (!files.find((r) => r.name === name))
|
|
62
|
+
throw new LoggerFatalError({ name, names: files.map((r) => r.name).join(', ') }, 'Name does not exist inside job');
|
|
63
|
+
output.add(name);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
54
66
|
}
|
|
55
67
|
return output;
|
|
56
68
|
}
|
|
@@ -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,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAW,MAAM,kBAAkB,CAAC;AACpG,OAAO,EAAE,KAAK,EAAE,MAAM,oCAAoC,CAAC;AAC3D,OAAO,EACL,iBAAiB,GAKlB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAA8C,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,OAAO,gBAAiB,SAAQ,iBAAiB;IAMrD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,KAAK;YACjB,OAAO,EAAE,cAAc;YACvB,aAAa,EAAE,yCAAyC;SACzD,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,GAAW;;QAClB,MAAM,MAAM,GAAgB,IAAI,GAAG,EAAU,CAAC;QAC9C,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC7B,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QACrD,IAAI,UAAU,GAAG,CAAC,CAAC,EAAE;YACnB,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;YACnC,IAAI,IAAI,IAAI,IAAI,EAAE;gBAChB,MAAM,IAAI,gBAAgB,CACxB,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,EACnD,0CAA0C,CAC3C,CAAC;aACH;YACD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACjB,OAAO,MAAM,CAAC;SACf;QAED,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,CAAC;QACvC,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3C,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE;gBACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE;oBAC9B,MAAM,IAAI,gBAAgB,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,oCAAoC,CAAC,CAAC;iBAC9G;gBACD,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC1B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aAClB;YAED,OAAO,MAAM,CAAC;SACf;QAED,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,IAAI,0CAAE,MAAM,CAAC;QAChC,IAAI,KAAK,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"action.cog.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.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 maxPixelWidth;
|
|
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,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EACL,iBAAiB,EAIlB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,UAAU,EAAsB,MAAM,2BAA2B,CAAC;AAc3E,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,aAAa,CAA8B;IACnD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,GAAG,CAA2B;;IAUtC,SAAS,CAAC,kBAAkB,IAAI,IAAI;IA4D9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC1B,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IA6CrG,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 } 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.maxPixelWidth = this.defineIntegerParameter({
|
|
59
|
+
argumentName: 'MAX_PIXEL_WIDTH',
|
|
60
|
+
parameterLongName: '--max-pixel',
|
|
61
|
+
description: 'Maximum Pixel Width for the cogs',
|
|
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,18 +87,29 @@ 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
|
-
|
|
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);
|
|
78
98
|
const outputs = [];
|
|
79
|
-
for (const identifier of
|
|
99
|
+
for (const identifier of tileMatrixSets) {
|
|
80
100
|
const id = ulid.ulid();
|
|
81
101
|
const tileMatrix = TileMatrixSets.find(identifier);
|
|
82
102
|
if (tileMatrix == null)
|
|
83
103
|
throw new Error(`Cannot find tile matrix: ${identifier}`);
|
|
84
104
|
logger.info({ id, tileMatrix: tileMatrix.identifier }, 'SetTileMatrix');
|
|
85
105
|
const job = await this.makeCog(id, name, tileMatrix, source);
|
|
86
|
-
|
|
106
|
+
const jobLocation = job.getJobPath('job.json');
|
|
107
|
+
// Split the jobs into chunked tasks
|
|
108
|
+
const chunkedJobs = await this.splitJob(job, logger);
|
|
109
|
+
for (const names of chunkedJobs) {
|
|
110
|
+
outputs.push({ job: jobLocation, names });
|
|
111
|
+
}
|
|
87
112
|
}
|
|
88
|
-
// Write the output job json
|
|
89
113
|
const output = this.output.value;
|
|
90
114
|
if (output) {
|
|
91
115
|
fsa.write(output, JSON.stringify(outputs));
|
|
@@ -93,7 +117,7 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
93
117
|
}
|
|
94
118
|
async makeCog(id, imageryName, tileMatrix, uri) {
|
|
95
119
|
const bucket = this.target.value;
|
|
96
|
-
if (bucket == null)
|
|
120
|
+
if (bucket == null && this.aws.value)
|
|
97
121
|
throw new Error('Please provide a validate bucket for output job.json');
|
|
98
122
|
let resampling;
|
|
99
123
|
/** Process Gebco 2193 as one cog of full extent to avoid antimeridian problems */
|
|
@@ -111,9 +135,11 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
111
135
|
}
|
|
112
136
|
// Prepare the cutline
|
|
113
137
|
let cutline;
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
138
|
+
const cutlinePath = this.cutline.value === '' ? undefined : this.cutline.value;
|
|
139
|
+
const blend = this.blend.value === 0 ? undefined : this.blend.value;
|
|
140
|
+
if (cutlinePath && blend)
|
|
141
|
+
cutline = { href: cutlinePath, blend };
|
|
142
|
+
else if (cutlinePath)
|
|
117
143
|
new Error('Please provide a blend for the cutline');
|
|
118
144
|
else
|
|
119
145
|
cutline = getCutline(imageryName);
|
|
@@ -121,9 +147,11 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
121
147
|
throw new Error(`Cannot found default cutline from imagery name: ${imageryName}`);
|
|
122
148
|
const ctx = {
|
|
123
149
|
imageryName,
|
|
124
|
-
override: { id, projection: Epsg.Nztm2000, resampling },
|
|
125
|
-
outputLocation:
|
|
126
|
-
|
|
150
|
+
override: { id, projection: Epsg.Nztm2000, resampling, maxImageSize: this.maxPixelWidth.value },
|
|
151
|
+
outputLocation: this.aws.value
|
|
152
|
+
? await this.findLocation(`s3://${bucket}/`)
|
|
153
|
+
: { type: 'local', path: '.' },
|
|
154
|
+
sourceLocation: await this.findLocation(uri),
|
|
127
155
|
cutline,
|
|
128
156
|
batch: false,
|
|
129
157
|
tileMatrix,
|
|
@@ -132,5 +160,32 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
132
160
|
const job = (await CogJobFactory.create(ctx));
|
|
133
161
|
return job;
|
|
134
162
|
}
|
|
163
|
+
async splitJob(job, logger) {
|
|
164
|
+
// Get all the existing output tiffs
|
|
165
|
+
const existTiffs = new Set();
|
|
166
|
+
for await (const fileName of fsa.list(job.getJobPath())) {
|
|
167
|
+
if (fileName.endsWith('.tiff'))
|
|
168
|
+
existTiffs.add(basename(fileName));
|
|
169
|
+
}
|
|
170
|
+
// Prepare chunk job and individual jobs based on imagery size.
|
|
171
|
+
const jobs = await BatchJob.getJobs(job, existTiffs, logger);
|
|
172
|
+
if (jobs.length === 0) {
|
|
173
|
+
logger.info('NoJobs');
|
|
174
|
+
return [];
|
|
175
|
+
}
|
|
176
|
+
logger.info({ jobTotal: job.output.files.length, jobLeft: jobs.length }, 'SplitJob:ChunkedJobs');
|
|
177
|
+
return jobs;
|
|
178
|
+
}
|
|
179
|
+
async findLocation(path) {
|
|
180
|
+
const configPath = Env.get(Env.AwsRoleConfigPath);
|
|
181
|
+
if (configPath == null)
|
|
182
|
+
throw new Error('No aws config path provided');
|
|
183
|
+
const configs = await fsa.readJson(configPath);
|
|
184
|
+
for (const prefix of configs.prefixes) {
|
|
185
|
+
if (path.startsWith(prefix.prefix))
|
|
186
|
+
return { type: 's3', path, roleArn: prefix.roleArn };
|
|
187
|
+
}
|
|
188
|
+
throw new Error(`No valid role to find the path: ${path}`);
|
|
189
|
+
}
|
|
135
190
|
}
|
|
136
191
|
//# 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,
|
|
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,EAAoB,GAAG,EAAE,SAAS,EAAW,MAAM,kBAAkB,CAAC;AAClF,OAAO,EACL,iBAAiB,GAIlB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAQ1C,MAAM,OAAO,cAAe,SAAQ,iBAAiB;IAWnD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,UAAU;YACtB,OAAO,EAAE,yCAAyC;YAClD,aAAa,EAAE,4DAA4D;SAC5E,CAAC,CAAC;IACL,CAAC;IAES,kBAAkB;QAC1B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACxC,YAAY,EAAE,SAAS;YACvB,kBAAkB,EAAE,IAAI;YACxB,iBAAiB,EAAE,WAAW;YAC9B,WAAW,EAAE,mCAAmC;YAChD,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,kBAAkB,EAAE,IAAI;YACxB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,4BAA4B;YACzC,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACrC,YAAY,EAAE,MAAM;YACpB,kBAAkB,EAAE,IAAI;YACxB,iBAAiB,EAAE,QAAQ;YAC3B,WAAW,EAAE,sBAAsB;YACnC,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC;YAC3C,YAAY,EAAE,aAAa;YAC3B,iBAAiB,EAAE,eAAe;YAClC,WAAW,EAAE,oBAAoB;YACjC,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACxC,YAAY,EAAE,SAAS;YACvB,iBAAiB,EAAE,WAAW;YAC9B,WAAW,EAAE,wBAAwB;YACrC,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC;YACvC,YAAY,EAAE,OAAO;YACrB,iBAAiB,EAAE,SAAS;YAC5B,WAAW,EAAE,eAAe;YAC5B,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,sBAAsB,CAAC;YAC/C,YAAY,EAAE,iBAAiB;YAC/B,iBAAiB,EAAE,aAAa;YAChC,WAAW,EAAE,kCAAkC;YAC/C,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,kBAAkB,EAAE,IAAI;YACxB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,sBAAsB;YACnC,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,mBAAmB,CAAC;YAClC,iBAAiB,EAAE,OAAO;YAC1B,WAAW,EAAE,wBAAwB;YACrC,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QACnC,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAChE,IAAI,OAAO,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC9E,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEvF,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC;QAC/D,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC;QAChD,IAAI,IAAI,IAAI,IAAI;YAAE,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;QACjE,IAAI,IAAI,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAErE,IAAI,cAAc,GAAa,EAAE,CAAC;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QACzC,IAAI,UAAU,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QACjF,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;;YACvF,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAErC,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,KAAK,MAAM,UAAU,IAAI,cAAc,EAAE;YACvC,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YACvB,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACnD,IAAI,UAAU,IAAI,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,UAAU,EAAE,CAAC,CAAC;YAClF,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU,EAAE,EAAE,eAAe,CAAC,CAAC;YACxE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;YAC7D,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAC/C,oCAAoC;YACpC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACrD,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE;gBAC/B,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;aAC3C;SACF;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QACjC,IAAI,MAAM,EAAE;YACV,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;SAC5C;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU,EAAE,WAAmB,EAAE,UAAyB,EAAE,GAAW;QACnF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QACjC,IAAI,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC9G,IAAI,UAAU,CAAC;QACf,kFAAkF;QAClF,IAAI,UAAU,CAAC,UAAU,KAAK,IAAI,CAAC,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC5E,UAAU,GAAG;gBACX,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,SAAS;aACX,CAAC;SACZ;QAED,IAAI,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YACrC,UAAU,GAAG;gBACX,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,UAAU;aACZ,CAAC;SACZ;QAED,sBAAsB;QACtB,IAAI,OAAoD,CAAC;QACzD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QAC/E,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QACpE,IAAI,WAAW,IAAI,KAAK;YAAE,OAAO,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;aAC5D,IAAI,WAAW;YAAE,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;;YACrE,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QACvC,IAAI,OAAO,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,mDAAmD,WAAW,EAAE,CAAC,CAAC;QAEvG,MAAM,GAAG,GAAuB;YAC9B,WAAW;YACX,QAAQ,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE;YAC/F,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK;gBAC5B,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,MAAM,GAAG,CAAC;gBAC5C,CAAC,CAAC,EAAE,IAAI,EAAE,OAAgB,EAAE,IAAI,EAAE,GAAG,EAAE;YACzC,cAAc,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;YAC5C,OAAO;YACP,KAAK,EAAE,KAAK;YACZ,UAAU;YACV,cAAc,EAAE,KAAK;SACtB,CAAC;QAEF,MAAM,GAAG,GAAG,CAAC,MAAM,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAe,CAAC;QAC5D,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAe,EAAE,MAAe;QAC7C,oCAAoC;QACpC,MAAM,UAAU,GAAgB,IAAI,GAAG,EAAE,CAAC;QAC1C,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,EAAE;YACvD,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;SACpE;QAED,+DAA+D;QAC/D,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QAC7D,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACtB,OAAO,EAAE,CAAC;SACX;QACD,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC;QACjG,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAY;QAC7B,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAClD,IAAI,UAAU,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAuB,UAAU,CAAC,CAAC;QACrE,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,QAAQ,EAAE;YACrC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;gBAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;SAC1F;QACD,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAC;IAC7D,CAAC;CACF"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import { BaseConfig, ConfigProviderMemory } from '@basemaps/config';
|
|
1
|
+
import { BaseConfig, BasemapsConfigProvider, ConfigProviderMemory } from '@basemaps/config';
|
|
2
|
+
import { TileMatrixSet } from '@basemaps/geo';
|
|
2
3
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
4
|
+
import { CogStacJob } from '../../cog/cog.stac.job.js';
|
|
3
5
|
export declare class CommandImport extends CommandLineAction {
|
|
4
6
|
private config;
|
|
5
7
|
private backup;
|
|
8
|
+
private output;
|
|
6
9
|
private commit;
|
|
7
10
|
promises: Promise<boolean>[];
|
|
8
11
|
/** List of paths to invalidate at the end of the request */
|
|
@@ -13,5 +16,15 @@ export declare class CommandImport extends CommandLineAction {
|
|
|
13
16
|
protected onDefineParameters(): void;
|
|
14
17
|
onExecute(): Promise<void>;
|
|
15
18
|
update(config: BaseConfig, commit: boolean): void;
|
|
19
|
+
outputChange(output: string, mem: BasemapsConfigProvider, cfg: BasemapsConfigProvider): Promise<void>;
|
|
20
|
+
_jobs: Map<string, CogStacJob>;
|
|
21
|
+
_loadJob(path: string): Promise<CogStacJob>;
|
|
22
|
+
/**
|
|
23
|
+
* Prepare QA urls with center location
|
|
24
|
+
*/
|
|
25
|
+
prepareUrl(id: string, mem: BasemapsConfigProvider, tileMatrix: TileMatrixSet): Promise<{
|
|
26
|
+
layer: string;
|
|
27
|
+
tag: string;
|
|
28
|
+
}>;
|
|
16
29
|
}
|
|
17
30
|
//# sourceMappingURL=action.import.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.import.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"action.import.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,sBAAsB,EAGtB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAA8B,aAAa,EAAE,MAAM,eAAe,CAAC;AAE1E,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAErH,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAMvD,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA2B;IAEzC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAM;IAClC,4DAA4D;IAC5D,aAAa,EAAE,MAAM,EAAE,CAAM;IAC7B,4DAA4D;IAC5D,YAAY,EAAE,oBAAoB,CAA8B;;IAUhE,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAwB9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAwEhC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;IAkB3C,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,sBAAsB,EAAE,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD3G,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAiC;IACzD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAQjD;;OAEG;IACG,UAAU,CACd,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,sBAAsB,EAC3B,UAAU,EAAE,aAAa,GACxB,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;CAe3C"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import { ConfigProviderMemory } from '@basemaps/config';
|
|
2
|
-
import {
|
|
1
|
+
import { ConfigProviderMemory, } from '@basemaps/config';
|
|
2
|
+
import { GoogleTms, Nztm2000QuadTms } from '@basemaps/geo';
|
|
3
|
+
import { Env, fsa, getDefaultConfig, LogConfig, Projection } from '@basemaps/shared';
|
|
3
4
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
4
5
|
import fetch from 'node-fetch';
|
|
5
6
|
import { invalidateCache } from '../util.js';
|
|
6
7
|
import { Q, Updater } from './config.update.js';
|
|
8
|
+
const PublicUrlBase = 'https://basemaps.linz.govt.nz/';
|
|
7
9
|
export class CommandImport extends CommandLineAction {
|
|
8
10
|
constructor() {
|
|
9
11
|
super({
|
|
@@ -16,6 +18,7 @@ export class CommandImport extends CommandLineAction {
|
|
|
16
18
|
this.invalidations = [];
|
|
17
19
|
/** List of paths to invalidate at the end of the request */
|
|
18
20
|
this.backupConfig = new ConfigProviderMemory();
|
|
21
|
+
this._jobs = new Map();
|
|
19
22
|
}
|
|
20
23
|
onDefineParameters() {
|
|
21
24
|
this.config = this.defineStringParameter({
|
|
@@ -29,6 +32,11 @@ export class CommandImport extends CommandLineAction {
|
|
|
29
32
|
parameterLongName: '--backup',
|
|
30
33
|
description: 'Backup the old config into a config bundle json',
|
|
31
34
|
});
|
|
35
|
+
this.output = this.defineStringParameter({
|
|
36
|
+
argumentName: 'OUTPUT',
|
|
37
|
+
parameterLongName: '--output',
|
|
38
|
+
description: 'Output a markdown file with the config changes',
|
|
39
|
+
});
|
|
32
40
|
this.commit = this.defineFlagParameter({
|
|
33
41
|
parameterLongName: '--commit',
|
|
34
42
|
description: 'Actually start the import',
|
|
@@ -69,6 +77,7 @@ export class CommandImport extends CommandLineAction {
|
|
|
69
77
|
name: cfg.ConfigBundle.id(`config-${configJson.hash}.json`),
|
|
70
78
|
path: config,
|
|
71
79
|
hash: configJson.hash,
|
|
80
|
+
assets: configJson.assets,
|
|
72
81
|
};
|
|
73
82
|
logger.info({ config }, 'Import:ConfigBundle');
|
|
74
83
|
if (cfg.ConfigBundle.isWriteable()) {
|
|
@@ -95,6 +104,9 @@ export class CommandImport extends CommandLineAction {
|
|
|
95
104
|
if (backup) {
|
|
96
105
|
await fsa.writeJson(backup, this.backupConfig.toJson());
|
|
97
106
|
}
|
|
107
|
+
const output = this.output.value;
|
|
108
|
+
if (output)
|
|
109
|
+
await this.outputChange(output, mem, cfg);
|
|
98
110
|
if (commit !== true)
|
|
99
111
|
logger.info('DryRun:Done');
|
|
100
112
|
}
|
|
@@ -115,5 +127,87 @@ export class CommandImport extends CommandLineAction {
|
|
|
115
127
|
});
|
|
116
128
|
this.promises.push(promise);
|
|
117
129
|
}
|
|
130
|
+
async outputChange(output, mem, cfg) {
|
|
131
|
+
const inserts = ['# New Layers\n'];
|
|
132
|
+
const updates = ['# Updates\n'];
|
|
133
|
+
const id = 'ts_aerial';
|
|
134
|
+
const newData = await mem.TileSet.get(id);
|
|
135
|
+
const oldData = await cfg.TileSet.get(id);
|
|
136
|
+
if (newData == null || oldData == null)
|
|
137
|
+
throw new Error('Failed to fetch aerial config data.');
|
|
138
|
+
for (const layer of newData.layers) {
|
|
139
|
+
if (layer.name === 'chatham-islands_digital-globe_2014-2019_0-5m')
|
|
140
|
+
continue; // Ignore duplicated layer.
|
|
141
|
+
const existing = oldData.layers.find((l) => l.name === layer.name);
|
|
142
|
+
if (existing) {
|
|
143
|
+
const change = [`### ${layer.name}\n`];
|
|
144
|
+
if (layer.minZoom !== existing.minZoom || layer.maxZoom !== existing.maxZoom) {
|
|
145
|
+
let msg = ' - Zoom level updated.';
|
|
146
|
+
if (layer.minZoom !== existing.minZoom)
|
|
147
|
+
msg += ` min zoom ${existing.minZoom} -> ${layer.minZoom}`;
|
|
148
|
+
if (layer.maxZoom !== existing.maxZoom)
|
|
149
|
+
msg += ` max zoom ${existing.maxZoom} -> ${layer.maxZoom}`;
|
|
150
|
+
change.push(`${msg}\n`);
|
|
151
|
+
}
|
|
152
|
+
if (layer[2193] && layer[2193] !== existing[2193]) {
|
|
153
|
+
const urls = await this.prepareUrl(layer[2193], mem, Nztm2000QuadTms);
|
|
154
|
+
change.push(`- Layer update [NZTM200Quad](${urls.layer}) -- [Aerial](${urls.tag})\n`);
|
|
155
|
+
}
|
|
156
|
+
if (layer[3857] && layer[3857] !== existing[3857]) {
|
|
157
|
+
const urls = await this.prepareUrl(layer[3857], mem, GoogleTms);
|
|
158
|
+
change.push(`- Layer update [WebMercatorQuad](${urls.layer}) -- [Aerial](${urls.tag})\n`);
|
|
159
|
+
}
|
|
160
|
+
if (change.length > 1)
|
|
161
|
+
updates.push(change.join(''));
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
// New layers
|
|
165
|
+
inserts.push(`### ${layer.name}\n`);
|
|
166
|
+
if (layer[2193]) {
|
|
167
|
+
const urls = await this.prepareUrl(layer[2193], mem, Nztm2000QuadTms);
|
|
168
|
+
inserts.push(` - [NZTM200Quad](${urls.layer}) -- [Aerial](${urls.tag})\n`);
|
|
169
|
+
}
|
|
170
|
+
if (layer[3857]) {
|
|
171
|
+
const urls = await this.prepareUrl(layer[3857], mem, GoogleTms);
|
|
172
|
+
inserts.push(` - [WebMercatorQuad](${urls.layer}) -- [Aerial](${urls.tag})\n`);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
let md = '';
|
|
177
|
+
if (inserts.length > 1)
|
|
178
|
+
md += inserts.join('');
|
|
179
|
+
if (updates.length > 1)
|
|
180
|
+
md += updates.join('');
|
|
181
|
+
if (md !== '')
|
|
182
|
+
await fsa.write(output, md);
|
|
183
|
+
return;
|
|
184
|
+
}
|
|
185
|
+
async _loadJob(path) {
|
|
186
|
+
const existing = this._jobs.get(path);
|
|
187
|
+
if (existing)
|
|
188
|
+
return existing;
|
|
189
|
+
const job = await fsa.readJson(path);
|
|
190
|
+
this._jobs.set(path, job);
|
|
191
|
+
return job;
|
|
192
|
+
}
|
|
193
|
+
/**
|
|
194
|
+
* Prepare QA urls with center location
|
|
195
|
+
*/
|
|
196
|
+
async prepareUrl(id, mem, tileMatrix) {
|
|
197
|
+
const configImagey = await mem.Imagery.get(id);
|
|
198
|
+
if (configImagey == null)
|
|
199
|
+
throw new Error(`Failed to find imagery config from config bundel file. Id: ${id}`);
|
|
200
|
+
const job = await this._loadJob(fsa.join(configImagey.uri, 'job.json'));
|
|
201
|
+
const bounds = configImagey.bounds;
|
|
202
|
+
const center = { x: bounds.x + bounds.width / 2, y: bounds.y + bounds.height / 2 };
|
|
203
|
+
const proj = Projection.get(configImagey.projection);
|
|
204
|
+
const centerLatLon = proj.toWgs84([center.x, center.y]).map((c) => c.toFixed(6));
|
|
205
|
+
const targetZoom = Math.max(tileMatrix.findBestZoom(job.output.gsd) - 12, 0);
|
|
206
|
+
const urls = {
|
|
207
|
+
layer: `${PublicUrlBase}?i=${job.id}&p=${tileMatrix.identifier}&debug#@${centerLatLon[1]},${centerLatLon[0]},z${targetZoom}`,
|
|
208
|
+
tag: `${PublicUrlBase}?config=${this.config.value}&p=${tileMatrix.identifier}&debug#@${centerLatLon[1]},${centerLatLon[0]},z${targetZoom}`,
|
|
209
|
+
};
|
|
210
|
+
return urls;
|
|
211
|
+
}
|
|
118
212
|
}
|
|
119
213
|
//# sourceMappingURL=action.import.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.import.js","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"action.import.js","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basemaps/cli",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.36.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -38,12 +38,13 @@
|
|
|
38
38
|
"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@basemaps/config": "^6.
|
|
41
|
+
"@basemaps/config": "^6.36.0",
|
|
42
42
|
"@basemaps/geo": "^6.32.1",
|
|
43
|
-
"@basemaps/server": "^6.
|
|
44
|
-
"@basemaps/shared": "^6.
|
|
43
|
+
"@basemaps/server": "^6.36.0",
|
|
44
|
+
"@basemaps/shared": "^6.36.0",
|
|
45
45
|
"@basemaps/sprites": "^6.32.1",
|
|
46
46
|
"@chunkd/fs": "^8.5.1",
|
|
47
|
+
"@chunkd/source-aws-v2": "^8.5.1",
|
|
47
48
|
"@cogeotiff/core": "^7.0.0",
|
|
48
49
|
"@cotar/core": "^5.4.0",
|
|
49
50
|
"@cotar/tar": "^5.4.1",
|
|
@@ -68,5 +69,5 @@
|
|
|
68
69
|
"files": [
|
|
69
70
|
"build/"
|
|
70
71
|
],
|
|
71
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "c232694ad1f1186b7b56a8af1def56ef165df8fd"
|
|
72
73
|
}
|