@basemaps/cli-config 8.5.0 → 8.6.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/build/__tests__/config.diff.d.ts +18 -0
- package/build/__tests__/config.diff.data.d.ts +2 -0
- package/build/__tests__/config.diff.data.js +33 -0
- package/build/__tests__/config.diff.data.js.map +1 -0
- package/build/__tests__/config.diff.js +41 -0
- package/build/__tests__/config.diff.js.map +1 -0
- package/build/__tests__/config.diff.test.d.ts +1 -0
- package/build/__tests__/config.diff.test.js +124 -0
- package/build/__tests__/config.diff.test.js.map +1 -0
- package/build/cli/action.import.d.ts +15 -0
- package/build/cli/action.import.js +33 -32
- package/build/cli/action.import.js.map +1 -1
- package/package.json +5 -5
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { ConfigProviderMemory, ConfigTileSetRaster } from '@basemaps/config';
|
|
2
|
+
export declare function configDiff(before: ConfigProviderMemory, after: ConfigProviderMemory): {
|
|
3
|
+
raster: Diff<ConfigTileSetRaster>[];
|
|
4
|
+
};
|
|
5
|
+
export type DiffNew<T> = {
|
|
6
|
+
type: 'new';
|
|
7
|
+
after: T;
|
|
8
|
+
};
|
|
9
|
+
export type DiffRemoved<T> = {
|
|
10
|
+
type: 'removed';
|
|
11
|
+
before: T;
|
|
12
|
+
};
|
|
13
|
+
export type DiffChanged<T> = {
|
|
14
|
+
type: 'changed';
|
|
15
|
+
before: T;
|
|
16
|
+
after: T;
|
|
17
|
+
};
|
|
18
|
+
export type Diff<T> = DiffNew<T> | DiffRemoved<T> | DiffChanged<T>;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
export const TsAerial = {
|
|
2
|
+
type: 'raster',
|
|
3
|
+
id: 'ts_aerial',
|
|
4
|
+
title: 'Aerial Imagery Basemap',
|
|
5
|
+
category: 'Basemaps',
|
|
6
|
+
layers: [
|
|
7
|
+
{
|
|
8
|
+
'2193': 's3://linz-basemaps/2193/grey_2025_0.075m/01JZVMA8FPS6QJGHAR4VY968FY/',
|
|
9
|
+
'3857': 's3://linz-basemaps/3857/grey_2025_0.075m/01JZVMA8FQV0MPPVBNBNZC6G3M/',
|
|
10
|
+
name: 'grey-2025-0.075m',
|
|
11
|
+
title: 'Grey 0.075m Urban Aerial Photos (2025) - Draft',
|
|
12
|
+
category: 'Urban Aerial Photos',
|
|
13
|
+
minZoom: 14,
|
|
14
|
+
},
|
|
15
|
+
{
|
|
16
|
+
'2193': 's3://linz-basemaps/2193/upper-hutt_2025_0.075m/01K0TGPNGH1R7F8G5EYWHHSGD1/',
|
|
17
|
+
'3857': 's3://linz-basemaps/3857/upper-hutt_2025_0.075m/01K0TGPNGH0C105PQTEFQG4QH6/',
|
|
18
|
+
name: 'upper-hutt-2025-0.075m',
|
|
19
|
+
title: 'Upper Hutt 0.075m Urban Aerial Photos (2025)',
|
|
20
|
+
category: 'Urban Aerial Photos',
|
|
21
|
+
minZoom: 14,
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
'2193': 's3://linz-basemaps/2193/masterton_2025_0.075m/01K0XA50T2GFPNTG1PANZJ3R8B/',
|
|
25
|
+
'3857': 's3://linz-basemaps/3857/masterton_2025_0.075m/01K0XA50T2MC43751EX6M8QDXK/',
|
|
26
|
+
name: 'masterton-2025-0.075m',
|
|
27
|
+
title: 'Masterton 0.075m Urban Aerial Photos (2025)',
|
|
28
|
+
category: 'Urban Aerial Photos',
|
|
29
|
+
minZoom: 14,
|
|
30
|
+
},
|
|
31
|
+
],
|
|
32
|
+
};
|
|
33
|
+
//# sourceMappingURL=config.diff.data.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.diff.data.js","sourceRoot":"","sources":["../../src/__tests__/config.diff.data.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,QAAQ,GAAwB;IAC3C,IAAI,EAAE,QAA8B;IACpC,EAAE,EAAE,WAAW;IACf,KAAK,EAAE,wBAAwB;IAC/B,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE;QACN;YACE,MAAM,EAAE,sEAAsE;YAC9E,MAAM,EAAE,sEAAsE;YAC9E,IAAI,EAAE,kBAAkB;YACxB,KAAK,EAAE,gDAAgD;YACvD,QAAQ,EAAE,qBAAqB;YAC/B,OAAO,EAAE,EAAE;SACZ;QACD;YACE,MAAM,EAAE,4EAA4E;YACpF,MAAM,EAAE,4EAA4E;YACpF,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,8CAA8C;YACrD,QAAQ,EAAE,qBAAqB;YAC/B,OAAO,EAAE,EAAE;SACZ;QACD;YACE,MAAM,EAAE,2EAA2E;YACnF,MAAM,EAAE,2EAA2E;YACnF,IAAI,EAAE,uBAAuB;YAC7B,KAAK,EAAE,6CAA6C;YACpD,QAAQ,EAAE,qBAAqB;YAC/B,OAAO,EAAE,EAAE;SACZ;KACe;CACnB,CAAC"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
function getAllTileSets(cfg) {
|
|
2
|
+
const tileSets = new Map();
|
|
3
|
+
for (const obj of cfg.objects.values()) {
|
|
4
|
+
if (!cfg.TileSet.is(obj))
|
|
5
|
+
continue;
|
|
6
|
+
if (tileSets.has(obj.id))
|
|
7
|
+
throw new Error(`Duplicate tileSet id ${obj.id}`);
|
|
8
|
+
tileSets.set(obj.id, obj);
|
|
9
|
+
}
|
|
10
|
+
return tileSets;
|
|
11
|
+
}
|
|
12
|
+
function tileSetDiffRaster(before, after) {
|
|
13
|
+
if (before == null && after == null)
|
|
14
|
+
return null;
|
|
15
|
+
if (before == null)
|
|
16
|
+
return { type: 'new', after: after };
|
|
17
|
+
if (after == null)
|
|
18
|
+
return { type: 'removed', before };
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
export function configDiff(before, after) {
|
|
22
|
+
const tileSetBefore = getAllTileSets(before);
|
|
23
|
+
const tileSetAfter = getAllTileSets(after);
|
|
24
|
+
const seen = new Set();
|
|
25
|
+
const diffs = [];
|
|
26
|
+
for (const tsBefore of tileSetBefore.values()) {
|
|
27
|
+
const diff = tileSetDiffRaster(tsBefore, tileSetAfter.get(tsBefore.id));
|
|
28
|
+
seen.add(tsBefore.id);
|
|
29
|
+
if (diff)
|
|
30
|
+
diffs.push(diff);
|
|
31
|
+
}
|
|
32
|
+
for (const tsAfter of tileSetAfter.values()) {
|
|
33
|
+
if (seen.has(tsAfter.id))
|
|
34
|
+
continue;
|
|
35
|
+
const diff = tileSetDiffRaster(undefined, tsAfter);
|
|
36
|
+
if (diff)
|
|
37
|
+
diffs.push(diff);
|
|
38
|
+
}
|
|
39
|
+
return { raster: diffs };
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=config.diff.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.diff.js","sourceRoot":"","sources":["../../src/__tests__/config.diff.ts"],"names":[],"mappings":"AAEA,SAAS,cAAc,CAAC,GAAyB;IAC/C,MAAM,QAAQ,GAAqC,IAAI,GAAG,EAAE,CAAC;IAE7D,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACvC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC;YAAE,SAAS;QACnC,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5E,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,GAA0B,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,iBAAiB,CACxB,MAA4B,EAC5B,KAA2B;IAE3B,IAAI,MAAM,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACjD,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAA4B,EAAE,CAAC;IAChF,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IAEtD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,MAA4B,EAC5B,KAA2B;IAE3B,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAE3C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,MAAM,KAAK,GAAgC,EAAE,CAAC;IAE9C,KAAK,MAAM,QAAQ,IAAI,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,iBAAiB,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACtB,IAAI,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;QAC5C,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAAE,SAAS;QACnC,MAAM,IAAI,GAAG,iBAAiB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,IAAI;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC3B,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
import assert from 'node:assert';
|
|
2
|
+
import { before, describe, it } from 'node:test';
|
|
3
|
+
import { getAllImagery, sha256base58 } from '@basemaps/config';
|
|
4
|
+
import { ConfigJson } from '@basemaps/config-loader';
|
|
5
|
+
import { Epsg, TileMatrixSets } from '@basemaps/geo';
|
|
6
|
+
import { fsa, FsMemory, LogConfig } from '@basemaps/shared';
|
|
7
|
+
import pLimit from 'p-limit';
|
|
8
|
+
import { outputChange } from '../cli/action.import.js';
|
|
9
|
+
import { TsAerial } from './config.diff.data.js';
|
|
10
|
+
import { configDiff } from './config.diff.js';
|
|
11
|
+
describe('config.diff', () => {
|
|
12
|
+
const fsMem = new FsMemory();
|
|
13
|
+
before(() => {
|
|
14
|
+
// Imagery is linked from s3, overwrite s3 links to just use memory
|
|
15
|
+
fsa.register('s3://', fsMem);
|
|
16
|
+
fsa.register('source://', fsMem);
|
|
17
|
+
fsa.register('before://', fsMem);
|
|
18
|
+
fsa.register('after://', fsMem);
|
|
19
|
+
fsMem.files.clear();
|
|
20
|
+
fsa.write(fsa.toUrl('before://config/tileset/aerial.json'), JSON.stringify(TsAerial));
|
|
21
|
+
});
|
|
22
|
+
async function stubLoadConfig(t, source) {
|
|
23
|
+
t.mock.method(ConfigJson.prototype, 'initImageryFromTiffUrl', (url) => {
|
|
24
|
+
// const imageryName = getImageryName(url);
|
|
25
|
+
const parts = url.pathname.split('/');
|
|
26
|
+
const projection = TileMatrixSets.get(Epsg.parseCode(parts[1]));
|
|
27
|
+
const imageryName = parts[2];
|
|
28
|
+
const gsd = imageryName.split('_').at(-1);
|
|
29
|
+
const imagery = {
|
|
30
|
+
id: `im_${sha256base58(url.href)}`,
|
|
31
|
+
name: imageryName,
|
|
32
|
+
title: imageryName,
|
|
33
|
+
updatedAt: Date.now(),
|
|
34
|
+
projection: projection?.projection.code,
|
|
35
|
+
tileMatrix: projection?.identifier ?? 'none',
|
|
36
|
+
gsd: parseFloat(gsd ?? '100'),
|
|
37
|
+
uri: url.href,
|
|
38
|
+
url: url,
|
|
39
|
+
bounds: { x: 0, y: 0, width: 0, height: 0 },
|
|
40
|
+
files: [],
|
|
41
|
+
};
|
|
42
|
+
return Promise.resolve(imagery);
|
|
43
|
+
});
|
|
44
|
+
const mem = await ConfigJson.fromUrl(new URL(source), pLimit(1), LogConfig.get());
|
|
45
|
+
mem.createVirtualTileSets(false);
|
|
46
|
+
return mem;
|
|
47
|
+
}
|
|
48
|
+
it('should load the aerial config', async (t) => {
|
|
49
|
+
const cfg = await stubLoadConfig(t, 'before://config/');
|
|
50
|
+
const tsAerial = await cfg.TileSet.get('aerial');
|
|
51
|
+
assert.ok(tsAerial, 'Should have loaded the aerial tile set');
|
|
52
|
+
assert.equal(tsAerial.layers.length, 3);
|
|
53
|
+
const all3857 = await getAllImagery(cfg, tsAerial.layers, [Epsg.Google]);
|
|
54
|
+
assert.equal(all3857.size, 3, 'Should have 3 layers in the 3857 tile set');
|
|
55
|
+
for (const layer of all3857.values()) {
|
|
56
|
+
const tsId = `ts_${layer.name}`;
|
|
57
|
+
assert.ok(cfg.objects.has(tsId), `Should have a tile set for ${layer.name}`);
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
it('should not have any changes when nothing has changed', async (t) => {
|
|
61
|
+
const before = await stubLoadConfig(t, 'before://config/');
|
|
62
|
+
const after = await stubLoadConfig(t, 'before://config/');
|
|
63
|
+
const diff = configDiff(before, after);
|
|
64
|
+
assert.deepEqual(diff, { raster: [] }, 'Should not have any changes when nothing has changed');
|
|
65
|
+
});
|
|
66
|
+
it('should diff when a layer is removed', async (t) => {
|
|
67
|
+
const before = await stubLoadConfig(t, 'before://config/');
|
|
68
|
+
const tsAfter = structuredClone(TsAerial);
|
|
69
|
+
tsAfter.layers.shift(); // Remove the first layer
|
|
70
|
+
await fsa.write(fsa.toUrl('after://config/tileset/aerial.json'), JSON.stringify(tsAfter));
|
|
71
|
+
const after = await stubLoadConfig(t, 'after://config/');
|
|
72
|
+
const diff = configDiff(before, after);
|
|
73
|
+
assert.equal(diff.raster.length, 1, 'Should only have one diff');
|
|
74
|
+
const firstDiff = diff.raster[0];
|
|
75
|
+
assert.equal(firstDiff.type, 'removed');
|
|
76
|
+
assert.equal(firstDiff.before.id, 'ts_grey-2025-0.075m');
|
|
77
|
+
});
|
|
78
|
+
it('should diff when a layer is added', async (t) => {
|
|
79
|
+
const before = await stubLoadConfig(t, 'before://config/');
|
|
80
|
+
const tsAfter = structuredClone(TsAerial);
|
|
81
|
+
tsAfter.layers.push(layerConfig('test-layer', 'Test layer')); // Remove the first layer
|
|
82
|
+
await fsa.write(fsa.toUrl('after://config/tileset/aerial.json'), JSON.stringify(tsAfter));
|
|
83
|
+
const after = await stubLoadConfig(t, 'after://config/');
|
|
84
|
+
const diff = configDiff(before, after);
|
|
85
|
+
assert.equal(diff.raster.length, 1, 'Should only have one diff');
|
|
86
|
+
const firstDiff = diff.raster[0];
|
|
87
|
+
assert.equal(firstDiff.type, 'new');
|
|
88
|
+
assert.equal(firstDiff.after.id, 'ts_test-layer');
|
|
89
|
+
});
|
|
90
|
+
it('should show no layer diffs when a layer is removed then added as a seperate config', async (t) => {
|
|
91
|
+
const before = await stubLoadConfig(t, 'before://config/');
|
|
92
|
+
const tsAfter = structuredClone(TsAerial);
|
|
93
|
+
// Remove the first layer then store it as a seperate tile set config file
|
|
94
|
+
const removed = tsAfter.layers.shift(); // Remove the first layer
|
|
95
|
+
await fsa.write(fsa.toUrl('after://config/tileset/aerial.json'), JSON.stringify(tsAfter));
|
|
96
|
+
await fsa.write(fsa.toUrl(`after://config/tileset/imagery/${removed.title}.json`), JSON.stringify({
|
|
97
|
+
type: 'raster',
|
|
98
|
+
id: `ts_${removed.name}`,
|
|
99
|
+
name: removed.name,
|
|
100
|
+
title: removed.title,
|
|
101
|
+
category: removed.category,
|
|
102
|
+
layers: [removed],
|
|
103
|
+
minZoom: removed.minZoom,
|
|
104
|
+
}));
|
|
105
|
+
const after = await stubLoadConfig(t, 'after://config/');
|
|
106
|
+
const diff = configDiff(before, after);
|
|
107
|
+
assert.equal(diff.raster.length, 0, 'should have no diff');
|
|
108
|
+
const doc = await outputChange(after, before, 'after://config/tileset/aerial.json', []);
|
|
109
|
+
const lines = doc.split('\n');
|
|
110
|
+
// TODO this is the bug that needs to be fixed.
|
|
111
|
+
assert.ok(lines.find((f) => f.includes('Aerial Imagery Deletes')));
|
|
112
|
+
});
|
|
113
|
+
});
|
|
114
|
+
function layerConfig(name, title) {
|
|
115
|
+
return {
|
|
116
|
+
'2193': `source://linz-basemaps/2193/${name}/${sha256base58(name + '2193')}/`,
|
|
117
|
+
'3857': `source://linz-basemaps/3857/${name}/${sha256base58(name + '3857')}/`,
|
|
118
|
+
name,
|
|
119
|
+
title,
|
|
120
|
+
category: 'Urban Aerial Photos',
|
|
121
|
+
minZoom: 14,
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
//# sourceMappingURL=config.diff.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.diff.test.js","sourceRoot":"","sources":["../../src/__tests__/config.diff.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { BaseConfig, BasemapsConfigProvider, ConfigProviderMemory } from '@basemaps/config';
|
|
1
2
|
export declare const ImportCommand: Partial<import("cmd-ts/dist/cjs/argparser.js").Register> & {
|
|
2
3
|
parse(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<{
|
|
3
4
|
config: string;
|
|
@@ -17,3 +18,17 @@ export declare const ImportCommand: Partial<import("cmd-ts/dist/cjs/argparser.js
|
|
|
17
18
|
}, Promise<void>> & {
|
|
18
19
|
run(context: import("cmd-ts/dist/cjs/argparser.js").ParseContext): Promise<import("cmd-ts/dist/cjs/argparser.js").ParsingResult<Promise<void>>>;
|
|
19
20
|
} & Partial<import("cmd-ts/dist/cjs/helpdoc.js").Versioned & import("cmd-ts/dist/cjs/helpdoc.js").Descriptive & import("cmd-ts/dist/cjs/helpdoc.js").Aliased>;
|
|
21
|
+
/**
|
|
22
|
+
* This function compared new config with existing and output a markdown document to highlight the inserts and changes
|
|
23
|
+
* Changes includes
|
|
24
|
+
* - aerial config
|
|
25
|
+
* - vector config
|
|
26
|
+
* - vector style
|
|
27
|
+
* - individual config
|
|
28
|
+
*
|
|
29
|
+
* @param output a string of output markdown location
|
|
30
|
+
* @param mem new config data read from config bundle file
|
|
31
|
+
* @param cfg existing config data
|
|
32
|
+
* @param configPath path of config json
|
|
33
|
+
*/
|
|
34
|
+
export declare function outputChange(mem: ConfigProviderMemory, cfg: BasemapsConfigProvider, configPath: string, changes: BaseConfig[]): Promise<string>;
|
|
@@ -60,6 +60,31 @@ export const ImportCommand = command({
|
|
|
60
60
|
const configJson = await fsa.readJson(configUrl);
|
|
61
61
|
const mem = ConfigProviderMemory.fromJson(configJson);
|
|
62
62
|
mem.createVirtualTileSets();
|
|
63
|
+
const promises = [];
|
|
64
|
+
/** List of paths to invalidate at the end of the request */
|
|
65
|
+
const invalidations = [];
|
|
66
|
+
/** List of changed config */
|
|
67
|
+
const changes = [];
|
|
68
|
+
/** List of paths to invalidate at the end of the request */
|
|
69
|
+
const backupConfig = new ConfigProviderMemory();
|
|
70
|
+
function update(config, oldConfig, commit) {
|
|
71
|
+
const promise = Q(async () => {
|
|
72
|
+
const updater = new Updater(config, oldConfig, commit);
|
|
73
|
+
const hasChanges = await updater.reconcile();
|
|
74
|
+
if (hasChanges) {
|
|
75
|
+
changes.push(config);
|
|
76
|
+
invalidations.push(updater.invalidatePath());
|
|
77
|
+
const oldData = await updater.getOldData();
|
|
78
|
+
if (oldData != null)
|
|
79
|
+
backupConfig.put(oldData); // No need to backup anything if there is new insert
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
backupConfig.put(config);
|
|
83
|
+
}
|
|
84
|
+
return true;
|
|
85
|
+
});
|
|
86
|
+
promises.push(promise);
|
|
87
|
+
}
|
|
63
88
|
logger.info({ config }, 'Import:Start');
|
|
64
89
|
const objectTypes = {};
|
|
65
90
|
for (const config of mem.objects.values()) {
|
|
@@ -105,8 +130,12 @@ export const ImportCommand = command({
|
|
|
105
130
|
throw new Error('Basemaps is unhealthy');
|
|
106
131
|
}
|
|
107
132
|
const output = args.output;
|
|
108
|
-
if (output != null)
|
|
109
|
-
await outputChange(
|
|
133
|
+
if (output != null) {
|
|
134
|
+
const doc = await outputChange(mem, cfg, config, changes);
|
|
135
|
+
if (doc.length > 0) {
|
|
136
|
+
await fsa.write(fsa.toUrl(output), doc);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
110
139
|
if (commit !== true)
|
|
111
140
|
logger.info('DryRun:Done');
|
|
112
141
|
},
|
|
@@ -122,31 +151,6 @@ async function getConfig(logger, target) {
|
|
|
122
151
|
}
|
|
123
152
|
return getDefaultConfig();
|
|
124
153
|
}
|
|
125
|
-
const promises = [];
|
|
126
|
-
/** List of paths to invalidate at the end of the request */
|
|
127
|
-
const invalidations = [];
|
|
128
|
-
/** List of changed config */
|
|
129
|
-
const changes = [];
|
|
130
|
-
/** List of paths to invalidate at the end of the request */
|
|
131
|
-
const backupConfig = new ConfigProviderMemory();
|
|
132
|
-
function update(config, oldConfig, commit) {
|
|
133
|
-
const promise = Q(async () => {
|
|
134
|
-
const updater = new Updater(config, oldConfig, commit);
|
|
135
|
-
const hasChanges = await updater.reconcile();
|
|
136
|
-
if (hasChanges) {
|
|
137
|
-
changes.push(config);
|
|
138
|
-
invalidations.push(updater.invalidatePath());
|
|
139
|
-
const oldData = await updater.getOldData();
|
|
140
|
-
if (oldData != null)
|
|
141
|
-
backupConfig.put(oldData); // No need to backup anything if there is new insert
|
|
142
|
-
}
|
|
143
|
-
else {
|
|
144
|
-
backupConfig.put(config);
|
|
145
|
-
}
|
|
146
|
-
return true;
|
|
147
|
-
});
|
|
148
|
-
promises.push(promise);
|
|
149
|
-
}
|
|
150
154
|
/**
|
|
151
155
|
* This function compared new config with existing and output a markdown document to highlight the inserts and changes
|
|
152
156
|
* Changes includes
|
|
@@ -160,7 +164,7 @@ function update(config, oldConfig, commit) {
|
|
|
160
164
|
* @param cfg existing config data
|
|
161
165
|
* @param configPath path of config json
|
|
162
166
|
*/
|
|
163
|
-
async function outputChange(
|
|
167
|
+
export async function outputChange(mem, cfg, configPath, changes) {
|
|
164
168
|
const outputMarkdown = [];
|
|
165
169
|
// Output for aerial config changes
|
|
166
170
|
const inserts = [];
|
|
@@ -258,10 +262,7 @@ async function outputChange(output, mem, cfg, configPath) {
|
|
|
258
262
|
outputMarkdown.push('# Vector Style Update', ...styleUpdate);
|
|
259
263
|
if (vectorUpdate.length > 0)
|
|
260
264
|
outputMarkdown.push('# Vector Data Update', ...vectorUpdate);
|
|
261
|
-
|
|
262
|
-
await fsa.write(fsa.toUrl(output), outputMarkdown.join('\n'));
|
|
263
|
-
}
|
|
264
|
-
return;
|
|
265
|
+
return outputMarkdown.join('\n');
|
|
265
266
|
}
|
|
266
267
|
/**
|
|
267
268
|
* This function prepare for the markdown lines with preview urls for new inserted config layers
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.import.js","sourceRoot":"","sources":["../../src/cli/action.import.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"action.import.js","sourceRoot":"","sources":["../../src/cli/action.import.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basemaps/cli-config",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.6.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -24,10 +24,10 @@
|
|
|
24
24
|
"test": "node --test"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@basemaps/config": "^8.
|
|
28
|
-
"@basemaps/config-loader": "^8.
|
|
27
|
+
"@basemaps/config": "^8.6.0",
|
|
28
|
+
"@basemaps/config-loader": "^8.6.0",
|
|
29
29
|
"@basemaps/geo": "^8.3.0",
|
|
30
|
-
"@basemaps/shared": "^8.
|
|
30
|
+
"@basemaps/shared": "^8.6.0",
|
|
31
31
|
"@cotar/builder": "^6.0.1",
|
|
32
32
|
"@cotar/core": "^6.0.1",
|
|
33
33
|
"@cotar/tar": "^6.0.1",
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
"files": [
|
|
52
52
|
"build/"
|
|
53
53
|
],
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "bd34894f26d1c7827503e0cb9d48d0773ecd6775"
|
|
55
55
|
}
|