@basemaps/lambda-tiler 7.7.0 → 7.10.0

package/build/routes/health.js

@@ -1,13 +1,47 @@
 import * as fs from 'node:fs';
+import { TileSetType } from '@basemaps/config';
 import { GoogleTms, Nztm2000QuadTms } from '@basemaps/geo';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
+import { VectorTile } from '@mapbox/vector-tile';
+import Protobuf from 'pbf';
 import PixelMatch from 'pixelmatch';
 import Sharp from 'sharp';
+import { gunzipSync } from 'zlib';
 import { ConfigLoader } from '../util/config.loader.js';
+import { isGzip } from '../util/cotar.serve.js';
 import { TileXyzRaster } from './tile.xyz.raster.js';
+import { tileXyzVector } from './tile.xyz.vector.js';
 export const TestTiles = [
     { tileSet: 'health', tileMatrix: GoogleTms, tileType: 'png', tile: { x: 252, y: 156, z: 8 } },
     { tileSet: 'health', tileMatrix: Nztm2000QuadTms, tileType: 'png', tile: { x: 30, y: 33, z: 6 } },
+    {
+        tileSet: 'topographic',
+        tileMatrix: GoogleTms,
+        tileType: 'pbf',
+        tile: { x: 1009, y: 641, z: 10 },
+        testFeatures: [
+            { layer: 'aeroway', key: 'name', value: 'Wellington Airport' },
+            { layer: 'place', key: 'name', value: 'Wellington' },
+            { layer: 'coastline', key: 'class', value: 'coastline' },
+            { layer: 'landcover', key: 'class', value: 'grass' },
+            { layer: 'poi', key: 'name', value: 'Seatoun Wharf' },
+            { layer: 'transportation', key: 'name', value: 'Mt Victoria Tunnel' },
+        ],
+    },
+    {
+        tileSet: 'topographic',
+        tileMatrix: GoogleTms,
+        tileType: 'pbf',
+        tile: { x: 62, y: 40, z: 6 },
+        testFeatures: [
+            { layer: 'landuse', key: 'name', value: 'Queenstown' },
+            { layer: 'place', key: 'name', value: 'Christchurch' },
+            { layer: 'water', key: 'name', value: 'Tasman Lake' },
+            { layer: 'coastline', key: 'class', value: 'coastline' },
+            { layer: 'landcover', key: 'class', value: 'wood' },
+            { layer: 'transportation', key: 'name', value: 'STATE HIGHWAY 6' },
+        ],
+    },
 ];
 const TileSize = 256;
 export async function getTestBuffer(test) {
@@ -27,6 +61,80 @@ export async function updateExpectedTile(test, newTileData, difference) {
         .toBuffer();
     await fs.promises.writeFile(`${expectedFileName}.diff.png`, imgPng);
 }
+/**
+ * Compare and validate the raster test tile from server with pixel match
+ */
+async function validateRasterTile(tileSet, test, req) {
+    // Get the parse response tile to raw buffer
+    const response = await TileXyzRaster.tile(req, tileSet, test);
+    if (response.status !== 200)
+        throw new LambdaHttpResponse(500, response.statusDescription);
+    if (!Buffer.isBuffer(response._body))
+        throw new LambdaHttpResponse(500, 'Not a Buffer response content.');
+    const resImgBuffer = await Sharp(response._body).raw().toBuffer();
+    // Get test tile to compare
+    const testBuffer = await getTestBuffer(test);
+    test.buf = testBuffer;
+    const testImgBuffer = await Sharp(testBuffer).raw().toBuffer();
+    const outputBuffer = Buffer.alloc(testImgBuffer.length);
+    const missMatchedPixels = PixelMatch(testImgBuffer, resImgBuffer, outputBuffer, TileSize, TileSize);
+    if (missMatchedPixels) {
+        /** Uncomment this to overwite the expected files */
+        // await updateExpectedTile(test, response._body as Buffer, outputBuffer);
+        req.log.error({ missMatchedPixels, projection: test.tileMatrix.identifier, xyz: test.tile }, 'Health:MissMatch');
+        throw new LambdaHttpResponse(500, 'TileSet does not match.');
+    }
+}
+function checkFeatureExists(tile, testFeature) {
+    const layer = tile.layers[testFeature.layer];
+    for (let i = 0; i < layer.length; i++) {
+        const feature = layer.feature(i);
+        if (feature.properties[testFeature.key] === testFeature.value)
+            return true;
+    }
+    return false;
+}
+/**
+ * Fetch vector tile and decode into mapbox VectorTile
+ */
+export const VectorTileProvider = {
+    async getVectorTile(tileSet, test, req) {
+        // Get the parse response tile to raw buffer
+        const response = await tileXyzVector.tile(req, tileSet, test);
+        if (response.status !== 200)
+            throw new LambdaHttpResponse(500, response.statusDescription);
+        if (!Buffer.isBuffer(response._body))
+            throw new LambdaHttpResponse(500, 'Not a Buffer response content.');
+        const buffer = isGzip(response._body) ? gunzipSync(response._body) : response._body;
+        return new VectorTile(new Protobuf(buffer));
+    },
+};
+/**
+ * Check the existence of a feature property in side the vector tile
+ *
+ * @throws LambdaHttpResponse if any test feature not found from vector tile
+ */
+function featureCheck(tile, testTile) {
+    const testTileName = `${testTile.tileSet}-${testTile.tile.x}/${testTile.tile.y}/z${testTile.tile.z}`;
+    if (testTile.testFeatures == null) {
+        throw new LambdaHttpResponse(500, `No test feature found from testTile: ${testTileName}`);
+    }
+    for (const testFeature of testTile.testFeatures) {
+        if (!checkFeatureExists(tile, testFeature)) {
+            throw new LambdaHttpResponse(500, `Failed to validate tile: ${testTileName} for layer: ${testFeature.layer}.`);
+        }
+    }
+}
+/**
+ * Health check the test vector tiles that contains all the expected features.
+ *
+ * @throws LambdaHttpResponse if test tiles not returned or features not exists
+ */
+async function validateVectorTile(tileSet, test, req) {
+    // Get the parse response tile to raw buffer
+    const tile = await VectorTileProvider.getVectorTile(tileSet, test, req);
+    featureCheck(tile, test);
+}
 /**
  * Health request get health TileSets and validate with test TileSets
  * - Valid response from get heath tile request
@@ -36,28 +144,18 @@ export async function updateExpectedTile(test, newTileData, difference) {
  */
 export async function healthGet(req) {
     const config = await ConfigLoader.load(req);
-    const tileSet = await config.TileSet.get(config.TileSet.id('health'));
-    if (tileSet == null)
-        throw new LambdaHttpResponse(500, 'TileSet: "health" not found');
     for (const test of TestTiles) {
-        // Get the parse response tile to raw buffer
-        const response = await TileXyzRaster.tile(req, tileSet, test);
-        if (response.status !== 200)
-            return new LambdaHttpResponse(500, response.statusDescription);
-        if (!Buffer.isBuffer(response._body))
-            throw new LambdaHttpResponse(500, 'Not a Buffer response content.');
-        const resImgBuffer = await Sharp(response._body).raw().toBuffer();
-        // Get test tile to compare
-        const testBuffer = await getTestBuffer(test);
-        test.buf = testBuffer;
-        const testImgBuffer = await Sharp(testBuffer).raw().toBuffer();
-        const outputBuffer = Buffer.alloc(testImgBuffer.length);
-        const missMatchedPixels = PixelMatch(testImgBuffer, resImgBuffer, outputBuffer, TileSize, TileSize);
-        if (missMatchedPixels) {
-            /** Uncomment this to overwite the expected files */
-            // await updateExpectedTile(test, response._body as Buffer, outputBuffer);
-            req.log.error({ missMatchedPixels, projection: test.tileMatrix.identifier, xyz: test.tile }, 'Health:MissMatch');
-            return new LambdaHttpResponse(500, 'TileSet does not match.');
+        const tileSet = await config.TileSet.get(config.TileSet.id(test.tileSet));
+        if (tileSet == null)
+            throw new LambdaHttpResponse(500, `TileSet: ${test.tileSet} not found`);
+        if (tileSet.type === TileSetType.Raster) {
+            await validateRasterTile(tileSet, test, req);
+        }
+        else if (tileSet.type === TileSetType.Vector) {
+            await validateVectorTile(tileSet, test, req);
+        }
+        else {
+            throw new LambdaHttpResponse(500, `Invalid TileSet type for tileSet ${test.tileSet}`);
         }
     }
     // Return Ok response when all health test passed.

package/build/routes/health.js.map

@@ -1 +1 @@
-{"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"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"}

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

@@ -1,25 +1,53 @@
-import { ConfigTileSetRaster, Layer, StyleJson } from '@basemaps/config';
+import { ConfigTileSetRaster, StyleJson } from '@basemaps/config';
 import { TileMatrixSet } from '@basemaps/geo';
 import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 /**
- * Convert relative URLS into a full hostname url
+ * Convert relative URL into a full hostname URL, converting {tileMatrix} into the provided tileMatrix
+ *
+ * Will also add query parameters of apiKey and configuration if provided
+ *
+ * @example
+ * ```typescript
+ * convertRelativeUrl("/v1/tiles/aerial/{tileMatrix}/{z}/{x}/{y}.webp", NZTM2000Quad)
+ * "https://basemaps.linz.govt.nz/v1/tiles/aerial/NZTM2000Quad/{z}/{x}/{y}.webp?api=c..."
+ * ```
+ *
  * @param url possible url to update
  * @param apiKey ApiKey to append with ?api= if required
- * @returns Updated Url or empty string if url is empty
+ * @param tileMatrix replace {tileMatrix} with the tile matrix
+ *
+ * @returns Updated URL or empty string if url is empty
  */
 export declare function convertRelativeUrl(url?: string, tileMatrix?: TileMatrixSet, apiKey?: string, config?: string | null): string;
 /**
- * Create a new style json that has absolute urls to the current host and  API Keys where required
+ * Update the style JSON to have absolute urls to the current host and API Keys where required
+ *
  * @param style style to update
+ * @param tileMatrix convert the tile matrix to the target tile matrix
  * @param apiKey api key to inject
- * @returns new stylejson
+ * @param config optional configuration url to use
+ * @param layers replace the layers in the style json
+ * @returns new style JSON
  */
-export declare function convertStyleJson(style: StyleJson, tileMatrix: TileMatrixSet, apiKey: string, config: string | null, layers?: Layer[]): StyleJson;
+export declare function setStyleUrls(style: StyleJson, tileMatrix: TileMatrixSet, apiKey: string, config: string | null): void;
+export interface StyleConfig {
+    /** Name of the terrain layer */
+    terrain?: string | null;
+    /** Combine layer with the labels layer */
+    labels: boolean;
+}
+/**
+ * Generate a StyleJSON from a tileset
+ * @returns
+ */
+export declare function tileSetToStyle(req: LambdaHttpRequest<StyleGet>, tileSet: ConfigTileSetRaster, tileMatrix: TileMatrixSet, apiKey: string): StyleJson;
+/**
+ * generate a style from a tile set which has a output
+ */
+export declare function tileSetOutputToStyle(req: LambdaHttpRequest<StyleGet>, tileSet: ConfigTileSetRaster, tileMatrix: TileMatrixSet, apiKey: string): StyleJson;
 export interface StyleGet {
     Params: {
         styleName: string;
     };
 }
-export declare function tileSetToStyle(req: LambdaHttpRequest<StyleGet>, tileSet: ConfigTileSetRaster, tileMatrix: TileMatrixSet, apiKey: string, terrain?: string): Promise<LambdaHttpResponse>;
-export declare function tileSetOutputToStyle(req: LambdaHttpRequest<StyleGet>, tileSet: ConfigTileSetRaster, tileMatrix: TileMatrixSet, apiKey: string, terrain?: string): Promise<LambdaHttpResponse>;
 export declare function styleJsonGet(req: LambdaHttpRequest<StyleGet>): Promise<LambdaHttpResponse>;

package/build/routes/tile.style.json.js

@@ -1,18 +1,30 @@
-import { ConfigId, ConfigPrefix, TileSetType } from '@basemaps/config';
+import { ConfigId, ConfigPrefix, TileSetType, } from '@basemaps/config';
 import { DefaultExaggeration } from '@basemaps/config/build/config/vector.style.js';
-import { GoogleTms, TileMatrixSets } from '@basemaps/geo';
+import { GoogleTms, Nztm2000QuadTms, TileMatrixSets } from '@basemaps/geo';
 import { Env, toQueryString } from '@basemaps/shared';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import { URL } from 'url';
 import { ConfigLoader } from '../util/config.loader.js';
 import { Etag } from '../util/etag.js';
+import { convertStyleToNztmStyle } from '../util/nztm.style.js';
 import { NotFound, NotModified } from '../util/response.js';
 import { Validate } from '../util/validate.js';
 /**
- * Convert relative URLS into a full hostname url
+ * Convert relative URL into a full hostname URL, converting {tileMatrix} into the provided tileMatrix
+ *
+ * Will also add query parameters of apiKey and configuration if provided
+ *
+ * @example
+ * ```typescript
+ * convertRelativeUrl("/v1/tiles/aerial/{tileMatrix}/{z}/{x}/{y}.webp", NZTM2000Quad)
+ * "https://basemaps.linz.govt.nz/v1/tiles/aerial/NZTM2000Quad/{z}/{x}/{y}.webp?api=c..."
+ * ```
+ *
  * @param url possible url to update
  * @param apiKey ApiKey to append with ?api= if required
- * @returns Updated Url or empty string if url is empty
+ * @param tileMatrix replace {tileMatrix} with the tile matrix
+ *
+ * @returns Updated URL or empty string if url is empty
  */
 export function convertRelativeUrl(url, tileMatrix, apiKey, config) {
     if (url == null)
@@ -30,18 +42,18 @@ export function convertRelativeUrl(url, tileMatrix, apiKey, config) {
     return fullUrl.toString().replace(/%7B/g, '{').replace(/%7D/g, '}');
 }
 /**
- * Create a new style json that has absolute urls to the current host and  API Keys where required
+ * Update the style JSON to have absolute urls to the current host and API Keys where required
+ *
  * @param style style to update
+ * @param tileMatrix convert the tile matrix to the target tile matrix
  * @param apiKey api key to inject
- * @returns new stylejson
+ * @param config optional configuration url to use
+ * @param layers replace the layers in the style json
+ * @returns new style JSON
  */
-export function convertStyleJson(style, tileMatrix, apiKey, config, layers) {
-    const sources = JSON.parse(JSON.stringify(style.sources));
-    for (const [key, value] of Object.entries(sources)) {
+export function setStyleUrls(style, tileMatrix, apiKey, config) {
+    for (const [key, value] of Object.entries(style.sources ?? {})) {
         if (value.type === 'vector') {
-            if (tileMatrix !== GoogleTms) {
-                throw new LambdaHttpResponse(400, `TileMatrix is not supported for the vector source ${value.url}.`);
-            }
             value.url = convertRelativeUrl(value.url, tileMatrix, apiKey, config);
         }
         else if ((value.type === 'raster' || value.type === 'raster-dem') && Array.isArray(value.tiles)) {
@@ -49,52 +61,80 @@ export function convertStyleJson(style, tileMatrix, apiKey, config, layers) {
                 value.tiles[i] = convertRelativeUrl(value.tiles[i], tileMatrix, apiKey, config);
             }
         }
-        sources[key] = value;
+        style.sources[key] = value;
     }
-    const styleJson = {
-        version: 8,
-        id: style.id,
-        name: style.name,
-        sources,
-        layers: layers ? layers : style.layers,
-    };
-    if (style.metadata)
-        styleJson.metadata = style.metadata;
     if (style.glyphs)
-        styleJson.glyphs = convertRelativeUrl(style.glyphs, undefined, undefined, config);
+        style.glyphs = convertRelativeUrl(style.glyphs, undefined, undefined, config);
     if (style.sprite)
-        styleJson.sprite = convertRelativeUrl(style.sprite, undefined, undefined, config);
-    if (style.sky)
-        styleJson.sky = style.sky;
-    return styleJson;
+        style.sprite = convertRelativeUrl(style.sprite, undefined, undefined, config);
 }
+/**
+ * Turn on the terrain setting in the style json
+ */
 function setStyleTerrain(style, terrain, tileMatrix) {
     const source = Object.keys(style.sources).find((s) => s === terrain);
     if (source == null)
-        throw new LambdaHttpResponse(400, `Terrain: ${terrain} is not exists in the style source.`);
+        throw new LambdaHttpResponse(400, `Terrain: ${terrain} does not exists in the style source.`);
     style.terrain = {
         source,
         exaggeration: DefaultExaggeration[tileMatrix.identifier] ?? DefaultExaggeration[GoogleTms.identifier],
     };
 }
-async function ensureTerrain(req, tileMatrix, apiKey, style) {
+/**
+ * Merge the "labels" layer into the style json
+ */
+async function setStyleLabels(req, style) {
     const config = await ConfigLoader.load(req);
-    const terrain = await config.TileSet.get('ts_elevation');
-    if (terrain) {
-        const configLocation = ConfigLoader.extract(req);
-        const elevationQuery = toQueryString({ config: configLocation, api: apiKey, pipeline: 'terrain-rgb' });
-        style.sources['LINZ-Terrain'] = {
-            type: 'raster-dem',
-            tileSize: 256,
-            maxzoom: 18,
-            tiles: [convertRelativeUrl(`/v1/tiles/elevation/${tileMatrix.identifier}/{z}/{x}/{y}.png${elevationQuery}`)],
-        };
+    const labels = await config.Style.get('labels');
+    if (labels == null) {
+        req.log.warn('LabelsStyle:Missing');
+        return;
+    }
+    const layerId = new Set();
+    for (const l of style.layers)
+        layerId.add(l.id);
+    for (const newLayers of labels.style.layers) {
+        if (layerId.has(newLayers.id)) {
+            throw new LambdaHttpResponse(400, 'Cannot merge styles with duplicate layerIds: ' + newLayers.id);
+        }
     }
+    if (style.glyphs == null)
+        style.glyphs = labels.style.glyphs;
+    if (style.sprite == null)
+        style.sprite = labels.style.sprite;
+    if (style.sky == null)
+        style.sky = labels.style.sky;
+    Object.assign(style.sources, labels.style.sources);
+    style.layers = style.layers.concat(labels.style.layers);
 }
-export async function tileSetToStyle(req, tileSet, tileMatrix, apiKey, terrain) {
+/**
+ * Ensure that a "LINZ-Terrain" layer is force added into the output styleJSON source
+ */
+async function ensureTerrain(req, tileMatrix, apiKey, style) {
+    const config = await ConfigLoader.load(req);
+    const terrain = await config.TileSet.get('elevation');
+    if (terrain == null)
+        return;
+    const configLocation = ConfigLoader.extract(req);
+    const elevationQuery = toQueryString({ config: configLocation, api: apiKey, pipeline: 'terrain-rgb' });
+    style.sources['LINZ-Terrain'] = {
+        type: 'raster-dem',
+        tileSize: 256,
+        maxzoom: 18, // TODO: this should be configurable based on the elevation layer
+        tiles: [convertRelativeUrl(`/v1/tiles/elevation/${tileMatrix.identifier}/{z}/{x}/{y}.png${elevationQuery}`)],
+    };
+}
+/**
+ * Generate a StyleJSON from a tileset
+ * @returns
+ */
+export function tileSetToStyle(req, tileSet, tileMatrix, apiKey) {
+    // If the style has outputs defined it has a different process for generating the stylejson
+    if (tileSet.outputs)
+        return tileSetOutputToStyle(req, tileSet, tileMatrix, apiKey);
     const [tileFormat] = Validate.getRequestedFormats(req) ?? ['webp'];
     if (tileFormat == null)
-        return new LambdaHttpResponse(400, 'Invalid image format');
+        throw new LambdaHttpResponse(400, 'Invalid image format');
     const pipeline = Validate.pipeline(tileSet, tileFormat, req.query.get('pipeline'));
     const pipelineName = pipeline?.name === 'rgba' ? undefined : pipeline?.name;
     const configLocation = ConfigLoader.extract(req);
@@ -102,132 +142,108 @@ export async function tileSetToStyle(req, tileSet, tileMatrix, apiKey, terrain)
     const tileUrl = (Env.get(Env.PublicUrlBase) ?? '') +
         `/v1/tiles/${tileSet.name}/${tileMatrix.identifier}/{z}/{x}/{y}.${tileFormat}${query}`;
     const styleId = `basemaps-${tileSet.name}`;
-    const style = {
+    return {
         id: ConfigId.prefix(ConfigPrefix.Style, tileSet.name),
         name: tileSet.name,
         version: 8,
         sources: { [styleId]: { type: 'raster', tiles: [tileUrl], tileSize: 256 } },
         layers: [{ id: styleId, type: 'raster', source: styleId }],
     };
-    // Ensure elevation for individual tilesets
-    await ensureTerrain(req, tileMatrix, apiKey, style);
-    // Add terrain in style
-    if (terrain)
-        setStyleTerrain(style, terrain, tileMatrix);
-    const data = Buffer.from(JSON.stringify(style));
-    const cacheKey = Etag.key(data);
-    if (Etag.isNotModified(req, cacheKey))
-        return NotModified();
-    const response = new LambdaHttpResponse(200, 'ok');
-    response.header(HttpHeader.ETag, cacheKey);
-    response.header(HttpHeader.CacheControl, 'no-store');
-    response.buffer(data, 'application/json');
-    req.set('bytes', data.byteLength);
-    return response;
 }
-export async function tileSetOutputToStyle(req, tileSet, tileMatrix, apiKey, terrain) {
+/**
+ * generate a style from a tile set which has a output
+ */
+export function tileSetOutputToStyle(req, tileSet, tileMatrix, apiKey) {
+    if (tileSet.outputs == null)
+        throw new LambdaHttpResponse(400, 'TileSet does not have any outputs to generate');
     const configLocation = ConfigLoader.extract(req);
-    const query = toQueryString({ config: configLocation, api: apiKey });
     const styleId = `basemaps-${tileSet.name}`;
     const sources = {};
     const layers = [];
-    if (tileSet.outputs) {
-        //for loop output.
-        for (const output of tileSet.outputs) {
-            const format = output.format?.[0] ?? 'webp';
-            const urlBase = Env.get(Env.PublicUrlBase) ?? '';
-            const tileUrl = `${urlBase}/v1/tiles/${tileSet.name}/${tileMatrix.identifier}/{z}/{x}/{y}.${format}${query}`;
-            if (output.name === 'terrain-rgb') {
-                // Add both raster source and dem raster source for terrain-rgb output
-                sources[`${styleId}-${output.name}`] = {
-                    type: 'raster',
-                    tiles: [tileUrl + `&pipeline=${output.name}`],
-                    tileSize: 256,
-                };
-                sources[`${styleId}-${output.name}-dem`] = {
-                    type: 'raster-dem',
-                    tiles: [tileUrl + `&pipeline=${output.name}`],
-                    tileSize: 256,
-                };
-            }
-            else {
-                // Add raster source other outputs
-                sources[`${styleId}-${output.name}`] = {
-                    type: 'raster',
-                    tiles: [tileUrl + `&pipeline=${output.name}`],
-                    tileSize: 256,
-                };
-            }
+    for (const output of tileSet.outputs) {
+        const format = output.format?.[0] ?? 'webp';
+        const urlBase = Env.get(Env.PublicUrlBase) ?? '';
+        const query = toQueryString({ config: configLocation, api: apiKey, pipeline: output.name });
+        const tileUrl = `${urlBase}/v1/tiles/${tileSet.name}/${tileMatrix.identifier}/{z}/{x}/{y}.${format}${query}`;
+        if (output.name === 'terrain-rgb') {
+            // Add both raster source and dem raster source for terrain-rgb output
+            sources[`${styleId}-${output.name}`] = { type: 'raster', tiles: [tileUrl], tileSize: 256 };
+            sources[`${styleId}-${output.name}-dem`] = { type: 'raster-dem', tiles: [tileUrl], tileSize: 256 };
+        }
+        else {
+            // Add raster source other outputs
+            sources[`${styleId}-${output.name}`] = { type: 'raster', tiles: [tileUrl], tileSize: 256 };
         }
     }
     // Add first raster source as default layer
     for (const source of Object.keys(sources)) {
         if (sources[source].type === 'raster') {
-            layers.push({
-                id: styleId,
-                type: 'raster',
-                source,
-            });
+            layers.push({ id: styleId, type: 'raster', source });
             break;
         }
     }
-    const style = {
+    return {
         id: ConfigId.prefix(ConfigPrefix.Style, tileSet.name),
         name: tileSet.name,
         version: 8,
         sources,
         layers,
     };
-    // Ensure elevation for style json config
-    await ensureTerrain(req, tileMatrix, apiKey, style);
-    // Add terrain in style
-    if (terrain)
-        setStyleTerrain(style, terrain, tileMatrix);
-    const data = Buffer.from(JSON.stringify(style));
-    const cacheKey = Etag.key(data);
-    if (Etag.isNotModified(req, cacheKey))
-        return Promise.resolve(NotModified());
-    const response = new LambdaHttpResponse(200, 'ok');
-    response.header(HttpHeader.ETag, cacheKey);
-    response.header(HttpHeader.CacheControl, 'no-store');
-    response.buffer(data, 'application/json');
-    req.set('bytes', data.byteLength);
-    return Promise.resolve(response);
+}
+async function generateStyleFromTileSet(req, config, tileSetName, tileMatrix, apiKey) {
+    const tileSet = await config.TileSet.get(tileSetName);
+    if (tileSet == null)
+        throw NotFound();
+    if (tileSet.type !== TileSetType.Raster) {
+        throw new LambdaHttpResponse(400, 'Only raster tile sets can generate style JSON');
+    }
+    if (tileSet.outputs)
+        return tileSetOutputToStyle(req, tileSet, tileMatrix, apiKey);
+    else
+        return tileSetToStyle(req, tileSet, tileMatrix, apiKey);
 }
 export async function styleJsonGet(req) {
     const apiKey = Validate.apiKey(req);
     const styleName = req.params.styleName;
-    const excludeLayers = req.query.getAll('exclude');
-    const excluded = new Set(excludeLayers.map((l) => l.toLowerCase()));
     const tileMatrix = TileMatrixSets.find(req.query.get('tileMatrix') ?? GoogleTms.identifier);
     if (tileMatrix == null)
         return new LambdaHttpResponse(400, 'Invalid tile matrix');
+    // Remove layers from the output style json
+    const excludeLayers = req.query.getAll('exclude');
+    const excluded = new Set(excludeLayers.map((l) => l.toLowerCase()));
+    if (excluded.size > 0)
+        req.set('excludedLayers', [...excluded]);
+    /**
+     * Configuration options used for the landing page:
+     * "terrain" - force add a terrain layer
+     * "labels" - merge the labels style with the current style
+     *
+     * TODO: (2024-08) this is not a very scalable way of configuring styles, it would be good to provide a styleJSON merge
+     */
     const terrain = req.query.get('terrain') ?? undefined;
+    const labels = Boolean(req.query.get('labels') ?? false);
+    req.set('styleConfig', { terrain, labels });
     // Get style Config from db
     const config = await ConfigLoader.load(req);
-    const dbId = config.Style.id(styleName);
-    const styleConfig = await config.Style.get(dbId);
-    if (styleConfig == null) {
-        // Were we given a tileset name instead, generated
-        const tileSet = await config.TileSet.get(config.TileSet.id(styleName));
-        if (tileSet == null)
-            return NotFound();
-        if (tileSet.type !== TileSetType.Raster)
-            return NotFound();
-        if (tileSet.outputs)
-            return await tileSetOutputToStyle(req, tileSet, tileMatrix, apiKey, terrain);
-        else
-            return await tileSetToStyle(req, tileSet, tileMatrix, apiKey, terrain);
-    }
-    // Prepare sources and add linz source
-    const style = convertStyleJson(styleConfig.style, tileMatrix, apiKey, ConfigLoader.extract(req), styleConfig.style.layers.filter((f) => !excluded.has(f.id.toLowerCase())));
+    const styleConfig = await config.Style.get(styleName);
+    const styleSource = styleConfig?.style ?? (await generateStyleFromTileSet(req, config, styleName, tileMatrix, apiKey));
+    const targetStyle = structuredClone(styleSource);
     // Ensure elevation for style json config
     // TODO: We should remove this after adding terrain source into style configs. PR-916
-    await ensureTerrain(req, tileMatrix, apiKey, style);
+    await ensureTerrain(req, tileMatrix, apiKey, targetStyle);
     // Add terrain in style
     if (terrain)
-        setStyleTerrain(style, terrain, tileMatrix);
-    const data = Buffer.from(JSON.stringify(style));
+        setStyleTerrain(targetStyle, terrain, tileMatrix);
+    if (labels)
+        await setStyleLabels(req, targetStyle);
+    // convert sources to full URLS and convert style between projections
+    setStyleUrls(targetStyle, tileMatrix, apiKey, ConfigLoader.extract(req));
+    if (tileMatrix.identifier === Nztm2000QuadTms.identifier)
+        convertStyleToNztmStyle(targetStyle, false);
+    // filter out any excluded layers
+    if (excluded.size > 0)
+        targetStyle.layers = targetStyle.layers.filter((f) => !excluded.has(f.id.toLowerCase()));
+    const data = Buffer.from(JSON.stringify(targetStyle));
     const cacheKey = Etag.key(data);
     if (Etag.isNotModified(req, cacheKey))
         return NotModified();