@basemaps/cli 6.14.0 → 6.17.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.
Files changed (6) hide show
  1. package/CHANGELOG.md +38 -0
  2. package/build/cli/cogify/action.cog.d.ts.map +1 -1
  3. package/build/cli/cogify/action.cog.js +6 -8
  4. package/build/cog/builder.d.ts +2 -2
  5. package/build/cog/builder.d.ts.map +1 -1
  6. package/package.json +5 -5
package/CHANGELOG.md CHANGED
@@ -3,6 +3,44 @@
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.17.0](https://github.com/linz/basemaps/compare/v6.16.1...v6.17.0) (2021-12-05)
7
+
8
+ **Note:** Version bump only for package @basemaps/cli
9
+
10
+
11
+
12
+
13
+
14
+ ## [6.16.1](https://github.com/linz/basemaps/compare/v6.16.0...v6.16.1) (2021-11-30)
15
+
16
+ **Note:** Version bump only for package @basemaps/cli
17
+
18
+
19
+
20
+
21
+
22
+ # [6.16.0](https://github.com/linz/basemaps/compare/v6.15.0...v6.16.0) (2021-11-29)
23
+
24
+
25
+ ### Bug Fixes
26
+
27
+ * **lambda-tiler:** p-limit is a needed dependency ([#1998](https://github.com/linz/basemaps/issues/1998)) ([dfb1b25](https://github.com/linz/basemaps/commit/dfb1b2575e9b40b96ffa4bdcfa8f1496b18ae25e))
28
+
29
+
30
+
31
+
32
+
33
+ # [6.15.0](https://github.com/linz/basemaps/compare/v6.14.2...v6.15.0) (2021-11-28)
34
+
35
+
36
+ ### Bug Fixes
37
+
38
+ * **cli:** ensure all files from the job.json are created before logging JobComplete ([#1959](https://github.com/linz/basemaps/issues/1959)) ([78fd35a](https://github.com/linz/basemaps/commit/78fd35ad863c424069d79c8668e9e5b3195ccec9))
39
+
40
+
41
+
42
+
43
+
6
44
  # [6.14.0](https://github.com/linz/basemaps/compare/v6.13.0...v6.14.0) (2021-10-27)
7
45
 
8
46
 
package/build/cli/cogify/action.cog.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"action.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EACL,iBAAiB,EAIlB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAM5C,qBAAa,eAAgB,SAAQ,iBAAiB;IACpD,OAAO,CAAC,GAAG,CAAC,CAA6B;IACzC,OAAO,CAAC,IAAI,CAAC,CAA6B;IAC1C,OAAO,CAAC,MAAM,CAAC,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA8B;;IAU/C,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAgC7B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqEhC,2DAA2D;IACrD,cAAc,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBrE,SAAS,CAAC,kBAAkB,IAAI,IAAI;CA4BrC"}
1
+ {"version":3,"file":"action.cog.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/action.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EACL,iBAAiB,EAIlB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAM5C,qBAAa,eAAgB,SAAQ,iBAAiB;IACpD,OAAO,CAAC,GAAG,CAAC,CAA6B;IACzC,OAAO,CAAC,IAAI,CAAC,CAA6B;IAC1C,OAAO,CAAC,MAAM,CAAC,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA8B;;IAU/C,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAgC7B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqEhC,2DAA2D;IACrD,cAAc,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBrE,SAAS,CAAC,kBAAkB,IAAI,IAAI;CA4BrC"}
package/build/cli/cogify/action.cog.js CHANGED
@@ -107,23 +107,21 @@ export class ActionCogCreate extends CommandLineAction {
107
107
  async checkJobStatus(job, logger) {
108
108
  const basePath = job.getJobPath();
109
109
  const expectedTiffs = new Set();
110
+ const jobSize = job.output.files.length;
111
+ for (const file of job.output.files)
112
+ expectedTiffs.add(`${file.name}.tiff`);
110
113
  for await (const fileName of fsa.list(basePath)) {
111
114
  const basename = path.basename(fileName);
112
115
  // Look for tile tiffs only
113
116
  if (!basename.includes('-') || !basename.endsWith('.tiff'))
114
117
  continue;
115
- expectedTiffs.add(basename);
116
- }
117
- const jobSize = job.output.files.length;
118
- for (const file of job.output.files) {
119
- if (expectedTiffs.has(`${file.name}.tiff`))
120
- expectedTiffs.delete(`${file.name}.tiff`);
118
+ expectedTiffs.delete(basename);
121
119
  }
122
120
  if (expectedTiffs.size === 0) {
123
- logger.info({ tiffCount: jobSize }, 'CogCreate:JobComplete');
121
+ logger.info({ tiffCount: jobSize, tiffTotal: jobSize }, 'CogCreate:JobComplete');
124
122
  }
125
123
  else {
126
- logger.info({ tiffCount: jobSize, remainingTiff: expectedTiffs.size }, 'CogCreate:JobProgress');
124
+ logger.info({ tiffCount: jobSize, tiffRemaining: expectedTiffs.size }, 'CogCreate:JobProgress');
127
125
  }
128
126
  }
129
127
  onDefineParameters() {
package/build/cog/builder.d.ts CHANGED
@@ -2,7 +2,7 @@ import { Epsg, TileMatrixSet } from '@basemaps/geo';
2
2
  import { LogType } from '@basemaps/shared';
3
3
  import { ChunkSource } from '@chunkd/core';
4
4
  import { CogTiff } from '@cogeotiff/core';
5
- import pLimit from 'p-limit';
5
+ import { LimitFunction } from 'p-limit';
6
6
  import { Cutline } from './cutline.js';
7
7
  import { CogBuilderMetadata, SourceMetadata } from './types.js';
8
8
  export declare const InvalidProjectionCode = 32767;
@@ -20,7 +20,7 @@ export declare const CacheFolder = "./.cache";
20
20
  */
21
21
  export declare function guessProjection(wkt: string | null): Epsg | null;
22
22
  export declare class CogBuilder {
23
- q: pLimit.Limit;
23
+ q: LimitFunction;
24
24
  logger: LogType;
25
25
  targetTms: TileMatrixSet;
26
26
  srcProj?: Epsg;
package/build/cog/builder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/cog/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,IAAI,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAyC,OAAO,EAAc,MAAM,kBAAkB,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAuB,MAAM,iBAAiB,CAAC;AAG/D,OAAO,MAAM,MAAM,SAAS,CAAC;AAG7B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEhE,eAAO,MAAM,qBAAqB,QAAQ,CAAC;AAC3C,eAAO,MAAM,YAAY,OAAO,CAAC;AACjC,eAAO,MAAM,WAAW,aAAa,CAAC;AAEtC;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAO/D;AAED,qBAAa,UAAU;IACrB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,OAAO,CAAC,EAAE,IAAI,CAAC;IAGf,kBAAkB,cAAqB;IAEvC;;OAEG;gBACS,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI;IAO1F;;;OAGG;IACG,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAoF7D,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAuBnC;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI;IAaxC,wFAAwF;YAC1E,WAAW;IA2BzB;;;;OAIG;IACG,KAAK,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAWjF"}
1
+ {"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/cog/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,IAAI,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAyC,OAAO,EAAc,MAAM,kBAAkB,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAuB,MAAM,iBAAiB,CAAC;AAG/D,OAAe,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGhD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEhE,eAAO,MAAM,qBAAqB,QAAQ,CAAC;AAC3C,eAAO,MAAM,YAAY,OAAO,CAAC;AACjC,eAAO,MAAM,WAAW,aAAa,CAAC;AAEtC;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAO/D;AAED,qBAAa,UAAU;IACrB,CAAC,EAAE,aAAa,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,OAAO,CAAC,EAAE,IAAI,CAAC;IAGf,kBAAkB,cAAqB;IAEvC;;OAEG;gBACS,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI;IAO1F;;;OAGG;IACG,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAoF7D,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAuBnC;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI;IAaxC,wFAAwF;YAC1E,WAAW;IA2BzB;;;;OAIG;IACG,KAAK,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAWjF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@basemaps/cli",
3
- "version": "6.14.0",
3
+ "version": "6.17.0",
4
4
  "private": false,
5
5
  "repository": {
6
6
  "type": "git",
@@ -38,15 +38,15 @@
38
38
  "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
39
39
  },
40
40
  "dependencies": {
41
- "@basemaps/config": "^6.10.0",
41
+ "@basemaps/config": "^6.17.0",
42
42
  "@basemaps/geo": "^6.10.0",
43
- "@basemaps/shared": "^6.12.0",
43
+ "@basemaps/shared": "^6.17.0",
44
44
  "@chunkd/fs": "^7.3.1",
45
45
  "@cogeotiff/core": "^6.0.2",
46
46
  "@linzjs/geojson": "^6.10.0",
47
47
  "@rushstack/ts-command-line": "^4.3.13",
48
48
  "ansi-colors": "^4.1.1",
49
- "p-limit": "^3.0.1",
49
+ "p-limit": "^4.0.0",
50
50
  "pretty-json-log": "^1.0.0",
51
51
  "zod": "^3.2.0"
52
52
  },
@@ -60,5 +60,5 @@
60
60
  "files": [
61
61
  "build/"
62
62
  ],
63
- "gitHead": "320a55f85f5f64a5f9f89387cf7b4837984fe159"
63
+ "gitHead": "16850d66b32943f40900900c07b0cbc778e8c332"
64
64
  }