@basemaps/lambda-tiler 6.31.0 → 6.32.0

package/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.32.0](https://github.com/linz/basemaps/compare/v6.31.0...v6.32.0) (2022-07-28)
+
+
+### Bug Fixes
+
+* **lambda-tiler:** CORS is handled by the function url. ([#2376](https://github.com/linz/basemaps/issues/2376)) ([8ad2bf1](https://github.com/linz/basemaps/commit/8ad2bf10f4e9b131c35c33273afd6c2d3460b46c))
+* **lambda-tiler:** do not cache responses as they can be modifed ([#2372](https://github.com/linz/basemaps/issues/2372)) ([686e978](https://github.com/linz/basemaps/commit/686e978926261847eeda5fd8d1fafc718adb2b4b))
+* **lambda-tiler:** ignore cors for function urls ([#2377](https://github.com/linz/basemaps/issues/2377)) ([96f5d66](https://github.com/linz/basemaps/commit/96f5d669c41a3154e3914955fd5f6d057bc4bf2a))
+
+
+### Features
+
+* **lambda-tiler:** create unique id for source requests ([#2370](https://github.com/linz/basemaps/issues/2370)) ([59c90a7](https://github.com/linz/basemaps/commit/59c90a7110f2ea8ef76a3f4dcb02b0170ea134df))
+* **lambda-tiler:** force more aggressive cache control on most endpoints ([#2371](https://github.com/linz/basemaps/issues/2371)) ([18f9e67](https://github.com/linz/basemaps/commit/18f9e674aa762901d027b67ef14026d86e2442b9))
+* **lambda-tiler:** log cache hit percentages ([#2368](https://github.com/linz/basemaps/issues/2368)) ([3f7bf0c](https://github.com/linz/basemaps/commit/3f7bf0c39ba46797b1a271a191fe51fc578abffc))
+* **lambda-tiler:** move all routes to route handler ([#2354](https://github.com/linz/basemaps/issues/2354)) ([4896e7c](https://github.com/linz/basemaps/commit/4896e7c47488389845ce22fdf46a8aadf79495a2))
+
+
+
+
+
 # [6.31.0](https://github.com/linz/basemaps/compare/v6.30.0...v6.31.0) (2022-07-22)
 
 

package/build/__tests__/config.data.d.ts

@@ -1,6 +1,11 @@
-import { ConfigTileSetRaster, ConfigImagery, ConfigProvider } from '@basemaps/config';
+import { ConfigImagery, ConfigProvider, ConfigTileSetRaster, ConfigTileSetVector } from '@basemaps/config';
 export declare const TileSetAerial: ConfigTileSetRaster;
+export declare const TileSetVector: ConfigTileSetVector;
 export declare const Imagery2193: ConfigImagery;
 export declare const Imagery3857: ConfigImagery;
 export declare const Provider: ConfigProvider;
+export declare class FakeData {
+    static tileSetRaster(name: string): ConfigTileSetRaster;
+    static tileSetVector(name: string): ConfigTileSetVector;
+}
 //# sourceMappingURL=config.data.d.ts.map

package/build/__tests__/config.data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.data.d.ts","sourceRoot":"","sources":["../../src/__tests__/config.data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAe,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGnG,eAAO,MAAM,aAAa,EAAE,mBAiB3B,CAAC;AACF,eAAO,MAAM,WAAW,EAAE,aAezB,CAAC;AACF,eAAO,MAAM,WAAW,EAAE,aAezB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,cA2BtB,CAAC"}
+{"version":3,"file":"config.data.d.ts","sourceRoot":"","sources":["../../src/__tests__/config.data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,mBAAmB,EAAE,mBAAmB,EAAe,MAAM,kBAAkB,CAAC;AAGxH,eAAO,MAAM,aAAa,EAAE,mBAiB3B,CAAC;AACF,eAAO,MAAM,aAAa,EAAE,mBAgB3B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,aAezB,CAAC;AACF,eAAO,MAAM,WAAW,EAAE,aAezB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,cA2BtB,CAAC;AAEF,qBAAa,QAAQ;IACnB,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB;IASvD,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB;CAQxD"}

package/build/__tests__/config.data.js

@@ -1,5 +1,5 @@
 import { TileSetType } from '@basemaps/config';
-import { ImageFormat } from '@basemaps/geo';
+import { ImageFormat, VectorFormat } from '@basemaps/geo';
 export const TileSetAerial = {
     id: 'ts_aerial',
     name: 'aerial',
@@ -18,6 +18,23 @@ export const TileSetAerial = {
         },
     ],
 };
+export const TileSetVector = {
+    id: 'ts_topographic',
+    type: TileSetType.Vector,
+    name: 'topotgrpahic',
+    description: 'topotgrpahic__description',
+    title: 'topotgrpahic Imagery',
+    category: 'Basemap',
+    format: VectorFormat.MapboxVectorTiles,
+    layers: [
+        {
+            3857: 's3://linz-basemaps/01G7WQMGHB7V946M0YWJJBZ6DW/topopgraphic.tar.co',
+            title: 'Vector tiles',
+            category: 'Vector Tiles',
+            name: 'Vector tiles',
+        },
+    ],
+};
 export const Imagery2193 = {
     id: 'im_01FYWKAJ86W9P7RWM1VB62KD0H',
     name: 'ōtorohanga_urban_2021_0-1m_RGB',
@@ -52,7 +69,7 @@ export const Imagery3857 = {
 };
 export const Provider = {
     name: 'main',
-    id: 'pv_main_production',
+    id: 'pv_linz',
     updatedAt: Date.now(),
     version: 1,
     serviceIdentification: {
@@ -78,4 +95,18 @@ export const Provider = {
         site: 'https://example.provider.com',
     },
 };
+export class FakeData {
+    static tileSetRaster(name) {
+        const tileSet = JSON.parse(JSON.stringify(TileSetAerial));
+        tileSet.name = name;
+        tileSet.id = `ts_${name}`;
+        return tileSet;
+    }
+    static tileSetVector(name) {
+        const tileSet = JSON.parse(JSON.stringify(TileSetVector));
+        tileSet.name = name;
+        tileSet.id = `ts_${name}`;
+        return tileSet;
+    }
+}
 //# sourceMappingURL=config.data.js.map

package/build/__tests__/config.data.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.data.js","sourceRoot":"","sources":["../../src/__tests__/config.data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,WAAW,EAAiC,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,CAAC,MAAM,aAAa,GAAwB;IAChD,EAAE,EAAE,WAAW;IACf,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,WAAW,CAAC,MAAM;IACxB,MAAM,EAAE,WAAW,CAAC,IAAI;IACxB,WAAW,EAAE,qBAAqB;IAClC,KAAK,EAAE,gBAAgB;IACvB,QAAQ,EAAE,SAAS;IACnB,MAAM,EAAE;QACN;YACE,IAAI,EAAE,+BAA+B;YACrC,IAAI,EAAE,+BAA+B;YACrC,KAAK,EAAE,4CAA4C;YACnD,QAAQ,EAAE,qBAAqB;YAC/B,IAAI,EAAE,gCAAgC;SACvC;KACF;CACF,CAAC;AACF,MAAM,CAAC,MAAM,WAAW,GAAkB;IACxC,EAAE,EAAE,+BAA+B;IACnC,IAAI,EAAE,gCAAgC;IACtC,KAAK,EAAE,4CAA4C;IACnD,QAAQ,EAAE,qBAAqB;IAC/B,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,cAAc;IAC1B,GAAG,EAAE,mFAAmF;IACxF,MAAM,EAAE;QACN,CAAC,EAAE,kBAAkB;QACrB,CAAC,EAAE,iBAAiB;QACpB,KAAK,EAAE,kBAAkB;QACzB,MAAM,EAAE,kBAAkB;KAC3B;IACD,KAAK,EAAE,EAAE;CACV,CAAC;AACF,MAAM,CAAC,MAAM,WAAW,GAAkB;IACxC,EAAE,EAAE,+BAA+B;IACnC,IAAI,EAAE,gCAAgC;IACtC,KAAK,EAAE,4CAA4C;IACnD,QAAQ,EAAE,qBAAqB;IAC/B,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,iBAAiB;IAC7B,GAAG,EAAE,mFAAmF;IACxF,MAAM,EAAE;QACN,CAAC,EAAE,kBAAkB;QACrB,CAAC,EAAE,CAAC,gBAAgB;QACpB,KAAK,EAAE,kBAAkB;QACzB,MAAM,EAAE,iBAAiB;KAC1B;IACD,KAAK,EAAE,EAAE;CACV,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAmB;IACtC,IAAI,EAAE,MAAM;IACZ,EAAE,EAAE,oBAAoB;IACxB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;IACrB,OAAO,EAAE,CAAC;IACV,qBAAqB,EAAE;QACrB,iBAAiB,EAAE,uBAAuB;QAC1C,WAAW,EAAE,iBAAiB;QAC9B,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,WAAW;KACnB;IACD,eAAe,EAAE;QACf,OAAO,EAAE;YACP,OAAO,EAAE;gBACP,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,aAAa;gBACtB,aAAa,EAAE,mBAAmB;gBAClC,KAAK,EAAE,eAAe;gBACtB,UAAU,EAAE,gBAAgB;aAC7B;YACD,cAAc,EAAE,kBAAkB;YAClC,KAAK,EAAE,WAAW;YAClB,QAAQ,EAAE,cAAc;SACzB;QACD,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,8BAA8B;KACrC;CACF,CAAC"}
+{"version":3,"file":"config.data.js","sourceRoot":"","sources":["../../src/__tests__/config.data.ts"],"names":[],"mappings":"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"}

package/build/__tests__/index.test.js

@@ -1,17 +1,7 @@
-import { LogConfig } from '@basemaps/shared';
-import { LambdaAlbRequest } from '@linzjs/lambda';
 import o from 'ospec';
 import { handler } from '../index.js';
+import { mockRequest } from './xyz.util.js';
 o.spec('LambdaXyz index', () => {
-    function req(path, method = 'get') {
-        return new LambdaAlbRequest({
-            requestContext: null,
-            httpMethod: method.toUpperCase(),
-            path,
-            body: null,
-            isBase64Encoded: false,
-        }, {}, LogConfig.get());
-    }
     o('should export handler', async () => {
         const foo = await import('../index.js');
         o(typeof foo.handler).equals('function');
@@ -26,7 +16,7 @@ o.spec('LambdaXyz index', () => {
         o('should return version', async () => {
             process.env.GIT_VERSION = '1.2.3';
             process.env.GIT_HASH = 'abc456';
-            const response = await handler.router.handle(req('/v1/version'));
+            const response = await handler.router.handle(mockRequest('/v1/version'));
             o(response.status).equals(200);
             o(response.statusDescription).equals('ok');
             o(response.header('cache-control')).equals('no-store');
@@ -37,7 +27,7 @@ o.spec('LambdaXyz index', () => {
         });
     });
     o('should respond to /ping', async () => {
-        const res = await handler.router.handle(req('/v1/ping'));
+        const res = await handler.router.handle(mockRequest('/v1/ping'));
         o(res.status).equals(200);
         o(res.statusDescription).equals('ok');
         o(res.header('cache-control')).equals('no-store');

package/build/__tests__/index.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/__tests__/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAqB,MAAM,gBAAgB,CAAC;AAErE,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,SAAS,GAAG,CAAC,IAAY,EAAE,MAAM,GAAG,KAAK;QACvC,OAAO,IAAI,gBAAgB,CACzB;YACE,cAAc,EAAE,IAAW;YAC3B,UAAU,EAAE,MAAM,CAAC,WAAW,EAAE;YAChC,IAAI;YACJ,IAAI,EAAE,IAAI;YACV,eAAe,EAAE,KAAK;SACvB,EACD,EAAa,EACb,SAAS,CAAC,GAAG,EAAE,CAChB,CAAC;IACJ,CAAC;IAED,CAAC,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACpC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QACxC,CAAC,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE;QACrB,MAAM,WAAW,GAAQ,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QACjD,MAAM,QAAQ,GAAQ,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC3C,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,CAAC,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;YACpC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAEhC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;YAEjE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC/B,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3C,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACvD,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAc,CAAC,CAAC,CAAC,UAAU,CAAC;gBAChD,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACtC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/__tests__/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,CAAC,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACpC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QACxC,CAAC,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE;QACrB,MAAM,WAAW,GAAQ,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QACjD,MAAM,QAAQ,GAAQ,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC3C,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,CAAC,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;YACpC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAEhC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC;YAEzE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC/B,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC3C,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACvD,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAc,CAAC,CAAC,CAAC,UAAU,CAAC;gBAChD,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACtC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;QACjE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/build/__tests__/xyz.util.d.ts

@@ -1,12 +1,10 @@
-import { TileMatrixSet } from '@basemaps/geo';
 import { LambdaHttpRequest } from '@linzjs/lambda';
-import { TileSetRaster } from '../tile.set.raster.js';
-import { TileSetVector } from '../tile.set.vector.js';
 export declare function mockRequest(path: string, method?: string, headers?: Record<string, string>): LambdaHttpRequest;
-export declare class FakeTileSet extends TileSetRaster {
-    constructor(name: string, tileMatrix: TileMatrixSet, title?: string, description?: string);
-}
-export declare class FakeTileSetVector extends TileSetVector {
-    constructor(name: string, tileMatrix: TileMatrixSet);
-}
+export declare function mockUrlRequest(path: string, query?: string, headers?: Record<string, unknown>): LambdaHttpRequest;
+export declare const Api: {
+    key: string;
+    header: {
+        'x-linz-api-key': string;
+    };
+};
 //# sourceMappingURL=xyz.util.d.ts.map

package/build/__tests__/xyz.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xyz.util.d.ts","sourceRoot":"","sources":["../../src/__tests__/xyz.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAoB,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAQ,EAAE,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,iBAAiB,CAajH;AAED,qBAAa,WAAY,SAAQ,aAAa;gBAChC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,SAAkB,EAAE,WAAW,SAAwB;CASlH;AAED,qBAAa,iBAAkB,SAAQ,aAAa;gBACtC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa;CAIpD"}
+{"version":3,"file":"xyz.util.d.ts","sourceRoot":"","sources":["../../src/__tests__/xyz.util.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,iBAAiB,EAAoB,MAAM,gBAAgB,CAAC;AAGvF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAQ,EAAE,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,iBAAiB,CAajH;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAK,EAAE,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,iBAAiB,CAYjH;AAED,eAAO,MAAM,GAAG;;;;;CAGf,CAAC"}

package/build/__tests__/xyz.util.js

@@ -1,32 +1,26 @@
 import { LogConfig } from '@basemaps/shared';
-import { LambdaAlbRequest } from '@linzjs/lambda';
-import { TileSetRaster } from '../tile.set.raster.js';
-import { TileSetVector } from '../tile.set.vector.js';
+import { LambdaAlbRequest, LambdaUrlRequest } from '@linzjs/lambda';
 export function mockRequest(path, method = 'get', headers = {}) {
     return new LambdaAlbRequest({
         requestContext: null,
         httpMethod: method.toUpperCase(),
-        path,
+        path: encodeURI(path),
         headers,
         body: null,
         isBase64Encoded: false,
     }, {}, LogConfig.get());
 }
-export class FakeTileSet extends TileSetRaster {
-    constructor(name, tileMatrix, title = `${name}:title`, description = `${name}:description`) {
-        super(name, tileMatrix);
-        this.tileSet = {
-            name,
-            title,
-            description,
-            layers: [{ name: `imagery_${name}`, [tileMatrix.projection.code]: `im_${title}` }],
-        };
-    }
-}
-export class FakeTileSetVector extends TileSetVector {
-    constructor(name, tileMatrix) {
-        super(name, tileMatrix);
-        this.tileSet = {};
-    }
+export function mockUrlRequest(path, query = '', headers = {}) {
+    return new LambdaUrlRequest({
+        requestContext: { http: { method: 'GET' } },
+        headers,
+        rawPath: encodeURI(path),
+        rawQueryString: query,
+        isBase64Encoded: false,
+    }, {}, LogConfig.get());
 }
+export const Api = {
+    key: 'd01f7w7rnhdzg0p7fyrc9v9ard1',
+    header: { 'x-linz-api-key': 'd01f7w7rnhdzg0p7fyrc9v9ard1' },
+};
 //# sourceMappingURL=xyz.util.js.map

package/build/__tests__/xyz.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"xyz.util.js","sourceRoot":"","sources":["../../src/__tests__/xyz.util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAqB,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,MAAM,GAAG,KAAK,EAAE,UAAkC,EAAE;IAC5F,OAAO,IAAI,gBAAgB,CACzB;QACE,cAAc,EAAE,IAAW;QAC3B,UAAU,EAAE,MAAM,CAAC,WAAW,EAAE;QAChC,IAAI;QACJ,OAAO;QACP,IAAI,EAAE,IAAI;QACV,eAAe,EAAE,KAAK;KACvB,EACD,EAAa,EACb,SAAS,CAAC,GAAG,EAAE,CAChB,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,WAAY,SAAQ,aAAa;IAC5C,YAAY,IAAY,EAAE,UAAyB,EAAE,KAAK,GAAG,GAAG,IAAI,QAAQ,EAAE,WAAW,GAAG,GAAG,IAAI,cAAc;QAC/G,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG;YACb,IAAI;YACJ,KAAK;YACL,WAAW;YACX,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,EAAE,EAAE,CAAC;SAC5E,CAAC;IACX,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,aAAa;IAClD,YAAY,IAAY,EAAE,UAAyB;QACjD,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,EAAS,CAAC;IAC3B,CAAC;CACF"}
+{"version":3,"file":"xyz.util.js","sourceRoot":"","sources":["../../src/__tests__/xyz.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAqB,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGvF,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,MAAM,GAAG,KAAK,EAAE,UAAkC,EAAE;IAC5F,OAAO,IAAI,gBAAgB,CACzB;QACE,cAAc,EAAE,IAAW;QAC3B,UAAU,EAAE,MAAM,CAAC,WAAW,EAAE;QAChC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC;QACrB,OAAO;QACP,IAAI,EAAE,IAAI;QACV,eAAe,EAAE,KAAK;KACvB,EACD,EAAa,EACb,SAAS,CAAC,GAAG,EAAE,CAChB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,KAAK,GAAG,EAAE,EAAE,UAAmC,EAAE;IAC5F,OAAO,IAAI,gBAAgB,CACzB;QACE,cAAc,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;QAC3C,OAAO;QACP,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC;QACxB,cAAc,EAAE,KAAK;QACrB,eAAe,EAAE,KAAK;KAChB,EACR,EAAa,EACb,SAAS,CAAC,GAAG,EAAE,CAChB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,GAAG,GAAG;IACjB,GAAG,EAAE,6BAA6B;IAClC,MAAM,EAAE,EAAE,gBAAgB,EAAE,6BAA6B,EAAE;CAC5D,CAAC"}

package/build/index.d.ts

@@ -1,5 +1,3 @@
-import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
-export declare function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
 export declare const handler: import("@linzjs/lambda/build/src/function").LambdaHandler<import("@linzjs/lambda/build/src/http/request.http").HttpRequestEvent, import("@linzjs/lambda/build/src/http/request.http").HttpResponse> & {
     router: import("@linzjs/lambda/build/src/http/router").Router;
 };

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAM,MAAM,gBAAgB,CAAC;AAe3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAOvF;AAED,eAAO,MAAM,OAAO;;CAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,OAAO;;CAA2B,CAAC"}

package/build/index.js

@@ -1,48 +1,79 @@
 import { LogConfig } from '@basemaps/shared';
-import { lf } from '@linzjs/lambda';
-import { createHash } from 'crypto';
-import { Router } from './router.js';
-import { Ping, Version } from './routes/api.js';
+import { LambdaHttpResponse, LambdaUrlRequest, lf } from '@linzjs/lambda';
+import { tileAttributionGet } from './routes/attribution.js';
 import { fontGet, fontList } from './routes/fonts.js';
-import { Health } from './routes/health.js';
+import { healthGet } from './routes/health.js';
 import { imageryGet } from './routes/imagery.js';
+import { pingGet } from './routes/ping.js';
 import { spriteGet } from './routes/sprites.js';
-import { Tiles } from './routes/tile.js';
-import { St } from './source.tracer.js';
-const app = new Router();
-app.get('tiles', Tiles);
-export async function handleRequest(req) {
-    const apiKey = Router.apiKey(req);
-    if (apiKey != null) {
-        const apiKeyHash = createHash('sha256').update(apiKey).digest('base64');
-        req.set('api', apiKeyHash);
-    }
-    return await app.handle(req);
-}
+import { tileJsonGet } from './routes/tile.json.js';
+import { styleJsonGet } from './routes/tile.style.json.js';
+import { wmtsCapabilitiesGet } from './routes/tile.wmts.js';
+import { tileXyzGet } from './routes/tile.xyz.js';
+import { versionGet } from './routes/version.js';
+import { NotFound } from './util/response.js';
+import { CoSources } from './util/source.cache.js';
+import { St } from './util/source.tracer.js';
 export const handler = lf.http(LogConfig.get());
 handler.router.hook('request', (req) => {
     req.set('name', 'LambdaTiler');
     // Reset the request tracing before every request
     St.reset();
 });
-handler.router.hook('response', (req) => {
+handler.router.hook('response', (req, res) => {
     if (St.requests.length > 0) {
         // TODO this could be relaxed to every say 5% of requests if logging gets too verbose.
         req.set('requests', St.requests.slice(0, 100)); // limit to 100 requests (some tiles need 100s of requests)
         req.set('requestCount', St.requests.length);
     }
+    // Log the source cache hit/miss ratio
+    req.set('sources', {
+        hits: CoSources.cache.hits,
+        misses: CoSources.cache.misses,
+        size: CoSources.cache.currentSize,
+        resets: CoSources.cache.resets,
+        cacheA: CoSources.cache.cacheA.size,
+        cacheB: CoSources.cache.cacheB.size,
+    });
+    // FunctionURLs automatically inject CORS responses for us
+    if (!(req instanceof LambdaUrlRequest) && req.headers.has('origin')) {
+        res.header('access-control-allow-origin', '*');
+    }
+});
+// CORS is handled by function url hook so just return ok if the route exists
+handler.router.options('*', (req) => {
+    const route = handler.router.router.find('GET', req.path);
+    if (route == null)
+        return NotFound();
+    return LambdaHttpResponse.ok();
 });
 // TODO some internal health checks hit these routes, we should change them all to point at /v1/
-handler.router.get('/ping', Ping);
-handler.router.get('/health', Health);
-handler.router.get('/version', Version);
-handler.router.get('/v1/ping', Ping);
-handler.router.get('/v1/health', Health);
-handler.router.get('/v1/version', Version);
+handler.router.get('/ping', pingGet);
+handler.router.get('/health', healthGet);
+handler.router.get('/version', versionGet);
+handler.router.get('/v1/ping', pingGet);
+handler.router.get('/v1/health', healthGet);
+handler.router.get('/v1/version', versionGet);
+// Image Metadata
 handler.router.get('/v1/imagery/:imageryId/:fileName', imageryGet);
+// Sprites
 handler.router.get('/v1/sprites/:spriteName', spriteGet);
+// Fonts
 handler.router.get('/v1/fonts.json', fontList);
 handler.router.get('/v1/fonts/:fontStack/:range.pbf', fontGet);
-// Catch all for old requests
-handler.router.get('*', handleRequest);
+// 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);
+// TileJSON
+handler.router.get('/v1/tiles/:tileSet/:tileMatrix/tile.json', tileJsonGet);
+// Tiles
+handler.router.get('/v1/tiles/:tileSet/:tileMatrix/:z/:x/:y.:tileType', tileXyzGet);
+// Attribution
+handler.router.get('/v1/tiles/:tileSet/:tileMatrix/attribution.json', tileAttributionGet);
+handler.router.get('/v1/attribution/:tileSet/:tileMatrix/summary.json', tileAttributionGet);
+// WMTS Capabilities
+handler.router.get('/v1/tiles/:tileSet/:tileMatrix/WMTSCapabilities.xml', wmtsCapabilitiesGet);
+handler.router.get('/v1/tiles/:tileSet/WMTSCapabilities.xml', wmtsCapabilitiesGet);
+handler.router.get('/v1/tiles/WMTSCapabilities.xml', wmtsCapabilitiesGet);
 //# sourceMappingURL=index.js.map

package/build/index.js.map

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