@basemaps/lambda-tiler 6.30.0 → 6.31.0

package/dist/node_modules/.package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.30.0",
+  "version": "6.31.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

package/dist/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.30.0",
+  "version": "6.31.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@basemaps/lambda-tiler",
-      "version": "6.30.0",
+      "version": "6.31.0",
       "license": "MIT",
       "dependencies": {
         "sharp": "0.30.7"

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.30.0",
+  "version": "6.31.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.30.0",
+  "version": "6.31.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,12 +22,12 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^6.30.0",
-    "@basemaps/geo": "^6.28.1",
+    "@basemaps/config": "^6.31.0",
+    "@basemaps/geo": "^6.31.0",
     "@basemaps/lambda": "^6.7.0",
-    "@basemaps/shared": "^6.30.0",
-    "@basemaps/tiler": "^6.29.0",
-    "@basemaps/tiler-sharp": "^6.30.0",
+    "@basemaps/shared": "^6.31.0",
+    "@basemaps/tiler": "^6.31.0",
+    "@basemaps/tiler-sharp": "^6.31.0",
     "@chunkd/fs": "^8.4.0",
     "@cogeotiff/core": "^7.0.0",
     "@cotar/core": "^5.4.0",
@@ -52,12 +52,12 @@
     "bundle": "./bundle.sh"
   },
   "devDependencies": {
-    "@basemaps/attribution": "^6.28.1",
+    "@basemaps/attribution": "^6.31.0",
     "@types/aws-lambda": "^8.10.75",
     "@types/node": "^17.0.34",
     "@types/pixelmatch": "^5.0.0",
     "@types/sharp": "^0.30.3",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "c4858d318fd769e086a11e8b2a8f052b54964aab"
+  "gitHead": "2ab942c2a8cd82b94b20c2ad616042ea2fc38518"
 }

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

@@ -316,22 +316,19 @@ o.spec('WmtsCapabilities', () => {
     const boundingBoxes = tags(layer, 'ows:BoundingBox');
     o(boundingBoxes.length).equals(2);
     o(boundingBoxes[0].attrs.crs).equals('urn:ogc:def:crs:EPSG::3857');
-    o(boundingBoxes[0].children.map((c) => roundNumbersInString(c.textContent, 4))).deepEquals([
+    o(boundingBoxes[0].children.map((c) => c.textContent)).deepEquals([
       '19457809.9203 -4609458.5537',
       '19509787.0995 -4578883.7424',
     ]);
     o(boundingBoxes[1].attrs.crs).equals('urn:ogc:def:crs:EPSG::2193');
-    o(boundingBoxes[1].children.map((c) => roundNumbersInString(c.textContent, 4))).deepEquals([
+    o(boundingBoxes[1].children.map((c) => c.textContent)).deepEquals([
       '5766358.9964 1757351.3045',
       '5793264.8304 1798321.5516',
     ]);
 
     const wgs84 = layer.find('ows:WGS84BoundingBox');
     o(wgs84?.attrs.crs).equals('urn:ogc:def:crs:OGC:2:84');
-    o(wgs84?.children.map((c) => roundNumbersInString(c.textContent, 4))).deepEquals([
-      '174.7925 -38.2123',
-      '175.2594 -37.9962',
-    ]);
+    o(wgs84?.children.map((c) => c.textContent)).deepEquals(['174.79248 -38.212288', '175.259399 -37.996163']);
   });
 
   o('should only output imagery if exists', () => {
@@ -363,4 +360,110 @@ o.spec('WmtsCapabilities', () => {
     const layersB = tags(rawB, 'Layer');
     o(layersB.length).equals(1);
   });
+
+  o('should cover the entire WebMercatorBounds', () => {
+    const halfSize = GoogleTms.extent.width / 2;
+    // Create two fake imagery sets one covers tile z1 x0 y0 another covers tile z1 x1 y1
+    // so the entire bounding box should be tile z0 x0 y0 or the full extent
+    const imagery = new Map();
+    const imageTopLeft = { ...Imagery3857, id: 'im_top_left', name: 'top_left' };
+    imageTopLeft.bounds = { x: -halfSize, y: 0, width: halfSize, height: halfSize };
+    imagery.set(imageTopLeft.id, imageTopLeft);
+
+    const imageBottomRight = { ...Imagery3857, id: 'im_bottom_right', name: 'bottom_right' };
+    imageBottomRight.bounds = { x: 0, y: -halfSize, width: halfSize, height: halfSize };
+    imagery.set(imageBottomRight.id, imageBottomRight);
+
+    const tileSet = { ...TileSetAerial };
+    tileSet.layers = [
+      { 3857: imageTopLeft.id, name: 'a_top_left' },
+      { 3857: imageBottomRight.id, name: 'b_bottom_right' },
+    ];
+
+    const raw = new WmtsCapabilities({
+      httpBase: 'https://basemaps.test',
+      provider: Provider,
+      tileMatrix: [GoogleTms],
+      tileSet,
+      imagery,
+      formats: [ImageFormat.Png],
+      isIndividualLayers: true,
+    }).toVNode();
+
+    const boundingBox = tags(raw, 'ows:WGS84BoundingBox').map((c) =>
+      c
+        .toString()
+        .split('\n')
+        .map((c) => c.trim()),
+    );
+    o(boundingBox[0][1]).deepEquals('<ows:LowerCorner>-180 -85.051129</ows:LowerCorner>');
+    o(boundingBox[0][2]).equals('<ows:UpperCorner>180 85.051129</ows:UpperCorner>');
+
+    o(boundingBox[1][1]).deepEquals('<ows:LowerCorner>-180 0</ows:LowerCorner>');
+    o(boundingBox[1][2]).equals('<ows:UpperCorner>0 85.051129</ows:UpperCorner>');
+
+    o(boundingBox[2][1]).deepEquals('<ows:LowerCorner>0 -85.051129</ows:LowerCorner>');
+    o(boundingBox[2][2]).equals('<ows:UpperCorner>180 0</ows:UpperCorner>');
+  });
+
+  o('should work when crossing anti meridian', () => {
+    const halfSize = GoogleTms.extent.width / 2;
+
+    const imagery = new Map();
+    // This image covers z1 x1.5 y1 to z1 x0.5 y1
+    // which cross the AM and covers half the width of two tiles
+    const imageBottomRight = { ...Imagery3857, id: 'im_bottom_right', name: 'bottom_right' };
+    imageBottomRight.bounds = { x: halfSize / 2, y: -halfSize, width: halfSize, height: halfSize };
+    imagery.set(imageBottomRight.id, imageBottomRight);
+
+    const tileSet = { ...TileSetAerial };
+    tileSet.layers = [{ 3857: imageBottomRight.id, name: 'b_bottom_right' }];
+
+    const raw = new WmtsCapabilities({
+      httpBase: 'https://basemaps.test',
+      provider: Provider,
+      tileMatrix: [GoogleTms],
+      tileSet,
+      imagery,
+      formats: [ImageFormat.Png],
+      isIndividualLayers: true,
+    }).toVNode();
+
+    const boundingBox = tags(raw, 'ows:WGS84BoundingBox').map((c) =>
+      roundNumbersInString(c.toString(), 4)
+        .split('\n')
+        .map((c) => c.trim()),
+    );
+    o(boundingBox[0][1]).deepEquals('<ows:LowerCorner>-180 -85.0511</ows:LowerCorner>');
+    o(boundingBox[0][2]).equals('<ows:UpperCorner>180 0</ows:UpperCorner>');
+
+    o(boundingBox[1][1]).deepEquals('<ows:LowerCorner>-180 -85.0511</ows:LowerCorner>');
+    o(boundingBox[1][2]).equals('<ows:UpperCorner>180 0</ows:UpperCorner>');
+  });
+
+  o('should work with NZTM2000Quad', () => {
+    const wmts = new WmtsCapabilities({ tileMatrix: [] } as any);
+
+    // Full NZTM200Quad coverage
+    const bbox = wmts.buildWgs84BoundingBox(Nztm2000QuadTms, []);
+    o(bbox.children[0].textContent).equals('-180 -49.929855');
+    o(bbox.children[1].textContent).equals('180 2.938603');
+
+    // Full NZTM200Quad coverage at z1
+    const bboxB = wmts.buildWgs84BoundingBox(Nztm2000QuadTms, [
+      Nztm2000QuadTms.tileToSourceBounds({ z: 1, x: 0, y: 0 }),
+      Nztm2000QuadTms.tileToSourceBounds({ z: 1, x: 1, y: 1 }),
+    ]);
+    o(bboxB.children[0].textContent).equals('-180 -49.929855');
+    o(bboxB.children[1].textContent).equals('180 2.938603');
+
+    // Full NZTM200Quad coverage at z5
+    const tileCount = Nztm2000QuadTms.zooms[5].matrixWidth;
+    const bboxC = wmts.buildWgs84BoundingBox(Nztm2000QuadTms, [
+      Nztm2000QuadTms.tileToSourceBounds({ z: 5, x: 0, y: 0 }),
+      Nztm2000QuadTms.tileToSourceBounds({ z: 5, x: tileCount - 1, y: tileCount - 1 }),
+    ]);
+    o(bboxC.children[0].textContent).equals('-180 -49.929855');
+    o(bboxC.children[1].textContent).equals('180 2.938603');
+  });
 });

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

@@ -401,7 +401,7 @@ o.spec('attribution', () => {
       const ts = new TileSetRaster('Fake', Nztm2000Tms);
       ts.tileSet = { ...ts.tileSet, layers: [fakeLayer] };
 
-      const output = createAttributionCollection(ts, null, fakeIm, fakeLayer, fakeHost, null as any);
+      const output = createAttributionCollection(ts, fakeIm, fakeLayer, fakeHost, null as any);
       o(output.title).equals('SomeName');
       o(output.summaries['linz:zoom']).deepEquals({ min: 5, max: 11 });
     });
@@ -409,7 +409,7 @@ o.spec('attribution', () => {
     o('should generate with correct zooms for NZTM2000Quad', () => {
       const ts = new TileSetRaster('Fake', Nztm2000QuadTms);
       ts.tileSet = { ...ts.tileSet, layers: [fakeLayer] };
-      const output = createAttributionCollection(ts, null, fakeIm, fakeLayer, fakeHost, null as any);
+      const output = createAttributionCollection(ts, fakeIm, fakeLayer, fakeHost, null as any);
       o(output.title).equals('SomeName');
       o(output.summaries['linz:zoom']).deepEquals({ min: 7, max: 14 });
     });
@@ -418,7 +418,7 @@ o.spec('attribution', () => {
       const fakeGebco = { ...fakeLayer, minZoom: 0, maxZoom: 15 };
       const ts = new TileSetRaster('Fake', Nztm2000QuadTms);
       ts.tileSet = { ...ts.tileSet, layers: [fakeLayer] };
-      const output = createAttributionCollection(ts, null, fakeIm, fakeGebco, fakeHost, null as any);
+      const output = createAttributionCollection(ts, fakeIm, fakeGebco, fakeHost, null as any);
       o(output.title).equals('SomeName');
       o(output.summaries['linz:zoom']).deepEquals({ min: 0, max: 13 });
     });
@@ -427,7 +427,7 @@ o.spec('attribution', () => {
       const fakeGebco = { ...fakeLayer, minZoom: 0, maxZoom: 32 };
       const ts = new TileSetRaster('Fake', Nztm2000QuadTms);
       ts.tileSet = { ...ts.tileSet, layers: [fakeLayer] };
-      const output = createAttributionCollection(ts, null, fakeIm, fakeGebco, fakeHost, null as any);
+      const output = createAttributionCollection(ts, fakeIm, fakeGebco, fakeHost, null as any);
       o(output.title).equals('SomeName');
       o(output.summaries['linz:zoom']).deepEquals({ min: 0, max: Nztm2000QuadTms.maxZoom });
     });

package/src/routes/attribution.ts

@@ -87,7 +87,6 @@ async function readStac(uri: string): Promise<StacCollection | null> {
 
 export function createAttributionCollection(
   tileSet: TileSetRaster,
-  stac: StacCollection | null | undefined,
   imagery: ConfigImagery,
   layer: ConfigLayer,
   host: ConfigProvider,
@@ -96,16 +95,15 @@ export function createAttributionCollection(
   const tileMatrix = tileSet.tileMatrix;
   return {
     stac_version: Stac.Version,
-    license: stac?.license ?? Stac.License,
+    license: Stac.License,
     id: imagery.id,
-    providers: stac?.providers ?? [
-      { name: host.serviceProvider.name, url: host.serviceProvider.site, roles: ['host'] },
-    ],
-    title: stac?.title ?? titleizeImageryName(imagery.name),
-    description: stac?.description ?? 'No description',
+    providers: [{ name: host.serviceProvider.name, url: host.serviceProvider.site, roles: ['host'] }],
+    title: imagery.title ?? titleizeImageryName(imagery.name),
+    description: 'No description',
     extent,
     links: [],
     summaries: {
+      'linz:category': imagery.category,
       'linz:zoom': {
         min: TileMatrixSet.convertZoomLevel(layer.minZoom ? layer.minZoom : 0, GoogleTms, tileMatrix, true),
         max: TileMatrixSet.convertZoomLevel(layer.maxZoom ? layer.maxZoom : 32, GoogleTms, tileMatrix, true),
@@ -146,18 +144,13 @@ async function tileSetAttribution(tileSet: TileSetRaster): Promise<AttributionSt
     if (imgId == null) continue;
     const im = tileSet.imagery.get(imgId);
     if (im == null) continue;
-    const stac = await stacFiles.get(im.uri);
 
     const bbox = proj.boundsToWgs84BoundingBox(im.bounds).map(roundNumber) as BBox;
 
-    let interval: [string, string][] | undefined = stac?.extent.temporal.interval;
-    if (interval == null) {
-      const years = extractYearRangeFromName(im.name);
-      if (years[0] === -1) {
-        throw new Error('Missing date in imagery name: ' + im.name);
-      }
-      interval = [years.map((y) => `${y}-01-01T00:00:00Z`) as [string, string]];
-    }
+    const years = extractYearRangeFromName(im.name);
+    if (years[0] === -1) throw new Error('Missing date in imagery name: ' + im.name);
+    const interval = [years.map((y) => `${y}-01-01T00:00:00Z`) as [string, string]];
+
     const extent: StacExtent = { spatial: { bbox: [bbox] }, temporal: { interval } };
 
     items.push({
@@ -173,14 +166,15 @@ async function tileSetAttribution(tileSet: TileSetRaster): Promise<AttributionSt
         coordinates: createCoordinates(bbox, im.files, proj),
       },
       properties: {
-        title: titleizeImageryName(im.name),
+        title: im.title ?? titleizeImageryName(im.name),
+        category: im.category,
         datetime: null,
         start_datetime: interval[0][0],
         end_datetime: interval[0][1],
       },
     });
 
-    cols.push(createAttributionCollection(tileSet, stac, im, layer, host, extent));
+    cols.push(createAttributionCollection(tileSet, im, layer, host, extent));
   }
   return {
     id: tileSet.id,

package/src/wmts.capability.ts

@@ -3,7 +3,7 @@ import { Bounds, GoogleTms, ImageFormat, TileMatrixSet, WmtsProvider } from '@ba
 import { Projection, V, VNodeElement } from '@basemaps/shared';
 import { ImageFormatOrder } from '@basemaps/tiler';
 import { BoundingBox } from '@cogeotiff/core';
-import { BBox, Wgs84 } from '@linzjs/geojson';
+import { BBox } from '@linzjs/geojson';
 
 const CapabilitiesAttrs = {
   xmlns: 'http://www.opengis.net/wmts/1.0',
@@ -38,6 +38,19 @@ export interface WmtsCapabilitiesParams {
   formats?: ImageFormat[];
 }
 
+/** Number of decimal places to use in lat lng */
+const LngLatPrecision = 6;
+const MeterPrecision = 4;
+
+function formatCoords(x: number, precision: number): string {
+  return Number(x.toFixed(precision)).toString();
+}
+
+/** Format a bounding box XY as `${x} ${y}` while restricting to precision decimal places */
+function formatBbox(x: number, y: number, precision: number): string {
+  return `${formatCoords(x, precision)} ${formatCoords(y, precision)}`;
+}
+
 export class WmtsCapabilities {
   httpBase: string;
   provider?: WmtsProvider;
@@ -73,22 +86,26 @@ export class WmtsCapabilities {
   buildWgs84BoundingBox(tms: TileMatrixSet, layers: Bounds[]): VNodeElement {
     let bbox: BBox;
     if (layers.length > 0) {
-      bbox = wgs84Extent(tms, layers[0]);
+      let bounds = layers[0];
       for (let i = 1; i < layers.length; i++) {
-        bbox = Wgs84.union(bbox, wgs84Extent(tms, layers[i]));
+        bounds = bounds.union(layers[i]);
       }
+      bbox = wgs84Extent(tms, bounds.toJson());
     } else {
       // No layers provided assume extent is the size of the tile matrix set :shrug: ?
       bbox = wgs84Extent(tms, tms.extent);
     }
 
-    return V(
-      'ows:WGS84BoundingBox',
-      { crs: 'urn:ogc:def:crs:OGC:2:84' },
-      bbox[2] > 180
-        ? [V('ows:LowerCorner', `-180 -90`), V('ows:UpperCorner', `180 90`)]
-        : [V('ows:LowerCorner', `${bbox[0]} ${bbox[1]}`), V('ows:UpperCorner', `${bbox[2]} ${bbox[3]}`)],
-    );
+    // If east is less than west, then this has crossed the anti meridian, so cover the entire globe
+    if (bbox[2] < bbox[0]) {
+      bbox[0] = -180;
+      bbox[2] = 180;
+    }
+
+    return V('ows:WGS84BoundingBox', { crs: 'urn:ogc:def:crs:OGC:2:84' }, [
+      V('ows:LowerCorner', formatBbox(bbox[0], bbox[1], LngLatPrecision)),
+      V('ows:UpperCorner', formatBbox(bbox[2], bbox[3], LngLatPrecision)),
+    ]);
   }
 
   /** Combine all the bounds of the imagery inside the layers into a extent for the imagery set */
@@ -106,8 +123,8 @@ export class WmtsCapabilities {
 
     const bbox = bounds.toBbox();
     return V('ows:BoundingBox', { crs: tms.projection.toUrn() }, [
-      V('ows:LowerCorner', `${bbox[tms.indexX]} ${bbox[tms.indexY]}`),
-      V('ows:UpperCorner', `${bbox[tms.indexX + 2]} ${bbox[tms.indexY + 2]}`),
+      V('ows:LowerCorner', formatBbox(bbox[tms.indexX], bbox[tms.indexY], MeterPrecision)),
+      V('ows:UpperCorner', formatBbox(bbox[tms.indexX + 2], bbox[tms.indexY + 2], MeterPrecision)),
     ]);
   }