feat(lambda-tiler): expose all pipelines in WMTSCapabilities BM-1455 (#3586)

### Motivation

Layers can now have quite a few pipelines, it would be useful to expose
all the pipelines to WMTS consumers

### Modifications

If no pipeline is provided expose all pipelines to the WMTS consumers

### Verification

Unit tests

Author: blacha

package-lock.json

@@ -55,8 +55,8 @@ export const TileSetElevation: ConfigTileSetRaster = {
   category: 'Elevation',
   layers: [
     {
-      2193: 'im_01FYWKAJ86W9P7RWM1VB62KD0H',
-      3857: 'im_01FYWKATAEK2ZTJQ2PX44Y0XNT',
+      2193: 'im_01FYWKAJ86W9P7RWM1VB62KDEM',
+      3857: 'im_01FYWKATAEK2ZTJQ2PX44Y0DEM',
       title: 'New Zealand 8m DEM (2012)',
       name: 'new-zealand_2012_dem_8m',
     },
@@ -82,6 +82,44 @@ export const TileSetHillshadeElevation: ConfigTileSetRaster = {
   outputs: [DefaultColorRampOutput],
 };
 
+export const Imagery2193Elevation: ConfigImagery = {
+  v: 2,
+  id: 'im_01FYWKAJ86W9P7RWM1VB62KDEM',
+  name: 'ōtorohanga_urban_2021_0-1m_DEM',
+  title: 'Ōtorohanga 0.1m DEM (2021)',
+  category: 'Elevation',
+  projection: 2193,
+  tileMatrix: 'NZTM2000Quad',
+  uri: 's3://linz-basemaps/2193/ōtorohanga_urban_2021_0-1m_DEM/im_01FYWKAJ86W9P7RWM1VB62KDEM',
+  bounds: {
+    x: 1757351.3044652338,
+    y: 5766358.996410044,
+    width: 40970.247160854284,
+    height: 26905.833956381306,
+  },
+  files: [],
+  bands: [{ type: 'float32' }],
+};
+
+export const Imagery3857Elevation: ConfigImagery = {
+  v: 2,
+  id: 'im_01FYWKATAEK2ZTJQ2PX44Y0DEM',
+  name: 'ōtorohanga_urban_2021_0-1m_DEM',
+  title: 'Ōtorohanga 0.1m Urban DEM (2021)',
+  category: 'Elevation',
+  projection: 3857,
+  tileMatrix: 'WebMercatorQuad',
+  uri: 's3://linz-basemaps/3857/ōtorohanga_urban_2021_0-1m_DEM/im_01FYWKATAEK2ZTJQ2PX44Y0DEM',
+  bounds: {
+    x: 1757351.3044652338,
+    y: 5766358.996410044,
+    width: 40970.247160854284,
+    height: 26905.833956381306,
+  },
+  files: [],
+  bands: [{ type: 'float32' }],
+};
+
 export const Imagery2193: ConfigImagery = {
   v: 2,
   id: 'im_01FYWKAJ86W9P7RWM1VB62KD0H',

packages/lambda-tiler/src/__tests__/config.data.ts

@@ -7,7 +7,15 @@ import { V, VNodeElement } from '@basemaps/shared';
 import { roundNumbersInString } from '@basemaps/test/build/rounding.js';
 
 import { WmtsCapabilities } from '../wmts.capability.js';
-import { Imagery2193, Imagery3857, Provider, TileSetAerial } from './config.data.js';
+import {
+  Imagery2193,
+  Imagery2193Elevation,
+  Imagery3857,
+  Imagery3857Elevation,
+  Provider,
+  TileSetAerial,
+  TileSetElevation,
+} from './config.data.js';
 
 function tags(node: VNodeElement | null | undefined, tag: string): VNodeElement[] {
   if (node == null) return [];
@@ -88,7 +96,7 @@ describe('WmtsCapabilities', () => {
   });
 
   it('should support unicorns and rainbows', () => {
-    const tileSet = { ...TileSetAerial };
+    const tileSet = structuredClone(TileSetAerial);
     tileSet.name = '🦄_🌈_2022_0-5m';
     tileSet.title = '🦄 🌈 Imagery (2022)';
     tileSet.description = '🦄 🌈 Description';
@@ -512,6 +520,14 @@ describe('WmtsCapabilities', () => {
     const rawB = wmtsB.toVNode();
     const layersB = tags(rawB, 'Layer');
     assert.equal(layersB.length, 1);
+    assert.deepEqual(
+      layersB.map((l) => l.find('ows:Identifier')?.textContent),
+      ['aerial'],
+    );
+    assert.deepEqual(
+      layersB.map((l) => l.find('ows:Title')?.textContent),
+      ['Aerial Imagery'],
+    );
   });
 
   it('should cover the entire WebMercatorBounds', () => {
@@ -527,7 +543,7 @@ describe('WmtsCapabilities', () => {
     imageBottomRight.bounds = { x: 0, y: -halfSize, width: halfSize, height: halfSize };
     imagery.set(imageBottomRight.id, imageBottomRight);
 
-    const tileSet = { ...TileSetAerial };
+    const tileSet = structuredClone(TileSetAerial);
     tileSet.layers = [
       { 3857: imageTopLeft.id, name: 'a_top_left', title: 'A Top Left' },
       { 3857: imageBottomRight.id, name: 'b_bottom_right', title: 'B Bottom Right' },
@@ -573,7 +589,7 @@ describe('WmtsCapabilities', () => {
     imageBottomRight.bounds = { x: halfSize / 2, y: -halfSize, width: halfSize, height: halfSize };
     imagery.set(imageBottomRight.id, imageBottomRight);
 
-    const tileSet = { ...TileSetAerial };
+    const tileSet = structuredClone(TileSetAerial);
     tileSet.layers = [{ 3857: imageBottomRight.id, name: 'b_bottom_right', title: 'B Bottom Right' }];
 
     const wmts = new WmtsCapabilities({
@@ -628,4 +644,41 @@ describe('WmtsCapabilities', () => {
     assert.equal(bboxC.children[0].textContent, '-180 -49.929855');
     assert.equal(bboxC.children[1].textContent, '180 2.938603');
   });
+
+  it('should export a layer per pipeline', () => {
+    const tileSet = structuredClone(TileSetElevation);
+
+    const wmts = new WmtsCapabilities({ httpBase: '' });
+    wmts.fromParams({
+      provider: Provider,
+      tileMatrix: [GoogleTms],
+      tileSet,
+      imagery: new Map([
+        [Imagery2193Elevation.id, Imagery2193Elevation],
+        [Imagery3857Elevation.id, Imagery3857Elevation],
+      ]),
+      formats: ['webp'],
+    });
+
+    const raw = wmts.toVNode();
+    const layers = [...(raw.find('Contents')?.tags('Layer') ?? [])];
+
+    assert.equal(layers.length, 2);
+    assert.deepEqual(
+      layers.map((l) => l.find('ows:Identifier')?.textContent),
+      ['elevation_terrain-rgb', 'elevation_color-ramp'],
+    );
+    assert.deepEqual(
+      layers.map((l) => l.find('ows:Title')?.textContent),
+      ['Elevation Imagery TerrainRGB', 'Elevation Imagery Color ramp'],
+    );
+
+    assert.deepEqual(
+      layers.map((l) => tags(l, 'Format').map((m) => m.textContent)),
+      [
+        ['image/png'], // Terrain RGB can only be used as PNG
+        ['image/webp'],
+      ],
+    );
+  });
 });

packages/lambda-tiler/src/__tests__/wmts.capability.test.ts

@@ -4,7 +4,15 @@ import { afterEach, beforeEach, describe, it } from 'node:test';
 import { ConfigProviderMemory, ConfigTileSetRaster } from '@basemaps/config';
 import { Env } from '@basemaps/shared';
 
-import { Imagery2193, Imagery3857, Provider, TileSetAerial, TileSetElevation } from '../../__tests__/config.data.js';
+import {
+  Imagery2193,
+  Imagery2193Elevation,
+  Imagery3857,
+  Imagery3857Elevation,
+  Provider,
+  TileSetAerial,
+  TileSetElevation,
+} from '../../__tests__/config.data.js';
 import { Api, mockUrlRequest } from '../../__tests__/xyz.util.js';
 import { handler } from '../../index.js';
 import { ConfigLoader } from '../../util/config.loader.js';
@@ -33,6 +41,8 @@ describe('WMTSRouting', () => {
       return process.env[arg];
     });
     config.put(TileSetElevation);
+    config.put(Imagery2193Elevation);
+    config.put(Imagery3857Elevation);
     t.mock.method(ConfigLoader, 'load', () => Promise.resolve(config));
     const req = mockUrlRequest(
       '/v1/tiles/elevation/WebMercatorQuad/WMTSCapabilities.xml',
@@ -42,9 +52,10 @@ describe('WMTSRouting', () => {
 
     assert.equal(res.status, 200);
     const lines = Buffer.from(res.body, 'base64').toString().split('\n');
-    const resourceUrl = lines.find((f) => f.includes('ResourceURL'))?.trim();
+    const resourceUrls = lines.filter((f) => f.includes('ResourceURL'));
 
-    assert.ok(resourceUrl);
+    const resourceUrl = resourceUrls[0].trim();
+    assert.equal(resourceUrls.length, 1);
     assert.ok(resourceUrl.includes('amp;pipeline=terrain-rgb'), `includes pipeline=terrain-rgb in ${resourceUrl}`);
     assert.ok(resourceUrl.includes('.png'), `includes .png in ${resourceUrl}`);
   });

packages/lambda-tiler/src/routes/__tests__/wmts.test.ts

@@ -1,4 +1,11 @@
-import { ConfigImagery, ConfigLayer, ConfigTileSet, standardizeLayerName } from '@basemaps/config';
+import {
+  ConfigImagery,
+  ConfigLayer,
+  ConfigTileSet,
+  ConfigTileSetRasterOutput,
+  standardizeLayerName,
+  TileSetType,
+} from '@basemaps/config';
 import { BoundingBox, Bounds, GoogleTms, ImageFormat, Projection, TileMatrixSet, WmtsProvider } from '@basemaps/geo';
 import { toQueryString, V, VNodeElement } from '@basemaps/shared';
 import { ImageFormatOrder } from '@basemaps/tiler';
@@ -74,7 +81,13 @@ export class WmtsBuilder {
     for (const format of formats) this.formats.push(format);
   }
 
-  getFormats(): ImageFormat[] {
+  getFormats(restrictTo?: ImageFormat[]): ImageFormat[] {
+    if (restrictTo) {
+      if (this.formats.length === 0) return restrictTo;
+      const filtered = this.formats.filter((f) => restrictTo.includes(f));
+      if (filtered.length === 0) return restrictTo;
+      return filtered;
+    }
     if (this.formats.length) return this.formats;
     return ImageFormatOrder;
   }
@@ -154,17 +167,17 @@ export class WmtsBuilder {
     return V('Style', { isDefault: 'true' }, [V('ows:Title', 'Default Style'), V('ows:Identifier', 'default')]);
   }
 
-  buildResourceUrl(tileSetId: string, suffix: string): VNodeElement {
+  buildResourceUrl(tileSetId: string, suffix: string, pipeline?: string): VNodeElement {
     return V('ResourceURL', {
       format: 'image/' + suffix,
       resourceType: 'tile',
-      template: this.buildTileUrl(tileSetId, suffix),
+      template: this.buildTileUrl(tileSetId, suffix, pipeline),
     });
   }
 
-  buildTileUrl(tileSetId: string, suffix: string): string {
+  buildTileUrl(tileSetId: string, suffix: string, pipeline?: string): string {
     // TODO this should restrict the output formats to supported formats in pipelines
-    const query = { api: this.apiKey, config: this.config, pipeline: this.pipeline };
+    const query = { api: this.apiKey, config: this.config, pipeline };
 
     return [
       this.httpBase,
@@ -178,10 +191,6 @@ export class WmtsBuilder {
     ].join('/');
   }
 
-  buildFormats(): VNodeElement[] {
-    return this.getFormats().map((fmt) => V('Format', 'image/' + fmt));
-  }
-
   buildTileMatrixLink(tileSet: ConfigTileSet): VNodeElement[] {
     const matrixSetNodes: VNodeElement[] = [];
     for (const tms of this.tileMatrixSets.values()) {
@@ -319,7 +328,7 @@ export class WmtsCapabilities extends WmtsBuilder {
     ];
   }
 
-  toLayerVNode(tileSet: ConfigTileSet): VNodeElement {
+  toLayerVNode(tileSet: ConfigTileSet): VNodeElement[] {
     const matrixSets = this.getMatrixSets(tileSet);
     const matrixSetList = [...matrixSets.values()];
     const firstMatrix = matrixSetList[0];
@@ -334,19 +343,43 @@ export class WmtsCapabilities extends WmtsBuilder {
       bounds.push(Bounds.fromJson(img.bounds));
     }
 
+    const layers: VNodeElement[] = [];
+
+    const pipelines = this.getPipelines(tileSet, this.pipeline);
+
     const layerNameId = standardizeLayerName(tileSet.name);
-    return V('Layer', [
-      V('ows:Title', tileSet.title),
-      V('ows:Abstract', tileSet.description ?? ''),
-      V('ows:Identifier', layerNameId),
-      this.buildKeywords(tileSet),
-      ...[...matrixSets.values()].map((tms) => this.buildBoundingBoxFromImagery(tms, tileSet.layers)),
-      this.buildWgs84BoundingBox(webMercatorOrFirst, bounds),
-      this.buildStyle(),
-      ...this.buildFormats(),
-      ...this.buildTileMatrixLink(tileSet),
-      ...this.getFormats().map((fmt) => this.buildResourceUrl(layerNameId, fmt)),
-    ]);
+
+    for (const pipeline of pipelines) {
+      const formats = this.getFormats(pipeline.format);
+      const layerId = pipeline.default ? layerNameId : `${layerNameId}_${pipeline.name}`;
+      const layerTitle = pipeline.default ? tileSet.title : `${tileSet.title} ${pipeline.title}`;
+
+      const layer = V('Layer', [
+        V('ows:Title', layerTitle),
+        V('ows:Abstract', tileSet.description ?? ''),
+        V('ows:Identifier', layerId),
+        this.buildKeywords(tileSet),
+        ...[...matrixSets.values()].map((tms) => this.buildBoundingBoxFromImagery(tms, tileSet.layers)),
+        this.buildWgs84BoundingBox(webMercatorOrFirst, bounds),
+        this.buildStyle(),
+        ...formats.map((fmt) => V('Format', 'image/' + fmt)),
+        ...this.buildTileMatrixLink(tileSet),
+        ...formats.map((fmt) => this.buildResourceUrl(layerNameId, fmt, pipeline.default ? undefined : pipeline.name)),
+      ]);
+      layers.push(layer);
+    }
+
+    return layers;
+  }
+
+  getPipelines(tileSet: ConfigTileSet, pipeline?: string): ConfigTileSetRasterOutput[] {
+    if (tileSet.type !== TileSetType.Raster) return [];
+
+    if (tileSet.outputs == null) return [{ name: 'rgba', title: 'RGBA', default: true }];
+
+    if (pipeline) return tileSet.outputs.filter((f) => f.name === pipeline);
+
+    return tileSet.outputs;
   }
 
   toAllImageryLayersVNode(configLayers?: ConfigLayer[]): VNodeElement[] {
@@ -393,7 +426,7 @@ export class WmtsCapabilities extends WmtsBuilder {
 
     // Build TileSet Layer VNodes
     const layers: VNodeElement[] = [];
-    layers.push(this.toLayerVNode(this.tileSet));
+    layers.push(...this.toLayerVNode(this.tileSet));
     const contents = layers.concat(this.toAllImageryLayersVNode(this.configLayers));
 
     // Build TileMatrix Sets vNodes