@basemaps/lambda-tiler 8.2.0 → 8.5.0

package/dist/node_modules/.package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "8.2.0",
+  "version": "8.5.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {

package/dist/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "8.2.0",
+  "version": "8.5.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@basemaps/lambda-tiler",
-      "version": "8.2.0",
+      "version": "8.5.0",
       "license": "MIT",
       "dependencies": {
         "lerc": "4.0.4",

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "8.2.0",
+  "version": "8.5.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "8.2.0",
+  "version": "8.5.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,12 +22,12 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^8.1.0",
-    "@basemaps/config-loader": "^8.2.0",
-    "@basemaps/geo": "^8.0.0",
-    "@basemaps/shared": "^8.2.0",
-    "@basemaps/tiler": "^8.0.0",
-    "@basemaps/tiler-sharp": "^8.1.0",
+    "@basemaps/config": "^8.3.0",
+    "@basemaps/config-loader": "^8.5.0",
+    "@basemaps/geo": "^8.3.0",
+    "@basemaps/shared": "^8.5.0",
+    "@basemaps/tiler": "^8.3.0",
+    "@basemaps/tiler-sharp": "^8.3.0",
     "@linzjs/geojson": "^8.0.0",
     "@linzjs/lambda": "^4.0.0",
     "@mapbox/vector-tile": "^2.0.3",
@@ -50,11 +50,11 @@
     "bundle": "./bundle.sh"
   },
   "devDependencies": {
-    "@basemaps/attribution": "^8.0.0",
+    "@basemaps/attribution": "^8.3.0",
     "@chunkd/fs": "^11.2.0",
     "@types/aws-lambda": "^8.10.75",
     "@types/pixelmatch": "^5.0.0",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "69195be692efa914369fa854d3bae16355dc0dc8"
+  "gitHead": "4f6f3929b9117c3e112f7d156ab185cb98821796"
 }

package/src/index.ts

@@ -3,6 +3,7 @@ import { LambdaHttpRequest, LambdaHttpResponse, lf } from '@linzjs/lambda';
 
 import { tileAttributionGet } from './routes/attribution.js';
 import { configImageryGet, configTileSetGet } from './routes/config.js';
+import { exportTileSetGet } from './routes/export.tileset.js';
 import { fontGet, fontList } from './routes/fonts.js';
 import { healthGet } from './routes/health.js';
 import { imageryGet } from './routes/imagery.js';
@@ -116,3 +117,5 @@ handler.router.get('/v1/attribution/:tileSet/:tileMatrix/summary.json', tileAttr
 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);
+
+handler.router.get('/v1/export/:tileSet/:tileMatrix.:extension', exportTileSetGet);

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

@@ -0,0 +1,55 @@
+import { afterEach, beforeEach, describe, it } from 'node:test';
+
+import { ConfigProviderMemory } from '@basemaps/config';
+import { fsa, FsMemory, LogConfig, s3Config } from '@basemaps/shared';
+import assert from 'assert';
+
+import { FakeData } from '../../__tests__/config.data.js';
+import { Api, mockUrlRequest } from '../../__tests__/xyz.util.js';
+import { handler } from '../../index.js';
+import { ConfigLoader } from '../../util/config.loader.js';
+
+describe('tileset.export', () => {
+  const config = new ConfigProviderMemory();
+
+  beforeEach(() => {
+    LogConfig.get().level = 'silent';
+    fsa.register('s3://fake-memory/', new FsMemory());
+  });
+
+  afterEach(() => {
+    config.objects.clear();
+  });
+
+  it('should create presigned url', async (t) => {
+    t.mock.method(ConfigLoader, 'getDefaultConfig', () => Promise.resolve(config));
+
+    t.mock.method(s3Config, 'getSignedUrl', () => Promise.resolve('https://fake-s3-url.com/tileset.mbtiles'));
+
+    const topographic = FakeData.tileSetVector('topographic');
+    topographic.layers[0][2193] = 's3://fake-memory/fake-tiles.tar.co';
+    config.put(topographic);
+
+    await fsa.write(fsa.toUrl('s3://fake-memory/fake-tiles.mbtiles'), Buffer.from('ABC123'));
+
+    const res = await handler.router.handle(
+      mockUrlRequest('/v1/export/topographic/NZTM2000Quad.mbtiles', 'get', Api.header),
+    );
+    assert.equal(res.status, 302); // Temporary redirect
+    assert.equal(res.headers.get('location'), 'https://fake-s3-url.com/tileset.mbtiles');
+  });
+
+  it('should fail if mbtiles do not exist', async (t) => {
+    t.mock.method(ConfigLoader, 'getDefaultConfig', () => Promise.resolve(config));
+    t.mock.method(s3Config, 'getSignedUrl', () => Promise.resolve('https://fake-s3-url.com/tileset.mbtiles'));
+
+    const topographic = FakeData.tileSetVector('topographic');
+    topographic.layers[0][2193] = 's3://fake-memory/fake-tiles.tar.co';
+    config.put(topographic);
+
+    const res = await handler.router.handle(
+      mockUrlRequest('/v1/export/topographic/NZTM2000Quad.mbtiles', 'get', Api.header),
+    );
+    assert.equal(res.status, 404);
+  });
+});

package/src/routes/export.tileset.ts

@@ -0,0 +1,61 @@
+import { signS3Get } from '@basemaps/shared';
+import { fsa } from '@chunkd/fs';
+import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+
+import { ConfigLoader } from '../util/config.loader.js';
+import { NotFound } from '../util/response.js';
+import { Validate } from '../util/validate.js';
+
+export interface TileSetExportGet {
+  Params: {
+    tileSet: string;
+    tileMatrix: string;
+  };
+}
+
+/**
+ * Export an MBTiles file
+ *
+ * /v1/export/:tileSet/:tileMatrixSet
+ *
+ * @example
+ *  Vector Tileset `/v1/export/topographic/WebMercatorQuad.mbtiles`
+ *
+ */
+export async function exportTileSetGet(req: LambdaHttpRequest<TileSetExportGet>): Promise<LambdaHttpResponse> {
+  Validate.apiKey(req);
+
+  req.set('tileSet', req.params.tileSet);
+
+  const tileMatrix = Validate.getTileMatrixSet(req.params.tileMatrix);
+  if (tileMatrix == null) throw new LambdaHttpResponse(404, 'Tile Matrix not found');
+
+  req.set('tileMatrix', tileMatrix.identifier);
+  req.set('projection', tileMatrix.projection.code);
+  const config = await ConfigLoader.load(req);
+
+  req.timer.start('tileset:load');
+  const tileSet = await config.TileSet.get(config.TileSet.id(req.params.tileSet));
+  req.timer.end('tileset:load');
+  if (tileSet == null) return NotFound();
+
+  // Vector tiles cannot be merged (yet!)
+  if (tileSet.layers.length > 1) {
+    return new LambdaHttpResponse(500, `Too many layers in vector tileset ${tileSet.layers.length}`);
+  }
+
+  const epsgCode = tileMatrix.projection.code;
+  const layerId = tileSet.layers[0][epsgCode];
+  if (layerId == null) return new LambdaHttpResponse(404, `No data found for tile matrix: ${tileMatrix.identifier}`);
+
+  if (!layerId.startsWith('s3://')) return new LambdaHttpResponse(400, `Unable to export tilesets not inside of S3`);
+  if (!layerId.endsWith('.tar.co')) return new LambdaHttpResponse(400, `Unable to export tileset`);
+
+  const target = new URL(layerId.replace('.tar.co', '.mbtiles'));
+  const exists = await fsa.exists(target);
+  if (!exists) return NotFound();
+
+  const presignedUrl = await signS3Get(target);
+
+  return new LambdaHttpResponse(302, 'Moved', { location: presignedUrl });
+}