@basemaps/lambda-tiler 6.28.1 → 6.31.0

package/dist/package.json

@@ -0,0 +1,39 @@
+{
+  "name": "@basemaps/lambda-tiler",
+  "version": "6.31.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/linz/basemaps.git",
+    "directory": "packages/lambda-tiler"
+  },
+  "author": {
+    "name": "Land Information New Zealand",
+    "url": "https://linz.govt.nz",
+    "organization": true
+  },
+  "type": "commonjs",
+  "engines": {
+    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "sharp": "0.30.7"
+  },
+  "bundle": {
+    "entry": "src/index.ts",
+    "outdir": "dist/",
+    "external": [
+      "aws-sdk",
+      "pino-pretty",
+      "sharp"
+    ]
+  },
+  "scripts": {
+    "test": "ospec --globs 'build/**/*.test.js'",
+    "bundle": "./bundle.sh"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.28.1",
+  "version": "6.31.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,21 +22,21 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^6.28.1",
-    "@basemaps/geo": "^6.28.1",
+    "@basemaps/config": "^6.31.0",
+    "@basemaps/geo": "^6.31.0",
     "@basemaps/lambda": "^6.7.0",
-    "@basemaps/shared": "^6.28.1",
-    "@basemaps/tiler": "^6.28.1",
-    "@basemaps/tiler-sharp": "^6.28.1",
-    "@chunkd/fs": "^8.1.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.3.0",
+    "@cotar/core": "^5.4.0",
     "@linzjs/geojson": "^6.28.1",
-    "@linzjs/lambda": "^3.0.1",
+    "@linzjs/lambda": "^3.2.0",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.1.0",
     "pixelmatch": "^5.1.0",
-    "sharp": "0.29.2"
+    "sharp": "^0.30.7"
   },
   "bundle": {
     "entry": "src/index.ts",
@@ -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.29.2",
+    "@types/sharp": "^0.30.3",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "f387e0365bcfc7391fd8d0665195b246c93532cf"
+  "gitHead": "2ab942c2a8cd82b94b20c2ad616042ea2fc38518"
 }

package/scripts/create.deployment.package.mjs

@@ -24,7 +24,7 @@ export function getPackageVersion(packageName) {
 // the bundle is a commonjs module
 parentPackage.type = 'commonjs';
 parentPackage.main = 'index.js';
-parentPackage.dependencies = { sharp: '0.29.2' };
+parentPackage.dependencies = { sharp: getPackageVersion('sharp') };
 
 // Clean up
 delete parentPackage.types;

package/src/__tests__/config.data.ts

@@ -0,0 +1,82 @@
+import { ConfigTileSetRaster, TileSetType, ConfigImagery, ConfigProvider } from '@basemaps/config';
+import { ImageFormat } from '@basemaps/geo';
+
+export const TileSetAerial: ConfigTileSetRaster = {
+  id: 'ts_aerial',
+  name: 'aerial',
+  type: TileSetType.Raster,
+  format: ImageFormat.Webp,
+  description: 'aerial__description',
+  title: 'Aerial Imagery',
+  category: 'Basemap',
+  layers: [
+    {
+      2193: 'im_01FYWKAJ86W9P7RWM1VB62KD0H',
+      3857: 'im_01FYWKATAEK2ZTJQ2PX44Y0XNT',
+      title: 'Ōtorohanga 0.1m Urban Aerial Photos (2021)',
+      category: 'Urban Aerial Photos',
+      name: 'ōtorohanga_urban_2021_0-1m_RGB',
+    },
+  ],
+};
+export const Imagery2193: ConfigImagery = {
+  id: 'im_01FYWKAJ86W9P7RWM1VB62KD0H',
+  name: 'ōtorohanga_urban_2021_0-1m_RGB',
+  title: 'Ōtorohanga 0.1m Urban Aerial Photos (2021)',
+  category: 'Urban Aerial Photos',
+  projection: 2193,
+  tileMatrix: 'NZTM2000Quad',
+  uri: 's3://linz-basemaps/2193/ōtorohanga_urban_2021_0-1m_RGB/01FYWKAJ86W9P7RWM1VB62KD0H',
+  bounds: {
+    x: 1757351.3044652338,
+    y: 5766358.996410044,
+    width: 40970.247160854284,
+    height: 26905.833956381306,
+  },
+  files: [],
+};
+export const Imagery3857: ConfigImagery = {
+  id: 'im_01FYWKATAEK2ZTJQ2PX44Y0XNT',
+  name: 'ōtorohanga_urban_2021_0-1m_RGB',
+  title: 'Ōtorohanga 0.1m Urban Aerial Photos (2021)',
+  category: 'Urban Aerial Photos',
+  projection: 3857,
+  tileMatrix: 'WebMercatorQuad',
+  uri: 's3://linz-basemaps/3857/ōtorohanga_urban_2021_0-1m_RGB/01FYWKATAEK2ZTJQ2PX44Y0XNT',
+  bounds: {
+    x: 19457809.920274343,
+    y: -4609458.55370921,
+    width: 51977.179234057665,
+    height: 30574.81131407339,
+  },
+  files: [],
+};
+
+export const Provider: ConfigProvider = {
+  name: 'main',
+  id: 'pv_main_production',
+  updatedAt: Date.now(),
+  version: 1,
+  serviceIdentification: {
+    accessConstraints: 'the accessConstraints',
+    description: 'the description',
+    fees: 'the fees',
+    title: 'the title',
+  },
+  serviceProvider: {
+    contact: {
+      address: {
+        city: 'the city',
+        country: 'the country',
+        deliveryPoint: 'the deliveryPoint',
+        email: 'email address',
+        postalCode: 'the postalCode',
+      },
+      individualName: 'the contact name',
+      phone: 'the phone',
+      position: 'the position',
+    },
+    name: 'the name',
+    site: 'https://example.provider.com',
+  },
+};

package/src/__tests__/index.test.ts

@@ -2,7 +2,7 @@ import { LogConfig } from '@basemaps/shared';
 import { LambdaAlbRequest, LambdaHttpRequest } from '@linzjs/lambda';
 import { Context } from 'aws-lambda';
 import o from 'ospec';
-import { handleRequest } from '../index.js';
+import { handler } from '../index.js';
 
 o.spec('LambdaXyz index', () => {
   function req(path: string, method = 'get'): LambdaHttpRequest {
@@ -36,7 +36,7 @@ o.spec('LambdaXyz index', () => {
       process.env.GIT_VERSION = '1.2.3';
       process.env.GIT_HASH = 'abc456';
 
-      const response = await handleRequest(req('/version'));
+      const response = await handler.router.handle(req('/v1/version'));
 
       o(response.status).equals(200);
       o(response.statusDescription).equals('ok');
@@ -49,7 +49,7 @@ o.spec('LambdaXyz index', () => {
   });
 
   o('should respond to /ping', async () => {
-    const res = await handleRequest(req('/ping'));
+    const res = await handler.router.handle(req('/v1/ping'));
     o(res.status).equals(200);
     o(res.statusDescription).equals('ok');
     o(res.header('cache-control')).equals('no-store');

package/src/__tests__/tile.set.cache.test.ts

@@ -1,6 +1,5 @@
 import { ConfigImagery, ConfigTileSetRaster, TileSetType } from '@basemaps/config';
-import { Epsg, GoogleTms, Nztm2000Tms } from '@basemaps/geo';
-import { Config, TileSetName } from '@basemaps/shared';
+import { GoogleTms } from '@basemaps/geo';
 import o from 'ospec';
 import sinon from 'sinon';
 import { TileSets } from '../tile.set.cache.js';
@@ -15,14 +14,6 @@ o.spec('TileSetCache', () => {
     uri: 's3://foo/bar',
   } as ConfigImagery;
 
-  const imageTwo = {
-    id: 'im_id2',
-    name: 'wellington_urban_2018-19_0-3m',
-    bounds: { x: 123, y: 456, width: 200, height: 300 },
-    files: [{ name: 'foo', x: 123, y: 456, width: 200, height: 300 }],
-    uri: 's3://foo/bar',
-  } as ConfigImagery;
-
   const imgMap = new Map<string, ConfigImagery>();
   imgMap.set(imageOne.id, imageOne);
 
@@ -86,61 +77,4 @@ o.spec('TileSetCache', () => {
       o(subTileSet).equals(null);
     });
   });
-
-  o.spec('loadTileSets', () => {
-    o('load all', async () => {
-      sandbox.stub(Config.TileSet, 'get');
-
-      TileSets.add(new TileSetRaster('aerial', GoogleTms));
-      TileSets.add(new TileSetRaster('aerial', Nztm2000Tms));
-      const tileSets = await TileSets.getAll('aerial', null);
-
-      o(tileSets.length).deepEquals(2);
-
-      o(tileSets[0].fullName).equals(TileSetName.aerial);
-      o(tileSets[0].components.name).equals(TileSetName.aerial);
-      o(tileSets[0].tileMatrix.projection.code).equals(3857);
-
-      o(tileSets[1].fullName).equals(TileSetName.aerial);
-      o(tileSets[1].components.name).equals(TileSetName.aerial);
-      o(tileSets[1].tileMatrix.projection.code).equals(2193);
-    });
-
-    o('load all subset projections', async () => {
-      sandbox.stub(Config.TileSet, 'get');
-
-      const ts1 = new TileSetRaster('aerial@head', Nztm2000Tms);
-      ts1.imagery = imgMap;
-      TileSets.add(ts1);
-      const ts2 = new TileSetRaster('aerial@head', GoogleTms);
-      ts2.imagery = imgMap;
-      TileSets.add(ts2);
-      const tileSets = await TileSets.getAll('aerial@head:tasman_rural_2018-19_0-3m', null);
-
-      o(tileSets.length).deepEquals(2);
-
-      o(tileSets[0].fullName).equals('aerial@head:tasman_rural_2018-19_0-3m');
-      o(tileSets[0].tileMatrix.projection).equals(Epsg.Google);
-      o(tileSets[1].fullName).equals('aerial@head:tasman_rural_2018-19_0-3m');
-      o(tileSets[1].tileMatrix.projection).equals(Epsg.Nztm2000);
-    });
-
-    o('load all @tag', async () => {
-      sandbox.stub(Config.TileSet, 'get');
-      const imgMap = new Map();
-      imgMap.set(imageOne.id, imageOne);
-      imgMap.set(imageTwo.id, imageTwo);
-      const ts1 = new TileSetRaster('aerial@head', Nztm2000Tms);
-      ts1.imagery = imgMap;
-      TileSets.add(ts1);
-
-      const tileSets = await TileSets.getAll('aerial@head', null);
-
-      o(tileSets.length).deepEquals(3);
-
-      o(tileSets[0].fullName).equals('aerial@head');
-      o(tileSets[1].fullName).equals('aerial@head:tasman_rural_2018-19_0-3m');
-      o(tileSets[2].fullName).equals('aerial@head:wellington_urban_2018-19_0-3m');
-    });
-  });
 });