@basemaps/lambda-tiler 6.25.0 → 6.28.0

package/CHANGELOG.md

@@ -3,6 +3,68 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.28.0](https://github.com/linz/basemaps/compare/v6.27.0...v6.28.0) (2022-06-06)
+
+
+### Bug Fixes
+
+* **lambda-tiler:** remove console.log ([#2224](https://github.com/linz/basemaps/issues/2224)) ([addc742](https://github.com/linz/basemaps/commit/addc74270235fe6348e53391444a5570b02fea3e))
+* **tiler:** down grade sharp to 0.29.2 as we are scaling webp past 16k ([#2237](https://github.com/linz/basemaps/issues/2237)) ([53cd5ef](https://github.com/linz/basemaps/commit/53cd5ef420698c2d8528735b5c02b84189c6b7f9))
+
+
+### Features
+
+* **lambda-tiler:** tiff paths should allow trailing slashes ([#2223](https://github.com/linz/basemaps/issues/2223)) ([4cd4948](https://github.com/linz/basemaps/commit/4cd49487dddc3a70123437d1644ff3e22d9dc12f))
+* **server:** bundle basemaps-server cli so its easier to install ([#2218](https://github.com/linz/basemaps/issues/2218)) ([8457b66](https://github.com/linz/basemaps/commit/8457b66be6d0f54decf43b515bb78853cefbc8ed))
+* **sprites:** create sprites using sharp ([#2235](https://github.com/linz/basemaps/issues/2235)) ([e7b6a9e](https://github.com/linz/basemaps/commit/e7b6a9e9c95359dc866b40e7a6988837a71d9d96))
+
+
+
+
+
+# [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)
+
+
+### Bug Fixes
+
+* **lambda-tiler:** Fix the insert of processing job config and actually start job after inserting config. ([#2182](https://github.com/linz/basemaps/issues/2182)) ([65d9c84](https://github.com/linz/basemaps/commit/65d9c841d3cbdde1c9a3753f3ae81fd67c5aef80))
+* **lambda-tiler:** remove vector_layers as maplibre uses it as a validator ([#2189](https://github.com/linz/basemaps/issues/2189)) ([457d978](https://github.com/linz/basemaps/commit/457d978527f2c42408562021cef7b48ff9ce1afb))
+
+
+### Features
+
+* **lambda-tiler:** Remove the job id to use ulid and update HTTP status code. ([#2188](https://github.com/linz/basemaps/issues/2188)) ([7d72f0c](https://github.com/linz/basemaps/commit/7d72f0c94ce4eefe0342b01b1ac2c8c153fc7c10))
+
+
+
+
+
 # [6.25.0](https://github.com/linz/basemaps/compare/v6.24.2...v6.25.0) (2022-05-11)
 
 

package/build/{__test__ → __tests__}/index.test.d.ts.map

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

package/build/{__test__ → __tests__}/route.test.d.ts.map

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

package/build/__tests__/tiff.cache.test.d.ts.map

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

package/build/__tests__/tile.cache.key.test.d.ts.map

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

package/build/__tests__/tile.set.cache.test.d.ts.map

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

package/build/__tests__/tile.set.test.d.ts.map

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

package/build/{__test__ → __tests__}/tile.set.test.js

@@ -2,11 +2,6 @@ import { GoogleTms, Nztm2000Tms } from '@basemaps/geo';
 import o from 'ospec';
 import { TileSetRaster } from '../tile.set.raster.js';
 o.spec('tile.set', () => {
-    o('basePath', () => {
-        const rec = { uri: 's3://test-bucket/3857/aerail/job123' };
-        o(TileSetRaster.basePath(rec)).equals('s3://test-bucket/3857/aerail/job123');
-        o(TileSetRaster.basePath(rec, '31223')).equals('s3://test-bucket/3857/aerail/job123/31223.tiff');
-    });
     o('extent', () => {
         o(new TileSetRaster('google', GoogleTms).extent.toBbox()).deepEquals([
             -20037508.3427892, -20037508.3427892, 20037508.3427892, 20037508.3427892,

package/build/__tests__/tile.style.json.test.d.ts.map

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"wmts.capability.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/wmts.capability.test.ts"],"names":[],"mappings":"AAQA,OAAO,gCAAgC,CAAC"}

package/build/{__test__ → __tests__}/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/{__test__ → __tests__}/xyz.test.d.ts.map

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

package/build/{__test__ → __tests__}/xyz.test.js

@@ -167,7 +167,6 @@ o.spec('LambdaXyz', () => {
             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',
             });
         });
@@ -179,7 +178,6 @@ o.spec('LambdaXyz', () => {
             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/EPSG:3857/{z}/{x}/{y}.pbf?api=${apiKey}`],
-                vector_layers: [],
                 tilejson: '3.0.0',
             });
         });
@@ -195,7 +193,6 @@ o.spec('LambdaXyz', () => {
             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,
                 minzoom: 3,
                 tilejson: '3.0.0',
@@ -213,7 +210,6 @@ o.spec('LambdaXyz', () => {
             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/__tests__/xyz.util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"xyz.util.d.ts","sourceRoot":"","sources":["../../src/__tests__/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/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/__tests__/attribution.test.d.ts.map

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

package/build/routes/{__test__ → __tests__}/attribution.test.js

@@ -1,14 +1,14 @@
 import { EpsgCode, GoogleTms, Nztm2000QuadTms, Nztm2000Tms, Stac, TileMatrixSets } from '@basemaps/geo';
 import { HttpHeader } from '@linzjs/lambda';
 import { Config } 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 sinon from 'sinon';
 const sandbox = sinon.createSandbox();
 import { TileSets } from '../../tile.set.cache.js';
 import { TileSetRaster } from '../../tile.set.raster.js';
-import { FakeTileSet, mockRequest, Provider } from '../../__test__/xyz.util.js';
+import { FakeTileSet, mockRequest, Provider } from '../../__tests__/xyz.util.js';
 import { attribution, createAttributionCollection } from '../attribution.js';
 import { TileEtag } from '../tile.etag.js';
 import { Attribution } from '@basemaps/attribution';
@@ -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/__tests__/health.test.d.ts.map

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

package/build/routes/__tests__/imagery.test.d.ts.map

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

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

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

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

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

package/build/routes/__tests__/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.json.js

@@ -22,7 +22,7 @@ export async function tileJson(req) {
     const host = (_a = Env.get(Env.PublicUrlBase)) !== null && _a !== void 0 ? _a : '';
     const tileUrl = [host, version, name, tileSet.fullName, getTileMatrixId(tileMatrix), '{z}', '{x}', '{y}'].join('/') +
         `.${tileSet.format}?api=${apiKey}`;
-    const tileJson = { tiles: [tileUrl], vector_layers: [], tilejson: '3.0.0' };
+    const tileJson = { tiles: [tileUrl], tilejson: '3.0.0' };
     const maxZoom = TileMatrixSet.convertZoomLevel((_b = tileSet.tileSet.maxZoom) !== null && _b !== void 0 ? _b : 30, GoogleTms, tileMatrix, true);
     const minZoom = TileMatrixSet.convertZoomLevel((_c = tileSet.tileSet.minZoom) !== null && _c !== void 0 ? _c : 0, GoogleTms, tileMatrix, true);
     if (tileSet.tileSet.maxZoom)

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,CAmC9E"}

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
  *
@@ -27,10 +43,14 @@ export async function wmts(req) {
         return NotFound;
     const providerId = Config.Provider.id('linz');
     const provider = await Config.Provider.get(providerId);
-    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: provider !== null && provider !== void 0 ? provider : undefined,
+        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

@@ -15,6 +15,7 @@ export interface TileSetResponse {
     layersTotal: number;
     contentType: string;
 }
+export declare function getTiffName(name: string): string;
 export declare class TileSetRaster {
     type: TileSetType.Raster;
     tileMatrix: TileMatrixSet;
@@ -23,12 +24,6 @@ export declare class TileSetRaster {
     extentOverride: Bounds;
     components: TileSetNameComponents;
     tileSet: ConfigTileSetRaster;
-    /**
-     * Return the location of a imagery `record`
-     * @param record
-     * @param name the COG to locate. Return just the directory if `null`
-     */
-    static basePath(record: ConfigImagery, name?: string): string;
     constructor(name: string, tileMatrix: TileMatrixSet);
     get id(): string;
     get fullName(): string;

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,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGhD;AAED,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;gBAEjB,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;IA4BxF;;;;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,10 +11,15 @@ 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 };
+export function getTiffName(name) {
+    if (name.endsWith('.tif') || name.endsWith('.tiff'))
+        return name;
+    return `${name}.tiff`;
+}
 export class TileSetRaster {
     constructor(name, tileMatrix) {
         this.type = TileSetType.Raster;
@@ -22,18 +27,6 @@ export class TileSetRaster {
         this.tileMatrix = tileMatrix;
         this.tiler = new Tiler(this.tileMatrix);
     }
-    /**
-     * Return the location of a imagery `record`
-     * @param record
-     * @param name the COG to locate. Return just the directory if `null`
-     */
-    static basePath(record, name) {
-        if (name == null)
-            return record.uri;
-        if (record.uri.endsWith('/'))
-            throw new Error("Invalid uri ending with '/' " + record.uri);
-        return `${record.uri}/${name}.tiff`;
-    }
     get id() {
         return TileSets.id(this.fullName, this.tileMatrix);
     }
@@ -92,16 +85,14 @@ export class TileSetRaster {
         req.set('layers', layers.length);
         if (TileEtag.isNotModified(req, cacheKey))
             return NotModified;
-        req.timer.start('tile:compose');
         const res = await TileComposer.compose({
             layers,
             format: xyz.ext,
             background: (_a = this.tileSet.background) !== null && _a !== void 0 ? _a : DefaultBackground,
             resizeKernel: (_b = this.tileSet.resizeKernel) !== null && _b !== void 0 ? _b : DefaultResizeKernel,
+            metrics: req.timer,
         });
-        req.timer.end('tile:compose');
         req.set('layersUsed', res.layers);
-        req.set('allLayersUsed', res.layers === layers.length);
         req.set('bytes', res.buffer.byteLength);
         const response = new LambdaHttpResponse(200, 'ok');
         response.header(HttpHeader.ETag, cacheKey);
@@ -131,7 +122,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;
             }
@@ -147,16 +137,16 @@ export class TileSetRaster {
         for (const c of record.files) {
             if (!tileBounds.intersects(Bounds.fromJson(c)))
                 continue;
-            const tiffKey = `${record.id}_${c.name}`;
-            let existing = TiffCache.get(tiffKey);
+            const tiffPath = fsa.join(record.uri, getTiffName(c.name));
+            let existing = TiffCache.get(tiffPath);
             if (existing == null) {
-                const source = fsa.source(TileSetRaster.basePath(record, c.name));
+                const source = fsa.source(tiffPath);
                 if (source == null) {
-                    throw new Error(`Failed to create CogSource from  ${TileSetRaster.basePath(record, c.name)}`);
+                    throw new Error(`Failed to create CogSource from  ${tiffPath}`);
                 }
                 St.trace(source);
                 existing = new CogTiff(source);
-                TiffCache.set(tiffKey, existing);
+                TiffCache.set(tiffPath, existing);
             }
             output.push(existing);
         }