@basemaps/lambda-tiler 6.30.0 → 6.32.1

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

@@ -33,14 +33,16 @@ o.spec('/v1/fonts', () => {
   });
 
   o('should return empty list if no fonts found', async () => {
-    const res = await fontList();
+    const res = await fontList(mockRequest('/v1/fonts.json'));
     o(res.status).equals(200);
     o(res.body).equals('[]');
+    o(res.header('etag')).notEquals(undefined);
+    o(res.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
   });
 
   o('should return 404 if no assets defined', async () => {
     delete process.env[Env.AssetLocation];
-    const res = await fontList();
+    const res = await fontList(mockRequest('/v1/fonts.json'));
     o(res.status).equals(404);
   });
 
@@ -50,7 +52,7 @@ o.spec('/v1/fonts', () => {
       fsa.write('memory://fonts/Roboto Thin/256-512.pbf', Buffer.from('')),
       fsa.write('memory://fonts/Roboto Black/0-255.pbf', Buffer.from('')),
     ]);
-    const res = await fontList();
+    const res = await fontList(mockRequest('/v1/fonts.json'));
     o(res.status).equals(200);
     o(res.header('content-type')).equals('application/json');
     o(res.header('content-encoding')).equals(undefined);
@@ -60,10 +62,12 @@ o.spec('/v1/fonts', () => {
   o('should get the correct font', async () => {
     await fsa.write('memory://fonts/Roboto Thin/0-255.pbf', Buffer.from(''));
 
-    const res255 = await handler.router.handle(mockRequest(encodeURI('/v1/fonts/Roboto Thin/0-255.pbf')));
+    const res255 = await handler.router.handle(mockRequest('/v1/fonts/Roboto Thin/0-255.pbf'));
     o(res255.status).equals(200);
     o(res255.header('content-type')).equals('application/x-protobuf');
     o(res255.header('content-encoding')).equals(undefined);
+    o(res255.header('etag')).notEquals(undefined);
+    o(res255.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
 
     const res404 = await handler.router.handle(mockRequest('/v1/fonts/Roboto Thin/256-512.pbf'));
     o(res404.status).equals(404);
@@ -72,9 +76,11 @@ o.spec('/v1/fonts', () => {
   o('should get the correct utf8 font', async () => {
     await fsa.write('memory://fonts/🦄 🌈/0-255.pbf', Buffer.from(''));
 
-    const res255 = await handler.router.handle(mockRequest(encodeURI('/v1/fonts/🦄 🌈/0-255.pbf')));
+    const res255 = await handler.router.handle(mockRequest('/v1/fonts/🦄 🌈/0-255.pbf'));
     o(res255.status).equals(200);
     o(res255.header('content-type')).equals('application/x-protobuf');
     o(res255.header('content-encoding')).equals(undefined);
+    o(res255.header('etag')).notEquals(undefined);
+    o(res255.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
   });
 });

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

@@ -1,12 +1,13 @@
-import { GoogleTms } from '@basemaps/geo';
+import { Config, ConfigProviderMemory } from '@basemaps/config';
 import { LogConfig } from '@basemaps/shared';
 import { LambdaAlbRequest, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { Context } from 'aws-lambda';
 import o from 'ospec';
 import sinon from 'sinon';
-import { TileSets } from '../../tile.set.cache.js';
-import { TileSetRaster } from '../../tile.set.raster.js';
-import { getTestBuffer, Health, TestTiles } from '../health.js';
+import { FakeData } from '../../__tests__/config.data.js';
+
+import { getTestBuffer, healthGet, TestTiles } from '../health.js';
+import { TileXyzRaster } from '../tile.xyz.raster.js';
 
 const ctx: LambdaHttpRequest = new LambdaAlbRequest(
   {
@@ -20,13 +21,16 @@ const ctx: LambdaHttpRequest = new LambdaAlbRequest(
   LogConfig.get(),
 );
 
-o.spec('health', async () => {
+o.spec('/v1/health', async () => {
   o.specTimeout(1000);
   const sandbox = sinon.createSandbox();
+  const config = new ConfigProviderMemory();
 
-  const tileSet = new TileSetRaster('health', GoogleTms);
+  const fakeTileSet = FakeData.tileSetRaster('health');
   o.beforeEach(() => {
-    sandbox.stub(TileSets, 'get').resolves(tileSet);
+    config.objects.clear();
+    Config.setConfigProvider(config);
+    config.put(fakeTileSet);
   });
 
   o.afterEach(() => {
@@ -36,10 +40,10 @@ o.spec('health', async () => {
   o('Should return bad response', async () => {
     // Given ... a bad get tile response
     const BadResponse = new LambdaHttpResponse(500, 'Can not get Tile Set.');
-    sandbox.stub(tileSet, 'tile').resolves(BadResponse);
+    sandbox.stub(TileXyzRaster, 'tile').resolves(BadResponse);
 
     // When ...
-    const res = await Health(ctx);
+    const res = await healthGet(ctx);
 
     // Then ...
     o(res.status).equals(500);
@@ -59,12 +63,12 @@ o.spec('health', async () => {
 
   o('Should give a 200 response', async () => {
     // Given ... a series good get tile response
-    const callback = sandbox.stub(tileSet, 'tile');
+    const callback = sandbox.stub(TileXyzRaster, 'tile');
     callback.onCall(0).resolves(Response1);
     callback.onCall(1).resolves(Response2);
 
     // When ...
-    const res = await Health(ctx);
+    const res = await healthGet(ctx);
 
     // Then ...
     o(res.status).equals(200);
@@ -73,12 +77,12 @@ o.spec('health', async () => {
 
   o('Should return mis-match tile response', async () => {
     // Given ... a bad get tile response for second get tile
-    const callback = sandbox.stub(tileSet, 'tile');
+    const callback = sandbox.stub(TileXyzRaster, 'tile');
     callback.onCall(0).resolves(Response1);
     callback.onCall(1).resolves(Response1);
 
     // When ...
-    const res = await Health(ctx);
+    const res = await healthGet(ctx);
 
     // Then ...
     o(res.status).equals(500);

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

@@ -36,6 +36,8 @@ o.spec('/v1/sprites', () => {
     o(res.status).equals(200);
     o(res.header('content-type')).equals('application/json');
     o(res.header('content-encoding')).equals(undefined);
+    o(res.header('etag')).notEquals(undefined);
+    o(res.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
 
     o(JSON.parse(Buffer.from(res.body, 'base64').toString())).deepEquals({ test: true });
   });
@@ -48,6 +50,8 @@ o.spec('/v1/sprites', () => {
     const res = await handler.router.handle(mockRequest('/v1/sprites/topographic@2x.png'));
     o(res.status).equals(200);
     o(res.header('content-type')).equals('image/png');
+    o(res.header('etag')).notEquals(undefined);
+    o(res.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
   });
 
   o('should detect gziped files and set content-encoding', async () => {
@@ -58,7 +62,8 @@ o.spec('/v1/sprites', () => {
     o(res.status).equals(200);
     o(res.header('content-type')).equals('application/json');
     o(res.header('content-encoding')).equals('gzip');
-
+    o(res.header('etag')).notEquals(undefined);
+    o(res.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
     o(JSON.parse(gunzipSync(Buffer.from(res.body, 'base64')).toString())).deepEquals({ test: true });
   });
 });

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

@@ -0,0 +1,145 @@
+import { Config, ConfigProviderMemory } from '@basemaps/config';
+import { Env } from '@basemaps/shared';
+import o from 'ospec';
+import { handler } from '../../index.js';
+import { CoSources } from '../../util/source.cache.js';
+import { FakeData } from '../../__tests__/config.data.js';
+import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
+
+o.spec('/v1/tiles/:tileSet/:tileMatrix/tile.json', () => {
+  const config = new ConfigProviderMemory();
+  o.before(() => {
+    process.env[Env.PublicUrlBase] = 'https://tiles.test';
+    Config.setConfigProvider(config);
+  });
+
+  o.beforeEach(() => {
+    config.objects.clear();
+    CoSources.cache.clear();
+  });
+
+  o('should 404 if invalid url is given', async () => {
+    const request = mockRequest('/v1/tiles/tile.json', 'get', Api.header);
+
+    const res = await handler.router.handle(request);
+    o(res.status).equals(404);
+  });
+
+  o('should support utf8 tilesets', async () => {
+    const request = mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `api=${Api.key}`);
+    o(request.path).equals('/v1/tiles/%F0%9F%A6%84%20%F0%9F%8C%88/NZTM2000Quad/tile.json');
+
+    const fakeTileSet = FakeData.tileSetRaster('🦄 🌈');
+    config.put(fakeTileSet);
+
+    const res = await handler.router.handle(request);
+    o(res.status).equals(200);
+  });
+
+  o('should serve tile json for tile_set', async () => {
+    const request = mockRequest('/v1/tiles/aerial/NZTM2000Quad/tile.json', 'get', Api.header);
+    const fakeTileSet = FakeData.tileSetRaster('aerial');
+    config.put(fakeTileSet);
+
+    const res = await handler.router.handle(request);
+    o(res.status).equals(200);
+    o(res.header('cache-control')).equals('no-store');
+
+    const body = Buffer.from(res.body ?? '', 'base64').toString();
+    o(JSON.parse(body)).deepEquals({
+      tiles: [`https://tiles.test/v1/tiles/aerial/NZTM2000Quad/{z}/{x}/{y}.webp?api=${Api.key}`],
+      tilejson: '3.0.0',
+    });
+  });
+
+  o('should use the correct format', async () => {
+    const request = mockRequest('/v1/tiles/aerial/NZTM2000Quad/tile.json', 'get', Api.header);
+    request.query.set('format', 'jpeg');
+
+    const fakeTileSet = FakeData.tileSetRaster('aerial');
+    config.put(fakeTileSet);
+
+    const res = await handler.router.handle(request);
+    o(res.status).equals(200);
+    o(res.header('cache-control')).equals('no-store');
+
+    const body = Buffer.from(res.body ?? '', 'base64').toString();
+    o(JSON.parse(body)).deepEquals({
+      tiles: [`https://tiles.test/v1/tiles/aerial/NZTM2000Quad/{z}/{x}/{y}.jpeg?api=${Api.key}`],
+      tilejson: '3.0.0',
+    });
+  });
+
+  o('should use the correct format when multiple set', async () => {
+    const request = mockRequest('/v1/tiles/aerial/NZTM2000Quad/tile.json', 'get', Api.header);
+    request.query.append('format', 'png');
+    request.query.append('format', 'jpeg');
+
+    const fakeTileSet = FakeData.tileSetRaster('aerial');
+    config.put(fakeTileSet);
+
+    const res = await handler.router.handle(request);
+    o(res.status).equals(200);
+    o(res.header('cache-control')).equals('no-store');
+
+    const body = Buffer.from(res.body ?? '', 'base64').toString();
+    o(JSON.parse(body)).deepEquals({
+      tiles: [`https://tiles.test/v1/tiles/aerial/NZTM2000Quad/{z}/{x}/{y}.png?api=${Api.key}`],
+      tilejson: '3.0.0',
+    });
+  });
+
+  o('should serve vector tiles', async () => {
+    const request = mockRequest('/v1/tiles/topographic/EPSG:3857/tile.json', 'get', Api.header);
+    const fakeTileSet = FakeData.tileSetVector('topographic');
+    config.put(fakeTileSet);
+
+    const res = await handler.router.handle(request);
+    o(res.status).equals(200);
+
+    const body = Buffer.from(res.body ?? '', 'base64').toString();
+    o(JSON.parse(body)).deepEquals({
+      tiles: [`https://tiles.test/v1/tiles/topographic/WebMercatorQuad/{z}/{x}/{y}.pbf?api=${Api.key}`],
+      tilejson: '3.0.0',
+    });
+  });
+
+  o('should serve vector tiles with min/max zoom', async () => {
+    const fakeTileSet = FakeData.tileSetVector('fake-vector');
+    fakeTileSet.maxZoom = 15;
+    fakeTileSet.minZoom = 3;
+    config.put(fakeTileSet);
+    const request = mockRequest('/v1/tiles/fake-vector/WebMercatorQuad/tile.json', 'get', Api.header);
+
+    const res = await handler.router.handle(request);
+    o(res.status).equals(200);
+
+    const body = Buffer.from(res.body ?? '', 'base64').toString();
+    o(JSON.parse(body)).deepEquals({
+      tiles: [`https://tiles.test/v1/tiles/fake-vector/WebMercatorQuad/{z}/{x}/{y}.pbf?api=${Api.key}`],
+      maxzoom: 15,
+      minzoom: 3,
+      tilejson: '3.0.0',
+    });
+  });
+
+  o('should serve convert zoom to tile matrix', async () => {
+    const fakeTileSet = FakeData.tileSetVector('fake-vector');
+    fakeTileSet.maxZoom = 15;
+    fakeTileSet.minZoom = 1;
+    config.put(fakeTileSet);
+
+    const request = mockRequest('/v1/tiles/fake-vector/NZTM2000Quad/tile.json', 'get', Api.header);
+
+    const res = await handler.router.handle(request);
+    o(res.status).equals(200);
+
+    const body = Buffer.from(res.body ?? '', 'base64').toString();
+    o(JSON.parse(body)).deepEquals({
+      tiles: [`https://tiles.test/v1/tiles/fake-vector/NZTM2000Quad/{z}/{x}/{y}.pbf?api=${Api.key}`],
+      maxzoom: 13,
+      minzoom: 0,
+      tilejson: '3.0.0',
+    });
+  });
+});

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

@@ -0,0 +1,105 @@
+import { Config, StyleJson } from '@basemaps/config';
+import { Env } from '@basemaps/shared';
+import o from 'ospec';
+import { createSandbox } from 'sinon';
+import { handler } from '../../index.js';
+import { Api, mockRequest } from '../../__tests__/xyz.util.js';
+
+o.spec('/v1/styles', () => {
+  const host = 'https://tiles.test';
+  const sandbox = createSandbox();
+
+  o.before(() => {
+    process.env[Env.PublicUrlBase] = host;
+  });
+  //   o.beforeEach(() => {});
+  o.afterEach(() => sandbox.restore());
+  o('should not found style json', async () => {
+    const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', Api.header);
+
+    sandbox.stub(Config.Style, 'get').resolves(null);
+
+    const res = await handler.router.handle(request);
+    o(res.status).equals(404);
+  });
+
+  o('should serve style json', async () => {
+    const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', Api.header);
+
+    const fakeStyle: StyleJson = {
+      version: 8,
+      id: 'test',
+      name: 'topographic',
+      sources: {
+        basemaps_vector: {
+          type: 'vector',
+          url: `/vector`,
+        },
+        basemaps_raster: {
+          type: 'raster',
+          tiles: [`/raster`],
+        },
+        basemaps_raster_encode: {
+          type: 'raster',
+          tiles: [`/raster/{z}/{x}/{y}.webp`], // Shouldn't encode the {}
+        },
+        test_vector: {
+          type: 'vector',
+          url: 'vector.url.co.nz',
+        },
+        test_raster: {
+          type: 'raster',
+          tiles: ['raster.url.co.nz'],
+        },
+      },
+      layers: [
+        {
+          layout: {
+            visibility: 'visible',
+          },
+          paint: {
+            'background-color': 'rgba(206, 229, 242, 1)',
+          },
+          id: 'Background',
+          type: 'background',
+          minzoom: 0,
+        },
+      ],
+      glyphs: '/glyphs',
+      sprite: '/sprite',
+      metadata: { id: 'test' },
+    };
+
+    const fakeRecord = {
+      id: 'st_topographic_production',
+      name: 'topographic',
+      style: fakeStyle,
+    };
+
+    sandbox.stub(Config.Style, 'get').resolves(fakeRecord as any);
+
+    const res = await handler.router.handle(request);
+    o(res.status).equals(200);
+    o(res.header('content-type')).equals('application/json');
+    o(res.header('cache-control')).equals('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`;
+
+    o(JSON.parse(body)).deepEquals(fakeStyle);
+  });
+});

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

@@ -1,59 +1,9 @@
-import { ImageFormat } from '@basemaps/geo';
-import { Config, LogConfig } from '@basemaps/shared';
-import { LambdaHttpRequest, LambdaUrlRequest } from '@linzjs/lambda';
-import { Context } from 'aws-lambda';
+import { Config } from '@basemaps/shared';
 import o from 'ospec';
-import { handleRequest } from '../../index.js';
-import { ulid } from 'ulid';
-import { getImageFormats } from '../tile.wmts.js';
 import { createSandbox } from 'sinon';
+import { handler } from '../../index.js';
 import { Imagery2193, Imagery3857, Provider, TileSetAerial } from '../../__tests__/config.data.js';
-
-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.spec('GetImageFormats', () => {
-  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]);
-  });
-
-  o('should support "tileFormat" Alias all formats', () => {
-    const req = newRequest('/v1/blank', 'tileFormat=png&format=jpeg');
-    const formats = getImageFormats(req);
-    o(formats).deepEquals([ImageFormat.Jpeg, ImageFormat.Png]);
-  });
-
-  o('should not duplicate "tileFormat" alias all formats', () => {
-    const req = newRequest('/v1/blank', 'tileFormat=jpeg&format=jpeg');
-    const formats = getImageFormats(req);
-    o(formats).deepEquals([ImageFormat.Jpeg]);
-  });
-});
+import { Api, mockUrlRequest } from '../../__tests__/xyz.util.js';
 
 o.spec('WMTSRouting', () => {
   const sandbox = createSandbox();
@@ -70,8 +20,8 @@ o.spec('WMTSRouting', () => {
     const imageryStub = sandbox.stub(Config.Imagery, 'getAll').returns(Promise.resolve(imagery));
     const providerStub = sandbox.stub(Config.Provider, 'get').returns(Promise.resolve(Provider));
 
-    const req = newRequest('/v1/tiles/WMTSCapabilities.xml', 'format=png&api=c' + ulid());
-    const res = await handleRequest(req);
+    const req = mockUrlRequest('/v1/tiles/WMTSCapabilities.xml', `format=png&api=${Api.key}`);
+    const res = await handler.router.handle(req);
 
     o(tileSetStub.calledOnce).equals(true);
     o(tileSetStub.args[0][0]).equals('ts_aerial');

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

@@ -0,0 +1,119 @@
+import { Config, ConfigProviderMemory } from '@basemaps/config';
+import { LogConfig } from '@basemaps/shared';
+import { round } from '@basemaps/test/build/rounding.js';
+import o from 'ospec';
+import sinon from 'sinon';
+import { handler } from '../../index.js';
+import { Etag } from '../../util/etag.js';
+import { FakeData } from '../../__tests__/config.data.js';
+import { Api, mockRequest } from '../../__tests__/xyz.util.js';
+
+const sandbox = sinon.createSandbox();
+
+const TileSetNames = ['aerial', 'aerial:ōtorohanga_urban_2021_0-1m_RGB', '01FYWKAJ86W9P7RWM1VB62KD0H'];
+o.spec('/v1/tiles', () => {
+  const config = new ConfigProviderMemory();
+
+  o.beforeEach(() => {
+    LogConfig.get().level = 'silent';
+    Config.setConfigProvider(config);
+    config.objects.clear();
+
+    for (const tileSetName of TileSetNames) config.put(FakeData.tileSetRaster(tileSetName));
+
+    sandbox.stub(Etag, 'key').returns('fakeEtag');
+  });
+
+  o.afterEach(() => {
+    sandbox.restore();
+  });
+
+  o('should export handler', async () => {
+    const base = await import('../../index.js');
+    o(typeof base.handler).equals('function');
+  });
+
+  TileSetNames.forEach((tileSetName) => {
+    o(`should generate a tile/v1/tiles/${tileSetName}/global-mercator/0/0/0.png`, async () => {
+      const request = mockRequest(`/v1/tiles/${tileSetName}/global-mercator/0/0/0.png`, 'get', Api.header);
+      const res = await handler.router.handle(request);
+      o(res.status).equals(200);
+      o(res.header('content-type')).equals('image/png');
+      o(res.header('eTaG')).equals('fakeEtag');
+
+      // Validate the session information has been set correctly
+      o(request.logContext['tileSet']).equals(tileSetName);
+      o(request.logContext['xyz']).deepEquals({ x: 0, y: 0, z: 0 });
+      o(round(request.logContext['location'])).deepEquals({ lat: 0, lon: 0 });
+    });
+  });
+
+  o('should generate a tile 0,0,0 for webp', async () => {
+    const request = mockRequest('/v1/tiles/aerial/3857/0/0/0.webp', 'get', Api.header);
+    const res = await handler.router.handle(request);
+    o(res.status).equals(200);
+    o(res.header('content-type')).equals('image/webp');
+    o(res.header('eTaG')).equals('fakeEtag');
+    // o(res.body).equals(rasterMockBuffer.toString('base64'));
+
+    // Validate the session information has been set correctly
+    o(request.logContext['xyz']).deepEquals({ x: 0, y: 0, z: 0 });
+    o(round(request.logContext['location'])).deepEquals({ lat: 0, lon: 0 });
+  });
+
+  ['png', 'webp', 'jpeg', 'avif'].forEach((fmt) => {
+    o(`should 200 with empty ${fmt} if a tile is out of bounds`, async () => {
+      // tiler.tile = async () => [];
+      const res = await handler.router.handle(
+        mockRequest(`/v1/tiles/aerial/global-mercator/0/0/0.${fmt}`, 'get', Api.header),
+      );
+      o(res.status).equals(200);
+      o(res.header('content-type')).equals(`image/${fmt}`);
+      o(res.header('etag')).notEquals(undefined);
+      o(res.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
+      //   o(rasterMock.calls.length).equals(1);
+    });
+  });
+
+  o('should 304 if a tile is not modified', async () => {
+    const key = 'fakeEtag';
+    const request = mockRequest('/v1/tiles/aerial/global-mercator/0/0/0.png', 'get', {
+      'if-none-match': key,
+      ...Api.header,
+    });
+    const res = await handler.router.handle(request);
+    o(res.status).equals(304);
+    o(res.header('eTaG')).equals(undefined);
+
+    o(request.logContext['cache']).deepEquals({ match: key, hit: true });
+  });
+
+  o('should 404 if a tile is outside of the range', async () => {
+    const res = await handler.router.handle(
+      mockRequest('/v1/tiles/aerial/global-mercator/25/0/0.png', 'get', Api.header),
+    );
+    o(res.status).equals(404);
+
+    const resB = await handler.router.handle(mockRequest('/v1/tiles/aerial/2193/17/0/0.png', 'get', Api.header));
+    o(resB.status).equals(404);
+  });
+
+  o('should support utf8 tilesets', async () => {
+    const fakeTileSet = FakeData.tileSetRaster('🦄 🌈');
+    config.put(fakeTileSet);
+    const req = mockRequest('/v1/tiles/🦄 🌈/global-mercator/0/0/0.png', 'get', Api.header);
+    o(req.path).equals('/v1/tiles/%F0%9F%A6%84%20%F0%9F%8C%88/global-mercator/0/0/0.png');
+    const res = await handler.router.handle(req);
+    o(res.status).equals(200);
+    o(res.header('content-type')).equals('image/png');
+    o(res.header('etag')).notEquals(undefined);
+    o(res.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
+  });
+
+  ['/favicon.ico', '/index.html', '/foo/bar'].forEach((path) => {
+    o('should 404 on invalid paths: ' + path, async () => {
+      const res = await handler.router.handle(mockRequest(path, 'get', Api.header));
+      o(res.status).equals(404);
+    });
+  });
+});