@basemaps/lambda-tiler 6.20.0 → 6.22.1

package/CHANGELOG.md

@@ -3,6 +3,59 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.22.1](https://github.com/linz/basemaps/compare/v6.22.0...v6.22.1) (2022-03-23)
+
+**Note:** Version bump only for package @basemaps/lambda-tiler
+
+
+
+
+
+# [6.22.0](https://github.com/linz/basemaps/compare/v6.21.1...v6.22.0) (2022-03-20)
+
+**Note:** Version bump only for package @basemaps/lambda-tiler
+
+
+
+
+
+## [6.21.1](https://github.com/linz/basemaps/compare/v6.21.0...v6.21.1) (2022-03-17)
+
+
+### Bug Fixes
+
+* **lambda-tiler:** bundle the exact version of sharp from the yarn.lock  ([#2114](https://github.com/linz/basemaps/issues/2114)) ([a193e41](https://github.com/linz/basemaps/commit/a193e4172c63349e745e8bfcbb78ac919e52f1dd))
+* **lambda-tiler:** scripts should be specific to the module type ([#2115](https://github.com/linz/basemaps/issues/2115)) ([04c6f87](https://github.com/linz/basemaps/commit/04c6f8777ec722f1dc918757dd79043bd88d5e9a))
+
+
+
+
+
+# [6.21.0](https://github.com/linz/basemaps/compare/v6.20.0...v6.21.0) (2022-03-17)
+
+
+### Bug Fixes
+
+* **config:** fetch all unprocessed keys from dynamo if there are any ([#2101](https://github.com/linz/basemaps/issues/2101)) ([731430e](https://github.com/linz/basemaps/commit/731430e73756f05b2684f5b7ae7bd2852bc0a9b5))
+
+
+### Features
+
+* **config:** remove imagery year and resoltuion from config as it is not used ([#2097](https://github.com/linz/basemaps/issues/2097)) ([8be7c09](https://github.com/linz/basemaps/commit/8be7c09b9ce64898e5ab54b7fcb74c34405f558e))
+* **lambda-tiler:** limit request tracing to 100 requests ([#2095](https://github.com/linz/basemaps/issues/2095)) ([f86fc30](https://github.com/linz/basemaps/commit/f86fc30aefcd2ddbfe2ffe43547338d36c152315))
+* **lambda-tiler:** trace all requests to source ([#2093](https://github.com/linz/basemaps/issues/2093)) ([a2ca049](https://github.com/linz/basemaps/commit/a2ca049bd11505882105cb525a3f28f84c10611a))
+
+
+### Reverts
+
+* Revert "release: v6.21.0 (#2104)" (#2111) ([d07f8ab](https://github.com/linz/basemaps/commit/d07f8ab4037466b060bf7e83960737554ff064b4)), closes [#2104](https://github.com/linz/basemaps/issues/2104) [#2111](https://github.com/linz/basemaps/issues/2111)
+* Revert "release: v6.22.0 (#2108)" (#2110) ([abcd2e4](https://github.com/linz/basemaps/commit/abcd2e4732a6d606eed865f526d6df2e4617aad3)), closes [#2108](https://github.com/linz/basemaps/issues/2108) [#2110](https://github.com/linz/basemaps/issues/2110)
+* Revert "release: v6.21.0 (#2104)" (#2107) ([2c7e7f6](https://github.com/linz/basemaps/commit/2c7e7f6686a293995abdeb9604413808f2208bd6)), closes [#2104](https://github.com/linz/basemaps/issues/2104) [#2107](https://github.com/linz/basemaps/issues/2107)
+
+
+
+
+
 # [6.20.0](https://github.com/linz/basemaps/compare/v6.19.0...v6.20.0) (2022-02-01)
 
 

package/build/__test__/tile.set.cache.test.js

@@ -1,3 +1,4 @@
+import { TileSetType } from '@basemaps/config';
 import { Epsg, GoogleTms, Nztm2000Tms } from '@basemaps/geo';
 import { Config, TileSetName } from '@basemaps/shared';
 import o from 'ospec';
@@ -22,13 +23,6 @@ o.spec('TileSetCache', () => {
     };
     const imgMap = new Map();
     imgMap.set(imageOne.id, imageOne);
-    o.beforeEach(() => {
-        sandbox.stub(Config, 'getTileSetImagery').callsFake(async () => {
-            const imgMap = new Map();
-            imgMap.set(imageOne.id, imageOne);
-            return imgMap;
-        });
-    });
     o.afterEach(() => {
         TileSets.cache.clear();
         sandbox.restore();
@@ -37,7 +31,7 @@ o.spec('TileSetCache', () => {
         o('load individual set', async () => {
             TileSets.add(new TileSetRaster('aerial@head', GoogleTms));
             const parentTileSet = await TileSets.get('aerial@head', GoogleTms);
-            if (parentTileSet == null || parentTileSet.isVector())
+            if (parentTileSet == null || parentTileSet.type === TileSetType.Vector)
                 throw new Error('null parentTileSet');
             parentTileSet.imagery = imgMap;
             parentTileSet.tileSet = {
@@ -46,7 +40,7 @@ o.spec('TileSetCache', () => {
                 background: { r: 200, g: 50, b: 100, alpha: 0.5 },
             };
             const subTileSet = await TileSets.get('aerial@head:tasman_rural_2018-19_0-3m', GoogleTms);
-            if (subTileSet == null || subTileSet.isVector())
+            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');
@@ -68,7 +62,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())
+            if (subTileSetB == null || subTileSetB.type === TileSetType.Vector)
                 throw new Error('null subTileSetB');
             o(subTileSetB.title).equals('parent Tasman rural 2018-19 0.3m');
         });

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAoB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkBvF;AAED,eAAO,MAAM,OAAO,2LAA0C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAqB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BvF;AAED,eAAO,MAAM,OAAO,2LAA0C,CAAC"}

package/build/index.js

@@ -7,6 +7,7 @@ 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();
 app.get('ping', Ping);
 app.get('health', Health);
@@ -16,6 +17,8 @@ app.get('imagery', Imagery);
 app.get('esri', Esri);
 let slowTimer = null;
 export async function handleRequest(req) {
+    // Reset the request tracing
+    St.reset();
     // Warn if a request takes more than 10 seconds to process
     if (slowTimer)
         clearTimeout(slowTimer);
@@ -28,7 +31,11 @@ export async function handleRequest(req) {
             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)

package/build/routes/__test__/attribution.test.js

@@ -157,7 +157,6 @@ const ExpectedJson = {
             },
             links: [],
             summaries: {
-                gsd: [0.75],
                 'linz:zoom': {
                     min: 14,
                     max: 16,
@@ -188,7 +187,6 @@ const ExpectedJson = {
             },
             links: [],
             summaries: {
-                gsd: [0.75],
                 'linz:zoom': {
                     min: 15,
                     max: 17,
@@ -219,7 +217,6 @@ const ExpectedJson = {
             },
             links: [],
             summaries: {
-                gsd: [0.75],
                 'linz:zoom': {
                     min: 16,
                     max: 18,
@@ -250,7 +247,6 @@ const ExpectedJson = {
             },
             links: [],
             summaries: {
-                gsd: [0.75],
                 'linz:zoom': {
                     min: 14,
                     max: 16,
@@ -261,15 +257,13 @@ const ExpectedJson = {
     ],
     links: [],
 };
-function makeImageRecord(id, name, x = 10, year = 2019) {
+function makeImageRecord(id, name, x = 10) {
     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();
             b.name = name + i;
@@ -343,18 +337,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`);
             const res = await attribution(request);

package/build/routes/attribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attribution.d.ts","sourceRoot":"","sources":["../../src/routes/attribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EACL,qBAAqB,EAOrB,cAAc,EACd,UAAU,EAEX,MAAM,eAAe,CAAC;AACvB,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAcnF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAsEtD,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,UAAU,GACjB,qBAAqB,CAsBvB;AAiFD;;GAEG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkCrF"}
+{"version":3,"file":"attribution.d.ts","sourceRoot":"","sources":["../../src/routes/attribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAe,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EACL,qBAAqB,EAOrB,cAAc,EACd,UAAU,EAEX,MAAM,eAAe,CAAC;AAYvB,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAInF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AA2DtD,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,UAAU,GACjB,qBAAqB,CAqBvB;AAiFD;;GAEG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkCrF"}

package/build/routes/attribution.js

@@ -1,10 +1,11 @@
+import { TileSetType } from '@basemaps/config';
 import { Bounds, GoogleTms, Stac, TileMatrixSet, } from '@basemaps/geo';
-import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import { CompositeError, Config, extractYearRangeFromName, fsa, Projection, setNameAndProjection, tileAttributionFromPath, titleizeImageryName, } from '@basemaps/shared';
 import { multiPolygonToWgs84, union, Wgs84 } from '@linzjs/geojson';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import { createHash } from 'crypto';
-import { TileSets } from '../tile.set.cache.js';
 import { Router } from '../router.js';
+import { TileSets } from '../tile.set.cache.js';
 /** Amount to pad imagery bounds to avoid fragmenting polygons  */
 const SmoothPadding = 1 + 1e-10; // about 1/100th of a millimeter at equator
 const NotFound = new LambdaHttpResponse(404, 'Not Found');
@@ -52,21 +53,8 @@ async function readStac(uri) {
         throw err;
     }
 }
-/** Attempt to find the GSD from a stack summary object */
-function getGsd(un) {
-    if (un == null)
-        return null;
-    const gsd = un['gsd'];
-    if (gsd == null)
-        return null;
-    if (!Array.isArray(gsd))
-        return null;
-    if (isNaN(gsd[0]))
-        return null;
-    return gsd[0];
-}
 export function createAttributionCollection(tileSet, stac, imagery, layer, host, extent) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const tileMatrix = tileSet.tileMatrix;
     return {
         stac_version: Stac.Version,
@@ -80,7 +68,6 @@ export function createAttributionCollection(tileSet, stac, imagery, layer, host,
         extent,
         links: [],
         summaries: {
-            gsd: [(_e = getGsd(stac === null || stac === void 0 ? void 0 : stac.summaries)) !== null && _e !== void 0 ? _e : imagery.resolution / 1000],
             'linz:zoom': {
                 min: TileMatrixSet.convertZoomLevel(layer.minZoom ? layer.minZoom : 0, GoogleTms, tileMatrix, true),
                 max: TileMatrixSet.convertZoomLevel(layer.maxZoom ? layer.maxZoom : 32, GoogleTms, tileMatrix, true),
@@ -102,7 +89,7 @@ async function tileSetAttribution(tileSet) {
     const items = [];
     // read all stac files in parallel
     for (const layer of tileSet.tileSet.layers) {
-        const imgId = Config.getImageId(layer, proj.epsg);
+        const imgId = layer[proj.epsg.code];
         if (imgId == null)
             continue;
         const im = tileSet.imagery.get(imgId);
@@ -116,7 +103,7 @@ async function tileSetAttribution(tileSet) {
     if (host == null)
         return null;
     for (const layer of tileSet.tileSet.layers) {
-        const imgId = Config.getImageId(layer, proj.epsg);
+        const imgId = layer[proj.epsg.code];
         if (imgId == null)
             continue;
         const im = tileSet.imagery.get(imgId);
@@ -177,7 +164,7 @@ export async function attribution(req) {
     req.timer.start('tileset:load');
     const tileSet = await TileSets.get(data.name, data.tileMatrix);
     req.timer.end('tileset:load');
-    if (tileSet == null || tileSet.isVector())
+    if (tileSet == null || tileSet.type === TileSetType.Vector)
         return NotFound;
     const cacheKey = createHash('sha256').update(JSON.stringify(tileSet.tileSet)).digest('base64');
     const ifNoneMatch = req.header(HttpHeader.IfNoneMatch);

package/build/routes/tile.wmts.js

@@ -1,4 +1,4 @@
-import { Config } from '@basemaps/config';
+import { Config, TileSetType } from '@basemaps/config';
 import { Env, TileSetName, tileWmtsFromPath } from '@basemaps/shared';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import { createHash } from 'crypto';
@@ -47,7 +47,7 @@ export async function wmts(req) {
 async function wmtsLoadTileSets(name, tileMatrix) {
     if (tileMatrix != null) {
         const ts = await TileSets.get(name, tileMatrix);
-        if (ts == null || ts.isVector())
+        if (ts == null || ts.type === TileSetType.Vector)
             return [];
         return [ts];
     }

package/build/source.tracer.d.ts

@@ -0,0 +1,17 @@
+import { ChunkSource } from '@chunkd/core';
+interface SourceRequest {
+    offset: number;
+    length?: number;
+    source: string;
+    duration?: number;
+}
+export declare class SourceTracer {
+    requests: SourceRequest[];
+    /** Reset the request tracer */
+    reset(): void;
+    /** Override the fetchByte function to trace all requests for this source  */
+    trace(source: ChunkSource): void;
+}
+export declare const St: SourceTracer;
+export {};
+//# sourceMappingURL=source.tracer.d.ts.map

package/build/source.tracer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source.tracer.d.ts","sourceRoot":"","sources":["../src/source.tracer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,UAAU,aAAa;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,YAAY;IACvB,QAAQ,EAAE,aAAa,EAAE,CAAM;IAE/B,+BAA+B;IAC/B,KAAK,IAAI,IAAI;IAIb,6EAA6E;IAC7E,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;CAajC;AAED,eAAO,MAAM,EAAE,cAAqB,CAAC"}

package/build/source.tracer.js

@@ -0,0 +1,22 @@
+export class SourceTracer {
+    constructor() {
+        this.requests = [];
+    }
+    /** Reset the request tracer */
+    reset() {
+        this.requests = [];
+    }
+    /** Override the fetchByte function to trace all requests for this source  */
+    trace(source) {
+        const originFetch = source.fetchBytes;
+        source.fetchBytes = async (offset, length) => {
+            const request = { source: source.uri, offset, length };
+            this.requests.push(request);
+            const startTime = Date.now();
+            const ret = await originFetch.apply(source, [offset, length]);
+            request.duration = Date.now() - startTime;
+            return ret;
+        };
+    }
+}
+export const St = new SourceTracer();

package/build/tile.set.cache.js

@@ -1,4 +1,4 @@
-import { TileSetNameParser } from '@basemaps/config';
+import { TileSetNameParser, TileSetType } from '@basemaps/config';
 import { TileMatrixSets } from '@basemaps/geo';
 import { Config } from '@basemaps/shared';
 import { TileSetRaster } from './tile.set.raster.js';
@@ -42,7 +42,7 @@ export class TileSetCache {
         if (nameComp.layer != null) {
             const parentName = TileSetNameParser.componentsToName({ ...nameComp, layer: undefined });
             const parent = await this.get(parentName, tileMatrix);
-            if (parent == null || parent.isVector())
+            if (parent == null || parent.type === TileSetType.Vector)
                 return null;
             return parent.child(nameComp.layer);
         }
@@ -79,7 +79,7 @@ export class TileSetCache {
         for (const parent of tileMatrixSets) {
             if (parent == null)
                 continue;
-            if (parent.isVector())
+            if (parent.type === TileSetType.Vector)
                 continue;
             tileSets.push(parent);
             if (nameComp.layer != null) {

package/build/tile.set.d.ts

@@ -1,20 +1,4 @@
-import { ConfigTileSetRaster, ConfigTileSetVector, TileSetNameComponents, TileSetType } from '@basemaps/config';
-import { TileMatrixSet } from '@basemaps/geo';
-import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
-import { TileDataXyz } from '@basemaps/shared';
 import { TileSetRaster } from './tile.set.raster.js';
 import { TileSetVector } from './tile.set.vector.js';
 export declare type TileSet = TileSetVector | TileSetRaster;
-export declare abstract class TileSetHandler<T extends ConfigTileSetRaster | ConfigTileSetVector> {
-    type: TileSetType;
-    components: TileSetNameComponents;
-    tileMatrix: TileMatrixSet;
-    tileSet: T;
-    constructor(name: string, tileMatrix: TileMatrixSet);
-    get id(): string;
-    get fullName(): string;
-    isVector(): this is TileSetVector;
-    isRaster(): this is TileSetRaster;
-    abstract tile(req: LambdaHttpRequest, xyz: TileDataXyz): Promise<LambdaHttpResponse>;
-}
 //# sourceMappingURL=tile.set.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tile.set.d.ts","sourceRoot":"","sources":["../src/tile.set.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EAErB,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,oBAAY,OAAO,GAAG,aAAa,GAAG,aAAa,CAAC;AAEpD,8BAAsB,cAAc,CAAC,CAAC,SAAS,mBAAmB,GAAG,mBAAmB;IACtF,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,EAAE,qBAAqB,CAAC;IAClC,UAAU,EAAE,aAAa,CAAC;IAC1B,OAAO,EAAE,CAAC,CAAC;gBACC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa;IAKnD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,QAAQ,IAAI,IAAI,IAAI,aAAa;IAIjC,QAAQ,IAAI,IAAI,IAAI,aAAa;IAIjC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;CACrF"}
+{"version":3,"file":"tile.set.d.ts","sourceRoot":"","sources":["../src/tile.set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,oBAAY,OAAO,GAAG,aAAa,GAAG,aAAa,CAAC"}

package/build/tile.set.js

@@ -1,20 +1 @@
-import { TileSetNameParser, TileSetType, } from '@basemaps/config';
-import { TileSets } from './tile.set.cache.js';
-export class TileSetHandler {
-    constructor(name, tileMatrix) {
-        this.components = TileSetNameParser.parse(name);
-        this.tileMatrix = tileMatrix;
-    }
-    get id() {
-        return TileSets.id(this.fullName, this.tileMatrix);
-    }
-    get fullName() {
-        return TileSetNameParser.componentsToName(this.components);
-    }
-    isVector() {
-        return this.type === TileSetType.Vector;
-    }
-    isRaster() {
-        return this.type === TileSetType.Raster;
-    }
-}
+export {};

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { ConfigImagery, ConfigTileSetRaster, TileSetType } from '@basemaps/config';
+import { ConfigImagery, ConfigTileSetRaster, TileSetNameComponents, TileSetType } from '@basemaps/config';
 import { Bounds, Tile, TileMatrixSet } from '@basemaps/geo';
 import { LogType, TileDataXyz } from '@basemaps/shared';
 import { Tiler } from '@basemaps/tiler';
@@ -7,7 +7,6 @@ import { TileMakerSharp } from '@basemaps/tiler-sharp';
 import { CogTiff } from '@cogeotiff/core';
 import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { Metrics } from '@linzjs/metrics';
-import { TileSetHandler } from './tile.set.js';
 export declare const TileComposer: TileMakerSharp;
 export interface TileSetResponse {
     buffer: Buffer;
@@ -16,12 +15,14 @@ export interface TileSetResponse {
     layersTotal: number;
     contentType: string;
 }
-export declare class TileSetRaster extends TileSetHandler<ConfigTileSetRaster> {
-    type: TileSetType;
+export declare class TileSetRaster {
+    type: TileSetType.Raster;
     tileMatrix: TileMatrixSet;
     tiler: Tiler;
     imagery: Map<string, ConfigImagery>;
     extentOverride: Bounds;
+    components: TileSetNameComponents;
+    tileSet: ConfigTileSetRaster;
     /**
      * Return the location of a imagery `record`
      * @param record
@@ -29,6 +30,8 @@ export declare class TileSetRaster extends TileSetHandler<ConfigTileSetRaster> {
      */
     static basePath(record: ConfigImagery, name?: string): string;
     constructor(name: string, tileMatrix: TileMatrixSet);
+    get id(): string;
+    get fullName(): string;
     get title(): string;
     get description(): string;
     get extent(): Bounds;

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,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;AAK1C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAI/C,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,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,4 +1,4 @@
-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';
@@ -8,16 +8,18 @@ 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 { 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);
     }
     /**
@@ -32,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;
@@ -111,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;
@@ -141,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/response.js';
-import { TileSetHandler } from './tile.set.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