@basemaps/cli 6.32.1 → 6.34.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 +41 -0
- package/build/cli/aws/__tests__/action.aws.test.js +45 -26
- package/build/cli/aws/__tests__/action.aws.test.js.map +1 -1
- package/build/cli/aws/__tests__/size.test.d.ts +2 -0
- package/build/cli/aws/__tests__/size.test.d.ts.map +1 -0
- package/build/cli/aws/__tests__/size.test.js +51 -0
- package/build/cli/aws/__tests__/size.test.js.map +1 -0
- package/build/cli/aws/action.aws.list.d.ts +10 -2
- package/build/cli/aws/action.aws.list.d.ts.map +1 -1
- package/build/cli/aws/action.aws.list.js +26 -16
- package/build/cli/aws/action.aws.list.js.map +1 -1
- package/build/cli/aws/sizes.d.ts +8 -0
- package/build/cli/aws/sizes.d.ts.map +1 -0
- package/build/cli/aws/sizes.js +30 -0
- package/build/cli/aws/sizes.js.map +1 -0
- package/build/cli/config/action.bundle.d.ts.map +1 -1
- package/build/cli/config/action.bundle.js +4 -2
- package/build/cli/config/action.bundle.js.map +1 -1
- package/build/cli/config/action.imagery.config.d.ts +10 -0
- package/build/cli/config/action.imagery.config.d.ts.map +1 -0
- package/build/cli/config/action.imagery.config.js +111 -0
- package/build/cli/config/action.imagery.config.js.map +1 -0
- package/build/cli/config/action.import.d.ts.map +1 -1
- package/build/cli/config/action.import.js +0 -1
- package/build/cli/config/action.import.js.map +1 -1
- package/build/cli/index.d.ts.map +1 -1
- package/build/cli/index.js +2 -0
- package/build/cli/index.js.map +1 -1
- package/build/cli/screenshot/test.tiles.d.ts.map +1 -1
- package/build/cli/screenshot/test.tiles.js +40 -0
- package/build/cli/screenshot/test.tiles.js.map +1 -1
- package/build/cli/server/action.serve.d.ts.map +1 -1
- package/build/cli/server/action.serve.js +7 -2
- package/build/cli/server/action.serve.js.map +1 -1
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,47 @@
|
|
|
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.34.0](https://github.com/linz/basemaps/compare/v6.33.0...v6.34.0) (2022-08-17)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **cli:** include sharp in batch container ([#2420](https://github.com/linz/basemaps/issues/2420)) ([da8a216](https://github.com/linz/basemaps/commit/da8a216b4a1a0c898b9d4eef07f508bff3ba8ce5))
|
|
12
|
+
* **cli:** Need to set AwsRoleConfigPath for RoleRegister ([#2427](https://github.com/linz/basemaps/issues/2427)) ([cd564b1](https://github.com/linz/basemaps/commit/cd564b11bbe8c9277030b43c0ad52ae5ef4829da))
|
|
13
|
+
* **cli:** path always ending with /, we need get the name by at(-2). ([#2432](https://github.com/linz/basemaps/issues/2432)) ([759163f](https://github.com/linz/basemaps/commit/759163f2756613ecbc8e57feb93733624e546923))
|
|
14
|
+
* **server:** error if port is in use ([#2418](https://github.com/linz/basemaps/issues/2418)) ([a469af3](https://github.com/linz/basemaps/commit/a469af3685899c9ece6f6a4394089a341c0672b5))
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Features
|
|
18
|
+
|
|
19
|
+
* **cli:** add --group-size to group by a size limit ([#2438](https://github.com/linz/basemaps/issues/2438)) ([b22a03a](https://github.com/linz/basemaps/commit/b22a03a61c78d1d19dc60787812c26b69f2877cb))
|
|
20
|
+
* **cli:** Add some new screenshot default tests. BM-640 ([#2402](https://github.com/linz/basemaps/issues/2402)) ([f0caee1](https://github.com/linz/basemaps/commit/f0caee104b2ab0286bbfcf95b240bf1b2ee3479c))
|
|
21
|
+
* **cli:** New cli tool to create config.json for raw imagery. ([#2423](https://github.com/linz/basemaps/issues/2423)) ([2cbfb40](https://github.com/linz/basemaps/commit/2cbfb4094b1c1ae7eba31e6cfc8acb837d0efbe1))
|
|
22
|
+
* **lambda-tiler:** Assets provider to get assets from any location. ([#2374](https://github.com/linz/basemaps/issues/2374)) ([c145f28](https://github.com/linz/basemaps/commit/c145f283bf5875d5e7b15909cc37811b029303f4))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
# [6.33.0](https://github.com/linz/basemaps/compare/v6.32.2...v6.33.0) (2022-08-01)
|
|
29
|
+
|
|
30
|
+
**Note:** Version bump only for package @basemaps/cli
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
## [6.32.2](https://github.com/linz/basemaps/compare/v6.32.1...v6.32.2) (2022-07-28)
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
### Bug Fixes
|
|
40
|
+
|
|
41
|
+
* **cli:** do not trace everything by default ([#2383](https://github.com/linz/basemaps/issues/2383)) ([39eba95](https://github.com/linz/basemaps/commit/39eba95b1f297f794592d9eddef10b05b5bfe08b))
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
|
|
6
47
|
## [6.32.1](https://github.com/linz/basemaps/compare/v6.32.0...v6.32.1) (2022-07-28)
|
|
7
48
|
|
|
8
49
|
**Note:** Version bump only for package @basemaps/cli
|
|
@@ -1,39 +1,58 @@
|
|
|
1
1
|
import { fsa } from '@chunkd/fs';
|
|
2
2
|
import o from 'ospec';
|
|
3
|
-
import { asyncFilter,
|
|
4
|
-
o.spec('
|
|
3
|
+
import { asyncFilter, chunkFiles } from '../action.aws.list.js';
|
|
4
|
+
o.spec('chunkFiles', () => {
|
|
5
5
|
o('should chunk a array', () => {
|
|
6
|
-
o(
|
|
7
|
-
[1, 2],
|
|
8
|
-
[3, 4],
|
|
9
|
-
]);
|
|
10
|
-
});
|
|
11
|
-
o('should chunk a set', () => {
|
|
12
|
-
o(chunkArray(new Set([1, 2, 3, 4, 4]), 2)).deepEquals([
|
|
13
|
-
[1, 2],
|
|
14
|
-
[3, 4],
|
|
6
|
+
o(chunkFiles([{ path: '1' }, { path: '2' }, { path: '3' }, { path: '4' }], 2, -1)).deepEquals([
|
|
7
|
+
['1', '2'],
|
|
8
|
+
['3', '4'],
|
|
15
9
|
]);
|
|
16
10
|
});
|
|
17
11
|
o('should chunk small set', () => {
|
|
18
|
-
o(
|
|
12
|
+
o(chunkFiles([{ path: '1' }], 2, -1)).deepEquals([['1']]);
|
|
19
13
|
});
|
|
20
14
|
o('should chunk large set', () => {
|
|
21
|
-
o(
|
|
15
|
+
o(chunkFiles([{ path: '1' }, { path: '2' }, { path: '3' }, { path: '4' }], 5, -1)).deepEquals([
|
|
16
|
+
['1', '2', '3', '4'],
|
|
17
|
+
]);
|
|
22
18
|
});
|
|
23
19
|
o('should chunk into single sets', () => {
|
|
24
|
-
o(
|
|
20
|
+
o(chunkFiles([{ path: '1' }, { path: '2' }, { path: '3' }, { path: '4' }], 1, -1)).deepEquals([
|
|
21
|
+
['1'],
|
|
22
|
+
['2'],
|
|
23
|
+
['3'],
|
|
24
|
+
['4'],
|
|
25
|
+
]);
|
|
26
|
+
});
|
|
27
|
+
o('should chunk by size', () => {
|
|
28
|
+
o(chunkFiles([
|
|
29
|
+
{ path: '1', size: 100 },
|
|
30
|
+
{ path: '2', size: 200 },
|
|
31
|
+
{ path: '3', size: 300 },
|
|
32
|
+
{ path: '4', size: 400 },
|
|
33
|
+
], -1, 300)).deepEquals([['1', '2'], ['3'], ['4']]);
|
|
34
|
+
});
|
|
35
|
+
o('should chunk by size or count which ever comes first', () => {
|
|
36
|
+
o(chunkFiles([
|
|
37
|
+
{ path: '1', size: 100 },
|
|
38
|
+
{ path: '2', size: 100 },
|
|
39
|
+
{ path: '3', size: 100 },
|
|
40
|
+
{ path: '4', size: 100 },
|
|
41
|
+
{ path: '5', size: 600 },
|
|
42
|
+
{ path: '6', size: 600 },
|
|
43
|
+
], 2, 500)).deepEquals([['1', '2'], ['3', '4'], ['5'], ['6']]);
|
|
25
44
|
});
|
|
26
45
|
});
|
|
27
46
|
o.spec('asyncFilter', () => {
|
|
28
47
|
const fileList = [
|
|
29
|
-
'a.tiff',
|
|
30
|
-
'B.TIFF',
|
|
31
|
-
'/foo/bar/baz.tiff',
|
|
32
|
-
'/foo/xls.ts',
|
|
33
|
-
'c:\\foo\\bar.txt',
|
|
34
|
-
's3://foo/bar.tiff',
|
|
35
|
-
's3://foo/bar.ts',
|
|
36
|
-
's3://foo/bar/baz.tif',
|
|
48
|
+
{ path: 'a.tiff' },
|
|
49
|
+
{ path: 'B.TIFF' },
|
|
50
|
+
{ path: '/foo/bar/baz.tiff' },
|
|
51
|
+
{ path: '/foo/xls.ts' },
|
|
52
|
+
{ path: 'c:\\foo\\bar.txt' },
|
|
53
|
+
{ path: 's3://foo/bar.tiff' },
|
|
54
|
+
{ path: 's3://foo/bar.ts' },
|
|
55
|
+
{ path: 's3://foo/bar/baz.tif' },
|
|
37
56
|
];
|
|
38
57
|
async function* generator() {
|
|
39
58
|
for (const file of fileList)
|
|
@@ -44,16 +63,16 @@ o.spec('asyncFilter', () => {
|
|
|
44
63
|
});
|
|
45
64
|
o('should filter exact', async () => {
|
|
46
65
|
for (const file of fileList) {
|
|
47
|
-
if (file.startsWith('c:\\'))
|
|
66
|
+
if (file.path.startsWith('c:\\'))
|
|
48
67
|
continue; // not a valid regexp
|
|
49
|
-
o(await fsa.toArray(asyncFilter(generator(), file))).deepEquals([file]);
|
|
68
|
+
o(await fsa.toArray(asyncFilter(generator(), file.path))).deepEquals([file]);
|
|
50
69
|
}
|
|
51
70
|
});
|
|
52
71
|
o('should filter suffix', async () => {
|
|
53
|
-
o(await fsa.toArray(asyncFilter(generator(), '.tiff$'))).deepEquals(fileList.filter((f) => f.toLowerCase().endsWith('.tiff')));
|
|
72
|
+
o(await fsa.toArray(asyncFilter(generator(), '.tiff$'))).deepEquals(fileList.filter((f) => f.path.toLowerCase().endsWith('.tiff')));
|
|
54
73
|
});
|
|
55
74
|
o('should filter tif or tiff', async () => {
|
|
56
|
-
o(await fsa.toArray(asyncFilter(generator(), '.tiff?$'))).deepEquals(fileList.filter((f) => f.toLowerCase().endsWith('.tiff') || f.toLowerCase().endsWith('.tif')));
|
|
75
|
+
o(await fsa.toArray(asyncFilter(generator(), '.tiff?$'))).deepEquals(fileList.filter((f) => f.path.toLowerCase().endsWith('.tiff') || f.path.toLowerCase().endsWith('.tif')));
|
|
57
76
|
});
|
|
58
77
|
});
|
|
59
78
|
//# sourceMappingURL=action.aws.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.aws.test.js","sourceRoot":"","sources":["../../../../src/cli/aws/__tests__/action.aws.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"action.aws.test.js","sourceRoot":"","sources":["../../../../src/cli/aws/__tests__/action.aws.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"size.test.d.ts","sourceRoot":"","sources":["../../../../src/cli/aws/__tests__/size.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import o from 'ospec';
|
|
2
|
+
import { parseSize } from '../sizes.js';
|
|
3
|
+
o.spec('parseSize', () => {
|
|
4
|
+
o('should parse bytes', () => {
|
|
5
|
+
o(parseSize('1')).equals(1);
|
|
6
|
+
o(parseSize('1KB')).equals(1024);
|
|
7
|
+
o(parseSize('1MB')).equals(1024 * 1024);
|
|
8
|
+
o(parseSize('1GB')).equals(1024 * 1024 * 1024);
|
|
9
|
+
o(parseSize('1TB')).equals(1024 * 1024 * 1024 * 1024);
|
|
10
|
+
});
|
|
11
|
+
o('should parse negative bytes', () => {
|
|
12
|
+
o(parseSize('-1.2 ')).equals(-1);
|
|
13
|
+
o(parseSize('-1.2 KB')).equals(Math.round(-1.2 * 1024));
|
|
14
|
+
o(parseSize('-1.2 MB')).equals(Math.round(-1.2 * 1024 * 1024));
|
|
15
|
+
o(parseSize('-1.2 GB')).equals(Math.round(-1.2 * 1024 * 1024 * 1024));
|
|
16
|
+
o(parseSize('-1.2 TB')).equals(Math.round(-1.2 * 1024 * 1024 * 1024 * 1024));
|
|
17
|
+
});
|
|
18
|
+
o('should parse partial bytes', () => {
|
|
19
|
+
o(parseSize('1.2 ')).equals(1);
|
|
20
|
+
o(parseSize('1.2 KB')).equals(Math.round(1.2 * 1024));
|
|
21
|
+
o(parseSize('1.2 MB')).equals(Math.round(1.2 * 1024 * 1024));
|
|
22
|
+
o(parseSize('1.2 GB')).equals(Math.round(1.2 * 1024 * 1024 * 1024));
|
|
23
|
+
o(parseSize('1.2 TB')).equals(Math.round(1.2 * 1024 * 1024 * 1024 * 1024));
|
|
24
|
+
});
|
|
25
|
+
o('should parse metric', () => {
|
|
26
|
+
o(parseSize('1Ki')).equals(1000);
|
|
27
|
+
o(parseSize('1Mi')).equals(1000 * 1000);
|
|
28
|
+
o(parseSize('1Gi')).equals(1000 * 1000 * 1000);
|
|
29
|
+
o(parseSize('1Ti')).equals(1000 * 1000 * 1000 * 1000);
|
|
30
|
+
});
|
|
31
|
+
o('should parse partial metric', () => {
|
|
32
|
+
o(parseSize('1.2 Ki')).equals(1.2 * 1000);
|
|
33
|
+
o(parseSize('1.2 Mi')).equals(1.2 * 1000 * 1000);
|
|
34
|
+
o(parseSize('1.2 Gi')).equals(1.2 * 1000 * 1000 * 1000);
|
|
35
|
+
o(parseSize('1.2 Ti')).equals(1.2 * 1000 * 1000 * 1000 * 1000);
|
|
36
|
+
});
|
|
37
|
+
o('should parse negative metric', () => {
|
|
38
|
+
o(parseSize('-1.2 ')).equals(-1);
|
|
39
|
+
o(parseSize('-1.2 Ki')).equals(-1.2 * 1000);
|
|
40
|
+
o(parseSize('-1.2 Mi')).equals(-1.2 * 1000 * 1000);
|
|
41
|
+
o(parseSize('-1.2 Gi')).equals(-1.2 * 1000 * 1000 * 1000);
|
|
42
|
+
o(parseSize('-1.2 Ti')).equals(-1.2 * 1000 * 1000 * 1000 * 1000);
|
|
43
|
+
});
|
|
44
|
+
o('should fail on invalid test', () => {
|
|
45
|
+
o(() => parseSize('1 B B')).throws(Error);
|
|
46
|
+
o(() => parseSize('1 ZB')).throws(Error);
|
|
47
|
+
o(() => parseSize('1 Zi')).throws(Error);
|
|
48
|
+
o(() => parseSize('a')).throws(Error);
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
//# sourceMappingURL=size.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"size.test.js","sourceRoot":"","sources":["../../../../src/cli/aws/__tests__/size.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,22 @@
|
|
|
1
1
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
2
|
+
export interface FileSizeInfo {
|
|
3
|
+
path: string;
|
|
4
|
+
size?: number;
|
|
5
|
+
}
|
|
2
6
|
export declare class CommandList extends CommandLineAction {
|
|
3
7
|
private filter;
|
|
4
8
|
private output;
|
|
5
9
|
private group;
|
|
10
|
+
private groupSize;
|
|
6
11
|
private limit;
|
|
7
12
|
private config;
|
|
8
13
|
constructor();
|
|
9
14
|
protected onDefineParameters(): void;
|
|
10
15
|
onExecute(): Promise<void>;
|
|
11
16
|
}
|
|
12
|
-
export declare function asyncFilter
|
|
13
|
-
|
|
17
|
+
export declare function asyncFilter<T extends {
|
|
18
|
+
path: string;
|
|
19
|
+
}>(source: AsyncGenerator<T>, filter: string): AsyncGenerator<T>;
|
|
20
|
+
/** Chunk files into a max size (eg 1GB chunks) or max count (eg 100 files) or what ever comes first when both are defined */
|
|
21
|
+
export declare function chunkFiles(values: FileSizeInfo[], count: number, size: number): string[][];
|
|
14
22
|
//# sourceMappingURL=action.aws.list.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.aws.list.d.ts","sourceRoot":"","sources":["../../../src/cli/aws/action.aws.list.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA2D,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"action.aws.list.d.ts","sourceRoot":"","sources":["../../../src/cli/aws/action.aws.list.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAA2D,MAAM,4BAA4B,CAAC;AAGxH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,WAAY,SAAQ,iBAAiB;IAChD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,MAAM,CAA6B;;IAU3C,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAqC9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAmCjC;AAED,wBAAuB,WAAW,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAC3D,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,MAAM,EAAE,MAAM,GACb,cAAc,CAAC,CAAC,CAAC,CAQnB;AAED,6HAA6H;AAC7H,wBAAgB,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,CAiB1F"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Env, fsa, LogConfig, RoleRegister } from '@basemaps/shared';
|
|
2
2
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
3
|
+
import { parseSize } from './sizes.js';
|
|
3
4
|
export class CommandList extends CommandLineAction {
|
|
4
5
|
constructor() {
|
|
5
6
|
super({
|
|
@@ -19,6 +20,11 @@ export class CommandList extends CommandLineAction {
|
|
|
19
20
|
parameterLongName: '--group',
|
|
20
21
|
description: 'Group files into this number per group',
|
|
21
22
|
});
|
|
23
|
+
this.groupSize = this.defineStringParameter({
|
|
24
|
+
argumentName: 'GROUP_SIZE',
|
|
25
|
+
parameterLongName: '--group-size',
|
|
26
|
+
description: 'Group files into this size per group, eg "5Gi" or "3TB"',
|
|
27
|
+
});
|
|
22
28
|
this.limit = this.defineIntegerParameter({
|
|
23
29
|
argumentName: 'LIMIT',
|
|
24
30
|
parameterLongName: '--limit',
|
|
@@ -40,7 +46,7 @@ export class CommandList extends CommandLineAction {
|
|
|
40
46
|
});
|
|
41
47
|
}
|
|
42
48
|
async onExecute() {
|
|
43
|
-
var _a, _b, _c, _d;
|
|
49
|
+
var _a, _b, _c, _d, _e, _f;
|
|
44
50
|
const logger = LogConfig.get();
|
|
45
51
|
const config = this.config.value;
|
|
46
52
|
if (config) {
|
|
@@ -55,28 +61,25 @@ export class CommandList extends CommandLineAction {
|
|
|
55
61
|
throw new Error('Missing --output path');
|
|
56
62
|
const limit = (_c = this.limit.value) !== null && _c !== void 0 ? _c : -1; // no limit by default
|
|
57
63
|
const filter = (_d = this.filter.value) !== null && _d !== void 0 ? _d : '*'; // Filter everything by default
|
|
58
|
-
const outputFiles =
|
|
64
|
+
const outputFiles = [];
|
|
59
65
|
for (const targetPath of paths) {
|
|
60
66
|
logger.debug({ path: targetPath }, 'List');
|
|
61
67
|
const assumedRole = await RoleRegister.findRole(targetPath);
|
|
62
68
|
if (assumedRole)
|
|
63
69
|
logger.debug({ path: targetPath, roleArn: assumedRole === null || assumedRole === void 0 ? void 0 : assumedRole.roleArn }, 'List:Role');
|
|
64
|
-
const fileList = await fsa.toArray(asyncFilter(fsa.
|
|
70
|
+
const fileList = await fsa.toArray(asyncFilter(fsa.details(targetPath), filter));
|
|
65
71
|
logger.debug({ path: targetPath, fileCount: fileList.length }, 'List:Count');
|
|
66
72
|
for (const file of fileList) {
|
|
67
|
-
outputFiles.
|
|
68
|
-
if (limit > 0 && outputFiles.
|
|
73
|
+
outputFiles.push(file);
|
|
74
|
+
if (limit > 0 && outputFiles.length >= limit)
|
|
69
75
|
break;
|
|
70
76
|
}
|
|
71
|
-
if (limit > 0 && outputFiles.
|
|
77
|
+
if (limit > 0 && outputFiles.length >= limit)
|
|
72
78
|
break;
|
|
73
79
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
else {
|
|
78
|
-
await fsa.write(outputPath, JSON.stringify(chunkArray(outputFiles, this.group.value)));
|
|
79
|
-
}
|
|
80
|
+
const maxSize = parseSize((_e = this.groupSize.value) !== null && _e !== void 0 ? _e : '-1');
|
|
81
|
+
const maxLength = (_f = this.group.value) !== null && _f !== void 0 ? _f : -1;
|
|
82
|
+
await fsa.write(outputPath, JSON.stringify(chunkFiles(outputFiles, maxLength, maxSize)));
|
|
80
83
|
}
|
|
81
84
|
}
|
|
82
85
|
export async function* asyncFilter(source, filter) {
|
|
@@ -85,18 +88,25 @@ export async function* asyncFilter(source, filter) {
|
|
|
85
88
|
const re = new RegExp(filter.toLowerCase(), 'i');
|
|
86
89
|
for await (const f of source) {
|
|
87
90
|
// Always match on lowercase
|
|
88
|
-
if (re.test(f.toLowerCase()))
|
|
91
|
+
if (re.test(f.path.toLowerCase()))
|
|
89
92
|
yield f;
|
|
90
93
|
}
|
|
91
94
|
}
|
|
92
|
-
|
|
95
|
+
/** Chunk files into a max size (eg 1GB chunks) or max count (eg 100 files) or what ever comes first when both are defined */
|
|
96
|
+
export function chunkFiles(values, count, size) {
|
|
97
|
+
if (count == null && size == null)
|
|
98
|
+
return [values.map((c) => c.path)];
|
|
93
99
|
const output = [];
|
|
94
100
|
let current = [];
|
|
101
|
+
let totalSize = 0;
|
|
95
102
|
for (const v of values) {
|
|
96
|
-
current.push(v);
|
|
97
|
-
if (
|
|
103
|
+
current.push(v.path);
|
|
104
|
+
if (v.size)
|
|
105
|
+
totalSize += v.size;
|
|
106
|
+
if ((count > 0 && current.length >= count) || (size > 0 && totalSize >= size)) {
|
|
98
107
|
output.push(current);
|
|
99
108
|
current = [];
|
|
109
|
+
totalSize = 0;
|
|
100
110
|
}
|
|
101
111
|
}
|
|
102
112
|
if (current.length > 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.aws.list.js","sourceRoot":"","sources":["../../../src/cli/aws/action.aws.list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAA2D,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"action.aws.list.js","sourceRoot":"","sources":["../../../src/cli/aws/action.aws.list.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sizes.d.ts","sourceRoot":"","sources":["../../../src/cli/aws/sizes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,qBAStB,CAAC;AAEH;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAW9C"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
export const FileSizeMap = new Map([
|
|
2
|
+
['kb', 1024],
|
|
3
|
+
['mb', 1024 * 1024],
|
|
4
|
+
['gb', 1024 * 1024 * 1024],
|
|
5
|
+
['tb', 1024 * 1024 * 1024 * 1024],
|
|
6
|
+
['ki', 1000],
|
|
7
|
+
['mi', 1000 * 1000],
|
|
8
|
+
['gi', 1000 * 1000 * 1000],
|
|
9
|
+
['ti', 1000 * 1000 * 1000 * 1000],
|
|
10
|
+
]);
|
|
11
|
+
/**
|
|
12
|
+
* Convert a number eg "1KB" to size in bytes (1024)
|
|
13
|
+
*
|
|
14
|
+
* Rounded to the nearest byte
|
|
15
|
+
*/
|
|
16
|
+
export function parseSize(size) {
|
|
17
|
+
const textString = size.toLowerCase().replace(/ /g, '').trim();
|
|
18
|
+
if (textString.endsWith('i') || textString.endsWith('b')) {
|
|
19
|
+
const lastVal = textString.slice(textString.length - 2);
|
|
20
|
+
const denominator = FileSizeMap.get(lastVal);
|
|
21
|
+
if (denominator == null)
|
|
22
|
+
throw new Error(`Failed to parse: ${size} as a file size`);
|
|
23
|
+
return Math.round(denominator * Number(textString.slice(0, textString.length - 2)));
|
|
24
|
+
}
|
|
25
|
+
const fileSize = Number(textString);
|
|
26
|
+
if (isNaN(fileSize))
|
|
27
|
+
throw new Error(`Failed to parse: ${size} as a file size`);
|
|
28
|
+
return Math.round(fileSize);
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=sizes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sizes.js","sourceRoot":"","sources":["../../../src/cli/aws/sizes.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAiB;IACjD,CAAC,IAAI,EAAE,IAAI,CAAC;IACZ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IAC1B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IACjC,CAAC,IAAI,EAAE,IAAI,CAAC;IACZ,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IAC1B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;CAClC,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/D,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACxD,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACxD,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,WAAW,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,iBAAiB,CAAC,CAAC;QACpF,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;KACrF;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IACpC,IAAI,KAAK,CAAC,QAAQ,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,iBAAiB,CAAC,CAAC;IAChF,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.bundle.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.bundle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA8B,MAAM,4BAA4B,CAAC;AAE3F,eAAO,MAAM,aAAa,YAAY,CAAC;AACvC,eAAO,MAAM,aAAa,uBAAuB,CAAC;AAElD,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;;IAU3C,SAAS,CAAC,kBAAkB,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"action.bundle.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.bundle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA8B,MAAM,4BAA4B,CAAC;AAE3F,eAAO,MAAM,aAAa,YAAY,CAAC;AACvC,eAAO,MAAM,aAAa,uBAAuB,CAAC;AAElD,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;;IAU3C,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAmB9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAajC"}
|
|
@@ -26,6 +26,7 @@ export class CommandBundle extends CommandLineAction {
|
|
|
26
26
|
argumentName: 'ASSETS',
|
|
27
27
|
parameterLongName: '--assets',
|
|
28
28
|
description: 'Add assets location into the config bundle file',
|
|
29
|
+
required: true,
|
|
29
30
|
});
|
|
30
31
|
}
|
|
31
32
|
async onExecute() {
|
|
@@ -36,8 +37,9 @@ export class CommandBundle extends CommandLineAction {
|
|
|
36
37
|
const mem = await ConfigJson.fromPath(config, logger);
|
|
37
38
|
const configJson = mem.toJson();
|
|
38
39
|
const assets = this.assets.value;
|
|
39
|
-
if (assets)
|
|
40
|
-
|
|
40
|
+
if (assets == null)
|
|
41
|
+
throw new Error('Please provide a asset path.');
|
|
42
|
+
configJson.assets = assets;
|
|
41
43
|
await fsa.writeJson(bundle, configJson);
|
|
42
44
|
logger.info({ path: bundle }, 'ConfigBundled');
|
|
43
45
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.bundle.js","sourceRoot":"","sources":["../../../src/cli/config/action.bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAA8B,MAAM,4BAA4B,CAAC;AAE3F,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC;AACvC,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAAC;AAElD,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IAKlD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,wCAAwC;YACjD,aAAa,EAAE,mEAAmE;SACnF,CAAC,CAAC;IACL,CAAC;IAES,kBAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,sBAAsB;SACpC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,2BAA2B;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,iDAAiD;
|
|
1
|
+
{"version":3,"file":"action.bundle.js","sourceRoot":"","sources":["../../../src/cli/config/action.bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAA8B,MAAM,4BAA4B,CAAC;AAE3F,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC;AACvC,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAAC;AAElD,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IAKlD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,wCAAwC;YACjD,aAAa,EAAE,mEAAmE;SACnF,CAAC,CAAC;IACL,CAAC;IAES,kBAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,sBAAsB;SACpC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,2BAA2B;SACzC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,iDAAiD;YAC9D,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;;QACb,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,mCAAI,aAAa,CAAC;QAClD,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,mCAAI,aAAa,CAAC;QAClD,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QACjC,IAAI,MAAM,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACpE,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;QAC3B,MAAM,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACxC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC;QAC/C,OAAO;IACT,CAAC;CACF"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
2
|
+
export declare class CommandImageryConfig extends CommandLineAction {
|
|
3
|
+
private path;
|
|
4
|
+
private config;
|
|
5
|
+
private commit;
|
|
6
|
+
constructor();
|
|
7
|
+
protected onDefineParameters(): void;
|
|
8
|
+
onExecute(): Promise<void>;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=action.imagery.config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"action.imagery.config.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.imagery.config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAGrH,qBAAa,oBAAqB,SAAQ,iBAAiB;IACzD,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA2B;;IAUzC,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAmB9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CA6EjC"}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import { CogTiff } from '@cogeotiff/core';
|
|
2
|
+
import { Config, ConfigProviderMemory } from '@basemaps/config';
|
|
3
|
+
import { Nztm2000QuadTms, Bounds } from '@basemaps/geo';
|
|
4
|
+
import { ulid } from 'ulid';
|
|
5
|
+
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
6
|
+
import { Env, fsa, LogConfig, RoleRegister } from '@basemaps/shared';
|
|
7
|
+
export class CommandImageryConfig extends CommandLineAction {
|
|
8
|
+
constructor() {
|
|
9
|
+
super({
|
|
10
|
+
actionName: 'create-config',
|
|
11
|
+
summary: 'Create config file from raw tiff imagery',
|
|
12
|
+
documentation: 'Given a valid path of raw imagery and create a config bundle file',
|
|
13
|
+
});
|
|
14
|
+
}
|
|
15
|
+
onDefineParameters() {
|
|
16
|
+
this.path = this.defineStringParameter({
|
|
17
|
+
argumentName: 'PATH',
|
|
18
|
+
parameterLongName: '--path',
|
|
19
|
+
description: 'Path of raw imagery, this can be both a local path or s3 location',
|
|
20
|
+
required: true,
|
|
21
|
+
});
|
|
22
|
+
this.config = this.defineStringParameter({
|
|
23
|
+
argumentName: 'CONFIG',
|
|
24
|
+
parameterLongName: '--config',
|
|
25
|
+
description: 'Location of a configuration file containing role->bucket mapping information',
|
|
26
|
+
});
|
|
27
|
+
this.commit = this.defineFlagParameter({
|
|
28
|
+
parameterLongName: '--commit',
|
|
29
|
+
description: 'Actually upload the config to s3.',
|
|
30
|
+
required: false,
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
async onExecute() {
|
|
34
|
+
var _a;
|
|
35
|
+
const logger = LogConfig.get();
|
|
36
|
+
let path = this.path.value;
|
|
37
|
+
if (path == null)
|
|
38
|
+
throw new Error('Please provide valid a path for the imagery');
|
|
39
|
+
if (!path.endsWith('/'))
|
|
40
|
+
path += '/';
|
|
41
|
+
const commit = (_a = this.commit.value) !== null && _a !== void 0 ? _a : false;
|
|
42
|
+
const config = this.config.value;
|
|
43
|
+
if (config) {
|
|
44
|
+
logger.info({ path: config }, 'Role:Config');
|
|
45
|
+
process.env[Env.AwsRoleConfigPath] = config;
|
|
46
|
+
}
|
|
47
|
+
const assumedRole = await RoleRegister.findRole(path);
|
|
48
|
+
if (assumedRole)
|
|
49
|
+
logger.debug({ path, roleArn: assumedRole === null || assumedRole === void 0 ? void 0 : assumedRole.roleArn }, 'ImageryConfig:AssumeRole');
|
|
50
|
+
logger.info({ path }, 'ImageryConfig:List');
|
|
51
|
+
const sourceFiles = await fsa.toArray(fsa.list(path));
|
|
52
|
+
const tiffs = await Promise.all(sourceFiles
|
|
53
|
+
.filter((f) => f.toLocaleLowerCase().endsWith('.tif') || f.toLocaleLowerCase().endsWith('.tiff'))
|
|
54
|
+
.map((c) => CogTiff.create(fsa.source(c))));
|
|
55
|
+
if (tiffs.length === 0)
|
|
56
|
+
throw new Error('Provided path does not have tif and tiff imagery.');
|
|
57
|
+
logger.info({ path }, 'ImageryConfig:CreateConfig');
|
|
58
|
+
let bounds = null;
|
|
59
|
+
const files = [];
|
|
60
|
+
for (const tif of tiffs) {
|
|
61
|
+
await tif.getImage(0).loadGeoTiffTags();
|
|
62
|
+
if (tif.getImage(0).epsg !== Nztm2000QuadTms.projection.code)
|
|
63
|
+
throw new Error('Imagery is not NZTM Projection.');
|
|
64
|
+
const imgBounds = Bounds.fromBbox(tif.getImage(0).bbox);
|
|
65
|
+
if (bounds == null)
|
|
66
|
+
bounds = imgBounds;
|
|
67
|
+
else
|
|
68
|
+
bounds = bounds.union(imgBounds);
|
|
69
|
+
files.push({
|
|
70
|
+
name: tif.source.uri.replace(path, ''),
|
|
71
|
+
...imgBounds,
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
const provider = new ConfigProviderMemory();
|
|
75
|
+
const id = ulid();
|
|
76
|
+
let name = path.split('/').at(-2);
|
|
77
|
+
if (name == null) {
|
|
78
|
+
logger.warn({ path, id }, `Unable to extract the imagery name from path, use uild id instead.`);
|
|
79
|
+
name = id;
|
|
80
|
+
}
|
|
81
|
+
const imagery = {
|
|
82
|
+
id: Config.Imagery.id(id),
|
|
83
|
+
name,
|
|
84
|
+
updatedAt: Date.now(),
|
|
85
|
+
projection: Nztm2000QuadTms.projection.code,
|
|
86
|
+
tileMatrix: Nztm2000QuadTms.identifier,
|
|
87
|
+
uri: path,
|
|
88
|
+
bounds,
|
|
89
|
+
files,
|
|
90
|
+
};
|
|
91
|
+
provider.put(imagery);
|
|
92
|
+
const tileSet = {
|
|
93
|
+
id: 'ts_aerial',
|
|
94
|
+
name,
|
|
95
|
+
type: 'raster',
|
|
96
|
+
format: 'webp',
|
|
97
|
+
layers: [{ 2193: imagery.id, name: imagery.name, title: imagery.name }],
|
|
98
|
+
};
|
|
99
|
+
provider.put(tileSet);
|
|
100
|
+
if (commit) {
|
|
101
|
+
logger.info({ path }, 'ImageryConfig:UploadConfig');
|
|
102
|
+
const output = fsa.join(path, 'basemaps-config.json.gz');
|
|
103
|
+
const configJson = provider.toJson();
|
|
104
|
+
await fsa.writeJson(output, configJson);
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
logger.info('DryRun:Done');
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
//# sourceMappingURL=action.imagery.config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"action.imagery.config.js","sourceRoot":"","sources":["../../../src/cli/config/action.imagery.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AACrH,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErE,MAAM,OAAO,oBAAqB,SAAQ,iBAAiB;IAKzD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,eAAe;YAC3B,OAAO,EAAE,0CAA0C;YACnD,aAAa,EAAE,mEAAmE;SACnF,CAAC,CAAC;IACL,CAAC;IAES,kBAAkB;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACrC,YAAY,EAAE,MAAM;YACpB,iBAAiB,EAAE,QAAQ;YAC3B,WAAW,EAAE,mEAAmE;YAChF,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,8EAA8E;SAC5F,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC;YACrC,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,mCAAmC;YAChD,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;;QACb,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAC3B,IAAI,IAAI,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjF,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,IAAI,IAAI,GAAG,CAAC;QACrC,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,mCAAI,KAAK,CAAC;QAE1C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QACjC,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC;SAC7C;QACD,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,WAAW;YAAE,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,EAAE,0BAA0B,CAAC,CAAC;QAEnG,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,oBAAoB,CAAC,CAAC;QAC5C,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,WAAW;aACR,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,iBAAiB,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;aAChG,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAC7C,CAAC;QAEF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QAE7F,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,4BAA4B,CAAC,CAAC;QACpD,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;YACvB,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;YACxC,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,UAAU,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACjH,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACxD,IAAI,MAAM,IAAI,IAAI;gBAAE,MAAM,GAAG,SAAS,CAAC;;gBAClC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;gBACtC,GAAG,SAAS;aACb,CAAC,CAAC;SACJ;QAED,MAAM,QAAQ,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAC5C,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC;QAClB,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,IAAI,IAAI,IAAI,EAAE;YAChB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,oEAAoE,CAAC,CAAC;YAChG,IAAI,GAAG,EAAE,CAAC;SACX;QACD,MAAM,OAAO,GAAG;YACd,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YACzB,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,UAAU,EAAE,eAAe,CAAC,UAAU,CAAC,IAAI;YAC3C,UAAU,EAAE,eAAe,CAAC,UAAU;YACtC,GAAG,EAAE,IAAI;YACT,MAAM;YACN,KAAK;SACN,CAAC;QACF,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEtB,MAAM,OAAO,GAAG;YACd,EAAE,EAAE,WAAW;YACf,IAAI;YACJ,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;SACxE,CAAC;QACF,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEtB,IAAI,MAAM,EAAE;YACV,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,4BAA4B,CAAC,CAAC;YACpD,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;YACzD,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;SACzC;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SAC5B;IACH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.import.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAuC,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAKrH,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,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;IAmB9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"action.import.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAuC,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAKrH,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,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;IAmB9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAmEhC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;CAiBlD"}
|
|
@@ -38,7 +38,6 @@ export class CommandImport extends CommandLineAction {
|
|
|
38
38
|
async onExecute() {
|
|
39
39
|
var _a;
|
|
40
40
|
const logger = LogConfig.get();
|
|
41
|
-
logger.level = 'trace';
|
|
42
41
|
const commit = (_a = this.commit.value) !== null && _a !== void 0 ? _a : false;
|
|
43
42
|
const config = this.config.value;
|
|
44
43
|
const backup = this.backup.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.import.js","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAc,MAAM,EAA+B,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AACrH,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IAWlD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,oCAAoC;YAC7C,aAAa,EAAE,gEAAgE;SAChF,CAAC,CAAC;QAXL,aAAQ,GAAuB,EAAE,CAAC;QAClC,4DAA4D;QAC5D,kBAAa,GAAa,EAAE,CAAC;QAC7B,4DAA4D;QAC5D,iBAAY,GAAyB,IAAI,oBAAoB,EAAE,CAAC;IAQhE,CAAC;IAES,kBAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,mEAAmE;YAChF,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,iDAAiD;SAC/D,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC;YACrC,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,2BAA2B;YACxC,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;;QACb,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,
|
|
1
|
+
{"version":3,"file":"action.import.js","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"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"}
|
package/build/cli/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,gCAAgC,CAAC;AAYxC,qBAAa,yBAA0B,SAAQ,eAAe;;CAsB7D"}
|
package/build/cli/index.js
CHANGED
|
@@ -6,6 +6,7 @@ import { CommandCogCreate } from './cogify/action.cog.js';
|
|
|
6
6
|
import { CommandJobCreate } from './cogify/action.job.js';
|
|
7
7
|
import { CommandBundleAssets } from './config/action.bundle.assets.js';
|
|
8
8
|
import { CommandBundle } from './config/action.bundle.js';
|
|
9
|
+
import { CommandImageryConfig } from './config/action.imagery.config.js';
|
|
9
10
|
import { CommandImport } from './config/action.import.js';
|
|
10
11
|
import { CommandScreenShot } from './screenshot/action.screenshot.js';
|
|
11
12
|
import { CommandServe } from './server/action.serve.js';
|
|
@@ -21,6 +22,7 @@ export class BasemapsConfigCommandLine extends BaseCommandLine {
|
|
|
21
22
|
this.addAction(new CommandBundle());
|
|
22
23
|
this.addAction(new CommandBundleAssets());
|
|
23
24
|
this.addAction(new CommandImport());
|
|
25
|
+
this.addAction(new CommandImageryConfig());
|
|
24
26
|
this.addAction(new CommandScreenShot());
|
|
25
27
|
this.addAction(new CommandSprites());
|
|
26
28
|
this.addAction(new CommandServe());
|
package/build/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,MAAM,OAAO,yBAA0B,SAAQ,eAAe;IAC5D;QACE,KAAK,CAAC;YACJ,YAAY,EAAE,KAAK;YACnB,eAAe,EAAE,+BAA+B;SACjD,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,IAAI,gBAAgB,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,SAAS,CAAC,IAAI,gBAAgB,EAAE,CAAC,CAAC;QAEvC,IAAI,CAAC,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,MAAM,OAAO,yBAA0B,SAAQ,eAAe;IAC5D;QACE,KAAK,CAAC;YACJ,YAAY,EAAE,KAAK;YACnB,eAAe,EAAE,+BAA+B;SACjD,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,IAAI,gBAAgB,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,SAAS,CAAC,IAAI,gBAAgB,EAAE,CAAC,CAAC;QAEvC,IAAI,CAAC,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;QAE3C,IAAI,CAAC,SAAS,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;QAExC,IAAI,CAAC,SAAS,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,SAAS,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;QAEnC,IAAI,CAAC,SAAS,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC;IACpC,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.tiles.d.ts","sourceRoot":"","sources":["../../../src/cli/screenshot/test.tiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,aAAK,oBAAoB;IACvB,YAAY,iBAAiB;IAC7B,MAAM,oBAAoB;CAC3B;AAQD,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMb,CAAC;AAEH,oBAAY,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC;AAEvD,eAAO,MAAM,gBAAgB,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"test.tiles.d.ts","sourceRoot":"","sources":["../../../src/cli/screenshot/test.tiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,aAAK,oBAAoB;IACvB,YAAY,iBAAiB;IAC7B,MAAM,oBAAoB;CAC3B;AAQD,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMb,CAAC;AAEH,oBAAY,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC;AAEvD,eAAO,MAAM,gBAAgB,EAAE,cAAc,EA+F5C,CAAC"}
|
|
@@ -29,6 +29,18 @@ export const DefaultTestTiles = [
|
|
|
29
29
|
location: { lat: -41.8899962, lng: 174.0492437, z: 3 },
|
|
30
30
|
tileSet: 'aerial',
|
|
31
31
|
},
|
|
32
|
+
{
|
|
33
|
+
name: 'aerial-3857-wellington-urban-z16',
|
|
34
|
+
tileMatrix: TileMatrixIdentifier.Google,
|
|
35
|
+
location: { lat: -41.2890657, lng: 174.7769262, z: 16 },
|
|
36
|
+
tileSet: 'aerial',
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
name: 'aerial-3857-canterbury-rural-z12',
|
|
40
|
+
tileMatrix: TileMatrixIdentifier.Google,
|
|
41
|
+
location: { lat: -43.4040409, lng: 172.5393086, z: 12 },
|
|
42
|
+
tileSet: 'aerial',
|
|
43
|
+
},
|
|
32
44
|
{
|
|
33
45
|
name: 'topographic-3857-z8',
|
|
34
46
|
tileMatrix: TileMatrixIdentifier.Google,
|
|
@@ -57,6 +69,34 @@ export const DefaultTestTiles = [
|
|
|
57
69
|
tileSet: 'topographic',
|
|
58
70
|
style: 'topographic',
|
|
59
71
|
},
|
|
72
|
+
{
|
|
73
|
+
name: 'topographic-3857-auckland-airport-z13',
|
|
74
|
+
tileMatrix: TileMatrixIdentifier.Google,
|
|
75
|
+
location: { lat: -37.000845, lng: 174.8064383, z: 13 },
|
|
76
|
+
tileSet: 'topographic',
|
|
77
|
+
style: 'topographic',
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
name: 'topographic-3857-otaki-south-z13',
|
|
81
|
+
tileMatrix: TileMatrixIdentifier.Google,
|
|
82
|
+
location: { lat: -40.7727954, lng: 175.1504838, z: 13 },
|
|
83
|
+
tileSet: 'topographic',
|
|
84
|
+
style: 'topographic',
|
|
85
|
+
},
|
|
86
|
+
{
|
|
87
|
+
name: 'topographic-3857-christchurch-north-urban-z17',
|
|
88
|
+
tileMatrix: TileMatrixIdentifier.Google,
|
|
89
|
+
location: { lat: -43.4567506, lng: 172.6109426, z: 17 },
|
|
90
|
+
tileSet: 'topographic',
|
|
91
|
+
style: 'topographic',
|
|
92
|
+
},
|
|
93
|
+
{
|
|
94
|
+
name: 'topographic-3857-mount-cook-village-z12',
|
|
95
|
+
tileMatrix: TileMatrixIdentifier.Google,
|
|
96
|
+
location: { lat: -43.717227, lng: 170.0844837, z: 12 },
|
|
97
|
+
tileSet: 'topographic',
|
|
98
|
+
style: 'topographic',
|
|
99
|
+
},
|
|
60
100
|
{
|
|
61
101
|
name: 'topolite-3857-ngauranga-z15',
|
|
62
102
|
tileMatrix: TileMatrixIdentifier.Google,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.tiles.js","sourceRoot":"","sources":["../../../src/cli/screenshot/test.tiles.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"test.tiles.js","sourceRoot":"","sources":["../../../src/cli/screenshot/test.tiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.serve.d.ts","sourceRoot":"","sources":["../../../src/cli/server/action.serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"action.serve.d.ts","sourceRoot":"","sources":["../../../src/cli/server/action.serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAOxH,qBAAa,YAAa,SAAQ,iBAAiB;IACjD,MAAM,EAAE,0BAA0B,CAAC;IACnC,MAAM,EAAE,0BAA0B,CAAC;IACnC,IAAI,EAAE,2BAA2B,CAAC;;IAUlC,SAAS,CAAC,kBAAkB,IAAI,IAAI;cAmBpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAoB3C"}
|
|
@@ -38,8 +38,13 @@ export class CommandServe extends CommandLineAction {
|
|
|
38
38
|
const ServerUrl = (_b = Env.get(Env.PublicUrlBase)) !== null && _b !== void 0 ? _b : `http://localhost:${port}`;
|
|
39
39
|
process.env[Env.PublicUrlBase] = ServerUrl;
|
|
40
40
|
const server = await createServer({ config, assets }, logger);
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
await new Promise((resolve, reject) => {
|
|
42
|
+
server.listen(port !== null && port !== void 0 ? port : DefaultPort, '0.0.0.0', (err) => {
|
|
43
|
+
if (err)
|
|
44
|
+
reject(err);
|
|
45
|
+
logger.info({ url: ServerUrl }, 'ServerStarted');
|
|
46
|
+
resolve();
|
|
47
|
+
});
|
|
43
48
|
});
|
|
44
49
|
}
|
|
45
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.serve.js","sourceRoot":"","sources":["../../../src/cli/server/action.serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA2D,MAAM,4BAA4B,CAAC;AAExH,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"action.serve.js","sourceRoot":"","sources":["../../../src/cli/server/action.serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA2D,MAAM,4BAA4B,CAAC;AAExH,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEzD,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,MAAM,OAAO,YAAa,SAAQ,iBAAiB;IAKjD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,OAAO;YACnB,OAAO,EAAE,iCAAiC;YAC1C,aAAa,EAAE,gDAAgD;SAChE,CAAC,CAAC;IACL,CAAC;IAES,kBAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,6BAA6B;SAC3C,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,+CAA+C;SAC7D,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC;YACtC,YAAY,EAAE,MAAM;YACpB,iBAAiB,EAAE,QAAQ;YAC3B,WAAW,EAAE,aAAa;YAC1B,YAAY,EAAE,WAAW;SAC1B,CAAC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,SAAS;;QACvB,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAE/B,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,mCAAI,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC;QACjF,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAEjC,oEAAoE;QACpE,MAAM,SAAS,GAAG,MAAA,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,mCAAI,oBAAoB,IAAI,EAAE,CAAC;QAC3E,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;QAE3C,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;QAC9D,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,CAAC,MAAM,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,WAAW,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;gBACpD,IAAI,GAAG;oBAAE,MAAM,CAAC,GAAG,CAAC,CAAC;gBACrB,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,eAAe,CAAC,CAAC;gBACjD,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basemaps/cli",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.34.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -38,10 +38,10 @@
|
|
|
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.34.0",
|
|
42
42
|
"@basemaps/geo": "^6.32.1",
|
|
43
|
-
"@basemaps/server": "^6.
|
|
44
|
-
"@basemaps/shared": "^6.
|
|
43
|
+
"@basemaps/server": "^6.34.0",
|
|
44
|
+
"@basemaps/shared": "^6.34.0",
|
|
45
45
|
"@basemaps/sprites": "^6.32.1",
|
|
46
46
|
"@chunkd/fs": "^8.4.0",
|
|
47
47
|
"@cogeotiff/core": "^7.0.0",
|
|
@@ -69,5 +69,5 @@
|
|
|
69
69
|
"files": [
|
|
70
70
|
"build/"
|
|
71
71
|
],
|
|
72
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "1685fa12be66df74bc64d7f76b7355390980a43f"
|
|
73
73
|
}
|