@basemaps/cli 7.0.0 → 7.1.1
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/build/cli/__tests__/util.test.d.ts +0 -1
- package/build/cli/__tests__/util.test.js +11 -10
- package/build/cli/__tests__/util.test.js.map +1 -1
- package/build/cli/bin.d.ts +0 -1
- package/build/cli/config/action.bundle.assets.d.ts +5 -7
- package/build/cli/config/action.bundle.assets.js +34 -21
- package/build/cli/config/action.bundle.assets.js.map +1 -1
- package/build/cli/config/action.bundle.d.ts +1 -1
- package/build/cli/config/action.bundle.js +40 -10
- package/build/cli/config/action.bundle.js.map +1 -1
- package/build/cli/config/action.import.d.ts +4 -9
- package/build/cli/config/action.import.js +131 -110
- package/build/cli/config/action.import.js.map +1 -1
- package/build/cli/config/config.diff.d.ts +2 -2
- package/build/cli/config/config.diff.js +6 -4
- package/build/cli/config/config.diff.js.map +1 -1
- package/build/cli/config/config.update.d.ts +3 -5
- package/build/cli/config/config.update.js +42 -7
- package/build/cli/config/config.update.js.map +1 -1
- package/build/cli/folder.d.ts +0 -1
- package/build/cli/folder.js +1 -2
- package/build/cli/folder.js.map +1 -1
- package/build/cli/index.d.ts +0 -2
- package/build/cli/index.js +0 -6
- package/build/cli/index.js.map +1 -1
- package/build/cli/server/action.serve.d.ts +0 -1
- package/build/cli/server/action.serve.js +27 -4
- package/build/cli/server/action.serve.js.map +1 -1
- package/build/cli/util.d.ts +2 -2
- package/build/cli/util.js +38 -37
- package/build/cli/util.js.map +1 -1
- package/package.json +20 -19
- package/CHANGELOG.md +0 -1612
- package/build/cli/__tests__/util.test.d.ts.map +0 -1
- package/build/cli/bin.d.ts.map +0 -1
- package/build/cli/config/action.bundle.assets.d.ts.map +0 -1
- package/build/cli/config/action.bundle.d.ts.map +0 -1
- package/build/cli/config/action.imagery.config.d.ts +0 -11
- package/build/cli/config/action.imagery.config.d.ts.map +0 -1
- package/build/cli/config/action.imagery.config.js +0 -142
- package/build/cli/config/action.imagery.config.js.map +0 -1
- package/build/cli/config/action.import.d.ts.map +0 -1
- package/build/cli/config/config.diff.d.ts.map +0 -1
- package/build/cli/config/config.update.d.ts.map +0 -1
- package/build/cli/folder.d.ts.map +0 -1
- package/build/cli/index.d.ts.map +0 -1
- package/build/cli/overview/__test__/wmts.overview.test.d.ts +0 -2
- package/build/cli/overview/__test__/wmts.overview.test.d.ts.map +0 -1
- package/build/cli/overview/__test__/wmts.overview.test.js +0 -24
- package/build/cli/overview/__test__/wmts.overview.test.js.map +0 -1
- package/build/cli/overview/action.create.overview.d.ts +0 -19
- package/build/cli/overview/action.create.overview.d.ts.map +0 -1
- package/build/cli/overview/action.create.overview.js +0 -178
- package/build/cli/overview/action.create.overview.js.map +0 -1
- package/build/cli/overview/overview.wmts.d.ts +0 -3
- package/build/cli/overview/overview.wmts.d.ts.map +0 -1
- package/build/cli/overview/overview.wmts.js +0 -29
- package/build/cli/overview/overview.wmts.js.map +0 -1
- package/build/cli/overview/tile.generator.d.ts +0 -13
- package/build/cli/overview/tile.generator.d.ts.map +0 -1
- package/build/cli/overview/tile.generator.js +0 -86
- package/build/cli/overview/tile.generator.js.map +0 -1
- package/build/cli/overview/timer.d.ts +0 -14
- package/build/cli/overview/timer.d.ts.map +0 -1
- package/build/cli/overview/timer.js +0 -21
- package/build/cli/overview/timer.js.map +0 -1
- package/build/cli/server/action.serve.d.ts.map +0 -1
- package/build/cli/util.d.ts.map +0 -1
- package/build/cog/builder.d.ts +0 -49
- package/build/cog/builder.d.ts.map +0 -1
- package/build/cog/builder.js +0 -177
- package/build/cog/builder.js.map +0 -1
- package/build/cog/cutline.d.ts +0 -75
- package/build/cog/cutline.d.ts.map +0 -1
- package/build/cog/cutline.js +0 -250
- package/build/cog/cutline.js.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ConfigId, ConfigPrefix, ConfigProviderMemory,
|
|
2
|
-
import { GoogleTms, Nztm2000QuadTms
|
|
3
|
-
import { Env, fsa, getDefaultConfig, LogConfig } from '@basemaps/shared';
|
|
1
|
+
import { ConfigId, ConfigPrefix, ConfigProviderMemory, } from '@basemaps/config';
|
|
2
|
+
import { GoogleTms, Nztm2000QuadTms } from '@basemaps/geo';
|
|
3
|
+
import { Env, fsa, getDefaultConfig, getPreviewUrl, LogConfig, setDefaultConfig } from '@basemaps/shared';
|
|
4
4
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
5
5
|
import fetch from 'node-fetch';
|
|
6
6
|
import { invalidateCache } from '../util.js';
|
|
@@ -14,15 +14,57 @@ export class CommandImport extends CommandLineAction {
|
|
|
14
14
|
summary: 'import a config json into dynamodb',
|
|
15
15
|
documentation: 'Given a valid bundle config json and import them into dynamodb',
|
|
16
16
|
});
|
|
17
|
-
this
|
|
17
|
+
Object.defineProperty(this, "config", {
|
|
18
|
+
enumerable: true,
|
|
19
|
+
configurable: true,
|
|
20
|
+
writable: true,
|
|
21
|
+
value: void 0
|
|
22
|
+
});
|
|
23
|
+
Object.defineProperty(this, "output", {
|
|
24
|
+
enumerable: true,
|
|
25
|
+
configurable: true,
|
|
26
|
+
writable: true,
|
|
27
|
+
value: void 0
|
|
28
|
+
});
|
|
29
|
+
Object.defineProperty(this, "commit", {
|
|
30
|
+
enumerable: true,
|
|
31
|
+
configurable: true,
|
|
32
|
+
writable: true,
|
|
33
|
+
value: void 0
|
|
34
|
+
});
|
|
35
|
+
Object.defineProperty(this, "target", {
|
|
36
|
+
enumerable: true,
|
|
37
|
+
configurable: true,
|
|
38
|
+
writable: true,
|
|
39
|
+
value: void 0
|
|
40
|
+
});
|
|
41
|
+
Object.defineProperty(this, "promises", {
|
|
42
|
+
enumerable: true,
|
|
43
|
+
configurable: true,
|
|
44
|
+
writable: true,
|
|
45
|
+
value: []
|
|
46
|
+
});
|
|
18
47
|
/** List of paths to invalidate at the end of the request */
|
|
19
|
-
this
|
|
48
|
+
Object.defineProperty(this, "invalidations", {
|
|
49
|
+
enumerable: true,
|
|
50
|
+
configurable: true,
|
|
51
|
+
writable: true,
|
|
52
|
+
value: []
|
|
53
|
+
});
|
|
20
54
|
/** List of changed config ids */
|
|
21
|
-
this
|
|
55
|
+
Object.defineProperty(this, "changes", {
|
|
56
|
+
enumerable: true,
|
|
57
|
+
configurable: true,
|
|
58
|
+
writable: true,
|
|
59
|
+
value: []
|
|
60
|
+
});
|
|
22
61
|
/** List of paths to invalidate at the end of the request */
|
|
23
|
-
this
|
|
24
|
-
|
|
25
|
-
|
|
62
|
+
Object.defineProperty(this, "backupConfig", {
|
|
63
|
+
enumerable: true,
|
|
64
|
+
configurable: true,
|
|
65
|
+
writable: true,
|
|
66
|
+
value: new ConfigProviderMemory()
|
|
67
|
+
});
|
|
26
68
|
}
|
|
27
69
|
onDefineParameters() {
|
|
28
70
|
this.config = this.defineStringParameter({
|
|
@@ -31,34 +73,44 @@ export class CommandImport extends CommandLineAction {
|
|
|
31
73
|
description: 'Path of config json, this can be both a local path or s3 location',
|
|
32
74
|
required: true,
|
|
33
75
|
});
|
|
34
|
-
this.backup = this.defineStringParameter({
|
|
35
|
-
argumentName: 'BACKUP',
|
|
36
|
-
parameterLongName: '--backup',
|
|
37
|
-
description: 'Backup the old config into a config bundle json',
|
|
38
|
-
});
|
|
39
76
|
this.output = this.defineStringParameter({
|
|
40
77
|
argumentName: 'OUTPUT',
|
|
41
78
|
parameterLongName: '--output',
|
|
42
79
|
description: 'Output a markdown file with the config changes',
|
|
43
80
|
});
|
|
81
|
+
this.target = this.defineStringParameter({
|
|
82
|
+
argumentName: 'TARGET',
|
|
83
|
+
parameterLongName: '--target',
|
|
84
|
+
description: 'Target config file to compare',
|
|
85
|
+
});
|
|
44
86
|
this.commit = this.defineFlagParameter({
|
|
45
87
|
parameterLongName: '--commit',
|
|
46
88
|
description: 'Actually start the import',
|
|
47
89
|
required: false,
|
|
48
90
|
});
|
|
49
91
|
}
|
|
92
|
+
async getConfig(logger) {
|
|
93
|
+
if (this.target.value) {
|
|
94
|
+
logger.info({ config: this.target.value }, 'Import:Target:Load');
|
|
95
|
+
const configJson = await fsa.readJson(fsa.toUrl(this.target.value));
|
|
96
|
+
const mem = ConfigProviderMemory.fromJson(configJson);
|
|
97
|
+
mem.createVirtualTileSets();
|
|
98
|
+
setDefaultConfig(mem);
|
|
99
|
+
return mem;
|
|
100
|
+
}
|
|
101
|
+
return getDefaultConfig();
|
|
102
|
+
}
|
|
50
103
|
async onExecute() {
|
|
51
|
-
var _a;
|
|
52
104
|
const logger = LogConfig.get();
|
|
53
|
-
const commit =
|
|
105
|
+
const commit = this.commit.value ?? false;
|
|
54
106
|
const config = this.config.value;
|
|
55
|
-
const backup = this.backup.value;
|
|
56
|
-
const cfg = getDefaultConfig();
|
|
57
107
|
if (config == null)
|
|
58
108
|
throw new Error('Please provide a config json');
|
|
59
109
|
if (commit && !config.startsWith('s3://') && Env.isProduction()) {
|
|
60
110
|
throw new Error('To actually import into dynamo has to use the config file from s3.');
|
|
61
111
|
}
|
|
112
|
+
const configUrl = fsa.toUrl(config);
|
|
113
|
+
const cfg = await this.getConfig(logger);
|
|
62
114
|
const HostPrefix = Env.isProduction() ? '' : 'dev.';
|
|
63
115
|
const healthEndpoint = `https://${HostPrefix}basemaps.linz.govt.nz/v1/health`;
|
|
64
116
|
logger.info({ url: healthEndpoint }, 'Import:ValidateHealth');
|
|
@@ -68,13 +120,20 @@ export class CommandImport extends CommandLineAction {
|
|
|
68
120
|
throw new Error('Cannot update basemaps is unhealthy');
|
|
69
121
|
}
|
|
70
122
|
logger.info({ config }, 'Import:Load');
|
|
71
|
-
const configJson = await fsa.readJson(
|
|
123
|
+
const configJson = await fsa.readJson(configUrl);
|
|
72
124
|
const mem = ConfigProviderMemory.fromJson(configJson);
|
|
73
125
|
mem.createVirtualTileSets();
|
|
74
126
|
logger.info({ config }, 'Import:Start');
|
|
75
|
-
|
|
76
|
-
|
|
127
|
+
const objectTypes = {};
|
|
128
|
+
for (const config of mem.objects.values()) {
|
|
129
|
+
const objectType = ConfigId.getPrefix(config.id);
|
|
130
|
+
if (objectType) {
|
|
131
|
+
objectTypes[objectType] = (objectTypes[objectType] ?? 0) + 1;
|
|
132
|
+
}
|
|
133
|
+
this.update(config, cfg, commit);
|
|
134
|
+
}
|
|
77
135
|
await Promise.all(this.promises);
|
|
136
|
+
logger.info({ objects: mem.objects.size, types: objectTypes }, 'Import:Compare:Done');
|
|
78
137
|
if (commit) {
|
|
79
138
|
const configBundle = {
|
|
80
139
|
id: cfg.ConfigBundle.id(configJson.hash),
|
|
@@ -91,6 +150,9 @@ export class CommandImport extends CommandLineAction {
|
|
|
91
150
|
configBundle.id = cfg.ConfigBundle.id('latest');
|
|
92
151
|
await cfg.ConfigBundle.put(configBundle);
|
|
93
152
|
}
|
|
153
|
+
else {
|
|
154
|
+
logger.error('Import:NotWriteable');
|
|
155
|
+
}
|
|
94
156
|
}
|
|
95
157
|
if (commit && this.invalidations.length > 0) {
|
|
96
158
|
// Lots of invalidations just invalidate everything
|
|
@@ -105,18 +167,15 @@ export class CommandImport extends CommandLineAction {
|
|
|
105
167
|
if (!res.ok)
|
|
106
168
|
throw new Error('Basemaps is unhealthy');
|
|
107
169
|
}
|
|
108
|
-
if (backup) {
|
|
109
|
-
await fsa.writeJson(backup, this.backupConfig.toJson());
|
|
110
|
-
}
|
|
111
170
|
const output = this.output.value;
|
|
112
171
|
if (output)
|
|
113
172
|
await this.outputChange(output, mem, cfg);
|
|
114
173
|
if (commit !== true)
|
|
115
174
|
logger.info('DryRun:Done');
|
|
116
175
|
}
|
|
117
|
-
update(config, commit) {
|
|
176
|
+
update(config, oldConfig, commit) {
|
|
118
177
|
const promise = Q(async () => {
|
|
119
|
-
const updater = new Updater(config, commit);
|
|
178
|
+
const updater = new Updater(config, oldConfig, commit);
|
|
120
179
|
const hasChanges = await updater.reconcile();
|
|
121
180
|
if (hasChanges) {
|
|
122
181
|
this.changes.push(config.id);
|
|
@@ -140,22 +199,18 @@ export class CommandImport extends CommandLineAction {
|
|
|
140
199
|
* @param aerial output preview link for aerial map
|
|
141
200
|
*/
|
|
142
201
|
async outputNewLayers(mem, layer, inserts, aerial) {
|
|
143
|
-
inserts.push(
|
|
202
|
+
inserts.push(`\n### ${layer.name}\n`);
|
|
144
203
|
if (layer[2193]) {
|
|
145
204
|
const urls = await this.prepareUrl(layer[2193], mem, Nztm2000QuadTms);
|
|
146
205
|
inserts.push(` - [NZTM2000Quad](${urls.layer})`);
|
|
147
206
|
if (aerial)
|
|
148
|
-
inserts.push(`
|
|
149
|
-
else
|
|
150
|
-
inserts.push('\n');
|
|
207
|
+
inserts.push(` - [Aerial](${urls.tag})`);
|
|
151
208
|
}
|
|
152
209
|
if (layer[3857]) {
|
|
153
210
|
const urls = await this.prepareUrl(layer[3857], mem, GoogleTms);
|
|
154
211
|
inserts.push(` - [WebMercatorQuad](${urls.layer})`);
|
|
155
212
|
if (aerial)
|
|
156
|
-
inserts.push(`
|
|
157
|
-
else
|
|
158
|
-
inserts.push('\n');
|
|
213
|
+
inserts.push(` - [Aerial](${urls.tag})`);
|
|
159
214
|
}
|
|
160
215
|
}
|
|
161
216
|
/**
|
|
@@ -175,15 +230,13 @@ export class CommandImport extends CommandLineAction {
|
|
|
175
230
|
if (layer.maxZoom !== existing.maxZoom)
|
|
176
231
|
zoom += ` max zoom ${existing.maxZoom} -> ${layer.maxZoom}`;
|
|
177
232
|
}
|
|
178
|
-
const change = [
|
|
233
|
+
const change = [`\n### ${layer.name}\n`];
|
|
179
234
|
if (layer[2193]) {
|
|
180
235
|
if (layer[2193] !== existing[2193]) {
|
|
181
236
|
const urls = await this.prepareUrl(layer[2193], mem, Nztm2000QuadTms);
|
|
182
237
|
change.push(`- Layer update [NZTM2000Quad](${urls.layer})`);
|
|
183
238
|
if (aerial)
|
|
184
|
-
updates.push(`
|
|
185
|
-
else
|
|
186
|
-
updates.push('\n');
|
|
239
|
+
updates.push(` - [Aerial](${urls.tag})`);
|
|
187
240
|
}
|
|
188
241
|
if (zoom) {
|
|
189
242
|
const urls = await this.prepareUrl(layer[2193], mem, Nztm2000QuadTms);
|
|
@@ -195,9 +248,7 @@ export class CommandImport extends CommandLineAction {
|
|
|
195
248
|
const urls = await this.prepareUrl(layer[3857], mem, GoogleTms);
|
|
196
249
|
change.push(`- Layer update [WebMercatorQuad](${urls.layer})`);
|
|
197
250
|
if (aerial)
|
|
198
|
-
updates.push(`
|
|
199
|
-
else
|
|
200
|
-
updates.push('\n');
|
|
251
|
+
updates.push(` - [Aerial](${urls.tag})`);
|
|
201
252
|
}
|
|
202
253
|
if (zoom) {
|
|
203
254
|
const urls = await this.prepareUrl(layer[3857], mem, GoogleTms);
|
|
@@ -222,9 +273,10 @@ export class CommandImport extends CommandLineAction {
|
|
|
222
273
|
* @param cfg existing config data
|
|
223
274
|
*/
|
|
224
275
|
async outputChange(output, mem, cfg) {
|
|
276
|
+
const md = [];
|
|
225
277
|
// Output for aerial config changes
|
|
226
|
-
const inserts = [
|
|
227
|
-
const updates = [
|
|
278
|
+
const inserts = [];
|
|
279
|
+
const updates = [];
|
|
228
280
|
const aerialId = 'ts_aerial';
|
|
229
281
|
const newData = await mem.TileSet.get(aerialId);
|
|
230
282
|
const oldData = await cfg.TileSet.get(aerialId);
|
|
@@ -232,18 +284,29 @@ export class CommandImport extends CommandLineAction {
|
|
|
232
284
|
if (newData == null || oldData == null)
|
|
233
285
|
throw new Error('Failed to fetch aerial config data.');
|
|
234
286
|
for (const layer of newData.layers) {
|
|
287
|
+
// if (aerialLayers.has(layer.name)) continue;
|
|
235
288
|
aerialLayers.add(layer.name);
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
const
|
|
239
|
-
if (
|
|
240
|
-
|
|
289
|
+
// There are duplicates layers inside the config this makes it hard to know what has changed
|
|
290
|
+
// so only allow comparisons to one layer at a time
|
|
291
|
+
const index = oldData.layers.findIndex((l) => l.name === layer.name);
|
|
292
|
+
if (index > -1) {
|
|
293
|
+
const [el] = oldData.layers.splice(index, 1);
|
|
294
|
+
await this.outputUpdatedLayers(mem, layer, el, updates, true);
|
|
295
|
+
}
|
|
241
296
|
else
|
|
242
297
|
await this.outputNewLayers(mem, layer, inserts, true);
|
|
243
298
|
}
|
|
299
|
+
if (inserts.length > 0)
|
|
300
|
+
md.push('# Aerial Imagery Inserts', ...inserts);
|
|
301
|
+
if (updates.length > 0)
|
|
302
|
+
md.push('# Aerial Imagery Updates', ...updates);
|
|
303
|
+
// Some layers were not removed from the old config so they no longer exist in the new config
|
|
304
|
+
if (oldData.layers.length > 0) {
|
|
305
|
+
md.push('# Aerial Imagery Deletes', ...oldData.layers.map((m) => `- ${m.title}`));
|
|
306
|
+
}
|
|
244
307
|
// Output for individual tileset config changes or inserts
|
|
245
|
-
const individualInserts = [
|
|
246
|
-
const individualUpdates = [
|
|
308
|
+
const individualInserts = [];
|
|
309
|
+
const individualUpdates = [];
|
|
247
310
|
for (const config of mem.objects.values()) {
|
|
248
311
|
if (!config.id.startsWith(ConfigPrefix.TileSet))
|
|
249
312
|
continue;
|
|
@@ -261,9 +324,13 @@ export class CommandImport extends CommandLineAction {
|
|
|
261
324
|
else
|
|
262
325
|
await this.outputNewLayers(mem, layer, individualInserts);
|
|
263
326
|
}
|
|
327
|
+
if (individualInserts.length > 0)
|
|
328
|
+
md.push('# Individual Inserts', ...individualInserts);
|
|
329
|
+
if (individualUpdates.length > 0)
|
|
330
|
+
md.push('# Individual Updates', ...individualUpdates);
|
|
264
331
|
// Output for vector config changes
|
|
265
|
-
const vectorUpdate = [
|
|
266
|
-
const styleUpdate = [
|
|
332
|
+
const vectorUpdate = [];
|
|
333
|
+
const styleUpdate = [];
|
|
267
334
|
for (const change of this.changes) {
|
|
268
335
|
if (change === 'ts_topographic') {
|
|
269
336
|
for (const style of VectorStyles) {
|
|
@@ -275,72 +342,26 @@ export class CommandImport extends CommandLineAction {
|
|
|
275
342
|
styleUpdate.push(`* [${style}](${PublicUrlBase}?config=${this.config.value}&i=topographic&s=${style}&debug)\n`);
|
|
276
343
|
}
|
|
277
344
|
}
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
md += individualInserts.join('');
|
|
285
|
-
if (individualUpdates.length > 1)
|
|
286
|
-
md += individualUpdates.join('');
|
|
287
|
-
if (vectorUpdate.length > 1)
|
|
288
|
-
md += vectorUpdate.join('');
|
|
289
|
-
if (styleUpdate.length > 1)
|
|
290
|
-
md += styleUpdate.join('');
|
|
291
|
-
if (md !== '')
|
|
292
|
-
await fsa.write(output, md);
|
|
293
|
-
return;
|
|
294
|
-
}
|
|
295
|
-
async _loadJob(path) {
|
|
296
|
-
const existing = this._jobs.get(path);
|
|
297
|
-
if (existing)
|
|
298
|
-
return existing;
|
|
299
|
-
try {
|
|
300
|
-
const job = await fsa.readJson(path);
|
|
301
|
-
this._jobs.set(path, job);
|
|
302
|
-
return job;
|
|
345
|
+
if (vectorUpdate.length > 0)
|
|
346
|
+
md.push('# Vector Data Update', ...vectorUpdate);
|
|
347
|
+
if (styleUpdate.length > 0)
|
|
348
|
+
md.push('# Vector Style Update', ...styleUpdate);
|
|
349
|
+
if (md.length > 0) {
|
|
350
|
+
await fsa.write(fsa.toUrl(output), md.join('\n'));
|
|
303
351
|
}
|
|
304
|
-
|
|
305
|
-
return;
|
|
306
|
-
}
|
|
307
|
-
}
|
|
308
|
-
async _loadCovering(path) {
|
|
309
|
-
const existing = this._coverings.get(path);
|
|
310
|
-
if (existing)
|
|
311
|
-
return existing;
|
|
312
|
-
const covering = await fsa.readJson(path);
|
|
313
|
-
this._coverings.set(path, covering);
|
|
314
|
-
return covering;
|
|
352
|
+
return;
|
|
315
353
|
}
|
|
316
354
|
/**
|
|
317
355
|
* Prepare QA urls with center location
|
|
318
356
|
*/
|
|
319
357
|
async prepareUrl(id, mem, tileMatrix) {
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
let targetZoom;
|
|
325
|
-
const job = await this._loadJob(fsa.join(configImagey.uri, 'job.json'));
|
|
326
|
-
if (job) {
|
|
327
|
-
// Calculate target zoom from gsd
|
|
328
|
-
targetZoom = Math.max(tileMatrix.findBestZoom(job.output.gsd) - 12, 0);
|
|
329
|
-
}
|
|
330
|
-
else {
|
|
331
|
-
// Get target zoom from covering
|
|
332
|
-
const covering = await this._loadCovering(fsa.join(configImagey.uri, 'covering.geojson'));
|
|
333
|
-
const zoomLevel = (_b = (_a = covering.features[0]) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b['linz_basemaps:options'].zoomLevel;
|
|
334
|
-
targetZoom = Math.max(zoomLevel - 12, 0);
|
|
335
|
-
}
|
|
336
|
-
const bounds = configImagey.bounds;
|
|
337
|
-
const center = { x: bounds.x + bounds.width / 2, y: bounds.y + bounds.height / 2 };
|
|
338
|
-
const proj = Projection.get(configImagey.projection);
|
|
339
|
-
const centerLatLon = proj.toWgs84([center.x, center.y]).map((c) => c.toFixed(6));
|
|
340
|
-
const name = standardizeLayerName(configImagey.name);
|
|
358
|
+
const configImagery = await mem.Imagery.get(id);
|
|
359
|
+
if (configImagery == null)
|
|
360
|
+
throw new Error(`Failed to find imagery config from config bundle file. Id: ${id}`);
|
|
361
|
+
const center = getPreviewUrl({ imagery: configImagery });
|
|
341
362
|
const urls = {
|
|
342
|
-
layer: `${PublicUrlBase}?config=${this.config.value}&i=${name}&p=${tileMatrix.identifier}&debug#@${
|
|
343
|
-
tag: `${PublicUrlBase}?config=${this.config.value}&p=${tileMatrix.identifier}&debug#@${
|
|
363
|
+
layer: `${PublicUrlBase}?config=${this.config.value}&i=${center.name}&p=${tileMatrix.identifier}&debug#@${center.location.lat},${center.location.lon},z${center.location.zoom}`,
|
|
364
|
+
tag: `${PublicUrlBase}?config=${this.config.value}&p=${tileMatrix.identifier}&debug#@${center.location.lat},${center.location.lon},z${center.location.zoom}`,
|
|
344
365
|
};
|
|
345
366
|
return urls;
|
|
346
367
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.import.js","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"action.import.js","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { LogType } from '@basemaps/shared';
|
|
2
2
|
import diff from 'deep-diff';
|
|
3
|
-
export declare const IgnoredProperties: string
|
|
3
|
+
export declare const IgnoredProperties: Set<string>;
|
|
4
4
|
export declare class ConfigDiff {
|
|
5
5
|
static getDiff<T>(changes: diff.Diff<T, T>[]): string;
|
|
6
6
|
static showDiff<T extends {
|
|
7
7
|
id: string;
|
|
8
|
+
name: string;
|
|
8
9
|
}>(type: string, oldData: T, newData: T, logger: LogType): boolean;
|
|
9
10
|
}
|
|
10
|
-
//# sourceMappingURL=config.diff.d.ts.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import c from 'ansi-colors';
|
|
2
2
|
import diff from 'deep-diff';
|
|
3
|
-
export const IgnoredProperties = ['id', 'createdAt', 'updatedAt', 'year', 'resolution'];
|
|
3
|
+
export const IgnoredProperties = new Set(['id', 'createdAt', 'updatedAt', 'year', 'resolution']);
|
|
4
4
|
export class ConfigDiff {
|
|
5
5
|
static getDiff(changes) {
|
|
6
6
|
let output = '';
|
|
@@ -33,13 +33,15 @@ export class ConfigDiff {
|
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
return output
|
|
36
|
+
return output;
|
|
37
37
|
}
|
|
38
38
|
static showDiff(type, oldData, newData, logger) {
|
|
39
|
-
const changes = diff.diff(oldData, newData, (_path, key) => IgnoredProperties.
|
|
39
|
+
const changes = diff.diff(oldData, newData, (_path, key) => IgnoredProperties.has(key));
|
|
40
40
|
if (changes) {
|
|
41
41
|
const changeDif = ConfigDiff.getDiff(changes);
|
|
42
|
-
logger.info({ type, record: newData.id }, 'Changes');
|
|
42
|
+
logger.info({ type, record: newData.id, description: newData.name }, 'Changes');
|
|
43
|
+
// eslint-disable-next-line no-console
|
|
44
|
+
console.log(newData.id, newData.name);
|
|
43
45
|
// eslint-disable-next-line no-console
|
|
44
46
|
console.log(changeDif);
|
|
45
47
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.diff.js","sourceRoot":"","sources":["../../../src/cli/config/config.diff.ts"],"names":[],"mappings":"AACA,OAAO,CAAC,MAAM,aAAa,CAAC;AAC5B,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.diff.js","sourceRoot":"","sources":["../../../src/cli/config/config.diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { BaseConfig,
|
|
2
|
-
import { BasemapsConfigObject } from '@basemaps/config';
|
|
1
|
+
import { BaseConfig, BasemapsConfigObject, BasemapsConfigProvider, ConfigImagery, ConfigProvider, ConfigTileSet, ConfigVectorStyle } from '@basemaps/config';
|
|
3
2
|
import { LogType } from '@basemaps/shared';
|
|
4
3
|
export declare const Q: import("p-limit").LimitFunction;
|
|
5
4
|
export declare class Updater<S extends BaseConfig = BaseConfig> {
|
|
6
5
|
config: S;
|
|
7
|
-
_oldData
|
|
6
|
+
_oldData?: Promise<ConfigImagery | ConfigTileSet | ConfigProvider | ConfigVectorStyle | null>;
|
|
8
7
|
prefix: string;
|
|
9
8
|
isCommit: boolean;
|
|
10
9
|
logger: LogType;
|
|
@@ -13,7 +12,7 @@ export declare class Updater<S extends BaseConfig = BaseConfig> {
|
|
|
13
12
|
* Class to apply an TileSetConfig source to the tile metadata db
|
|
14
13
|
* @param config a string or TileSetConfig to use
|
|
15
14
|
*/
|
|
16
|
-
constructor(config: S, isCommit: boolean);
|
|
15
|
+
constructor(config: S, oldConfig: BasemapsConfigProvider, isCommit: boolean);
|
|
17
16
|
getDB(): BasemapsConfigObject<ConfigTileSet | ConfigImagery | ConfigProvider | ConfigVectorStyle>;
|
|
18
17
|
getConfig(): ConfigTileSet | ConfigImagery | ConfigProvider | ConfigVectorStyle;
|
|
19
18
|
invalidatePath(): string;
|
|
@@ -23,4 +22,3 @@ export declare class Updater<S extends BaseConfig = BaseConfig> {
|
|
|
23
22
|
*/
|
|
24
23
|
reconcile(): Promise<boolean>;
|
|
25
24
|
}
|
|
26
|
-
//# sourceMappingURL=config.update.d.ts.map
|
|
@@ -1,17 +1,52 @@
|
|
|
1
|
-
import { ConfigPrefix, } from '@basemaps/config';
|
|
2
|
-
import {
|
|
3
|
-
import { getDefaultConfig, LogConfig, ConfigDynamoBase } from '@basemaps/shared';
|
|
4
|
-
import { ConfigDiff } from './config.diff.js';
|
|
1
|
+
import { ConfigId, ConfigPrefix, } from '@basemaps/config';
|
|
2
|
+
import { ConfigDynamoBase, LogConfig } from '@basemaps/shared';
|
|
5
3
|
import PLimit from 'p-limit';
|
|
4
|
+
import { ConfigDiff } from './config.diff.js';
|
|
6
5
|
export const Q = PLimit(10);
|
|
7
6
|
export class Updater {
|
|
8
7
|
/**
|
|
9
8
|
* Class to apply an TileSetConfig source to the tile metadata db
|
|
10
9
|
* @param config a string or TileSetConfig to use
|
|
11
10
|
*/
|
|
12
|
-
constructor(config, isCommit) {
|
|
11
|
+
constructor(config, oldConfig, isCommit) {
|
|
12
|
+
Object.defineProperty(this, "config", {
|
|
13
|
+
enumerable: true,
|
|
14
|
+
configurable: true,
|
|
15
|
+
writable: true,
|
|
16
|
+
value: void 0
|
|
17
|
+
});
|
|
18
|
+
Object.defineProperty(this, "_oldData", {
|
|
19
|
+
enumerable: true,
|
|
20
|
+
configurable: true,
|
|
21
|
+
writable: true,
|
|
22
|
+
value: void 0
|
|
23
|
+
});
|
|
24
|
+
Object.defineProperty(this, "prefix", {
|
|
25
|
+
enumerable: true,
|
|
26
|
+
configurable: true,
|
|
27
|
+
writable: true,
|
|
28
|
+
value: void 0
|
|
29
|
+
});
|
|
30
|
+
Object.defineProperty(this, "isCommit", {
|
|
31
|
+
enumerable: true,
|
|
32
|
+
configurable: true,
|
|
33
|
+
writable: true,
|
|
34
|
+
value: void 0
|
|
35
|
+
});
|
|
36
|
+
Object.defineProperty(this, "logger", {
|
|
37
|
+
enumerable: true,
|
|
38
|
+
configurable: true,
|
|
39
|
+
writable: true,
|
|
40
|
+
value: void 0
|
|
41
|
+
});
|
|
42
|
+
Object.defineProperty(this, "cfg", {
|
|
43
|
+
enumerable: true,
|
|
44
|
+
configurable: true,
|
|
45
|
+
writable: true,
|
|
46
|
+
value: void 0
|
|
47
|
+
});
|
|
13
48
|
this.config = config;
|
|
14
|
-
this.cfg =
|
|
49
|
+
this.cfg = oldConfig;
|
|
15
50
|
const prefix = ConfigId.getPrefix(config.id);
|
|
16
51
|
if (prefix == null)
|
|
17
52
|
throw new Error(`Incorrect Config Id ${config.id}`);
|
|
@@ -64,7 +99,7 @@ export class Updater {
|
|
|
64
99
|
const oldData = await this.getOldData();
|
|
65
100
|
if (oldData == null || ConfigDiff.showDiff(db.prefix, oldData, newData, this.logger)) {
|
|
66
101
|
const operation = oldData == null ? 'Insert' : 'Update';
|
|
67
|
-
this.logger.info({ type: db.prefix, record: newData.id, commit: this.isCommit }, `Change:${operation}`);
|
|
102
|
+
this.logger.info({ type: db.prefix, record: newData.id, description: newData.name, commit: this.isCommit }, `Change:${operation}`);
|
|
68
103
|
if (this.isCommit) {
|
|
69
104
|
if (db instanceof ConfigDynamoBase)
|
|
70
105
|
await db.put(newData);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.update.js","sourceRoot":"","sources":["../../../src/cli/config/config.update.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"config.update.js","sourceRoot":"","sources":["../../../src/cli/config/config.update.ts"],"names":[],"mappings":"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"}
|
package/build/cli/folder.d.ts
CHANGED
package/build/cli/folder.js
CHANGED
|
@@ -3,8 +3,7 @@ import { promises as fs } from 'fs';
|
|
|
3
3
|
import * as path from 'path';
|
|
4
4
|
/** Make a temp folder inside TEMP_FOLDER's path */
|
|
5
5
|
export async function makeTempFolder(folder) {
|
|
6
|
-
|
|
7
|
-
const tempPath = (_a = Env.get(Env.TempFolder)) !== null && _a !== void 0 ? _a : '/tmp';
|
|
6
|
+
const tempPath = Env.get(Env.TempFolder) ?? '/tmp';
|
|
8
7
|
const folderPath = path.join(tempPath, folder);
|
|
9
8
|
await fs.mkdir(folderPath, { recursive: true });
|
|
10
9
|
return folderPath;
|
package/build/cli/folder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folder.js","sourceRoot":"","sources":["../../src/cli/folder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,mDAAmD;AACnD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAAc
|
|
1
|
+
{"version":3,"file":"folder.js","sourceRoot":"","sources":["../../src/cli/folder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,mDAAmD;AACnD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAAc;IACjD,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC;IACnD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE/C,MAAM,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,mDAAmD;AACnD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,SAAiB,EAAE,IAAY;IAClE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAE9C,MAAM,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,OAAO,UAAU,CAAC;AACpB,CAAC"}
|