@basemaps/lambda-tiler 6.38.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__/tile.style.json.test.ts

@@ -28,60 +28,115 @@ o.spec('/v1/styles', () => {
     o(res.status).equals(404);
   });
 
-  o('should serve style json', async () => {
-    const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', Api.header);
-
-    const fakeStyle: StyleJson = {
-      version: 8,
-      id: 'test',
-      name: 'topographic',
-      sources: {
-        basemaps_vector: {
-          type: 'vector',
-          url: `/vector`,
-        },
-        basemaps_raster: {
-          type: 'raster',
-          tiles: [`/raster`],
+  const fakeStyle: StyleJson = {
+    version: 8,
+    id: 'test',
+    name: 'topographic',
+    sources: {
+      basemaps_vector: {
+        type: 'vector',
+        url: `/vector`,
+      },
+      basemaps_raster: {
+        type: 'raster',
+        tiles: [`/raster`],
+      },
+      basemaps_raster_encode: {
+        type: 'raster',
+        tiles: [`/raster/{z}/{x}/{y}.webp`], // Shouldn't encode the {}
+      },
+      test_vector: {
+        type: 'vector',
+        url: 'vector.url.co.nz',
+      },
+      test_raster: {
+        type: 'raster',
+        tiles: ['raster.url.co.nz'],
+      },
+    },
+    layers: [
+      {
+        layout: {
+          visibility: 'visible',
         },
-        basemaps_raster_encode: {
-          type: 'raster',
-          tiles: [`/raster/{z}/{x}/{y}.webp`], // Shouldn't encode the {}
+        paint: {
+          'background-color': 'rgba(206, 229, 242, 1)',
         },
-        test_vector: {
-          type: 'vector',
-          url: 'vector.url.co.nz',
+        id: 'Background1',
+        type: 'background',
+        minzoom: 0,
+      },
+      {
+        layout: {
+          visibility: 'visible',
         },
-        test_raster: {
-          type: 'raster',
-          tiles: ['raster.url.co.nz'],
+        paint: {
+          'background-color': 'rgba(206, 229, 242, 1)',
         },
+        id: 'Background2',
+        type: 'background',
+        minzoom: 0,
       },
-      layers: [
-        {
-          layout: {
-            visibility: 'visible',
-          },
-          paint: {
-            'background-color': 'rgba(206, 229, 242, 1)',
-          },
-          id: 'Background',
-          type: 'background',
-          minzoom: 0,
+      {
+        layout: {
+          visibility: 'visible',
         },
-      ],
-      glyphs: '/glyphs',
-      sprite: '/sprite',
-      metadata: { id: 'test' },
-    };
+        paint: {
+          'background-color': 'rgba(206, 229, 242, 1)',
+        },
+        id: 'Background3',
+        type: 'background',
+        minzoom: 0,
+      },
+    ],
+    glyphs: '/glyphs',
+    sprite: '/sprite',
+    metadata: { id: 'test' },
+  };
+
+  const fakeRecord = {
+    id: 'st_topographic',
+    name: 'topographic',
+    style: fakeStyle,
+  };
+
+  o('should serve style json', async () => {
+    config.put(fakeRecord);
 
-    const fakeRecord = {
-      id: 'st_topographic',
-      name: 'topographic',
-      style: fakeStyle,
+    const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', Api.header);
+
+    const res = await handler.router.handle(request);
+    o(res.status).equals(200);
+    o(res.header('content-type')).equals('application/json');
+    o(res.header('cache-control')).equals('no-store');
+
+    const body = Buffer.from(res.body ?? '', 'base64').toString();
+    fakeStyle.sources.basemaps_vector = {
+      type: 'vector',
+      url: `${host}/vector?api=${Api.key}`,
+    };
+    fakeStyle.sources.basemaps_raster = {
+      type: 'raster',
+      tiles: [`${host}/raster?api=${Api.key}`],
     };
+    fakeStyle.sources.basemaps_raster_encode = {
+      type: 'raster',
+      tiles: [`${host}/raster/{z}/{x}/{y}.webp?api=${Api.key}`],
+    };
+
+    fakeStyle.sprite = `${host}/sprite`;
+    fakeStyle.glyphs = `${host}/glyphs`;
+
+    o(JSON.parse(body)).deepEquals(fakeStyle);
+  });
 
+  o('should serve style json with excluded layers', async () => {
     config.put(fakeRecord);
+    const request = mockUrlRequest(
+      '/v1/tiles/topographic/Google/style/topographic.json',
+      '?exclude=background1&exclude=BACKGROUND2',
+      Api.header,
+    );
 
     const res = await handler.router.handle(request);
     o(res.status).equals(200);
@@ -104,6 +159,7 @@ o.spec('/v1/styles', () => {
 
     fakeStyle.sprite = `${host}/sprite`;
     fakeStyle.glyphs = `${host}/glyphs`;
+    fakeStyle.layers = [fakeStyle.layers[2]];
 
     o(JSON.parse(body)).deepEquals(fakeStyle);
   });