fix(lambda-tiler): correctly build WMTS for child tile sets

packages/lambda-tiler/src/__test__/tile.set.cache.test.ts

@@ -49,6 +49,7 @@ o.spec('TileSetCache', () => {
             if (parentTileSet == null || parentTileSet.isVector()) throw new Error('null parentTileSet');
             parentTileSet.imagery = imgMap;
             parentTileSet.tileSet = {
+                name: 'parent',
                 title: 'parent aerial title',
                 background: { r: 200, g: 50, b: 100, alpha: 0.5 },
             } as ConfigTileSetRaster;
@@ -76,6 +77,12 @@ o.spec('TileSetCache', () => {
             const aTiff = subTileSet.getTiffsForTile({ x: 0, y: 0, z: 0 });
             o(aTiff.length).equals(1);
             o(aTiff[0].source.uri).equals('s3://foo/bar/foo.tiff');
+
+            TileSets.cache.delete(subTileSet.id);
+            delete parentTileSet.tileSet.title;
+            const subTileSetB = await TileSets.get('aerial@head:tasman_rural_2018-19_0-3m', GoogleTms);
+            if (subTileSetB == null || subTileSetB.isVector()) throw new Error('null subTileSetB');
+            o(subTileSetB.title).equals('parent Tasman rural 2018-19 0.3m');
         });
     });
 

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

@@ -189,6 +189,33 @@ o.spec('WmtsCapabilities', () => {
         o(layers[1].find('TileMatrixSet')?.textContent).equals('EPSG:2193');
     });
 
+    o('should support child tile sets', () => {
+        const ts = [
+            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 layers = tags(nodes, 'Layer');
+
+        o(layers.length).equals(2);
+
+        const boundingBoxes = tags(layers[0], 'ows:BoundingBox');
+        o(boundingBoxes.length).equals(1);
+
+        const firstTitle = layers[0].children[0].textContent;
+        o(firstTitle).equals('wairoa_urban_2014-2015_0-10m_RGBA');
+        const secondTitle = layers[1].children[0].textContent;
+        o(secondTitle).equals('west-coast_rural_2016-17_0-3m');
+    });
+
     o('should support multiple different projections on different tiles sets', () => {
         const ts = [
             new FakeTileSet(TileSetName.aerial, Nztm2000Tms, TileSetName.aerial),

packages/lambda-tiler/src/routes/tile.ts

@@ -30,6 +30,11 @@ export async function tile(req: LambdaContext): Promise<LambdaHttpResponse> {
 }
 
 async function wmtsLoadTileSets(name: string, tileMatrix: TileMatrixSet | null): Promise<TileSetRaster[]> {
+    if (tileMatrix != null) {
+        const ts = await TileSets.get(name, tileMatrix);
+        if (ts == null || ts.isVector()) return [];
+        return [ts];
+    }
     if (name === '') name = TileSetName.aerial;
     return (await TileSets.getAll(name, tileMatrix)).filter((f) => f.type === 'raster') as TileSetRaster[];
 }

packages/lambda-tiler/src/tile.set.raster.ts

@@ -195,7 +195,8 @@ export class TileSetRaster extends TileSetHandler<ConfigTileSetRaster> {
         // use parent data as prototype for child;
         child.tileSet = { ...this.tileSet };
         child.tileSet.background = undefined;
-        child.tileSet.title = `${this.tileSet?.title} ${titleizeImageryName(image.name)}`;
+        const title = this.tileSet?.title ?? this.tileSet?.name;
+        child.tileSet.title = `${title} ${titleizeImageryName(image.name)}`;
         child.extentOverride = Bounds.fromJson(image.bounds);
 
         const layer: ConfigLayer = { name: image.name, minZoom: 0, maxZoom: 100 };

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

@@ -44,10 +44,10 @@ export class WmtsCapabilities {
 
         for (const layer of layers) {
             // TODO is grouping by name the best option
-            let existing = this.layers.get(layer.components.name);
+            let existing = this.layers.get(layer.fullName);
             if (existing == null) {
                 existing = [];
-                this.layers.set(layer.components.name, existing);
+                this.layers.set(layer.fullName, existing);
             }
             // TODO should a error be thrown here if the projection is invalid
             existing.push(layer);