@basemaps/lambda-tiler 8.12.2 → 8.13.1

package/build/util/config.loader.js

@@ -19,9 +19,9 @@ export class ConfigLoader {
         const cb = await config.ConfigBundle.get('cb_latest');
         if (cb == null)
             return config;
-        req?.timer.start('config:load');
-        return CachedConfig.get(fsa.toUrl(cb.path)).then((cfg) => {
-            req?.timer.end('config:load');
+        const configUrl = fsa.toUrl(cb.path);
+        return CachedConfig.get(configUrl).then((cfg) => {
+            req?.set('config', configUrl.href);
             if (cfg == null)
                 throw new LambdaHttpResponse(500, 'Unable to find latest configuration');
             if (cfg.assets == null)
@@ -39,9 +39,15 @@ export class ConfigLoader {
         return rawLocation;
     }
     static async load(req) {
+        req.timer.start('config:load');
+        const config = await this._load(req);
+        req.timer.end('config:load');
+        return config;
+    }
+    static async _load(req) {
         const rawLocation = req.query.get('config');
         if (rawLocation == null)
-            return this.getDefaultConfig();
+            return this.getDefaultConfig(req);
         const configLocation = isBase58(rawLocation) ? Buffer.from(base58.decode(rawLocation)).toString() : rawLocation;
         const configUrl = fsa.toUrl(configLocation);
         if (configUrl == null)
@@ -52,10 +58,8 @@ export class ConfigLoader {
         if (!SafeBuckets.has(configUrl.hostname)) {
             throw new LambdaHttpResponse(400, `Bucket: "${configUrl.hostname}" is not a allowed bucket location`);
         }
-        req.set('config', configUrl.href);
-        req.timer.start('config:load');
         return CachedConfig.get(configUrl).then((f) => {
-            req.timer.end('config:load');
+            req.set('config', configUrl.href);
             if (f == null)
                 throw new LambdaHttpResponse(400, `Invalid config location at ${configLocation}`);
             return f;

package/build/util/config.loader.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "8.12.2",
+  "version": "8.13.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -23,11 +23,11 @@
   "license": "MIT",
   "dependencies": {
     "@basemaps/config": "^8.13.1",
-    "@basemaps/config-loader": "^8.12.2",
+    "@basemaps/config-loader": "^8.12.4",
     "@basemaps/geo": "^8.9.0",
-    "@basemaps/shared": "^8.9.6",
+    "@basemaps/shared": "^8.9.8",
     "@basemaps/tiler": "^8.12.2",
-    "@basemaps/tiler-sharp": "^8.11.4",
+    "@basemaps/tiler-sharp": "^8.11.5",
     "@linzjs/geojson": "^8.0.0",
     "@linzjs/lambda": "^4.2.0",
     "@mapbox/vector-tile": "^2.0.3",
@@ -56,5 +56,5 @@
     "@types/pixelmatch": "^5.0.0",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "8e7b083ad11f25ed8eb61a7d2382efe48d208bb5"
+  "gitHead": "3745d3ad58beacc0134127d7b82a882a7a2a20c8"
 }

package/src/cli/render.tile.ts

@@ -1,7 +1,7 @@
-import { ConfigProviderMemory } from '@basemaps/config';
+import { ConfigImagery, ConfigProviderMemory, ConfigTileSetRaster } from '@basemaps/config';
 import { initConfigFromUrls } from '@basemaps/config-loader';
 import { Tile, TileMatrixSet, TileMatrixSets } from '@basemaps/geo';
-import { fsa, LogConfig, setDefaultConfig } from '@basemaps/shared';
+import { fsa, FsaLocalCache, LogConfig, setDefaultConfig } from '@basemaps/shared';
 import { LambdaHttpRequest, LambdaUrlRequest, UrlEvent } from '@linzjs/lambda';
 import { Context } from 'aws-lambda';
 import { extname } from 'path';
@@ -25,6 +25,9 @@ if (sourceRaw == null || tilePath == null) {
   `);
   process.exit(1);
 }
+
+fsa.middleware.push(FsaLocalCache);
+
 const source = fsa.toUrl(sourceRaw);
 const tile = fromPath(tilePath);
 let tileMatrix: TileMatrixSet | null = null;
@@ -43,14 +46,27 @@ function fromPath(s: string): Tile & { extension: string } {
   return tile;
 }
 
+async function loadConfig(
+  url: URL,
+): Promise<{ tileSet: ConfigTileSetRaster; imagery: ConfigImagery[]; cfg: ConfigProviderMemory }> {
+  if (url.pathname.endsWith('.json') || url.pathname.endsWith('.json.gz')) {
+    const cfg = ConfigProviderMemory.fromJson(await fsa.readJson(url), url);
+    LogConfig.get().info({ url: url.href }, 'ConfigLoaded');
+    const imagery = [...cfg.objects.values()].filter((f) => f.id.startsWith('im_')) as ConfigImagery[];
+    return { tileSet: cfg.imageryToTileSetByName(imagery[0]), imagery, cfg };
+  }
+
+  const cfg = new ConfigProviderMemory();
+  const { imagery } = await initConfigFromUrls(cfg, [url]);
+  return { tileSet: cfg.imageryToTileSetByName(imagery[0]), imagery, cfg };
+}
+
 async function main(): Promise<void> {
   const log = LogConfig.get();
-  log.level = 'trace';
-  const provider = new ConfigProviderMemory();
-  setDefaultConfig(provider);
-  const { imagery } = await initConfigFromUrls(provider, [source]);
+  log.level = process.argv.includes('--verbose') ? 'trace' : 'debug';
 
-  const tileSet = provider.imageryToTileSetByName(imagery[0]);
+  const { tileSet, imagery, cfg } = await loadConfig(source);
+  setDefaultConfig(cfg);
 
   log.info({ tileSet: tileSet.name, layers: tileSet.layers.length }, 'TileSet:Loaded');
 

package/src/index.ts

@@ -48,11 +48,12 @@ handler.router.hook('request', (req) => {
   randomTrace(req);
 
   req.set('name', 'LambdaTiler');
+
+  req.log.debug({ ...req.logContext }, 'Lambda:Start');
 });
 
 handler.router.hook('response', (req, res) => {
   req.set('fetchCount', FsaLog.count);
-  req.set('fetches', FsaLog.requests);
   req.set('cacheSize', FsaCache.size);
   // Force access-control-allow-origin to everything
   res.header('access-control-allow-origin', '*');
@@ -90,6 +91,7 @@ handler.router.get('/v1/fonts/:fontStack/:range.pbf', fontGet);
 
 // StyleJSON
 handler.router.get('/v1/styles/:styleName.json', styleJsonGet);
+
 /** @deprecated 2022-07-22 all styles should be being served from /v1/styles/:styleName.json */
 handler.router.get('/v1/tiles/:tileSet/:tileMatrix/style/:styleName.json', styleJsonGet);
 

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

@@ -2,30 +2,17 @@ import assert from 'node:assert';
 import { afterEach, before, beforeEach, describe, it } from 'node:test';
 
 import { ConfigProviderMemory } from '@basemaps/config';
-import { LogConfig } from '@basemaps/shared';
-import { LambdaAlbRequest, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import { LambdaHttpResponse } from '@linzjs/lambda';
 import { VectorTile, VectorTileFeature, VectorTileLayer } from '@mapbox/vector-tile';
-import { ALBEventRequestContext, Context } from 'aws-lambda';
 import sinon from 'sinon';
 
 import { FakeData } from '../../__tests__/config.data.js';
+import { mockRequest } from '../../__tests__/xyz.util.js';
 import { ConfigLoader } from '../../util/config.loader.js';
 import { getTestBuffer, healthGet, TestFeature, TestTiles, VectorTileProvider } from '../health.js';
 import { TileXyzRaster } from '../tile.xyz.raster.js';
 import { tileXyzVector } from '../tile.xyz.vector.js';
 
-const ctx: LambdaHttpRequest = new LambdaAlbRequest(
-  {
-    requestContext: null as unknown as ALBEventRequestContext,
-    httpMethod: 'get',
-    path: '/v1/tiles/health',
-    body: null,
-    isBase64Encoded: false,
-  },
-  {} as Context,
-  LogConfig.get(),
-);
-
 //  Function to create a vector tile with specific properties for testing
 function createTestTile(testFeatures: TestFeature[]): VectorTile {
   const layers: Record<string, VectorTileLayer> = {};
@@ -65,14 +52,14 @@ describe('/v1/health', () => {
     sandbox.restore();
   });
 
-  it('Should return bad response', () => {
+  it('Should return bad response', async () => {
     // Given ... a bad get tile response
     const BadResponse = new LambdaHttpResponse(500, 'Can not get Tile Set.');
     sandbox.stub(TileXyzRaster, 'tile').resolves(BadResponse);
     sandbox.stub(tileXyzVector, 'tile').resolves(BadResponse);
 
     // When ...Then ...
-    assert.rejects(() => healthGet(ctx), BadResponse);
+    await assert.rejects(() => healthGet(mockRequest('/v1/tiles/health')), BadResponse);
   });
 
   const Response1 = new LambdaHttpResponse(200, 'ok');
@@ -99,20 +86,20 @@ describe('/v1/health', () => {
     callbackVectorTile.onCall(1).resolves(testVectorTile2);
 
     // When ...
-    const res = await healthGet(ctx);
+    const res = await healthGet(mockRequest('/v1/tiles/health'));
 
     // Then ...
     assert.equal(res.status, 200);
     assert.equal(res.statusDescription, 'ok');
   });
 
-  it('Should return mis-match tile response', () => {
+  it('Should return mis-match tile response', async () => {
     // Given ... a bad get tile response for second get tile
     const callback = sandbox.stub(TileXyzRaster, 'tile');
     callback.onCall(0).resolves(Response2);
 
     // When ... Then ...
     const BadResponse = new LambdaHttpResponse(500, 'TileSet does not match.');
-    assert.rejects(() => healthGet(ctx), BadResponse);
+    await assert.rejects(() => healthGet(mockRequest('/v1/tiles/health')), BadResponse);
   });
 });

package/src/routes/__tests__/tile.style.json.test.ts

@@ -195,32 +195,16 @@ describe('/v1/styles', () => {
     assert.equal(res.header('content-type'), 'application/json');
     assert.equal(res.header('cache-control'), 'no-store');
 
-    const body = Buffer.from(res.body ?? '', 'base64').toString();
-    fakeStyle.sources['basemaps_vector'] = {
-      type: 'vector',
-      url: `${host}/vector?api=${Api.key}`,
-    };
-    fakeStyle.sources['basemaps_raster'] = {
-      type: 'raster',
-      tiles: [`${host}/raster?api=${Api.key}`],
-    };
-    fakeStyle.sources['basemaps_raster_encode'] = {
-      type: 'raster',
-      tiles: [`${host}/raster/{z}/{x}/{y}.webp?api=${Api.key}`],
-    };
-
-    fakeStyle.sources['basemaps_terrain'] = {
-      type: 'raster-dem',
-      tiles: [`${host}/elevation/{z}/{x}/{y}.png?pipeline=terrain-rgb&api=${Api.key}`],
-    };
+    const targetStyle = JSON.parse(Buffer.from(res.body ?? '', 'base64').toString()) as StyleJson;
 
-    fakeStyle.sprite = `${host}/sprite`;
-    fakeStyle.glyphs = `${host}/glyphs`;
-
-    assert.deepEqual(JSON.parse(body), fakeStyle);
+    assert.deepEqual(targetStyle.layers, fakeStyle.layers);
+    assert.deepEqual(Object.keys(targetStyle.sources), Object.keys(fakeStyle.sources));
+    assert.equal(targetStyle.glyphs, `${host}${fakeStyle.glyphs}`);
+    assert.equal(targetStyle.sprite, `${host}${fakeStyle.sprite}`);
   });
 
   it('should serve style json with excluded layers', async () => {
+    console.log(fakeRecord.style.layers.map((m) => m.id));
     config.put(fakeRecord);
     const request = mockUrlRequest(
       '/v1/tiles/topographic/Google/style/topographic.json',
@@ -233,25 +217,18 @@ describe('/v1/styles', () => {
     assert.equal(res.header('content-type'), 'application/json');
     assert.equal(res.header('cache-control'), 'no-store');
 
-    const body = Buffer.from(res.body ?? '', 'base64').toString();
-    fakeStyle.sources['basemaps_vector'] = {
-      type: 'vector',
-      url: `${host}/vector?api=${Api.key}`,
-    };
-    fakeStyle.sources['basemaps_raster'] = {
-      type: 'raster',
-      tiles: [`${host}/raster?api=${Api.key}`],
-    };
-    fakeStyle.sources['basemaps_raster_encode'] = {
-      type: 'raster',
-      tiles: [`${host}/raster/{z}/{x}/{y}.webp?api=${Api.key}`],
-    };
-
-    fakeStyle.sprite = `${host}/sprite`;
-    fakeStyle.glyphs = `${host}/glyphs`;
-    fakeStyle.layers = [fakeStyle.layers[2]];
+    const targetStyle = JSON.parse(Buffer.from(res.body ?? '', 'base64').toString()) as StyleJson;
+    assert.deepEqual(
+      targetStyle.layers.map((m) => m.id),
+      ['Background3'],
+    );
+    // original record should be preserved
+    assert.deepEqual(
+      fakeRecord.style.layers.map((m) => m.id),
+      ['Background1', 'Background2', 'Background3'],
+    );
 
-    assert.deepEqual(JSON.parse(body), fakeStyle);
+    assert.deepEqual(Object.keys(targetStyle.sources), Object.keys(fakeStyle.sources));
   });
 
   it('should create raster styles', async () => {
@@ -371,6 +348,7 @@ describe('/v1/styles', () => {
         },
         id: 'Background1',
         type: 'background',
+        source: 'basemaps_vector',
         minzoom: 0,
       },
     ],
@@ -399,6 +377,63 @@ describe('/v1/styles', () => {
     ]);
   });
 
+  describe('style.merge', () => {
+    it('should merge terrain for all style config', async () => {
+      const request = mockUrlRequest('/v1/styles/aerial,topolite.json', '', Api.header);
+      config.put(fakeVectorRecord);
+      config.put(fakeAerialRecord);
+
+      const res = await handler.router.handle(request);
+      assert.equal(res.status, 200, res.statusDescription);
+
+      const body = JSON.parse(Buffer.from(res.body, 'base64').toString()) as StyleJson;
+      const aerialSource = body.sources['basemaps_raster'] as unknown as SourceRaster;
+
+      assert.equal(aerialSource.type, 'raster');
+      assert.equal(body.layers[0].source, 'basemaps_raster');
+      assert.equal(body.layers[1].source, 'basemaps_vector');
+    });
+
+    it('should fail merge terrain for duplicate layers', async () => {
+      const request = mockUrlRequest('/v1/styles/topolite,topolite.json', '', Api.header);
+      config.put(fakeVectorRecord);
+
+      const res = await handler.router.handle(request);
+
+      assert.equal(res.status, 400, res.statusDescription);
+      assert.equal(res.statusDescription.includes('duplicate layerIds'), true);
+    });
+
+    it('should fail merge terrain for large requests', async () => {
+      const layers = 'topolite,'.repeat(10).slice(0, -1);
+      const request = mockUrlRequest(`/v1/styles/${layers}.json`, '', Api.header);
+      config.put(fakeVectorRecord);
+
+      const res = await handler.router.handle(request);
+      assert.equal(res.status, 400, res.statusDescription);
+      assert.equal(res.statusDescription.includes('Too many styles'), true);
+    });
+
+    it('should skip merging empty style names', async () => {
+      const layers = ','.repeat(10);
+      const request = mockUrlRequest(`/v1/styles/${layers}topolite.json`, '', Api.header);
+      config.put(fakeVectorRecord);
+
+      const res = await handler.router.handle(request);
+      assert.equal(res.status, 200, res.statusDescription);
+      console.log(request.url);
+    });
+
+    it('should fail merge if one layer is missing', async () => {
+      const request = mockUrlRequest('/v1/styles/topolite,missing-layer.json', '', Api.header);
+      config.put(fakeVectorRecord);
+
+      const res = await handler.router.handle(request);
+
+      assert.equal(res.status, 404, res.statusDescription);
+    });
+  });
+
   const fakeAerialStyleConfig = {
     id: 'test',
     name: 'test',
@@ -420,8 +455,9 @@ describe('/v1/styles', () => {
         paint: {
           'background-color': 'rgba(206, 229, 242, 1)',
         },
-        id: 'Background1',
-        type: 'background',
+        id: 'aerial',
+        source: 'basemaps_raster',
+        type: 'raster',
         minzoom: 0,
       },
     ],

package/src/routes/tile.style.json.ts

@@ -298,9 +298,51 @@ export interface StyleGet {
   };
 }
 
+/**
+ * Join styles together
+ *
+ * Returns a new style json with sources and layers merged together
+ *
+ * @throws if there are any duplicate layerIds between the styles
+ * @param styles styles to merge together, the first style in the array will be used as the base style and urls will be merged into this style
+ * @returns
+ */
+function mergeStyles(styles: StyleJson[]): StyleJson {
+  const target = structuredClone(styles[0]);
+  if (styles.length === 1) return target;
+
+  const layerId = new Map<string, string>();
+  for (const l of target.layers) layerId.set(l.id, target.id);
+
+  for (const st of styles.slice(1)) {
+    for (const newLayers of st.layers) {
+      if (layerId.has(newLayers.id)) {
+        const prev = layerId.get(newLayers.id);
+        throw new LambdaHttpResponse(
+          400,
+          `Cannot merge styles with duplicate layerIds! styles: "${prev}" "${st.id}" layer: ${newLayers.id}`,
+        );
+      }
+      layerId.set(newLayers.id, st.id);
+    }
+
+    if (target.glyphs == null) target.glyphs = st.glyphs;
+    if (target.sprite == null) target.sprite = st.sprite;
+    if (target.sky == null) target.sky = st.sky;
+
+    Object.assign(target.sources, st.sources);
+    target.layers.push(...st.layers);
+    target.name = target.name + '_' + st.name;
+    target.id = target.id + '_' + st.id;
+  }
+
+  return target;
+}
+
 export async function styleJsonGet(req: LambdaHttpRequest<StyleGet>): Promise<LambdaHttpResponse> {
   const apiKey = Validate.apiKey(req);
-  const styleName = req.params.styleName;
+  const styleNames = req.params.styleName.split(',').filter((f) => f.trim().length > 0);
+  if (styleNames.length > 9) throw new LambdaHttpResponse(400, 'Too many styles requested, max 10');
 
   const tileMatrix = TileMatrixSets.find(req.query.get('tileMatrix') ?? GoogleTms.identifier);
   if (tileMatrix == null) return new LambdaHttpResponse(400, 'Invalid tile matrix');
@@ -311,23 +353,32 @@ export async function styleJsonGet(req: LambdaHttpRequest<StyleGet>): Promise<La
   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
+   * Force add a terrain layer
    *
-   * TODO: (2024-08) this is not a very scalable way of configuring styles, it would be good to provide a styleJSON merge
+   * @deprecated 2026-02: use "/aerial,terrain-v2.json"
    */
   const terrain = req.query.get('terrain') ?? undefined;
+  /**
+   * Merge the labels style with the current style
+   *
+   * @deprecated 2026-02: use "/aerial,labels-v2.json"
+   */
   const labels = Boolean(req.query.get('labels') ?? false);
-  req.set('styleConfig', { terrain, labels });
+  req.set('styleConfig', { terrain, labels, styles: styleNames });
 
   // Get style Config from db
   const config = await ConfigLoader.load(req);
-  const styleConfig = await config.Style.get(styleName);
-  const styleSource =
-    styleConfig?.style ?? (await generateStyleFromTileSet(req, config, styleName, tileMatrix, apiKey));
 
-  const targetStyle = structuredClone(styleSource);
+  const styles = await Promise.all(
+    styleNames.map(async (styleName) => {
+      const styleConfig = await config.Style.get(styleName);
+      if (styleConfig?.style != null) return styleConfig.style;
+      return generateStyleFromTileSet(req, config, styleName, tileMatrix, apiKey);
+    }),
+  );
+
+  const targetStyle = mergeStyles(styles);
+
   // 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, targetStyle);

package/src/util/config.loader.ts

@@ -25,10 +25,10 @@ export class ConfigLoader {
     const cb = await config.ConfigBundle.get('cb_latest');
     if (cb == null) return config;
 
-    req?.timer.start('config:load');
+    const configUrl = fsa.toUrl(cb.path);
+    return CachedConfig.get(configUrl).then((cfg) => {
+      req?.set('config', configUrl.href);
 
-    return CachedConfig.get(fsa.toUrl(cb.path)).then((cfg) => {
-      req?.timer.end('config:load');
       if (cfg == null) throw new LambdaHttpResponse(500, 'Unable to find latest configuration');
       if (cfg.assets == null) cfg.assets = cb.assets;
       return cfg;
@@ -44,8 +44,15 @@ export class ConfigLoader {
   }
 
   static async load(req: LambdaHttpRequest): Promise<BasemapsConfigProvider> {
+    req.timer.start('config:load');
+    const config = await this._load(req);
+    req.timer.end('config:load');
+    return config;
+  }
+
+  static async _load(req: LambdaHttpRequest): Promise<BasemapsConfigProvider> {
     const rawLocation = req.query.get('config');
-    if (rawLocation == null) return this.getDefaultConfig();
+    if (rawLocation == null) return this.getDefaultConfig(req);
 
     const configLocation = isBase58(rawLocation) ? Buffer.from(base58.decode(rawLocation)).toString() : rawLocation;
     const configUrl = fsa.toUrl(configLocation);
@@ -58,10 +65,9 @@ export class ConfigLoader {
       throw new LambdaHttpResponse(400, `Bucket: "${configUrl.hostname}" is not a allowed bucket location`);
     }
 
-    req.set('config', configUrl.href);
-    req.timer.start('config:load');
     return CachedConfig.get(configUrl).then((f) => {
-      req.timer.end('config:load');
+      req.set('config', configUrl.href);
+
       if (f == null) throw new LambdaHttpResponse(400, `Invalid config location at ${configLocation}`);
       return f;
     });