@basemaps/lambda-tiler 6.16.0 → 6.19.0

package/dist/node_modules/color-string/index.js

@@ -137,7 +137,7 @@ cs.get.hsl = function (string) {
 		return null;
 	}
 
-	var hsl = /^hsla?\(\s*([+-]?(?:\d{0,3}\.)?\d+)(?:deg)?\s*,?\s*([+-]?[\d\.]+)%\s*,?\s*([+-]?[\d\.]+)%\s*(?:[,|\/]\s*([+-]?[\d\.]+)\s*)?\)$/;
+	var hsl = /^hsla?\(\s*([+-]?(?:\d{0,3}\.)?\d+)(?:deg)?\s*,?\s*([+-]?[\d\.]+)%\s*,?\s*([+-]?[\d\.]+)%\s*(?:[,|\/]\s*([+-]?(?=\.\d|\d)(?:0|[1-9]\d*)?(?:\.\d*)?(?:[eE][+-]?\d+)?)\s*)?\)$/;
 	var match = string.match(hsl);
 
 	if (match) {
@@ -158,7 +158,7 @@ cs.get.hwb = function (string) {
 		return null;
 	}
 
-	var hwb = /^hwb\(\s*([+-]?\d{0,3}(?:\.\d+)?)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/;
+	var hwb = /^hwb\(\s*([+-]?\d{0,3}(?:\.\d+)?)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?(?=\.\d|\d)(?:0|[1-9]\d*)?(?:\.\d*)?(?:[eE][+-]?\d+)?)\s*)?\)$/;
 	var match = string.match(hwb);
 
 	if (match) {

package/dist/node_modules/color-string/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "color-string@^1.6.0",
-  "_id": "color-string@1.8.2",
+  "_id": "color-string@1.9.0",
   "_inBundle": false,
-  "_integrity": "sha512-w5ZkKRdLsc5NOYsmnpS2DpyRW71npwZGwbRpLrJTuqjfTs2Bhrba7UiV59IX9siBlCPl2pne5NtiwnVWUzvYFA==",
+  "_integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
   "_location": "/color-string",
   "_phantomChildren": {},
   "_requested": {
@@ -18,8 +18,8 @@
   "_requiredBy": [
     "/color"
   ],
-  "_resolved": "https://registry.npmjs.org/color-string/-/color-string-1.8.2.tgz",
-  "_shasum": "08bd49fa5f3889c27b0c670052ed746dd7a671de",
+  "_resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+  "_shasum": "63b6ebd1bec11999d1df3a79a7569451ac2be8aa",
   "_spec": "color-string@^1.6.0",
   "_where": "/home/runner/work/basemaps/basemaps/packages/lambda-tiler/dist/node_modules/color",
   "author": {
@@ -71,7 +71,7 @@
     "pretest": "xo",
     "test": "node test/basic.js"
   },
-  "version": "1.8.2",
+  "version": "1.9.0",
   "xo": {
     "rules": {
       "no-cond-assign": 0,

package/dist/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.16.0",
+  "version": "6.19.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -92,9 +92,9 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "color-string": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.8.2.tgz",
-      "integrity": "sha512-w5ZkKRdLsc5NOYsmnpS2DpyRW71npwZGwbRpLrJTuqjfTs2Bhrba7UiV59IX9siBlCPl2pne5NtiwnVWUzvYFA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz",
+      "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==",
       "requires": {
         "color-name": "^1.0.0",
         "simple-swizzle": "^0.2.2"

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.16.0",
+  "version": "6.19.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -21,12 +21,12 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^6.10.0",
+    "@basemaps/config": "^6.18.0",
     "@basemaps/geo": "^6.10.0",
     "@basemaps/lambda": "^6.7.0",
-    "@basemaps/shared": "^6.12.0",
+    "@basemaps/shared": "^6.18.0",
     "@basemaps/tiler": "^6.11.0",
-    "@basemaps/tiler-sharp": "^6.11.0",
+    "@basemaps/tiler-sharp": "^6.16.1",
     "@chunkd/fs": "^7.3.1",
     "@cogeotiff/core": "^6.0.2",
     "@cotar/core": "^5.0.1",
@@ -51,7 +51,7 @@
     "bundle": "./bundle.sh"
   },
   "devDependencies": {
-    "@basemaps/attribution": "^6.10.0",
+    "@basemaps/attribution": "^6.17.0",
     "@types/aws-lambda": "^8.10.75",
     "@types/express": "^4.17.11",
     "@types/node": "^14.11.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.16.0",
+  "version": "6.19.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": "^6.10.0",
+    "@basemaps/config": "^6.18.0",
     "@basemaps/geo": "^6.10.0",
     "@basemaps/lambda": "^6.7.0",
-    "@basemaps/shared": "^6.12.0",
+    "@basemaps/shared": "^6.18.0",
     "@basemaps/tiler": "^6.11.0",
-    "@basemaps/tiler-sharp": "^6.11.0",
+    "@basemaps/tiler-sharp": "^6.16.1",
     "@chunkd/fs": "^7.3.1",
     "@cogeotiff/core": "^6.0.2",
     "@cotar/core": "^5.0.1",
@@ -52,7 +52,7 @@
     "bundle": "./bundle.sh"
   },
   "devDependencies": {
-    "@basemaps/attribution": "^6.10.0",
+    "@basemaps/attribution": "^6.17.0",
     "@types/aws-lambda": "^8.10.75",
     "@types/express": "^4.17.11",
     "@types/node": "^14.11.2",
@@ -61,5 +61,5 @@
     "express": "^4.17.1",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "75bda15568c94ebe89af4c179c0e80226bfabd3f"
+  "gitHead": "87d778480368585d0f4a5a7546a2858882d8ab39"
 }

package/src/__test__/xyz.test.ts

@@ -209,7 +209,7 @@ o.spec('LambdaXyz', () => {
     o('should serve tile json for tile_set', async () => {
       process.env[Env.PublicUrlBase] = 'https://tiles.test';
 
-      const request = mockRequest('/v1/tiles/topolike/Google/tile.json', 'get', apiKeyHeader);
+      const request = mockRequest('/v1/tiles/topographic/Google/tile.json', 'get', apiKeyHeader);
 
       const res = await handleRequest(request);
       o(res.status).equals(200);
@@ -218,7 +218,7 @@ o.spec('LambdaXyz', () => {
 
       const body = Buffer.from(res.body ?? '', 'base64').toString();
       o(JSON.parse(body)).deepEquals({
-        tiles: [`https://tiles.test/v1/tiles/topolike/Google/{z}/{x}/{y}.pbf?api=${apiKey}`],
+        tiles: [`https://tiles.test/v1/tiles/topographic/Google/{z}/{x}/{y}.pbf?api=${apiKey}`],
         minzoom: 0,
         maxzoom: 15,
         format: 'pbf',
@@ -236,7 +236,7 @@ o.spec('LambdaXyz', () => {
     o('should not found style json', async () => {
       process.env[Env.PublicUrlBase] = 'https://tiles.test';
 
-      const request = mockRequest('/v1/tiles/topolike/Google/style/topolike.json', 'get', apiKeyHeader);
+      const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', apiKeyHeader);
 
       sandbox.stub(Config.Style, 'get').resolves(null);
 
@@ -248,24 +248,24 @@ o.spec('LambdaXyz', () => {
       const host = 'https://tiles.test';
       process.env[Env.PublicUrlBase] = host;
 
-      const request = mockRequest('/v1/tiles/topolike/Google/style/topolike.json', 'get', apiKeyHeader);
+      const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', apiKeyHeader);
 
       const fakeStyle: StyleJson = {
         version: 8,
         id: 'test',
-        name: 'topolike',
+        name: 'topographic',
         sources: {
           basemaps_vector: {
             type: 'vector',
-            url: `${host}/vector`,
+            url: `/vector`,
           },
           basemaps_raster: {
             type: 'raster',
-            tiles: [`${host}/raster`],
+            tiles: [`/raster`],
           },
           basemaps_raster_encode: {
             type: 'raster',
-            tiles: [`${host}/raster/{z}/{x}/{y}.webp`], // Shouldn't encode the {}
+            tiles: [`/raster/{z}/{x}/{y}.webp`], // Shouldn't encode the {}
           },
           test_vector: {
             type: 'vector',
@@ -295,8 +295,8 @@ o.spec('LambdaXyz', () => {
       };
 
       const fakeRecord = {
-        id: 'st_topolike_production',
-        name: 'topolike',
+        id: 'st_topographic_production',
+        name: 'topographic',
         style: fakeStyle,
       };
 
@@ -305,7 +305,7 @@ o.spec('LambdaXyz', () => {
       const res = await handleRequest(request);
       o(res.status).equals(200);
       o(res.header('content-type')).equals('application/json');
-      o(res.header('cache-control')).equals('max-age=120');
+      o(res.header('cache-control')).equals('no-store');
 
       const body = Buffer.from(res.body ?? '', 'base64').toString();
       fakeStyle.sources.basemaps_vector = {

package/src/index.ts

@@ -4,6 +4,8 @@ import { Ping, Version } from './routes/api.js';
 import { Health } from './routes/health.js';
 import { Tiles } from './routes/tile.js';
 import { Router } from './router.js';
+import { createHash } from 'crypto';
+import { Imagery } from './routes/imagery.js';
 
 const app = new Router();
 
@@ -11,6 +13,7 @@ app.get('ping', Ping);
 app.get('health', Health);
 app.get('version', Version);
 app.get('tiles', Tiles);
+app.get('imagery', Imagery);
 
 let slowTimer: NodeJS.Timer | null = null;
 export async function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpResponse> {
@@ -21,6 +24,11 @@ export async function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpR
 
   req.set('name', 'LambdaTiler');
   try {
+    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);
   } finally {
     if (slowTimer) clearTimeout(slowTimer);

package/src/routes/imagery.ts

@@ -0,0 +1,50 @@
+import { Config } from '@basemaps/config';
+import { fsa } from '@basemaps/shared';
+import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import { createHash } from 'crypto';
+import { promisify } from 'util';
+import { gzip } from 'zlib';
+import { Router } from '../router.js';
+import { TileEtag } from './tile.etag.js';
+import { NotModified } from './tile.js';
+
+const gzipP = promisify(gzip);
+
+function isAllowedFile(f: string): boolean {
+  if (f.endsWith('.geojson')) return true;
+  if (f.endsWith('.json')) return true;
+  return false;
+}
+
+/**
+ * Get metadata around the imagery such as the source bounding box or the bounding box of the COGS
+ * - /v1/imagery/:imageryId/source.geojson
+ * - /v1/imagery/:imageryId/covering.geojson
+ */
+export async function Imagery(req: LambdaHttpRequest): Promise<LambdaHttpResponse> {
+  const { rest } = Router.action(req);
+  const [imageryId, requestType] = rest;
+  if (!isAllowedFile(requestType)) return new LambdaHttpResponse(404, 'Not found');
+
+  const imagery = await Config.Imagery.get(imageryId);
+  if (imagery == null) return new LambdaHttpResponse(404, 'Not found');
+
+  const targetPath = fsa.join(imagery.uri, requestType);
+
+  try {
+    const buf = await fsa.read(targetPath);
+    const cacheKey = createHash('sha256').update(buf).digest('base64');
+
+    if (TileEtag.isNotModified(req, cacheKey)) return NotModified;
+
+    const response = new LambdaHttpResponse(200, 'ok');
+    response.header(HttpHeader.ETag, cacheKey);
+    response.header(HttpHeader.ContentEncoding, 'gzip');
+    response.buffer(await gzipP(buf), 'application/json');
+    req.set('bytes', buf.byteLength);
+    return response;
+  } catch (e) {
+    req.log.warn({ targetPath }, 'ImageryMetadata:Failed');
+    return new LambdaHttpResponse(404, 'Not found');
+  }
+}

package/src/routes/tile.ts

@@ -13,6 +13,7 @@ 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);
 
@@ -132,16 +133,16 @@ export const TileRoute = {
     const sources: Sources = {};
     for (const [key, value] of Object.entries(style.sources)) {
       if (value.type === 'vector') {
-        if (value.url.includes(host)) {
-          const url = new URL(value.url);
+        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.includes(host)) {
-            const url = new URL(tile);
+          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, '}');
           }
@@ -173,7 +174,7 @@ export const TileRoute = {
 
     const response = new LambdaHttpResponse(200, 'ok');
     response.header(HttpHeader.ETag, cacheKey);
-    response.header(HttpHeader.CacheControl, 'max-age=120');
+    response.header(HttpHeader.CacheControl, 'no-store');
     response.buffer(data, 'application/json');
     req.set('bytes', data.byteLength);
     return response;
@@ -183,10 +184,6 @@ export async function Tiles(req: LambdaHttpRequest): Promise<LambdaHttpResponse>
   const { rest } = Router.action(req);
   if (rest.length < 1) return NotFound;
   const apiKey = Router.apiKey(req);
-  const apiKeyHash = createHash('sha256')
-    .update(apiKey ?? '')
-    .digest('base64');
-  req.set('api', apiKeyHash);
   if (!isValidApiKey(apiKey)) return new LambdaHttpResponse(400, 'Invalid API Key');
 
   const fileName = rest[rest.length - 1].toLowerCase();