@basemaps/lambda-tiler 6.26.0 → 6.27.0

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.27.0](https://github.com/linz/basemaps/compare/v6.26.0...v6.27.0) (2022-05-29)
+
+
+### Bug Fixes
+
+* **lambda-tiler:** do not serve mvt in the wrong projection ([#2212](https://github.com/linz/basemaps/issues/2212)) ([a68e588](https://github.com/linz/basemaps/commit/a68e5889f2d0394676dcc41d831d00ede3df115d))
+
+
+### Features
+
+* **cli:** allow overriding imagery names ([#2169](https://github.com/linz/basemaps/issues/2169)) ([5c3bdd8](https://github.com/linz/basemaps/commit/5c3bdd89b664dd85df2b48d709653b71bdc348f7))
+* **cli:** Insert imagery and tileset config after cog creation complete ([#2191](https://github.com/linz/basemaps/issues/2191)) ([3ea5efd](https://github.com/linz/basemaps/commit/3ea5efd049b956f882a05c90471d764efb5d39fd))
+* **cli:** make cogs will update the process job status if exists. ([#2180](https://github.com/linz/basemaps/issues/2180)) ([855ce1c](https://github.com/linz/basemaps/commit/855ce1cb1f7b8bff575be342184e5ac387684f09))
+* **config:** add configuration parser and bundler ([#2200](https://github.com/linz/basemaps/issues/2200)) ([795e3f2](https://github.com/linz/basemaps/commit/795e3f224ee0b4cd1e66a242d05a1fd5357cae3a))
+* **lambda-cog:** New lambda Cog for import api. ([#2207](https://github.com/linz/basemaps/issues/2207)) ([79f4ae7](https://github.com/linz/basemaps/commit/79f4ae70ea3fc16a37dd575b843a0b60a1365df4))
+* **lambda-tiler:** Add file number limitation to import api. ([#2203](https://github.com/linz/basemaps/issues/2203)) ([4694e29](https://github.com/linz/basemaps/commit/4694e29a4444810391e72b290ec64f8b8541c369))
+* **lambda-tiler:** allow selection of output format for wmts with ?format= ([#2211](https://github.com/linz/basemaps/issues/2211)) ([e32e1ed](https://github.com/linz/basemaps/commit/e32e1ed6f48f5d70c47b9fd81032ebc8662d3a72))
+* **lambda-tiler:** Increase limit of total file size. ([#2205](https://github.com/linz/basemaps/issues/2205)) ([5246ea0](https://github.com/linz/basemaps/commit/5246ea0879a4bf6b20770fb633d63afac778d54d))
+* **lambda-tiler:** increase the max number of tiffs to load at once to 25 ([#2219](https://github.com/linz/basemaps/issues/2219)) ([d7d30a8](https://github.com/linz/basemaps/commit/d7d30a843201be91933c8627d99988098d783cec))
+* **lambda-tiler:** Load MaxImagePixelSize from import api. ([#2206](https://github.com/linz/basemaps/issues/2206)) ([b851934](https://github.com/linz/basemaps/commit/b85193401bc5df2ecb689c3801f62af71696cdf5))
+* **server:** use a bundled `@basemaps/landing` to serve static assets ([#2202](https://github.com/linz/basemaps/issues/2202)) ([c60f518](https://github.com/linz/basemaps/commit/c60f518893fe037a03f8bfd489c84d8427481678))
+
+
+
+
+
 # [6.26.0](https://github.com/linz/basemaps/compare/v6.25.0...v6.26.0) (2022-05-12)
 
 

package/build/__test__/wmts.capability.test.js

@@ -1,4 +1,4 @@
-import { Bounds, Epsg, GoogleTms, Nztm2000QuadTms, Nztm2000Tms } from '@basemaps/geo';
+import { Bounds, Epsg, GoogleTms, ImageFormat, Nztm2000QuadTms, Nztm2000Tms } from '@basemaps/geo';
 import { TileSetName, V, VNodeElement } from '@basemaps/shared';
 import { roundNumbersInString } from '@basemaps/test/build/rounding.js';
 import { createHash } from 'crypto';
@@ -18,9 +18,27 @@ o.spec('WmtsCapabilities', () => {
     const apiKey = 'secret1234';
     const tileSet = new FakeTileSet(TileSetName.aerial, GoogleTms);
     const tileSetImagery = new FakeTileSet('01E7PJFR9AMQFJ05X9G7FQ3XMW', GoogleTms);
+    o('should output the requested formats', () => {
+        const wmts = new WmtsCapabilities({
+            httpBase: 'https://basemaps.test',
+            provider: Provider,
+            layers: [tileSet],
+            apiKey,
+            formats: [ImageFormat.Avif],
+        }).toVNode();
+        const urls = tags(wmts, 'ResourceURL');
+        o(urls.length).equals(1);
+        o(urls[0].attrs.format).equals('image/avif');
+        o(urls[0].attrs.template).equals('https://basemaps.test/v1/tiles/aerial/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.avif?api=secret1234');
+    });
     o('should build capability xml for tileset and projection', () => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        const wmts = new WmtsCapabilities('https://basemaps.test', Provider, [tileSet], apiKey);
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        const wmts = new WmtsCapabilities({
+            httpBase: 'https://basemaps.test',
+            provider: Provider,
+            layers: [tileSet],
+            apiKey,
+        });
         const raw = wmts.toVNode();
         const serviceId = raw.find('ows:ServiceIdentification');
         o((_a = serviceId === null || serviceId === void 0 ? void 0 : serviceId.find('ows:Abstract')) === null || _a === void 0 ? void 0 : _a.textContent).equals('the description');
@@ -73,12 +91,21 @@ o.spec('WmtsCapabilities', () => {
         }
         compareMatrix(tileMatrices[0], '0', 1, 559082264.028717);
         compareMatrix(tileMatrices[10], '10', 1024, 545978.773465544);
-        const xml = (_m = WmtsCapabilities.toXml('https://basemaps.test', Provider, [tileSet], apiKey)) !== null && _m !== void 0 ? _m : '';
+        const xml = new WmtsCapabilities({
+            httpBase: 'https://basemaps.test',
+            provider: Provider,
+            layers: [tileSet],
+            apiKey,
+        }).toXml();
         o(xml).deepEquals('<?xml version="1.0"?>\n' + (raw === null || raw === void 0 ? void 0 : raw.toString()));
         o(createHash('sha256').update(Buffer.from(xml)).digest('base64')).equals('beknYyMt8v74vK4p84AS3c1OnBSJ+ZE0kan+mMVQS1A=');
     });
     o('should allow individual imagery sets', () => {
-        const raw = new WmtsCapabilities('https://basemaps.test', Provider, [tileSetImagery]).toVNode();
+        const raw = new WmtsCapabilities({
+            httpBase: 'https://basemaps.test',
+            provider: Provider,
+            layers: [tileSetImagery],
+        }).toVNode();
         const tms = raw === null || raw === void 0 ? void 0 : raw.find('TileMatrixSet', 'ows:Identifier');
         o(tms === null || tms === void 0 ? void 0 : tms.textContent).equals('EPSG:3857');
         const urls = Array.from(raw ? raw.tags('ResourceURL') : []);
@@ -89,7 +116,7 @@ o.spec('WmtsCapabilities', () => {
     o('should support multiple projections', () => {
         var _a, _b, _c, _d;
         const ts = [new FakeTileSet(TileSetName.aerial, Nztm2000Tms), new FakeTileSet(TileSetName.aerial, GoogleTms)];
-        const xml = new WmtsCapabilities('basemaps.test', Provider, ts);
+        const xml = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts });
         const nodes = xml.toVNode();
         const layers = tags(nodes, 'Layer');
         o(layers.length).equals(1);
@@ -129,7 +156,7 @@ o.spec('WmtsCapabilities', () => {
             new FakeTileSet(TileSetName.aerial, Nztm2000Tms, 'aerial-title'),
             new FakeTileSet('01E7PJFR9AMQFJ05X9G7FQ3XMW', Nztm2000Tms, 'imagery-title'),
         ];
-        const nodes = new WmtsCapabilities('basemaps.test', Provider, ts).toVNode();
+        const nodes = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts }).toVNode();
         const layers = tags(nodes, 'Layer');
         o(layers.length).equals(2);
         o((_a = layers[0].find('ows:Title')) === null || _a === void 0 ? void 0 : _a.textContent).equals('aerial-title');
@@ -142,7 +169,7 @@ o.spec('WmtsCapabilities', () => {
             new FakeTileSet(`${TileSetName.aerial}:wairoa_urban_2014-2015_0-10m_RGBA`, Nztm2000Tms, 'wairoa_urban_2014-2015_0-10m_RGBA'),
             new FakeTileSet(`${TileSetName.aerial}:west-coast_rural_2016-17_0-3m`, Nztm2000Tms, 'west-coast_rural_2016-17_0-3m'),
         ];
-        const nodes = new WmtsCapabilities('basemaps.test', Provider, ts).toVNode();
+        const nodes = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts }).toVNode();
         const layers = tags(nodes, 'Layer');
         o(layers.length).equals(2);
         const boundingBoxes = tags(layers[0], 'ows:BoundingBox');
@@ -162,7 +189,7 @@ o.spec('WmtsCapabilities', () => {
         ];
         ts[1].extentOverride = new Bounds(1, 2, 2, 2);
         ts[2].tileSet.title = 'aerial_dunedin_urban';
-        const nodes = new WmtsCapabilities('basemaps.test', Provider, ts).toVNode();
+        const nodes = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts }).toVNode();
         const allMatrixes = tags(nodes, 'TileMatrixSet');
         o(allMatrixes[0].children[0].textContent).equals('EPSG:2193');
         o(allMatrixes[1].children[0].textContent).equals('EPSG:2193');

package/build/index.d.ts

@@ -1,4 +1,6 @@
 import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 export declare function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
-export declare const handler: import("@linzjs/lambda/build/src/function").LambdaHandler<import("@linzjs/lambda/build/src/request.http").HttpRequestEvent, import("@linzjs/lambda/build/src/request.http").HttpResponse>;
+export declare const handler: import("@linzjs/lambda/build/src/function").LambdaHandler<import("@linzjs/lambda/build/src/http/request.http").HttpRequestEvent, import("@linzjs/lambda/build/src/http/request.http").HttpResponse> & {
+    router: import("@linzjs/lambda/build/src/http/router").Router;
+};
 //# sourceMappingURL=index.d.ts.map

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;AAuB3E,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;AAqB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BvF;AAED,eAAO,MAAM,OAAO;;CAA2B,CAAC"}

package/build/index.js

@@ -8,7 +8,6 @@ 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);
@@ -16,7 +15,6 @@ 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
@@ -45,4 +43,5 @@ export async function handleRequest(req) {
         slowTimer = null;
     }
 }
-export const handler = lf.http(handleRequest, LogConfig.get());
+export const handler = lf.http(LogConfig.get());
+handler.router.get('*', handleRequest);

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

@@ -266,6 +266,7 @@ function makeImageRecord(id, name, x = 10) {
         id,
         name,
         projection: EpsgCode.Google,
+        tileMatrix: 'WebMercatorQuad',
         uri: 's3://bucket/path/' + name,
         bounds: GoogleTms.tileToSourceBounds({ x, y: 10, z: 5 }),
         files: [0, 1].map((i) => {

package/build/routes/__test__/wmts.test.d.ts

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

package/build/routes/__test__/wmts.test.d.ts.map

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

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

@@ -0,0 +1,31 @@
+import { ImageFormat } from '@basemaps/geo';
+import { LogConfig } from '@basemaps/shared';
+import { LambdaUrlRequest } from '@linzjs/lambda';
+import o from 'ospec';
+import { getImageFormats } from '../tile.wmts.js';
+o.spec('GetImageFormats', () => {
+    function newRequest(path, query) {
+        return new LambdaUrlRequest({
+            requestContext: { http: { method: 'GET' } },
+            headers: {},
+            rawPath: path,
+            rawQueryString: query,
+            isBase64Encoded: false,
+        }, {}, LogConfig.get());
+    }
+    o('should parse all formats', () => {
+        const req = newRequest('/v1/blank', 'format=png&format=jpeg');
+        const formats = getImageFormats(req);
+        o(formats).deepEquals([ImageFormat.Png, ImageFormat.Jpeg]);
+    });
+    o('should ignore bad formats', () => {
+        const req = newRequest('/v1/blank', 'format=fake&format=mvt');
+        const formats = getImageFormats(req);
+        o(formats).equals(undefined);
+    });
+    o('should de-dupe formats', () => {
+        const req = newRequest('/v1/blank', 'format=png&format=jpeg&format=png&format=jpeg&format=png&format=jpeg');
+        const formats = getImageFormats(req);
+        o(formats).deepEquals([ImageFormat.Png, ImageFormat.Jpeg]);
+    });
+});

package/build/routes/tile.wmts.d.ts

@@ -1,4 +1,6 @@
+import { ImageFormat } from '@basemaps/geo';
 import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+export declare function getImageFormats(req: LambdaHttpRequest): ImageFormat[] | undefined;
 /**
  * Serve a WMTS request
  *

package/build/routes/tile.wmts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tile.wmts.d.ts","sourceRoot":"","sources":["../../src/routes/tile.wmts.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AASnF;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA8B9E"}
+{"version":3,"file":"tile.wmts.d.ts","sourceRoot":"","sources":["../../src/routes/tile.wmts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAiB,MAAM,eAAe,CAAC;AAG3D,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AASnF,wBAAgB,eAAe,CAAC,GAAG,EAAE,iBAAiB,GAAG,WAAW,EAAE,GAAG,SAAS,CAYjF;AAED;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAoC9E"}

package/build/routes/tile.wmts.js

@@ -1,5 +1,6 @@
 import { Config, TileSetType } from '@basemaps/config';
 import { Env, TileSetName, tileWmtsFromPath } from '@basemaps/shared';
+import { getImageFormat } from '@basemaps/tiler';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import { createHash } from 'crypto';
 import { Router } from '../router.js';
@@ -7,6 +8,21 @@ import { TileSets } from '../tile.set.cache.js';
 import { WmtsCapabilities } from '../wmts.capability.js';
 import { NotFound, NotModified } from './response.js';
 import { TileEtag } from './tile.etag.js';
+export function getImageFormats(req) {
+    const formats = req.query.getAll('format');
+    if (formats == null || formats.length === 0)
+        return undefined;
+    const output = new Set();
+    for (const fmt of formats) {
+        const parsed = getImageFormat(fmt);
+        if (parsed == null)
+            continue;
+        output.add(parsed);
+    }
+    if (output.size === 0)
+        return undefined;
+    return [...output.values()];
+}
 /**
  * Serve a WMTS request
  *
@@ -30,7 +46,13 @@ export async function wmts(req) {
     if (provider == null)
         return NotFound;
     const apiKey = Router.apiKey(req);
-    const xml = WmtsCapabilities.toXml(host, provider, tileSets, apiKey);
+    const xml = new WmtsCapabilities({
+        httpBase: host,
+        provider,
+        layers: tileSets,
+        apiKey,
+        formats: getImageFormats(req),
+    }).toXml();
     if (xml == null)
         return NotFound;
     const data = Buffer.from(xml);

package/build/tile.set.cache.js

@@ -54,7 +54,7 @@ export class TileSetCache {
         }
         // If we already have a copy and it hasn't been modified just return it
         const existing = this.tileSets.get(tileSetId);
-        if ((existing === null || existing === void 0 ? void 0 : existing.tileSet.updatedAt) === tileSet.updatedAt) {
+        if (existing != null && (existing === null || existing === void 0 ? void 0 : existing.tileSet.updatedAt) === tileSet.updatedAt) {
             return existing;
         }
         if (Config.isTileSetRaster(tileSet)) {

package/build/tile.set.raster.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tile.set.raster.d.ts","sourceRoot":"","sources":["../src/tile.set.raster.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,aAAa,EAEb,mBAAmB,EACnB,qBAAqB,EAErB,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAQ,WAAW,EAAE,IAAI,EAAE,aAAa,EAAgC,MAAM,eAAe,CAAC;AAC7G,OAAO,EAAoB,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAU1C,eAAO,MAAM,YAAY,gBAA0B,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAKD,qBAAa,aAAa;IACxB,IAAI,EAAE,WAAW,CAAC,MAAM,CAAsB;IAE9C,UAAU,EAAE,aAAa,CAAC;IAC1B,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IAEvB,UAAU,EAAE,qBAAqB,CAAC;IAClC,OAAO,EAAE,mBAAmB,CAAC;IAE7B;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM;gBAMjD,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa;IAMnD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,uCAAuC;IACvC,IAAI,MAAM,IAAI,WAAW,CAExB;IAEK,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAmBhD,IAAI,CAAC,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA8BxF;;;;OAIG;IACI,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE;IAgC5D,OAAO,CAAC,cAAc;IAwBtB,oDAAoD;IACpD,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAShD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;CAqB3C"}
+{"version":3,"file":"tile.set.raster.d.ts","sourceRoot":"","sources":["../src/tile.set.raster.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,aAAa,EAEb,mBAAmB,EACnB,qBAAqB,EAErB,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAQ,WAAW,EAAE,IAAI,EAAE,aAAa,EAAgC,MAAM,eAAe,CAAC;AAC7G,OAAO,EAAoB,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAU1C,eAAO,MAAM,YAAY,gBAA0B,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAKD,qBAAa,aAAa;IACxB,IAAI,EAAE,WAAW,CAAC,MAAM,CAAsB;IAE9C,UAAU,EAAE,aAAa,CAAC;IAC1B,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IAEvB,UAAU,EAAE,qBAAqB,CAAC;IAClC,OAAO,EAAE,mBAAmB,CAAC;IAE7B;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM;gBAMjD,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa;IAMnD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,uCAAuC;IACvC,IAAI,MAAM,IAAI,WAAW,CAExB;IAEK,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAmBhD,IAAI,CAAC,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA8BxF;;;;OAIG;IACI,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE;IA+B5D,OAAO,CAAC,cAAc;IAwBtB,oDAAoD;IACpD,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAShD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;CAqB3C"}

package/build/tile.set.raster.js

@@ -11,7 +11,7 @@ import { TileEtag } from './routes/tile.etag.js';
 import { St } from './source.tracer.js';
 import { TiffCache } from './tiff.cache.js';
 import { TileSets } from './tile.set.cache.js';
-const LoadingQueue = pLimit(Env.getNumber(Env.TiffConcurrency, 5));
+const LoadingQueue = pLimit(Env.getNumber(Env.TiffConcurrency, 25));
 export const TileComposer = new TileMakerSharp(256);
 const DefaultResizeKernel = { in: 'lanczos3', out: 'lanczos3' };
 const DefaultBackground = { r: 0, g: 0, b: 0, alpha: 0 };
@@ -131,7 +131,6 @@ export class TileSetRaster {
             }
             const imagery = this.imagery.get(imgId);
             if (imagery == null) {
-                console.log('Failed', { imagery, i: this.imagery, ts: this.tileSet.layers });
                 log === null || log === void 0 ? void 0 : log.warn({ layer: layer.name, projection: this.tileMatrix.projection.code, imgId }, 'Failed to lookup imagery');
                 continue;
             }

package/build/tile.set.vector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tile.set.vector.d.ts","sourceRoot":"","sources":["../src/tile.set.vector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAqB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9G,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAO,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKnF,cAAM,UAAU;IACd,KAAK,qCAA4C;IAEjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;CAUxC;AAED,eAAO,MAAM,MAAM,YAAmB,CAAC;AAEvC,qBAAa,aAAa;IACxB,IAAI,EAAE,WAAW,CAAC,MAAM,CAAsB;IAC9C,UAAU,EAAE,qBAAqB,CAAC;IAClC,UAAU,EAAE,aAAa,CAAC;IAC1B,OAAO,EAAE,mBAAmB,CAAC;gBACjB,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa;IAK7C,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,oCAAoC;IACpC,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAEK,IAAI,CAAC,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAwBlF"}
+{"version":3,"file":"tile.set.vector.d.ts","sourceRoot":"","sources":["../src/tile.set.vector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAqB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9G,OAAO,EAAa,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAO,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKnF,cAAM,UAAU;IACd,KAAK,qCAA4C;IAEjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;CAUxC;AAED,eAAO,MAAM,MAAM,YAAmB,CAAC;AAEvC,qBAAa,aAAa;IACxB,IAAI,EAAE,WAAW,CAAC,MAAM,CAAsB;IAC9C,UAAU,EAAE,qBAAqB,CAAC;IAClC,UAAU,EAAE,aAAa,CAAC;IAC1B,OAAO,EAAE,mBAAmB,CAAC;gBACjB,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa;IAK7C,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,oCAAoC;IACpC,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAEK,IAAI,CAAC,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAyBlF"}

package/build/tile.set.vector.js

@@ -1,5 +1,5 @@
 import { TileSetNameParser, TileSetType } from '@basemaps/config';
-import { VectorFormat } from '@basemaps/geo';
+import { GoogleTms, VectorFormat } from '@basemaps/geo';
 import { fsa } from '@basemaps/shared';
 import { Cotar } from '@cotar/core';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
@@ -44,6 +44,8 @@ export class TileSetVector {
     async tile(req, xyz) {
         if (xyz.ext !== VectorFormat.MapboxVectorTiles)
             return NotFound;
+        if (xyz.tileMatrix.identifier !== GoogleTms.identifier)
+            return NotFound;
         if (this.tileSet.layers.length > 1)
             return new LambdaHttpResponse(500, 'Too many layers in tileset');
         const [layer] = this.tileSet.layers;

package/build/wmts.capability.d.ts

@@ -1,18 +1,25 @@
-import { ConfigProvider } from '@basemaps/config';
-import { Bounds, TileMatrixSet, WmtsProvider } from '@basemaps/geo';
+import { Bounds, ImageFormat, TileMatrixSet, WmtsProvider } from '@basemaps/geo';
 import { VNodeElement } from '@basemaps/shared';
 import { TileSetRaster } from './tile.set.raster.js';
 /**
  * Default the tile matrix id to the projection of the TileMatrixSet
  */
 export declare function getTileMatrixId(tileMatrix: TileMatrixSet): string;
+export interface WmtsCapabilitiesParams {
+    httpBase: string;
+    provider: WmtsProvider;
+    layers: TileSetRaster[];
+    apiKey?: string;
+    formats?: ImageFormat[];
+}
 export declare class WmtsCapabilities {
     httpBase: string;
     provider: WmtsProvider;
     layers: Map<string, TileSetRaster[]>;
     apiKey?: string;
     tileMatrixSets: Map<string, TileMatrixSet>;
-    constructor(httpBase: string, provider: WmtsProvider, layers: TileSetRaster[], apiKey?: string);
+    formats: ImageFormat[];
+    constructor(params: WmtsCapabilitiesParams);
     buildWgs84BoundingBox(layers: TileSetRaster[], tagName?: string): VNodeElement;
     buildBoundingBox(tms: TileMatrixSet, extent: Bounds): VNodeElement;
     buildProvider(): VNodeElement[];
@@ -22,7 +29,6 @@ export declare class WmtsCapabilities {
     buildStyle(): VNodeElement;
     buildTileMatrixSet(tms: TileMatrixSet): VNodeElement;
     toVNode(): VNodeElement;
-    toString(): string;
-    static toXml(httpBase: string, provider: ConfigProvider, tileSet: TileSetRaster[], apiKey?: string): string;
+    toXml(): string;
 }
 //# sourceMappingURL=wmts.capability.d.ts.map

package/build/wmts.capability.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wmts.capability.d.ts","sourceRoot":"","sources":["../src/wmts.capability.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAmB,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAiB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAG/D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAiBrD;;GAEG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,MAAM,CAIjE;AAED,qBAAa,gBAAgB;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAa;IAEjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,6BAAoC;gBAEtC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM;IAmB9F,qBAAqB,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE,OAAO,SAAyB,GAAG,YAAY;IAe9F,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAQlE,aAAa,IAAI,YAAY,EAAE;IAkC/B,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAc5D,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAQtE,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,YAAY;IAuBjD,UAAU,IAAI,YAAY;IAI1B,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,YAAY;IAoBpD,OAAO,IAAI,YAAY;IAUvB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;CAG5G"}
+{"version":3,"file":"wmts.capability.d.ts","sourceRoot":"","sources":["../src/wmts.capability.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAmB,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClG,OAAO,EAAiB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAG/D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAiBrD;;GAEG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,MAAM,CAIjE;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IACvB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,qBAAa,gBAAgB;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAa;IAEjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,6BAAoC;IAClD,OAAO,EAAE,WAAW,EAAE,CAAC;gBAEX,MAAM,EAAE,sBAAsB;IAoB1C,qBAAqB,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE,OAAO,SAAyB,GAAG,YAAY;IAe9F,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAQlE,aAAa,IAAI,YAAY,EAAE;IAkC/B,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAc5D,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAQtE,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,YAAY;IAuBjD,UAAU,IAAI,YAAY;IAI1B,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,YAAY;IAoBpD,OAAO,IAAI,YAAY;IAUvB,KAAK,IAAI,MAAM;CAGhB"}

package/build/wmts.capability.js

@@ -24,12 +24,13 @@ export function getTileMatrixId(tileMatrix) {
     return tileMatrix.projection.toEpsgString();
 }
 export class WmtsCapabilities {
-    constructor(httpBase, provider, layers, apiKey) {
+    constructor(params) {
+        var _a;
         this.layers = new Map();
         this.tileMatrixSets = new Map();
-        this.httpBase = httpBase;
-        this.provider = provider;
-        for (const layer of layers) {
+        this.httpBase = params.httpBase;
+        this.provider = params.provider;
+        for (const layer of params.layers) {
             // TODO is grouping by name the best option
             let existing = this.layers.get(layer.fullName);
             if (existing == null) {
@@ -40,7 +41,8 @@ export class WmtsCapabilities {
             existing.push(layer);
             this.tileMatrixSets.set(layer.tileMatrix.identifier, layer.tileMatrix);
         }
-        this.apiKey = apiKey;
+        this.apiKey = params.apiKey;
+        this.formats = (_a = params.formats) !== null && _a !== void 0 ? _a : ImageFormatOrder;
     }
     buildWgs84BoundingBox(layers, tagName = 'ows:WGS84BoundingBox') {
         let bbox = wgs84Extent(layers[0]);
@@ -127,9 +129,9 @@ export class WmtsCapabilities {
             ...layers.map((layer) => this.buildBoundingBox(layer.tileMatrix, layer.extent)),
             this.buildWgs84BoundingBox(layers),
             this.buildStyle(),
-            ...ImageFormatOrder.map((fmt) => V('Format', 'image/' + fmt)),
+            ...this.formats.map((fmt) => V('Format', 'image/' + fmt)),
             ...matrixSetNodes,
-            ...ImageFormatOrder.map((fmt) => this.buildResourceUrl(firstLayer, fmt)),
+            ...this.formats.map((fmt) => this.buildResourceUrl(firstLayer, fmt)),
         ]);
     }
     buildStyle() {
@@ -164,10 +166,7 @@ export class WmtsCapabilities {
             layers.push(this.buildTileMatrixSet(tms));
         return V('Capabilities', CapabilitiesAttrs, [...this.buildProvider(), V('Contents', layers)]);
     }
-    toString() {
+    toXml() {
         return '<?xml version="1.0"?>\n' + this.toVNode().toString();
     }
-    static toXml(httpBase, provider, tileSet, apiKey) {
-        return new WmtsCapabilities(httpBase, provider, tileSet, apiKey).toString();
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.26.0",
+  "version": "6.27.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,18 +22,17 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/cli": "^6.26.0",
-    "@basemaps/config": "^6.26.0",
+    "@basemaps/config": "^6.27.0",
     "@basemaps/geo": "^6.26.0",
     "@basemaps/lambda": "^6.7.0",
-    "@basemaps/shared": "^6.26.0",
+    "@basemaps/shared": "^6.27.0",
     "@basemaps/tiler": "^6.26.0",
     "@basemaps/tiler-sharp": "^6.26.0",
     "@chunkd/fs": "^8.1.0",
     "@cogeotiff/core": "^7.0.0",
     "@cotar/core": "^5.3.0",
     "@linzjs/geojson": "^6.21.1",
-    "@linzjs/lambda": "^2.0.0",
+    "@linzjs/lambda": "^3.0.1",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.1.0",
     "pixelmatch": "^5.1.0",
@@ -55,10 +54,10 @@
   "devDependencies": {
     "@basemaps/attribution": "^6.26.0",
     "@types/aws-lambda": "^8.10.75",
-    "@types/node": "^14.11.2",
+    "@types/node": "^17.0.34",
     "@types/pixelmatch": "^5.0.0",
     "@types/sharp": "^0.29.3",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "1b3a7eb8aad1e0c9bb2ca64e0dcfe13b16e08a50"
+  "gitHead": "c6aa61c20503cbc7f04cf31927f4e2b95aed34cb"
 }

package/src/__test__/wmts.capability.test.ts

@@ -1,4 +1,4 @@
-import { Bounds, Epsg, GoogleTms, Nztm2000QuadTms, Nztm2000Tms } from '@basemaps/geo';
+import { Bounds, Epsg, GoogleTms, ImageFormat, Nztm2000QuadTms, Nztm2000Tms } from '@basemaps/geo';
 import { TileSetName, V, VNodeElement } from '@basemaps/shared';
 import { roundNumbersInString } from '@basemaps/test/build/rounding.js';
 import { createHash } from 'crypto';
@@ -21,8 +21,30 @@ o.spec('WmtsCapabilities', () => {
   const tileSet = new FakeTileSet(TileSetName.aerial, GoogleTms);
   const tileSetImagery = new FakeTileSet('01E7PJFR9AMQFJ05X9G7FQ3XMW', GoogleTms);
 
+  o('should output the requested formats', () => {
+    const wmts = new WmtsCapabilities({
+      httpBase: 'https://basemaps.test',
+      provider: Provider,
+      layers: [tileSet],
+      apiKey,
+      formats: [ImageFormat.Avif],
+    }).toVNode();
+
+    const urls = tags(wmts, 'ResourceURL');
+    o(urls.length).equals(1);
+    o(urls[0].attrs.format).equals('image/avif');
+    o(urls[0].attrs.template).equals(
+      'https://basemaps.test/v1/tiles/aerial/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.avif?api=secret1234',
+    );
+  });
+
   o('should build capability xml for tileset and projection', () => {
-    const wmts = new WmtsCapabilities('https://basemaps.test', Provider, [tileSet], apiKey);
+    const wmts = new WmtsCapabilities({
+      httpBase: 'https://basemaps.test',
+      provider: Provider,
+      layers: [tileSet],
+      apiKey,
+    });
 
     const raw = wmts.toVNode();
     const serviceId = raw.find('ows:ServiceIdentification');
@@ -102,7 +124,12 @@ o.spec('WmtsCapabilities', () => {
     compareMatrix(tileMatrices[0], '0', 1, 559082264.028717);
     compareMatrix(tileMatrices[10], '10', 1024, 545978.773465544);
 
-    const xml = WmtsCapabilities.toXml('https://basemaps.test', Provider, [tileSet], apiKey) ?? '';
+    const xml = new WmtsCapabilities({
+      httpBase: 'https://basemaps.test',
+      provider: Provider,
+      layers: [tileSet],
+      apiKey,
+    }).toXml();
 
     o(xml).deepEquals('<?xml version="1.0"?>\n' + raw?.toString());
 
@@ -112,7 +139,11 @@ o.spec('WmtsCapabilities', () => {
   });
 
   o('should allow individual imagery sets', () => {
-    const raw = new WmtsCapabilities('https://basemaps.test', Provider, [tileSetImagery]).toVNode();
+    const raw = new WmtsCapabilities({
+      httpBase: 'https://basemaps.test',
+      provider: Provider,
+      layers: [tileSetImagery],
+    }).toVNode();
 
     const tms = raw?.find('TileMatrixSet', 'ows:Identifier');
 
@@ -128,7 +159,7 @@ o.spec('WmtsCapabilities', () => {
 
   o('should support multiple projections', () => {
     const ts = [new FakeTileSet(TileSetName.aerial, Nztm2000Tms), new FakeTileSet(TileSetName.aerial, GoogleTms)];
-    const xml = new WmtsCapabilities('basemaps.test', Provider, ts);
+    const xml = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts });
     const nodes = xml.toVNode();
 
     const layers = tags(nodes, 'Layer');
@@ -175,7 +206,7 @@ o.spec('WmtsCapabilities', () => {
       new FakeTileSet(TileSetName.aerial, Nztm2000Tms, 'aerial-title'),
       new FakeTileSet('01E7PJFR9AMQFJ05X9G7FQ3XMW', Nztm2000Tms, 'imagery-title'),
     ];
-    const nodes = new WmtsCapabilities('basemaps.test', Provider, ts).toVNode();
+    const nodes = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts }).toVNode();
     const layers = tags(nodes, 'Layer');
     o(layers.length).equals(2);
 
@@ -199,7 +230,7 @@ o.spec('WmtsCapabilities', () => {
         'west-coast_rural_2016-17_0-3m',
       ),
     ];
-    const nodes = new WmtsCapabilities('basemaps.test', Provider, ts).toVNode();
+    const nodes = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts }).toVNode();
     const layers = tags(nodes, 'Layer');
 
     o(layers.length).equals(2);
@@ -223,7 +254,7 @@ o.spec('WmtsCapabilities', () => {
     ts[1].extentOverride = new Bounds(1, 2, 2, 2);
 
     ts[2].tileSet.title = 'aerial_dunedin_urban';
-    const nodes = new WmtsCapabilities('basemaps.test', Provider, ts).toVNode();
+    const nodes = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts }).toVNode();
 
     const allMatrixes = tags(nodes, 'TileMatrixSet');
 

package/src/index.ts

@@ -8,7 +8,6 @@ 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();
 
@@ -18,7 +17,6 @@ app.get('version', Version);
 app.get('tiles', Tiles);
 app.get('imagery', Imagery);
 app.get('esri', Esri);
-app.get('import', Import);
 
 let slowTimer: NodeJS.Timer | null = null;
 export async function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpResponse> {
@@ -50,4 +48,5 @@ export async function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpR
   }
 }
 
-export const handler = lf.http(handleRequest, LogConfig.get());
+export const handler = lf.http(LogConfig.get());
+handler.router.get('*', handleRequest);

package/src/routes/__test__/attribution.test.ts

@@ -268,6 +268,7 @@ function makeImageRecord(id: string, name: string, x = 10): ConfigImagery {
     id,
     name,
     projection: EpsgCode.Google,
+    tileMatrix: 'WebMercatorQuad',
     uri: 's3://bucket/path/' + name,
     bounds: GoogleTms.tileToSourceBounds({ x, y: 10, z: 5 }),
     files: [0, 1].map((i) => {