@basemaps/lambda-tiler 6.19.0 → 6.22.0

package/build/tile.set.raster.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tile.set.raster.d.ts","sourceRoot":"","sources":["../src/tile.set.raster.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAe,mBAAmB,EAAqB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACnH,OAAO,EAAE,MAAM,EAAQ,IAAI,EAAE,aAAa,EAAkB,MAAM,eAAe,CAAC;AAClF,OAAO,EAAoB,OAAO,EAAE,WAAW,EAAqC,MAAM,kBAAkB,CAAC;AAC7G,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAK1C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAI/C,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAKD,qBAAa,aAAc,SAAQ,cAAc,CAAC,mBAAmB,CAAC;IACpE,IAAI,cAAsB;IAE1B,UAAU,EAAE,aAAa,CAAC;IAC1B,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM;gBAMjD,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa;IAKnD,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEK,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAmBhD,IAAI,CAAC,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA8BxF;;;;OAIG;IACI,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE;IAgC5D,OAAO,CAAC,cAAc;IAsBtB,oDAAoD;IACpD,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAShD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa;CAuBpC"}
+{"version":3,"file":"tile.set.raster.d.ts","sourceRoot":"","sources":["../src/tile.set.raster.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,aAAa,EAEb,mBAAmB,EACnB,qBAAqB,EAErB,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAQ,IAAI,EAAE,aAAa,EAAkB,MAAM,eAAe,CAAC;AAClF,OAAO,EAAoB,OAAO,EAAE,WAAW,EAAqC,MAAM,kBAAkB,CAAC;AAC7G,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAU1C,eAAO,MAAM,YAAY,gBAA0B,CAAC;AAEpD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAKD,qBAAa,aAAa;IACxB,IAAI,EAAE,WAAW,CAAC,MAAM,CAAsB;IAE9C,UAAU,EAAE,aAAa,CAAC;IAC1B,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IAEvB,UAAU,EAAE,qBAAqB,CAAC;IAClC,OAAO,EAAE,mBAAmB,CAAC;IAE7B;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM;gBAMjD,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa;IAMnD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,KAAK,IAAI,MAAM,CAElB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEK,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAmBhD,IAAI,CAAC,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA8BxF;;;;OAIG;IACI,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE;IAgC5D,OAAO,CAAC,cAAc;IAwBtB,oDAAoD;IACpD,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAShD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa;CAuBpC"}

package/build/tile.set.raster.js

@@ -1,21 +1,25 @@
-import { TileSetNameParser, TileSetType } from '@basemaps/config';
+import { TileSetNameParser, TileSetType, } from '@basemaps/config';
 import { Bounds, Epsg, TileMatrixSet, TileMatrixSets } from '@basemaps/geo';
 import { Config, Env, fsa, titleizeImageryName, VectorFormat } from '@basemaps/shared';
 import { Tiler } from '@basemaps/tiler';
+import { TileMakerSharp } from '@basemaps/tiler-sharp';
 import { CogTiff } from '@cogeotiff/core';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import pLimit from 'p-limit';
+import { NotFound, NotModified } from './routes/response.js';
 import { TileEtag } from './routes/tile.etag.js';
-import { NotFound, NotModified, TileComposer } from './routes/tile.js';
+import { St } from './source.tracer.js';
 import { TiffCache } from './tiff.cache.js';
-import { TileSetHandler } from './tile.set.js';
+import { TileSets } from './tile.set.cache.js';
 const LoadingQueue = pLimit(Env.getNumber(Env.TiffConcurrency, 5));
+export const TileComposer = new TileMakerSharp(256);
 const DefaultResizeKernel = { in: 'lanczos3', out: 'lanczos3' };
 const DefaultBackground = { r: 0, g: 0, b: 0, alpha: 0 };
-export class TileSetRaster extends TileSetHandler {
+export class TileSetRaster {
     constructor(name, tileMatrix) {
-        super(name, tileMatrix);
         this.type = TileSetType.Raster;
+        this.components = TileSetNameParser.parse(name);
+        this.tileMatrix = tileMatrix;
         this.tiler = new Tiler(this.tileMatrix);
     }
     /**
@@ -30,6 +34,12 @@ export class TileSetRaster extends TileSetHandler {
             throw new Error("Invalid uri ending with '/' " + record.uri);
         return `${record.uri}/${name}.tiff`;
     }
+    get id() {
+        return TileSets.id(this.fullName, this.tileMatrix);
+    }
+    get fullName() {
+        return TileSetNameParser.componentsToName(this.components);
+    }
     get title() {
         var _a, _b;
         return (_b = (_a = this.tileSet) === null || _a === void 0 ? void 0 : _a.title) !== null && _b !== void 0 ? _b : this.components.name;
@@ -109,7 +119,7 @@ export class TileSetRaster extends TileSetHandler {
                 continue;
             if (layer.minZoom != null && filterZoom < layer.minZoom)
                 continue;
-            const imgId = Config.getImageId(layer, this.tileMatrix.projection);
+            const imgId = layer[this.tileMatrix.projection.code];
             if (imgId == null) {
                 log === null || log === void 0 ? void 0 : log.warn({ layer: layer.name, projection: this.tileMatrix.projection.code }, 'Failed to lookup imagery');
                 continue;
@@ -139,6 +149,7 @@ export class TileSetRaster extends TileSetHandler {
                 if (source == null) {
                     throw new Error(`Failed to create CogSource from  ${TileSetRaster.basePath(record, c.name)}`);
                 }
+                St.trace(source);
                 existing = new CogTiff(source);
                 TiffCache.set(tiffKey, existing);
             }

package/build/tile.set.vector.d.ts

@@ -1,15 +1,21 @@
-import { ConfigTileSetVector, TileSetType } from '@basemaps/config';
+import { ConfigTileSetVector, TileSetNameComponents, TileSetType } from '@basemaps/config';
+import { TileMatrixSet } from '@basemaps/geo';
 import { TileDataXyz } from '@basemaps/shared';
 import { Cotar } from '@cotar/core';
 import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
-import { TileSetHandler } from './tile.set.js';
 declare class CotarCache {
     cache: Map<string, Promise<Cotar | null>>;
     get(uri: string): Promise<Cotar | null>;
 }
 export declare const Layers: CotarCache;
-export declare class TileSetVector extends TileSetHandler<ConfigTileSetVector> {
-    type: TileSetType;
+export declare class TileSetVector {
+    type: TileSetType.Vector;
+    components: TileSetNameComponents;
+    tileMatrix: TileMatrixSet;
+    tileSet: ConfigTileSetVector;
+    constructor(name: string, tileMatrix: TileMatrixSet);
+    get id(): string;
+    get fullName(): string;
     tile(req: LambdaHttpRequest, xyz: TileDataXyz): Promise<LambdaHttpResponse>;
 }
 export {};

package/build/tile.set.vector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tile.set.vector.d.ts","sourceRoot":"","sources":["../src/tile.set.vector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAO,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEnF,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,cAAM,UAAU;IACd,KAAK,qCAA4C;IAEjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;CAQxC;AAED,eAAO,MAAM,MAAM,YAAmB,CAAC;AAEvC,qBAAa,aAAc,SAAQ,cAAc,CAAC,mBAAmB,CAAC;IACpE,IAAI,cAAsB;IAEpB,IAAI,CAAC,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAwBlF"}
+{"version":3,"file":"tile.set.vector.d.ts","sourceRoot":"","sources":["../src/tile.set.vector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAqB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9G,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAO,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKnF,cAAM,UAAU;IACd,KAAK,qCAA4C;IAEjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;CAUxC;AAED,eAAO,MAAM,MAAM,YAAmB,CAAC;AAEvC,qBAAa,aAAa;IACxB,IAAI,EAAE,WAAW,CAAC,MAAM,CAAsB;IAC9C,UAAU,EAAE,qBAAqB,CAAC;IAClC,UAAU,EAAE,aAAa,CAAC;IAC1B,OAAO,EAAE,mBAAmB,CAAC;gBACjB,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa;IAKnD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAEK,IAAI,CAAC,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAwBlF"}

package/build/tile.set.vector.js

@@ -1,9 +1,10 @@
-import { TileSetType } from '@basemaps/config';
+import { TileSetNameParser, TileSetType } from '@basemaps/config';
 import { fsa, VectorFormat } from '@basemaps/shared';
 import { Cotar } from '@cotar/core';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
-import { NotFound } from './routes/tile.js';
-import { TileSetHandler } from './tile.set.js';
+import { NotFound } from './routes/response.js';
+import { TileSets } from './tile.set.cache.js';
+import { St } from './source.tracer.js';
 class CotarCache {
     constructor() {
         this.cache = new Map();
@@ -11,17 +12,26 @@ class CotarCache {
     get(uri) {
         let cotar = this.cache.get(uri);
         if (cotar == null) {
-            cotar = Cotar.fromTar(fsa.source(uri));
+            const source = fsa.source(uri);
+            St.trace(source);
+            cotar = Cotar.fromTar(source);
             this.cache.set(uri, cotar);
         }
         return cotar;
     }
 }
 export const Layers = new CotarCache();
-export class TileSetVector extends TileSetHandler {
-    constructor() {
-        super(...arguments);
+export class TileSetVector {
+    constructor(name, tileMatrix) {
         this.type = TileSetType.Vector;
+        this.components = TileSetNameParser.parse(name);
+        this.tileMatrix = tileMatrix;
+    }
+    get id() {
+        return TileSets.id(this.fullName, this.tileMatrix);
+    }
+    get fullName() {
+        return TileSetNameParser.componentsToName(this.components);
     }
     async tile(req, xyz) {
         if (xyz.ext !== VectorFormat.MapboxVectorTiles)
@@ -39,7 +49,7 @@ export class TileSetVector extends TileSetHandler {
         // Flip Y coordinate because MBTiles files are TMS.
         const y = (1 << xyz.z) - 1 - xyz.y;
         req.timer.start('cotar:tile');
-        const tile = await cotar.get(`tiles/${xyz.z}/${xyz.x}/${y}.pbf.gz`, req.log);
+        const tile = await cotar.get(`tiles/${xyz.z}/${xyz.x}/${y}.pbf.gz`);
         if (tile == null)
             return NotFound;
         req.timer.end('cotar:tile');

package/bundle.sh

@@ -4,8 +4,8 @@
 #
 ../../scripts/bundle.js package.json
 cd dist
+../scripts/create.deployment.package.mjs
 # Make the new package a commonjs module
-cat ../package.json | grep -v '"type": "module"' > package.json
 cp -r ../static .
 # @see https://sharp.pixelplumbing.com/en/stable/install/#aws-lambda
-npm install --arch=x64 --platform=linux sharp
+npm install --arch=x64 --platform=linux --production

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.19.0",
+  "version": "6.22.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,21 +22,21 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^6.18.0",
-    "@basemaps/geo": "^6.10.0",
+    "@basemaps/config": "^6.21.1",
+    "@basemaps/geo": "^6.21.1",
     "@basemaps/lambda": "^6.7.0",
-    "@basemaps/shared": "^6.18.0",
-    "@basemaps/tiler": "^6.11.0",
-    "@basemaps/tiler-sharp": "^6.16.1",
-    "@chunkd/fs": "^7.3.1",
-    "@cogeotiff/core": "^6.0.2",
-    "@cotar/core": "^5.0.1",
-    "@linzjs/geojson": "^6.10.0",
+    "@basemaps/shared": "^6.22.0",
+    "@basemaps/tiler": "^6.21.1",
+    "@basemaps/tiler-sharp": "^6.21.1",
+    "@chunkd/fs": "^8.1.0",
+    "@cogeotiff/core": "^6.1.1",
+    "@cotar/core": "^5.3.0",
+    "@linzjs/geojson": "^6.21.1",
     "@linzjs/lambda": "^2.0.0",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.1.0",
     "pixelmatch": "^5.1.0",
-    "sharp": "^0.28.3"
+    "sharp": "^0.29.3"
   },
   "bundle": {
     "entry": "src/index.ts",
@@ -52,14 +52,14 @@
     "bundle": "./bundle.sh"
   },
   "devDependencies": {
-    "@basemaps/attribution": "^6.17.0",
+    "@basemaps/attribution": "^6.22.0",
     "@types/aws-lambda": "^8.10.75",
     "@types/express": "^4.17.11",
     "@types/node": "^14.11.2",
     "@types/pixelmatch": "^5.0.0",
-    "@types/sharp": "^0.28.0",
+    "@types/sharp": "^0.29.3",
     "express": "^4.17.1",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "87d778480368585d0f4a5a7546a2858882d8ab39"
+  "gitHead": "b85a4a628bcdfea657a37de97faa23dde5c34798"
 }

package/scripts/create.deployment.package.mjs

@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+/**
+ * Create a pacakge.json for the `dist` bundle based off the parent package.json
+ *
+ * This is needed as libsharp has to be "installed" into the dist node_modules so that lambda has access to sharp
+ */
+import * as fs from 'fs';
+
+const parentPackage = JSON.parse(fs.readFileSync('../package.json').toString());
+
+// Find the exact version of a package in the yarn lock
+function getPackageVersion(packageName) {
+  const parentLock = fs.readFileSync('../../../yarn.lock').toString().split('\n');
+
+  for (let i = 0; i < parentLock.length; i++) {
+    if (parentLock[i].startsWith(packageName + '@')) {
+      const versionList = parentLock[i + 1].trim();
+      if (!versionList.startsWith('version ')) throw new Error('Failed to find sharp version');
+      return JSON.parse(versionList.slice('version '.length));
+    }
+  }
+}
+
+// the bundle is a commonjs module
+parentPackage.type = 'commonjs';
+parentPackage.main = 'index.js';
+parentPackage.dependencies = { sharp: getPackageVersion('sharp') };
+
+// Clean up
+delete parentPackage.types;
+delete parentPackage.devDependencies;
+
+console.log('Installing dependencies', parentPackage.dependencies);
+fs.writeFileSync('./package.json', JSON.stringify(parentPackage, null, 2));

package/src/__test__/tile.set.cache.test.ts

@@ -1,4 +1,4 @@
-import { ConfigImagery, ConfigTileSetRaster } from '@basemaps/config';
+import { ConfigImagery, ConfigTileSetRaster, TileSetType } from '@basemaps/config';
 import { Epsg, GoogleTms, Nztm2000Tms } from '@basemaps/geo';
 import { Config, TileSetName } from '@basemaps/shared';
 import o from 'ospec';
@@ -26,14 +26,6 @@ o.spec('TileSetCache', () => {
   const imgMap = new Map<string, ConfigImagery>();
   imgMap.set(imageOne.id, imageOne);
 
-  o.beforeEach(() => {
-    sandbox.stub(Config, 'getTileSetImagery').callsFake(async () => {
-      const imgMap = new Map<string, ConfigImagery>();
-      imgMap.set(imageOne.id, imageOne);
-      return imgMap;
-    });
-  });
-
   o.afterEach(() => {
     TileSets.cache.clear();
     sandbox.restore();
@@ -44,7 +36,7 @@ o.spec('TileSetCache', () => {
       TileSets.add(new TileSetRaster('aerial@head', GoogleTms));
 
       const parentTileSet = await TileSets.get('aerial@head', GoogleTms);
-      if (parentTileSet == null || parentTileSet.isVector()) throw new Error('null parentTileSet');
+      if (parentTileSet == null || parentTileSet.type === TileSetType.Vector) throw new Error('null parentTileSet');
       parentTileSet.imagery = imgMap;
       parentTileSet.tileSet = {
         name: 'parent',
@@ -53,7 +45,7 @@ o.spec('TileSetCache', () => {
       } as ConfigTileSetRaster;
 
       const subTileSet = await TileSets.get('aerial@head:tasman_rural_2018-19_0-3m', GoogleTms);
-      if (subTileSet == null || subTileSet.isVector()) throw new Error('null subTileSet');
+      if (subTileSet == null || subTileSet.type === TileSetType.Vector) throw new Error('null subTileSet');
 
       o(subTileSet.title).equals('parent aerial title Tasman rural 2018-19 0.3m');
       o(subTileSet.fullName).equals('aerial@head:tasman_rural_2018-19_0-3m');
@@ -79,7 +71,7 @@ o.spec('TileSetCache', () => {
       TileSets.cache.delete(subTileSet.id);
       delete parentTileSet.tileSet.title;
       const subTileSetB = await TileSets.get('aerial@head:tasman_rural_2018-19_0-3m', GoogleTms);
-      if (subTileSetB == null || subTileSetB.isVector()) throw new Error('null subTileSetB');
+      if (subTileSetB == null || subTileSetB.type === TileSetType.Vector) throw new Error('null subTileSetB');
       o(subTileSetB.title).equals('parent Tasman rural 2018-19 0.3m');
     });
   });

package/src/__test__/tile.style.json.test.ts

@@ -0,0 +1,40 @@
+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: string | undefined;
+  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/src/__test__/xyz.test.ts

@@ -3,17 +3,21 @@ 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();
@@ -26,6 +30,8 @@ o.spec('LambdaXyz', () => {
   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(() => {
@@ -54,6 +60,7 @@ o.spec('LambdaXyz', () => {
     TileSets.cache.clear();
     TileComposer.compose = origCompose;
     TileEtag.generate = origTileEtag;
+    process.env[Env.PublicUrlBase] = origPublicUrlBase;
     sandbox.restore();
   });
 
@@ -134,12 +141,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', {
@@ -148,6 +151,7 @@ o.spec('LambdaXyz', () => {
       });
 
       const res = await handleRequest(request);
+
       if (res.status === 200) {
         o(res.header('eTaG')).equals(key); // this line is useful for discovering the new etag
         return;
@@ -160,9 +164,6 @@ o.spec('LambdaXyz', () => {
     });
 
     o('should serve WMTSCapabilities for tile_set', async () => {
-      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);
@@ -185,13 +186,10 @@ 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);
@@ -206,9 +204,19 @@ o.spec('LambdaXyz', () => {
       o(request.logContext['cache']).deepEquals({ key, match: key, hit: true });
     });
 
-    o('should serve tile json for tile_set', async () => {
-      process.env[Env.PublicUrlBase] = 'https://tiles.test';
+    o('should 200 if a invalid etag is given', async () => {
+      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(res.body ?? '', '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 () => {
       const request = mockRequest('/v1/tiles/topographic/Google/tile.json', 'get', apiKeyHeader);
 
       const res = await handleRequest(request);
@@ -228,14 +236,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);
@@ -245,9 +246,6 @@ o.spec('LambdaXyz', () => {
     });
 
     o('should serve style json', async () => {
-      const host = 'https://tiles.test';
-      process.env[Env.PublicUrlBase] = host;
-
       const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', apiKeyHeader);
 
       const fakeStyle: StyleJson = {
@@ -289,8 +287,8 @@ o.spec('LambdaXyz', () => {
             minzoom: 0,
           },
         ],
-        glyphs: 'glyphs',
-        sprite: 'sprite',
+        glyphs: '/glyphs',
+        sprite: '/sprite',
         metadata: { id: 'test' },
       };
 
@@ -320,6 +318,10 @@ 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/src/cli/dump.ts

@@ -4,7 +4,7 @@ import { ImageFormat } from '@basemaps/tiler';
 import { LambdaAlbRequest } from '@linzjs/lambda';
 import { Context } from 'aws-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 { TileSet } from '../tile.set.js';
 import { TileSetLocal } from './tile.set.local.js';
@@ -48,7 +48,7 @@ async function main(): Promise<void> {
     logger,
   );
 
-  const tileData = await TileRoute.tile(ctx);
+  const tileData = await tileXyz(ctx);
 
   const headers: Record<string, any> = {};
   for (const [key, value] of tileData.headers) headers[key] = value;

package/src/cli/validate.ts

@@ -1,3 +1,4 @@
+import { TileSetType } from '@basemaps/config';
 import { GoogleTms } from '@basemaps/geo';
 import { Env, fsa, LogConfig, TileSetName } from '@basemaps/shared';
 import { CogTiff } from '@cogeotiff/core';
@@ -13,7 +14,7 @@ const Q = pLimit(Env.getNumber(Env.TiffConcurrency, 25));
 async function main(): Promise<void> {
   const tileSet = await TileSets.get(TileSetName.aerial, GoogleTms);
   if (tileSet == null) throw new Error('No tile set found');
-  if (tileSet.isVector()) throw new Error('Invalid tile set type');
+  if (tileSet.type === TileSetType.Vector) throw new Error('Invalid tile set type');
 
   let errorCount = 0;
   const logger = LogConfig.get();

package/src/index.ts

@@ -6,6 +6,8 @@ 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';
+import { St } from './source.tracer.js';
 
 const app = new Router();
 
@@ -14,9 +16,13 @@ app.get('health', Health);
 app.get('version', Version);
 app.get('tiles', Tiles);
 app.get('imagery', Imagery);
+app.get('esri', Esri);
 
 let slowTimer: NodeJS.Timer | null = null;
 export async function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpResponse> {
+  // Reset the request tracing
+  St.reset();
+
   // Warn if a request takes more than 10 seconds to process
   if (slowTimer) clearTimeout(slowTimer);
   slowTimer = setTimeout(() => req.log.warn(req.logContext, 'Lambda:Slow'), 10_000);
@@ -29,7 +35,13 @@ export async function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpR
       const apiKeyHash = createHash('sha256').update(apiKey).digest('base64');
       req.set('api', apiKeyHash);
     }
-    return await app.handle(req);
+    const ret = await app.handle(req);
+
+    // 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);
+
+    return ret;
   } finally {
     if (slowTimer) clearTimeout(slowTimer);
     slowTimer = null;

package/src/routes/__test__/attribution.test.ts

@@ -159,7 +159,6 @@ const ExpectedJson = {
       },
       links: [],
       summaries: {
-        gsd: [0.75],
         'linz:zoom': {
           min: 14,
           max: 16,
@@ -190,7 +189,6 @@ const ExpectedJson = {
       },
       links: [],
       summaries: {
-        gsd: [0.75],
         'linz:zoom': {
           min: 15,
           max: 17,
@@ -221,7 +219,6 @@ const ExpectedJson = {
       },
       links: [],
       summaries: {
-        gsd: [0.75],
         'linz:zoom': {
           min: 16,
           max: 18,
@@ -252,7 +249,6 @@ const ExpectedJson = {
       },
       links: [],
       summaries: {
-        gsd: [0.75],
         'linz:zoom': {
           min: 14,
           max: 16,
@@ -263,15 +259,13 @@ const ExpectedJson = {
   ],
   links: [],
 };
-function makeImageRecord(id: string, name: string, x = 10, year = 2019): ConfigImagery {
+function makeImageRecord(id: string, name: string, x = 10): ConfigImagery {
   return {
     id,
     name,
     projection: EpsgCode.Google,
-    year,
     uri: 's3://bucket/path/' + name,
     bounds: GoogleTms.tileToSourceBounds({ x, y: 10, z: 5 }),
-    resolution: 750,
     files: [0, 1].map((i) => {
       const b = GoogleTms.tileToSourceBounds({ x, y: 10, z: 5 }).toJson() as NamedBounds;
       b.name = name + i;
@@ -351,18 +345,14 @@ o.spec('attribution', () => {
             name: 'p1',
           },
         ],
-        summaries: {
-          gsd: [0.75],
-        },
+        summaries: {},
       };
       mockFs.jsStore['s3://bucket/path/image2/collection.json'] = {
         extent: {
           spatial: { bbox: [5, 6, 7, 8] },
           temporal: { interval: [['2016-02-03T01:02:03Z', '2018-09-13T11:32:43Z']] },
         },
-        summaries: {
-          gsd: [0.5],
-        },
+        summaries: {},
       };
 
       const request = mockRequest(`/v1/attribution/aerial/EPSG:3857/summary.json`);