@basemaps/lambda-tiler 7.6.0 → 7.9.0

package/build/util/__test__/cache.test.js

@@ -0,0 +1,29 @@
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+import { fsa, FsMemory } from '@chunkd/fs';
+import { SourceCache } from '../source.cache.js';
+describe('CoSourceCache', () => {
+    it('should not exit if a promise rejection happens for tiff', async () => {
+        const cache = new SourceCache(5);
+        const mem = new FsMemory();
+        const tiffLoc = new URL('memory://foo/bar.tiff');
+        await mem.write(tiffLoc, Buffer.from('ABC123'));
+        fsa.register('memory://', mem);
+        let failCount = 0;
+        await cache.getCog(tiffLoc).catch(() => failCount++);
+        assert.equal(cache.cache.currentSize, 0);
+        assert.equal(failCount, 1);
+    });
+    it('should not exit if a promise rejection happens for tar', async () => {
+        const cache = new SourceCache(5);
+        const mem = new FsMemory();
+        const tiffLoc = new URL('memory://foo/bar.tar');
+        await mem.write(tiffLoc, Buffer.from('ABC123'));
+        fsa.register('memory://', mem);
+        let failCount = 0;
+        await cache.getCotar(tiffLoc).catch(() => failCount++);
+        assert.equal(cache.cache.currentSize, 0);
+        assert.equal(failCount, 1);
+    });
+});
+//# sourceMappingURL=cache.test.js.map

package/build/util/__test__/cache.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache.test.js","sourceRoot":"","sources":["../../../src/util/__test__/cache.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;QACvE,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;QAEjC,MAAM,GAAG,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACjD,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChD,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAE/B,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;QACrD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;QAEjC,MAAM,GAAG,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAChD,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChD,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAE/B,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,MAAM,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;QACvD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/build/util/source.cache.d.ts

@@ -4,24 +4,18 @@ export type LruStrut = LruStrutCotar | LruStrutCog;
 export interface LruStrutCotar {
     type: 'cotar';
     value: Promise<Cotar>;
-    _value?: Cotar;
+    size: number;
 }
 export interface LruStrutCog {
     type: 'cog';
     value: Promise<Tiff>;
-    _value?: Tiff;
-}
-declare class LruStrutObj<T extends LruStrut> {
-    ob: T;
-    constructor(ob: T);
     size: number;
 }
 export declare class SourceCache {
-    cache: SwappingLru<LruStrutObj<LruStrutCotar | LruStrutCog>>;
+    cache: SwappingLru<LruStrut>;
     constructor(maxSize: number);
     getCog(location: URL): Promise<Tiff>;
     getCotar(location: URL): Promise<Cotar>;
 }
 /** Cache the last 5,000 tiff/tar files accessed, generally it is only <100KB of memory used per tiff file so approx 50MB of cache */
 export declare const CoSources: SourceCache;
-export {};

package/build/util/source.cache.js

@@ -1,25 +1,5 @@
 import { Cotar, fsa, Tiff } from '@basemaps/shared';
 import { SwappingLru } from './swapping.lru.js';
-class LruStrutObj {
-    constructor(ob) {
-        Object.defineProperty(this, "ob", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "size", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: 1
-        });
-        this.ob = ob;
-        if (this.ob._value == null) {
-            void this.ob.value.then((c) => (this.ob._value = c));
-        }
-    }
-}
 export class SourceCache {
     constructor(maxSize) {
         Object.defineProperty(this, "cache", {
@@ -31,25 +11,27 @@ export class SourceCache {
         this.cache = new SwappingLru(maxSize);
     }
     getCog(location) {
-        const existing = this.cache.get(location.href)?.ob;
+        const existing = this.cache.get(location.href);
         if (existing != null) {
             if (existing.type === 'cog')
                 return existing.value;
             throw new Error(`Existing object of type: ${existing.type} made for location: ${location.href}`);
         }
         const value = Tiff.create(fsa.source(location));
-        this.cache.set(location.href, new LruStrutObj({ type: 'cog', value }));
+        this.cache.set(location.href, { type: 'cog', value, size: 1 });
+        value.catch(() => this.cache.delete(location.href));
         return value;
     }
     getCotar(location) {
-        const existing = this.cache.get(location.href)?.ob;
+        const existing = this.cache.get(location.href);
         if (existing != null) {
             if (existing.type === 'cotar')
                 return existing.value;
             throw new Error(`Existing object of type: ${existing.type} made for location: ${location.href}`);
         }
         const value = Cotar.fromTar(fsa.source(location));
-        this.cache.set(location.href, new LruStrutObj({ type: 'cotar', value }));
+        this.cache.set(location.href, { type: 'cotar', value, size: 1 });
+        value.catch(() => this.cache.delete(location.href));
         return value;
     }
 }

package/build/util/source.cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"source.cache.js","sourceRoot":"","sources":["../../src/util/source.cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAgBhD,MAAM,WAAW;IAEf,YAAY,EAAK;QADjB;;;;;WAAM;QAQN;;;;mBAAO,CAAC;WAAC;QANP,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;YAC3B,KAAK,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;CAGF;AAED,MAAM,OAAO,WAAW;IAEtB,YAAY,OAAe;QAD3B;;;;;WAA6D;QAE3D,IAAI,CAAC,KAAK,GAAG,IAAI,WAAW,CAAwB,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,CAAC,QAAa;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QAEnD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK;gBAAE,OAAO,QAAQ,CAAC,KAAK,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,CAAC,IAAI,uBAAuB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QACnG,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QACvE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,QAAQ,CAAC,QAAa;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QAEnD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO;gBAAE,OAAO,QAAQ,CAAC,KAAK,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,CAAC,IAAI,uBAAuB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QACnG,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QACzE,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED,qIAAqI;AACrI,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"source.cache.js","sourceRoot":"","sources":["../../src/util/source.cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAgBhD,MAAM,OAAO,WAAW;IAEtB,YAAY,OAAe;QAD3B;;;;;WAA6B;QAE3B,IAAI,CAAC,KAAK,GAAG,IAAI,WAAW,CAAW,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,QAAa;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE/C,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK;gBAAE,OAAO,QAAQ,CAAC,KAAK,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,CAAC,IAAI,uBAAuB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QACnG,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/D,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,QAAQ,CAAC,QAAa;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE/C,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO;gBAAE,OAAO,QAAQ,CAAC,KAAK,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,CAAC,IAAI,uBAAuB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QACnG,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QACjE,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED,qIAAqI;AACrI,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC"}

package/build/util/swapping.lru.d.ts

@@ -13,6 +13,7 @@ export declare class SwappingLru<T extends {
     get(id: string): T | null;
     /** Reset the cache */
     clear(): void;
+    delete(id: string): void;
     set(id: string, tiff: T): void;
     /** Validate the size of the cache has not exploded */
     check(): void;

package/build/util/swapping.lru.js

@@ -73,6 +73,10 @@ export class SwappingLru {
         this.cacheB.clear();
         this.clears++;
     }
+    delete(id) {
+        this.cacheA.delete(id);
+        this.cacheB.delete(id);
+    }
     set(id, tiff) {
         this.cacheA.set(id, tiff);
         this.check();

package/build/util/swapping.lru.js.map

@@ -1 +1 @@
-{"version":3,"file":"swapping.lru.js","sourceRoot":"","sources":["../../src/util/swapping.lru.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,WAAW;IAYtB,YAAY,OAAe;QAX3B;;;;mBAAyB,IAAI,GAAG,EAAE;WAAC;QACnC;;;;mBAAyB,IAAI,GAAG,EAAE;WAAC;QACnC;;;;;WAAgB;QAEhB;;;;mBAAO,CAAC;WAAC;QACT;;;;mBAAS,CAAC;WAAC;QACX;;;;mBAAS,CAAC;WAAC;QACX;;;;mBAAS,CAAC;WAAC;QAEX;;;;mBAAiB,CAAC,CAAC;WAAC;QAGlB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,GAAG,CAAC,EAAU;QACZ,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,0DAA0D;QAC1D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACvB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,sBAAsB;IACtB,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED,GAAG,CAAC,EAAU,EAAE,IAAO;QACrB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,sDAAsD;IACtD,KAAK;QACH,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC;YAAE,OAAO;QAC9B,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,qFAAqF;QACrF,IAAI,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;YAChB,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;IAC1B,CAAC;IAED,6DAA6D;IAC7D,IAAI,WAAW;QACb,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"swapping.lru.js","sourceRoot":"","sources":["../../src/util/swapping.lru.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,WAAW;IAYtB,YAAY,OAAe;QAX3B;;;;mBAAyB,IAAI,GAAG,EAAE;WAAC;QACnC;;;;mBAAyB,IAAI,GAAG,EAAE;WAAC;QACnC;;;;;WAAgB;QAEhB;;;;mBAAO,CAAC;WAAC;QACT;;;;mBAAS,CAAC;WAAC;QACX;;;;mBAAS,CAAC;WAAC;QACX;;;;mBAAS,CAAC;WAAC;QAEX;;;;mBAAiB,CAAC,CAAC;WAAC;QAGlB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,GAAG,CAAC,EAAU;QACZ,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACnB,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,0DAA0D;QAC1D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACvB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,sBAAsB;IACtB,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,EAAU;QACf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACvB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,GAAG,CAAC,EAAU,EAAE,IAAO;QACrB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,sDAAsD;IACtD,KAAK;QACH,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC;YAAE,OAAO;QAC9B,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,qFAAqF;QACrF,IAAI,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;YAChB,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;IAC1B,CAAC;IAED,6DAA6D;IAC7D,IAAI,WAAW;QACb,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "7.6.0",
+  "version": "7.9.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,12 +22,12 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^7.6.0",
-    "@basemaps/config-loader": "^7.6.0",
+    "@basemaps/config": "^7.7.0",
+    "@basemaps/config-loader": "^7.9.0",
     "@basemaps/geo": "^7.5.0",
-    "@basemaps/shared": "^7.6.0",
+    "@basemaps/shared": "^7.9.0",
     "@basemaps/tiler": "^7.5.0",
-    "@basemaps/tiler-sharp": "^7.6.0",
+    "@basemaps/tiler-sharp": "^7.7.0",
     "@linzjs/geojson": "^7.5.0",
     "@linzjs/lambda": "^4.0.0",
     "p-limit": "^4.0.0",
@@ -55,5 +55,5 @@
     "@types/pixelmatch": "^5.0.0",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "b97ded866e18b19410cb3effd5c67240e8980da4"
+  "gitHead": "5dc4332d74563f6ca6ac644258728eb64ceacf6a"
 }

package/src/__tests__/config.data.ts

@@ -33,9 +33,9 @@ export const TileSetAerial: ConfigTileSetRaster = {
 export const TileSetVector: ConfigTileSetVector = {
   id: 'ts_topographic',
   type: TileSetType.Vector,
-  name: 'topotgrpahic',
-  description: 'topotgrpahic__description',
-  title: 'topotgrpahic Imagery',
+  name: 'topographic',
+  description: 'topographic__description',
+  title: 'topographic Imagery',
   category: 'Basemap',
   layers: [
     {

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

@@ -4,7 +4,6 @@ import { afterEach, beforeEach, describe, it } from 'node:test';
 import { StyleJson } from '@basemaps/config';
 import { GoogleTms, Nztm2000QuadTms } from '@basemaps/geo';
 import { Env } from '@basemaps/shared';
-import { LambdaHttpResponse } from '@linzjs/lambda';
 
 import { convertRelativeUrl, convertStyleJson } from '../routes/tile.style.json.js';
 
@@ -153,12 +152,6 @@ describe('TileStyleJson', () => {
     });
   });
 
-  it('should thrown error for NZTM2000Quad with vector source', () => {
-    const converted = (): StyleJson => convertStyleJson(baseStyleJson, Nztm2000QuadTms, 'abc123', null);
-
-    assert.throws(converted, LambdaHttpResponse);
-  });
-
   it('should convert relative glyphs and sprites', () => {
     const apiKey = '0x9f9f';
     const converted = convertStyleJson(baseStyleJson, GoogleTms, apiKey, null);

package/src/routes/__tests__/imagery.test.ts

@@ -1,9 +1,27 @@
 import assert from 'node:assert';
-import { describe, it } from 'node:test';
+import { before, beforeEach, describe, it } from 'node:test';
 
+import { ConfigProviderMemory } from '@basemaps/config';
+import { fsa, FsMemory } from '@chunkd/fs';
+
+import { Imagery3857 } from '../../__tests__/config.data.js';
+import { mockRequest } from '../../__tests__/xyz.util.js';
+import { handler } from '../../index.js';
+import { ConfigLoader } from '../../util/config.loader.js';
 import { isAllowedFile } from '../imagery.js';
 
 describe('ImageryRoute', () => {
+  const memory = new FsMemory();
+  const config = new ConfigProviderMemory();
+
+  before(() => {
+    fsa.register('memory://imagery/', memory);
+  });
+
+  beforeEach(() => {
+    config.assets = 'fake-s3://assets/';
+  });
+
   it('should allow geojson and json files only', () => {
     assert.equal(isAllowedFile('foo.geojson'), true);
     assert.equal(isAllowedFile('foo.json'), true);
@@ -12,4 +30,36 @@ describe('ImageryRoute', () => {
     assert.equal(isAllowedFile(''), false);
     assert.equal(isAllowedFile(null as unknown as string), false);
   });
+
+  it('should force download geojson files', async (t) => {
+    const fakeImagery = { ...Imagery3857 };
+    config.put(fakeImagery);
+    fakeImagery.uri = 'memory://imagery/';
+
+    t.mock.method(ConfigLoader, 'getDefaultConfig', () => Promise.resolve(config));
+    const res404 = await handler.router.handle(mockRequest(`/v1/imagery/${fakeImagery.id}/capture-area.geojson`));
+    assert.equal(res404.status, 404);
+
+    await memory.write(fsa.toUrl('memory://imagery/capture-area.geojson'), JSON.stringify({ hello: 'world' }));
+
+    const res200 = await handler.router.handle(mockRequest(`/v1/imagery/${fakeImagery.id}/capture-area.geojson`));
+    assert.equal(res200.status, 200);
+    assert.equal(res200.headers.get('content-disposition'), 'attachment');
+  });
+
+  it('should fetch stac files', async (t) => {
+    const fakeImagery = { ...Imagery3857 };
+    config.put(fakeImagery);
+    fakeImagery.uri = 'memory://imagery/';
+
+    t.mock.method(ConfigLoader, 'getDefaultConfig', () => Promise.resolve(config));
+    const res404 = await handler.router.handle(mockRequest(`/v1/imagery/${fakeImagery.id}/collection.json`));
+    assert.equal(res404.status, 404);
+
+    await memory.write(fsa.toUrl('memory://imagery/collection.json'), JSON.stringify({ hello: 'world' }));
+
+    const res200 = await handler.router.handle(mockRequest(`/v1/imagery/${fakeImagery.id}/collection.json`));
+    assert.equal(res200.status, 200);
+    assert.equal(res200.headers.get('content-disposition'), undefined);
+  });
 });

package/src/routes/__tests__/tile.style.json.test.ts

@@ -380,4 +380,35 @@ describe('/v1/styles', () => {
     assert.deepEqual(terrain.source, 'LINZ-Terrain');
     assert.deepEqual(terrain.exaggeration, 1.2);
   });
+
+  it('should set labels via parameter', async () => {
+    config.put(TileSetAerial);
+    config.put(TileSetElevation);
+
+    const fakeStyle = { id: 'st_labels', name: 'labels', style: fakeVectorStyleConfig };
+    config.put(fakeStyle);
+
+    const request = mockUrlRequest('/v1/styles/aerial.json', `?terrain=LINZ-Terrain&labels=true`, Api.header);
+    const res = await handler.router.handle(request);
+    assert.equal(res.status, 200, res.statusDescription);
+
+    const body = JSON.parse(Buffer.from(res.body, 'base64').toString()) as StyleJson;
+    const terrain = body.terrain as unknown as Terrain;
+    assert.deepEqual(terrain.source, 'LINZ-Terrain');
+    assert.deepEqual(terrain.exaggeration, 1.2);
+
+    assert.equal(body.sources['basemaps_vector']?.type, 'vector');
+    assert.equal(body.layers.length, 2);
+  });
+
+  it('should error when joining layers with duplicate ids', async () => {
+    const fakeStyle = { id: 'st_labels', name: 'labels', style: fakeVectorStyleConfig };
+    config.put(fakeStyle);
+    config.put(TileSetAerial);
+
+    const request = mockUrlRequest('/v1/styles/labels.json', `?labels=true`, Api.header);
+    const res = await handler.router.handle(request);
+    assert.equal(res.status, 400, res.statusDescription);
+    assert.equal(res.statusDescription.includes('Background1'), true);
+  });
 });

package/src/routes/imagery.ts

@@ -51,6 +51,10 @@ export async function imageryGet(req: LambdaHttpRequest<ImageryGet>): Promise<La
     response.header(HttpHeader.ETag, cacheKey);
     response.header(HttpHeader.ContentEncoding, 'gzip');
     response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
+    // Force geojson files to be downloaded
+    if (requestedFile.endsWith('.geojson')) {
+      response.header('Content-Disposition', 'attachment');
+    }
     response.buffer(isGzip(buf) ? buf : await gzipP(buf), 'application/json');
     req.set('bytes', buf.byteLength);
     return response;

package/src/routes/tile.style.json.ts

@@ -1,4 +1,5 @@
 import { ConfigId, ConfigPrefix, ConfigTileSetRaster, Layer, Sources, StyleJson, TileSetType } from '@basemaps/config';
+import { DefaultExaggeration } from '@basemaps/config/build/config/vector.style.js';
 import { GoogleTms, TileMatrixSet, TileMatrixSets } from '@basemaps/geo';
 import { Env, toQueryString } from '@basemaps/shared';
 import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
@@ -47,9 +48,6 @@ export function convertStyleJson(
   const sources = JSON.parse(JSON.stringify(style.sources)) as Sources;
   for (const [key, value] of Object.entries(sources)) {
     if (value.type === 'vector') {
-      if (tileMatrix !== GoogleTms) {
-        throw new LambdaHttpResponse(400, `TileMatrix is not supported for the vector source ${value.url}.`);
-      }
       value.url = convertRelativeUrl(value.url, tileMatrix, apiKey, config);
     } else if ((value.type === 'raster' || value.type === 'raster-dem') && Array.isArray(value.tiles)) {
       for (let i = 0; i < value.tiles.length; i++) {
@@ -71,6 +69,7 @@ export function convertStyleJson(
   if (style.glyphs) styleJson.glyphs = convertRelativeUrl(style.glyphs, undefined, undefined, config);
   if (style.sprite) styleJson.sprite = convertRelativeUrl(style.sprite, undefined, undefined, config);
   if (style.sky) styleJson.sky = style.sky;
+  if (style.terrain) styleJson.terrain = style.terrain;
 
   return styleJson;
 }
@@ -81,15 +80,48 @@ export interface StyleGet {
   };
 }
 
-function setStyleTerrain(style: StyleJson, terrain: string): void {
+export interface StyleConfig {
+  /** Name of the terrain layer */
+  terrain?: string | null;
+  /** Combine layer with the labels layer */
+  labels: boolean;
+}
+
+function setStyleTerrain(style: StyleJson, terrain: string, tileMatrix: TileMatrixSet): void {
   const source = Object.keys(style.sources).find((s) => s === terrain);
   if (source == null) throw new LambdaHttpResponse(400, `Terrain: ${terrain} is not exists in the style source.`);
   style.terrain = {
     source,
-    exaggeration: 1.2,
+    exaggeration: DefaultExaggeration[tileMatrix.identifier] ?? DefaultExaggeration[GoogleTms.identifier],
   };
 }
 
+async function setStyleLabels(req: LambdaHttpRequest<StyleGet>, style: StyleJson): Promise<void> {
+  const config = await ConfigLoader.load(req);
+  const labels = await config.Style.get('labels');
+
+  if (labels == null) {
+    req.log.warn('LabelsStyle:Missing');
+    return;
+  }
+
+  const layerId = new Set<string>();
+  for (const l of style.layers) layerId.add(l.id);
+
+  for (const newLayers of labels.style.layers) {
+    if (layerId.has(newLayers.id)) {
+      throw new LambdaHttpResponse(400, 'Cannot merge styles with duplicate layerIds: ' + newLayers.id);
+    }
+  }
+
+  if (style.glyphs == null) style.glyphs = labels.style.glyphs;
+  if (style.sprite == null) style.sprite = labels.style.sprite;
+  if (style.sky == null) style.sky = labels.style.sky;
+
+  Object.assign(style.sources, labels.style.sources);
+  style.layers = style.layers.concat(labels.style.layers);
+}
+
 async function ensureTerrain(
   req: LambdaHttpRequest<StyleGet>,
   tileMatrix: TileMatrixSet,
@@ -97,17 +129,16 @@ async function ensureTerrain(
   style: StyleJson,
 ): Promise<void> {
   const config = await ConfigLoader.load(req);
-  const terrain = await config.TileSet.get('ts_elevation');
-  if (terrain) {
-    const configLocation = ConfigLoader.extract(req);
-    const elevationQuery = toQueryString({ config: configLocation, api: apiKey, pipeline: 'terrain-rgb' });
-    style.sources['LINZ-Terrain'] = {
-      type: 'raster-dem',
-      tileSize: 256,
-      maxzoom: 18,
-      tiles: [convertRelativeUrl(`/v1/tiles/elevation/${tileMatrix.identifier}/{z}/{x}/{y}.png${elevationQuery}`)],
-    };
-  }
+  const terrain = await config.TileSet.get('elevation');
+  if (terrain == null) return;
+  const configLocation = ConfigLoader.extract(req);
+  const elevationQuery = toQueryString({ config: configLocation, api: apiKey, pipeline: 'terrain-rgb' });
+  style.sources['LINZ-Terrain'] = {
+    type: 'raster-dem',
+    tileSize: 256,
+    maxzoom: 18,
+    tiles: [convertRelativeUrl(`/v1/tiles/elevation/${tileMatrix.identifier}/{z}/{x}/{y}.png${elevationQuery}`)],
+  };
 }
 
 export async function tileSetToStyle(
@@ -115,7 +146,7 @@ export async function tileSetToStyle(
   tileSet: ConfigTileSetRaster,
   tileMatrix: TileMatrixSet,
   apiKey: string,
-  terrain?: string,
+  cfg: StyleConfig,
 ): Promise<LambdaHttpResponse> {
   const [tileFormat] = Validate.getRequestedFormats(req) ?? ['webp'];
   if (tileFormat == null) return new LambdaHttpResponse(400, 'Invalid image format');
@@ -143,9 +174,10 @@ export async function tileSetToStyle(
   await ensureTerrain(req, tileMatrix, apiKey, style);
 
   // Add terrain in style
-  if (terrain) setStyleTerrain(style, terrain);
+  if (cfg.terrain) setStyleTerrain(style, cfg.terrain, tileMatrix);
+  if (cfg.labels) await setStyleLabels(req, style);
 
-  const data = Buffer.from(JSON.stringify(style));
+  const data = Buffer.from(JSON.stringify(convertStyleJson(style, tileMatrix, apiKey, configLocation)));
 
   const cacheKey = Etag.key(data);
   if (Etag.isNotModified(req, cacheKey)) return NotModified();
@@ -163,7 +195,7 @@ export async function tileSetOutputToStyle(
   tileSet: ConfigTileSetRaster,
   tileMatrix: TileMatrixSet,
   apiKey: string,
-  terrain?: string,
+  cfg: StyleConfig,
 ): Promise<LambdaHttpResponse> {
   const configLocation = ConfigLoader.extract(req);
   const query = toQueryString({ config: configLocation, api: apiKey });
@@ -226,9 +258,10 @@ export async function tileSetOutputToStyle(
   await ensureTerrain(req, tileMatrix, apiKey, style);
 
   // Add terrain in style
-  if (terrain) setStyleTerrain(style, terrain);
+  if (cfg.terrain) setStyleTerrain(style, cfg.terrain, tileMatrix);
+  if (cfg.labels) await setStyleLabels(req, style);
 
-  const data = Buffer.from(JSON.stringify(style));
+  const data = Buffer.from(JSON.stringify(convertStyleJson(style, tileMatrix, apiKey, configLocation)));
 
   const cacheKey = Etag.key(data);
   if (Etag.isNotModified(req, cacheKey)) return Promise.resolve(NotModified());
@@ -249,18 +282,22 @@ export async function styleJsonGet(req: LambdaHttpRequest<StyleGet>): Promise<La
   const tileMatrix = TileMatrixSets.find(req.query.get('tileMatrix') ?? GoogleTms.identifier);
   if (tileMatrix == null) return new LambdaHttpResponse(400, 'Invalid tile matrix');
   const terrain = req.query.get('terrain') ?? undefined;
+  const labels = Boolean(req.query.get('labels') ?? false);
 
   // Get style Config from db
   const config = await ConfigLoader.load(req);
   const dbId = config.Style.id(styleName);
   const styleConfig = await config.Style.get(dbId);
+
+  req.set('styleConfig', { terrain, labels });
+
   if (styleConfig == null) {
     // Were we given a tileset name instead, generated
     const tileSet = await config.TileSet.get(config.TileSet.id(styleName));
     if (tileSet == null) return NotFound();
     if (tileSet.type !== TileSetType.Raster) return NotFound();
-    if (tileSet.outputs) return await tileSetOutputToStyle(req, tileSet, tileMatrix, apiKey, terrain);
-    else return await tileSetToStyle(req, tileSet, tileMatrix, apiKey, terrain);
+    if (tileSet.outputs) return await tileSetOutputToStyle(req, tileSet, tileMatrix, apiKey, { terrain, labels });
+    else return await tileSetToStyle(req, tileSet, tileMatrix, apiKey, { terrain, labels });
   }
 
   // Prepare sources and add linz source
@@ -277,7 +314,8 @@ export async function styleJsonGet(req: LambdaHttpRequest<StyleGet>): Promise<La
   await ensureTerrain(req, tileMatrix, apiKey, style);
 
   // Add terrain in style
-  if (terrain) setStyleTerrain(style, terrain);
+  if (terrain) setStyleTerrain(style, terrain, tileMatrix);
+  if (labels) await setStyleLabels(req, style);
 
   const data = Buffer.from(JSON.stringify(style));
 

package/src/routes/tile.xyz.raster.ts

@@ -109,7 +109,6 @@ export const TileXyzRaster = {
     }
 
     // Remove with typescript >=5.5.0
-
     return (await Promise.all(toLoad)).filter((f) => f != null);
   },
 

package/src/util/__test__/cache.test.ts

@@ -0,0 +1,36 @@
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+
+import { fsa, FsMemory } from '@chunkd/fs';
+
+import { SourceCache } from '../source.cache.js';
+
+describe('CoSourceCache', () => {
+  it('should not exit if a promise rejection happens for tiff', async () => {
+    const cache = new SourceCache(5);
+
+    const mem = new FsMemory();
+    const tiffLoc = new URL('memory://foo/bar.tiff');
+    await mem.write(tiffLoc, Buffer.from('ABC123'));
+    fsa.register('memory://', mem);
+
+    let failCount = 0;
+    await cache.getCog(tiffLoc).catch(() => failCount++);
+    assert.equal(cache.cache.currentSize, 0);
+    assert.equal(failCount, 1);
+  });
+
+  it('should not exit if a promise rejection happens for tar', async () => {
+    const cache = new SourceCache(5);
+
+    const mem = new FsMemory();
+    const tiffLoc = new URL('memory://foo/bar.tar');
+    await mem.write(tiffLoc, Buffer.from('ABC123'));
+    fsa.register('memory://', mem);
+
+    let failCount = 0;
+    await cache.getCotar(tiffLoc).catch(() => failCount++);
+    assert.equal(cache.cache.currentSize, 0);
+    assert.equal(failCount, 1);
+  });
+});

package/src/util/source.cache.ts

@@ -7,54 +7,44 @@ export type LruStrut = LruStrutCotar | LruStrutCog;
 export interface LruStrutCotar {
   type: 'cotar';
   value: Promise<Cotar>;
-  _value?: Cotar;
+  size: number;
 }
 
 export interface LruStrutCog {
   type: 'cog';
   value: Promise<Tiff>;
-  _value?: Tiff;
-}
-
-class LruStrutObj<T extends LruStrut> {
-  ob: T;
-  constructor(ob: T) {
-    this.ob = ob;
-    if (this.ob._value == null) {
-      void this.ob.value.then((c) => (this.ob._value = c));
-    }
-  }
-
-  size = 1;
+  size: number;
 }
 
 export class SourceCache {
-  cache: SwappingLru<LruStrutObj<LruStrutCotar | LruStrutCog>>;
+  cache: SwappingLru<LruStrut>;
   constructor(maxSize: number) {
-    this.cache = new SwappingLru<LruStrutObj<LruStrut>>(maxSize);
+    this.cache = new SwappingLru<LruStrut>(maxSize);
   }
 
   getCog(location: URL): Promise<Tiff> {
-    const existing = this.cache.get(location.href)?.ob;
+    const existing = this.cache.get(location.href);
 
     if (existing != null) {
       if (existing.type === 'cog') return existing.value;
       throw new Error(`Existing object of type: ${existing.type} made for location: ${location.href}`);
     }
     const value = Tiff.create(fsa.source(location));
-    this.cache.set(location.href, new LruStrutObj({ type: 'cog', value }));
+    this.cache.set(location.href, { type: 'cog', value, size: 1 });
+    value.catch(() => this.cache.delete(location.href));
     return value;
   }
 
   getCotar(location: URL): Promise<Cotar> {
-    const existing = this.cache.get(location.href)?.ob;
+    const existing = this.cache.get(location.href);
 
     if (existing != null) {
       if (existing.type === 'cotar') return existing.value;
       throw new Error(`Existing object of type: ${existing.type} made for location: ${location.href}`);
     }
     const value = Cotar.fromTar(fsa.source(location));
-    this.cache.set(location.href, new LruStrutObj({ type: 'cotar', value }));
+    this.cache.set(location.href, { type: 'cotar', value, size: 1 });
+    value.catch(() => this.cache.delete(location.href));
     return value;
   }
 }

package/src/util/swapping.lru.ts

@@ -41,6 +41,11 @@ export class SwappingLru<T extends { size: number }> {
     this.clears++;
   }
 
+  delete(id: string): void {
+    this.cacheA.delete(id);
+    this.cacheB.delete(id);
+  }
+
   set(id: string, tiff: T): void {
     this.cacheA.set(id, tiff);
     this.check();