@basemaps/lambda-tiler 7.4.0 → 7.6.0

package/src/util/__test__/config.loader.test.ts

@@ -42,11 +42,11 @@ describe('ConfigLoader', () => {
       mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=notapath`, Api.header),
     )
       .then(() => null)
-      .catch((e) => e);
+      .catch((e) => e as LambdaHttpResponse);
 
     assert.equal(error instanceof LambdaHttpResponse, true);
-    assert.equal((error as LambdaHttpResponse).status, 400);
-    assert.equal((error as LambdaHttpResponse).statusDescription, 'Invalid configuration location protocol:file:');
+    assert.equal(error?.status, 400);
+    assert.equal(error?.statusDescription, 'Invalid configuration location protocol:file:');
   });
 
   it('should Not working with wrong protocol', async () => {
@@ -54,11 +54,11 @@ describe('ConfigLoader', () => {
       mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=memory1://linz-basemaps/config`, Api.header),
     )
       .then(() => null)
-      .catch((e) => e);
+      .catch((e) => e as LambdaHttpResponse);
 
     assert.equal(error instanceof LambdaHttpResponse, true);
-    assert.equal((error as LambdaHttpResponse).status, 400);
-    assert.equal((error as LambdaHttpResponse).statusDescription, 'Invalid configuration location protocol:memory1:');
+    assert.equal(error?.status, 400);
+    assert.equal(error?.statusDescription, 'Invalid configuration location protocol:memory1:');
   });
 
   it('should Not working with wrong s3 bucket', async () => {
@@ -66,28 +66,25 @@ describe('ConfigLoader', () => {
       mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=s3://wrong-bucket/config`, Api.header),
     )
       .then(() => null)
-      .catch((e) => e);
+      .catch((e) => e as LambdaHttpResponse);
 
     assert.equal(error instanceof LambdaHttpResponse, true);
-    assert.equal((error as LambdaHttpResponse).status, 400);
-    assert.equal(
-      (error as LambdaHttpResponse).statusDescription,
-      'Bucket: "wrong-bucket" is not a allowed bucket location',
-    );
+    assert.equal(error?.status, 400);
+    assert.equal(error?.statusDescription, 'Bucket: "wrong-bucket" is not a allowed bucket location');
   });
 
   const location = new URL('memory://linz-basemaps/config.json');
 
   it('should Not working with no file in the path', async () => {
     const error = await ConfigLoader.load(
-      mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=${location}`, Api.header),
+      mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=${location.href}`, Api.header),
     )
       .then(() => null)
-      .catch((e) => e);
+      .catch((e) => e as LambdaHttpResponse);
 
     assert.equal(error instanceof LambdaHttpResponse, true);
-    assert.equal((error as LambdaHttpResponse).status, 400);
-    assert.equal((error as LambdaHttpResponse).statusDescription, `Invalid config location at ${location}`);
+    assert.equal(error?.status, 400);
+    assert.equal(error?.statusDescription, `Invalid config location at ${location.href}`);
   });
 
   it('should get expected config file', async () => {
@@ -96,7 +93,7 @@ describe('ConfigLoader', () => {
     await fsa.write(location, Buffer.from(JSON.stringify(expectedConfig.toJson())));
 
     const provider = await ConfigLoader.load(
-      mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=${location}`, Api.header),
+      mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=${location.href}`, Api.header),
     );
 
     assert.deepEqual(await provider.Imagery.get('aerial'), await expectedConfig.Imagery.get('aerial'));
@@ -124,10 +121,10 @@ describe('ConfigLoader', () => {
       mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=${deletedLocation}`, Api.header),
     )
       .then(() => null)
-      .catch((e) => e);
+      .catch((e) => e as LambdaHttpResponse);
 
     assert.equal(error instanceof LambdaHttpResponse, true);
-    assert.equal((error as LambdaHttpResponse).status, 400);
-    assert.equal((error as LambdaHttpResponse).statusDescription, `Invalid config location at ${deletedLocation}`);
+    assert.equal(error?.status, 400);
+    assert.equal(error?.statusDescription, `Invalid config location at ${deletedLocation}`);
   });
 });

package/src/util/config.cache.ts

@@ -1,5 +1,6 @@
 import { ConfigBundled, ConfigProviderMemory } from '@basemaps/config';
 import { fsa } from '@basemaps/shared';
+import { FsError } from '@chunkd/fs';
 
 import { SwappingLru } from './swapping.lru.js';
 
@@ -15,7 +16,7 @@ class LruConfig {
         return configProvider;
       })
       .catch((e) => {
-        if (e.code === 404) return null;
+        if ((e as FsError).code === 404) return null;
         throw e;
       });
   }

package/src/util/source.cache.ts

@@ -20,7 +20,9 @@ class LruStrutObj<T extends LruStrut> {
   ob: T;
   constructor(ob: T) {
     this.ob = ob;
-    if (this.ob._value == null) this.ob.value.then((c) => (this.ob._value = c));
+    if (this.ob._value == null) {
+      void this.ob.value.then((c) => (this.ob._value = c));
+    }
   }
 
   size = 1;
@@ -37,7 +39,7 @@ export class SourceCache {
 
     if (existing != null) {
       if (existing.type === 'cog') return existing.value;
-      throw new Error(`Existing object of type: ${existing.type} made for location: ${location}`);
+      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 }));
@@ -48,8 +50,8 @@ export class SourceCache {
     const existing = this.cache.get(location.href)?.ob;
 
     if (existing != null) {
-      if (existing.type === 'cotar') return existing.value as Promise<Cotar>;
-      throw new Error(`Existing object of type: ${existing.type} made for location: ${location}`);
+      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 }));

package/src/util/validate.ts

@@ -138,7 +138,7 @@ export const Validate = {
     }
     // If the tileset has pipelines defined the user MUST specify which one
     if (tileSet.outputs) {
-      throw new LambdaHttpResponse(404, 'TileSet needs pipeline: ' + tileSet.outputs.map((f) => f.name));
+      throw new LambdaHttpResponse(404, 'TileSet needs pipeline: ' + tileSet.outputs.map((f) => f.name).join(', '));
     }
 
     // Generate a default RGBA configuration

package/src/wmts.capability.ts

@@ -38,14 +38,15 @@ export interface WmtsBuilderParams {
   apiKey?: string;
   /** Config location */
   config?: string | null;
-  /** Specific DateRange filter for the wmts layers */
-  filters?: Record<string, string | undefined>;
+  /** Default pipeline to use */
+  pipeline?: string;
 }
 
 export class WmtsBuilder {
   httpBase: string;
   apiKey?: string;
   config?: string | null;
+  pipeline?: string;
   filters?: Record<string, string | undefined>;
 
   /** All the imagery used by the tileSet and tileMatrixes */
@@ -58,7 +59,7 @@ export class WmtsBuilder {
     this.httpBase = params.httpBase;
     this.apiKey = params.apiKey;
     this.config = params.config;
-    this.filters = params.filters;
+    this.pipeline = params.pipeline;
   }
 
   addImagery(...imagery: ConfigImagery[]): void {
@@ -153,17 +154,17 @@ export class WmtsBuilder {
     return V('Style', { isDefault: 'true' }, [V('ows:Title', 'Default Style'), V('ows:Identifier', 'default')]);
   }
 
-  buildResourceUrl(tileSetId: string, suffix: string, addFilter = false): VNodeElement {
+  buildResourceUrl(tileSetId: string, suffix: string): VNodeElement {
     return V('ResourceURL', {
       format: 'image/' + suffix,
       resourceType: 'tile',
-      template: this.buildTileUrl(tileSetId, suffix, addFilter),
+      template: this.buildTileUrl(tileSetId, suffix),
     });
   }
 
-  buildTileUrl(tileSetId: string, suffix: string, addFilter = false): string {
-    let query = { api: this.apiKey, config: this.config };
-    if (addFilter) query = { api: this.apiKey, config: this.config, ...this.filters };
+  buildTileUrl(tileSetId: string, suffix: string): string {
+    // TODO this should restrict the output formats to supported formats in pipelines
+    const query = { api: this.apiKey, config: this.config, pipeline: this.pipeline };
 
     return [
       this.httpBase,
@@ -239,6 +240,8 @@ export interface WmtsCapabilitiesParams {
   formats: ImageFormat[];
   /** Specific layers to add to the WMTS */
   layers?: ConfigLayer[];
+  /** Default output pipeline to use */
+  pipeline?: string | null;
 }
 
 /**
@@ -277,6 +280,10 @@ export class WmtsCapabilities extends WmtsBuilder {
     this.provider = provider;
   }
 
+  addPipeline(pipeline: string): void {
+    this.pipeline = pipeline;
+  }
+
   toProviderVNode(provider?: WmtsProvider): VNodeElement[] | [] {
     if (provider == null) return [];
     const { serviceIdentification, serviceProvider } = provider;
@@ -338,7 +345,7 @@ export class WmtsCapabilities extends WmtsBuilder {
       this.buildStyle(),
       ...this.buildFormats(),
       ...this.buildTileMatrixLink(tileSet),
-      ...this.getFormats().map((fmt) => this.buildResourceUrl(layerNameId, fmt, true)),
+      ...this.getFormats().map((fmt) => this.buildResourceUrl(layerNameId, fmt)),
     ]);
   }
 
@@ -408,5 +415,6 @@ export class WmtsCapabilities extends WmtsBuilder {
     this.addTileSet(params.tileSet);
     this.addLayers(params.layers);
     this.addProvider(params.provider);
+    if (params.pipeline) this.addPipeline(params.pipeline);
   }
 }

package/tsconfig.json

@@ -1,17 +1,17 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "rootDir": "./src",
-    "outDir": "./build"
+    "outDir": "./build",
+    "rootDir": "./src"
   },
-  "include": ["src/**/*"],
+  "include": ["src"],
   "references": [
-    { "path": "../config" },
-    { "path": "../config-loader/" },
-    { "path": "../shared" },
-    { "path": "../geo" },
-    { "path": "../tiler" },
-    { "path": "../tiler-sharp" },
-    { "path": "../attribution" }
+    { "path": "../config/tsconfig.json" },
+    { "path": "../config-loader/tsconfig.json" },
+    { "path": "../shared/tsconfig.json" },
+    { "path": "../geo/tsconfig.json" },
+    { "path": "../tiler/tsconfig.json" },
+    { "path": "../tiler-sharp/tsconfig.json" },
+    { "path": "../attribution/tsconfig.json" }
   ]
 }