@basemaps/cli 6.42.0 → 6.43.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 +22 -0
- package/build/cli/cogify/action.make.cog.d.ts +0 -1
- package/build/cli/cogify/action.make.cog.d.ts.map +1 -1
- package/build/cli/cogify/action.make.cog.js +0 -7
- package/build/cli/cogify/action.make.cog.js.map +1 -1
- package/build/cli/cogify/action.make.cog.pr.d.ts +2 -2
- package/build/cli/cogify/action.make.cog.pr.d.ts.map +1 -1
- package/build/cli/cogify/action.make.cog.pr.js +9 -11
- package/build/cli/cogify/action.make.cog.pr.js.map +1 -1
- package/build/cli/config/action.import.d.ts +31 -2
- package/build/cli/config/action.import.d.ts.map +1 -1
- package/build/cli/config/action.import.js +113 -45
- package/build/cli/config/action.import.js.map +1 -1
- package/build/cli/github/github.d.ts +15 -0
- package/build/cli/github/github.d.ts.map +1 -1
- package/build/cli/github/github.js +38 -0
- package/build/cli/github/github.js.map +1 -1
- package/build/cli/github/make.cog.pr.d.ts +11 -3
- package/build/cli/github/make.cog.pr.d.ts.map +1 -1
- package/build/cli/github/make.cog.pr.js +60 -29
- package/build/cli/github/make.cog.pr.js.map +1 -1
- package/package.json +9 -11
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,28 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [6.43.0](https://github.com/linz/basemaps/compare/v6.42.1...v6.43.0) (2023-08-22)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **cli:** Correct the path of linzijs prettierrc.js location. ([#2894](https://github.com/linz/basemaps/issues/2894)) ([348a7f7](https://github.com/linz/basemaps/commit/348a7f7094f817603d8740e54b141e7c45a1bac3))
|
|
12
|
+
* **cli:** Fix to set org in the github to be used in create pull request api. ([#2902](https://github.com/linz/basemaps/issues/2902)) ([0081275](https://github.com/linz/basemaps/commit/0081275606e055765105d5082cfd53c5983965d1))
|
|
13
|
+
* **cli:** new created file need to add to git before commit. ([#2904](https://github.com/linz/basemaps/issues/2904)) ([24fbf6d](https://github.com/linz/basemaps/commit/24fbf6d40073bf72780783bf3b1a4d01e91dbd4e))
|
|
14
|
+
* **cli:** Run npm install in the basemaps-config to install the @linz/style ([#2900](https://github.com/linz/basemaps/issues/2900)) ([fb7930c](https://github.com/linz/basemaps/commit/fb7930c38af4e1dc94e649a4dd6ae2a72483e16f))
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Features
|
|
18
|
+
|
|
19
|
+
* **cli:** Create pull request cli to format the config files by npx prettier. BM-810 ([#2898](https://github.com/linz/basemaps/issues/2898)) ([061b605](https://github.com/linz/basemaps/commit/061b60528c2e9d2104a9e51dc8373aca84a1d7d9))
|
|
20
|
+
* **cli:** Create pull request via Github api and access token. ([#2838](https://github.com/linz/basemaps/issues/2838)) ([ef5e29f](https://github.com/linz/basemaps/commit/ef5e29fd8964eb4f3e001de6f8b880233f47b9dc))
|
|
21
|
+
* **cli:** Create standalone imagery config and remove disabled layer. BM-810 ([#2810](https://github.com/linz/basemaps/issues/2810)) ([e956851](https://github.com/linz/basemaps/commit/e956851983ad5f90d24cbb7c50f75824869e0e08))
|
|
22
|
+
* **cli:** Update the import cli to output preview links for individual configs. BM-869 ([#2897](https://github.com/linz/basemaps/issues/2897)) ([e70280a](https://github.com/linz/basemaps/commit/e70280a5729f75cc808f149d81cdad3051bb2574))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
6
28
|
# [6.42.0](https://github.com/linz/basemaps/compare/v6.41.0...v6.42.0) (2023-08-06)
|
|
7
29
|
|
|
8
30
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.make.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,aAAa,EAAkB,MAAM,eAAe,CAAC;AACpE,OAAO,EAAO,UAAU,EAAkB,OAAO,EAAuB,MAAM,kBAAkB,CAAC;AACjG,OAAO,EACL,iBAAiB,EAIlB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,UAAU,EAAsB,MAAM,2BAA2B,CAAC;AAgB3E,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,GAAG,CAA2B
|
|
1
|
+
{"version":3,"file":"action.make.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,aAAa,EAAkB,MAAM,eAAe,CAAC;AACpE,OAAO,EAAO,UAAU,EAAkB,OAAO,EAAuB,MAAM,kBAAkB,CAAC;AACjG,OAAO,EACL,iBAAiB,EAIlB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,UAAU,EAAsB,MAAM,2BAA2B,CAAC;AAgB3E,qBAAa,cAAe,SAAQ,iBAAiB;IACnD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,GAAG,CAA2B;;IAUtC,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAkE9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAkD1B,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAmDrG,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAiB/D,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;CActD"}
|
|
@@ -80,11 +80,6 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
80
80
|
description: 'Running the job on aws',
|
|
81
81
|
required: false,
|
|
82
82
|
});
|
|
83
|
-
this.disabled = this.defineFlagParameter({
|
|
84
|
-
parameterLongName: '--disable',
|
|
85
|
-
description: 'Add disable flag for the new inserted layer.',
|
|
86
|
-
required: false,
|
|
87
|
-
});
|
|
88
83
|
}
|
|
89
84
|
async onExecute() {
|
|
90
85
|
const logger = LogConfig.get();
|
|
@@ -127,8 +122,6 @@ export class CommandMakeCog extends CommandLineAction {
|
|
|
127
122
|
// Set config layer for output
|
|
128
123
|
const path = jobLocation.replace('/job.json', '');
|
|
129
124
|
configLayer[tileMatrix.projection.code] = path;
|
|
130
|
-
if (this.disabled.value)
|
|
131
|
-
configLayer.disabled = true;
|
|
132
125
|
paths.push(path);
|
|
133
126
|
}
|
|
134
127
|
const output = this.output.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.make.cog.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAiB,cAAc,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,GAAG,EAAc,GAAG,EAAE,SAAS,EAAW,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EACL,iBAAiB,GAIlB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAOtD,MAAM,OAAO,cAAe,SAAQ,iBAAiB;
|
|
1
|
+
{"version":3,"file":"action.make.cog.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export declare enum Category {
|
|
|
8
8
|
}
|
|
9
9
|
export interface CategorySetting {
|
|
10
10
|
minZoom?: number;
|
|
11
|
-
|
|
11
|
+
individual?: boolean;
|
|
12
12
|
}
|
|
13
13
|
export declare const DefaultCategorySetting: Record<Category, CategorySetting>;
|
|
14
14
|
export declare function parseCategory(category: string): Category;
|
|
@@ -16,7 +16,7 @@ export declare class CommandCogPullRequest extends CommandLineAction {
|
|
|
16
16
|
private layer;
|
|
17
17
|
private category;
|
|
18
18
|
private repository;
|
|
19
|
-
private
|
|
19
|
+
private individual;
|
|
20
20
|
private vector;
|
|
21
21
|
constructor();
|
|
22
22
|
protected onDefineParameters(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.make.cog.pr.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.pr.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAGrH,oBAAY,QAAQ;IAClB,KAAK,wBAAwB;IAC7B,KAAK,wBAAwB;IAC7B,SAAS,sBAAsB;IAC/B,KAAK,UAAU;IACf,KAAK,sBAAsB;CAC5B;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,
|
|
1
|
+
{"version":3,"file":"action.make.cog.pr.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.pr.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAGrH,oBAAY,QAAQ;IAClB,KAAK,wBAAwB;IAC7B,KAAK,wBAAwB;IAC7B,SAAS,sBAAsB;IAC/B,KAAK,UAAU;IACf,KAAK,sBAAsB;CAC5B;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,QAAQ,EAAE,eAAe,CAMpE,CAAC;AAEF,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAMxD;AAED,qBAAa,qBAAsB,SAAQ,iBAAiB;IAC1D,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,UAAU,CAA6B;IAC/C,OAAO,CAAC,UAAU,CAA2B;IAC7C,OAAO,CAAC,MAAM,CAA2B;;IAUzC,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAgC9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAqBjC"}
|
|
@@ -11,11 +11,11 @@ export var Category;
|
|
|
11
11
|
Category["Other"] = "New Aerial Photos";
|
|
12
12
|
})(Category || (Category = {}));
|
|
13
13
|
export const DefaultCategorySetting = {
|
|
14
|
-
[Category.Urban]: { minZoom: 14 },
|
|
15
|
-
[Category.Rural]: { minZoom: 13 },
|
|
16
|
-
[Category.Satellite]: { minZoom: 5 },
|
|
17
|
-
[Category.Event]: {
|
|
18
|
-
[Category.Other]: {
|
|
14
|
+
[Category.Urban]: { minZoom: 14, individual: false },
|
|
15
|
+
[Category.Rural]: { minZoom: 13, individual: false },
|
|
16
|
+
[Category.Satellite]: { minZoom: 5, individual: false },
|
|
17
|
+
[Category.Event]: { individual: true },
|
|
18
|
+
[Category.Other]: { individual: true },
|
|
19
19
|
};
|
|
20
20
|
export function parseCategory(category) {
|
|
21
21
|
const c = category.toLocaleLowerCase();
|
|
@@ -56,9 +56,9 @@ export class CommandCogPullRequest extends CommandLineAction {
|
|
|
56
56
|
defaultValue: 'linz/basemaps-config',
|
|
57
57
|
required: false,
|
|
58
58
|
});
|
|
59
|
-
this.
|
|
60
|
-
parameterLongName: '--
|
|
61
|
-
description: '
|
|
59
|
+
this.individual = this.defineFlagParameter({
|
|
60
|
+
parameterLongName: '--individual',
|
|
61
|
+
description: 'Import imagery as individual layer in basemaps.',
|
|
62
62
|
required: false,
|
|
63
63
|
});
|
|
64
64
|
this.vector = this.defineFlagParameter({
|
|
@@ -87,12 +87,10 @@ export class CommandCogPullRequest extends CommandLineAction {
|
|
|
87
87
|
//Make sure the imagery name is standardized before update the config
|
|
88
88
|
layer.name = standardizeLayerName(layer.name);
|
|
89
89
|
const git = new MakeCogGithub(layer.name, repo, logger);
|
|
90
|
-
if (this.disabled.value)
|
|
91
|
-
layer.disabled = true;
|
|
92
90
|
if (this.vector.value)
|
|
93
91
|
await git.updateVectorTileSet('topographic', layer);
|
|
94
92
|
else
|
|
95
|
-
await git.updateRasterTileSet('aerial', layer, category);
|
|
93
|
+
await git.updateRasterTileSet('aerial', layer, category, this.individual.value);
|
|
96
94
|
}
|
|
97
95
|
}
|
|
98
96
|
//# sourceMappingURL=action.make.cog.pr.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.make.cog.pr.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.pr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AACrH,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,MAAM,CAAN,IAAY,QAMX;AAND,WAAY,QAAQ;IAClB,yCAA6B,CAAA;IAC7B,yCAA6B,CAAA;IAC7B,2CAA+B,CAAA;IAC/B,2BAAe,CAAA;IACf,uCAA2B,CAAA;AAC7B,CAAC,EANW,QAAQ,KAAR,QAAQ,QAMnB;AAOD,MAAM,CAAC,MAAM,sBAAsB,GAAsC;IACvE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"action.make.cog.pr.js","sourceRoot":"","sources":["../../../src/cli/cogify/action.make.cog.pr.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BaseConfig, BasemapsConfigProvider, ConfigProviderMemory } from '@basemaps/config';
|
|
1
|
+
import { BaseConfig, BasemapsConfigProvider, ConfigLayer, ConfigProviderMemory } from '@basemaps/config';
|
|
2
2
|
import { TileMatrixSet } from '@basemaps/geo';
|
|
3
3
|
import { CommandLineAction } from '@rushstack/ts-command-line';
|
|
4
4
|
import { CogStacJob } from '../../cog/cog.stac.job.js';
|
|
@@ -18,7 +18,36 @@ export declare class CommandImport extends CommandLineAction {
|
|
|
18
18
|
protected onDefineParameters(): void;
|
|
19
19
|
onExecute(): Promise<void>;
|
|
20
20
|
update(config: BaseConfig, commit: boolean): void;
|
|
21
|
-
|
|
21
|
+
/**
|
|
22
|
+
* This function prepare for the markdown lines with preview urls for new inserted config layers
|
|
23
|
+
* @param mem new config data read from config bundle file
|
|
24
|
+
* @param layer new config tileset layer
|
|
25
|
+
* @param inserts string array to save all the lines for markdown output
|
|
26
|
+
* @param aerial output preview link for aerial map
|
|
27
|
+
*/
|
|
28
|
+
outputNewLayers(mem: ConfigProviderMemory, layer: ConfigLayer, inserts: string[], aerial?: boolean): Promise<void>;
|
|
29
|
+
/**
|
|
30
|
+
* This function compared new config tileset layer with existing one, then output the markdown lines for updates and preview urls.
|
|
31
|
+
* @param mem new config data read from config bundle file
|
|
32
|
+
* @param layer new config tileset layer
|
|
33
|
+
* @param existing existing config tileset layer
|
|
34
|
+
* @param updates string array to save all the lines for markdown output
|
|
35
|
+
* @param aerial output preview link for aerial map
|
|
36
|
+
*/
|
|
37
|
+
outputUpdatedLayers(mem: ConfigProviderMemory, layer: ConfigLayer, existing: ConfigLayer, updates: string[], aerial?: boolean): Promise<void>;
|
|
38
|
+
/**
|
|
39
|
+
* This function compared new config with existing and output a markdown document to highlight the inserts and changes
|
|
40
|
+
* Changes includes
|
|
41
|
+
* - aerial config
|
|
42
|
+
* - vector config
|
|
43
|
+
* - vector style
|
|
44
|
+
* - individual config
|
|
45
|
+
*
|
|
46
|
+
* @param output a string of output markdown location
|
|
47
|
+
* @param mem new config data read from config bundle file
|
|
48
|
+
* @param cfg existing config data
|
|
49
|
+
*/
|
|
50
|
+
outputChange(output: string, mem: ConfigProviderMemory, cfg: BasemapsConfigProvider): Promise<void>;
|
|
22
51
|
_jobs: Map<string, CogStacJob>;
|
|
23
52
|
_loadJob(path: string): Promise<CogStacJob>;
|
|
24
53
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.import.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,sBAAsB,
|
|
1
|
+
{"version":3,"file":"action.import.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,sBAAsB,EAItB,WAAW,EAEX,oBAAoB,EAGrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAA0C,aAAa,EAAE,MAAM,eAAe,CAAC;AAEtF,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAErH,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAQvD,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;IAE7B,iCAAiC;IACjC,OAAO,EAAE,MAAM,EAAE,CAAM;IAEvB,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;IAmBjD;;;;;;OAMG;IACG,eAAe,CACnB,GAAG,EAAE,oBAAoB,EACzB,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;;;;OAOG;IACG,mBAAmB,CACvB,GAAG,EAAE,oBAAoB,EACzB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC;IAgChB;;;;;;;;;;;OAWG;IACG,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2DzG,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;CAgB3C"}
|
|
@@ -131,10 +131,95 @@ export class CommandImport extends CommandLineAction {
|
|
|
131
131
|
});
|
|
132
132
|
this.promises.push(promise);
|
|
133
133
|
}
|
|
134
|
+
/**
|
|
135
|
+
* This function prepare for the markdown lines with preview urls for new inserted config layers
|
|
136
|
+
* @param mem new config data read from config bundle file
|
|
137
|
+
* @param layer new config tileset layer
|
|
138
|
+
* @param inserts string array to save all the lines for markdown output
|
|
139
|
+
* @param aerial output preview link for aerial map
|
|
140
|
+
*/
|
|
141
|
+
async outputNewLayers(mem, layer, inserts, aerial) {
|
|
142
|
+
inserts.push(`### ${layer.name}\n`);
|
|
143
|
+
if (layer[2193]) {
|
|
144
|
+
const urls = await this.prepareUrl(layer[2193], mem, Nztm2000QuadTms);
|
|
145
|
+
inserts.push(` - [NZTM2000Quad](${urls.layer})`);
|
|
146
|
+
if (aerial)
|
|
147
|
+
inserts.push(` -- [Aerial](${urls.tag})\n`);
|
|
148
|
+
else
|
|
149
|
+
inserts.push('\n');
|
|
150
|
+
}
|
|
151
|
+
if (layer[3857]) {
|
|
152
|
+
const urls = await this.prepareUrl(layer[3857], mem, GoogleTms);
|
|
153
|
+
inserts.push(` - [WebMercatorQuad](${urls.layer})`);
|
|
154
|
+
if (aerial)
|
|
155
|
+
inserts.push(` -- [Aerial](${urls.tag})\n`);
|
|
156
|
+
else
|
|
157
|
+
inserts.push('\n');
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
/**
|
|
161
|
+
* This function compared new config tileset layer with existing one, then output the markdown lines for updates and preview urls.
|
|
162
|
+
* @param mem new config data read from config bundle file
|
|
163
|
+
* @param layer new config tileset layer
|
|
164
|
+
* @param existing existing config tileset layer
|
|
165
|
+
* @param updates string array to save all the lines for markdown output
|
|
166
|
+
* @param aerial output preview link for aerial map
|
|
167
|
+
*/
|
|
168
|
+
async outputUpdatedLayers(mem, layer, existing, updates, aerial) {
|
|
169
|
+
let zoom = undefined;
|
|
170
|
+
if (layer.minZoom !== existing.minZoom || layer.maxZoom !== existing.maxZoom) {
|
|
171
|
+
zoom = ' - Zoom level updated.';
|
|
172
|
+
if (layer.minZoom !== existing.minZoom)
|
|
173
|
+
zoom += ` min zoom ${existing.minZoom} -> ${layer.minZoom}`;
|
|
174
|
+
if (layer.maxZoom !== existing.maxZoom)
|
|
175
|
+
zoom += ` max zoom ${existing.maxZoom} -> ${layer.maxZoom}`;
|
|
176
|
+
}
|
|
177
|
+
const change = [`### ${layer.name}\n`];
|
|
178
|
+
if (layer[2193]) {
|
|
179
|
+
const urls = await this.prepareUrl(layer[2193], mem, Nztm2000QuadTms);
|
|
180
|
+
if (layer[2193] !== existing[2193]) {
|
|
181
|
+
change.push(`- Layer update [NZTM2000Quad](${urls.layer})`);
|
|
182
|
+
if (aerial)
|
|
183
|
+
updates.push(` -- [Aerial](${urls.tag})\n`);
|
|
184
|
+
else
|
|
185
|
+
updates.push('\n');
|
|
186
|
+
}
|
|
187
|
+
if (zoom)
|
|
188
|
+
zoom += ` [NZTM2000Quad](${urls.tag})`;
|
|
189
|
+
}
|
|
190
|
+
if (layer[3857]) {
|
|
191
|
+
const urls = await this.prepareUrl(layer[3857], mem, GoogleTms);
|
|
192
|
+
if (layer[3857] !== existing[3857]) {
|
|
193
|
+
change.push(`- Layer update [WebMercatorQuad](${urls.layer})`);
|
|
194
|
+
if (aerial)
|
|
195
|
+
updates.push(` -- [Aerial](${urls.tag})\n`);
|
|
196
|
+
else
|
|
197
|
+
updates.push('\n');
|
|
198
|
+
}
|
|
199
|
+
if (zoom)
|
|
200
|
+
zoom += ` [WebMercatorQuad](${urls.tag})`;
|
|
201
|
+
}
|
|
202
|
+
if (zoom)
|
|
203
|
+
change.push(`${zoom}\n`);
|
|
204
|
+
if (change.length > 1)
|
|
205
|
+
updates.push(change.join(''));
|
|
206
|
+
}
|
|
207
|
+
/**
|
|
208
|
+
* This function compared new config with existing and output a markdown document to highlight the inserts and changes
|
|
209
|
+
* Changes includes
|
|
210
|
+
* - aerial config
|
|
211
|
+
* - vector config
|
|
212
|
+
* - vector style
|
|
213
|
+
* - individual config
|
|
214
|
+
*
|
|
215
|
+
* @param output a string of output markdown location
|
|
216
|
+
* @param mem new config data read from config bundle file
|
|
217
|
+
* @param cfg existing config data
|
|
218
|
+
*/
|
|
134
219
|
async outputChange(output, mem, cfg) {
|
|
135
220
|
// Output for aerial config changes
|
|
136
|
-
const inserts = ['#
|
|
137
|
-
const updates = ['# Updates\n'];
|
|
221
|
+
const inserts = ['# Aerial Config Inserts\n'];
|
|
222
|
+
const updates = ['# Aerial Config Updates\n'];
|
|
138
223
|
const aerialId = 'ts_aerial';
|
|
139
224
|
const newData = await mem.TileSet.get(aerialId);
|
|
140
225
|
const oldData = await cfg.TileSet.get(aerialId);
|
|
@@ -144,49 +229,28 @@ export class CommandImport extends CommandLineAction {
|
|
|
144
229
|
if (layer.name === 'chatham-islands_digital-globe_2014-2019_0-5m')
|
|
145
230
|
continue; // Ignore duplicated layer.
|
|
146
231
|
const existing = oldData.layers.find((l) => l.name === layer.name);
|
|
147
|
-
if (existing)
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
}
|
|
170
|
-
if (zoom)
|
|
171
|
-
zoom += ` [WebMercatorQuad](${urls.tag})`;
|
|
172
|
-
}
|
|
173
|
-
if (zoom)
|
|
174
|
-
change.push(`${zoom}\n`);
|
|
175
|
-
if (change.length > 1)
|
|
176
|
-
updates.push(change.join(''));
|
|
177
|
-
}
|
|
178
|
-
else {
|
|
179
|
-
// New layers
|
|
180
|
-
inserts.push(`### ${layer.name}\n`);
|
|
181
|
-
if (layer[2193]) {
|
|
182
|
-
const urls = await this.prepareUrl(layer[2193], mem, Nztm2000QuadTms);
|
|
183
|
-
inserts.push(` - [NZTM2000Quad](${urls.layer}) -- [Aerial](${urls.tag})\n`);
|
|
184
|
-
}
|
|
185
|
-
if (layer[3857]) {
|
|
186
|
-
const urls = await this.prepareUrl(layer[3857], mem, GoogleTms);
|
|
187
|
-
inserts.push(` - [WebMercatorQuad](${urls.layer}) -- [Aerial](${urls.tag})\n`);
|
|
188
|
-
}
|
|
189
|
-
}
|
|
232
|
+
if (existing)
|
|
233
|
+
await this.outputUpdatedLayers(mem, layer, existing, updates, true);
|
|
234
|
+
else
|
|
235
|
+
await this.outputNewLayers(mem, layer, inserts, true);
|
|
236
|
+
}
|
|
237
|
+
// Output for individual tileset config changes or inserts
|
|
238
|
+
const individualInserts = ['# Individual Layer Inserts\n'];
|
|
239
|
+
const individualUpdates = ['# Individual Layer Updates\n'];
|
|
240
|
+
for (const config of mem.objects.values()) {
|
|
241
|
+
if (!config.id.startsWith(ConfigPrefix.TileSet))
|
|
242
|
+
continue;
|
|
243
|
+
if (config.id === 'ts_aerial' || config.id === 'ts_topographic')
|
|
244
|
+
continue;
|
|
245
|
+
const tileSet = config;
|
|
246
|
+
if (tileSet.layers.length > 1)
|
|
247
|
+
continue; // Not an individual layer
|
|
248
|
+
const existing = await cfg.TileSet.get(config.id);
|
|
249
|
+
const layer = tileSet.layers[0];
|
|
250
|
+
if (existing)
|
|
251
|
+
await this.outputUpdatedLayers(mem, layer, existing.layers[0], individualUpdates);
|
|
252
|
+
else
|
|
253
|
+
await this.outputNewLayers(mem, layer, individualInserts);
|
|
190
254
|
}
|
|
191
255
|
// Output for vector config changes
|
|
192
256
|
const vectorUpdate = ['# Vector Data Update\n'];
|
|
@@ -207,6 +271,10 @@ export class CommandImport extends CommandLineAction {
|
|
|
207
271
|
md += inserts.join('');
|
|
208
272
|
if (updates.length > 1)
|
|
209
273
|
md += updates.join('');
|
|
274
|
+
if (individualInserts.length > 1)
|
|
275
|
+
md += individualInserts.join('');
|
|
276
|
+
if (individualUpdates.length > 1)
|
|
277
|
+
md += individualUpdates.join('');
|
|
210
278
|
if (vectorUpdate.length > 1)
|
|
211
279
|
md += vectorUpdate.join('');
|
|
212
280
|
if (styleUpdate.length > 1)
|
|
@@ -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,9 +1,13 @@
|
|
|
1
1
|
import { LogType } from '@basemaps/shared';
|
|
2
|
+
import { Api } from '@octokit/plugin-rest-endpoint-methods/dist-types/types.js';
|
|
2
3
|
export declare class Github {
|
|
3
4
|
repo: string;
|
|
5
|
+
org: string;
|
|
4
6
|
logger: LogType;
|
|
5
7
|
repoName: string;
|
|
8
|
+
octokit: Api;
|
|
6
9
|
constructor(repo: string, logger: LogType);
|
|
10
|
+
isOk: (s: number) => boolean;
|
|
7
11
|
/**
|
|
8
12
|
* Clone the repository
|
|
9
13
|
*
|
|
@@ -20,6 +24,11 @@ export declare class Github {
|
|
|
20
24
|
*
|
|
21
25
|
*/
|
|
22
26
|
configUser(): void;
|
|
27
|
+
/**
|
|
28
|
+
* Commit the changes to current branch
|
|
29
|
+
*
|
|
30
|
+
*/
|
|
31
|
+
add(paths: string[]): void;
|
|
23
32
|
/**
|
|
24
33
|
* Commit the changes to current branch
|
|
25
34
|
*
|
|
@@ -30,5 +39,11 @@ export declare class Github {
|
|
|
30
39
|
*
|
|
31
40
|
*/
|
|
32
41
|
push(): void;
|
|
42
|
+
/**
|
|
43
|
+
* Create pull request
|
|
44
|
+
* This needs to use github API to create Pull request by access token.
|
|
45
|
+
*
|
|
46
|
+
*/
|
|
47
|
+
createPullRequests(branch: string, title: string, draft: boolean): Promise<number>;
|
|
33
48
|
}
|
|
34
49
|
//# sourceMappingURL=github.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../../src/cli/github/github.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAGhD,qBAAa,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../../src/cli/github/github.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAGhD,OAAO,EAAE,GAAG,EAAE,MAAM,2DAA2D,CAAC;AAGhF,qBAAa,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;gBAED,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;IAazC,IAAI,MAAO,MAAM,KAAG,OAAO,CAAyB;IAEpD;;;OAGG;IACH,KAAK,IAAI,IAAI;IAMb;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAajC;;;OAGG;IACH,UAAU,IAAI,IAAI;IASlB;;;OAGG;IACH,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAO1B;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAK7B;;;OAGG;IACH,IAAI,IAAI,IAAI;IAKZ;;;;OAIG;IACG,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAczF"}
|
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
import { Env } from '@basemaps/shared';
|
|
2
2
|
import { execFileSync } from 'child_process';
|
|
3
|
+
import { Octokit } from '@octokit/core';
|
|
4
|
+
import { restEndpointMethods } from '@octokit/plugin-rest-endpoint-methods';
|
|
3
5
|
export class Github {
|
|
4
6
|
constructor(repo, logger) {
|
|
7
|
+
this.isOk = (s) => s >= 200 && s <= 299;
|
|
5
8
|
this.repo = repo;
|
|
6
9
|
this.logger = logger;
|
|
7
10
|
const [org, repoName] = repo.split('/');
|
|
8
11
|
if (org == null || repoName == null)
|
|
9
12
|
throw new Error(`Badly formatted repo name: ${repo}`);
|
|
13
|
+
this.org = org;
|
|
10
14
|
this.repoName = repoName;
|
|
15
|
+
const token = Env.get(Env.GitHubToken);
|
|
16
|
+
if (token == null)
|
|
17
|
+
throw new Error('Please set up github token environment variable.');
|
|
18
|
+
this.octokit = restEndpointMethods(new Octokit({ auth: token }));
|
|
11
19
|
}
|
|
12
20
|
/**
|
|
13
21
|
* Clone the repository
|
|
@@ -49,6 +57,16 @@ export class Github {
|
|
|
49
57
|
this.logger.info({ repository: this.repo }, 'GitHub: Config User Name');
|
|
50
58
|
execFileSync('git', ['config', 'user.name', name], { cwd: this.repoName }).toString().trim();
|
|
51
59
|
}
|
|
60
|
+
/**
|
|
61
|
+
* Commit the changes to current branch
|
|
62
|
+
*
|
|
63
|
+
*/
|
|
64
|
+
add(paths) {
|
|
65
|
+
this.logger.info({ repository: this.repo }, 'GitHub: Add Path');
|
|
66
|
+
for (const path of paths) {
|
|
67
|
+
execFileSync('git', ['add', path], { cwd: this.repoName }).toString().trim();
|
|
68
|
+
}
|
|
69
|
+
}
|
|
52
70
|
/**
|
|
53
71
|
* Commit the changes to current branch
|
|
54
72
|
*
|
|
@@ -65,5 +83,25 @@ export class Github {
|
|
|
65
83
|
this.logger.info({ repository: this.repo }, 'GitHub: Push');
|
|
66
84
|
execFileSync('git', ['push', 'origin', 'HEAD'], { cwd: this.repoName }).toString().trim();
|
|
67
85
|
}
|
|
86
|
+
/**
|
|
87
|
+
* Create pull request
|
|
88
|
+
* This needs to use github API to create Pull request by access token.
|
|
89
|
+
*
|
|
90
|
+
*/
|
|
91
|
+
async createPullRequests(branch, title, draft) {
|
|
92
|
+
// Create pull request from the give head
|
|
93
|
+
const response = await this.octokit.rest.pulls.create({
|
|
94
|
+
owner: this.org,
|
|
95
|
+
repo: this.repoName,
|
|
96
|
+
title,
|
|
97
|
+
head: branch,
|
|
98
|
+
base: 'master',
|
|
99
|
+
draft,
|
|
100
|
+
});
|
|
101
|
+
if (!this.isOk(response.status))
|
|
102
|
+
throw new Error('Failed to create pull request.');
|
|
103
|
+
this.logger.info({ branch, url: response.data.html_url }, 'GitHub: Create Pull Request');
|
|
104
|
+
return response.data.number;
|
|
105
|
+
}
|
|
68
106
|
}
|
|
69
107
|
//# sourceMappingURL=github.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../src/cli/github/github.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAW,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../src/cli/github/github.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,23 @@
|
|
|
1
|
-
import { ConfigLayer,
|
|
1
|
+
import { ConfigLayer, ConfigTileSetRaster, ConfigTileSetVector } from '@basemaps/config';
|
|
2
2
|
import { LogType } from '@basemaps/shared';
|
|
3
3
|
import { Category } from '../cogify/action.make.cog.pr.js';
|
|
4
4
|
import { Github } from './github.js';
|
|
5
5
|
export declare class MakeCogGithub extends Github {
|
|
6
6
|
imagery: string;
|
|
7
|
+
_formatInstalled: boolean;
|
|
7
8
|
constructor(imagery: string, repo: string, logger: LogType);
|
|
8
|
-
|
|
9
|
+
/**
|
|
10
|
+
* Install the dependencies for the cloned repo
|
|
11
|
+
*/
|
|
12
|
+
npmInstall(): boolean;
|
|
13
|
+
/**
|
|
14
|
+
* Format the config files by prettier
|
|
15
|
+
*/
|
|
16
|
+
formatConfigFile(path?: string): void;
|
|
9
17
|
/**
|
|
10
18
|
* Prepare and create pull request for the aerial tileset config
|
|
11
19
|
*/
|
|
12
|
-
updateRasterTileSet(filename: string, layer: ConfigLayer, category: Category): Promise<void>;
|
|
20
|
+
updateRasterTileSet(filename: string, layer: ConfigLayer, category: Category, individual: boolean): Promise<void>;
|
|
13
21
|
/**
|
|
14
22
|
* Set the default setting for the category
|
|
15
23
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make.cog.pr.d.ts","sourceRoot":"","sources":["../../../src/cli/github/make.cog.pr.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"make.cog.pr.d.ts","sourceRoot":"","sources":["../../../src/cli/github/make.cog.pr.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EAEX,mBAAmB,EACnB,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAO,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAA0B,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,qBAAa,aAAc,SAAQ,MAAM;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,UAAS;gBACb,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;IAK1D;;OAEG;IACH,UAAU,IAAI,OAAO;IAMrB;;OAEG;IACH,gBAAgB,CAAC,IAAI,SAAc,GAAG,IAAI;IAM1C;;OAEG;IACG,mBAAmB,CACvB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,IAAI,CAAC;IA4ChB;;OAEG;IACH,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,GAAG,WAAW;IAOrE;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,GAAG,mBAAmB;IAYnG;;OAEG;IACG,0BAA0B,CAC9B,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAgC3C;;OAEG;IACG,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B9E;;OAEG;IACG,0BAA0B,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAUjH"}
|
|
@@ -1,45 +1,75 @@
|
|
|
1
|
+
import { ConfigId, ConfigPrefix, TileSetType, } from '@basemaps/config';
|
|
1
2
|
import { fsa } from '@basemaps/shared';
|
|
2
3
|
import { Category, DefaultCategorySetting } from '../cogify/action.make.cog.pr.js';
|
|
3
4
|
import { Github } from './github.js';
|
|
4
|
-
import
|
|
5
|
+
import { execFileSync } from 'child_process';
|
|
5
6
|
export class MakeCogGithub extends Github {
|
|
6
7
|
constructor(imagery, repo, logger) {
|
|
7
8
|
super(repo, logger);
|
|
9
|
+
this._formatInstalled = false;
|
|
8
10
|
this.imagery = imagery;
|
|
9
11
|
}
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
12
|
+
/**
|
|
13
|
+
* Install the dependencies for the cloned repo
|
|
14
|
+
*/
|
|
15
|
+
npmInstall() {
|
|
16
|
+
this.logger.info({ repository: this.repo }, 'GitHub: Npm Install');
|
|
17
|
+
execFileSync('npm', ['install', '--include=dev'], { cwd: this.repoName });
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Format the config files by prettier
|
|
22
|
+
*/
|
|
23
|
+
formatConfigFile(path = './config/') {
|
|
24
|
+
if (!this._formatInstalled)
|
|
25
|
+
this._formatInstalled = this.npmInstall();
|
|
26
|
+
this.logger.info({ repository: this.repo }, 'GitHub: Prettier');
|
|
27
|
+
execFileSync('npx', ['prettier', '-w', path], { cwd: this.repoName });
|
|
20
28
|
}
|
|
21
29
|
/**
|
|
22
30
|
* Prepare and create pull request for the aerial tileset config
|
|
23
31
|
*/
|
|
24
|
-
async updateRasterTileSet(filename, layer, category) {
|
|
32
|
+
async updateRasterTileSet(filename, layer, category, individual) {
|
|
25
33
|
const branch = `feat/bot-config-raster-${this.imagery}`;
|
|
26
34
|
// Clone the basemaps-config repo and checkout branch
|
|
27
35
|
this.clone();
|
|
28
36
|
this.configUser();
|
|
29
37
|
this.getBranch(branch);
|
|
30
|
-
// Prepare new aerial tileset config
|
|
31
38
|
this.logger.info({ imagery: this.imagery }, 'GitHub: Get the master TileSet config file');
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
+
if (individual) {
|
|
40
|
+
// Prepare new standalone tileset config
|
|
41
|
+
const tileSet = {
|
|
42
|
+
type: TileSetType.Raster,
|
|
43
|
+
id: ConfigId.prefix(ConfigPrefix.TileSet, layer.name),
|
|
44
|
+
title: layer.title,
|
|
45
|
+
layers: [layer],
|
|
46
|
+
};
|
|
47
|
+
const tileSetPath = fsa.joinAll('config', 'tileset', 'individual', `${layer.name}.json`);
|
|
48
|
+
const fullPath = fsa.join(this.repoName, tileSetPath);
|
|
49
|
+
await fsa.write(fullPath, JSON.stringify(tileSet));
|
|
50
|
+
// Format the config file by prettier
|
|
51
|
+
this.formatConfigFile(tileSetPath);
|
|
52
|
+
this.add([tileSetPath]);
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
// Prepare new aerial tileset config
|
|
56
|
+
const tileSetPath = fsa.joinAll('config', 'tileset', `${filename}.json`);
|
|
57
|
+
const fullPath = fsa.join(this.repoName, tileSetPath);
|
|
58
|
+
const tileSet = await fsa.readJson(fullPath);
|
|
59
|
+
const newTileSet = await this.prepareRasterTileSetConfig(layer, tileSet, category);
|
|
60
|
+
// skip pull request if not an urban or rural imagery
|
|
61
|
+
if (newTileSet == null)
|
|
62
|
+
return;
|
|
63
|
+
await fsa.write(fullPath, JSON.stringify(newTileSet));
|
|
64
|
+
// Format the config file by prettier
|
|
65
|
+
this.formatConfigFile(tileSetPath);
|
|
66
|
+
this.add([tileSetPath]);
|
|
67
|
+
}
|
|
39
68
|
// Commit and push the changes
|
|
40
69
|
const message = `config(raster): Add imagery ${this.imagery} to ${filename} config file.`;
|
|
41
70
|
this.commit(message);
|
|
42
71
|
this.push();
|
|
72
|
+
await this.createPullRequests(branch, message, false);
|
|
43
73
|
}
|
|
44
74
|
/**
|
|
45
75
|
* Set the default setting for the category
|
|
@@ -47,12 +77,8 @@ export class MakeCogGithub extends Github {
|
|
|
47
77
|
setDefaultConfig(layer, category) {
|
|
48
78
|
layer.category = category;
|
|
49
79
|
const defaultSetting = DefaultCategorySetting[category];
|
|
50
|
-
if (defaultSetting)
|
|
51
|
-
|
|
52
|
-
layer.minZoom = defaultSetting.minZoom;
|
|
53
|
-
if (defaultSetting.minZoom != null && layer.minZoom != null)
|
|
54
|
-
layer.disabled = defaultSetting.disabled;
|
|
55
|
-
}
|
|
80
|
+
if (defaultSetting.minZoom != null && layer.minZoom != null)
|
|
81
|
+
layer.minZoom = defaultSetting.minZoom;
|
|
56
82
|
return layer;
|
|
57
83
|
}
|
|
58
84
|
/**
|
|
@@ -113,17 +139,22 @@ export class MakeCogGithub extends Github {
|
|
|
113
139
|
this.getBranch(branch);
|
|
114
140
|
// Prepare new aerial tileset config
|
|
115
141
|
this.logger.info({ imagery: this.imagery }, 'GitHub: Get the master TileSet config file');
|
|
116
|
-
const tileSetPath = fsa.joinAll(
|
|
117
|
-
const
|
|
142
|
+
const tileSetPath = fsa.joinAll('config', 'tileset', `${filename}.json`);
|
|
143
|
+
const fullPath = fsa.join(this.repoName, tileSetPath);
|
|
144
|
+
const tileSet = await fsa.readJson(fullPath);
|
|
118
145
|
const newTileSet = await this.prepareVectorTileSetConfig(layer, tileSet);
|
|
119
146
|
// skip pull request if not an urban or rural imagery
|
|
120
147
|
if (newTileSet == null)
|
|
121
148
|
return;
|
|
122
|
-
await fsa.write(
|
|
149
|
+
await fsa.write(fullPath, JSON.stringify(newTileSet));
|
|
150
|
+
// Format the config file by prettier
|
|
151
|
+
this.formatConfigFile(tileSetPath);
|
|
123
152
|
// Commit and push the changes
|
|
124
153
|
const message = `config(vector): Update the ${this.imagery} to ${filename} config file.`;
|
|
154
|
+
this.add([tileSetPath]);
|
|
125
155
|
this.commit(message);
|
|
126
156
|
this.push();
|
|
157
|
+
await this.createPullRequests(branch, message, false);
|
|
127
158
|
}
|
|
128
159
|
/**
|
|
129
160
|
* Prepare raster tileSet config json
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make.cog.pr.js","sourceRoot":"","sources":["../../../src/cli/github/make.cog.pr.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"make.cog.pr.js","sourceRoot":"","sources":["../../../src/cli/github/make.cog.pr.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@basemaps/cli",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.43.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -39,19 +39,19 @@
|
|
|
39
39
|
"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@basemaps/config": "^6.
|
|
43
|
-
"@basemaps/geo": "^6.
|
|
44
|
-
"@basemaps/server": "^6.
|
|
45
|
-
"@basemaps/shared": "^6.
|
|
42
|
+
"@basemaps/config": "^6.43.0",
|
|
43
|
+
"@basemaps/geo": "^6.43.0",
|
|
44
|
+
"@basemaps/server": "^6.43.0",
|
|
45
|
+
"@basemaps/shared": "^6.43.0",
|
|
46
46
|
"@basemaps/sprites": "^6.41.0",
|
|
47
|
-
"@basemaps/tiler": "^6.
|
|
48
|
-
"@basemaps/tiler-sharp": "^6.
|
|
47
|
+
"@basemaps/tiler": "^6.43.0",
|
|
48
|
+
"@basemaps/tiler-sharp": "^6.43.0",
|
|
49
49
|
"@chunkd/fs": "^10.0.2",
|
|
50
50
|
"@chunkd/source-aws-v2": "^9.3.1",
|
|
51
51
|
"@cogeotiff/core": "^7.2.0",
|
|
52
52
|
"@cotar/core": "^5.4.0",
|
|
53
53
|
"@cotar/tar": "^5.4.1",
|
|
54
|
-
"@linzjs/geojson": "^6.
|
|
54
|
+
"@linzjs/geojson": "^6.43.0",
|
|
55
55
|
"@octokit/core": "^4.0.5",
|
|
56
56
|
"@rushstack/ts-command-line": "^4.3.13",
|
|
57
57
|
"ansi-colors": "^4.1.1",
|
|
@@ -60,14 +60,12 @@
|
|
|
60
60
|
"get-port": "^6.1.2",
|
|
61
61
|
"node-fetch": "^3.2.3",
|
|
62
62
|
"p-limit": "^4.0.0",
|
|
63
|
-
"prettier": "^2.8.8",
|
|
64
63
|
"pretty-json-log": "^1.0.0",
|
|
65
64
|
"slugify": "^1.6.5",
|
|
66
65
|
"zod": "^3.17.3"
|
|
67
66
|
},
|
|
68
67
|
"devDependencies": {
|
|
69
68
|
"@types/deep-diff": "^1.0.1",
|
|
70
|
-
"@types/prettier": "^2.7.2",
|
|
71
69
|
"@types/proj4": "^2.5.2",
|
|
72
70
|
"@types/sharp": "^0.31.0"
|
|
73
71
|
},
|
|
@@ -77,5 +75,5 @@
|
|
|
77
75
|
"files": [
|
|
78
76
|
"build/"
|
|
79
77
|
],
|
|
80
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "628865a32130147eb893b027a7fd78b749a589f1"
|
|
81
79
|
}
|