@basemaps/cli 6.27.0 → 6.29.0

package/build/cli/screenshot/action.screenshot.js

@@ -0,0 +1,121 @@
+import { Config, Env, fsa, LogConfig } from '@basemaps/shared';
+import { mkdir } from 'fs/promises';
+import { chromium } from 'playwright';
+import { CommandLineAction } from '@rushstack/ts-command-line';
+import { z } from 'zod';
+import getPort from 'get-port';
+import { createServer } from '@basemaps/server';
+import { ConfigProviderMemory } from '@basemaps/config';
+export const DefaultTestTiles = './test-tiles/default.test.tiles.json';
+export const DefaultHost = 'basemaps.linz.govt.nz';
+var TileMatrixIdentifier;
+(function (TileMatrixIdentifier) {
+    TileMatrixIdentifier["Nztm2000Quad"] = "NZTM2000Quad";
+    TileMatrixIdentifier["Google"] = "WebMercatorQuad";
+})(TileMatrixIdentifier || (TileMatrixIdentifier = {}));
+const zLocation = z.object({
+    lat: z.number().gte(-90).lte(90),
+    lng: z.number().gte(-180).lte(180),
+    z: z.number().gte(0).lte(32),
+});
+const zTileTest = z.object({
+    name: z.string(),
+    tileMatrix: z.nativeEnum(TileMatrixIdentifier),
+    location: zLocation,
+    tileSet: z.string(),
+    style: z.string().optional(),
+});
+export class CommandScreenShot extends CommandLineAction {
+    constructor() {
+        super({
+            actionName: 'screenshot',
+            summary: 'dump screenshots of from LINZ Basemaps',
+            documentation: 'Dump screenshots with selected tile sets',
+        });
+    }
+    onDefineParameters() {
+        this.config = this.defineStringParameter({
+            argumentName: 'CONFIG',
+            parameterLongName: '--config',
+            description: 'Path of config bundle file, could be both local file or s3.',
+        });
+        this.host = this.defineStringParameter({
+            argumentName: 'HOST',
+            parameterLongName: '--host',
+            description: 'Host to use',
+            defaultValue: DefaultHost,
+        });
+        this.tiles = this.defineStringParameter({
+            argumentName: 'TILES',
+            parameterLongName: '--tiles',
+            description: 'JSON file path for the test tiles',
+            defaultValue: DefaultTestTiles,
+        });
+    }
+    async onExecute() {
+        var _a, _b, _c;
+        const logger = LogConfig.get();
+        const config = this.config.value;
+        let host = (_a = this.host.value) !== null && _a !== void 0 ? _a : DefaultHost;
+        const tiles = (_b = this.tiles.value) !== null && _b !== void 0 ? _b : DefaultTestTiles;
+        let BasemapsServer = undefined;
+        if (config != null) {
+            const port = await getPort();
+            host = (_c = Env.get(Env.PublicUrlBase)) !== null && _c !== void 0 ? _c : `http://localhost:${port}`;
+            // Force a default url base so WMTS requests know their relative url
+            process.env[Env.PublicUrlBase] = host;
+            BasemapsServer = await startServer(port, config, logger);
+            logger.info({ url: host }, 'Server:Started');
+        }
+        logger.info('Page:Launch');
+        const chrome = await chromium.launch();
+        try {
+            await takeScreenshots(host, tiles, chrome, logger);
+        }
+        finally {
+            await chrome.close();
+            if (BasemapsServer != null)
+                await BasemapsServer.close();
+        }
+    }
+}
+export async function takeScreenshots(host, tiles, chrome, logger) {
+    const TestTiles = await fsa.readJson(tiles);
+    for (const test of TestTiles) {
+        const page = await chrome.newPage();
+        const searchParam = new URLSearchParams();
+        searchParam.set('p', test.tileMatrix);
+        searchParam.set('i', test.tileSet);
+        if (test.style)
+            searchParam.set('s', test.style);
+        const loc = `@${test.location.lat},${test.location.lng},z${test.location.z}`;
+        const fileName = '.artifacts/visual-snapshots/' + test.name + '.png';
+        await mkdir(`.artifacts/visual-snapshots/`, { recursive: true });
+        let url = `${host}/?${searchParam.toString()}&debug=true&debug.screenshot=true#${loc}`;
+        if (!url.startsWith('http'))
+            url = `https://${url}`;
+        logger.info({ url, expected: fileName }, 'Page:Load');
+        await page.goto(url);
+        try {
+            await page.waitForSelector('div#map-loaded', { state: 'attached' });
+            await page.waitForTimeout(1000);
+            await page.waitForLoadState('networkidle');
+            await page.screenshot({ path: fileName });
+        }
+        catch (e) {
+            await page.screenshot({ path: fileName });
+            throw e;
+        }
+        logger.info({ url, expected: fileName }, 'Page:Load:Done');
+        await page.close();
+    }
+}
+async function startServer(port, config, logger) {
+    // Bundle Config
+    const configJson = await fsa.readJson(config);
+    const mem = ConfigProviderMemory.fromJson(configJson);
+    Config.setConfigProvider(mem);
+    // Start server
+    const server = createServer(logger);
+    return await new Promise((resolve) => server.listen(port, '0.0.0.0', () => resolve(server)));
+}

package/build/cli/util.js

@@ -2,7 +2,7 @@ import { Env, fsa, LogConfig, Projection } from '@basemaps/shared';
 import CloudFormation from 'aws-sdk/clients/cloudformation.js';
 import CloudFront from 'aws-sdk/clients/cloudfront.js';
 import S3 from 'aws-sdk/clients/s3.js';
-import { CliId } from './base.cli.js';
+import { CliId } from '@basemaps/shared/build/cli/base.js';
 import crypto from 'crypto';
 import path from 'path';
 import { gzip } from 'zlib';

package/build/cog/__tests__/builder.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"builder.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__tests__/builder.test.ts"],"names":[],"mappings":""}

package/build/cog/__tests__/cog.stac.job.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cog.stac.job.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__tests__/cog.stac.job.test.ts"],"names":[],"mappings":""}

package/build/cog/{__test__ → __tests__}/cog.stac.job.test.js

@@ -1,6 +1,6 @@
 import { Bounds, Epsg, EpsgCode, GoogleTms, Nztm2000Tms, Stac } from '@basemaps/geo';
 import { Projection } from '@basemaps/shared';
-import { mockFileOperator } from '@basemaps/shared/build/file/__test__/file.operator.test.helper.js';
+import { mockFileOperator } from '@basemaps/shared/build/file/__tests__/file.operator.test.helper.js';
 import { round } from '@basemaps/test/build/rounding.js';
 import o from 'ospec';
 import { CogStacJob } from '../cog.stac.job.js';

package/build/cog/__tests__/cog.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cog.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__tests__/cog.test.ts"],"names":[],"mappings":""}

package/build/cog/__tests__/cog.vrt.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cog.vrt.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__tests__/cog.vrt.test.ts"],"names":[],"mappings":""}

package/build/cog/{__test__ → __tests__}/cog.vrt.test.js

@@ -1,6 +1,6 @@
 import { EpsgCode, GoogleTms, Nztm2000Tms } from '@basemaps/geo';
 import { fsa, LogConfig } from '@basemaps/shared';
-import { qkToName } from '@basemaps/shared/build/proj/__test__/test.util.js';
+import { qkToName } from '@basemaps/shared/build/proj/__tests__/test.util.js';
 import { round } from '@basemaps/test/build/rounding.js';
 import o from 'ospec';
 import path from 'path';

package/build/cog/__tests__/cutline.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cutline.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__tests__/cutline.test.ts"],"names":[],"mappings":""}

package/build/cog/{__test__ → __tests__}/cutline.test.js

@@ -1,5 +1,5 @@
 import { Bounds, EpsgCode, GoogleTms, Nztm2000Tms } from '@basemaps/geo';
-import { qkToName } from '@basemaps/shared/build/proj/__test__/test.util.js';
+import { qkToName } from '@basemaps/shared/build/proj/__tests__/test.util.js';
 import { round } from '@basemaps/test/build/rounding.js';
 import o from 'ospec';
 import path from 'path';
@@ -8,6 +8,7 @@ import { Cutline, polyContainsBounds } from '../cutline.js';
 import { SourceTiffTestHelper } from './source.tiff.testhelper.js';
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 o.spec('cutline', () => {
+    o.specTimeout(1000);
     const testDir = `${__dirname}/../../../__test.assets__`;
     o.spec('filterSourcesForName', () => {
         o('fully within same projection', async () => {

package/build/cog/__tests__/projection.loader.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"projection.loader.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__tests__/projection.loader.test.ts"],"names":[],"mappings":""}

package/build/cog/__tests__/source.tiff.testhelper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source.tiff.testhelper.d.ts","sourceRoot":"","sources":["../../../src/cog/__tests__/source.tiff.testhelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,WAAW,EAAa,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,eAAO,MAAM,oBAAoB;kBACjB,UAAU;mCAgBW,WAAW,EAAE;+BAmBrB,WAAW,EAAE,GAAG,MAAM,EAAE;CAGpD,CAAC"}

package/build/cog/cog.stac.job.js

@@ -1,7 +1,7 @@
 import { Bounds, Stac, TileMatrixSets, } from '@basemaps/geo';
 import { extractYearRangeFromName, Projection, fsa, titleizeImageryName, CompositeError, } from '@basemaps/shared';
 import { toFeatureCollection, toFeatureMultiPolygon } from '@linzjs/geojson';
-import { CliInfo } from '../cli/base.cli.js';
+import { CliInfo } from '@basemaps/shared/build/cli/base.js';
 import { GdalCogBuilderDefaults } from '../gdal/gdal.config.js';
 import { ProjectionLoader } from './projection.loader.js';
 import { CogStacItemExtensions, CogStacKeywords } from './stac.js';

package/build/cog/job.factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"job.factory.d.ts","sourceRoot":"","sources":["../../src/cog/job.factory.ts"],"names":[],"mappings":"AAKA,OAAO,EAAc,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAGpC,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAOxC,eAAO,MAAM,aAAa;IACxB;;OAEG;gBACe,kBAAkB,GAAG,QAAQ,MAAM,CAAC;CA4FvD,CAAC"}
+{"version":3,"file":"job.factory.d.ts","sourceRoot":"","sources":["../../src/cog/job.factory.ts"],"names":[],"mappings":"AAKA,OAAO,EAAc,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAGpC,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAiBxC,eAAO,MAAM,aAAa;IACxB;;OAEG;gBACe,kBAAkB,GAAG,QAAQ,MAAM,CAAC;CA0FvD,CAAC"}

package/build/cog/job.factory.js

@@ -11,6 +11,16 @@ function filterTiff(a) {
     const lowerA = a.toLowerCase();
     return lowerA.endsWith('.tiff') || lowerA.endsWith('.tif');
 }
+/** Group a file list by its zoom */
+function groupFiles(files) {
+    var _a;
+    const fileCounts = {};
+    for (const f of files) {
+        const zoom = f.name.split('-')[0];
+        fileCounts[zoom] = ((_a = fileCounts[zoom]) !== null && _a !== void 0 ? _a : 0) + 1;
+    }
+    return fileCounts;
+}
 export const CogJobFactory = {
     /**
      * Create a COG Job and potentially submit it to AWS Batch for processing
@@ -55,11 +65,9 @@ export const CogJobFactory = {
             ...metadata,
             tileMatrix: ctx.tileMatrix.identifier,
             bounds: undefined,
+            files: undefined,
             fileCount: files.length,
-            files: metadata.files
-                .map((r) => r.name)
-                .sort()
-                .join(' '),
+            fileGroups: groupFiles(metadata.files),
         }, 'CoveringGenerated');
         let addAlpha = true;
         // -addalpha to vrt adds extra alpha layers even if one already exist

package/build/gdal/__tests__/gdal.progress.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gdal.progress.test.d.ts","sourceRoot":"","sources":["../../../src/gdal/__tests__/gdal.progress.test.ts"],"names":[],"mappings":""}

package/build/gdal/__tests__/gdal.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gdal.test.d.ts","sourceRoot":"","sources":["../../../src/gdal/__tests__/gdal.test.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/cli",
-  "version": "6.27.0",
+  "version": "6.29.0",
   "private": false,
   "repository": {
     "type": "git",
@@ -16,7 +16,7 @@
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "bin": {
-    "cogify": "./cogify.js"
+    "bmc": "./bmc.js"
   },
   "scripts": {
     "build": "tsc",
@@ -25,9 +25,10 @@
   },
   "bundle": [
     {
-      "entry": "src/cli/cogify/index.ts",
-      "outdir": "dist/",
+      "entry": "src/cli/bin.ts",
+      "outfile": "dist/index.cjs",
       "external": [
+        "sharp",
         "pino-pretty"
       ]
     }
@@ -37,20 +38,25 @@
     "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
   },
   "dependencies": {
-    "@basemaps/config": "^6.27.0",
-    "@basemaps/geo": "^6.26.0",
-    "@basemaps/shared": "^6.27.0",
-    "@chunkd/fs": "^8.1.0",
+    "@basemaps/config": "^6.29.0",
+    "@basemaps/geo": "^6.28.1",
+    "@basemaps/server": "^6.29.0",
+    "@basemaps/shared": "^6.29.0",
+    "@chunkd/fs": "^8.4.0",
     "@cogeotiff/core": "^7.0.0",
-    "@linzjs/geojson": "^6.21.1",
+    "@linzjs/geojson": "^6.28.1",
     "@rushstack/ts-command-line": "^4.3.13",
     "ansi-colors": "^4.1.1",
+    "deep-diff": "^1.0.2",
+    "get-port": "^6.1.2",
     "node-fetch": "^3.2.3",
     "p-limit": "^4.0.0",
+    "playwright": "^1.22.2",
     "pretty-json-log": "^1.0.0",
-    "zod": "^3.2.0"
+    "zod": "^3.17.3"
   },
   "devDependencies": {
+    "@types/deep-diff": "^1.0.1",
     "@types/geojson": "^7946.0.7",
     "@types/proj4": "^2.5.0"
   },
@@ -60,5 +66,5 @@
   "files": [
     "build/"
   ],
-  "gitHead": "c6aa61c20503cbc7f04cf31927f4e2b95aed34cb"
+  "gitHead": "9097d2f045d734d0d5acd968f026fe29ab6afcda"
 }

package/build/cli/cogify/__test__/batch.job.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"batch.job.test.d.ts","sourceRoot":"","sources":["../../../../src/cli/cogify/__test__/batch.job.test.ts"],"names":[],"mappings":""}

package/build/cli/cogify/__test__/semver.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"semver.test.d.ts","sourceRoot":"","sources":["../../../../src/cli/cogify/__test__/semver.test.ts"],"names":[],"mappings":""}

package/build/cli/cogify/index.d.ts

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-import 'source-map-support/register.js';
-import { BaseCommandLine } from '../base.cli.js';
-export declare class CogifyCommandLine extends BaseCommandLine {
-    constructor();
-}
-//# sourceMappingURL=index.d.ts.map

package/build/cli/cogify/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/cogify/index.ts"],"names":[],"mappings":";AACA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAIjD,qBAAa,iBAAkB,SAAQ,eAAe;;CASrD"}

package/build/cli/cogify/index.js

@@ -1,16 +0,0 @@
-#!/usr/bin/env node
-import 'source-map-support/register.js';
-import { BaseCommandLine } from '../base.cli.js';
-import { ActionCogCreate } from './action.cog.js';
-import { ActionJobCreate } from './action.job.js';
-export class CogifyCommandLine extends BaseCommandLine {
-    constructor() {
-        super({
-            toolFilename: 'cogify',
-            toolDescription: 'Cloud optimized geotiff utilities',
-        });
-        this.addAction(new ActionCogCreate());
-        this.addAction(new ActionJobCreate());
-    }
-}
-new CogifyCommandLine().run();

package/build/cog/__test__/builder.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"builder.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__test__/builder.test.ts"],"names":[],"mappings":""}

package/build/cog/__test__/cog.stac.job.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cog.stac.job.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__test__/cog.stac.job.test.ts"],"names":[],"mappings":""}

package/build/cog/__test__/cog.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cog.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__test__/cog.test.ts"],"names":[],"mappings":""}

package/build/cog/__test__/cog.vrt.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cog.vrt.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__test__/cog.vrt.test.ts"],"names":[],"mappings":""}

package/build/cog/__test__/cutline.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cutline.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__test__/cutline.test.ts"],"names":[],"mappings":""}

package/build/cog/__test__/projection.loader.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"projection.loader.test.d.ts","sourceRoot":"","sources":["../../../src/cog/__test__/projection.loader.test.ts"],"names":[],"mappings":""}

package/build/cog/__test__/source.tiff.testhelper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"source.tiff.testhelper.d.ts","sourceRoot":"","sources":["../../../src/cog/__test__/source.tiff.testhelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,WAAW,EAAa,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,eAAO,MAAM,oBAAoB;kBACjB,UAAU;mCAgBW,WAAW,EAAE;+BAmBrB,WAAW,EAAE,GAAG,MAAM,EAAE;CAGpD,CAAC"}

package/build/gdal/__test__/gdal.progress.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"gdal.progress.test.d.ts","sourceRoot":"","sources":["../../../src/gdal/__test__/gdal.progress.test.ts"],"names":[],"mappings":""}

package/build/gdal/__test__/gdal.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"gdal.test.d.ts","sourceRoot":"","sources":["../../../src/gdal/__test__/gdal.test.ts"],"names":[],"mappings":""}

package/cogify.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-Error.stackTraceLimit = 100;
-import './build/cli/cogify/index.js';