@basemaps/lambda-tiler 6.19.0 → 6.20.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.20.0](https://github.com/linz/basemaps/compare/v6.19.0...v6.20.0) (2022-02-01)
+
+
+### Features
+
+* **lambda-tiler:** allow relative sprites and glyphs ([#2071](https://github.com/linz/basemaps/issues/2071)) ([a283157](https://github.com/linz/basemaps/commit/a283157f6b11fd9f6168edd19e9d5624f52d0325))
+* **lambda-tiler:** wip esri vectortileserver interface for vector tiles ([#2041](https://github.com/linz/basemaps/issues/2041)) ([0549d68](https://github.com/linz/basemaps/commit/0549d688ae44c20bd8dce0281988c7ba258fdacb))
+
+
+
+
+
 # [6.19.0](https://github.com/linz/basemaps/compare/v6.18.1...v6.19.0) (2021-12-20)
 
 

package/LICENSE

@@ -1,6 +1,6 @@
-Basemaps MIT Licence
+MIT License
 
-Crown copyright (c) 2020, Land Information New Zealand on behalf of the New Zealand Government.
+Crown copyright (c), Toitū Te Whenua Land Information New Zealand on behalf of the New Zealand Government.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/build/__test__/tile.style.json.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=tile.style.json.test.d.ts.map

package/build/__test__/tile.style.json.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tile.style.json.test.d.ts","sourceRoot":"","sources":["../../src/__test__/tile.style.json.test.ts"],"names":[],"mappings":""}

package/build/__test__/tile.style.json.test.js

@@ -0,0 +1,33 @@
+import { Env } from '@basemaps/shared';
+import o from 'ospec';
+import { convertRelativeUrl } from '../routes/tile.style.json.js';
+o.spec('TileStyleJson', () => {
+    const host = 'https://tiles.test';
+    let originalHost;
+    o.beforeEach(() => {
+        originalHost = process.env[Env.PublicUrlBase];
+        process.env[Env.PublicUrlBase] = host;
+    });
+    o.afterEach(() => {
+        process.env[Env.PublicUrlBase] = originalHost;
+    });
+    o('should not convert empty urls', () => {
+        o(convertRelativeUrl()).equals('');
+        o(convertRelativeUrl('')).equals('');
+        o(convertRelativeUrl(undefined)).equals('');
+    });
+    o('should only convert relative urls', () => {
+        o(convertRelativeUrl('/foo')).equals('https://tiles.test/foo');
+        o(convertRelativeUrl('/bar/baz/')).equals('https://tiles.test/bar/baz/');
+    });
+    o('should only convert with api keys', () => {
+        o(convertRelativeUrl('/foo', 'abc')).equals('https://tiles.test/foo?api=abc');
+        o(convertRelativeUrl('/bar/baz/', 'abc')).equals('https://tiles.test/bar/baz/?api=abc');
+    });
+    o('should convert with other query params', () => {
+        o(convertRelativeUrl('/foo?bar=baz', 'abc')).equals('https://tiles.test/foo?bar=baz&api=abc');
+    });
+    o('should not convert full urls', () => {
+        o(convertRelativeUrl('https://foo.com/foo?bar=baz', 'abc')).equals('https://foo.com/foo?bar=baz');
+    });
+});

package/build/__test__/xyz.test.js

@@ -2,16 +2,18 @@ import { TileMatrixSets } from '@basemaps/geo';
 import { Config, Env, LogConfig, VNodeParser } from '@basemaps/shared';
 import { round } from '@basemaps/test/build/rounding.js';
 import o from 'ospec';
+import sinon from 'sinon';
 import { handleRequest } from '../index.js';
-import { TileComposer } from '../routes/tile.js';
 import { TileEtag } from '../routes/tile.etag.js';
 import { TileSets } from '../tile.set.cache.js';
+import { TileComposer } from '../tile.set.raster.js';
 import { FakeTileSet, mockRequest, Provider } from './xyz.util.js';
-import sinon from 'sinon';
 const sandbox = sinon.createSandbox();
 const TileSetNames = ['aerial', 'aerial@head', 'aerial@beta', '01E7PJFR9AMQFJ05X9G7FQ3XMW'];
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
 o.spec('LambdaXyz', () => {
+    const host = 'https://tiles.test';
+    const origPublicUrlBase = process.env[Env.PublicUrlBase];
     /** Generate mock ALBEvent */
     let rasterMock = o.spy();
     const generateMock = o.spy(() => 'foo');
@@ -21,6 +23,7 @@ o.spec('LambdaXyz', () => {
     const apiKey = 'd01f7w7rnhdzg0p7fyrc9v9ard1';
     const apiKeyHeader = { 'x-linz-api-key': 'd01f7w7rnhdzg0p7fyrc9v9ard1' };
     o.beforeEach(() => {
+        process.env[Env.PublicUrlBase] = host;
         LogConfig.disable();
         // tileMock = o.spy(() => tileMockData) as any;
         rasterMock = o.spy(() => {
@@ -45,6 +48,7 @@ o.spec('LambdaXyz', () => {
         TileSets.cache.clear();
         TileComposer.compose = origCompose;
         TileEtag.generate = origTileEtag;
+        process.env[Env.PublicUrlBase] = origPublicUrlBase;
         sandbox.restore();
     });
     o('should export handler', async () => {
@@ -115,11 +119,8 @@ o.spec('LambdaXyz', () => {
         }
     });
     o.spec('WMTSCapabilities', () => {
-        const origPublicUrlBase = process.env[Env.PublicUrlBase];
-        o.after(() => {
-            process.env[Env.PublicUrlBase] = origPublicUrlBase;
-        });
         o('should 304 if a xml is not modified', async () => {
+            delete process.env[Env.PublicUrlBase];
             o.timeout(1000);
             const key = 'NuirTK8fozzCJV1iG1FznmdHhKvk6WaWuDhhEA1d40c=';
             const request = mockRequest('/v1/tiles/WMTSCapabilities.xml', 'get', {
@@ -137,8 +138,6 @@ o.spec('LambdaXyz', () => {
         });
         o('should serve WMTSCapabilities for tile_set', async () => {
             var _a;
-            console.log('\n\nTestStart');
-            process.env[Env.PublicUrlBase] = 'https://tiles.test';
             const request = mockRequest('/v1/tiles/aerial@beta/WMTSCapabilities.xml', 'get', apiKeyHeader);
             const res = await handleRequest(request);
             o(res.status).equals(200);
@@ -153,12 +152,9 @@ o.spec('LambdaXyz', () => {
         });
     });
     o.spec('tileJson', () => {
-        const origPublicUrlBase = process.env[Env.PublicUrlBase];
-        o.after(() => {
-            process.env[Env.PublicUrlBase] = origPublicUrlBase;
-        });
         o('should 304 if a json is not modified', async () => {
-            const key = 'XecTdbcdjCyzB1MHOOQbrOkD2TTJ0ORh4JuXqhxXEE0=';
+            // delete process.env[Env.PublicUrlBase];
+            const key = 'BBfQpNXA3Q90jlFrLSOZhxbvfOh7OpN1OEE+BylpbHw=';
             const request = mockRequest('/v1/tiles/tile.json', 'get', { 'if-none-match': key, ...apiKeyHeader });
             const res = await handleRequest(request);
             if (res.status === 200) {
@@ -169,9 +165,19 @@ o.spec('LambdaXyz', () => {
             o(rasterMock.calls.length).equals(0);
             o(request.logContext['cache']).deepEquals({ key, match: key, hit: true });
         });
+        o('should 200 if a invalid etag is given', async () => {
+            var _a;
+            const key = 'ABCXecTdbcdjCyzB1MHOOQbrOkD2TTJ0ORh4JuXqhxXEE0=';
+            const request = mockRequest('/v1/tiles/tile.json', 'get', { 'if-none-match': key, ...apiKeyHeader });
+            const res = await handleRequest(request);
+            o(res.status).equals(200);
+            o(res.header('etag')).equals('BBfQpNXA3Q90jlFrLSOZhxbvfOh7OpN1OEE+BylpbHw=');
+            const out = JSON.parse(Buffer.from((_a = res.body) !== null && _a !== void 0 ? _a : '', 'base64').toString());
+            o(out.tiles[0].startsWith('https://tiles.test/v1/tiles/tile.json/undefined/{z}/{x}/{y}.pbf?api=')).equals(true);
+            o(request.logContext['cache']).deepEquals(undefined);
+        });
         o('should serve tile json for tile_set', async () => {
             var _a;
-            process.env[Env.PublicUrlBase] = 'https://tiles.test';
             const request = mockRequest('/v1/tiles/topographic/Google/tile.json', 'get', apiKeyHeader);
             const res = await handleRequest(request);
             o(res.status).equals(200);
@@ -188,12 +194,7 @@ o.spec('LambdaXyz', () => {
         });
     });
     o.spec('styleJson', () => {
-        const origPublicUrlBase = process.env[Env.PublicUrlBase];
-        o.after(() => {
-            process.env[Env.PublicUrlBase] = origPublicUrlBase;
-        });
         o('should not found style json', async () => {
-            process.env[Env.PublicUrlBase] = 'https://tiles.test';
             const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', apiKeyHeader);
             sandbox.stub(Config.Style, 'get').resolves(null);
             const res = await handleRequest(request);
@@ -201,8 +202,6 @@ o.spec('LambdaXyz', () => {
         });
         o('should serve style json', async () => {
             var _a;
-            const host = 'https://tiles.test';
-            process.env[Env.PublicUrlBase] = host;
             const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', apiKeyHeader);
             const fakeStyle = {
                 version: 8,
@@ -243,8 +242,8 @@ o.spec('LambdaXyz', () => {
                         minzoom: 0,
                     },
                 ],
-                glyphs: 'glyphs',
-                sprite: 'sprite',
+                glyphs: '/glyphs',
+                sprite: '/sprite',
                 metadata: { id: 'test' },
             };
             const fakeRecord = {
@@ -270,6 +269,8 @@ o.spec('LambdaXyz', () => {
                 type: 'raster',
                 tiles: [`${host}/raster/{z}/{x}/{y}.webp?api=${apiKey}`],
             };
+            fakeStyle.sprite = `${host}/sprite`;
+            fakeStyle.glyphs = `${host}/glyphs`;
             o(JSON.parse(body)).deepEquals(fakeStyle);
         });
     });

package/build/cli/dump.js

@@ -3,7 +3,7 @@ import { LogConfig } from '@basemaps/shared';
 import { ImageFormat } from '@basemaps/tiler';
 import { LambdaAlbRequest } from '@linzjs/lambda';
 import { promises as fs } from 'fs';
-import { TileRoute } from '../routes/tile.js';
+import { tileXyz } from '../routes/tile.xyz.js';
 import { TileSets } from '../tile.set.cache.js';
 import { TileSetLocal } from './tile.set.local.js';
 const xyz = { x: 0, y: 0, z: 0 };
@@ -36,7 +36,7 @@ async function main() {
         httpMethod: 'get',
         path: `/v1/tiles/${tileSet.fullName}/${tileMatrix.identifier}/${xyz.z}/${xyz.x}/${xyz.y}.${ext}`,
     }, {}, logger);
-    const tileData = await TileRoute.tile(ctx);
+    const tileData = await tileXyz(ctx);
     const headers = {};
     for (const [key, value] of tileData.headers)
         headers[key] = value;

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAkB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkBvF;AAED,eAAO,MAAM,OAAO,2LAA0C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAoB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkBvF;AAED,eAAO,MAAM,OAAO,2LAA0C,CAAC"}

package/build/index.js

@@ -6,12 +6,14 @@ import { Tiles } from './routes/tile.js';
 import { Router } from './router.js';
 import { createHash } from 'crypto';
 import { Imagery } from './routes/imagery.js';
+import { Esri } from './routes/esri/rest.js';
 const app = new Router();
 app.get('ping', Ping);
 app.get('health', Health);
 app.get('version', Version);
 app.get('tiles', Tiles);
 app.get('imagery', Imagery);
+app.get('esri', Esri);
 let slowTimer = null;
 export async function handleRequest(req) {
     // Warn if a request takes more than 10 seconds to process

package/build/routes/esri/rest.d.ts

@@ -0,0 +1,10 @@
+import { TileMatrixSet } from '@basemaps/geo';
+import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+export declare function vectorTileServer(req: LambdaHttpRequest, layerId: string, tms: TileMatrixSet): Promise<LambdaHttpResponse>;
+/**
+ * /v1/esri/services/:layerId/VectorTileServer
+ *
+ * @example http://localhost:5000/v1/esri/services/topographic/VectorTileServer
+ */
+export declare function Esri(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
+//# sourceMappingURL=rest.d.ts.map

package/build/routes/esri/rest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rest.d.ts","sourceRoot":"","sources":["../../../src/routes/esri/rest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,aAAa,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKvE,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,iBAAiB,EACtB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,kBAAkB,CAAC,CAiD7B;AAED;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsB9E"}

package/build/routes/esri/rest.js

@@ -0,0 +1,87 @@
+import { GoogleTms } from '@basemaps/geo';
+import { tileXyzFromPath } from '@basemaps/shared';
+import { LambdaHttpResponse } from '@linzjs/lambda';
+import { Router } from '../../router.js';
+import { TileSets } from '../../tile.set.cache.js';
+import { NotFound } from '../response.js';
+export async function vectorTileServer(req, layerId, tms) {
+    if (tms.identifier !== GoogleTms.identifier)
+        return NotFound;
+    const extent = {
+        xmin: tms.extent.x,
+        ymin: tms.extent.y,
+        xmax: tms.extent.right,
+        ymax: tms.extent.bottom,
+        // TODO where is wkid from
+        spatialReference: { wkid: 102100, latestWkid: tms.projection.code },
+    };
+    const res = new LambdaHttpResponse(200, 'ok');
+    res.json({
+        currentVersion: 10.4,
+        name: layerId,
+        capabilities: 'TilesOnly',
+        type: 'indexedVector',
+        tileMap: 'tilemap',
+        defaultStyles: 'resources/styles',
+        tiles: ['tiles/{z}/{x}/{y}.pbf'],
+        exportTilesAllowed: false,
+        maxExportTilesCount: 0,
+        initialExtent: extent,
+        fullExtent: extent,
+        minScale: tms.zooms[0].scaleDenominator,
+        maxScale: tms.zooms[tms.zooms.length - 1].scaleDenominator,
+        tileInfo: {
+            // TODO are all the pbf 256x256?
+            rows: 256,
+            cols: 256,
+            dpi: 96,
+            format: 'pbf',
+            origin: { x: tms.extent.x, y: tms.extent.bottom },
+            spatialReference: { wkid: 102100, latestWkid: tms.projection.code },
+            lods: tms.zooms.map((c, i) => {
+                return {
+                    level: i,
+                    scale: c.scaleDenominator,
+                    resolution: c.scaleDenominator * 0.28e-3,
+                };
+            }),
+        },
+        resourceInfo: {
+            styleVersion: 8,
+            tileCompression: 'gzip',
+            cacheInfo: { storageInfo: { packetSize: 128, storageFormat: 'compactV2' } },
+        },
+    });
+    return res;
+}
+/**
+ * /v1/esri/services/:layerId/VectorTileServer
+ *
+ * @example http://localhost:5000/v1/esri/services/topographic/VectorTileServer
+ */
+export async function Esri(req) {
+    const { rest } = Router.action(req);
+    if (rest[0] !== 'services')
+        return NotFound;
+    const layerId = rest[1];
+    if (layerId == null)
+        return NotFound;
+    const serviceId = rest[2];
+    if (serviceId !== 'VectorTileServer')
+        return NotFound;
+    if (rest.length === 3)
+        return vectorTileServer(req, layerId, GoogleTms);
+    if (rest[rest.length - 1].endsWith('.pbf')) {
+        const generatedPath = [layerId, GoogleTms.identifier, ...rest.slice(rest.length - 3)];
+        const xyz = tileXyzFromPath(generatedPath);
+        if (xyz == null)
+            return NotFound;
+        req.timer.start('tileset:load');
+        const tileSet = await TileSets.get(xyz.name, xyz.tileMatrix);
+        req.timer.end('tileset:load');
+        if (tileSet == null)
+            return NotFound;
+        return await tileSet.tile(req, xyz);
+    }
+    return new LambdaHttpResponse(200, 'ok');
+}

package/build/routes/imagery.d.ts

@@ -1,6 +1,8 @@
 import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 /**
  * Get metadata around the imagery such as the source bounding box or the bounding box of the COGS
+ *
+ * @example
  * - /v1/imagery/:imageryId/source.geojson
  * - /v1/imagery/:imageryId/covering.geojson
  */

package/build/routes/imagery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imagery.d.ts","sourceRoot":"","sources":["../../src/routes/imagery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAgBnF;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0BjF"}
+{"version":3,"file":"imagery.d.ts","sourceRoot":"","sources":["../../src/routes/imagery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAgBnF;;;;;;GAMG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0BjF"}

package/build/routes/imagery.js

@@ -5,8 +5,8 @@ import { createHash } from 'crypto';
 import { promisify } from 'util';
 import { gzip } from 'zlib';
 import { Router } from '../router.js';
+import { NotModified } from './response.js';
 import { TileEtag } from './tile.etag.js';
-import { NotModified } from './tile.js';
 const gzipP = promisify(gzip);
 function isAllowedFile(f) {
     if (f.endsWith('.geojson'))
@@ -17,6 +17,8 @@ function isAllowedFile(f) {
 }
 /**
  * Get metadata around the imagery such as the source bounding box or the bounding box of the COGS
+ *
+ * @example
  * - /v1/imagery/:imageryId/source.geojson
  * - /v1/imagery/:imageryId/covering.geojson
  */

package/build/routes/response.d.ts

@@ -0,0 +1,4 @@
+import { LambdaHttpResponse } from '@linzjs/lambda';
+export declare const NotFound: LambdaHttpResponse;
+export declare const NotModified: LambdaHttpResponse;
+//# sourceMappingURL=response.d.ts.map

package/build/routes/response.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../src/routes/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,eAAO,MAAM,QAAQ,oBAA2C,CAAC;AACjE,eAAO,MAAM,WAAW,oBAA8C,CAAC"}

package/build/routes/response.js

@@ -0,0 +1,3 @@
+import { LambdaHttpResponse } from '@linzjs/lambda';
+export const NotFound = new LambdaHttpResponse(404, 'Not Found');
+export const NotModified = new LambdaHttpResponse(304, 'Not modified');

package/build/routes/tile.d.ts

@@ -1,23 +1,3 @@
-import { TileMatrixSet } from '@basemaps/geo';
 import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
-import { TileMakerSharp } from '@basemaps/tiler-sharp';
-import { TileSetRaster } from '../tile.set.raster.js';
-export declare const TileComposer: TileMakerSharp;
-export declare const NotFound: LambdaHttpResponse;
-export declare const NotModified: LambdaHttpResponse;
-export interface TileJson {
-    tiles: string[];
-    minzoom: number;
-    maxzoom: number;
-    format: string;
-    tilejson: string;
-}
-export declare const TileRoute: {
-    tile(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
-    wmtsLoadTileSets(name: string, tileMatrix: TileMatrixSet | null): Promise<TileSetRaster[]>;
-    wmts(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
-    tileJson(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
-    styleJson(req: LambdaHttpRequest, fileName: string): Promise<LambdaHttpResponse>;
-};
 export declare function Tiles(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
 //# sourceMappingURL=tile.d.ts.map

package/build/routes/tile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tile.d.ts","sourceRoot":"","sources":["../../src/routes/tile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEnF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAStD,eAAO,MAAM,YAAY,gBAA0B,CAAC;AAEpD,eAAO,MAAM,QAAQ,oBAA2C,CAAC;AACjE,eAAO,MAAM,WAAW,oBAA8C,CAAC;AAEvE,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,SAAS;cACJ,iBAAiB,GAAG,QAAQ,kBAAkB,CAAC;2BAelC,MAAM,cAAc,aAAa,GAAG,IAAI,GAAG,QAAQ,aAAa,EAAE,CAAC;cAUhF,iBAAiB,GAAG,QAAQ,kBAAkB,CAAC;kBAiC3C,iBAAiB,GAAG,QAAQ,kBAAkB,CAAC;mBA8B9C,iBAAiB,YAAY,MAAM,GAAG,QAAQ,kBAAkB,CAAC;CA8DvF,CAAC;AACF,wBAAsB,KAAK,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAY/E"}
+{"version":3,"file":"tile.d.ts","sourceRoot":"","sources":["../../src/routes/tile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAUvE,wBAAsB,KAAK,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAY/E"}

package/build/routes/tile.js

@@ -1,162 +1,12 @@
-import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
-import { Config, Env, setNameAndProjection, TileSetName, tileWmtsFromPath, tileXyzFromPath } from '@basemaps/shared';
-import { TileMakerSharp } from '@basemaps/tiler-sharp';
-import { createHash } from 'crypto';
+import { LambdaHttpResponse } from '@linzjs/lambda';
 import { isValidApiKey } from '../api.key.js';
-import { TileSets } from '../tile.set.cache.js';
-import { WmtsCapabilities } from '../wmts.capability.js';
-import { attribution } from './attribution.js';
-import { TileEtag } from './tile.etag.js';
 import { Router } from '../router.js';
-import { ValidateTilePath } from '../validate.js';
-import { URL } from 'url';
-import { fsa } from '@chunkd/fs';
-export const TileComposer = new TileMakerSharp(256);
-export const NotFound = new LambdaHttpResponse(404, 'Not Found');
-export const NotModified = new LambdaHttpResponse(304, 'Not modified');
-export const TileRoute = {
-    async tile(req) {
-        const action = Router.action(req);
-        const xyzData = tileXyzFromPath(action.rest);
-        if (xyzData == null)
-            return NotFound;
-        ValidateTilePath.validate(req, xyzData);
-        req.timer.start('tileset:load');
-        const tileSet = await TileSets.get(xyzData.name, xyzData.tileMatrix);
-        req.timer.end('tileset:load');
-        if (tileSet == null)
-            return NotFound;
-        const res = await tileSet.tile(req, xyzData);
-        return res;
-    },
-    async wmtsLoadTileSets(name, tileMatrix) {
-        if (tileMatrix != null) {
-            const ts = await TileSets.get(name, tileMatrix);
-            if (ts == null || ts.isVector())
-                return [];
-            return [ts];
-        }
-        if (name === '')
-            name = TileSetName.aerial;
-        return (await TileSets.getAll(name, tileMatrix)).filter((f) => f.type === 'raster');
-    },
-    async wmts(req) {
-        var _a;
-        const action = Router.action(req);
-        const wmtsData = tileWmtsFromPath(action.rest);
-        if (wmtsData == null)
-            return NotFound;
-        setNameAndProjection(req, wmtsData);
-        const host = (_a = Env.get(Env.PublicUrlBase)) !== null && _a !== void 0 ? _a : '';
-        req.timer.start('tileset:load');
-        const tileSets = await TileRoute.wmtsLoadTileSets(wmtsData.name, wmtsData.tileMatrix);
-        req.timer.end('tileset:load');
-        if (tileSets.length === 0)
-            return NotFound;
-        const providerId = Config.Provider.id('linz');
-        const provider = await Config.Provider.get(providerId);
-        if (provider == null)
-            return NotFound;
-        const apiKey = Router.apiKey(req);
-        const xml = WmtsCapabilities.toXml(host, provider, tileSets, apiKey);
-        if (xml == null)
-            return NotFound;
-        const data = Buffer.from(xml);
-        const cacheKey = createHash('sha256').update(data).digest('base64');
-        if (TileEtag.isNotModified(req, cacheKey))
-            return NotModified;
-        const response = new LambdaHttpResponse(200, 'ok');
-        response.header(HttpHeader.ETag, cacheKey);
-        response.header(HttpHeader.CacheControl, 'max-age=0');
-        response.buffer(data, 'text/xml');
-        req.set('bytes', data.byteLength);
-        return response;
-    },
-    async tileJson(req) {
-        var _a;
-        const { version, rest, name } = Router.action(req);
-        const apiKey = Router.apiKey(req);
-        const host = (_a = Env.get(Env.PublicUrlBase)) !== null && _a !== void 0 ? _a : '';
-        const tileUrl = `${host}/${version}/${name}/${rest[0]}/${rest[1]}/{z}/{x}/{y}.pbf?api=${apiKey}`;
-        const tileJson = {
-            tiles: [tileUrl],
-            minzoom: 0,
-            maxzoom: 15,
-            format: 'pbf',
-            tilejson: '2.0.0',
-        };
-        const json = JSON.stringify(tileJson);
-        const data = Buffer.from(json);
-        const cacheKey = createHash('sha256').update(data).digest('base64');
-        if (TileEtag.isNotModified(req, cacheKey))
-            return NotModified;
-        const response = new LambdaHttpResponse(200, 'ok');
-        response.header(HttpHeader.ETag, cacheKey);
-        response.header(HttpHeader.CacheControl, 'max-age=120');
-        response.buffer(data, 'application/json');
-        req.set('bytes', data.byteLength);
-        return response;
-    },
-    async styleJson(req, fileName) {
-        var _a;
-        const apiKey = Router.apiKey(req);
-        if (apiKey == null)
-            return new LambdaHttpResponse(400, 'Invalid API Key.');
-        const styleName = fileName.split('.json')[0];
-        const host = (_a = Env.get(Env.PublicUrlBase)) !== null && _a !== void 0 ? _a : '';
-        // Get style Config from db
-        const dbId = Config.Style.id(styleName);
-        const styleConfig = await Config.Style.get(dbId);
-        if (styleConfig == null)
-            return NotFound;
-        // Prepare sources and add linz source
-        const style = styleConfig.style;
-        const sources = {};
-        for (const [key, value] of Object.entries(style.sources)) {
-            if (value.type === 'vector') {
-                if (value.url.startsWith('/')) {
-                    const url = new URL(fsa.join(host, value.url));
-                    url.searchParams.set('api', apiKey);
-                    value.url = url.toString().replace(/%7B/g, '{').replace(/%7D/g, '}');
-                }
-            }
-            else if (value.type === 'raster' && Array.isArray(value.tiles)) {
-                for (let i = 0; i < value.tiles.length; i++) {
-                    const tile = value.tiles[i];
-                    if (tile.startsWith('/')) {
-                        const url = new URL(fsa.join(host, tile));
-                        url.searchParams.set('api', apiKey);
-                        value.tiles[i] = url.toString().replace(/%7B/g, '{').replace(/%7D/g, '}');
-                    }
-                }
-            }
-            sources[key] = value;
-        }
-        // prepare Style.json
-        const styleJson = {
-            /** Style.json version 8 */
-            version: 8,
-            id: style.id,
-            name: style.name,
-            sources,
-            layers: style.layers,
-            metadata: style.metadata || {},
-            glyphs: style.glyphs || '',
-            sprite: style.sprite || '',
-        };
-        const json = JSON.stringify(styleJson);
-        const data = Buffer.from(json);
-        const cacheKey = createHash('sha256').update(data).digest('base64');
-        if (TileEtag.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;
-    },
-};
+import { attribution } from './attribution.js';
+import { NotFound } from './response.js';
+import { tileJson } from './tile.json.js';
+import { styleJson } from './tile.style.json.js';
+import { wmts } from './tile.wmts.js';
+import { tileXyz } from './tile.xyz.js';
 export async function Tiles(req) {
     const { rest } = Router.action(req);
     if (rest.length < 1)
@@ -168,10 +18,10 @@ export async function Tiles(req) {
     if (fileName === 'attribution.json')
         return attribution(req);
     if (fileName === 'wmtscapabilities.xml')
-        return TileRoute.wmts(req);
+        return wmts(req);
     if (fileName === 'tile.json')
-        return TileRoute.tileJson(req);
+        return tileJson(req);
     if (fileName.endsWith('json') && rest[rest.length - 2] === 'style')
-        return TileRoute.styleJson(req, fileName);
-    return TileRoute.tile(req);
+        return styleJson(req, fileName);
+    return tileXyz(req);
 }

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

@@ -0,0 +1,10 @@
+import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+export interface TileJson {
+    tiles: string[];
+    minzoom: number;
+    maxzoom: number;
+    format: string;
+    tilejson: string;
+}
+export declare function tileJson(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
+//# sourceMappingURL=tile.json.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tile.json.d.ts","sourceRoot":"","sources":["../../src/routes/tile.json.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAMnF,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,QAAQ,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA4BlF"}