@basemaps/cli 6.33.0 → 6.35.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 +6 -0
- package/build/cli/cogify/action.cog.d.ts.map +1 -1
- package/build/cli/cogify/action.cog.js +11 -11
- package/build/cli/cogify/action.cog.js.map +1 -1
- package/build/cli/cogify/action.make.cog.d.ts +17 -0
- package/build/cli/cogify/action.make.cog.d.ts.map +1 -0
- package/build/cli/cogify/action.make.cog.js +136 -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.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.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 +10 -0
- package/build/cli/config/action.imagery.config.d.ts.map +1 -0
- package/build/cli/config/action.imagery.config.js +123 -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 +11 -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 +6 -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 -3
- package/build/cli/server/action.serve.js.map +1 -1
- package/package.json +7 -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 -59
- package/build/cli/aws/__tests__/action.aws.test.js.map +0 -1
- package/build/cli/aws/action.aws.list.d.ts +0 -14
- package/build/cli/aws/action.aws.list.d.ts.map +0 -1
- package/build/cli/aws/action.aws.list.js +0 -106
- package/build/cli/aws/action.aws.list.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 -75
- package/build/cli/screenshot/test.tiles.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"action.cog.mapsheet.js","sourceRoot":"","sources":["../../../src/cli/config/action.cog.mapsheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
2
|
+
export declare class CommandImageryConfig extends CommandLineAction {
|
|
3
|
+
private path;
|
|
4
|
+
private output;
|
|
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;CAwFjC"}
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
import { base58, ConfigProviderMemory } from '@basemaps/config';
|
|
2
|
+
import { Bounds, Nztm2000QuadTms } from '@basemaps/geo';
|
|
3
|
+
import { fsa, LogConfig, Projection } from '@basemaps/shared';
|
|
4
|
+
import { CogTiff } from '@cogeotiff/core';
|
|
5
|
+
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
6
|
+
import { ulid } from 'ulid';
|
|
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.output = this.defineStringParameter({
|
|
23
|
+
argumentName: 'OUTPUT',
|
|
24
|
+
parameterLongName: '--output',
|
|
25
|
+
description: 'An url written to the output file',
|
|
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 output = this.output.value;
|
|
43
|
+
logger.info({ path }, 'ImageryConfig:List');
|
|
44
|
+
const sourceFiles = await fsa.toArray(fsa.list(path));
|
|
45
|
+
const tiffs = await Promise.all(sourceFiles
|
|
46
|
+
.filter((f) => f.toLocaleLowerCase().endsWith('.tif') || f.toLocaleLowerCase().endsWith('.tiff'))
|
|
47
|
+
.map((c) => CogTiff.create(fsa.source(c))));
|
|
48
|
+
if (tiffs.length === 0)
|
|
49
|
+
throw new Error('Provided path does not have tif and tiff imagery.');
|
|
50
|
+
logger.info({ path }, 'ImageryConfig:CreateConfig');
|
|
51
|
+
let bounds = null;
|
|
52
|
+
let gsd = null;
|
|
53
|
+
const files = [];
|
|
54
|
+
for (const tif of tiffs) {
|
|
55
|
+
await tif.getImage(0).loadGeoTiffTags();
|
|
56
|
+
if (tif.getImage(0).epsg !== Nztm2000QuadTms.projection.code)
|
|
57
|
+
throw new Error('Imagery is not NZTM Projection.');
|
|
58
|
+
const imgBounds = Bounds.fromBbox(tif.getImage(0).bbox);
|
|
59
|
+
if (gsd == null)
|
|
60
|
+
gsd = tif.getImage(0).resolution[0];
|
|
61
|
+
if (bounds == null)
|
|
62
|
+
bounds = imgBounds;
|
|
63
|
+
else
|
|
64
|
+
bounds = bounds.union(imgBounds);
|
|
65
|
+
files.push({
|
|
66
|
+
name: tif.source.uri.replace(path, ''),
|
|
67
|
+
...imgBounds,
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
const provider = new ConfigProviderMemory();
|
|
71
|
+
const id = ulid();
|
|
72
|
+
let name = path.split('/').at(-2);
|
|
73
|
+
if (name == null) {
|
|
74
|
+
logger.warn({ path, id }, `Unable to extract the imagery name from path, use uild id instead.`);
|
|
75
|
+
name = id;
|
|
76
|
+
}
|
|
77
|
+
const imagery = {
|
|
78
|
+
id: provider.Imagery.id(id),
|
|
79
|
+
name: `${name}-${new Date().getFullYear()}`,
|
|
80
|
+
updatedAt: Date.now(),
|
|
81
|
+
projection: Nztm2000QuadTms.projection.code,
|
|
82
|
+
tileMatrix: Nztm2000QuadTms.identifier,
|
|
83
|
+
uri: path,
|
|
84
|
+
bounds,
|
|
85
|
+
files,
|
|
86
|
+
};
|
|
87
|
+
provider.put(imagery);
|
|
88
|
+
const tileSet = {
|
|
89
|
+
id: 'ts_aerial',
|
|
90
|
+
name: 'aerial',
|
|
91
|
+
title: 'Aerial Imagery Basemap',
|
|
92
|
+
category: 'Basemaps',
|
|
93
|
+
type: 'raster',
|
|
94
|
+
format: 'webp',
|
|
95
|
+
layers: [{ 2193: imagery.id, name: imagery.name, title: imagery.name }],
|
|
96
|
+
};
|
|
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
|
+
}
|
|
107
|
+
if (commit) {
|
|
108
|
+
logger.info({ path }, 'ImageryConfig:UploadConfig');
|
|
109
|
+
const configJson = provider.toJson();
|
|
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);
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
logger.info('DryRun:Done');
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
//# 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":"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"}
|
|
@@ -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,EAAE,UAAU,EAA+B,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEjG,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;IAoEhC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;CAiBlD"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { ConfigProviderMemory } from '@basemaps/config';
|
|
2
|
+
import { Env, fsa, getDefaultConfig, LogConfig } from '@basemaps/shared';
|
|
3
3
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
4
|
-
import { Q, Updater } from './config.update.js';
|
|
5
|
-
import { invalidateCache } from '../util.js';
|
|
6
4
|
import fetch from 'node-fetch';
|
|
5
|
+
import { invalidateCache } from '../util.js';
|
|
6
|
+
import { Q, Updater } from './config.update.js';
|
|
7
7
|
export class CommandImport extends CommandLineAction {
|
|
8
8
|
constructor() {
|
|
9
9
|
super({
|
|
@@ -41,6 +41,7 @@ export class CommandImport extends CommandLineAction {
|
|
|
41
41
|
const commit = (_a = this.commit.value) !== null && _a !== void 0 ? _a : false;
|
|
42
42
|
const config = this.config.value;
|
|
43
43
|
const backup = this.backup.value;
|
|
44
|
+
const cfg = getDefaultConfig();
|
|
44
45
|
if (config == null)
|
|
45
46
|
throw new Error('Please provide a config json');
|
|
46
47
|
if (commit && !config.startsWith('s3://')) {
|
|
@@ -64,18 +65,18 @@ export class CommandImport extends CommandLineAction {
|
|
|
64
65
|
await Promise.all(this.promises);
|
|
65
66
|
if (commit) {
|
|
66
67
|
const configBundle = {
|
|
67
|
-
id:
|
|
68
|
-
name:
|
|
68
|
+
id: cfg.ConfigBundle.id(configJson.hash),
|
|
69
|
+
name: cfg.ConfigBundle.id(`config-${configJson.hash}.json`),
|
|
69
70
|
path: config,
|
|
70
71
|
hash: configJson.hash,
|
|
71
72
|
};
|
|
72
73
|
logger.info({ config }, 'Import:ConfigBundle');
|
|
73
|
-
if (
|
|
74
|
+
if (cfg.ConfigBundle.isWriteable()) {
|
|
74
75
|
// Insert a cb_hash record for reference
|
|
75
|
-
await
|
|
76
|
+
await cfg.ConfigBundle.put(configBundle);
|
|
76
77
|
// Update the cb_latest record
|
|
77
|
-
configBundle.id =
|
|
78
|
-
await
|
|
78
|
+
configBundle.id = cfg.ConfigBundle.id('latest');
|
|
79
|
+
await cfg.ConfigBundle.put(configBundle);
|
|
79
80
|
}
|
|
80
81
|
}
|
|
81
82
|
if (commit && this.invalidations.length > 0) {
|
|
@@ -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;
|
|
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,13 +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';
|
|
10
|
+
import { CommandImageryConfig } from './config/action.imagery.config.js';
|
|
9
11
|
import { CommandImport } from './config/action.import.js';
|
|
10
|
-
import { CommandScreenShot } from './screenshot/action.screenshot.js';
|
|
11
12
|
import { CommandServe } from './server/action.serve.js';
|
|
12
13
|
import { CommandSprites } from './sprites/action.sprites.js';
|
|
13
14
|
export class BasemapsConfigCommandLine extends BaseCommandLine {
|
|
@@ -18,13 +19,14 @@ export class BasemapsConfigCommandLine extends BaseCommandLine {
|
|
|
18
19
|
});
|
|
19
20
|
this.addAction(new CommandCogCreate());
|
|
20
21
|
this.addAction(new CommandJobCreate());
|
|
22
|
+
this.addAction(new CommandMakeCog());
|
|
21
23
|
this.addAction(new CommandBundle());
|
|
22
24
|
this.addAction(new CommandBundleAssets());
|
|
23
25
|
this.addAction(new CommandImport());
|
|
24
|
-
this.addAction(new
|
|
26
|
+
this.addAction(new CommandImageryConfig());
|
|
25
27
|
this.addAction(new CommandSprites());
|
|
26
28
|
this.addAction(new CommandServe());
|
|
27
|
-
this.addAction(new
|
|
29
|
+
this.addAction(new CommandCogMapSheet());
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
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;
|
|
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"}
|
|
@@ -38,9 +38,8 @@ 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
|
-
server.listen(port !== null && port !== void 0 ? port : DefaultPort, '0.0.0.0'
|
|
42
|
-
|
|
43
|
-
});
|
|
41
|
+
await server.listen({ port: port !== null && port !== void 0 ? port : DefaultPort, host: '0.0.0.0' });
|
|
42
|
+
logger.info({ url: ServerUrl }, 'ServerStarted');
|
|
44
43
|
}
|
|
45
44
|
}
|
|
46
45
|
//# sourceMappingURL=action.serve.js.map
|
|
@@ -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,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACpE,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,eAAe,CAAC,CAAC;IACnD,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basemaps/cli",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.35.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -38,12 +38,12 @@
|
|
|
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.35.0",
|
|
42
42
|
"@basemaps/geo": "^6.32.1",
|
|
43
|
-
"@basemaps/server": "^6.
|
|
44
|
-
"@basemaps/shared": "^6.
|
|
43
|
+
"@basemaps/server": "^6.35.0",
|
|
44
|
+
"@basemaps/shared": "^6.35.0",
|
|
45
45
|
"@basemaps/sprites": "^6.32.1",
|
|
46
|
-
"@chunkd/fs": "^8.
|
|
46
|
+
"@chunkd/fs": "^8.5.1",
|
|
47
47
|
"@cogeotiff/core": "^7.0.0",
|
|
48
48
|
"@cotar/core": "^5.4.0",
|
|
49
49
|
"@cotar/tar": "^5.4.1",
|
|
@@ -51,16 +51,15 @@
|
|
|
51
51
|
"@rushstack/ts-command-line": "^4.3.13",
|
|
52
52
|
"ansi-colors": "^4.1.1",
|
|
53
53
|
"deep-diff": "^1.0.2",
|
|
54
|
+
"flatgeobuf": "^3.23.1",
|
|
54
55
|
"get-port": "^6.1.2",
|
|
55
56
|
"node-fetch": "^3.2.3",
|
|
56
57
|
"p-limit": "^4.0.0",
|
|
57
|
-
"playwright": "^1.22.2",
|
|
58
58
|
"pretty-json-log": "^1.0.0",
|
|
59
59
|
"zod": "^3.17.3"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
62
|
"@types/deep-diff": "^1.0.1",
|
|
63
|
-
"@types/geojson": "^7946.0.7",
|
|
64
63
|
"@types/proj4": "^2.5.2"
|
|
65
64
|
},
|
|
66
65
|
"publishConfig": {
|
|
@@ -69,5 +68,5 @@
|
|
|
69
68
|
"files": [
|
|
70
69
|
"build/"
|
|
71
70
|
],
|
|
72
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "dcebd7149ab318ea979b5d1ba34a9f82fc41b935"
|
|
73
72
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"action.aws.test.d.ts","sourceRoot":"","sources":["../../../../src/cli/aws/__tests__/action.aws.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
import { fsa } from '@chunkd/fs';
|
|
2
|
-
import o from 'ospec';
|
|
3
|
-
import { asyncFilter, chunkArray } from '../action.aws.list.js';
|
|
4
|
-
o.spec('chunkArray', () => {
|
|
5
|
-
o('should chunk a array', () => {
|
|
6
|
-
o(chunkArray([1, 2, 3, 4], 2)).deepEquals([
|
|
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],
|
|
15
|
-
]);
|
|
16
|
-
});
|
|
17
|
-
o('should chunk small set', () => {
|
|
18
|
-
o(chunkArray(new Set([1]), 2)).deepEquals([[1]]);
|
|
19
|
-
});
|
|
20
|
-
o('should chunk large set', () => {
|
|
21
|
-
o(chunkArray(new Set([1, 2, 3, 4, 4]), 5)).deepEquals([[1, 2, 3, 4]]);
|
|
22
|
-
});
|
|
23
|
-
o('should chunk into single sets', () => {
|
|
24
|
-
o(chunkArray(new Set([1, 2, 3, 4, 4]), 1)).deepEquals([[1], [2], [3], [4]]);
|
|
25
|
-
});
|
|
26
|
-
});
|
|
27
|
-
o.spec('asyncFilter', () => {
|
|
28
|
-
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',
|
|
37
|
-
];
|
|
38
|
-
async function* generator() {
|
|
39
|
-
for (const file of fileList)
|
|
40
|
-
yield file;
|
|
41
|
-
}
|
|
42
|
-
o('should filter all', async () => {
|
|
43
|
-
o(await fsa.toArray(asyncFilter(generator(), '*'))).deepEquals(fileList);
|
|
44
|
-
});
|
|
45
|
-
o('should filter exact', async () => {
|
|
46
|
-
for (const file of fileList) {
|
|
47
|
-
if (file.startsWith('c:\\'))
|
|
48
|
-
continue; // not a valid regexp
|
|
49
|
-
o(await fsa.toArray(asyncFilter(generator(), file))).deepEquals([file]);
|
|
50
|
-
}
|
|
51
|
-
});
|
|
52
|
-
o('should filter suffix', async () => {
|
|
53
|
-
o(await fsa.toArray(asyncFilter(generator(), '.tiff$'))).deepEquals(fileList.filter((f) => f.toLowerCase().endsWith('.tiff')));
|
|
54
|
-
});
|
|
55
|
-
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')));
|
|
57
|
-
});
|
|
58
|
-
});
|
|
59
|
-
//# sourceMappingURL=action.aws.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"action.aws.test.js","sourceRoot":"","sources":["../../../../src/cli/aws/__tests__/action.aws.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
2
|
-
export declare class CommandList extends CommandLineAction {
|
|
3
|
-
private filter;
|
|
4
|
-
private output;
|
|
5
|
-
private group;
|
|
6
|
-
private limit;
|
|
7
|
-
private config;
|
|
8
|
-
constructor();
|
|
9
|
-
protected onDefineParameters(): void;
|
|
10
|
-
onExecute(): Promise<void>;
|
|
11
|
-
}
|
|
12
|
-
export declare function asyncFilter(source: AsyncGenerator<string>, filter: string): AsyncGenerator<string>;
|
|
13
|
-
export declare function chunkArray<T>(values: Set<T> | T[], size: number): T[][];
|
|
14
|
-
//# sourceMappingURL=action.aws.list.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
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;AAExH,qBAAa,WAAY,SAAQ,iBAAiB;IAChD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,MAAM,CAA6B;;IAU3C,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAgC9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAqCjC;AAED,wBAAuB,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,CAQzG;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE,EAAE,CAYvE"}
|