feat(lambda-tiler): tiff paths should allow trailing slashes

packages/lambda-tiler/src/__test__/tile.set.cache.test.ts

@@ -66,6 +66,7 @@ o.spec('TileSetCache', () => {
 
       const aTiff = subTileSet.getTiffsForTile({ x: 0, y: 0, z: 0 });
       o(aTiff.length).equals(1);
+      console.log(aTiff[0].source);
       o(aTiff[0].source.uri).equals('s3://foo/bar/foo.tiff');
 
       TileSets.cache.delete(subTileSet.id);

packages/lambda-tiler/src/__test__/tile.set.test.ts

@@ -1,15 +1,8 @@
-import { ConfigImagery } from '@basemaps/config';
 import { GoogleTms, Nztm2000Tms } from '@basemaps/geo';
 import o from 'ospec';
 import { TileSetRaster } from '../tile.set.raster.js';
 
 o.spec('tile.set', () => {
-  o('basePath', () => {
-    const rec = { uri: 's3://test-bucket/3857/aerail/job123' } as ConfigImagery;
-    o(TileSetRaster.basePath(rec)).equals('s3://test-bucket/3857/aerail/job123');
-    o(TileSetRaster.basePath(rec, '31223')).equals('s3://test-bucket/3857/aerail/job123/31223.tiff');
-  });
-
   o('extent', () => {
     o(new TileSetRaster('google', GoogleTms).extent.toBbox()).deepEquals([
       -20037508.3427892, -20037508.3427892, 20037508.3427892, 20037508.3427892,

packages/lambda-tiler/src/tile.set.raster.ts

@@ -35,6 +35,11 @@ export interface TileSetResponse {
 const DefaultResizeKernel = { in: 'lanczos3', out: 'lanczos3' } as const;
 const DefaultBackground = { r: 0, g: 0, b: 0, alpha: 0 };
 
+export function getTiffName(name: string): string {
+  if (name.endsWith('.tif') || name.endsWith('.tiff')) return name;
+  return `${name}.tiff`;
+}
+
 export class TileSetRaster {
   type: TileSetType.Raster = TileSetType.Raster;
 
@@ -46,17 +51,6 @@ export class TileSetRaster {
   components: TileSetNameComponents;
   tileSet: ConfigTileSetRaster;
 
-  /**
-   * Return the location of a imagery `record`
-   * @param record
-   * @param name the COG to locate. Return just the directory if `null`
-   */
-  static basePath(record: ConfigImagery, name?: string): string {
-    if (name == null) return record.uri;
-    if (record.uri.endsWith('/')) throw new Error("Invalid uri ending with '/' " + record.uri);
-    return `${record.uri}/${name}.tiff`;
-  }
-
   constructor(name: string, tileMatrix: TileMatrixSet) {
     this.components = TileSetNameParser.parse(name);
     this.tileMatrix = tileMatrix;
@@ -180,18 +174,18 @@ export class TileSetRaster {
     const output: CogTiff[] = [];
     for (const c of record.files) {
       if (!tileBounds.intersects(Bounds.fromJson(c))) continue;
+      const tiffPath = fsa.join(record.uri, getTiffName(c.name));
 
-      const tiffKey = `${record.id}_${c.name}`;
-      let existing = TiffCache.get(tiffKey);
+      let existing = TiffCache.get(tiffPath);
       if (existing == null) {
-        const source = fsa.source(TileSetRaster.basePath(record, c.name));
+        const source = fsa.source(tiffPath);
         if (source == null) {
-          throw new Error(`Failed to create CogSource from  ${TileSetRaster.basePath(record, c.name)}`);
+          throw new Error(`Failed to create CogSource from  ${tiffPath}`);
         }
 
         St.trace(source);
         existing = new CogTiff(source);
-        TiffCache.set(tiffKey, existing);
+        TiffCache.set(tiffPath, existing);
       }
 
       output.push(existing);