@basemaps/cli 6.34.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 +48 -0
- package/README.md +12 -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 +29 -17
- package/build/cli/cogify/action.cog.js.map +1 -1
- package/build/cli/cogify/action.make.cog.d.ts +22 -0
- package/build/cli/cogify/action.make.cog.d.ts.map +1 -0
- package/build/cli/cogify/action.make.cog.js +191 -0
- package/build/cli/cogify/action.make.cog.js.map +1 -0
- package/build/cli/cogify/cutline.d.ts +5 -0
- package/build/cli/cogify/cutline.d.ts.map +1 -0
- package/build/cli/cogify/cutline.js +33 -0
- package/build/cli/cogify/cutline.js.map +1 -0
- package/build/cli/cogify/imagery.config.d.ts +3 -2
- package/build/cli/cogify/imagery.config.d.ts.map +1 -1
- package/build/cli/cogify/imagery.config.js +10 -10
- package/build/cli/cogify/imagery.config.js.map +1 -1
- package/build/cli/config/action.cog.mapsheet.d.ts +10 -0
- package/build/cli/config/action.cog.mapsheet.d.ts.map +1 -0
- package/build/cli/config/action.cog.mapsheet.js +89 -0
- package/build/cli/config/action.cog.mapsheet.js.map +1 -0
- package/build/cli/config/action.imagery.config.d.ts +1 -1
- package/build/cli/config/action.imagery.config.d.ts.map +1 -1
- package/build/cli/config/action.imagery.config.js +33 -21
- 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 +105 -10
- package/build/cli/config/action.import.js.map +1 -1
- package/build/cli/config/config.update.d.ts +3 -2
- package/build/cli/config/config.update.d.ts.map +1 -1
- package/build/cli/config/config.update.js +9 -7
- package/build/cli/config/config.update.js.map +1 -1
- package/build/cli/index.d.ts.map +1 -1
- package/build/cli/index.js +4 -4
- package/build/cli/index.js.map +1 -1
- package/build/cli/server/action.serve.d.ts.map +1 -1
- package/build/cli/server/action.serve.js +2 -8
- package/build/cli/server/action.serve.js.map +1 -1
- package/package.json +8 -8
- package/build/cli/aws/__tests__/action.aws.test.d.ts +0 -2
- package/build/cli/aws/__tests__/action.aws.test.d.ts.map +0 -1
- package/build/cli/aws/__tests__/action.aws.test.js +0 -78
- package/build/cli/aws/__tests__/action.aws.test.js.map +0 -1
- package/build/cli/aws/__tests__/size.test.d.ts +0 -2
- package/build/cli/aws/__tests__/size.test.d.ts.map +0 -1
- package/build/cli/aws/__tests__/size.test.js +0 -51
- package/build/cli/aws/__tests__/size.test.js.map +0 -1
- package/build/cli/aws/action.aws.list.d.ts +0 -22
- package/build/cli/aws/action.aws.list.d.ts.map +0 -1
- package/build/cli/aws/action.aws.list.js +0 -116
- package/build/cli/aws/action.aws.list.js.map +0 -1
- package/build/cli/aws/sizes.d.ts +0 -8
- package/build/cli/aws/sizes.d.ts.map +0 -1
- package/build/cli/aws/sizes.js +0 -30
- package/build/cli/aws/sizes.js.map +0 -1
- package/build/cli/screenshot/action.screenshot.d.ts +0 -19
- package/build/cli/screenshot/action.screenshot.d.ts.map +0 -1
- package/build/cli/screenshot/action.screenshot.js +0 -115
- package/build/cli/screenshot/action.screenshot.js.map +0 -1
- package/build/cli/screenshot/test.tiles.d.ts +0 -48
- package/build/cli/screenshot/test.tiles.d.ts.map +0 -1
- package/build/cli/screenshot/test.tiles.js +0 -115
- package/build/cli/screenshot/test.tiles.js.map +0 -1
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import { ConfigProviderMemory } from '@basemaps/config';
|
|
2
|
+
import { Bounds } from '@basemaps/geo';
|
|
3
|
+
import { fsa, LogConfig } from '@basemaps/shared';
|
|
4
|
+
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
5
|
+
import * as fgb from 'flatgeobuf/lib/mjs/geojson.js';
|
|
6
|
+
export class CommandCogMapSheet extends CommandLineAction {
|
|
7
|
+
constructor() {
|
|
8
|
+
super({
|
|
9
|
+
actionName: 'create-mapsheet',
|
|
10
|
+
summary: 'Create a cog mapsheet from provided flatgeobuf',
|
|
11
|
+
documentation: 'Given a valid path of raw imagery and create a config bundle file',
|
|
12
|
+
});
|
|
13
|
+
}
|
|
14
|
+
onDefineParameters() {
|
|
15
|
+
this.path = this.defineStringParameter({
|
|
16
|
+
argumentName: 'PATH',
|
|
17
|
+
parameterLongName: '--path',
|
|
18
|
+
description: 'Path of flatgeobuf, this can be both a local path or s3 location',
|
|
19
|
+
required: true,
|
|
20
|
+
});
|
|
21
|
+
this.config = this.defineStringParameter({
|
|
22
|
+
argumentName: 'CONFIG',
|
|
23
|
+
parameterLongName: '--config',
|
|
24
|
+
description: 'Path of basemaps config json, this can be both a local path or s3 location',
|
|
25
|
+
required: true,
|
|
26
|
+
});
|
|
27
|
+
this.output = this.defineStringParameter({
|
|
28
|
+
argumentName: 'OUTPUT',
|
|
29
|
+
parameterLongName: '--output',
|
|
30
|
+
description: 'Output of the mapsheet file',
|
|
31
|
+
required: true,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
async onExecute() {
|
|
35
|
+
const logger = LogConfig.get();
|
|
36
|
+
const path = this.path.value;
|
|
37
|
+
if (path == null)
|
|
38
|
+
throw new Error('Please provide valid a fgb path.');
|
|
39
|
+
const config = this.config.value;
|
|
40
|
+
if (config == null)
|
|
41
|
+
throw new Error('Please provide valid a config path.');
|
|
42
|
+
const outputPath = this.output.value;
|
|
43
|
+
if (outputPath == null)
|
|
44
|
+
throw new Error('Please provide valid a output path.');
|
|
45
|
+
logger.info({ path }, 'MapSheet:LoadFgb');
|
|
46
|
+
const buf = await fsa.read(path);
|
|
47
|
+
logger.info({ config }, 'MapSheet:LoadConfig');
|
|
48
|
+
const configJson = await fsa.readJson(config);
|
|
49
|
+
const men = ConfigProviderMemory.fromJson(configJson);
|
|
50
|
+
const rest = fgb.deserialize(buf);
|
|
51
|
+
const aerial = await men.TileSet.get('ts_aerial');
|
|
52
|
+
if (aerial == null)
|
|
53
|
+
throw new Error('Invalid config file.');
|
|
54
|
+
const layers = aerial.layers.filter((c) => c[2193] != null && (c.maxZoom == null || c.maxZoom > 19) && (c.minZoom == null || c.minZoom < 32));
|
|
55
|
+
const imageryIds = new Set();
|
|
56
|
+
for (const layer of layers) {
|
|
57
|
+
if (layer[2193] != null)
|
|
58
|
+
imageryIds.add(layer[2193]);
|
|
59
|
+
}
|
|
60
|
+
const imagery = await men.Imagery.getAll(imageryIds);
|
|
61
|
+
const output = [];
|
|
62
|
+
logger.info({ path, config }, 'MapSheet:CreateMapSheet');
|
|
63
|
+
for (const feature of rest.features) {
|
|
64
|
+
if (feature.properties == null)
|
|
65
|
+
continue;
|
|
66
|
+
const sheetCode = feature.properties.sheet_code_id;
|
|
67
|
+
const current = { sheetCode, files: [] };
|
|
68
|
+
output.push(current);
|
|
69
|
+
const bounds = Bounds.fromMultiPolygon(feature.geometry.coordinates);
|
|
70
|
+
for (const layer of layers) {
|
|
71
|
+
if (layer[2193] == null)
|
|
72
|
+
continue;
|
|
73
|
+
const img = imagery.get(layer[2193]);
|
|
74
|
+
if (img == null)
|
|
75
|
+
continue;
|
|
76
|
+
if (img.bounds == null || Bounds.fromJson(img.bounds).intersects(bounds)) {
|
|
77
|
+
for (const file of img.files) {
|
|
78
|
+
if (bounds.intersects(Bounds.fromJson(file))) {
|
|
79
|
+
current.files.push(`${img.uri}/${file.name}.tiff`);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
logger.info({ outputPath }, 'MapSheet:WriteOutput');
|
|
86
|
+
fsa.write(outputPath, JSON.stringify(output, null, 2));
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
//# sourceMappingURL=action.cog.mapsheet.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"action.cog.mapsheet.js","sourceRoot":"","sources":["../../../src/cli/config/action.cog.mapsheet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAA8B,MAAM,4BAA4B,CAAC;AAC3F,OAAO,KAAK,GAAG,MAAM,+BAA+B,CAAC;AAQrD,MAAM,OAAO,kBAAmB,SAAQ,iBAAiB;IAKvD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,iBAAiB;YAC7B,OAAO,EAAE,gDAAgD;YACzD,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,kEAAkE;YAC/E,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,4EAA4E;YACzF,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,6BAA6B;YAC1C,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAC7B,IAAI,IAAI,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QACjC,IAAI,MAAM,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAE3E,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QACrC,IAAI,UAAU,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAE/E,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,kBAAkB,CAAC,CAAC;QAC1C,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAgB,MAAM,CAAC,CAAC;QAC7D,MAAM,GAAG,GAAG,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAEtD,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAsB,CAAC;QAEvD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,MAAM,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,OAAO,GAAG,EAAE,CAAC,CACzG,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QACrC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI;gBAAE,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;SACtD;QACD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAErD,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,yBAAyB,CAAC,CAAC;QACzD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YACnC,IAAI,OAAO,CAAC,UAAU,IAAI,IAAI;gBAAE,SAAS;YACzC,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC;YACnD,MAAM,OAAO,GAAW,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;YACjD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrB,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAE,OAAO,CAAC,QAAyB,CAAC,WAAW,CAAC,CAAC;YAEvF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBAC1B,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI;oBAAE,SAAS;gBAClC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;gBACrC,IAAI,GAAG,IAAI,IAAI;oBAAE,SAAS;gBAC1B,IAAI,GAAG,CAAC,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;oBACxE,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE;wBAC5B,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE;4BAC5C,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC;yBACpD;qBACF;iBACF;aACF;SACF;QACD,MAAM,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,EAAE,sBAAsB,CAAC,CAAC;QACpD,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;CACF"}
|
|
@@ -1 +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;
|
|
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;CAwFjC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { base58, ConfigProviderMemory } from '@basemaps/config';
|
|
2
|
+
import { Bounds, Nztm2000QuadTms } from '@basemaps/geo';
|
|
3
|
+
import { fsa, LogConfig, Projection } from '@basemaps/shared';
|
|
1
4
|
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
5
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
6
|
-
import {
|
|
6
|
+
import { ulid } from 'ulid';
|
|
7
7
|
export class CommandImageryConfig extends CommandLineAction {
|
|
8
8
|
constructor() {
|
|
9
9
|
super({
|
|
@@ -19,10 +19,10 @@ export class CommandImageryConfig extends CommandLineAction {
|
|
|
19
19
|
description: 'Path of raw imagery, this can be both a local path or s3 location',
|
|
20
20
|
required: true,
|
|
21
21
|
});
|
|
22
|
-
this.
|
|
23
|
-
argumentName: '
|
|
24
|
-
parameterLongName: '--
|
|
25
|
-
description: '
|
|
22
|
+
this.output = this.defineStringParameter({
|
|
23
|
+
argumentName: 'OUTPUT',
|
|
24
|
+
parameterLongName: '--output',
|
|
25
|
+
description: 'An url written to the output file',
|
|
26
26
|
});
|
|
27
27
|
this.commit = this.defineFlagParameter({
|
|
28
28
|
parameterLongName: '--commit',
|
|
@@ -39,14 +39,7 @@ export class CommandImageryConfig extends CommandLineAction {
|
|
|
39
39
|
if (!path.endsWith('/'))
|
|
40
40
|
path += '/';
|
|
41
41
|
const commit = (_a = this.commit.value) !== null && _a !== void 0 ? _a : false;
|
|
42
|
-
const
|
|
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');
|
|
42
|
+
const output = this.output.value;
|
|
50
43
|
logger.info({ path }, 'ImageryConfig:List');
|
|
51
44
|
const sourceFiles = await fsa.toArray(fsa.list(path));
|
|
52
45
|
const tiffs = await Promise.all(sourceFiles
|
|
@@ -56,12 +49,15 @@ export class CommandImageryConfig extends CommandLineAction {
|
|
|
56
49
|
throw new Error('Provided path does not have tif and tiff imagery.');
|
|
57
50
|
logger.info({ path }, 'ImageryConfig:CreateConfig');
|
|
58
51
|
let bounds = null;
|
|
52
|
+
let gsd = null;
|
|
59
53
|
const files = [];
|
|
60
54
|
for (const tif of tiffs) {
|
|
61
55
|
await tif.getImage(0).loadGeoTiffTags();
|
|
62
56
|
if (tif.getImage(0).epsg !== Nztm2000QuadTms.projection.code)
|
|
63
57
|
throw new Error('Imagery is not NZTM Projection.');
|
|
64
58
|
const imgBounds = Bounds.fromBbox(tif.getImage(0).bbox);
|
|
59
|
+
if (gsd == null)
|
|
60
|
+
gsd = tif.getImage(0).resolution[0];
|
|
65
61
|
if (bounds == null)
|
|
66
62
|
bounds = imgBounds;
|
|
67
63
|
else
|
|
@@ -79,8 +75,8 @@ export class CommandImageryConfig extends CommandLineAction {
|
|
|
79
75
|
name = id;
|
|
80
76
|
}
|
|
81
77
|
const imagery = {
|
|
82
|
-
id:
|
|
83
|
-
name
|
|
78
|
+
id: provider.Imagery.id(id),
|
|
79
|
+
name: `${name}-${new Date().getFullYear()}`,
|
|
84
80
|
updatedAt: Date.now(),
|
|
85
81
|
projection: Nztm2000QuadTms.projection.code,
|
|
86
82
|
tileMatrix: Nztm2000QuadTms.identifier,
|
|
@@ -91,17 +87,33 @@ export class CommandImageryConfig extends CommandLineAction {
|
|
|
91
87
|
provider.put(imagery);
|
|
92
88
|
const tileSet = {
|
|
93
89
|
id: 'ts_aerial',
|
|
94
|
-
name,
|
|
90
|
+
name: 'aerial',
|
|
91
|
+
title: 'Aerial Imagery Basemap',
|
|
92
|
+
category: 'Basemaps',
|
|
95
93
|
type: 'raster',
|
|
96
94
|
format: 'webp',
|
|
97
95
|
layers: [{ 2193: imagery.id, name: imagery.name, title: imagery.name }],
|
|
98
96
|
};
|
|
99
97
|
provider.put(tileSet);
|
|
98
|
+
// Prepare the center location
|
|
99
|
+
let location = '';
|
|
100
|
+
if (bounds && gsd) {
|
|
101
|
+
const center = { x: bounds.x + bounds.width / 2, y: bounds.y + bounds.height / 2 };
|
|
102
|
+
const proj = Projection.get(Nztm2000QuadTms);
|
|
103
|
+
const centerLatLon = proj.toWgs84([center.x, center.y]).map((c) => c.toFixed(6));
|
|
104
|
+
const targetZoom = Math.max(Nztm2000QuadTms.findBestZoom(gsd) - 12, 0);
|
|
105
|
+
location = `#@${centerLatLon[1]},${centerLatLon[0]},z${targetZoom}`;
|
|
106
|
+
}
|
|
100
107
|
if (commit) {
|
|
101
108
|
logger.info({ path }, 'ImageryConfig:UploadConfig');
|
|
102
|
-
const output = fsa.join(path, 'basemaps-config.json.gz');
|
|
103
109
|
const configJson = provider.toJson();
|
|
104
|
-
|
|
110
|
+
const outputPath = fsa.join(path, `basemaps-config-${configJson.hash}.json.gz`);
|
|
111
|
+
await fsa.writeJson(outputPath, configJson);
|
|
112
|
+
const configPath = base58.encode(Buffer.from(outputPath));
|
|
113
|
+
const url = `https://basemaps.linz.govt.nz/?config=${configPath}&i=${imagery.name}&tileMatrix=NZTM2000Quad&debug${location}`;
|
|
114
|
+
logger.info({ path: output, url }, 'ImageryConfig:Done');
|
|
115
|
+
if (output != null)
|
|
116
|
+
await fsa.write(output, url);
|
|
105
117
|
}
|
|
106
118
|
else {
|
|
107
119
|
logger.info('DryRun:Done');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.imagery.config.js","sourceRoot":"","sources":["../../../src/cli/config/action.imagery.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"action.imagery.config.js","sourceRoot":"","sources":["../../../src/cli/config/action.imagery.config.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"
|
|
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 {
|
|
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
|
-
import { Q, Updater } from './config.update.js';
|
|
5
|
-
import { invalidateCache } from '../util.js';
|
|
6
5
|
import fetch from 'node-fetch';
|
|
6
|
+
import { invalidateCache } from '../util.js';
|
|
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',
|
|
@@ -41,6 +49,7 @@ export class CommandImport extends CommandLineAction {
|
|
|
41
49
|
const commit = (_a = this.commit.value) !== null && _a !== void 0 ? _a : false;
|
|
42
50
|
const config = this.config.value;
|
|
43
51
|
const backup = this.backup.value;
|
|
52
|
+
const cfg = getDefaultConfig();
|
|
44
53
|
if (config == null)
|
|
45
54
|
throw new Error('Please provide a config json');
|
|
46
55
|
if (commit && !config.startsWith('s3://')) {
|
|
@@ -64,18 +73,19 @@ export class CommandImport extends CommandLineAction {
|
|
|
64
73
|
await Promise.all(this.promises);
|
|
65
74
|
if (commit) {
|
|
66
75
|
const configBundle = {
|
|
67
|
-
id:
|
|
68
|
-
name:
|
|
76
|
+
id: cfg.ConfigBundle.id(configJson.hash),
|
|
77
|
+
name: cfg.ConfigBundle.id(`config-${configJson.hash}.json`),
|
|
69
78
|
path: config,
|
|
70
79
|
hash: configJson.hash,
|
|
80
|
+
assets: configJson.assets,
|
|
71
81
|
};
|
|
72
82
|
logger.info({ config }, 'Import:ConfigBundle');
|
|
73
|
-
if (
|
|
83
|
+
if (cfg.ConfigBundle.isWriteable()) {
|
|
74
84
|
// Insert a cb_hash record for reference
|
|
75
|
-
await
|
|
85
|
+
await cfg.ConfigBundle.put(configBundle);
|
|
76
86
|
// Update the cb_latest record
|
|
77
|
-
configBundle.id =
|
|
78
|
-
await
|
|
87
|
+
configBundle.id = cfg.ConfigBundle.id('latest');
|
|
88
|
+
await cfg.ConfigBundle.put(configBundle);
|
|
79
89
|
}
|
|
80
90
|
}
|
|
81
91
|
if (commit && this.invalidations.length > 0) {
|
|
@@ -94,6 +104,9 @@ export class CommandImport extends CommandLineAction {
|
|
|
94
104
|
if (backup) {
|
|
95
105
|
await fsa.writeJson(backup, this.backupConfig.toJson());
|
|
96
106
|
}
|
|
107
|
+
const output = this.output.value;
|
|
108
|
+
if (output)
|
|
109
|
+
await this.outputChange(output, mem, cfg);
|
|
97
110
|
if (commit !== true)
|
|
98
111
|
logger.info('DryRun:Done');
|
|
99
112
|
}
|
|
@@ -114,5 +127,87 @@ export class CommandImport extends CommandLineAction {
|
|
|
114
127
|
});
|
|
115
128
|
this.promises.push(promise);
|
|
116
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
|
+
}
|
|
117
212
|
}
|
|
118
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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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { BaseConfig, ConfigTileSet, ConfigImagery, ConfigProvider, ConfigVectorStyle } from '@basemaps/config';
|
|
2
|
-
import { BasemapsConfigObject } from '@basemaps/config
|
|
1
|
+
import { BaseConfig, ConfigTileSet, ConfigImagery, ConfigProvider, ConfigVectorStyle, BasemapsConfigProvider } from '@basemaps/config';
|
|
2
|
+
import { BasemapsConfigObject } from '@basemaps/config';
|
|
3
3
|
import { LogType } from '@basemaps/shared';
|
|
4
4
|
export declare const Q: import("p-limit").LimitFunction;
|
|
5
5
|
export declare class Updater<S extends BaseConfig = BaseConfig> {
|
|
@@ -8,6 +8,7 @@ export declare class Updater<S extends BaseConfig = BaseConfig> {
|
|
|
8
8
|
prefix: string;
|
|
9
9
|
isCommit: boolean;
|
|
10
10
|
logger: LogType;
|
|
11
|
+
cfg: BasemapsConfigProvider;
|
|
11
12
|
/**
|
|
12
13
|
* Class to apply an TileSetConfig source to the tile metadata db
|
|
13
14
|
* @param config a string or TileSetConfig to use
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.update.d.ts","sourceRoot":"","sources":["../../../src/cli/config/config.update.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,
|
|
1
|
+
{"version":3,"file":"config.update.d.ts","sourceRoot":"","sources":["../../../src/cli/config/config.update.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAEV,aAAa,EACb,aAAa,EACb,cAAc,EACd,iBAAiB,EAEjB,sBAAsB,EACvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAY,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAA+B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAIxE,eAAO,MAAM,CAAC,iCAAa,CAAC;AAE5B,qBAAa,OAAO,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU;IACpD,MAAM,EAAE,CAAC,CAAC;IACV,QAAQ,EAAE,OAAO,CAAC,aAAa,GAAG,aAAa,GAAG,cAAc,GAAG,iBAAiB,GAAG,IAAI,CAAC,CAAC;IAC7F,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,sBAAsB,CAAC;IAE5B;;;OAGG;gBACS,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,OAAO;IAUxC,KAAK,IAAI,oBAAoB,CAAC,aAAa,GAAG,aAAa,GAAG,cAAc,GAAG,iBAAiB,CAAC;IAQjG,SAAS,IAAI,aAAa,GAAG,aAAa,GAAG,cAAc,GAAG,iBAAiB;IAQ/E,cAAc,IAAI,MAAM;IAMxB,UAAU,IAAI,OAAO,CAAC,aAAa,GAAG,aAAa,GAAG,cAAc,GAAG,iBAAiB,GAAG,IAAI,CAAC;IAMhG;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAgBpC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { ConfigDynamoBase,
|
|
2
|
-
import {
|
|
1
|
+
import { ConfigDynamoBase, ConfigPrefix, } from '@basemaps/config';
|
|
2
|
+
import { ConfigId } from '@basemaps/config';
|
|
3
|
+
import { getDefaultConfig, LogConfig } from '@basemaps/shared';
|
|
3
4
|
import { ConfigDiff } from './config.diff.js';
|
|
4
5
|
import PLimit from 'p-limit';
|
|
5
6
|
export const Q = PLimit(10);
|
|
@@ -10,7 +11,8 @@ export class Updater {
|
|
|
10
11
|
*/
|
|
11
12
|
constructor(config, isCommit) {
|
|
12
13
|
this.config = config;
|
|
13
|
-
|
|
14
|
+
this.cfg = getDefaultConfig();
|
|
15
|
+
const prefix = ConfigId.getPrefix(config.id);
|
|
14
16
|
if (prefix == null)
|
|
15
17
|
throw new Error(`Incorrect Config Id ${config.id}`);
|
|
16
18
|
this.prefix = prefix;
|
|
@@ -19,13 +21,13 @@ export class Updater {
|
|
|
19
21
|
}
|
|
20
22
|
getDB() {
|
|
21
23
|
if (this.prefix === ConfigPrefix.Imagery)
|
|
22
|
-
return
|
|
24
|
+
return this.cfg.Imagery;
|
|
23
25
|
if (this.prefix === ConfigPrefix.TileSet)
|
|
24
|
-
return
|
|
26
|
+
return this.cfg.TileSet;
|
|
25
27
|
if (this.prefix === ConfigPrefix.Provider)
|
|
26
|
-
return
|
|
28
|
+
return this.cfg.Provider;
|
|
27
29
|
if (this.prefix === ConfigPrefix.Style)
|
|
28
|
-
return
|
|
30
|
+
return this.cfg.Style;
|
|
29
31
|
throw Error(`Unable to find the database table for prefix ${this.prefix}`);
|
|
30
32
|
}
|
|
31
33
|
getConfig() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.update.js","sourceRoot":"","sources":["../../../src/cli/config/config.update.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,
|
|
1
|
+
{"version":3,"file":"config.update.js","sourceRoot":"","sources":["../../../src/cli/config/config.update.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;AAYxC,qBAAa,yBAA0B,SAAQ,eAAe;;
|
|
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;;CAqB7D"}
|
package/build/cli/index.js
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { BaseCommandLine } from '@basemaps/shared/build/cli/base.js';
|
|
3
3
|
import 'source-map-support/register.js';
|
|
4
|
-
import { CommandList } from './aws/action.aws.list.js';
|
|
5
4
|
import { CommandCogCreate } from './cogify/action.cog.js';
|
|
6
5
|
import { CommandJobCreate } from './cogify/action.job.js';
|
|
6
|
+
import { CommandMakeCog } from './cogify/action.make.cog.js';
|
|
7
7
|
import { CommandBundleAssets } from './config/action.bundle.assets.js';
|
|
8
8
|
import { CommandBundle } from './config/action.bundle.js';
|
|
9
|
+
import { CommandCogMapSheet } from './config/action.cog.mapsheet.js';
|
|
9
10
|
import { CommandImageryConfig } from './config/action.imagery.config.js';
|
|
10
11
|
import { CommandImport } from './config/action.import.js';
|
|
11
|
-
import { CommandScreenShot } from './screenshot/action.screenshot.js';
|
|
12
12
|
import { CommandServe } from './server/action.serve.js';
|
|
13
13
|
import { CommandSprites } from './sprites/action.sprites.js';
|
|
14
14
|
export class BasemapsConfigCommandLine extends BaseCommandLine {
|
|
@@ -19,14 +19,14 @@ export class BasemapsConfigCommandLine extends BaseCommandLine {
|
|
|
19
19
|
});
|
|
20
20
|
this.addAction(new CommandCogCreate());
|
|
21
21
|
this.addAction(new CommandJobCreate());
|
|
22
|
+
this.addAction(new CommandMakeCog());
|
|
22
23
|
this.addAction(new CommandBundle());
|
|
23
24
|
this.addAction(new CommandBundleAssets());
|
|
24
25
|
this.addAction(new CommandImport());
|
|
25
26
|
this.addAction(new CommandImageryConfig());
|
|
26
|
-
this.addAction(new CommandScreenShot());
|
|
27
27
|
this.addAction(new CommandSprites());
|
|
28
28
|
this.addAction(new CommandServe());
|
|
29
|
-
this.addAction(new
|
|
29
|
+
this.addAction(new CommandCogMapSheet());
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
//# sourceMappingURL=index.js.map
|
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,
|
|
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,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,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;QACvC,IAAI,CAAC,SAAS,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC;QAErC,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,cAAc,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,SAAS,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;QAEnC,IAAI,CAAC,SAAS,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAC;IAC3C,CAAC;CACF"}
|
|
@@ -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;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;
|
|
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;CAe3C"}
|