@basemaps/lambda-tiler 6.24.2 → 6.27.0

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { ConfigImagery, ConfigTileSetRaster, TileSetNameComponents, TileSetType } from '@basemaps/config';
-import { Bounds, Tile, TileMatrixSet } from '@basemaps/geo';
+import { Bounds, ImageFormat, Tile, TileMatrixSet } from '@basemaps/geo';
 import { LogType, TileDataXyz } from '@basemaps/shared';
 import { Tiler } from '@basemaps/tiler';
 import { TileMakerSharp } from '@basemaps/tiler-sharp';
@@ -35,6 +35,8 @@ export declare class TileSetRaster {
     get title(): string;
     get description(): string;
     get extent(): Bounds;
+    /** Preferred default imagery format */
+    get format(): ImageFormat;
     init(record: ConfigTileSetRaster): Promise<void>;
     initTiffs(tile: Tile, log: LogType): Promise<CogTiff[]>;
     tile(req: LambdaHttpRequest, xyz: TileDataXyz): Promise<LambdaHttpResponse>;

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,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,GAAG,IAAI;CAqB3C"}
+{"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,WAAW,EAAE,IAAI,EAAE,aAAa,EAAgC,MAAM,eAAe,CAAC;AAC7G,OAAO,EAAoB,OAAO,EAAE,WAAW,EAAuB,MAAM,kBAAkB,CAAC;AAC/F,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;IAED,uCAAuC;IACvC,IAAI,MAAM,IAAI,WAAW,CAExB;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;IA+B5D,OAAO,CAAC,cAAc;IAwBtB,oDAAoD;IACpD,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAShD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;CAqB3C"}

package/build/tile.set.raster.js

@@ -1,6 +1,6 @@
 import { TileSetNameParser, TileSetType, } from '@basemaps/config';
-import { Bounds, Epsg, TileMatrixSet, TileMatrixSets } from '@basemaps/geo';
-import { Config, Env, fsa, titleizeImageryName, VectorFormat } from '@basemaps/shared';
+import { Bounds, Epsg, ImageFormat, TileMatrixSet, TileMatrixSets, VectorFormat } from '@basemaps/geo';
+import { Config, Env, fsa, titleizeImageryName } from '@basemaps/shared';
 import { Tiler } from '@basemaps/tiler';
 import { TileMakerSharp } from '@basemaps/tiler-sharp';
 import { CogTiff } from '@cogeotiff/core';
@@ -11,7 +11,7 @@ import { TileEtag } from './routes/tile.etag.js';
 import { St } from './source.tracer.js';
 import { TiffCache } from './tiff.cache.js';
 import { TileSets } from './tile.set.cache.js';
-const LoadingQueue = pLimit(Env.getNumber(Env.TiffConcurrency, 5));
+const LoadingQueue = pLimit(Env.getNumber(Env.TiffConcurrency, 25));
 export const TileComposer = new TileMakerSharp(256);
 const DefaultResizeKernel = { in: 'lanczos3', out: 'lanczos3' };
 const DefaultBackground = { r: 0, g: 0, b: 0, alpha: 0 };
@@ -52,6 +52,11 @@ export class TileSetRaster {
         var _a;
         return (_a = this.extentOverride) !== null && _a !== void 0 ? _a : this.tileMatrix.extent;
     }
+    /** Preferred default imagery format */
+    get format() {
+        var _a;
+        return (_a = this.tileSet.format) !== null && _a !== void 0 ? _a : ImageFormat.Webp;
+    }
     async init(record) {
         this.tileSet = record;
         this.imagery = await Config.getAllImagery(this.tileSet.layers, this.tileMatrix.projection);
@@ -126,7 +131,6 @@ export class TileSetRaster {
             }
             const imagery = this.imagery.get(imgId);
             if (imagery == null) {
-                console.log('Failed', { imagery, i: this.imagery, ts: this.tileSet.layers });
                 log === null || log === void 0 ? void 0 : log.warn({ layer: layer.name, projection: this.tileMatrix.projection.code, imgId }, 'Failed to lookup imagery');
                 continue;
             }

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

@@ -1,5 +1,5 @@
 import { ConfigTileSetVector, TileSetNameComponents, TileSetType } from '@basemaps/config';
-import { TileMatrixSet } from '@basemaps/geo';
+import { TileMatrixSet, VectorFormat } from '@basemaps/geo';
 import { TileDataXyz } from '@basemaps/shared';
 import { Cotar } from '@cotar/core';
 import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
@@ -14,6 +14,9 @@ export declare class TileSetVector {
     tileMatrix: TileMatrixSet;
     tileSet: ConfigTileSetVector;
     constructor(name: string, tileMatrix: TileMatrixSet);
+    init(record: ConfigTileSetVector): Promise<void>;
+    /** What format does tile set use */
+    get format(): VectorFormat;
     get id(): string;
     get fullName(): string;
     tile(req: LambdaHttpRequest, xyz: TileDataXyz): Promise<LambdaHttpResponse>;

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,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"}
+{"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,EAAa,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAO,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,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;IAK7C,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,oCAAoC;IACpC,IAAI,MAAM,IAAI,YAAY,CAEzB;IAED,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;CAyBlF"}

package/build/tile.set.vector.js

@@ -1,5 +1,6 @@
 import { TileSetNameParser, TileSetType } from '@basemaps/config';
-import { fsa, VectorFormat } from '@basemaps/shared';
+import { GoogleTms, VectorFormat } from '@basemaps/geo';
+import { fsa } from '@basemaps/shared';
 import { Cotar } from '@cotar/core';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import { NotFound } from './routes/response.js';
@@ -27,6 +28,13 @@ export class TileSetVector {
         this.components = TileSetNameParser.parse(name);
         this.tileMatrix = tileMatrix;
     }
+    async init(record) {
+        this.tileSet = record;
+    }
+    /** What format does tile set use */
+    get format() {
+        return VectorFormat.MapboxVectorTiles;
+    }
     get id() {
         return TileSets.id(this.fullName, this.tileMatrix);
     }
@@ -36,6 +44,8 @@ export class TileSetVector {
     async tile(req, xyz) {
         if (xyz.ext !== VectorFormat.MapboxVectorTiles)
             return NotFound;
+        if (xyz.tileMatrix.identifier !== GoogleTms.identifier)
+            return NotFound;
         if (this.tileSet.layers.length > 1)
             return new LambdaHttpResponse(500, 'Too many layers in tileset');
         const [layer] = this.tileSet.layers;

package/build/wmts.capability.d.ts

@@ -1,14 +1,25 @@
-import { ConfigProvider } from '@basemaps/config';
-import { Bounds, TileMatrixSet, WmtsProvider } from '@basemaps/geo';
+import { Bounds, ImageFormat, TileMatrixSet, WmtsProvider } from '@basemaps/geo';
 import { VNodeElement } from '@basemaps/shared';
 import { TileSetRaster } from './tile.set.raster.js';
+/**
+ * Default the tile matrix id to the projection of the TileMatrixSet
+ */
+export declare function getTileMatrixId(tileMatrix: TileMatrixSet): string;
+export interface WmtsCapabilitiesParams {
+    httpBase: string;
+    provider: WmtsProvider;
+    layers: TileSetRaster[];
+    apiKey?: string;
+    formats?: ImageFormat[];
+}
 export declare class WmtsCapabilities {
     httpBase: string;
     provider: WmtsProvider;
     layers: Map<string, TileSetRaster[]>;
     apiKey?: string;
     tileMatrixSets: Map<string, TileMatrixSet>;
-    constructor(httpBase: string, provider: WmtsProvider, layers: TileSetRaster[], apiKey?: string);
+    formats: ImageFormat[];
+    constructor(params: WmtsCapabilitiesParams);
     buildWgs84BoundingBox(layers: TileSetRaster[], tagName?: string): VNodeElement;
     buildBoundingBox(tms: TileMatrixSet, extent: Bounds): VNodeElement;
     buildProvider(): VNodeElement[];
@@ -18,7 +29,6 @@ export declare class WmtsCapabilities {
     buildStyle(): VNodeElement;
     buildTileMatrixSet(tms: TileMatrixSet): VNodeElement;
     toVNode(): VNodeElement;
-    toString(): string;
-    static toXml(httpBase: string, provider: ConfigProvider, tileSet: TileSetRaster[], apiKey?: string): string;
+    toXml(): string;
 }
 //# sourceMappingURL=wmts.capability.d.ts.map

package/build/wmts.capability.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wmts.capability.d.ts","sourceRoot":"","sources":["../src/wmts.capability.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAmB,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAiB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAG/D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA0BrD,qBAAa,gBAAgB;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAa;IAEjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,6BAAoC;gBAEtC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM;IAmB9F,qBAAqB,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE,OAAO,SAAyB,GAAG,YAAY;IAe9F,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAQlE,aAAa,IAAI,YAAY,EAAE;IAkC/B,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAc5D,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAQtE,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,YAAY;IAuBjD,UAAU,IAAI,YAAY;IAI1B,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,YAAY;IAoBpD,OAAO,IAAI,YAAY;IAUvB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;CAG5G"}
+{"version":3,"file":"wmts.capability.d.ts","sourceRoot":"","sources":["../src/wmts.capability.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAmB,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClG,OAAO,EAAiB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAG/D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAiBrD;;GAEG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,MAAM,CAIjE;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IACvB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,qBAAa,gBAAgB;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IAEvB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAa;IAEjD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,6BAAoC;IAClD,OAAO,EAAE,WAAW,EAAE,CAAC;gBAEX,MAAM,EAAE,sBAAsB;IAoB1C,qBAAqB,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE,OAAO,SAAyB,GAAG,YAAY;IAe9F,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAQlE,aAAa,IAAI,YAAY,EAAE;IAkC/B,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAc5D,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAQtE,UAAU,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,YAAY;IAuBjD,UAAU,IAAI,YAAY;IAI1B,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,YAAY;IAoBpD,OAAO,IAAI,YAAY;IAUvB,KAAK,IAAI,MAAM;CAGhB"}

package/build/wmts.capability.js

@@ -17,19 +17,20 @@ function wgs84Extent(layer) {
 /**
  * Default the tile matrix id to the projection of the TileMatrixSet
  */
-function getTileMatrixId(tileMatrix) {
+export function getTileMatrixId(tileMatrix) {
     // TODO this should really change everything to identifier
     if (tileMatrix.identifier === Nztm2000QuadTms.identifier)
         return Nztm2000QuadTms.identifier;
     return tileMatrix.projection.toEpsgString();
 }
 export class WmtsCapabilities {
-    constructor(httpBase, provider, layers, apiKey) {
+    constructor(params) {
+        var _a;
         this.layers = new Map();
         this.tileMatrixSets = new Map();
-        this.httpBase = httpBase;
-        this.provider = provider;
-        for (const layer of layers) {
+        this.httpBase = params.httpBase;
+        this.provider = params.provider;
+        for (const layer of params.layers) {
             // TODO is grouping by name the best option
             let existing = this.layers.get(layer.fullName);
             if (existing == null) {
@@ -40,7 +41,8 @@ export class WmtsCapabilities {
             existing.push(layer);
             this.tileMatrixSets.set(layer.tileMatrix.identifier, layer.tileMatrix);
         }
-        this.apiKey = apiKey;
+        this.apiKey = params.apiKey;
+        this.formats = (_a = params.formats) !== null && _a !== void 0 ? _a : ImageFormatOrder;
     }
     buildWgs84BoundingBox(layers, tagName = 'ows:WGS84BoundingBox') {
         let bbox = wgs84Extent(layers[0]);
@@ -127,9 +129,9 @@ export class WmtsCapabilities {
             ...layers.map((layer) => this.buildBoundingBox(layer.tileMatrix, layer.extent)),
             this.buildWgs84BoundingBox(layers),
             this.buildStyle(),
-            ...ImageFormatOrder.map((fmt) => V('Format', 'image/' + fmt)),
+            ...this.formats.map((fmt) => V('Format', 'image/' + fmt)),
             ...matrixSetNodes,
-            ...ImageFormatOrder.map((fmt) => this.buildResourceUrl(firstLayer, fmt)),
+            ...this.formats.map((fmt) => this.buildResourceUrl(firstLayer, fmt)),
         ]);
     }
     buildStyle() {
@@ -164,10 +166,7 @@ export class WmtsCapabilities {
             layers.push(this.buildTileMatrixSet(tms));
         return V('Capabilities', CapabilitiesAttrs, [...this.buildProvider(), V('Contents', layers)]);
     }
-    toString() {
+    toXml() {
         return '<?xml version="1.0"?>\n' + this.toVNode().toString();
     }
-    static toXml(httpBase, provider, tileSet, apiKey) {
-        return new WmtsCapabilities(httpBase, provider, tileSet, apiKey).toString();
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.24.2",
+  "version": "6.27.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,17 +22,17 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^6.24.2",
-    "@basemaps/geo": "^6.24.2",
+    "@basemaps/config": "^6.27.0",
+    "@basemaps/geo": "^6.26.0",
     "@basemaps/lambda": "^6.7.0",
-    "@basemaps/shared": "^6.24.2",
-    "@basemaps/tiler": "^6.24.2",
-    "@basemaps/tiler-sharp": "^6.24.2",
+    "@basemaps/shared": "^6.27.0",
+    "@basemaps/tiler": "^6.26.0",
+    "@basemaps/tiler-sharp": "^6.26.0",
     "@chunkd/fs": "^8.1.0",
     "@cogeotiff/core": "^7.0.0",
     "@cotar/core": "^5.3.0",
     "@linzjs/geojson": "^6.21.1",
-    "@linzjs/lambda": "^2.0.0",
+    "@linzjs/lambda": "^3.0.1",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.1.0",
     "pixelmatch": "^5.1.0",
@@ -52,12 +52,12 @@
     "bundle": "./bundle.sh"
   },
   "devDependencies": {
-    "@basemaps/attribution": "^6.24.2",
+    "@basemaps/attribution": "^6.26.0",
     "@types/aws-lambda": "^8.10.75",
-    "@types/node": "^14.11.2",
+    "@types/node": "^17.0.34",
     "@types/pixelmatch": "^5.0.0",
     "@types/sharp": "^0.29.3",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "12826558ede6a4e6ecdc0c250afc9a784b9cb40e"
+  "gitHead": "c6aa61c20503cbc7f04cf31927f4e2b95aed34cb"
 }

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

@@ -1,7 +1,7 @@
-import { GoogleTms, Nztm2000Tms } from '@basemaps/geo';
+import { GoogleTms, Nztm2000Tms, ImageFormat } from '@basemaps/geo';
 import { TileDataXyz, TileType } from '@basemaps/shared';
 import { TestTiff } from '@basemaps/test';
-import { Composition, ImageFormat } from '@basemaps/tiler';
+import { Composition } from '@basemaps/tiler';
 import o from 'ospec';
 import { TileEtag } from '../routes/tile.etag.js';
 
@@ -14,7 +14,7 @@ o.spec('TileCacheKey', () => {
     z: 0,
     tileMatrix: GoogleTms,
     name: 'foo',
-    ext: ImageFormat.PNG,
+    ext: ImageFormat.Png,
     type: TileType.Tile,
   };
 

package/src/__test__/wmts.capability.test.ts

@@ -1,4 +1,4 @@
-import { Bounds, Epsg, GoogleTms, Nztm2000QuadTms, Nztm2000Tms } from '@basemaps/geo';
+import { Bounds, Epsg, GoogleTms, ImageFormat, Nztm2000QuadTms, Nztm2000Tms } from '@basemaps/geo';
 import { TileSetName, V, VNodeElement } from '@basemaps/shared';
 import { roundNumbersInString } from '@basemaps/test/build/rounding.js';
 import { createHash } from 'crypto';
@@ -21,8 +21,30 @@ o.spec('WmtsCapabilities', () => {
   const tileSet = new FakeTileSet(TileSetName.aerial, GoogleTms);
   const tileSetImagery = new FakeTileSet('01E7PJFR9AMQFJ05X9G7FQ3XMW', GoogleTms);
 
+  o('should output the requested formats', () => {
+    const wmts = new WmtsCapabilities({
+      httpBase: 'https://basemaps.test',
+      provider: Provider,
+      layers: [tileSet],
+      apiKey,
+      formats: [ImageFormat.Avif],
+    }).toVNode();
+
+    const urls = tags(wmts, 'ResourceURL');
+    o(urls.length).equals(1);
+    o(urls[0].attrs.format).equals('image/avif');
+    o(urls[0].attrs.template).equals(
+      'https://basemaps.test/v1/tiles/aerial/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.avif?api=secret1234',
+    );
+  });
+
   o('should build capability xml for tileset and projection', () => {
-    const wmts = new WmtsCapabilities('https://basemaps.test', Provider, [tileSet], apiKey);
+    const wmts = new WmtsCapabilities({
+      httpBase: 'https://basemaps.test',
+      provider: Provider,
+      layers: [tileSet],
+      apiKey,
+    });
 
     const raw = wmts.toVNode();
     const serviceId = raw.find('ows:ServiceIdentification');
@@ -102,7 +124,12 @@ o.spec('WmtsCapabilities', () => {
     compareMatrix(tileMatrices[0], '0', 1, 559082264.028717);
     compareMatrix(tileMatrices[10], '10', 1024, 545978.773465544);
 
-    const xml = WmtsCapabilities.toXml('https://basemaps.test', Provider, [tileSet], apiKey) ?? '';
+    const xml = new WmtsCapabilities({
+      httpBase: 'https://basemaps.test',
+      provider: Provider,
+      layers: [tileSet],
+      apiKey,
+    }).toXml();
 
     o(xml).deepEquals('<?xml version="1.0"?>\n' + raw?.toString());
 
@@ -112,7 +139,11 @@ o.spec('WmtsCapabilities', () => {
   });
 
   o('should allow individual imagery sets', () => {
-    const raw = new WmtsCapabilities('https://basemaps.test', Provider, [tileSetImagery]).toVNode();
+    const raw = new WmtsCapabilities({
+      httpBase: 'https://basemaps.test',
+      provider: Provider,
+      layers: [tileSetImagery],
+    }).toVNode();
 
     const tms = raw?.find('TileMatrixSet', 'ows:Identifier');
 
@@ -128,7 +159,7 @@ o.spec('WmtsCapabilities', () => {
 
   o('should support multiple projections', () => {
     const ts = [new FakeTileSet(TileSetName.aerial, Nztm2000Tms), new FakeTileSet(TileSetName.aerial, GoogleTms)];
-    const xml = new WmtsCapabilities('basemaps.test', Provider, ts);
+    const xml = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts });
     const nodes = xml.toVNode();
 
     const layers = tags(nodes, 'Layer');
@@ -175,7 +206,7 @@ o.spec('WmtsCapabilities', () => {
       new FakeTileSet(TileSetName.aerial, Nztm2000Tms, 'aerial-title'),
       new FakeTileSet('01E7PJFR9AMQFJ05X9G7FQ3XMW', Nztm2000Tms, 'imagery-title'),
     ];
-    const nodes = new WmtsCapabilities('basemaps.test', Provider, ts).toVNode();
+    const nodes = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts }).toVNode();
     const layers = tags(nodes, 'Layer');
     o(layers.length).equals(2);
 
@@ -199,7 +230,7 @@ o.spec('WmtsCapabilities', () => {
         'west-coast_rural_2016-17_0-3m',
       ),
     ];
-    const nodes = new WmtsCapabilities('basemaps.test', Provider, ts).toVNode();
+    const nodes = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts }).toVNode();
     const layers = tags(nodes, 'Layer');
 
     o(layers.length).equals(2);
@@ -223,7 +254,7 @@ o.spec('WmtsCapabilities', () => {
     ts[1].extentOverride = new Bounds(1, 2, 2, 2);
 
     ts[2].tileSet.title = 'aerial_dunedin_urban';
-    const nodes = new WmtsCapabilities('basemaps.test', Provider, ts).toVNode();
+    const nodes = new WmtsCapabilities({ httpBase: 'basemaps.test', provider: Provider, layers: ts }).toVNode();
 
     const allMatrixes = tags(nodes, 'TileMatrixSet');
 

package/src/__test__/xyz.test.ts

@@ -1,5 +1,5 @@
 import { ConfigProvider, StyleJson } from '@basemaps/config';
-import { TileMatrixSets } from '@basemaps/geo';
+import { GoogleTms, Nztm2000QuadTms, TileMatrixSets } from '@basemaps/geo';
 import { Config, Env, LogConfig, VNodeParser } from '@basemaps/shared';
 import { round } from '@basemaps/test/build/rounding.js';
 import o from 'ospec';
@@ -8,7 +8,7 @@ import { handleRequest } from '../index.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 { FakeTileSet, FakeTileSetVector, mockRequest, Provider } from './xyz.util.js';
 
 const sandbox = sinon.createSandbox();
 
@@ -53,6 +53,8 @@ o.spec('LambdaXyz', () => {
       }
     }
 
+    TileSets.add(new FakeTileSetVector('topographic', GoogleTms));
+
     (Config.Provider as any).get = async (): Promise<ConfigProvider> => Provider;
   });
 
@@ -186,51 +188,76 @@ o.spec('LambdaXyz', () => {
   });
 
   o.spec('tileJson', () => {
-    o('should 304 if a json is not modified', async () => {
-      // delete process.env[Env.PublicUrlBase];
+    o('should 404 if invalid url is given', async () => {
+      const request = mockRequest('/v1/tiles/tile.json', 'get', apiKeyHeader);
 
-      const key = 'BBfQpNXA3Q90jlFrLSOZhxbvfOh7OpN1OEE+BylpbHw=';
-      const request = mockRequest('/v1/tiles/tile.json', 'get', { 'if-none-match': key, ...apiKeyHeader });
+      const res = await handleRequest(request);
+      o(res.status).equals(404);
+    });
+
+    o('should serve tile json for tile_set', async () => {
+      const request = mockRequest('/v1/tiles/aerial/NZTM2000Quad/tile.json', 'get', apiKeyHeader);
 
       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;
-      }
+      o(res.status).equals(200);
+      o(res.header('cache-control')).equals('no-store');
 
-      o(res.status).equals(304);
-      o(rasterMock.calls.length).equals(0);
+      const body = Buffer.from(res.body ?? '', 'base64').toString();
+      o(JSON.parse(body)).deepEquals({
+        tiles: [`https://tiles.test/v1/tiles/aerial/NZTM2000Quad/{z}/{x}/{y}.webp?api=${apiKey}`],
+        tilejson: '3.0.0',
+      });
+    });
 
-      o(request.logContext['cache']).deepEquals({ key, match: key, hit: true });
+    o('should serve vector tiles', async () => {
+      const request = mockRequest('/v1/tiles/topographic/WebMercatorQuad/tile.json', 'get', apiKeyHeader);
+
+      const res = await handleRequest(request);
+      o(res.status).equals(200);
+
+      const body = Buffer.from(res.body ?? '', 'base64').toString();
+      o(JSON.parse(body)).deepEquals({
+        tiles: [`https://tiles.test/v1/tiles/topographic/EPSG:3857/{z}/{x}/{y}.pbf?api=${apiKey}`],
+        tilejson: '3.0.0',
+      });
     });
 
-    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 });
+    o('should serve vector tiles with min/max zoom', async () => {
+      const fakeTileSet = new FakeTileSetVector('fake-vector', GoogleTms);
+      fakeTileSet.tileSet.maxZoom = 15;
+      fakeTileSet.tileSet.minZoom = 3;
+      TileSets.add(fakeTileSet);
+      const request = mockRequest('/v1/tiles/fake-vector/WebMercatorQuad/tile.json', 'get', 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);
+
+      const body = Buffer.from(res.body ?? '', 'base64').toString();
+      o(JSON.parse(body)).deepEquals({
+        tiles: [`https://tiles.test/v1/tiles/fake-vector/EPSG:3857/{z}/{x}/{y}.pbf?api=${apiKey}`],
+        maxzoom: 15,
+        minzoom: 3,
+        tilejson: '3.0.0',
+      });
     });
 
-    o('should serve tile json for tile_set', async () => {
-      const request = mockRequest('/v1/tiles/topographic/Google/tile.json', 'get', apiKeyHeader);
+    o('should serve convert zoom to tile matrix', async () => {
+      const fakeTileSet = new FakeTileSetVector('fake-vector', Nztm2000QuadTms);
+      fakeTileSet.tileSet.maxZoom = 15;
+      fakeTileSet.tileSet.minZoom = 1;
+      TileSets.add(fakeTileSet);
+
+      const request = mockRequest('/v1/tiles/fake-vector/NZTM2000Quad/tile.json', 'get', apiKeyHeader);
 
       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');
 
       const body = Buffer.from(res.body ?? '', 'base64').toString();
       o(JSON.parse(body)).deepEquals({
-        tiles: [`https://tiles.test/v1/tiles/topographic/Google/{z}/{x}/{y}.pbf?api=${apiKey}`],
+        tiles: [`https://tiles.test/v1/tiles/fake-vector/NZTM2000Quad/{z}/{x}/{y}.pbf?api=${apiKey}`],
+        maxzoom: 13,
         minzoom: 0,
-        maxzoom: 15,
-        format: 'pbf',
-        tilejson: '2.0.0',
+        tilejson: '3.0.0',
       });
     });
   });

package/src/__test__/xyz.util.ts

@@ -1,9 +1,10 @@
 import { ConfigProvider } from '@basemaps/config';
 import { TileMatrixSet } from '@basemaps/geo';
-import { LambdaHttpRequest, LambdaAlbRequest } from '@linzjs/lambda';
 import { LogConfig } from '@basemaps/shared';
-import { TileSetRaster } from '../tile.set.raster.js';
+import { LambdaAlbRequest, LambdaHttpRequest } from '@linzjs/lambda';
 import { Context } from 'aws-lambda';
+import { TileSetRaster } from '../tile.set.raster.js';
+import { TileSetVector } from '../tile.set.vector.js';
 
 export function mockRequest(path: string, method = 'get', headers: Record<string, string> = {}): LambdaHttpRequest {
   return new LambdaAlbRequest(
@@ -27,6 +28,13 @@ export class FakeTileSet extends TileSetRaster {
   }
 }
 
+export class FakeTileSetVector extends TileSetVector {
+  constructor(name: string, tileMatrix: TileMatrixSet) {
+    super(name, tileMatrix);
+    this.tileSet = {} as any;
+  }
+}
+
 export const Provider: ConfigProvider = {
   createdAt: Date.now(),
   name: 'main',

package/src/cli/dump.ts

@@ -1,6 +1,5 @@
-import { Nztm2000Tms } from '@basemaps/geo';
+import { Nztm2000Tms, ImageFormat } from '@basemaps/geo';
 import { LogConfig } from '@basemaps/shared';
-import { ImageFormat } from '@basemaps/tiler';
 import { LambdaAlbRequest } from '@linzjs/lambda';
 import { Context } from 'aws-lambda';
 import { promises as fs } from 'fs';
@@ -12,7 +11,7 @@ import { TileSetLocal } from './tile.set.local.js';
 const xyz = { x: 0, y: 0, z: 0 };
 const tileMatrix = Nztm2000Tms;
 const tileSetName = 'aerial';
-const ext = ImageFormat.PNG;
+const ext = ImageFormat.Png;
 
 /** Load a tileset form a file path otherwise default to the hard coded one from AWS */
 async function getTileSet(filePath?: string): Promise<TileSet> {

package/src/index.ts

@@ -48,4 +48,5 @@ export async function handleRequest(req: LambdaHttpRequest): Promise<LambdaHttpR
   }
 }
 
-export const handler = lf.http(handleRequest, LogConfig.get());
+export const handler = lf.http(LogConfig.get());
+handler.router.get('*', handleRequest);

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

@@ -268,6 +268,7 @@ function makeImageRecord(id: string, name: string, x = 10): ConfigImagery {
     id,
     name,
     projection: EpsgCode.Google,
+    tileMatrix: 'WebMercatorQuad',
     uri: 's3://bucket/path/' + name,
     bounds: GoogleTms.tileToSourceBounds({ x, y: 10, z: 5 }),
     files: [0, 1].map((i) => {

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

@@ -21,6 +21,7 @@ const ctx: LambdaHttpRequest = new LambdaAlbRequest(
 );
 
 o.spec('health', async () => {
+  o.specTimeout(1000);
   const sandbox = sinon.createSandbox();
 
   const tileSet = new TileSetRaster('health', GoogleTms);
@@ -57,8 +58,6 @@ o.spec('health', async () => {
   // Prepare mock test tile response based on the static test tiles
 
   o('Should give a 200 response', async () => {
-    o.timeout(500);
-
     // Given ... a series good get tile response
     const callback = sandbox.stub(tileSet, 'tile');
     callback.onCall(0).resolves(Response1);
@@ -73,7 +72,6 @@ o.spec('health', async () => {
   });
 
   o('Should return mis-match tile response', async () => {
-    o.timeout(500);
     // Given ... a bad get tile response for second get tile
     const callback = sandbox.stub(tileSet, 'tile');
     callback.onCall(0).resolves(Response1);