@basemaps/lambda-tiler 6.29.0 → 6.32.0

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

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

package/dist/package-lock.json

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

package/dist/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/lambda-tiler",
-  "version": "6.29.0",
+  "version": "6.32.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -22,17 +22,17 @@
   "types": "./build/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@basemaps/config": "^6.29.0",
-    "@basemaps/geo": "^6.28.1",
+    "@basemaps/config": "^6.32.0",
+    "@basemaps/geo": "^6.31.0",
     "@basemaps/lambda": "^6.7.0",
-    "@basemaps/shared": "^6.29.0",
-    "@basemaps/tiler": "^6.29.0",
-    "@basemaps/tiler-sharp": "^6.29.0",
+    "@basemaps/shared": "^6.32.0",
+    "@basemaps/tiler": "^6.31.0",
+    "@basemaps/tiler-sharp": "^6.32.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.1",
     "p-limit": "^4.0.0",
     "path-to-regexp": "^6.1.0",
     "pixelmatch": "^5.1.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": "9097d2f045d734d0d5acd968f026fe29ab6afcda"
+  "gitHead": "cf9e8d4e61f7634acf51b9a837bbab6889761f1b"
 }

package/src/__tests__/config.data.ts

@@ -0,0 +1,120 @@
+import { ConfigImagery, ConfigProvider, ConfigTileSetRaster, ConfigTileSetVector, TileSetType } from '@basemaps/config';
+import { ImageFormat, VectorFormat } 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 TileSetVector: ConfigTileSetVector = {
+  id: 'ts_topographic',
+  type: TileSetType.Vector,
+  name: 'topotgrpahic',
+  description: 'topotgrpahic__description',
+  title: 'topotgrpahic Imagery',
+  category: 'Basemap',
+  format: VectorFormat.MapboxVectorTiles,
+  layers: [
+    {
+      3857: 's3://linz-basemaps/01G7WQMGHB7V946M0YWJJBZ6DW/topopgraphic.tar.co',
+      title: 'Vector tiles',
+      category: 'Vector Tiles',
+      name: 'Vector tiles',
+    },
+  ],
+};
+
+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_linz',
+  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',
+  },
+};
+
+export class FakeData {
+  static tileSetRaster(name: string): ConfigTileSetRaster {
+    const tileSet = JSON.parse(JSON.stringify(TileSetAerial));
+
+    tileSet.name = name;
+    tileSet.id = `ts_${name}`;
+
+    return tileSet;
+  }
+
+  static tileSetVector(name: string): ConfigTileSetVector {
+    const tileSet = JSON.parse(JSON.stringify(TileSetVector));
+
+    tileSet.name = name;
+    tileSet.id = `ts_${name}`;
+
+    return tileSet;
+  }
+}

package/src/__tests__/index.test.ts

@@ -1,24 +1,8 @@
-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';
+import { mockRequest } from './xyz.util.js';
 
 o.spec('LambdaXyz index', () => {
-  function req(path: string, method = 'get'): LambdaHttpRequest {
-    return new LambdaAlbRequest(
-      {
-        requestContext: null as any,
-        httpMethod: method.toUpperCase(),
-        path,
-        body: null,
-        isBase64Encoded: false,
-      },
-      {} as Context,
-      LogConfig.get(),
-    );
-  }
-
   o('should export handler', async () => {
     const foo = await import('../index.js');
     o(typeof foo.handler).equals('function');
@@ -36,7 +20,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(mockRequest('/v1/version'));
 
       o(response.status).equals(200);
       o(response.statusDescription).equals('ok');
@@ -49,7 +33,7 @@ o.spec('LambdaXyz index', () => {
   });
 
   o('should respond to /ping', async () => {
-    const res = await handleRequest(req('/ping'));
+    const res = await handler.router.handle(mockRequest('/v1/ping'));
     o(res.status).equals(200);
     o(res.statusDescription).equals('ok');
     o(res.header('cache-control')).equals('no-store');