@basemaps/lambda-tiler 7.1.1 → 7.2.0

package/src/routes/attribution.ts

@@ -18,7 +18,6 @@ import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambd
 
 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';
 
@@ -38,6 +37,16 @@ function roundPair(p: Pair): Pair {
   return [roundNumber(p[0]), roundNumber(p[1])];
 }
 
+/**
+ * Convert the year range into full ISO date year range
+ *
+ * Expand to the full year of jan 1st 00:00 -> Dec 31st 23:59
+ */
+export function yearRangeToInterval(x: [number] | [number, number]): [Date, Date] {
+  if (x.length === 1) return [new Date(`${x[0]}-01-01T00:00:00.000Z`), new Date(`${x[0]}-12-31T23:59:59.999Z`)];
+  return [new Date(`${x[0]}-01-01T00:00:00.000Z`), new Date(`${x[1]}-12-31T23:59:59.999Z`)];
+}
+
 /**
  * Convert a list of COG file bounds into a MultiPolygon. If the bounds spans more than half the
  * globe then return a simple MultiPolygon for the bounding box.
@@ -84,11 +93,10 @@ 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 filteredLayers) {
+  for (const layer of tileSet.layers) {
     const imgId = layer[proj.epsg.code];
     if (imgId == null) continue;
     const im = imagery.get(imgId);

package/src/routes/tile.json.ts

@@ -4,7 +4,6 @@ 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';
 
@@ -39,7 +38,7 @@ export async function tileJsonGet(req: LambdaHttpRequest<TileJsonGet>): Promise<
 
   const configLocation = ConfigLoader.extract(req);
 
-  const query = toQueryString({ api: apiKey, config: configLocation, ...getFilters(req) });
+  const query = toQueryString({ api: apiKey, config: configLocation });
 
   const tileUrl =
     [host, 'v1', 'tiles', tileSet.name, tileMatrix.identifier, '{z}', '{x}', '{y}'].join('/') + `.${format[0]}${query}`;

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

@@ -6,7 +6,6 @@ import { URL } from 'url';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { Etag } from '../util/etag.js';
-import { getFilters } from '../util/filter.js';
 import { NotFound, NotModified } from '../util/response.js';
 import { Validate } from '../util/validate.js';
 
@@ -77,7 +76,7 @@ export async function tileSetToStyle(
   const pipelineName = pipeline?.name === 'rgba' ? undefined : pipeline?.name;
 
   const configLocation = ConfigLoader.extract(req);
-  const query = toQueryString({ config: configLocation, api: apiKey, ...getFilters(req), pipeline: pipelineName });
+  const query = toQueryString({ config: configLocation, api: apiKey, pipeline: pipelineName });
 
   const tileUrl =
     (Env.get(Env.PublicUrlBase) ?? '') +
@@ -111,7 +110,7 @@ export async function tileSetOutputToStyle(
   if (tileMatrix == null) return new LambdaHttpResponse(400, 'Invalid tile matrix');
 
   const configLocation = ConfigLoader.extract(req);
-  const query = toQueryString({ config: configLocation, api: apiKey, ...getFilters(req) });
+  const query = toQueryString({ config: configLocation, api: apiKey });
 
   const styleId = `basemaps-${tileSet.name}`;
   const sources: Sources = {};

package/src/routes/tile.wmts.ts

@@ -6,7 +6,6 @@ import { createHash } from 'crypto';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { Etag } from '../util/etag.js';
-import { filterLayers, getFilters } from '../util/filter.js';
 import { NotFound, NotModified } from '../util/response.js';
 import { Validate } from '../util/validate.js';
 import { WmtsCapabilities } from '../wmts.capability.js';
@@ -44,7 +43,7 @@ export async function wmtsCapabilitiesGet(req: LambdaHttpRequest<WmtsCapabilitie
   req.timer.start('tileset:load');
   const tileSet = await config.TileSet.get(config.TileSet.id(tileSetName ?? 'aerial'));
   req.timer.end('tileset:load');
-  if (tileSet == null || tileSet.type !== TileSetType.Raster) return NotFound();
+  if (tileSet == null || tileSet.type !== TileSetType.Raster) return NotFound('Tileset not found');
 
   const provider = await config.Provider.get(config.Provider.id('linz'));
 
@@ -55,12 +54,12 @@ export async function wmtsCapabilitiesGet(req: LambdaHttpRequest<WmtsCapabilitie
     tileMatrix.map((tms) => tms.projection),
   );
   req.timer.end('imagery:load');
+  if (imagery.size === 0) return NotFound('No layers found for tile set: ' + tileSet.id);
 
   const wmts = new WmtsCapabilities({
     httpBase: host,
     apiKey,
     config: ConfigLoader.extract(req),
-    filters: getFilters(req),
   });
 
   wmts.fromParams({
@@ -69,7 +68,7 @@ export async function wmtsCapabilitiesGet(req: LambdaHttpRequest<WmtsCapabilitie
     tileMatrix,
     imagery,
     formats: Validate.getRequestedFormats(req) ?? [],
-    layers: req.params.tileMatrix == null ? filterLayers(req, tileSet.layers) : undefined,
+    layers: req.params.tileMatrix == null ? tileSet.layers : undefined,
   });
 
   const xml = wmts.toXml();

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

@@ -8,7 +8,6 @@ import pLimit from 'p-limit';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { Etag } from '../util/etag.js';
-import { filterLayers } from '../util/filter.js';
 import { NotFound, NotModified } from '../util/response.js';
 import { CoSources } from '../util/source.cache.js';
 import { TileXyz, Validate } from '../util/validate.js';
@@ -47,13 +46,12 @@ export const TileXyzRaster = {
   ): Promise<URL[]> {
     const config = await ConfigLoader.load(req);
     const imagery = await getAllImagery(config, tileSet.layers, [tileMatrix.projection]);
-    const filteredLayers = filterLayers(req, tileSet.layers);
 
     const output: URL[] = [];
 
     // All zoom level config is stored as Google zoom levels
     const filterZoom = TileMatrixSet.convertZoomLevel(zoom, tileMatrix, TileMatrixSets.get(Epsg.Google));
-    for (const layer of filteredLayers) {
+    for (const layer of tileSet.layers) {
       if (layer.maxZoom != null && filterZoom > layer.maxZoom) continue;
       if (layer.minZoom != null && filterZoom < layer.minZoom) continue;
 
@@ -151,7 +149,7 @@ export const TileXyzRaster = {
     const response = new LambdaHttpResponse(200, 'ok');
     response.header(HttpHeader.ETag, cacheKey);
     response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
-    response.buffer(res.buffer, 'image/' + xyz.tileType);
+    response.buffer(res.buffer, `image/${format}`);
     return response;
   },
 };

package/src/util/response.ts

@@ -1,6 +1,6 @@
 import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 
-export const NotFound = (): LambdaHttpResponse => new LambdaHttpResponse(404, 'Not Found');
+export const NotFound = (msg: string = 'Not Found'): LambdaHttpResponse => new LambdaHttpResponse(404, msg);
 export const NotModified = (): LambdaHttpResponse => new LambdaHttpResponse(304, 'Not modified');
 export const NoContent = (): LambdaHttpResponse => new LambdaHttpResponse(204, 'No Content');
 export const OkResponse = (req: LambdaHttpRequest): LambdaHttpResponse =>