@basemaps/lambda-tiler 6.26.0 → 6.28.1

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;
+    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,CAAC,EAAE,YAAY,CAAC;IACxB,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,CAAC,EAAE,YAAY,CAAC;IAExB,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;IAmC/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]);
@@ -59,6 +61,8 @@ export class WmtsCapabilities {
         ]);
     }
     buildProvider() {
+        if (this.provider == null)
+            return [];
         const { serviceIdentification, serviceProvider } = this.provider;
         const { contact } = serviceProvider;
         return [
@@ -127,9 +131,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 +168,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.28.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,22 +22,21 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/cli": "^6.26.0",
-    "@basemaps/config": "^6.26.0",
-    "@basemaps/geo": "^6.26.0",
+    "@basemaps/config": "^6.28.1",
+    "@basemaps/geo": "^6.28.1",
     "@basemaps/lambda": "^6.7.0",
-    "@basemaps/shared": "^6.26.0",
-    "@basemaps/tiler": "^6.26.0",
-    "@basemaps/tiler-sharp": "^6.26.0",
+    "@basemaps/shared": "^6.28.1",
+    "@basemaps/tiler": "^6.28.1",
+    "@basemaps/tiler-sharp": "^6.28.1",
     "@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/geojson": "^6.28.1",
+    "@linzjs/lambda": "^3.0.1",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.1.0",
     "pixelmatch": "^5.1.0",
-    "sharp": "^0.29.3"
+    "sharp": "0.29.2"
   },
   "bundle": {
     "entry": "src/index.ts",
@@ -53,12 +52,12 @@
     "bundle": "./bundle.sh"
   },
   "devDependencies": {
-    "@basemaps/attribution": "^6.26.0",
+    "@basemaps/attribution": "^6.28.1",
     "@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",
+    "@types/sharp": "0.29.2",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "1b3a7eb8aad1e0c9bb2ca64e0dcfe13b16e08a50"
+  "gitHead": "f387e0365bcfc7391fd8d0665195b246c93532cf"
 }

package/scripts/create.deployment.package.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * Create a pacakge.json for the `dist` bundle based off the parent package.json
+ * Create a package.json for the `dist` bundle based off the parent package.json
  *
  * This is needed as libsharp has to be "installed" into the dist node_modules so that lambda has access to sharp
  */
@@ -9,7 +9,7 @@ import * as fs from 'fs';
 const parentPackage = JSON.parse(fs.readFileSync('../package.json').toString());
 
 // Find the exact version of a package in the yarn lock
-function getPackageVersion(packageName) {
+export function getPackageVersion(packageName) {
   const parentLock = fs.readFileSync('../../../yarn.lock').toString().split('\n');
 
   for (let i = 0; i < parentLock.length; i++) {
@@ -24,7 +24,7 @@ function getPackageVersion(packageName) {
 // the bundle is a commonjs module
 parentPackage.type = 'commonjs';
 parentPackage.main = 'index.js';
-parentPackage.dependencies = { sharp: getPackageVersion('sharp') };
+parentPackage.dependencies = { sharp: '0.29.2' };
 
 // Clean up
 delete parentPackage.types;

package/src/{__test__ → __tests__}/tile.set.test.ts

@@ -1,15 +1,8 @@
-import { ConfigImagery } from '@basemaps/config';
 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' } as ConfigImagery;
-    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/src/{__test__ → __tests__}/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__ → __tests__}/attribution.test.ts

@@ -2,14 +2,14 @@ import { ConfigImagery, ConfigLayer, ConfigProvider } from '@basemaps/config';
 import { EpsgCode, GoogleTms, NamedBounds, 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';
@@ -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) => {

package/src/routes/__tests__/wmts.test.ts

@@ -0,0 +1,40 @@
+import { ImageFormat } from '@basemaps/geo';
+import { LogConfig } from '@basemaps/shared';
+import { LambdaHttpRequest, LambdaUrlRequest } from '@linzjs/lambda';
+import { Context } from 'aws-lambda';
+import o from 'ospec';
+import { getImageFormats } from '../tile.wmts.js';
+
+o.spec('GetImageFormats', () => {
+  function newRequest(path: string, query: string): LambdaHttpRequest {
+    return new LambdaUrlRequest(
+      {
+        requestContext: { http: { method: 'GET' } },
+        headers: {},
+        rawPath: path,
+        rawQueryString: query,
+        isBase64Encoded: false,
+      } as any,
+      {} as Context,
+      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/src/routes/tile.wmts.ts

@@ -1,6 +1,7 @@
 import { Config, TileSetType } from '@basemaps/config';
-import { TileMatrixSet } from '@basemaps/geo';
+import { ImageFormat, TileMatrixSet } from '@basemaps/geo';
 import { Env, TileSetName, tileWmtsFromPath } from '@basemaps/shared';
+import { getImageFormat } from '@basemaps/tiler';
 import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { createHash } from 'crypto';
 import { Router } from '../router.js';
@@ -10,6 +11,20 @@ import { WmtsCapabilities } from '../wmts.capability.js';
 import { NotFound, NotModified } from './response.js';
 import { TileEtag } from './tile.etag.js';
 
+export function getImageFormats(req: LambdaHttpRequest): ImageFormat[] | undefined {
+  const formats = req.query.getAll('format');
+  if (formats == null || formats.length === 0) return undefined;
+
+  const output: Set<ImageFormat> = 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
  *
@@ -29,10 +44,15 @@ export async function wmts(req: LambdaHttpRequest): Promise<LambdaHttpResponse>
 
   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 ?? undefined,
+    layers: tileSets,
+    apiKey,
+    formats: getImageFormats(req),
+  }).toXml();
   if (xml == null) return NotFound;
 
   const data = Buffer.from(xml);

package/src/tile.set.cache.ts

@@ -63,7 +63,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?.tileSet.updatedAt === tileSet.updatedAt) {
+    if (existing != null && existing?.tileSet.updatedAt === tileSet.updatedAt) {
       return existing;
     }
 

package/src/tile.set.raster.ts

@@ -20,7 +20,7 @@ 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);
 
@@ -35,6 +35,11 @@ export interface TileSetResponse {
 const DefaultResizeKernel = { in: 'lanczos3', out: 'lanczos3' } as const;
 const DefaultBackground = { r: 0, g: 0, b: 0, alpha: 0 };
 
+export function getTiffName(name: string): string {
+  if (name.endsWith('.tif') || name.endsWith('.tiff')) return name;
+  return `${name}.tiff`;
+}
+
 export class TileSetRaster {
   type: TileSetType.Raster = TileSetType.Raster;
 
@@ -46,17 +51,6 @@ export class TileSetRaster {
   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 {
-    if (name == null) return record.uri;
-    if (record.uri.endsWith('/')) throw new Error("Invalid uri ending with '/' " + record.uri);
-    return `${record.uri}/${name}.tiff`;
-  }
-
   constructor(name: string, tileMatrix: TileMatrixSet) {
     this.components = TileSetNameParser.parse(name);
     this.tileMatrix = tileMatrix;
@@ -122,17 +116,15 @@ 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: this.tileSet.background ?? DefaultBackground,
       resizeKernel: this.tileSet.resizeKernel ?? 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');
@@ -165,7 +157,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?.warn(
           { layer: layer.name, projection: this.tileMatrix.projection.code, imgId },
           'Failed to lookup imagery',
@@ -183,18 +174,18 @@ export class TileSetRaster {
     const output: CogTiff[] = [];
     for (const c of record.files) {
       if (!tileBounds.intersects(Bounds.fromJson(c))) continue;
+      const tiffPath = fsa.join(record.uri, getTiffName(c.name));
 
-      const tiffKey = `${record.id}_${c.name}`;
-      let existing = TiffCache.get(tiffKey);
+      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);

package/src/tile.set.vector.ts

@@ -1,5 +1,5 @@
 import { ConfigTileSetVector, TileSetNameComponents, TileSetNameParser, TileSetType } from '@basemaps/config';
-import { TileMatrixSet, VectorFormat } from '@basemaps/geo';
+import { GoogleTms, TileMatrixSet, VectorFormat } from '@basemaps/geo';
 import { fsa, TileDataXyz } from '@basemaps/shared';
 import { Cotar } from '@cotar/core';
 import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
@@ -53,6 +53,7 @@ export class TileSetVector {
 
   async tile(req: LambdaHttpRequest, xyz: TileDataXyz): Promise<LambdaHttpResponse> {
     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;
     if (layer[3857] == null) return new LambdaHttpResponse(500, 'Layer url not found from tileset Config');