@basemaps/lambda-tiler 6.39.0 → 6.40.0

package/src/__tests__/config.data.ts

@@ -78,7 +78,148 @@ export const Imagery3857: ConfigImagery = {
     width: 51977.179234057665,
     height: 30574.81131407339,
   },
-  files: [],
+  files: [
+    {
+      x: 19461478.89763212,
+      y: -4591419.415033963,
+      width: 305.7481131407044,
+      height: 305.7481131407044,
+      name: '17-129188-80552',
+    },
+    {
+      x: 19502754.89290612,
+      y: -4603343.591446448,
+      width: 305.7481131407044,
+      height: 305.7481131407044,
+      name: '17-129323-80591',
+    },
+    {
+      x: 19504283.633471873,
+      y: -4608847.057483015,
+      width: 611.4962262814096,
+      height: 611.4962262814096,
+      name: '16-64664-40304',
+    },
+    {
+      x: 19509175.60328212,
+      y: -4605178.080125325,
+      width: 611.4962262814096,
+      height: 611.4962262814096,
+      name: '16-64672-40298',
+    },
+    {
+      x: 19509175.60328212,
+      y: -4604566.583899044,
+      width: 611.4962262814096,
+      height: 611.4962262814096,
+      name: '16-64672-40297',
+    },
+    {
+      x: 19459032.912726905,
+      y: -4582552.719752827,
+      width: 1222.9924525628148,
+      height: 1222.9924525628148,
+      name: '15-32295-20130',
+    },
+    {
+      x: 19460255.905179467,
+      y: -4592336.659373329,
+      width: 1222.9924525628148,
+      height: 1222.9924525628148,
+      name: '15-32296-20138',
+    },
+    {
+      x: 19501837.648566607,
+      y: -4609458.55370921,
+      width: 1222.9924525628148,
+      height: 1222.9924525628148,
+      name: '15-32330-20152',
+    },
+    {
+      x: 19503060.64101917,
+      y: -4609458.55370921,
+      width: 1222.9924525628148,
+      height: 1222.9924525628148,
+      name: '15-32331-20152',
+    },
+    {
+      x: 19503060.64101917,
+      y: -4603343.591446393,
+      width: 1222.9924525628148,
+      height: 1222.9924525628148,
+      name: '15-32331-20147',
+    },
+    {
+      x: 19457809.920274343,
+      y: -4593559.651825892,
+      width: 2445.9849051256297,
+      height: 2445.9849051256297,
+      name: '14-16147-10069',
+    },
+    {
+      x: 19457809.920274343,
+      y: -4591113.666920764,
+      width: 2445.9849051256297,
+      height: 2445.9849051256297,
+      name: '14-16147-10068',
+    },
+    {
+      x: 19457809.920274343,
+      y: -4588667.682015641,
+      width: 2445.9849051256297,
+      height: 2445.9849051256297,
+      name: '14-16147-10067',
+    },
+    {
+      x: 19457809.920274343,
+      y: -4581329.727300262,
+      width: 2445.9849051256297,
+      height: 2445.9849051256297,
+      name: '14-16147-10064',
+    },
+    {
+      x: 19460255.905179467,
+      y: -4591113.666920764,
+      width: 2445.9849051256297,
+      height: 2445.9849051256297,
+      name: '14-16148-10068',
+    },
+    {
+      x: 19460255.905179586,
+      y: -4588667.682015713,
+      width: 4891.969810251274,
+      height: 4891.969810251274,
+      name: '13-8074-5033',
+    },
+    {
+      x: 19460255.905179586,
+      y: -4583775.712205462,
+      width: 4891.969810251274,
+      height: 4891.969810251274,
+      name: '13-8074-5032',
+    },
+    {
+      x: 19499391.663661595,
+      y: -4608235.561256718,
+      width: 4891.969810251274,
+      height: 4891.969810251274,
+      name: '13-8082-5037',
+    },
+    {
+      x: 19504283.63347185,
+      y: -4608235.561256718,
+      width: 4891.969810251274,
+      height: 4891.969810251274,
+      name: '13-8083-5037',
+    },
+    {
+      x: 19504283.63347185,
+      y: -4603343.591446467,
+      width: 4891.969810251274,
+      height: 4891.969810251274,
+      name: '13-8083-5036',
+    },
+  ],
 };
 
 export const Provider: ConfigProvider = {

package/src/__tests__/wmts.capability.test.ts

@@ -30,7 +30,6 @@ o.spec('WmtsCapabilities', () => {
       imagery: allImagery,
       apiKey,
       formats: [ImageFormat.Avif],
-      isIndividualLayers: false,
     }).toVNode();
 
     const urls = tags(wmts, 'ResourceURL');
@@ -51,7 +50,6 @@ o.spec('WmtsCapabilities', () => {
       apiKey,
       config: 's3://linz-basemaps/config.json',
       formats: [ImageFormat.Avif],
-      isIndividualLayers: false,
     }).toVNode();
 
     const urls = tags(wmts, 'ResourceURL');
@@ -71,7 +69,6 @@ o.spec('WmtsCapabilities', () => {
       imagery: allImagery,
       apiKey,
       formats: [ImageFormat.Avif],
-      isIndividualLayers: false,
     }).toXml();
 
     o(xml.split('\n')[0]).deepEquals('<?xml version="1.0" encoding="utf-8"?>');
@@ -90,7 +87,6 @@ o.spec('WmtsCapabilities', () => {
       imagery: allImagery,
       apiKey,
       formats: [ImageFormat.Avif],
-      isIndividualLayers: false,
     }).toVNode();
 
     const urls = tags(wmts, 'ResourceURL');
@@ -142,7 +138,7 @@ o.spec('WmtsCapabilities', () => {
       tileSet,
       imagery,
       apiKey,
-      isIndividualLayers: true,
+      layers: tileSet.layers,
     }).toVNode();
 
     const layers = tags(wmts, 'Layer').map((c) => c.find('ows:Title')?.textContent);
@@ -161,7 +157,6 @@ o.spec('WmtsCapabilities', () => {
       tileSet: TileSetAerial,
       imagery,
       apiKey,
-      isIndividualLayers: false,
     });
 
     const raw = wmts.toVNode();
@@ -213,7 +208,6 @@ o.spec('WmtsCapabilities', () => {
       tileSet: TileSetAerial,
       imagery: allImagery,
       apiKey,
-      isIndividualLayers: false,
     }).toVNode();
     const layer = raw.find('Contents', 'Layer');
 
@@ -260,7 +254,7 @@ o.spec('WmtsCapabilities', () => {
       tileSet: TileSetAerial,
       imagery: imagery,
       formats: [ImageFormat.Png],
-      isIndividualLayers: true,
+      layers: TileSetAerial.layers,
     }).toVNode();
 
     const tms = raw?.find('TileMatrixSet', 'ows:Identifier');
@@ -299,7 +293,6 @@ o.spec('WmtsCapabilities', () => {
       tileSet: TileSetAerial,
       imagery: imagery,
       formats: [ImageFormat.Png],
-      isIndividualLayers: false,
     }).toVNode();
 
     const layers = tags(raw, 'Layer');
@@ -361,7 +354,7 @@ o.spec('WmtsCapabilities', () => {
       tileSet: TileSetAerial,
       imagery: imagery,
       formats: [ImageFormat.Png],
-      isIndividualLayers: true,
+      layers: TileSetAerial.layers,
     }).toVNode();
 
     const layers = tags(raw, 'Layer');
@@ -375,7 +368,7 @@ o.spec('WmtsCapabilities', () => {
       tileSet: TileSetAerial,
       imagery: imagery,
       formats: [ImageFormat.Png],
-      isIndividualLayers: true,
+      layers: TileSetAerial.layers,
     }).toVNode();
 
     const layersB = tags(rawB, 'Layer');
@@ -397,8 +390,8 @@ o.spec('WmtsCapabilities', () => {
 
     const tileSet = { ...TileSetAerial };
     tileSet.layers = [
-      { 3857: imageTopLeft.id, name: 'a_top_left' },
-      { 3857: imageBottomRight.id, name: 'b_bottom_right' },
+      { 3857: imageTopLeft.id, name: 'a_top_left', title: 'A Top Left' },
+      { 3857: imageBottomRight.id, name: 'b_bottom_right', title: 'B Bottom Right' },
     ];
 
     const raw = new WmtsCapabilities({
@@ -408,7 +401,7 @@ o.spec('WmtsCapabilities', () => {
       tileSet,
       imagery,
       formats: [ImageFormat.Png],
-      isIndividualLayers: true,
+      layers: tileSet.layers,
     }).toVNode();
 
     const boundingBox = tags(raw, 'ows:WGS84BoundingBox').map((c) =>
@@ -438,7 +431,7 @@ o.spec('WmtsCapabilities', () => {
     imagery.set(imageBottomRight.id, imageBottomRight);
 
     const tileSet = { ...TileSetAerial };
-    tileSet.layers = [{ 3857: imageBottomRight.id, name: 'b_bottom_right' }];
+    tileSet.layers = [{ 3857: imageBottomRight.id, name: 'b_bottom_right', title: 'B Bottom Right' }];
 
     const raw = new WmtsCapabilities({
       httpBase: 'https://basemaps.test',
@@ -447,7 +440,7 @@ o.spec('WmtsCapabilities', () => {
       tileSet,
       imagery,
       formats: [ImageFormat.Png],
-      isIndividualLayers: true,
+      layers: tileSet.layers,
     }).toVNode();
 
     const boundingBox = tags(raw, 'ows:WGS84BoundingBox').map((c) =>

package/src/__tests__/xyz.util.ts

@@ -3,6 +3,8 @@ import { LambdaAlbRequest, LambdaHttpRequest, LambdaUrlRequest } from '@linzjs/l
 import { Context } from 'aws-lambda';
 
 export function mockRequest(path: string, method = 'get', headers: Record<string, string> = {}): LambdaHttpRequest {
+  const log = LogConfig.get();
+  log.level = 'silent';
   return new LambdaAlbRequest(
     {
       requestContext: null as any,
@@ -13,7 +15,7 @@ export function mockRequest(path: string, method = 'get', headers: Record<string
       isBase64Encoded: false,
     },
     {} as Context,
-    LogConfig.get(),
+    log,
   );
 }
 
@@ -23,6 +25,8 @@ export function mockUrlRequest(
   headers: Record<string, unknown> = {},
   method?: string,
 ): LambdaHttpRequest {
+  const log = LogConfig.get();
+  log.level = 'silent';
   return new LambdaUrlRequest(
     {
       requestContext: { http: { method: method ? method.toUpperCase() : 'GET' } },
@@ -32,7 +36,7 @@ export function mockUrlRequest(
       isBase64Encoded: false,
     } as any,
     {} as Context,
-    LogConfig.get(),
+    log,
   );
 }
 

package/src/cli/render.tile.ts

@@ -0,0 +1,38 @@
+import { ConfigProviderMemory } from '@basemaps/config';
+import { initConfigFromPaths } from '@basemaps/config/build/json/tiff.config.js';
+import { ImageFormat, Nztm2000QuadTms } from '@basemaps/geo';
+import { LogConfig, setDefaultConfig } from '@basemaps/shared';
+import { fsa } from '@chunkd/fs';
+import { LambdaHttpRequest, LambdaUrlRequest, UrlEvent } from '@linzjs/lambda';
+import { Context } from 'aws-lambda';
+import { TileXyzRaster } from '../routes/tile.xyz.raster.js';
+
+const target = `/home/blacha/tmp/basemaps`;
+const tile = { z: 18, x: 126359, y: 137603 };
+const tileMatrix = Nztm2000QuadTms;
+
+async function main(): Promise<void> {
+  const log = LogConfig.get();
+  const provider = new ConfigProviderMemory();
+  setDefaultConfig(provider);
+  const { tileSet, imagery } = await initConfigFromPaths(provider, [target]);
+
+  if (tileSet.layers.length === 0) throw new Error('No imagery found in path: ' + target);
+  log.info({ tileSet: tileSet.name, layers: tileSet.layers.length }, 'TileSet:Loaded');
+  for (const im of imagery) {
+    log.info({ imagery: im.uri, title: im.title, tileMatrix: im.tileMatrix, files: im.files.length }, 'Imagery:Loaded');
+  }
+  const request = new LambdaUrlRequest({ headers: {} } as UrlEvent, {} as Context, log) as LambdaHttpRequest;
+
+  const res = await TileXyzRaster.tile(request, tileSet, {
+    tile,
+    tileMatrix,
+    tileSet: tileSet.id,
+    tileType: ImageFormat.Png,
+  });
+
+  await fsa.write(`./${tile.z}_${tile.x}_${tile.y}.png`, Buffer.from(res.body, 'base64'));
+  log.info({ path: `./${tile.z}_${tile.x}_${tile.y}.png` }, 'Tile:Write');
+}
+
+main();

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

@@ -1,7 +1,8 @@
 import { Attribution } from '@basemaps/attribution';
 import { ConfigProviderMemory } from '@basemaps/config';
-import { Nztm2000QuadTms } from '@basemaps/geo';
-import { LogConfig } from '@basemaps/shared';
+import { GoogleTms, Nztm2000QuadTms } from '@basemaps/geo';
+import { LogConfig, Projection } from '@basemaps/shared';
+import { BBox } from '@linzjs/geojson';
 import { HttpHeader } from '@linzjs/lambda';
 import o from 'ospec';
 import sinon from 'sinon';
@@ -9,6 +10,7 @@ import { handler } from '../../index.js';
 import { ConfigLoader } from '../../util/config.loader.js';
 import { FakeData, Imagery2193, Imagery3857, Provider, TileSetAerial } from '../../__tests__/config.data.js';
 import { mockUrlRequest } from '../../__tests__/xyz.util.js';
+import { createCoordinates } from '../attribution.js';
 
 // const ExpectedJson = {
 //   id: 'aerial_WebMercatorQuad',
@@ -332,7 +334,7 @@ o.spec('/v1/attribution', () => {
   });
 
   o.spec('ImageryRules', () => {
-    const fakeLayer = { [2193]: Imagery2193.id, name: 'image', minZoom: 9, maxZoom: 16 };
+    const fakeLayer = { [2193]: Imagery2193.id, name: 'image', minZoom: 9, maxZoom: 16, title: 'Image' };
     const ts = FakeData.tileSetRaster('fake');
 
     o.beforeEach(() => {
@@ -387,4 +389,64 @@ o.spec('/v1/attribution', () => {
       o(output.collections[0].summaries['linz:zoom']).deepEquals({ min: 0, max: Nztm2000QuadTms.maxZoom });
     });
   });
+
+  o('should create valid coordinates', async () => {
+    //bbox: BBox, files: NamedBounds[], proj: Projection
+    const bbox = [174.79248047, -38.21228805, 175.25939941, -37.99616268] as BBox;
+    const proj = Projection.get(GoogleTms);
+    const coordinates = createCoordinates(bbox, Imagery3857.files, proj);
+    console.log(JSON.stringify(coordinates));
+    o(coordinates).deepEquals([
+      [
+        [
+          [174.79247149, -38.09998972],
+          [174.81446211, -38.09998972],
+          [174.81446211, -38.09134368],
+          [174.82544844, -38.09134368],
+          [174.82544844, -38.08485848],
+          [174.82819502, -38.08485848],
+          [174.82819502, -38.08269662],
+          [174.83643476, -38.08269662],
+          [174.83643476, -38.06539942],
+          [174.85840742, -38.06539942],
+          [174.85840742, -37.9961556],
+          [174.81446211, -37.9961556],
+          [174.81446211, -37.9961556],
+          [174.79247149, -37.9961556],
+          [174.79247149, -38.01348331],
+          [174.80345781, -38.01348331],
+          [174.80345781, -38.02213855],
+          [174.81444414, -38.02213855],
+          [174.81444414, -38.04808399],
+          [174.79247149, -38.04808399],
+          [174.79247149, -38.09998972],
+        ],
+      ],
+      [
+        [
+          [175.16600664, -38.20366238],
+          [175.1879793, -38.20366238],
+          [175.1879793, -38.21229511],
+          [175.20996992, -38.21229511],
+          [175.20996992, -38.20797887],
+          [175.21546308, -38.20797887],
+          [175.21546308, -38.20366238],
+          [175.25391523, -38.20366238],
+          [175.25391523, -38.18207606],
+          [175.2594084, -38.18207606],
+          [175.2594084, -38.17342562],
+          [175.25391523, -38.17342562],
+          [175.25391523, -38.13454951],
+          [175.20995195, -38.13454951],
+          [175.20995195, -38.16046922],
+          [175.19896563, -38.16046922],
+          [175.19896563, -38.16694771],
+          [175.19621904, -38.16694771],
+          [175.19621904, -38.16910707],
+          [175.16600664, -38.16910707],
+          [175.16600664, -38.20366238],
+        ],
+      ],
+    ]);
+  });
 });

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

@@ -9,18 +9,11 @@ import { Api, mockUrlRequest } from '../../__tests__/xyz.util.js';
 o.spec('WMTSRouting', () => {
   const sandbox = createSandbox();
   const config = new ConfigProviderMemory();
+  const imagery = new Map();
 
-  o.before(() => {
+  o.beforeEach(() => {
     sandbox.stub(ConfigLoader, 'load').resolves(config);
-  });
 
-  o.afterEach(() => {
-    config.objects.clear();
-    sandbox.restore();
-  });
-
-  o('should default to the aerial layer', async () => {
-    const imagery = new Map();
     imagery.set(Imagery3857.id, Imagery3857);
     imagery.set(Imagery2193.id, Imagery2193);
 
@@ -28,7 +21,14 @@ o.spec('WMTSRouting', () => {
     config.put(Imagery2193);
     config.put(Imagery3857);
     config.put(Provider);
+  });
 
+  o.afterEach(() => {
+    config.objects.clear();
+    sandbox.restore();
+  });
+
+  o('should default to the aerial layer', async () => {
     const req = mockUrlRequest(
       '/v1/tiles/WMTSCapabilities.xml',
       `format=png&api=${Api.key}&config=s3://linz-basemaps/config.json`,
@@ -53,4 +53,65 @@ o.spec('WMTSRouting', () => {
       '<ResourceURL format="image/png" resourceType="tile" template="https://tiles.test/v1/tiles/ōtorohanga-urban-2021-0.1m/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png?api=d01f7w7rnhdzg0p7fyrc9v9ard1&amp;config=Q5pC4UjWdtFLU1CYtLcRSmB49RekgDgMa5EGJnB2M" />',
     ]);
   });
+
+  o('should filter out date[after] by year', async () => {
+    const req = mockUrlRequest(
+      '/v1/tiles/WMTSCapabilities.xml',
+      `format=png&api=${Api.key}&config=s3://linz-basemaps/config.json&date[after]=2022`,
+    );
+    const res = await handler.router.handle(req);
+
+    o(res.status).equals(200);
+    const lines = Buffer.from(res.body, 'base64').toString().split('\n');
+    const titles = lines.filter((f) => f.startsWith('      <ows:Title>')).map((f) => f.trim());
+
+    o(titles).deepEquals([
+      '<ows:Title>Aerial Imagery</ows:Title>',
+      '<ows:Title>Google Maps Compatible for the World</ows:Title>',
+      '<ows:Title>LINZ NZTM2000 Map Tile Grid V2</ows:Title>',
+    ]);
+  });
+
+  o('should filter out date[before] by year', async () => {
+    const req = mockUrlRequest(
+      '/v1/tiles/WMTSCapabilities.xml',
+      `format=png&api=${Api.key}&config=s3://linz-basemaps/config.json&date[before]=2020`,
+    );
+    const res = await handler.router.handle(req);
+
+    o(res.status).equals(200);
+    const lines = Buffer.from(res.body, 'base64').toString().split('\n');
+    const titles = lines.filter((f) => f.startsWith('      <ows:Title>')).map((f) => f.trim());
+
+    o(titles).deepEquals([
+      '<ows:Title>Aerial Imagery</ows:Title>',
+      '<ows:Title>Google Maps Compatible for the World</ows:Title>',
+      '<ows:Title>LINZ NZTM2000 Map Tile Grid V2</ows:Title>',
+    ]);
+  });
+
+  o('should filter inclusive date[before] by year', async () => {
+    const req = mockUrlRequest(
+      '/v1/tiles/WMTSCapabilities.xml',
+      `format=png&api=${Api.key}&config=s3://linz-basemaps/config.json&date[before]=2021`,
+    );
+    const res = await handler.router.handle(req);
+
+    o(res.status).equals(200);
+    const lines = Buffer.from(res.body, 'base64').toString().split('\n');
+    const titles = lines.filter((f) => f.startsWith('      <ows:Title>')).map((f) => f.trim());
+
+    o(titles).deepEquals([
+      '<ows:Title>Aerial Imagery</ows:Title>',
+      '<ows:Title>Ōtorohanga 0.1m Urban Aerial Photos (2021)</ows:Title>',
+      '<ows:Title>Google Maps Compatible for the World</ows:Title>',
+      '<ows:Title>LINZ NZTM2000 Map Tile Grid V2</ows:Title>',
+    ]);
+
+    const resourceURLs = lines.filter((f) => f.includes('<ResourceURL')).map((f) => f.trim());
+    o(resourceURLs).deepEquals([
+      '<ResourceURL format="image/png" resourceType="tile" template="https://tiles.test/v1/tiles/aerial/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png?api=d01f7w7rnhdzg0p7fyrc9v9ard1&amp;config=Q5pC4UjWdtFLU1CYtLcRSmB49RekgDgMa5EGJnB2M&amp;date%5Bbefore%5D=2021" />',
+      '<ResourceURL format="image/png" resourceType="tile" template="https://tiles.test/v1/tiles/ōtorohanga-urban-2021-0.1m/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png?api=d01f7w7rnhdzg0p7fyrc9v9ard1&amp;config=Q5pC4UjWdtFLU1CYtLcRSmB49RekgDgMa5EGJnB2M" />',
+    ]);
+  });
 });

package/src/routes/attribution.ts

@@ -11,12 +11,13 @@ import {
   StacProvider,
   TileMatrixSet,
 } from '@basemaps/geo';
-import { extractYearRangeFromName, Projection, titleizeImageryName } from '@basemaps/shared';
+import { extractYearRangeFromName, extractYearRangeFromTitle, Projection } from '@basemaps/shared';
 import { BBox, MultiPolygon, multiPolygonToWgs84, Pair, union, Wgs84 } from '@linzjs/geojson';
 import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { ConfigLoader } from '../util/config.loader.js';
 
 import { Etag } from '../util/etag.js';
+import { filterLayers, yearRangeToInterval } from '../util/filter.js';
 import { NotFound, NotModified } from '../util/response.js';
 import { Validate } from '../util/validate.js';
 
@@ -44,23 +45,19 @@ function roundPair(p: Pair): Pair {
  * @param files in target projection
  * @return MultiPolygon in WGS84
  */
-function createCoordinates(bbox: BBox, files: NamedBounds[], proj: Projection): MultiPolygon {
+export function createCoordinates(bbox: BBox, files: NamedBounds[], proj: Projection): MultiPolygon {
   if (Wgs84.delta(bbox[0], bbox[2]) <= 0) {
     // This bounds spans more than half the globe which multiPolygonToWgs84 can't handle; just
     // return bbox as polygon
     return Wgs84.bboxToMultiPolygon(bbox);
   }
 
-  let coordinates: MultiPolygon = [];
-
+  const polygons: MultiPolygon = [];
   // merge imagery bounds
-  for (const image of files) {
-    const poly = [Bounds.fromJson(image).pad(SmoothPadding).toPolygon()] as MultiPolygon;
-    coordinates = union(coordinates, poly);
-  }
+  for (const image of files) polygons.push(Bounds.fromJson(image).pad(SmoothPadding).toPolygon());
+  const coordinates = union(polygons);
 
   const roundToWgs84 = (p: number[]): number[] => roundPair(proj.toWgs84(p) as Pair);
-
   return multiPolygonToWgs84(coordinates, roundToWgs84);
 }
 
@@ -86,30 +83,23 @@ async function tileSetAttribution(
 
   const config = await ConfigLoader.load(req);
   const imagery = await getAllImagery(config, tileSet.layers, [tileMatrix.projection]);
+  const filteredLayers = filterLayers(req, tileSet.layers);
 
   const host = await config.Provider.get(config.Provider.id('linz'));
 
-  for (const layer of tileSet.layers) {
+  for (const layer of filteredLayers) {
+    if (layer.disabled) continue;
     const imgId = layer[proj.epsg.code];
     if (imgId == null) continue;
     const im = imagery.get(imgId);
     if (im == null) continue;
+    const title = im.title;
 
     const bbox = proj.boundsToWgs84BoundingBox(im.bounds).map(roundNumber) as BBox;
 
-    const years = extractYearRangeFromName(im.name);
-    if (years[0] === -1) {
-      req.log.debug({ imagery: im.name }, 'Attribution:DefaultYear');
-      // Put it in the future so people know its a "fake" date
-      years[0] = new Date().getUTCFullYear() + 1;
-      years[1] = years[0] + 1;
-    }
-
-    const interval = [years.map((y) => `${y}-01-01T00:00:00Z`) as [string, string]];
-
-    const extent: StacExtent = { spatial: { bbox: [bbox] }, temporal: { interval } };
+    const extent: StacExtent = { spatial: { bbox: [bbox] } };
 
-    items.push({
+    const item: AttributionItem = {
       type: 'Feature',
       stac_version: Stac.Version,
       id: imgId + '_item',
@@ -119,13 +109,19 @@ async function tileSetAttribution(
       bbox,
       geometry: { type: 'MultiPolygon', coordinates: createCoordinates(bbox, im.files, proj) },
       properties: {
-        title: im.title ?? titleizeImageryName(im.name),
+        title,
         category: im.category,
-        datetime: null,
-        start_datetime: interval[0][0],
-        end_datetime: interval[0][1],
       },
-    });
+    };
+    const years = extractYearRangeFromTitle(im.title) ?? extractYearRangeFromName(im.name);
+    if (years) {
+      const interval = yearRangeToInterval(years);
+      extent.temporal = { interval: [[interval[0].toISOString(), interval[1].toISOString()]] };
+      item.properties.datetime = null;
+      item.properties.start_datetime = interval[0].toISOString();
+      item.properties.end_datetime = interval[1].toISOString();
+    }
+    items.push(item);
 
     const zoomMin = TileMatrixSet.convertZoomLevel(layer.minZoom ? layer.minZoom : 0, GoogleTms, tileMatrix, true);
     const zoomMax = TileMatrixSet.convertZoomLevel(layer.maxZoom ? layer.maxZoom : 32, GoogleTms, tileMatrix, true);
@@ -134,7 +130,7 @@ async function tileSetAttribution(
       license: Stac.License,
       id: im.id,
       providers: getHost(host),
-      title: im.title ?? titleizeImageryName(im.name),
+      title,
       description: 'No description',
       extent,
       links: [],

package/src/routes/tile.json.ts

@@ -2,6 +2,7 @@ import { GoogleTms, TileJson, TileMatrixSet } from '@basemaps/geo';
 import { Env, toQueryString } from '@basemaps/shared';
 import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { ConfigLoader } from '../util/config.loader.js';
+import { getFilters } from '../util/filter.js';
 import { NotFound } from '../util/response.js';
 import { Validate } from '../util/validate.js';
 
@@ -31,7 +32,7 @@ export async function tileJsonGet(req: LambdaHttpRequest<TileJsonGet>): Promise<
 
   const configLocation = ConfigLoader.extract(req);
 
-  const query = toQueryString({ api: apiKey, config: configLocation });
+  const query = toQueryString({ api: apiKey, config: configLocation, ...getFilters(req) });
 
   const tileUrl =
     [host, 'v1', 'tiles', tileSet.name, tileMatrix.identifier, '{z}', '{x}', '{y}'].join('/') + `.${format[0]}${query}`;

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

@@ -8,6 +8,7 @@ import { Validate } from '../util/validate.js';
 import { Etag } from '../util/etag.js';
 import { ConfigLoader } from '../util/config.loader.js';
 import { GoogleTms, ImageFormat, TileMatrixSets } from '@basemaps/geo';
+import { getFilters } from '../util/filter.js';
 
 /**
  * Convert relative URLS into a full hostname url
@@ -73,7 +74,7 @@ export async function tileSetToStyle(
   if (tileFormat == null) return new LambdaHttpResponse(400, 'Invalid image format');
 
   const configLocation = ConfigLoader.extract(req);
-  const query = toQueryString({ config: configLocation, api: apiKey });
+  const query = toQueryString({ config: configLocation, api: apiKey, ...getFilters(req) });
 
   const tileUrl = fsa.join(
     Env.get(Env.PublicUrlBase) ?? '',