@basemaps/lambda-tiler 6.24.2 → 6.25.0

package/build/routes/tile.json.js

@@ -1,30 +1,38 @@
-import { Env } from '@basemaps/shared';
+import { GoogleTms, TileMatrixSet } from '@basemaps/geo';
+import { Env, extractTileMatrixSet } from '@basemaps/shared';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
-import { createHash } from 'crypto';
 import { Router } from '../router.js';
-import { NotModified } from './response.js';
-import { TileEtag } from './tile.etag.js';
+import { TileSets } from '../tile.set.cache.js';
+import { getTileMatrixId } from '../wmts.capability.js';
+import { NotFound } from './response.js';
 export async function tileJson(req) {
-    var _a;
+    var _a, _b, _c;
     const { version, rest, name } = Router.action(req);
+    if (rest.length !== 3)
+        return NotFound;
+    const tileMatrix = extractTileMatrixSet(rest[1]);
+    if (tileMatrix == null)
+        return NotFound;
+    req.timer.start('tileset:load');
+    const tileSet = await TileSets.get(rest[0], tileMatrix);
+    req.timer.end('tileset:load');
+    if (tileSet == null)
+        return NotFound;
     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 tileUrl = [host, version, name, tileSet.fullName, getTileMatrixId(tileMatrix), '{z}', '{x}', '{y}'].join('/') +
+        `.${tileSet.format}?api=${apiKey}`;
+    const tileJson = { tiles: [tileUrl], vector_layers: [], tilejson: '3.0.0' };
+    const maxZoom = TileMatrixSet.convertZoomLevel((_b = tileSet.tileSet.maxZoom) !== null && _b !== void 0 ? _b : 30, GoogleTms, tileMatrix, true);
+    const minZoom = TileMatrixSet.convertZoomLevel((_c = tileSet.tileSet.minZoom) !== null && _c !== void 0 ? _c : 0, GoogleTms, tileMatrix, true);
+    if (tileSet.tileSet.maxZoom)
+        tileJson.maxzoom = maxZoom;
+    if (tileSet.tileSet.minZoom)
+        tileJson.minzoom = minZoom;
     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.header(HttpHeader.CacheControl, 'no-store');
     response.buffer(data, 'application/json');
     req.set('bytes', data.byteLength);
     return response;

package/build/tile.set.cache.js

@@ -64,7 +64,7 @@ export class TileSetCache {
             return ts;
         }
         const ts = new TileSetVector(name, tileMatrix);
-        ts.tileSet = tileSet;
+        await ts.init(tileSet);
         this.tileSets.set(tileSetId, ts);
         return ts;
     }

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;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"}

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';
@@ -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);

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,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5D,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;CAwBlF"}

package/build/tile.set.vector.js

@@ -1,5 +1,6 @@
 import { TileSetNameParser, TileSetType } from '@basemaps/config';
-import { fsa, VectorFormat } from '@basemaps/shared';
+import { 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);
     }

package/build/wmts.capability.d.ts

@@ -2,6 +2,10 @@ import { ConfigProvider } from '@basemaps/config';
 import { Bounds, 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 declare class WmtsCapabilities {
     httpBase: string;
     provider: WmtsProvider;

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,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;AAiBrD;;GAEG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,MAAM,CAIjE;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;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"}

package/build/wmts.capability.js

@@ -17,7 +17,7 @@ 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.24.2",
+  "version": "6.25.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,12 +22,13 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^6.24.2",
-    "@basemaps/geo": "^6.24.2",
+    "@basemaps/cli": "^6.25.0",
+    "@basemaps/config": "^6.25.0",
+    "@basemaps/geo": "^6.25.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.25.0",
+    "@basemaps/tiler": "^6.25.0",
+    "@basemaps/tiler-sharp": "^6.25.0",
     "@chunkd/fs": "^8.1.0",
     "@cogeotiff/core": "^7.0.0",
     "@cotar/core": "^5.3.0",
@@ -52,12 +53,12 @@
     "bundle": "./bundle.sh"
   },
   "devDependencies": {
-    "@basemaps/attribution": "^6.24.2",
+    "@basemaps/attribution": "^6.25.0",
     "@types/aws-lambda": "^8.10.75",
     "@types/node": "^14.11.2",
     "@types/pixelmatch": "^5.0.0",
     "@types/sharp": "^0.29.3",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "12826558ede6a4e6ecdc0c250afc9a784b9cb40e"
+  "gitHead": "7ef26df6d42b79298035033fb6434d086fa642f8"
 }

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__/tile.import.test.ts

@@ -0,0 +1,140 @@
+import { JobCreationContext } from '@basemaps/cli/build/cog/cog.stac.job';
+import { Nztm2000Tms } from '@basemaps/geo';
+import { Config, Env, fsa, LogConfig } from '@basemaps/shared';
+import o from 'ospec';
+import { createHash } from 'crypto';
+import sinon from 'sinon';
+import { LambdaAlbRequest, LambdaHttpRequest } from '@linzjs/lambda';
+import { Context } from 'aws-lambda';
+import { Import } from '../routes/import.js';
+import { RoleConfig } from '../import/imagery.find.js';
+import { CogJobFactory } from '@basemaps/cli';
+import { ConfigProcessingJob } from '@basemaps/config';
+
+o.spec('Import', () => {
+  const sandbox = sinon.createSandbox();
+  const outputBucket = 'testOutputBucket';
+  const configBucket = 'testConfigBucket';
+  const origConfigBucket = process.env[Env.AwsRoleConfigBucket];
+  const origOutputBucket = process.env[Env.ImportImageryBucket];
+  o.beforeEach(() => {
+    process.env[Env.AwsRoleConfigBucket] = configBucket;
+    process.env[Env.ImportImageryBucket] = outputBucket;
+  });
+
+  o.afterEach(() => {
+    process.env[Env.AwsRoleConfigBucket] = origConfigBucket;
+    process.env[Env.ImportImageryBucket] = origOutputBucket;
+    sandbox.restore();
+  });
+
+  const tileMatrix = Nztm2000Tms;
+  const bucket = 'testSourceBucket';
+  const path = `s3://${bucket}/imagery/`;
+  const role: RoleConfig = {
+    bucket,
+    accountId: '123456',
+    roleArn: 'arn:aws:iam::123456:role/read-role',
+  };
+
+  const files = [`${path}/1.tiff`, `${path}/2.tiff`];
+  async function* listFiles(): AsyncGenerator<string, any, unknown> {
+    for (const key in files) yield files[key];
+  }
+
+  const ctx: JobCreationContext = {
+    override: {
+      projection: tileMatrix.projection,
+      resampling: {
+        warp: 'bilinear',
+        overview: 'lanczos',
+      },
+    },
+    outputLocation: { type: 's3' as const, path: `s3://${outputBucket}` },
+    sourceLocation: { type: 's3', path: path, ...role, files: files },
+    batch: true,
+    tileMatrix,
+    oneCogCovering: false,
+  };
+
+  const id = createHash('sha256').update(JSON.stringify(ctx)).digest('base64');
+  const jobId = Config.ProcessingJob.id(id);
+
+  function getRequest(path: string, projection: string): LambdaHttpRequest {
+    return new LambdaAlbRequest(
+      {
+        requestContext: null as any,
+        httpMethod: 'get',
+        path: '/v1/tiles/import',
+        body: null,
+        isBase64Encoded: false,
+        queryStringParameters: { path: path, p: projection },
+      },
+      {} as Context,
+      LogConfig.get(),
+    );
+  }
+
+  o('should return projection not found', async () => {
+    // Given ... wrong projection
+    const req = getRequest(path, '0000');
+
+    // When ... Then ...
+    const res = await Import(req);
+    o(res.body).equals('{"status":404,"message":"Target projection Not found"}');
+  });
+
+  o('should return Invalid s3 location', async () => {
+    // Given... wrong s3 path
+    const req = getRequest('s3::testbucket/', '2193');
+
+    // When ...Then ...
+    const res = await Import(req);
+    o(res.body).equals('{"status":500,"message":"Invalid s3 path"}');
+  });
+
+  o('should return Unable to access bucket', async () => {
+    // Given... different bucket have no access role
+    sandbox.stub(fsa, 'readJson').resolves({ buckets: [role] });
+    const req = getRequest(`s3://wrong-bucket/imagery/`, '2193');
+
+    // When ...Then ...
+    const res = await Import(req);
+    o(res.body).equals('{"status":500,"message":"Unable to Access the bucket"}');
+  });
+
+  o('should return Imagery not found', async () => {
+    // Given... none imagery find from bucket
+    sandbox.stub(fsa, 'readJson').resolves({ buckets: [role] });
+    sandbox.stub(fsa, 'list').callsFake(async function* () {
+      yield `${path}1.json`;
+    });
+
+    const req = getRequest(path, '2193');
+
+    // When ...Then ...
+    const res = await Import(req);
+    o(res.body).equals('{"status":404,"message":"Imagery Not Found"}');
+  });
+
+  o('should return 200 with existing import', async () => {
+    // Given... different bucket have no access role
+    sandbox.stub(fsa, 'readJson').resolves({ buckets: [role] });
+    sandbox.stub(fsa, 'list').callsFake(listFiles);
+    sandbox.stub(CogJobFactory, 'create').resolves(undefined);
+
+    const jobConfig = {
+      id: jobId,
+      name: path,
+      status: 'complete',
+    } as ConfigProcessingJob;
+    sandbox.stub(Config.ProcessingJob, 'get').resolves(jobConfig);
+    const req = getRequest(path, '2193');
+
+    // When ...Then ...
+    const res = await Import(req);
+    o(res.status).equals(200);
+    const body = Buffer.from(res.body ?? '', 'base64').toString();
+    o(JSON.parse(body)).deepEquals(jobConfig);
+  });
+});

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,80 @@ 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}`],
+        vector_layers: [],
+        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}`],
+        vector_layers: [],
+        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}`],
+        vector_layers: [],
+        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}`],
+        vector_layers: [],
+        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/import/imagery.find.ts

@@ -0,0 +1,60 @@
+import { AwsCredentials } from '@chunkd/source-aws-v2';
+import { fsa } from '@chunkd/fs';
+import { Env } from '@basemaps/shared';
+
+export interface RoleConfig {
+  bucket: string;
+  accountId: string;
+  roleArn: string;
+  externalId?: string;
+  roleSessionDuration?: number;
+}
+
+interface BucketConfig {
+  v: number;
+  buckets: RoleConfig[];
+  version: string;
+  package: string;
+  hash: string;
+  updatedAt: string;
+}
+
+export class RoleRegister {
+  /** Get all imagery source aws roles */
+  static async _loadRoles(): Promise<RoleConfig[]> {
+    const configBucket = Env.get(Env.AwsRoleConfigBucket);
+    if (configBucket == null) return [];
+    const configPath = `s3://${configBucket}/config.json`;
+    const config: BucketConfig = await fsa.readJson(configPath);
+    const roles = [];
+    for (const role of config.buckets) {
+      fsa.register(
+        's3://' + role.bucket,
+        AwsCredentials.fsFromRole(role.roleArn, role.externalId, role.roleSessionDuration),
+      );
+      roles.push(role);
+    }
+    return roles;
+  }
+
+  static _loadRolesPromise: Promise<RoleConfig[]> | undefined;
+  static loadRoles(): Promise<RoleConfig[]> {
+    if (RoleRegister._loadRolesPromise == null) RoleRegister._loadRolesPromise = this._loadRoles();
+    return RoleRegister._loadRolesPromise;
+  }
+
+  static async findRole(path: string): Promise<RoleConfig | undefined> {
+    const roles = await this.loadRoles();
+    return roles.find((f) => path.startsWith(`s3://${f.bucket}`));
+  }
+}
+
+/** Search for the imagery across all of our buckets */
+export async function findImagery(path: string): Promise<string[]> {
+  const files: string[] = [];
+  for await (const key of fsa.list(path)) {
+    const searchKey = key.toLowerCase();
+    if (searchKey.endsWith('.tif') || searchKey.endsWith('.tiff')) files.push(key);
+  }
+  return files;
+}