@basemaps/lambda-tiler 6.41.0 → 6.44.0

package/build/routes/preview.js

@@ -0,0 +1,159 @@
+import { Bounds, ImageFormat, Projection } from '@basemaps/geo';
+import { Tiler } from '@basemaps/tiler';
+import { TileMakerSharp } from '@basemaps/tiler-sharp';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
+import { ConfigLoader } from '../util/config.loader.js';
+import { Etag } from '../util/etag.js';
+import { NotModified } from '../util/response.js';
+import { Validate } from '../util/validate.js';
+import { DefaultResizeKernel, TileXyzRaster, isArchiveTiff } from './tile.xyz.raster.js';
+import sharp from 'sharp';
+const PreviewSize = { width: 1200, height: 630 };
+const TilerSharp = new TileMakerSharp(PreviewSize.width, PreviewSize.height);
+const OutputFormat = ImageFormat.Webp;
+/** Slightly grey color for the checker background */
+const PreviewBackgroundFillColor = 0xef;
+/** Make th e checkered background 30x30px */
+const PreviewBackgroundSizePx = 30;
+/**
+ * Serve a preview of a imagery set
+ *
+ * /v1/preview/:tileSet/:tileMatrixSet/:z/:lon/:lat
+ *
+ * @example
+ * Raster Tile `/v1/preview/aerial/WebMercatorQuad/12/177.3998405/-39.0852555`
+ *
+ */
+export async function tilePreviewGet(req) {
+    const tileMatrix = Validate.getTileMatrixSet(req.params.tileMatrix);
+    if (tileMatrix == null)
+        return new LambdaHttpResponse(404, 'Tile Matrix not found');
+    req.set('tileMatrix', tileMatrix.identifier);
+    req.set('projection', tileMatrix.projection.code);
+    // TODO we should detect the format based off the "Accept" header and maybe default back to webp
+    req.set('extension', OutputFormat);
+    const location = Validate.getLocation(req.params.lon, req.params.lat);
+    if (location == null)
+        return new LambdaHttpResponse(404, 'Preview location not found');
+    req.set('location', location);
+    const z = Math.ceil(parseFloat(req.params.z));
+    if (isNaN(z) || z < 0 || z > tileMatrix.maxZoom)
+        return new LambdaHttpResponse(404, 'Preview zoom invalid');
+    const config = await ConfigLoader.load(req);
+    req.timer.start('tileset:load');
+    const tileSet = await config.TileSet.get(config.TileSet.id(req.params.tileSet));
+    req.timer.end('tileset:load');
+    if (tileSet == null)
+        return new LambdaHttpResponse(404, 'Tileset not found');
+    // Only raster previews are supported
+    if (tileSet.type !== 'raster')
+        return new LambdaHttpResponse(404, 'Preview invalid tile set type');
+    return renderPreview(req, { tileSet, tileMatrix, location, outputFormat: OutputFormat, z });
+}
+/**
+ * Render the preview!
+ *
+ * All the parameter validation is done in {@link tilePreviewGet} this function expects everything to align
+ *
+ * @returns 304 not modified if the ETag matches or 200 ok with the content of the image
+ */
+export async function renderPreview(req, ctx) {
+    const tileMatrix = ctx.tileMatrix;
+    // Convert the input lat/lon into the projected coordinates to make it easier to do math with
+    const coords = Projection.get(tileMatrix).fromWgs84([ctx.location.lon, ctx.location.lat]);
+    // use the input as the center point, but round it to the closest pixel to make it easier to do math
+    const point = tileMatrix.sourceToPixels(coords[0], coords[1], ctx.z);
+    const pointCenter = { x: Math.round(point.x), y: Math.round(point.y) };
+    // position of the preview in relation to the output screen
+    const screenBounds = new Bounds(pointCenter.x - PreviewSize.width / 2, pointCenter.y - PreviewSize.height / 2, PreviewSize.width, PreviewSize.height);
+    // Convert the screen bounds back into the source to find the assets we need to render the preview
+    const topLeft = tileMatrix.pixelsToSource(screenBounds.x, screenBounds.y, ctx.z);
+    const bottomRight = tileMatrix.pixelsToSource(screenBounds.right, screenBounds.bottom, ctx.z);
+    const sourceBounds = Bounds.fromBbox([topLeft.x, topLeft.y, bottomRight.x, bottomRight.y]);
+    const assetLocations = await TileXyzRaster.getAssetsForBounds(req, ctx.tileSet, tileMatrix, sourceBounds, ctx.z, true);
+    const cacheKey = Etag.key(assetLocations);
+    if (Etag.isNotModified(req, cacheKey))
+        return NotModified();
+    const assets = await TileXyzRaster.loadAssets(req, assetLocations);
+    const tiler = new Tiler(tileMatrix);
+    // Figure out what tiffs and tiles need to be read and where they are placed on the output image
+    const compositions = [];
+    for (const asset of assets) {
+        // there shouldn't be any Cotar archives in previews but ignore them to be safe
+        if (!isArchiveTiff(asset))
+            continue;
+        const result = tiler.getTiles(asset, screenBounds, ctx.z);
+        if (result == null)
+            continue;
+        compositions.push(...result);
+    }
+    // Load all the tiff tiles and resize/them into the correct locations
+    req.timer.start('compose:overlay');
+    const overlays = (await Promise.all(compositions.map((comp) => TilerSharp.composeTileTiff(comp, DefaultResizeKernel))).then((items) => items.filter((f) => f != null)));
+    req.timer.end('compose:overlay');
+    // Create the output image and render all the individual pieces into them
+    const img = getBaseImage(ctx.tileSet.background);
+    img.composite(overlays);
+    req.timer.start('compose:compress');
+    const buf = await TilerSharp.toImage(ctx.outputFormat, img);
+    req.timer.end('compose:compress');
+    req.set('layersUsed', overlays.length);
+    req.set('bytes', buf.byteLength);
+    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(buf, 'image/' + ctx.outputFormat);
+    const shortLocation = [ctx.location.lon.toFixed(7), ctx.location.lat.toFixed(7)].join('_');
+    const suggestedFileName = `preview_${ctx.tileSet.name}_z${ctx.z}_${shortLocation}.${ctx.outputFormat}`;
+    response.header('Content-Disposition', `inline; filename=\"${suggestedFileName}\"`);
+    return response;
+}
+function getBaseImage(bg) {
+    if (bg == null || bg.alpha === 0) {
+        const buf = createCheckerBoard({
+            width: PreviewSize.width,
+            height: PreviewSize.height,
+            colors: { fill: PreviewBackgroundFillColor, background: 0xff },
+            size: PreviewBackgroundSizePx,
+        });
+        return sharp(buf.buffer, { raw: buf.raw });
+    }
+    return TilerSharp.createImage(bg);
+}
+/** Create a chess/checkerboard background alternating between two colors */
+function createCheckerBoard(ctx) {
+    const { width, height, size } = ctx;
+    const fillColor = ctx.colors.fill;
+    // Create a one band image, which starts off as full white
+    const buf = Buffer.alloc(height * width, ctx.colors.background); // 1 band grey buffer;
+    // Number of squares to make in x/y directions
+    const tileY = height / size;
+    const tileX = width / size;
+    // Fill in a square at the x/y pixel offsets
+    function fillSquare(xOffset, yOffset) {
+        for (let y = 0; y < size; y++) {
+            const yPx = (yOffset + y) * width;
+            for (let x = 0; x < size; x++) {
+                const px = yPx + xOffset + x;
+                // Actually set the color
+                buf[px] = fillColor;
+            }
+        }
+    }
+    for (let tX = 0; tX < tileX; tX++) {
+        for (let tY = 0; tY < tileY; tY++) {
+            const yOffset = tY * size;
+            const y2 = tY % 2;
+            // Draw every second tile alternating on rows
+            const x2 = tX % 2;
+            if (x2 === 0 && y2 === 1)
+                continue;
+            if (x2 === 1 && y2 === 0)
+                continue;
+            const xOffset = tX * size;
+            fillSquare(xOffset, yOffset);
+        }
+    }
+    return { buffer: buf, raw: { width, height, channels: 1 } };
+}
+//# sourceMappingURL=preview.js.map

package/build/routes/preview.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../src/routes/preview.ts"],"names":[],"mappings":"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"}

package/build/routes/tile.xyz.raster.d.ts

@@ -1,4 +1,5 @@
 import { ConfigTileSetRaster } from '@basemaps/config';
+import { Bounds, TileMatrixSet } from '@basemaps/geo';
 import { TileMakerSharp } from '@basemaps/tiler-sharp';
 import { CogTiff } from '@cogeotiff/core';
 import { Cotar } from '@cotar/core';
@@ -6,8 +7,22 @@ import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { TileXyz } from '../util/validate.js';
 export declare function getTiffName(name: string): string;
 export type CloudArchive = CogTiff | Cotar;
+/** Check to see if a cloud archive is a Tiff or a Cotar */
+export declare function isArchiveTiff(x: CloudArchive): x is CogTiff;
 export declare const TileComposer: TileMakerSharp;
+export declare const DefaultResizeKernel: {
+    readonly in: "lanczos3";
+    readonly out: "lanczos3";
+};
+export declare const DefaultBackground: {
+    r: number;
+    g: number;
+    b: number;
+    alpha: number;
+};
 export declare const TileXyzRaster: {
+    getAssetsForBounds(req: LambdaHttpRequest, tileSet: ConfigTileSetRaster, tileMatrix: TileMatrixSet, bounds: Bounds, zoom: number, ignoreOverview?: boolean): Promise<string[]>;
+    loadAssets(req: LambdaHttpRequest, assets: string[]): Promise<CloudArchive[]>;
     getAssetsForTile(req: LambdaHttpRequest, tileSet: ConfigTileSetRaster, xyz: TileXyz): Promise<string[]>;
     tile(req: LambdaHttpRequest, tileSet: ConfigTileSetRaster, xyz: TileXyz): Promise<LambdaHttpResponse>;
 };

package/build/routes/tile.xyz.raster.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tile.xyz.raster.d.ts","sourceRoot":"","sources":["../../src/routes/tile.xyz.raster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAItE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAOnF,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,KAAK,CAAC;AAE3C,eAAO,MAAM,YAAY,gBAA0B,CAAC;AAKpD,eAAO,MAAM,aAAa;0BACI,iBAAiB,WAAW,mBAAmB,OAAO,OAAO,GAAG,QAAQ,MAAM,EAAE,CAAC;cA8C7F,iBAAiB,WAAW,mBAAmB,OAAO,OAAO,GAAG,QAAQ,kBAAkB,CAAC;CA+C5G,CAAC"}
+{"version":3,"file":"tile.xyz.raster.d.ts","sourceRoot":"","sources":["../../src/routes/tile.xyz.raster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,MAAM,EAAQ,aAAa,EAAgC,MAAM,eAAe,CAAC;AAG1F,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAOnF,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,KAAK,CAAC;AAE3C,2DAA2D;AAC3D,wBAAgB,aAAa,CAAC,CAAC,EAAE,YAAY,GAAG,CAAC,IAAI,OAAO,CAK3D;AAED,eAAO,MAAM,YAAY,gBAA0B,CAAC;AAEpD,eAAO,MAAM,mBAAmB;;;CAA+C,CAAC;AAChF,eAAO,MAAM,iBAAiB;;;;;CAAiC,CAAC;AAEhE,eAAO,MAAM,aAAa;4BAEjB,iBAAiB,WACb,mBAAmB,cAChB,aAAa,UACjB,MAAM,QACR,MAAM,6BAEX,QAAQ,MAAM,EAAE,CAAC;oBA8CE,iBAAiB,UAAU,MAAM,EAAE,GAAG,QAAQ,YAAY,EAAE,CAAC;0BAsBvD,iBAAiB,WAAW,mBAAmB,OAAO,OAAO,GAAG,QAAQ,MAAM,EAAE,CAAC;cAK7F,iBAAiB,WAAW,mBAAmB,OAAO,OAAO,GAAG,QAAQ,kBAAkB,CAAC;CA6B5G,CAAC"}

package/build/routes/tile.xyz.raster.js

@@ -3,6 +3,7 @@ import { Bounds, Epsg, TileMatrixSet, TileMatrixSets, VectorFormat } from '@base
 import { Env, fsa } from '@basemaps/shared';
 import { Tiler } from '@basemaps/tiler';
 import { TileMakerSharp } from '@basemaps/tiler-sharp';
+import { CogTiff } from '@cogeotiff/core';
 import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import pLimit from 'p-limit';
 import { ConfigLoader } from '../util/config.loader.js';
@@ -17,41 +18,52 @@ export function getTiffName(name) {
         return name;
     return `${name}.tiff`;
 }
+/** Check to see if a cloud archive is a Tiff or a Cotar */
+export function isArchiveTiff(x) {
+    if (x instanceof CogTiff)
+        return true;
+    if (x.source.uri.endsWith('.tiff'))
+        return true;
+    if (x.source.uri.endsWith('.tif'))
+        return true;
+    return false;
+}
 export const TileComposer = new TileMakerSharp(256);
-const DefaultResizeKernel = { in: 'lanczos3', out: 'lanczos3' };
-const DefaultBackground = { r: 0, g: 0, b: 0, alpha: 0 };
+export const DefaultResizeKernel = { in: 'lanczos3', out: 'lanczos3' };
+export const DefaultBackground = { r: 0, g: 0, b: 0, alpha: 0 };
 export const TileXyzRaster = {
-    async getAssetsForTile(req, tileSet, xyz) {
+    async getAssetsForBounds(req, tileSet, tileMatrix, bounds, zoom, ignoreOverview = false) {
         const config = await ConfigLoader.load(req);
-        const imagery = await getAllImagery(config, tileSet.layers, [xyz.tileMatrix.projection]);
+        const imagery = await getAllImagery(config, tileSet.layers, [tileMatrix.projection]);
         const filteredLayers = filterLayers(req, tileSet.layers);
         const output = [];
-        const tileBounds = xyz.tileMatrix.tileToSourceBounds(xyz.tile);
         // All zoom level config is stored as Google zoom levels
-        const filterZoom = TileMatrixSet.convertZoomLevel(xyz.tile.z, xyz.tileMatrix, TileMatrixSets.get(Epsg.Google));
+        const filterZoom = TileMatrixSet.convertZoomLevel(zoom, tileMatrix, TileMatrixSets.get(Epsg.Google));
         for (const layer of filteredLayers) {
-            if (layer.disabled)
-                continue;
             if (layer.maxZoom != null && filterZoom > layer.maxZoom)
                 continue;
             if (layer.minZoom != null && filterZoom < layer.minZoom)
                 continue;
-            const imgId = layer[xyz.tileMatrix.projection.code];
-            if (imgId == null) {
-                req.log.warn({ layer: layer.name, projection: xyz.tileMatrix.projection.code }, 'Failed to lookup imagery');
+            const imgId = layer[tileMatrix.projection.code];
+            // Imagery does not exist for this projection
+            if (imgId == null)
                 continue;
-            }
             const img = imagery.get(imgId);
             if (img == null) {
-                req.log.warn({ layer: layer.name, projection: xyz.tileMatrix.projection.code, imgId }, 'Failed to lookup imagery');
+                req.log.warn({ layer: layer.name, projection: tileMatrix.projection.code, imgId }, 'Failed to lookup imagery');
                 continue;
             }
-            if (!tileBounds.intersects(Bounds.fromJson(img.bounds)))
+            if (!bounds.intersects(Bounds.fromJson(img.bounds)))
                 continue;
             for (const c of img.files) {
-                if (!tileBounds.intersects(Bounds.fromJson(c)))
+                if (!bounds.intersects(Bounds.fromJson(c)))
                     continue;
-                if (img.overviews && img.overviews.maxZoom >= filterZoom && img.overviews.minZoom <= filterZoom) {
+                // If there are overviews and they exist for this zoom range and we are not ignoring them
+                // lets use the overviews instead!
+                if (img.overviews &&
+                    img.overviews.maxZoom >= filterZoom &&
+                    img.overviews.minZoom <= filterZoom &&
+                    ignoreOverview !== true) {
                     output.push(fsa.join(img.uri, img.overviews.path));
                     break;
                 }
@@ -61,16 +73,9 @@ export const TileXyzRaster = {
         }
         return output;
     },
-    async tile(req, tileSet, xyz) {
-        var _a, _b;
-        if (xyz.tileType === VectorFormat.MapboxVectorTiles)
-            return NotFound();
-        const assetPaths = await this.getAssetsForTile(req, tileSet, xyz);
-        const cacheKey = Etag.key(assetPaths);
-        if (Etag.isNotModified(req, cacheKey))
-            return NotModified();
+    async loadAssets(req, assets) {
         const toLoad = [];
-        for (const assetPath of assetPaths) {
+        for (const assetPath of assets) {
             toLoad.push(LoadingQueue(() => {
                 if (assetPath.endsWith('.tar.co')) {
                     return CoSources.getCotar(assetPath).catch((error) => {
@@ -84,7 +89,21 @@ export const TileXyzRaster = {
                 });
             }));
         }
-        const assets = (await Promise.all(toLoad)).filter((f) => f != null);
+        return (await Promise.all(toLoad)).filter((f) => f != null);
+    },
+    async getAssetsForTile(req, tileSet, xyz) {
+        const tileBounds = xyz.tileMatrix.tileToSourceBounds(xyz.tile);
+        return TileXyzRaster.getAssetsForBounds(req, tileSet, xyz.tileMatrix, tileBounds, xyz.tile.z);
+    },
+    async tile(req, tileSet, xyz) {
+        var _a, _b;
+        if (xyz.tileType === VectorFormat.MapboxVectorTiles)
+            return NotFound();
+        const assetPaths = await this.getAssetsForTile(req, tileSet, xyz);
+        const cacheKey = Etag.key(assetPaths);
+        if (Etag.isNotModified(req, cacheKey))
+            return NotModified();
+        const assets = await TileXyzRaster.loadAssets(req, assetPaths);
         const tiler = new Tiler(xyz.tileMatrix);
         const layers = await tiler.tile(assets, xyz.tile.x, xyz.tile.y, xyz.tile.z);
         const res = await TileComposer.compose({

package/build/routes/tile.xyz.raster.js.map

@@ -1 +1 @@
-{"version":3,"file":"tile.xyz.raster.js","sourceRoot":"","sources":["../../src/routes/tile.xyz.raster.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tile.xyz.raster.js","sourceRoot":"","sources":["../../src/routes/tile.xyz.raster.ts"],"names":[],"mappings":"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"}

package/build/routes/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/routes/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,wBAAsB,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAK9D"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/routes/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,wBAAsB,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAqB9D"}

package/build/routes/version.js

@@ -3,7 +3,23 @@ export async function versionGet() {
     var _a;
     const response = new LambdaHttpResponse(200, 'ok');
     response.header(HttpHeader.CacheControl, 'no-store');
-    response.json({ version: (_a = process.env.GIT_VERSION) !== null && _a !== void 0 ? _a : 'dev', hash: process.env.GIT_HASH });
+    response.json({
+        /**
+         * last git version tag
+         * @example "v6.42.1"
+         */
+        version: (_a = process.env.GIT_VERSION) !== null && _a !== void 0 ? _a : 'dev',
+        /**
+         * Full git commit hash
+         * @example "e4231b1ee62c276c8657c56677ced02681dfe5d6"
+         */
+        hash: process.env.GIT_HASH,
+        /**
+         * The exact build that this release was run from
+         * @example "1658821493-3"
+         */
+        buildId: process.env.BUILD_ID,
+    });
     return response;
 }
 //# sourceMappingURL=version.js.map

package/build/routes/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/routes/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,UAAU;;IAC9B,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACnD,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IACrD,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,WAAW,mCAAI,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzF,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/routes/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,UAAU;;IAC9B,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACnD,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IACrD,QAAQ,CAAC,IAAI,CAAC;QACZ;;;WAGG;QACH,OAAO,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,WAAW,mCAAI,KAAK;QACzC;;;WAGG;QACH,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;QAC1B;;;WAGG;QACH,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;KAC9B,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/build/util/validate.d.ts

@@ -1,4 +1,4 @@
-import { ImageFormat, TileMatrixSet, VectorFormat } from '@basemaps/geo';
+import { ImageFormat, LatLon, TileMatrixSet, VectorFormat } from '@basemaps/geo';
 import { LambdaHttpRequest } from '@linzjs/lambda';
 import { TileXyzGet } from '../routes/tile.xyz';
 export interface TileXyz {
@@ -26,6 +26,8 @@ export declare const Validate: {
     /** Read in all image formats specified in the query parameters "format" or "tileFormat" */
     getRequestedFormats(req: LambdaHttpRequest): ImageFormat[] | null;
     getTileFormat(tileType: string): ImageFormat | VectorFormat | null;
+    /** Validate that a lat and lon are between -90/90 and -180/180 */
+    getLocation(lonIn: string, latIn: string): LatLon | null;
     /**
      * Validate that the tile request is somewhat valid
      * - Valid projection

package/build/util/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/util/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAc,aAAa,EAAkB,YAAY,EAAE,MAAM,eAAe,CAAC;AAGrG,OAAO,EAAE,iBAAiB,EAAsB,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,aAAa,CAAC;IAC1B,QAAQ,EAAE,YAAY,GAAG,WAAW,CAAC;CACtC;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACjC;AAED,eAAO,MAAM,QAAQ;IACnB;;;OAGG;gBACS,iBAAiB,GAAG,MAAM;2BAUf,MAAM,GAAG,aAAa,GAAG,IAAI;IAIpD,2FAA2F;6BAClE,iBAAiB,GAAG,WAAW,EAAE,GAAG,IAAI;4BAczC,MAAM,GAAG,WAAW,GAAG,YAAY,GAAG,IAAI;IAMlE;;;;;;;;;OASG;aACM,kBAAkB,UAAU,CAAC,GAAG,OAAO;CAiCjD,CAAC"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/util/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAc,aAAa,EAAkB,YAAY,EAAE,MAAM,eAAe,CAAC;AAG7G,OAAO,EAAE,iBAAiB,EAAsB,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,aAAa,CAAC;IAC1B,QAAQ,EAAE,YAAY,GAAG,WAAW,CAAC;CACtC;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACjC;AAED,eAAO,MAAM,QAAQ;IACnB;;;OAGG;gBACS,iBAAiB,GAAG,MAAM;2BAUf,MAAM,GAAG,aAAa,GAAG,IAAI;IAIpD,2FAA2F;6BAClE,iBAAiB,GAAG,WAAW,EAAE,GAAG,IAAI;4BAczC,MAAM,GAAG,WAAW,GAAG,YAAY,GAAG,IAAI;IAOlE,kEAAkE;uBAC/C,MAAM,SAAS,MAAM,GAAG,MAAM,GAAG,IAAI;IAOxD;;;;;;;;;OASG;aACM,kBAAkB,UAAU,CAAC,GAAG,OAAO;CAiCjD,CAAC"}

package/build/util/validate.js

@@ -44,6 +44,16 @@ export const Validate = {
             return VectorFormat.MapboxVectorTiles;
         return null;
     },
+    /** Validate that a lat and lon are between -90/90 and -180/180 */
+    getLocation(lonIn, latIn) {
+        const lat = parseFloat(latIn);
+        const lon = parseFloat(lonIn);
+        if (isNaN(lon) || lon < -180 || lon > 180)
+            return null;
+        if (isNaN(lat) || lat < -90 || lat > 90)
+            return null;
+        return { lon, lat };
+    },
     /**
      * Validate that the tile request is somewhat valid
      * - Valid projection

package/build/util/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/util/validate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/util/validate.ts"],"names":[],"mappings":"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"}

package/bundle.sh

@@ -8,4 +8,4 @@ cd dist
 # Make the new package a commonjs module
 cp -r ../static .
 # @see https://sharp.pixelplumbing.com/en/stable/install/#aws-lambda
-npm install --arch=x64 --platform=linux --production
+npm install --arch=arm64 --platform=linux --production

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.41.0",
+  "version": "6.44.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,15 +22,15 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^6.41.0",
-    "@basemaps/geo": "^6.41.0",
-    "@basemaps/shared": "^6.41.0",
-    "@basemaps/tiler": "^6.41.0",
-    "@basemaps/tiler-sharp": "^6.41.0",
+    "@basemaps/config": "^6.44.0",
+    "@basemaps/geo": "^6.44.0",
+    "@basemaps/shared": "^6.44.0",
+    "@basemaps/tiler": "^6.44.0",
+    "@basemaps/tiler-sharp": "^6.44.0",
     "@chunkd/fs": "^10.0.2",
     "@cogeotiff/core": "^7.2.0",
     "@cotar/core": "^5.4.0",
-    "@linzjs/geojson": "^6.41.0",
+    "@linzjs/geojson": "^6.43.0",
     "@linzjs/lambda": "^4.0.0",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.1.0",
@@ -50,12 +50,12 @@
     "bundle": "./bundle.sh"
   },
   "devDependencies": {
-    "@basemaps/attribution": "^6.41.0",
+    "@basemaps/attribution": "^6.44.0",
     "@chunkd/source-memory": "^10.0.0",
     "@types/aws-lambda": "^8.10.75",
     "@types/pixelmatch": "^5.0.0",
     "@types/sharp": "^0.30.3",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "a466cbcc9859b1585e6ca32894615b3eb6ad04b0"
+  "gitHead": "025cc55d4e11c7e527ba2aec2f7655489be8d035"
 }

package/src/__tests__/index.test.ts

@@ -9,11 +9,10 @@ o.spec('LambdaXyz index', () => {
   });
 
   o.spec('version', () => {
-    const origVersion: any = process.env.GIT_VERSION;
-    const origHash: any = process.env.GIT_HASH;
-    o.after(() => {
-      process.env.GIT_VERSION = origVersion;
-      process.env.GIT_HASH = origHash;
+    o.afterEach(() => {
+      delete process.env.GIT_VERSION;
+      delete process.env.GIT_HASH;
+      delete process.env.BUILD_ID;
     });
 
     o('should return version', async () => {
@@ -30,6 +29,22 @@ o.spec('LambdaXyz index', () => {
         hash: 'abc456',
       });
     });
+
+    o('should include buildId if exists', async () => {
+      process.env.GIT_VERSION = '1.2.3';
+      process.env.BUILD_ID = '1658821493-3';
+
+      const response = await handler.router.handle(mockRequest('/v1/version'));
+
+      const body = JSON.parse(response.body as string);
+      o(response.status).equals(200);
+      o(response.statusDescription).equals('ok');
+      o(response.header('cache-control')).equals('no-store');
+      o(body).deepEquals({
+        version: '1.2.3',
+        buildId: '1658821493-3',
+      });
+    });
   });
 
   o('should respond to /ping', async () => {

package/src/cli/render.preview.ts

@@ -0,0 +1,44 @@
+import { ConfigProviderMemory } from '@basemaps/config';
+import { initConfigFromUrls } from '@basemaps/config/build/json/tiff.config.js';
+import { ImageFormat, TileMatrixSet, TileMatrixSets } 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 { pathToFileURL } from 'url';
+import { renderPreview } from '../routes/preview.js';
+
+const target = pathToFileURL(`/home/blacha/tmp/basemaps/bm-724/test-north-island_20230220_10m/`);
+const location = { lat: -39.0852555, lon: 177.3998405 };
+const z = 12;
+
+const outputFormat = ImageFormat.Webp;
+let tileMatrix: TileMatrixSet | null = null;
+
+async function main(): Promise<void> {
+  const log = LogConfig.get();
+  const provider = new ConfigProviderMemory();
+  setDefaultConfig(provider);
+  const { tileSet, imagery } = await initConfigFromUrls(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({ url: im.uri, title: im.title, tileMatrix: im.tileMatrix, files: im.files.length }, 'Imagery:Loaded');
+    if (tileMatrix == null) {
+      tileMatrix = TileMatrixSets.find(im.tileMatrix);
+      log.info({ tileMatrix: im.tileMatrix }, 'Imagery:TileMatrix:Set');
+    }
+  }
+
+  if (tileMatrix == null) throw new Error('No tileMatrix found');
+
+  const req = new LambdaUrlRequest({ headers: {} } as UrlEvent, {} as Context, LogConfig.get()) as LambdaHttpRequest;
+  const res = await renderPreview(req, { tileMatrix, tileSet, location, z, outputFormat });
+  const previewFile = `./z${z}_${location.lon}_${location.lat}.${outputFormat}`;
+  await fsa.write(previewFile, Buffer.from(res.body, 'base64'));
+  log.info({ path: previewFile }, 'Tile:Write');
+}
+
+main();