@basemaps/lambda-tiler 6.24.0 → 6.25.0

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.25.0](https://github.com/linz/basemaps/compare/v6.24.2...v6.25.0) (2022-05-11)
+
+
+### Features
+
+* **config:** serve tilejson 3.0.0 and allow raster imagery ([#2173](https://github.com/linz/basemaps/issues/2173)) ([29f5313](https://github.com/linz/basemaps/commit/29f53131e917fa0b3ce6f280e8f9e09f4fe6e957))
+* **lambda-tiler:** Import api for import imagery jobs. ([#2170](https://github.com/linz/basemaps/issues/2170)) ([76b6175](https://github.com/linz/basemaps/commit/76b6175930db2a04f24437c7a05e7a70f160f7cd))
+
+
+
+
+
+## [6.24.2](https://github.com/linz/basemaps/compare/v6.24.1...v6.24.2) (2022-04-20)
+
+
+### Bug Fixes
+
+* **lambda-tiler:** expose the name of the imagery set in attribution ([#2153](https://github.com/linz/basemaps/issues/2153)) ([65d22cb](https://github.com/linz/basemaps/commit/65d22cbbf805d704b0179581ac6b66e755d2ef8f))
+* **lambda-tiler:** missing tilesets should 404 not 500 ([#2149](https://github.com/linz/basemaps/issues/2149)) ([a3420bc](https://github.com/linz/basemaps/commit/a3420bcc956a7fc16e2b3867100bd5943fa13e73))
+
+
+
+
+
+## [6.24.1](https://github.com/linz/basemaps/compare/v6.24.0...v6.24.1) (2022-04-07)
+
+
+### Bug Fixes
+
+* **lambda-tiler:** do not destroy database config when serving style.json ([#2146](https://github.com/linz/basemaps/issues/2146)) ([a625efd](https://github.com/linz/basemaps/commit/a625efd9a5f94522c50925e764c95ddeb57de427))
+
+
+
+
+
 # [6.24.0](https://github.com/linz/basemaps/compare/v6.23.0...v6.24.0) (2022-04-05)
 
 

package/build/__test__/tile.cache.key.test.js

@@ -1,7 +1,6 @@
-import { GoogleTms, Nztm2000Tms } from '@basemaps/geo';
+import { GoogleTms, Nztm2000Tms, ImageFormat } from '@basemaps/geo';
 import { TileType } from '@basemaps/shared';
 import { TestTiff } from '@basemaps/test';
-import { ImageFormat } from '@basemaps/tiler';
 import o from 'ospec';
 import { TileEtag } from '../routes/tile.etag.js';
 o.spec('TileCacheKey', () => {
@@ -12,7 +11,7 @@ o.spec('TileCacheKey', () => {
         z: 0,
         tileMatrix: GoogleTms,
         name: 'foo',
-        ext: ImageFormat.PNG,
+        ext: ImageFormat.Png,
         type: TileType.Tile,
     };
     o.afterEach(() => {

package/build/__test__/tile.import.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=tile.import.test.d.ts.map

package/build/__test__/tile.import.test.d.ts.map

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

package/build/__test__/tile.import.test.js

@@ -0,0 +1,115 @@
+import { Nztm2000Tms } from '@basemaps/geo';
+import { Config, Env, fsa, LogConfig } from '@basemaps/shared';
+import o from 'ospec';
+import { createHash } from 'crypto';
+import sinon from 'sinon';
+import { LambdaAlbRequest } from '@linzjs/lambda';
+import { Import } from '../routes/import.js';
+import { CogJobFactory } from '@basemaps/cli';
+o.spec('Import', () => {
+    const sandbox = sinon.createSandbox();
+    const outputBucket = 'testOutputBucket';
+    const configBucket = 'testConfigBucket';
+    const origConfigBucket = process.env[Env.AwsRoleConfigBucket];
+    const origOutputBucket = process.env[Env.ImportImageryBucket];
+    o.beforeEach(() => {
+        process.env[Env.AwsRoleConfigBucket] = configBucket;
+        process.env[Env.ImportImageryBucket] = outputBucket;
+    });
+    o.afterEach(() => {
+        process.env[Env.AwsRoleConfigBucket] = origConfigBucket;
+        process.env[Env.ImportImageryBucket] = origOutputBucket;
+        sandbox.restore();
+    });
+    const tileMatrix = Nztm2000Tms;
+    const bucket = 'testSourceBucket';
+    const path = `s3://${bucket}/imagery/`;
+    const role = {
+        bucket,
+        accountId: '123456',
+        roleArn: 'arn:aws:iam::123456:role/read-role',
+    };
+    const files = [`${path}/1.tiff`, `${path}/2.tiff`];
+    async function* listFiles() {
+        for (const key in files)
+            yield files[key];
+    }
+    const ctx = {
+        override: {
+            projection: tileMatrix.projection,
+            resampling: {
+                warp: 'bilinear',
+                overview: 'lanczos',
+            },
+        },
+        outputLocation: { type: 's3', path: `s3://${outputBucket}` },
+        sourceLocation: { type: 's3', path: path, ...role, files: files },
+        batch: true,
+        tileMatrix,
+        oneCogCovering: false,
+    };
+    const id = createHash('sha256').update(JSON.stringify(ctx)).digest('base64');
+    const jobId = Config.ProcessingJob.id(id);
+    function getRequest(path, projection) {
+        return new LambdaAlbRequest({
+            requestContext: null,
+            httpMethod: 'get',
+            path: '/v1/tiles/import',
+            body: null,
+            isBase64Encoded: false,
+            queryStringParameters: { path: path, p: projection },
+        }, {}, LogConfig.get());
+    }
+    o('should return projection not found', async () => {
+        // Given ... wrong projection
+        const req = getRequest(path, '0000');
+        // When ... Then ...
+        const res = await Import(req);
+        o(res.body).equals('{"status":404,"message":"Target projection Not found"}');
+    });
+    o('should return Invalid s3 location', async () => {
+        // Given... wrong s3 path
+        const req = getRequest('s3::testbucket/', '2193');
+        // When ...Then ...
+        const res = await Import(req);
+        o(res.body).equals('{"status":500,"message":"Invalid s3 path"}');
+    });
+    o('should return Unable to access bucket', async () => {
+        // Given... different bucket have no access role
+        sandbox.stub(fsa, 'readJson').resolves({ buckets: [role] });
+        const req = getRequest(`s3://wrong-bucket/imagery/`, '2193');
+        // When ...Then ...
+        const res = await Import(req);
+        o(res.body).equals('{"status":500,"message":"Unable to Access the bucket"}');
+    });
+    o('should return Imagery not found', async () => {
+        // Given... none imagery find from bucket
+        sandbox.stub(fsa, 'readJson').resolves({ buckets: [role] });
+        sandbox.stub(fsa, 'list').callsFake(async function* () {
+            yield `${path}1.json`;
+        });
+        const req = getRequest(path, '2193');
+        // When ...Then ...
+        const res = await Import(req);
+        o(res.body).equals('{"status":404,"message":"Imagery Not Found"}');
+    });
+    o('should return 200 with existing import', async () => {
+        var _a;
+        // Given... different bucket have no access role
+        sandbox.stub(fsa, 'readJson').resolves({ buckets: [role] });
+        sandbox.stub(fsa, 'list').callsFake(listFiles);
+        sandbox.stub(CogJobFactory, 'create').resolves(undefined);
+        const jobConfig = {
+            id: jobId,
+            name: path,
+            status: 'complete',
+        };
+        sandbox.stub(Config.ProcessingJob, 'get').resolves(jobConfig);
+        const req = getRequest(path, '2193');
+        // When ...Then ...
+        const res = await Import(req);
+        o(res.status).equals(200);
+        const body = Buffer.from((_a = res.body) !== null && _a !== void 0 ? _a : '', 'base64').toString();
+        o(JSON.parse(body)).deepEquals(jobConfig);
+    });
+});

package/build/__test__/tile.set.cache.test.js

@@ -66,6 +66,15 @@ o.spec('TileSetCache', () => {
                 throw new Error('null subTileSetB');
             o(subTileSetB.title).equals('parent Tasman rural 2018-19 0.3m');
         });
+        o('should not throw if child does not exist', async () => {
+            TileSets.add(new TileSetRaster('aerial@head', GoogleTms));
+            const parentTileSet = await TileSets.get('aerial@head', GoogleTms);
+            if (parentTileSet == null || parentTileSet.type === TileSetType.Vector)
+                throw new Error('null parentTileSet');
+            parentTileSet.imagery = imgMap;
+            const subTileSet = await TileSets.get('aerial@head:fake', GoogleTms);
+            o(subTileSet).equals(null);
+        });
     });
     o.spec('loadTileSets', () => {
         o('load all', async () => {

package/build/__test__/tile.style.json.test.js

@@ -1,6 +1,6 @@
 import { Env } from '@basemaps/shared';
 import o from 'ospec';
-import { convertRelativeUrl } from '../routes/tile.style.json.js';
+import { convertRelativeUrl, convertStyleJson } from '../routes/tile.style.json.js';
 o.spec('TileStyleJson', () => {
     const host = 'https://tiles.test';
     let originalHost;
@@ -30,4 +30,50 @@ o.spec('TileStyleJson', () => {
     o('should not convert full urls', () => {
         o(convertRelativeUrl('https://foo.com/foo?bar=baz', 'abc')).equals('https://foo.com/foo?bar=baz');
     });
+    const baseStyleJson = {
+        version: 8,
+        id: 'style.id',
+        name: 'style.name',
+        sources: {
+            vector: { type: 'vector', url: '/v1/tiles/topographic/EPSG:3857/tile.json' },
+            raster: { type: 'raster', tiles: ['/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.webp'] },
+        },
+        layers: [],
+        metadata: {},
+        glyphs: '/v1/glyphs',
+        sprite: '/v1/sprites',
+    };
+    o('should not destroy the original configuration', () => {
+        const apiKey = 'abc123';
+        const converted = convertStyleJson(baseStyleJson, apiKey);
+        o(converted.sources.vector).deepEquals({
+            type: 'vector',
+            url: 'https://tiles.test/v1/tiles/topographic/EPSG:3857/tile.json?api=abc123',
+        });
+        o(converted.sources.raster).deepEquals({
+            type: 'raster',
+            tiles: ['https://tiles.test/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.webp?api=abc123'],
+        });
+        o(JSON.stringify(baseStyleJson).includes(apiKey)).equals(false);
+        const convertedB = convertStyleJson(baseStyleJson, '0x1234');
+        o(convertedB.sources.vector).deepEquals({
+            type: 'vector',
+            url: 'https://tiles.test/v1/tiles/topographic/EPSG:3857/tile.json?api=0x1234',
+        });
+        o(convertedB.sources.raster).deepEquals({
+            type: 'raster',
+            tiles: ['https://tiles.test/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.webp?api=0x1234'],
+        });
+        o(JSON.stringify(baseStyleJson).includes('0x1234')).equals(false);
+        o(JSON.stringify(baseStyleJson).includes(apiKey)).equals(false);
+        o(JSON.stringify(baseStyleJson).includes('?api=')).equals(false);
+    });
+    o('should convert relative glyphs and sprites', () => {
+        const apiKey = '0x9f9f';
+        const converted = convertStyleJson(baseStyleJson, apiKey);
+        o(converted.sprite).equals('https://tiles.test/v1/sprites');
+        o(converted.glyphs).equals('https://tiles.test/v1/glyphs');
+        o(JSON.stringify(baseStyleJson).includes(apiKey)).equals(false);
+        o(JSON.stringify(baseStyleJson).includes('?api=')).equals(false);
+    });
 });

package/build/__test__/xyz.test.js

@@ -1,4 +1,4 @@
-import { TileMatrixSets } from '@basemaps/geo';
+import { GoogleTms, Nztm2000QuadTms, TileMatrixSets } from '@basemaps/geo';
 import { Config, Env, LogConfig, VNodeParser } from '@basemaps/shared';
 import { round } from '@basemaps/test/build/rounding.js';
 import o from 'ospec';
@@ -7,7 +7,7 @@ import { handleRequest } from '../index.js';
 import { TileEtag } from '../routes/tile.etag.js';
 import { TileSets } from '../tile.set.cache.js';
 import { TileComposer } from '../tile.set.raster.js';
-import { FakeTileSet, mockRequest, Provider } from './xyz.util.js';
+import { FakeTileSet, FakeTileSetVector, mockRequest, Provider } from './xyz.util.js';
 const sandbox = sinon.createSandbox();
 const TileSetNames = ['aerial', 'aerial@head', 'aerial@beta', '01E7PJFR9AMQFJ05X9G7FQ3XMW'];
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
@@ -42,6 +42,7 @@ o.spec('LambdaXyz', () => {
                 tileSet.initTiffs = async () => [];
             }
         }
+        TileSets.add(new FakeTileSetVector('topographic', GoogleTms));
         Config.Provider.get = async () => Provider;
     });
     o.afterEach(() => {
@@ -152,44 +153,70 @@ o.spec('LambdaXyz', () => {
         });
     });
     o.spec('tileJson', () => {
-        o('should 304 if a json is not modified', async () => {
-            // delete process.env[Env.PublicUrlBase];
-            const key = 'BBfQpNXA3Q90jlFrLSOZhxbvfOh7OpN1OEE+BylpbHw=';
-            const request = mockRequest('/v1/tiles/tile.json', 'get', { 'if-none-match': key, ...apiKeyHeader });
+        o('should 404 if invalid url is given', async () => {
+            const request = mockRequest('/v1/tiles/tile.json', 'get', apiKeyHeader);
             const res = await handleRequest(request);
-            if (res.status === 200) {
-                o(res.header('eTaG')).equals(key); // this line is useful for discovering the new etag
-                return;
-            }
-            o(res.status).equals(304);
-            o(rasterMock.calls.length).equals(0);
-            o(request.logContext['cache']).deepEquals({ key, match: key, hit: true });
+            o(res.status).equals(404);
         });
-        o('should 200 if a invalid etag is given', async () => {
+        o('should serve tile json for tile_set', async () => {
             var _a;
-            const key = 'ABCXecTdbcdjCyzB1MHOOQbrOkD2TTJ0ORh4JuXqhxXEE0=';
-            const request = mockRequest('/v1/tiles/tile.json', 'get', { 'if-none-match': key, ...apiKeyHeader });
+            const request = mockRequest('/v1/tiles/aerial/NZTM2000Quad/tile.json', 'get', apiKeyHeader);
             const res = await handleRequest(request);
             o(res.status).equals(200);
-            o(res.header('etag')).equals('BBfQpNXA3Q90jlFrLSOZhxbvfOh7OpN1OEE+BylpbHw=');
-            const out = JSON.parse(Buffer.from((_a = res.body) !== null && _a !== void 0 ? _a : '', 'base64').toString());
-            o(out.tiles[0].startsWith('https://tiles.test/v1/tiles/tile.json/undefined/{z}/{x}/{y}.pbf?api=')).equals(true);
-            o(request.logContext['cache']).deepEquals(undefined);
+            o(res.header('cache-control')).equals('no-store');
+            const body = Buffer.from((_a = res.body) !== null && _a !== void 0 ? _a : '', 'base64').toString();
+            o(JSON.parse(body)).deepEquals({
+                tiles: [`https://tiles.test/v1/tiles/aerial/NZTM2000Quad/{z}/{x}/{y}.webp?api=${apiKey}`],
+                vector_layers: [],
+                tilejson: '3.0.0',
+            });
         });
-        o('should serve tile json for tile_set', async () => {
+        o('should serve vector tiles', async () => {
             var _a;
-            const request = mockRequest('/v1/tiles/topographic/Google/tile.json', 'get', apiKeyHeader);
+            const request = mockRequest('/v1/tiles/topographic/WebMercatorQuad/tile.json', 'get', apiKeyHeader);
             const res = await handleRequest(request);
             o(res.status).equals(200);
-            o(res.header('content-type')).equals('application/json');
-            o(res.header('cache-control')).equals('max-age=120');
             const body = Buffer.from((_a = res.body) !== null && _a !== void 0 ? _a : '', 'base64').toString();
             o(JSON.parse(body)).deepEquals({
-                tiles: [`https://tiles.test/v1/tiles/topographic/Google/{z}/{x}/{y}.pbf?api=${apiKey}`],
-                minzoom: 0,
+                tiles: [`https://tiles.test/v1/tiles/topographic/EPSG:3857/{z}/{x}/{y}.pbf?api=${apiKey}`],
+                vector_layers: [],
+                tilejson: '3.0.0',
+            });
+        });
+        o('should serve vector tiles with min/max zoom', async () => {
+            var _a;
+            const fakeTileSet = new FakeTileSetVector('fake-vector', GoogleTms);
+            fakeTileSet.tileSet.maxZoom = 15;
+            fakeTileSet.tileSet.minZoom = 3;
+            TileSets.add(fakeTileSet);
+            const request = mockRequest('/v1/tiles/fake-vector/WebMercatorQuad/tile.json', 'get', apiKeyHeader);
+            const res = await handleRequest(request);
+            o(res.status).equals(200);
+            const body = Buffer.from((_a = res.body) !== null && _a !== void 0 ? _a : '', 'base64').toString();
+            o(JSON.parse(body)).deepEquals({
+                tiles: [`https://tiles.test/v1/tiles/fake-vector/EPSG:3857/{z}/{x}/{y}.pbf?api=${apiKey}`],
+                vector_layers: [],
                 maxzoom: 15,
-                format: 'pbf',
-                tilejson: '2.0.0',
+                minzoom: 3,
+                tilejson: '3.0.0',
+            });
+        });
+        o('should serve convert zoom to tile matrix', async () => {
+            var _a;
+            const fakeTileSet = new FakeTileSetVector('fake-vector', Nztm2000QuadTms);
+            fakeTileSet.tileSet.maxZoom = 15;
+            fakeTileSet.tileSet.minZoom = 1;
+            TileSets.add(fakeTileSet);
+            const request = mockRequest('/v1/tiles/fake-vector/NZTM2000Quad/tile.json', 'get', apiKeyHeader);
+            const res = await handleRequest(request);
+            o(res.status).equals(200);
+            const body = Buffer.from((_a = res.body) !== null && _a !== void 0 ? _a : '', 'base64').toString();
+            o(JSON.parse(body)).deepEquals({
+                tiles: [`https://tiles.test/v1/tiles/fake-vector/NZTM2000Quad/{z}/{x}/{y}.pbf?api=${apiKey}`],
+                vector_layers: [],
+                maxzoom: 13,
+                minzoom: 0,
+                tilejson: '3.0.0',
             });
         });
     });

package/build/__test__/xyz.util.d.ts

@@ -2,9 +2,13 @@ import { ConfigProvider } from '@basemaps/config';
 import { TileMatrixSet } from '@basemaps/geo';
 import { LambdaHttpRequest } from '@linzjs/lambda';
 import { TileSetRaster } from '../tile.set.raster.js';
+import { TileSetVector } from '../tile.set.vector.js';
 export declare function mockRequest(path: string, method?: string, headers?: Record<string, string>): LambdaHttpRequest;
 export declare class FakeTileSet extends TileSetRaster {
     constructor(name: string, tileMatrix: TileMatrixSet, title?: string, description?: string);
 }
+export declare class FakeTileSetVector extends TileSetVector {
+    constructor(name: string, tileMatrix: TileMatrixSet);
+}
 export declare const Provider: ConfigProvider;
 //# sourceMappingURL=xyz.util.d.ts.map

package/build/__test__/xyz.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xyz.util.d.ts","sourceRoot":"","sources":["../../src/__test__/xyz.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAoB,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAQ,EAAE,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,iBAAiB,CAajH;AAED,qBAAa,WAAY,SAAQ,aAAa;gBAChC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,SAAkB,EAAE,WAAW,SAAwB;CAIlH;AAED,eAAO,MAAM,QAAQ,EAAE,cA4BtB,CAAC"}
+{"version":3,"file":"xyz.util.d.ts","sourceRoot":"","sources":["../../src/__test__/xyz.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAoB,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAQ,EAAE,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,iBAAiB,CAajH;AAED,qBAAa,WAAY,SAAQ,aAAa;gBAChC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,SAAkB,EAAE,WAAW,SAAwB;CAIlH;AAED,qBAAa,iBAAkB,SAAQ,aAAa;gBACtC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa;CAIpD;AAED,eAAO,MAAM,QAAQ,EAAE,cA4BtB,CAAC"}

package/build/__test__/xyz.util.js

@@ -1,6 +1,7 @@
-import { LambdaAlbRequest } from '@linzjs/lambda';
 import { LogConfig } from '@basemaps/shared';
+import { LambdaAlbRequest } from '@linzjs/lambda';
 import { TileSetRaster } from '../tile.set.raster.js';
+import { TileSetVector } from '../tile.set.vector.js';
 export function mockRequest(path, method = 'get', headers = {}) {
     return new LambdaAlbRequest({
         requestContext: null,
@@ -17,6 +18,12 @@ export class FakeTileSet extends TileSetRaster {
         this.tileSet = { title, description };
     }
 }
+export class FakeTileSetVector extends TileSetVector {
+    constructor(name, tileMatrix) {
+        super(name, tileMatrix);
+        this.tileSet = {};
+    }
+}
 export const Provider = {
     createdAt: Date.now(),
     name: 'main',

package/build/cli/dump.js

@@ -1,6 +1,5 @@
-import { Nztm2000Tms } from '@basemaps/geo';
+import { Nztm2000Tms, ImageFormat } from '@basemaps/geo';
 import { LogConfig } from '@basemaps/shared';
-import { ImageFormat } from '@basemaps/tiler';
 import { LambdaAlbRequest } from '@linzjs/lambda';
 import { promises as fs } from 'fs';
 import { tileXyz } from '../routes/tile.xyz.js';
@@ -9,7 +8,7 @@ import { TileSetLocal } from './tile.set.local.js';
 const xyz = { x: 0, y: 0, z: 0 };
 const tileMatrix = Nztm2000Tms;
 const tileSetName = 'aerial';
-const ext = ImageFormat.PNG;
+const ext = ImageFormat.Png;
 /** Load a tileset form a file path otherwise default to the hard coded one from AWS */
 async function getTileSet(filePath) {
     if (filePath != null) {

package/build/import/imagery.find.d.ts

@@ -0,0 +1,17 @@
+export interface RoleConfig {
+    bucket: string;
+    accountId: string;
+    roleArn: string;
+    externalId?: string;
+    roleSessionDuration?: number;
+}
+export declare class RoleRegister {
+    /** Get all imagery source aws roles */
+    static _loadRoles(): Promise<RoleConfig[]>;
+    static _loadRolesPromise: Promise<RoleConfig[]> | undefined;
+    static loadRoles(): Promise<RoleConfig[]>;
+    static findRole(path: string): Promise<RoleConfig | undefined>;
+}
+/** Search for the imagery across all of our buckets */
+export declare function findImagery(path: string): Promise<string[]>;
+//# sourceMappingURL=imagery.find.d.ts.map

package/build/import/imagery.find.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"imagery.find.d.ts","sourceRoot":"","sources":["../../src/import/imagery.find.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAWD,qBAAa,YAAY;IACvB,uCAAuC;WAC1B,UAAU,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAgBhD,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,SAAS,CAAC;IAC5D,MAAM,CAAC,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;WAK5B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAIrE;AAED,uDAAuD;AACvD,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAOjE"}

package/build/import/imagery.find.js

@@ -0,0 +1,38 @@
+import { AwsCredentials } from '@chunkd/source-aws-v2';
+import { fsa } from '@chunkd/fs';
+import { Env } from '@basemaps/shared';
+export class RoleRegister {
+    /** Get all imagery source aws roles */
+    static async _loadRoles() {
+        const configBucket = Env.get(Env.AwsRoleConfigBucket);
+        if (configBucket == null)
+            return [];
+        const configPath = `s3://${configBucket}/config.json`;
+        const config = await fsa.readJson(configPath);
+        const roles = [];
+        for (const role of config.buckets) {
+            fsa.register('s3://' + role.bucket, AwsCredentials.fsFromRole(role.roleArn, role.externalId, role.roleSessionDuration));
+            roles.push(role);
+        }
+        return roles;
+    }
+    static loadRoles() {
+        if (RoleRegister._loadRolesPromise == null)
+            RoleRegister._loadRolesPromise = this._loadRoles();
+        return RoleRegister._loadRolesPromise;
+    }
+    static async findRole(path) {
+        const roles = await this.loadRoles();
+        return roles.find((f) => path.startsWith(`s3://${f.bucket}`));
+    }
+}
+/** Search for the imagery across all of our buckets */
+export async function findImagery(path) {
+    const files = [];
+    for await (const key of fsa.list(path)) {
+        const searchKey = key.toLowerCase();
+        if (searchKey.endsWith('.tif') || searchKey.endsWith('.tiff'))
+            files.push(key);
+    }
+    return files;
+}

package/build/import/make.cog.d.ts

@@ -0,0 +1,5 @@
+import { JobCreationContext } from '@basemaps/cli/build/cog/cog.stac.job';
+import { TileMatrixSet } from '@basemaps/geo';
+import { RoleConfig } from './imagery.find.js';
+export declare function getJobCreationContext(path: string, tileMatrix: TileMatrixSet, role: RoleConfig, files: string[]): Promise<JobCreationContext>;
+//# sourceMappingURL=make.cog.d.ts.map

package/build/import/make.cog.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"make.cog.d.ts","sourceRoot":"","sources":["../../src/import/make.cog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,aAAa,EACzB,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,kBAAkB,CAAC,CAkB7B"}

package/build/import/make.cog.js

@@ -0,0 +1,21 @@
+import { Env } from '@basemaps/shared';
+export async function getJobCreationContext(path, tileMatrix, role, files) {
+    const bucket = Env.get(Env.ImportImageryBucket);
+    if (bucket == null)
+        throw new Error('Output AWS s3 bucket Not Found.');
+    const ctx = {
+        override: {
+            projection: tileMatrix.projection,
+            resampling: {
+                warp: 'bilinear',
+                overview: 'lanczos',
+            },
+        },
+        outputLocation: { type: 's3', path: `s3://${bucket}` },
+        sourceLocation: { type: 's3', path, ...role, files: files },
+        batch: true,
+        tileMatrix,
+        oneCogCovering: false,
+    };
+    return ctx;
+}

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAqB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BvF;AAED,eAAO,MAAM,OAAO,2LAA0C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAuB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BvF;AAED,eAAO,MAAM,OAAO,2LAA0C,CAAC"}

package/build/index.js

@@ -8,6 +8,7 @@ import { createHash } from 'crypto';
 import { Imagery } from './routes/imagery.js';
 import { Esri } from './routes/esri/rest.js';
 import { St } from './source.tracer.js';
+import { Import } from './routes/import.js';
 const app = new Router();
 app.get('ping', Ping);
 app.get('health', Health);
@@ -15,6 +16,7 @@ app.get('version', Version);
 app.get('tiles', Tiles);
 app.get('imagery', Imagery);
 app.get('esri', Esri);
+app.get('import', Import);
 let slowTimer = null;
 export async function handleRequest(req) {
     // Reset the request tracing

package/build/routes/__test__/attribution.test.js

@@ -43,6 +43,7 @@ const ExpectedJson = {
                 ],
             },
             properties: {
+                title: 'Hastings-district urban 2011-13 0.1m',
                 datetime: null,
                 start_datetime: '2011-01-01T00:00:00Z',
                 end_datetime: '2014-01-01T00:00:00Z',
@@ -71,6 +72,7 @@ const ExpectedJson = {
                 ],
             },
             properties: {
+                title: 'Hastings-district urban 2013-14 0.1m',
                 datetime: null,
                 start_datetime: '2013-01-01T00:00:00Z',
                 end_datetime: '2015-01-01T00:00:00Z',
@@ -99,6 +101,7 @@ const ExpectedJson = {
                 ],
             },
             properties: {
+                title: 'Hastings-district urban 2015-17 0.1m',
                 datetime: null,
                 start_datetime: '2015-01-01T00:00:00Z',
                 end_datetime: '2018-01-01T00:00:00Z',
@@ -127,6 +130,7 @@ const ExpectedJson = {
                 ],
             },
             properties: {
+                title: 'Hastings-district urban 2017-18 0.1m',
                 datetime: null,
                 start_datetime: '2017-01-01T00:00:00Z',
                 end_datetime: '2019-01-01T00:00:00Z',

package/build/routes/__test__/health.test.js

@@ -14,6 +14,7 @@ const ctx = new LambdaAlbRequest({
     isBase64Encoded: false,
 }, {}, LogConfig.get());
 o.spec('health', async () => {
+    o.specTimeout(1000);
     const sandbox = sinon.createSandbox();
     const tileSet = new TileSetRaster('health', GoogleTms);
     o.beforeEach(() => {
@@ -42,7 +43,6 @@ o.spec('health', async () => {
     });
     // Prepare mock test tile response based on the static test tiles
     o('Should give a 200 response', async () => {
-        o.timeout(500);
         // Given ... a series good get tile response
         const callback = sandbox.stub(tileSet, 'tile');
         callback.onCall(0).resolves(Response1);
@@ -54,7 +54,6 @@ o.spec('health', async () => {
         o(res.statusDescription).equals('ok');
     });
     o('Should return mis-match tile response', async () => {
-        o.timeout(500);
         // Given ... a bad get tile response for second get tile
         const callback = sandbox.stub(tileSet, 'tile');
         callback.onCall(0).resolves(Response1);

package/build/routes/attribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attribution.d.ts","sourceRoot":"","sources":["../../src/routes/attribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAe,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EACL,qBAAqB,EAOrB,cAAc,EACd,UAAU,EAEX,MAAM,eAAe,CAAC;AAYvB,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAInF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AA2DtD,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,UAAU,GACjB,qBAAqB,CAqBvB;AAiFD;;GAEG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkCrF"}
+{"version":3,"file":"attribution.d.ts","sourceRoot":"","sources":["../../src/routes/attribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAe,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EACL,qBAAqB,EAOrB,cAAc,EACd,UAAU,EAEX,MAAM,eAAe,CAAC;AAYvB,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAInF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AA2DtD,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,UAAU,GACjB,qBAAqB,CAqBvB;AAkFD;;GAEG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkCrF"}

package/build/routes/attribution.js

@@ -133,6 +133,7 @@ async function tileSetAttribution(tileSet) {
                 coordinates: createCoordinates(bbox, im.files, proj),
             },
             properties: {
+                title: titleizeImageryName(im.name),
                 datetime: null,
                 start_datetime: interval[0][0],
                 end_datetime: interval[0][1],

package/build/routes/health.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAY,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAQnF,UAAU,QAAS,SAAQ,WAAW;IACpC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,SAAS,EAAE,QAAQ,EAG/B,CAAC;AAGF,wBAAsB,aAAa,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAYnE;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO/G;AAED;;;;;;GAMG;AACH,wBAAsB,MAAM,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgChF"}
+{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAY,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAQnF,UAAU,QAAS,SAAQ,WAAW;IACpC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,SAAS,EAAE,QAAQ,EAG/B,CAAC;AAGF,wBAAsB,aAAa,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAYnE;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAO/G;AAED;;;;;;GAMG;AACH,wBAAsB,MAAM,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgChF"}