@basemaps/cli 6.30.0 → 6.31.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 CHANGED
@@ -3,6 +3,25 @@
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.31.0](https://github.com/linz/basemaps/compare/v6.30.0...v6.31.0) (2022-07-22)
7
+
8
+
9
+ ### Bug Fixes
10
+
11
+ * **cli:** do not use built in fetch ([#2341](https://github.com/linz/basemaps/issues/2341)) ([415b877](https://github.com/linz/basemaps/commit/415b877767561bcc2462652e36bead2bc82617ea))
12
+
13
+
14
+ ### Features
15
+
16
+ * upgrade proj to 2.8.0 as it has improved transverse mercator projection logic BM-631 ([#2346](https://github.com/linz/basemaps/issues/2346)) ([4b74efb](https://github.com/linz/basemaps/commit/4b74efb07f69ceeaea9351d8e8012bc214c7614c))
17
+ * **cli:** Import config will update the latest ConfigBundle dynamo record. ([#2338](https://github.com/linz/basemaps/issues/2338)) ([25e864c](https://github.com/linz/basemaps/commit/25e864cb767af08bbe1d3df245666c2b6e8ecb44))
18
+ * **config:** Insert a config bundle records in dynamodb to refference the config file in s3. ([#2335](https://github.com/linz/basemaps/issues/2335)) ([143eeda](https://github.com/linz/basemaps/commit/143eeda69ab6eb6de70c7aed0247b6333ebb5bdf))
19
+ * **config:** use base58 hashes ([#2342](https://github.com/linz/basemaps/issues/2342)) ([8688351](https://github.com/linz/basemaps/commit/8688351834b0e00827024b25709d790d96522cb9))
20
+
21
+
22
+
23
+
24
+
6
25
  # [6.30.0](https://github.com/linz/basemaps/compare/v6.29.0...v6.30.0) (2022-07-20)
7
26
 
8
27
 
@@ -2,6 +2,8 @@
2
2
  import { CommandLineAction, CommandLineStringParameter } from '@rushstack/ts-command-line';
3
3
  import { CotarIndexOptions } from '@cotar/core';
4
4
  import { LogType } from '@basemaps/shared';
5
+ import { Readable } from 'stream';
6
+ export declare function hashFile(stream: Readable): Promise<string>;
5
7
  export declare class CommandBundleAssets extends CommandLineAction {
6
8
  assets: CommandLineStringParameter;
7
9
  output: CommandLineStringParameter;
@@ -1 +1 @@
1
- {"version":3,"file":"action.bundle.assets.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.bundle.assets.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAE3F,OAAO,EAAuC,iBAAiB,EAAa,MAAM,aAAa,CAAC;AAChG,OAAO,EAAa,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAStD,qBAAa,mBAAoB,SAAQ,iBAAiB;IACxD,MAAM,EAAE,0BAA0B,CAAC;IACnC,MAAM,EAAE,0BAA0B,CAAC;;IAUnC,SAAS,CAAC,kBAAkB,IAAI,IAAI;cAcpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAapC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBzE,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAmB3E,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAarH"}
1
+ {"version":3,"file":"action.bundle.assets.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.bundle.assets.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAE3F,OAAO,EAAuC,iBAAiB,EAAa,MAAM,aAAa,CAAC;AAChG,OAAO,EAAa,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAKtD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAOlC,wBAAsB,QAAQ,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAOhE;AAED,qBAAa,mBAAoB,SAAQ,iBAAiB;IACxD,MAAM,EAAE,0BAA0B,CAAC;IACnC,MAAM,EAAE,0BAA0B,CAAC;;IAUnC,SAAS,CAAC,kBAAkB,IAAI,IAAI;cAcpB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBpC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBzE,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAmB3E,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAarH"}
@@ -2,12 +2,22 @@ import { CommandLineAction } from '@rushstack/ts-command-line';
2
2
  import { SourceMemory } from '@chunkd/core';
3
3
  import { CotarIndexBinary, CotarIndexBuilder, TarReader } from '@cotar/core';
4
4
  import { LogConfig } from '@basemaps/shared';
5
- import { promises as fs } from 'fs';
5
+ import { createReadStream, promises as fs } from 'fs';
6
6
  import { TarBuilder } from '@cotar/tar';
7
7
  import { fsa } from '@chunkd/fs';
8
8
  import * as path from 'path';
9
+ import { createHash } from 'crypto';
10
+ import { base58 } from '@basemaps/config';
9
11
  const Packing = 25; // Packing factor for the hash map
10
12
  const MaxSearch = 50; // Max search factor
13
+ export async function hashFile(stream) {
14
+ return new Promise((resolve, reject) => {
15
+ const hash = createHash('sha256');
16
+ stream.on('data', (chunk) => hash.update(chunk));
17
+ stream.on('end', () => resolve(base58.encode(hash.digest())));
18
+ stream.on('error', (err) => reject(err));
19
+ });
20
+ }
11
21
  export class CommandBundleAssets extends CommandLineAction {
12
22
  constructor() {
13
23
  super({
@@ -39,7 +49,9 @@ export class CommandBundleAssets extends CommandLineAction {
39
49
  logger.info({ indput: assets }, 'BundleAssets:Start');
40
50
  const tarFile = await this.buildTar(assets, output, logger);
41
51
  const cotarFile = await this.buildTarCo(tarFile, output, logger);
42
- logger.info({ output: cotarFile }, 'BundleAssets:Finish');
52
+ const cotarHash = await hashFile(createReadStream(cotarFile));
53
+ await fs.rename(cotarFile, cotarFile.replace('.tar.co', `-${cotarHash}.tar.co`));
54
+ logger.info({ output: cotarFile, hash: cotarHash }, 'BundleAssets:Finish');
43
55
  }
44
56
  async buildTar(input, output, logger) {
45
57
  const startTime = Date.now();
@@ -1 +1 @@
1
- {"version":3,"file":"action.bundle.assets.js","sourceRoot":"","sources":["../../../src/cli/config/action.bundle.assets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"action.bundle.assets.js","sourceRoot":"","sources":["../../../src/cli/config/action.bundle.assets.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"action.import.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAiB,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAIrH,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA2B;IAEzC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAM;IAClC,4DAA4D;IAC5D,aAAa,EAAE,MAAM,EAAE,CAAM;IAC7B,4DAA4D;IAC5D,YAAY,EAAE,oBAAoB,CAA8B;;IAUhE,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAmB9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA+ChC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;CAiBlD"}
1
+ {"version":3,"file":"action.import.d.ts","sourceRoot":"","sources":["../../../src/cli/config/action.import.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAuC,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AAKrH,qBAAa,aAAc,SAAQ,iBAAiB;IAClD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,MAAM,CAA2B;IAEzC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAM;IAClC,4DAA4D;IAC5D,aAAa,EAAE,MAAM,EAAE,CAAM;IAC7B,4DAA4D;IAC5D,YAAY,EAAE,oBAAoB,CAA8B;;IAUhE,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAmB9B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoEhC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI;CAiBlD"}
@@ -1,8 +1,9 @@
1
1
  import { Env, fsa, LogConfig } from '@basemaps/shared';
2
- import { ConfigProviderMemory } from '@basemaps/config';
2
+ import { Config, ConfigProviderMemory } from '@basemaps/config';
3
3
  import { CommandLineAction } from '@rushstack/ts-command-line';
4
4
  import { Q, Updater } from './config.update.js';
5
5
  import { invalidateCache } from '../util.js';
6
+ import fetch from 'node-fetch';
6
7
  export class CommandImport extends CommandLineAction {
7
8
  constructor() {
8
9
  super({
@@ -20,7 +21,7 @@ export class CommandImport extends CommandLineAction {
20
21
  this.config = this.defineStringParameter({
21
22
  argumentName: 'CONFIG',
22
23
  parameterLongName: '--config',
23
- description: 'Path of config json',
24
+ description: 'Path of config json, this can be both a local path or s3 location',
24
25
  required: true,
25
26
  });
26
27
  this.backup = this.defineStringParameter({
@@ -43,6 +44,9 @@ export class CommandImport extends CommandLineAction {
43
44
  const backup = this.backup.value;
44
45
  if (config == null)
45
46
  throw new Error('Please provide a config json');
47
+ if (commit && !config.startsWith('s3://')) {
48
+ throw new Error('To actually import into dynamo has to use the config file from s3.');
49
+ }
46
50
  const HostPrefix = Env.isProduction() ? '' : 'dev.';
47
51
  const healthEndpoint = `https://${HostPrefix}basemaps.linz.govt.nz/v1/health`;
48
52
  logger.info({ url: healthEndpoint }, 'Import:ValidateHealth');
@@ -59,6 +63,22 @@ export class CommandImport extends CommandLineAction {
59
63
  for (const config of mem.objects.values())
60
64
  this.update(config, commit);
61
65
  await Promise.all(this.promises);
66
+ if (commit) {
67
+ const configBundle = {
68
+ id: Config.ConfigBundle.id(configJson.hash),
69
+ name: Config.ConfigBundle.id(`config-${configJson.hash}.json`),
70
+ path: config,
71
+ hash: configJson.hash,
72
+ };
73
+ logger.info({ config }, 'Import:ConfigBundle');
74
+ if (Config.ConfigBundle.isWriteable()) {
75
+ // Insert a cb_hash record for reference
76
+ await Config.ConfigBundle.put(configBundle);
77
+ // Update the cb_latest record
78
+ configBundle.id = Config.ConfigBundle.id('latest');
79
+ await Config.ConfigBundle.put(configBundle);
80
+ }
81
+ }
62
82
  if (commit && this.invalidations.length > 0) {
63
83
  // Lots of invalidations just invalidate everything
64
84
  if (this.invalidations.length > 10) {
@@ -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":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAc,MAAM,EAA+B,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAwD,MAAM,4BAA4B,CAAC;AACrH,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IAWlD;QACE,KAAK,CAAC;YACJ,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,oCAAoC;YAC7C,aAAa,EAAE,gEAAgE;SAChF,CAAC,CAAC;QAXL,aAAQ,GAAuB,EAAE,CAAC;QAClC,4DAA4D;QAC5D,kBAAa,GAAa,EAAE,CAAC;QAC7B,4DAA4D;QAC5D,iBAAY,GAAyB,IAAI,oBAAoB,EAAE,CAAC;IAQhE,CAAC;IAES,kBAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,mEAAmE;YAChF,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC;YACvC,YAAY,EAAE,QAAQ;YACtB,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,iDAAiD;SAC/D,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC;YACrC,iBAAiB,EAAE,UAAU;YAC7B,WAAW,EAAE,2BAA2B;YACxC,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;;QACb,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC;QAC/B,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC;QACvB,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,KAAK,mCAAI,KAAK,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QACjC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QACjC,IAAI,MAAM,IAAI,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACpE,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;YACzC,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;SACvF;QAED,MAAM,UAAU,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QACpD,MAAM,cAAc,GAAG,WAAW,UAAU,iCAAiC,CAAC;QAE9E,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,uBAAuB,CAAC,CAAC;QAC9D,IAAI,MAAM,EAAE;YACV,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,CAAC;YACxC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACrE;QAED,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,aAAa,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAgB,MAAM,CAAC,CAAC;QAC7D,MAAM,GAAG,GAAG,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACtD,GAAG,CAAC,qBAAqB,EAAE,CAAC;QAE5B,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,CAAC;QACxC,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE;YAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACvE,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEjC,IAAI,MAAM,EAAE;YACV,MAAM,YAAY,GAAiB;gBACjC,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC3C,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,UAAU,UAAU,CAAC,IAAI,OAAO,CAAC;gBAC9D,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,UAAU,CAAC,IAAI;aACtB,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC;YAE/C,IAAI,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE;gBACrC,wCAAwC;gBACxC,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC5C,8BAA8B;gBAC9B,YAAY,CAAC,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;gBACnD,MAAM,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;aAC7C;SACF;QAED,IAAI,MAAM,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3C,mDAAmD;YACnD,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,EAAE,EAAE;gBAClC,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aACrC;iBAAM;gBACL,MAAM,eAAe,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;aACnD;YAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;YAE1D,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,CAAC;YACxC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;SACvD;QAED,IAAI,MAAM,EAAE;YACV,MAAM,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;SACzD;QAED,IAAI,MAAM,KAAK,IAAI;YAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,MAAkB,EAAE,MAAe;QACxC,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,IAAsB,EAAE;YAC7C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAE5C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC;YAC7C,IAAI,UAAU,EAAE;gBACd,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;gBAClD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;gBAC3C,IAAI,OAAO,IAAI,IAAI;oBAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,oDAAoD;aAC1G;iBAAM;gBACL,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;aAC/B;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;CACF"}
@@ -78,12 +78,8 @@ o.spec('CogJob', () => {
78
78
  rel: 'sourceImagery',
79
79
  type: 'application/json',
80
80
  });
81
- o(round(stac.extent, 4)).deepEquals({
82
- spatial: { bbox: [[169.3341, -51.8754, -146.1432, -32.8952]] },
83
- temporal: {
84
- interval: [['2020-01-01T00:00:00.000', '2020-08-08T19:18:23.456Z']],
85
- },
86
- });
81
+ o(round(stac.extent.spatial.bbox, 4)).deepEquals([[169.3347, -51.868, -145.9143, -32.8496]]);
82
+ o(stac.extent.temporal).deepEquals({ interval: [['2020-01-01T00:00:00.000', '2020-08-08T19:18:23.456Z']] });
87
83
  });
88
84
  o('no source collection.json', async () => {
89
85
  const startNow = Date.now();
@@ -96,49 +92,40 @@ o.spec('CogJob', () => {
96
92
  cutlinePoly: [],
97
93
  });
98
94
  const afterNow = Date.now();
99
- o(job.json).equals(mockFs.jsStore[jobPath + '/job.json']);
100
- o(round(job.json, 4)).deepEquals({
101
- id: 'jobid1',
102
- name: 'auckland_rural_2010-2012_0-50m',
103
- title: 'Auckland rural 2010-2012 0.50m',
104
- description: 'No description',
105
- source: {
106
- gsd: 0.075,
107
- epsg: 2193,
108
- files: [
109
- {
110
- x: 1347679.1521,
111
- y: 5301577.5257,
112
- width: 1277913.1519,
113
- height: 201072.6389,
114
- name: 'ring0',
115
- },
116
- {
117
- x: 4728764.4861,
118
- y: 4246465.1768,
119
- width: 838463.4123,
120
- height: 610363.6056,
121
- name: 'ring1',
122
- },
123
- ],
124
- location: { type: 's3', path: 's3://source-bucket/path' },
125
- },
126
- output: {
127
- gsd: 0.0373,
128
- epsg: 3857,
129
- tileMatrix: 'WebMercatorQuad',
130
- files: [{ name: '0-0-0', x: 1, y: 2, width: 2, height: 3 }],
131
- location: { type: 's3', path: 's3://target-bucket/path' },
132
- resampling: { warp: 'bilinear', overview: 'lanczos' },
133
- quality: 90,
134
- cutline: { blend: 20, href: 's3://curline-bucket/path' },
135
- addAlpha: true,
136
- nodata: 0,
137
- bounds: { x: 1, y: 2, width: 2, height: 3 },
138
- oneCogCovering: true,
139
- },
140
- processingId: undefined,
95
+ const jobJson = round(job.json, 4);
96
+ o(jobJson).deepEquals(round(mockFs.jsStore[jobPath + '/job.json'], 4));
97
+ o(jobJson.id).equals('jobid1');
98
+ o(jobJson.name).equals('auckland_rural_2010-2012_0-50m');
99
+ o(jobJson.title).equals('Auckland rural 2010-2012 0.50m');
100
+ o(jobJson.description).equals('No description');
101
+ o(jobJson.source.gsd).equals(0.075);
102
+ o(jobJson.source.epsg).equals(2193);
103
+ o(jobJson.source.files[0]).deepEquals({
104
+ x: 1347679.1521,
105
+ y: 5301577.5262,
106
+ width: 1277913.1293,
107
+ height: 201072.641,
108
+ name: 'ring0',
109
+ });
110
+ o(jobJson.source.files[1]).deepEquals({
111
+ x: 4728648.2332,
112
+ y: 4247288.7253,
113
+ width: 837784.3351,
114
+ height: 609622.9622,
115
+ name: 'ring1',
141
116
  });
117
+ o(jobJson.source.location).deepEquals({ type: 's3', path: 's3://source-bucket/path' });
118
+ o(jobJson.output.gsd).equals(0.0373);
119
+ o(jobJson.output.epsg).equals(3857);
120
+ o(jobJson.output.tileMatrix).equals('WebMercatorQuad');
121
+ o(jobJson.output.files).deepEquals([{ name: '0-0-0', x: 1, y: 2, width: 2, height: 3 }]);
122
+ o(jobJson.output.location).deepEquals({ type: 's3', path: 's3://target-bucket/path' });
123
+ o(jobJson.output.resampling).deepEquals({ warp: 'bilinear', overview: 'lanczos' });
124
+ o(jobJson.output.quality).equals(90);
125
+ o(jobJson.output.cutline).deepEquals({ blend: 20, href: 's3://curline-bucket/path' });
126
+ o(jobJson.output.addAlpha).equals(true);
127
+ o(jobJson.output.nodata).equals(0);
128
+ o(jobJson.output.bounds).deepEquals({ x: 1, y: 2, width: 2, height: 3 });
142
129
  o(job.id).equals(id);
143
130
  o(job.source.gsd).equals(0.075);
144
131
  o(round(job.output.gsd, 4)).equals(0.0373);
@@ -150,63 +137,35 @@ o.spec('CogJob', () => {
150
137
  o(startNow <= jobNow && jobNow <= afterNow).equals(true);
151
138
  // split so that scripts/detect.unlinked.dep.js does not think it is an import
152
139
  o(generated.package).equals('@' + 'basemaps/cli');
153
- const exp = {
154
- id: 'jobid1',
155
- title: 'Auckland rural 2010-2012 0.50m',
156
- description: 'No description',
157
- stac_version: Stac.Version,
158
- stac_extensions: [Stac.BaseMapsExtension],
159
- extent: {
160
- spatial: { bbox: [[169.3341, -51.8754, -146.1432, -32.8952]] },
161
- temporal: { interval: [['2010-01-01T00:00:00Z', '2011-01-01T00:00:00Z']] },
162
- },
163
- license: Stac.License,
164
- keywords: ['Imagery', 'New Zealand'],
165
- providers: [],
166
- summaries: {
167
- gsd: [0.075],
168
- 'proj:epsg': [3857],
169
- 'linz:output': [
170
- {
171
- resampling: { warp: 'bilinear', overview: 'lanczos' },
172
- quality: 90,
173
- cutlineBlend: 20,
174
- addAlpha: true,
175
- nodata: 0,
176
- },
177
- ],
178
- 'linz:generated': [generated],
179
- },
180
- links: [
181
- {
182
- href: 's3://target-bucket/path/collection.json',
183
- type: 'application/json',
184
- rel: 'self',
185
- },
186
- {
187
- href: 'job.json',
188
- type: 'application/json',
189
- rel: 'linz.basemaps.job',
190
- },
191
- {
192
- href: 'cutline.geojson.gz',
193
- type: 'application/geo+json+gzip',
194
- rel: 'linz.basemaps.cutline',
195
- },
140
+ o(stac.id).equals(job.id);
141
+ o(stac.extent.spatial.bbox).deepEquals([[169.3347, -51.868, -145.9143, -32.8496]]);
142
+ o(stac.extent.temporal).deepEquals({ interval: [['2010-01-01T00:00:00Z', '2011-01-01T00:00:00Z']] });
143
+ o(stac.stac_version).equals(Stac.Version);
144
+ o(stac.stac_extensions).deepEquals([Stac.BaseMapsExtension]);
145
+ o(stac.license).deepEquals(Stac.License);
146
+ o(stac.keywords).deepEquals(['Imagery', 'New Zealand']);
147
+ o(stac.summaries).deepEquals({
148
+ gsd: [0.075],
149
+ 'proj:epsg': [3857],
150
+ 'linz:output': [
196
151
  {
197
- href: 'covering.geojson',
198
- type: 'application/geo+json',
199
- rel: 'linz.basemaps.covering',
152
+ resampling: { warp: 'bilinear', overview: 'lanczos' },
153
+ quality: 90,
154
+ cutlineBlend: 20,
155
+ addAlpha: true,
156
+ nodata: 0,
200
157
  },
201
- {
202
- href: 'source.geojson',
203
- type: 'application/geo+json',
204
- rel: 'linz.basemaps.source',
205
- },
206
- { href: '0-0-0.json', type: 'application/geo+json', rel: 'item' },
207
158
  ],
208
- };
209
- o(stac).deepEquals(exp);
159
+ 'linz:generated': [generated],
160
+ });
161
+ o(stac.links).deepEquals([
162
+ { href: 's3://target-bucket/path/collection.json', type: 'application/json', rel: 'self' },
163
+ { href: 'job.json', type: 'application/json', rel: 'linz.basemaps.job' },
164
+ { href: 'cutline.geojson.gz', type: 'application/geo+json+gzip', rel: 'linz.basemaps.cutline' },
165
+ { href: 'covering.geojson', type: 'application/geo+json', rel: 'linz.basemaps.covering' },
166
+ { href: 'source.geojson', type: 'application/geo+json', rel: 'linz.basemaps.source' },
167
+ { href: '0-0-0.json', type: 'application/geo+json', rel: 'item' },
168
+ ]);
210
169
  o(round(mockFs.jsStore[jobPath + '/cutline.geojson.gz'], 4)).deepEquals({
211
170
  type: 'FeatureCollection',
212
171
  features: [
@@ -280,55 +239,53 @@ o.spec('CogJob', () => {
280
239
  },
281
240
  ],
282
241
  });
283
- o(round(mockFs.jsStore[jobPath + '/source.geojson'], 4)).deepEquals({
284
- type: 'FeatureCollection',
285
- features: [
286
- {
287
- type: 'Feature',
288
- geometry: {
289
- type: 'MultiPolygon',
290
- coordinates: [
291
- [
292
- [
293
- [169.9343, -42.3971],
294
- [180, -42.2199],
295
- [180, -40.4109],
296
- [170.0185, -40.5885],
297
- [169.9343, -42.3971],
298
- ],
299
- ],
300
- [
301
- [
302
- [-180, -42.2199],
303
- [-174.6708, -41.7706],
304
- [-175, -40],
305
- [-180, -40.4109],
306
- [-180, -42.2199],
307
- ],
308
- ],
242
+ const sourceGeoJson = mockFs.jsStore[jobPath + '/source.geojson'];
243
+ o(sourceGeoJson.type).equals('FeatureCollection');
244
+ o(sourceGeoJson.features.length).equals(2);
245
+ o(round(sourceGeoJson.features[0], 4)).deepEquals({
246
+ type: 'Feature',
247
+ geometry: {
248
+ type: 'MultiPolygon',
249
+ coordinates: [
250
+ [
251
+ [
252
+ [169.9343, -42.3971],
253
+ [180, -42.2199],
254
+ [180, -40.4109],
255
+ [170.0185, -40.5885],
256
+ [169.9343, -42.3971],
309
257
  ],
310
- },
311
- properties: { name: 'ring0' },
312
- bbox: [169.9343, -42.3971, -175, -40],
313
- },
314
- {
315
- type: 'Feature',
316
- geometry: {
317
- type: 'Polygon',
318
- coordinates: [
319
- [
320
- [-147.7182, -44.5617],
321
- [-150.6057, -40.2044],
322
- [-143.8327, -37.2693],
323
- [-142.0209, -41.3698],
324
- [-147.7182, -44.5617],
325
- ],
258
+ ],
259
+ [
260
+ [
261
+ [-180, -42.2199],
262
+ [-174.6708, -41.7706],
263
+ [-175, -40],
264
+ [-180, -40.4109],
265
+ [-180, -42.2199],
326
266
  ],
327
- },
328
- properties: { name: 'ring1' },
329
- bbox: [-147.7182, -44.5617, -143.8327, -37.2693],
330
- },
331
- ],
267
+ ],
268
+ ],
269
+ },
270
+ properties: { name: 'ring0' },
271
+ bbox: [169.9343, -42.3971, -175, -40],
272
+ });
273
+ o(round(sourceGeoJson.features[1], 4)).deepEquals({
274
+ type: 'Feature',
275
+ geometry: {
276
+ type: 'Polygon',
277
+ coordinates: [
278
+ [
279
+ [-147.4403, -44.5167],
280
+ [-150.5162, -40.1908],
281
+ [-143.1693, -37.1443],
282
+ [-140, -41],
283
+ [-147.4403, -44.5167],
284
+ ],
285
+ ],
286
+ },
287
+ properties: { name: 'ring1' },
288
+ bbox: [-147.4403, -44.5167, -143.1693, -37.1443],
332
289
  });
333
290
  });
334
291
  o('should create with no tileMatrix', () => {
@@ -1 +1 @@
1
- {"version":3,"file":"cog.stac.job.test.js","sourceRoot":"","sources":["../../../src/cog/__tests__/cog.stac.job.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cog.stac.job.test.js","sourceRoot":"","sources":["../../../src/cog/__tests__/cog.stac.job.test.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.30.0",
3
+ "version": "6.31.0",
4
4
  "private": false,
5
5
  "repository": {
6
6
  "type": "git",
@@ -38,10 +38,10 @@
38
38
  "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
39
39
  },
40
40
  "dependencies": {
41
- "@basemaps/config": "^6.30.0",
42
- "@basemaps/geo": "^6.28.1",
43
- "@basemaps/server": "^6.30.0",
44
- "@basemaps/shared": "^6.30.0",
41
+ "@basemaps/config": "^6.31.0",
42
+ "@basemaps/geo": "^6.31.0",
43
+ "@basemaps/server": "^6.31.0",
44
+ "@basemaps/shared": "^6.31.0",
45
45
  "@basemaps/sprites": "^6.30.0",
46
46
  "@chunkd/fs": "^8.4.0",
47
47
  "@cogeotiff/core": "^7.0.0",
@@ -61,7 +61,7 @@
61
61
  "devDependencies": {
62
62
  "@types/deep-diff": "^1.0.1",
63
63
  "@types/geojson": "^7946.0.7",
64
- "@types/proj4": "^2.5.0"
64
+ "@types/proj4": "^2.5.2"
65
65
  },
66
66
  "publishConfig": {
67
67
  "access": "public"
@@ -69,5 +69,5 @@
69
69
  "files": [
70
70
  "build/"
71
71
  ],
72
- "gitHead": "c4858d318fd769e086a11e8b2a8f052b54964aab"
72
+ "gitHead": "2ab942c2a8cd82b94b20c2ad616042ea2fc38518"
73
73
  }