@basemaps/lambda-tiler 6.24.2 → 6.27.0

package/CHANGELOG.md

@@ -3,6 +3,61 @@
 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)
+
+
+### 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)
+
+
+### 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)
 
 

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__/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__/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,66 @@ 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}`],
+                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}`],
+                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}`],
                 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}`],
+                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/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;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;AAqB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BvF;AAED,eAAO,MAAM,OAAO;;CAA2B,CAAC"}

package/build/index.js

@@ -43,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__/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/__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/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"}

package/build/routes/health.js

@@ -1,6 +1,5 @@
-import { GoogleTms, Nztm2000QuadTms } from '@basemaps/geo';
+import { GoogleTms, Nztm2000QuadTms, ImageFormat } from '@basemaps/geo';
 import { TileType } from '@basemaps/shared';
-import { ImageFormat } from '@basemaps/tiler';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -9,8 +8,8 @@ import Sharp from 'sharp';
 import url from 'url';
 import { TileSets } from '../tile.set.cache.js';
 export const TestTiles = [
-    { type: TileType.Tile, name: 'health', tileMatrix: GoogleTms, ext: ImageFormat.PNG, x: 252, y: 156, z: 8 },
-    { type: TileType.Tile, name: 'health', tileMatrix: Nztm2000QuadTms, ext: ImageFormat.PNG, x: 30, y: 33, z: 6 },
+    { type: TileType.Tile, name: 'health', tileMatrix: GoogleTms, ext: ImageFormat.Png, x: 252, y: 156, z: 8 },
+    { type: TileType.Tile, name: 'health', tileMatrix: Nztm2000QuadTms, ext: ImageFormat.Png, x: 30, y: 33, z: 6 },
 ];
 const TileSize = 256;
 export async function getTestBuffer(test) {

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

@@ -1,10 +1,3 @@
 import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
-export interface TileJson {
-    tiles: string[];
-    minzoom: number;
-    maxzoom: number;
-    format: string;
-    tilejson: string;
-}
 export declare function tileJson(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
 //# sourceMappingURL=tile.json.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tile.json.d.ts","sourceRoot":"","sources":["../../src/routes/tile.json.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAMnF,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,QAAQ,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA4BlF"}
+{"version":3,"file":"tile.json.d.ts","sourceRoot":"","sources":["../../src/routes/tile.json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAMnF,wBAAsB,QAAQ,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkClF"}

package/build/routes/tile.json.js

@@ -1,30 +1,38 @@
-import { Env } from '@basemaps/shared';
+import { GoogleTms, TileMatrixSet } from '@basemaps/geo';
+import { Env, extractTileMatrixSet } from '@basemaps/shared';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
-import { createHash } from 'crypto';
 import { Router } from '../router.js';
-import { NotModified } from './response.js';
-import { TileEtag } from './tile.etag.js';
+import { TileSets } from '../tile.set.cache.js';
+import { getTileMatrixId } from '../wmts.capability.js';
+import { NotFound } from './response.js';
 export async function tileJson(req) {
-    var _a;
+    var _a, _b, _c;
     const { version, rest, name } = Router.action(req);
+    if (rest.length !== 3)
+        return NotFound;
+    const tileMatrix = extractTileMatrixSet(rest[1]);
+    if (tileMatrix == null)
+        return NotFound;
+    req.timer.start('tileset:load');
+    const tileSet = await TileSets.get(rest[0], tileMatrix);
+    req.timer.end('tileset:load');
+    if (tileSet == null)
+        return NotFound;
     const apiKey = Router.apiKey(req);
     const host = (_a = Env.get(Env.PublicUrlBase)) !== null && _a !== void 0 ? _a : '';
-    const tileUrl = `${host}/${version}/${name}/${rest[0]}/${rest[1]}/{z}/{x}/{y}.pbf?api=${apiKey}`;
-    const tileJson = {
-        tiles: [tileUrl],
-        minzoom: 0,
-        maxzoom: 15,
-        format: 'pbf',
-        tilejson: '2.0.0',
-    };
+    const tileUrl = [host, version, name, tileSet.fullName, getTileMatrixId(tileMatrix), '{z}', '{x}', '{y}'].join('/') +
+        `.${tileSet.format}?api=${apiKey}`;
+    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)
+        tileJson.maxzoom = maxZoom;
+    if (tileSet.tileSet.minZoom)
+        tileJson.minzoom = minZoom;
     const json = JSON.stringify(tileJson);
     const data = Buffer.from(json);
-    const cacheKey = createHash('sha256').update(data).digest('base64');
-    if (TileEtag.isNotModified(req, cacheKey))
-        return NotModified;
     const response = new LambdaHttpResponse(200, 'ok');
-    response.header(HttpHeader.ETag, cacheKey);
-    response.header(HttpHeader.CacheControl, 'max-age=120');
+    response.header(HttpHeader.CacheControl, 'no-store');
     response.buffer(data, 'application/json');
     req.set('bytes', data.byteLength);
     return response;

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)) {
@@ -64,7 +64,7 @@ export class TileSetCache {
             return ts;
         }
         const ts = new TileSetVector(name, tileMatrix);
-        ts.tileSet = tileSet;
+        await ts.init(tileSet);
         this.tileSets.set(tileSetId, ts);
         return ts;
     }