@basemaps/lambda-tiler 6.19.0 → 6.22.0

package/CHANGELOG.md

@@ -3,6 +3,63 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.22.0](https://github.com/linz/basemaps/compare/v6.21.1...v6.22.0) (2022-03-20)
+
+**Note:** Version bump only for package @basemaps/lambda-tiler
+
+
+
+
+
+## [6.21.1](https://github.com/linz/basemaps/compare/v6.21.0...v6.21.1) (2022-03-17)
+
+
+### Bug Fixes
+
+* **lambda-tiler:** bundle the exact version of sharp from the yarn.lock  ([#2114](https://github.com/linz/basemaps/issues/2114)) ([a193e41](https://github.com/linz/basemaps/commit/a193e4172c63349e745e8bfcbb78ac919e52f1dd))
+* **lambda-tiler:** scripts should be specific to the module type ([#2115](https://github.com/linz/basemaps/issues/2115)) ([04c6f87](https://github.com/linz/basemaps/commit/04c6f8777ec722f1dc918757dd79043bd88d5e9a))
+
+
+
+
+
+# [6.21.0](https://github.com/linz/basemaps/compare/v6.20.0...v6.21.0) (2022-03-17)
+
+
+### Bug Fixes
+
+* **config:** fetch all unprocessed keys from dynamo if there are any ([#2101](https://github.com/linz/basemaps/issues/2101)) ([731430e](https://github.com/linz/basemaps/commit/731430e73756f05b2684f5b7ae7bd2852bc0a9b5))
+
+
+### Features
+
+* **config:** remove imagery year and resoltuion from config as it is not used ([#2097](https://github.com/linz/basemaps/issues/2097)) ([8be7c09](https://github.com/linz/basemaps/commit/8be7c09b9ce64898e5ab54b7fcb74c34405f558e))
+* **lambda-tiler:** limit request tracing to 100 requests ([#2095](https://github.com/linz/basemaps/issues/2095)) ([f86fc30](https://github.com/linz/basemaps/commit/f86fc30aefcd2ddbfe2ffe43547338d36c152315))
+* **lambda-tiler:** trace all requests to source ([#2093](https://github.com/linz/basemaps/issues/2093)) ([a2ca049](https://github.com/linz/basemaps/commit/a2ca049bd11505882105cb525a3f28f84c10611a))
+
+
+### Reverts
+
+* Revert "release: v6.21.0 (#2104)" (#2111) ([d07f8ab](https://github.com/linz/basemaps/commit/d07f8ab4037466b060bf7e83960737554ff064b4)), closes [#2104](https://github.com/linz/basemaps/issues/2104) [#2111](https://github.com/linz/basemaps/issues/2111)
+* Revert "release: v6.22.0 (#2108)" (#2110) ([abcd2e4](https://github.com/linz/basemaps/commit/abcd2e4732a6d606eed865f526d6df2e4617aad3)), closes [#2108](https://github.com/linz/basemaps/issues/2108) [#2110](https://github.com/linz/basemaps/issues/2110)
+* Revert "release: v6.21.0 (#2104)" (#2107) ([2c7e7f6](https://github.com/linz/basemaps/commit/2c7e7f6686a293995abdeb9604413808f2208bd6)), closes [#2104](https://github.com/linz/basemaps/issues/2104) [#2107](https://github.com/linz/basemaps/issues/2107)
+
+
+
+
+
+# [6.20.0](https://github.com/linz/basemaps/compare/v6.19.0...v6.20.0) (2022-02-01)
+
+
+### Features
+
+* **lambda-tiler:** allow relative sprites and glyphs ([#2071](https://github.com/linz/basemaps/issues/2071)) ([a283157](https://github.com/linz/basemaps/commit/a283157f6b11fd9f6168edd19e9d5624f52d0325))
+* **lambda-tiler:** wip esri vectortileserver interface for vector tiles ([#2041](https://github.com/linz/basemaps/issues/2041)) ([0549d68](https://github.com/linz/basemaps/commit/0549d688ae44c20bd8dce0281988c7ba258fdacb))
+
+
+
+
+
 # [6.19.0](https://github.com/linz/basemaps/compare/v6.18.1...v6.19.0) (2021-12-20)
 
 

package/LICENSE

@@ -1,6 +1,6 @@
-Basemaps MIT Licence
+MIT License
 
-Crown copyright (c) 2020, Land Information New Zealand on behalf of the New Zealand Government.
+Crown copyright (c), Toitū Te Whenua Land Information New Zealand on behalf of the New Zealand Government.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/build/__test__/tile.set.cache.test.js

@@ -1,3 +1,4 @@
+import { TileSetType } from '@basemaps/config';
 import { Epsg, GoogleTms, Nztm2000Tms } from '@basemaps/geo';
 import { Config, TileSetName } from '@basemaps/shared';
 import o from 'ospec';
@@ -22,13 +23,6 @@ o.spec('TileSetCache', () => {
     };
     const imgMap = new Map();
     imgMap.set(imageOne.id, imageOne);
-    o.beforeEach(() => {
-        sandbox.stub(Config, 'getTileSetImagery').callsFake(async () => {
-            const imgMap = new Map();
-            imgMap.set(imageOne.id, imageOne);
-            return imgMap;
-        });
-    });
     o.afterEach(() => {
         TileSets.cache.clear();
         sandbox.restore();
@@ -37,7 +31,7 @@ o.spec('TileSetCache', () => {
         o('load individual set', async () => {
             TileSets.add(new TileSetRaster('aerial@head', GoogleTms));
             const parentTileSet = await TileSets.get('aerial@head', GoogleTms);
-            if (parentTileSet == null || parentTileSet.isVector())
+            if (parentTileSet == null || parentTileSet.type === TileSetType.Vector)
                 throw new Error('null parentTileSet');
             parentTileSet.imagery = imgMap;
             parentTileSet.tileSet = {
@@ -46,7 +40,7 @@ o.spec('TileSetCache', () => {
                 background: { r: 200, g: 50, b: 100, alpha: 0.5 },
             };
             const subTileSet = await TileSets.get('aerial@head:tasman_rural_2018-19_0-3m', GoogleTms);
-            if (subTileSet == null || subTileSet.isVector())
+            if (subTileSet == null || subTileSet.type === TileSetType.Vector)
                 throw new Error('null subTileSet');
             o(subTileSet.title).equals('parent aerial title Tasman rural 2018-19 0.3m');
             o(subTileSet.fullName).equals('aerial@head:tasman_rural_2018-19_0-3m');
@@ -68,7 +62,7 @@ o.spec('TileSetCache', () => {
             TileSets.cache.delete(subTileSet.id);
             delete parentTileSet.tileSet.title;
             const subTileSetB = await TileSets.get('aerial@head:tasman_rural_2018-19_0-3m', GoogleTms);
-            if (subTileSetB == null || subTileSetB.isVector())
+            if (subTileSetB == null || subTileSetB.type === TileSetType.Vector)
                 throw new Error('null subTileSetB');
             o(subTileSetB.title).equals('parent Tasman rural 2018-19 0.3m');
         });

package/build/__test__/tile.style.json.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=tile.style.json.test.d.ts.map

package/build/__test__/tile.style.json.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tile.style.json.test.d.ts","sourceRoot":"","sources":["../../src/__test__/tile.style.json.test.ts"],"names":[],"mappings":""}

package/build/__test__/tile.style.json.test.js

@@ -0,0 +1,33 @@
+import { Env } from '@basemaps/shared';
+import o from 'ospec';
+import { convertRelativeUrl } from '../routes/tile.style.json.js';
+o.spec('TileStyleJson', () => {
+    const host = 'https://tiles.test';
+    let originalHost;
+    o.beforeEach(() => {
+        originalHost = process.env[Env.PublicUrlBase];
+        process.env[Env.PublicUrlBase] = host;
+    });
+    o.afterEach(() => {
+        process.env[Env.PublicUrlBase] = originalHost;
+    });
+    o('should not convert empty urls', () => {
+        o(convertRelativeUrl()).equals('');
+        o(convertRelativeUrl('')).equals('');
+        o(convertRelativeUrl(undefined)).equals('');
+    });
+    o('should only convert relative urls', () => {
+        o(convertRelativeUrl('/foo')).equals('https://tiles.test/foo');
+        o(convertRelativeUrl('/bar/baz/')).equals('https://tiles.test/bar/baz/');
+    });
+    o('should only convert with api keys', () => {
+        o(convertRelativeUrl('/foo', 'abc')).equals('https://tiles.test/foo?api=abc');
+        o(convertRelativeUrl('/bar/baz/', 'abc')).equals('https://tiles.test/bar/baz/?api=abc');
+    });
+    o('should convert with other query params', () => {
+        o(convertRelativeUrl('/foo?bar=baz', 'abc')).equals('https://tiles.test/foo?bar=baz&api=abc');
+    });
+    o('should not convert full urls', () => {
+        o(convertRelativeUrl('https://foo.com/foo?bar=baz', 'abc')).equals('https://foo.com/foo?bar=baz');
+    });
+});

package/build/__test__/xyz.test.js

@@ -2,16 +2,18 @@ import { TileMatrixSets } from '@basemaps/geo';
 import { Config, Env, LogConfig, VNodeParser } from '@basemaps/shared';
 import { round } from '@basemaps/test/build/rounding.js';
 import o from 'ospec';
+import sinon from 'sinon';
 import { handleRequest } from '../index.js';
-import { TileComposer } from '../routes/tile.js';
 import { TileEtag } from '../routes/tile.etag.js';
 import { TileSets } from '../tile.set.cache.js';
+import { TileComposer } from '../tile.set.raster.js';
 import { FakeTileSet, mockRequest, Provider } from './xyz.util.js';
-import sinon from 'sinon';
 const sandbox = sinon.createSandbox();
 const TileSetNames = ['aerial', 'aerial@head', 'aerial@beta', '01E7PJFR9AMQFJ05X9G7FQ3XMW'];
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
 o.spec('LambdaXyz', () => {
+    const host = 'https://tiles.test';
+    const origPublicUrlBase = process.env[Env.PublicUrlBase];
     /** Generate mock ALBEvent */
     let rasterMock = o.spy();
     const generateMock = o.spy(() => 'foo');
@@ -21,6 +23,7 @@ o.spec('LambdaXyz', () => {
     const apiKey = 'd01f7w7rnhdzg0p7fyrc9v9ard1';
     const apiKeyHeader = { 'x-linz-api-key': 'd01f7w7rnhdzg0p7fyrc9v9ard1' };
     o.beforeEach(() => {
+        process.env[Env.PublicUrlBase] = host;
         LogConfig.disable();
         // tileMock = o.spy(() => tileMockData) as any;
         rasterMock = o.spy(() => {
@@ -45,6 +48,7 @@ o.spec('LambdaXyz', () => {
         TileSets.cache.clear();
         TileComposer.compose = origCompose;
         TileEtag.generate = origTileEtag;
+        process.env[Env.PublicUrlBase] = origPublicUrlBase;
         sandbox.restore();
     });
     o('should export handler', async () => {
@@ -115,11 +119,8 @@ o.spec('LambdaXyz', () => {
         }
     });
     o.spec('WMTSCapabilities', () => {
-        const origPublicUrlBase = process.env[Env.PublicUrlBase];
-        o.after(() => {
-            process.env[Env.PublicUrlBase] = origPublicUrlBase;
-        });
         o('should 304 if a xml is not modified', async () => {
+            delete process.env[Env.PublicUrlBase];
             o.timeout(1000);
             const key = 'NuirTK8fozzCJV1iG1FznmdHhKvk6WaWuDhhEA1d40c=';
             const request = mockRequest('/v1/tiles/WMTSCapabilities.xml', 'get', {
@@ -137,8 +138,6 @@ o.spec('LambdaXyz', () => {
         });
         o('should serve WMTSCapabilities for tile_set', async () => {
             var _a;
-            console.log('\n\nTestStart');
-            process.env[Env.PublicUrlBase] = 'https://tiles.test';
             const request = mockRequest('/v1/tiles/aerial@beta/WMTSCapabilities.xml', 'get', apiKeyHeader);
             const res = await handleRequest(request);
             o(res.status).equals(200);
@@ -153,12 +152,9 @@ o.spec('LambdaXyz', () => {
         });
     });
     o.spec('tileJson', () => {
-        const origPublicUrlBase = process.env[Env.PublicUrlBase];
-        o.after(() => {
-            process.env[Env.PublicUrlBase] = origPublicUrlBase;
-        });
         o('should 304 if a json is not modified', async () => {
-            const key = 'XecTdbcdjCyzB1MHOOQbrOkD2TTJ0ORh4JuXqhxXEE0=';
+            // delete process.env[Env.PublicUrlBase];
+            const key = 'BBfQpNXA3Q90jlFrLSOZhxbvfOh7OpN1OEE+BylpbHw=';
             const request = mockRequest('/v1/tiles/tile.json', 'get', { 'if-none-match': key, ...apiKeyHeader });
             const res = await handleRequest(request);
             if (res.status === 200) {
@@ -169,9 +165,19 @@ o.spec('LambdaXyz', () => {
             o(rasterMock.calls.length).equals(0);
             o(request.logContext['cache']).deepEquals({ key, match: key, hit: true });
         });
+        o('should 200 if a invalid etag is given', async () => {
+            var _a;
+            const key = 'ABCXecTdbcdjCyzB1MHOOQbrOkD2TTJ0ORh4JuXqhxXEE0=';
+            const request = mockRequest('/v1/tiles/tile.json', 'get', { 'if-none-match': key, ...apiKeyHeader });
+            const res = await handleRequest(request);
+            o(res.status).equals(200);
+            o(res.header('etag')).equals('BBfQpNXA3Q90jlFrLSOZhxbvfOh7OpN1OEE+BylpbHw=');
+            const out = JSON.parse(Buffer.from((_a = res.body) !== null && _a !== void 0 ? _a : '', 'base64').toString());
+            o(out.tiles[0].startsWith('https://tiles.test/v1/tiles/tile.json/undefined/{z}/{x}/{y}.pbf?api=')).equals(true);
+            o(request.logContext['cache']).deepEquals(undefined);
+        });
         o('should serve tile json for tile_set', async () => {
             var _a;
-            process.env[Env.PublicUrlBase] = 'https://tiles.test';
             const request = mockRequest('/v1/tiles/topographic/Google/tile.json', 'get', apiKeyHeader);
             const res = await handleRequest(request);
             o(res.status).equals(200);
@@ -188,12 +194,7 @@ o.spec('LambdaXyz', () => {
         });
     });
     o.spec('styleJson', () => {
-        const origPublicUrlBase = process.env[Env.PublicUrlBase];
-        o.after(() => {
-            process.env[Env.PublicUrlBase] = origPublicUrlBase;
-        });
         o('should not found style json', async () => {
-            process.env[Env.PublicUrlBase] = 'https://tiles.test';
             const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', apiKeyHeader);
             sandbox.stub(Config.Style, 'get').resolves(null);
             const res = await handleRequest(request);
@@ -201,8 +202,6 @@ o.spec('LambdaXyz', () => {
         });
         o('should serve style json', async () => {
             var _a;
-            const host = 'https://tiles.test';
-            process.env[Env.PublicUrlBase] = host;
             const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', apiKeyHeader);
             const fakeStyle = {
                 version: 8,
@@ -243,8 +242,8 @@ o.spec('LambdaXyz', () => {
                         minzoom: 0,
                     },
                 ],
-                glyphs: 'glyphs',
-                sprite: 'sprite',
+                glyphs: '/glyphs',
+                sprite: '/sprite',
                 metadata: { id: 'test' },
             };
             const fakeRecord = {
@@ -270,6 +269,8 @@ o.spec('LambdaXyz', () => {
                 type: 'raster',
                 tiles: [`${host}/raster/{z}/{x}/{y}.webp?api=${apiKey}`],
             };
+            fakeStyle.sprite = `${host}/sprite`;
+            fakeStyle.glyphs = `${host}/glyphs`;
             o(JSON.parse(body)).deepEquals(fakeStyle);
         });
     });

package/build/cli/dump.js

@@ -3,7 +3,7 @@ import { LogConfig } from '@basemaps/shared';
 import { ImageFormat } from '@basemaps/tiler';
 import { LambdaAlbRequest } from '@linzjs/lambda';
 import { promises as fs } from 'fs';
-import { TileRoute } from '../routes/tile.js';
+import { tileXyz } from '../routes/tile.xyz.js';
 import { TileSets } from '../tile.set.cache.js';
 import { TileSetLocal } from './tile.set.local.js';
 const xyz = { x: 0, y: 0, z: 0 };
@@ -36,7 +36,7 @@ async function main() {
         httpMethod: 'get',
         path: `/v1/tiles/${tileSet.fullName}/${tileMatrix.identifier}/${xyz.z}/${xyz.x}/${xyz.y}.${ext}`,
     }, {}, logger);
-    const tileData = await TileRoute.tile(ctx);
+    const tileData = await tileXyz(ctx);
     const headers = {};
     for (const [key, value] of tileData.headers)
         headers[key] = value;

package/build/cli/validate.js

@@ -1,3 +1,4 @@
+import { TileSetType } from '@basemaps/config';
 import { GoogleTms } from '@basemaps/geo';
 import { Env, fsa, LogConfig, TileSetName } from '@basemaps/shared';
 import { CogTiff } from '@cogeotiff/core';
@@ -12,7 +13,7 @@ async function main() {
     const tileSet = await TileSets.get(TileSetName.aerial, GoogleTms);
     if (tileSet == null)
         throw new Error('No tile set found');
-    if (tileSet.isVector())
+    if (tileSet.type === TileSetType.Vector)
         throw new Error('Invalid tile set type');
     let errorCount = 0;
     const logger = LogConfig.get();

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAkB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkBvF;AAED,eAAO,MAAM,OAAO,2LAA0C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAqB3E,wBAAsB,aAAa,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BvF;AAED,eAAO,MAAM,OAAO,2LAA0C,CAAC"}

package/build/index.js

@@ -6,14 +6,19 @@ import { Tiles } from './routes/tile.js';
 import { Router } from './router.js';
 import { createHash } from 'crypto';
 import { Imagery } from './routes/imagery.js';
+import { Esri } from './routes/esri/rest.js';
+import { St } from './source.tracer.js';
 const app = new Router();
 app.get('ping', Ping);
 app.get('health', Health);
 app.get('version', Version);
 app.get('tiles', Tiles);
 app.get('imagery', Imagery);
+app.get('esri', Esri);
 let slowTimer = null;
 export async function handleRequest(req) {
+    // Reset the request tracing
+    St.reset();
     // Warn if a request takes more than 10 seconds to process
     if (slowTimer)
         clearTimeout(slowTimer);
@@ -26,7 +31,11 @@ export async function handleRequest(req) {
             const apiKeyHash = createHash('sha256').update(apiKey).digest('base64');
             req.set('api', apiKeyHash);
         }
-        return await app.handle(req);
+        const ret = await app.handle(req);
+        // TODO this could be relaxed to every say 5% of requests if logging gets too verbose.
+        req.set('requests', St.requests.slice(0, 100)); // limit to 100 requests (some tiles need 100s of requests)
+        req.set('requestCount', St.requests.length);
+        return ret;
     }
     finally {
         if (slowTimer)

package/build/routes/__test__/attribution.test.js

@@ -157,7 +157,6 @@ const ExpectedJson = {
             },
             links: [],
             summaries: {
-                gsd: [0.75],
                 'linz:zoom': {
                     min: 14,
                     max: 16,
@@ -188,7 +187,6 @@ const ExpectedJson = {
             },
             links: [],
             summaries: {
-                gsd: [0.75],
                 'linz:zoom': {
                     min: 15,
                     max: 17,
@@ -219,7 +217,6 @@ const ExpectedJson = {
             },
             links: [],
             summaries: {
-                gsd: [0.75],
                 'linz:zoom': {
                     min: 16,
                     max: 18,
@@ -250,7 +247,6 @@ const ExpectedJson = {
             },
             links: [],
             summaries: {
-                gsd: [0.75],
                 'linz:zoom': {
                     min: 14,
                     max: 16,
@@ -261,15 +257,13 @@ const ExpectedJson = {
     ],
     links: [],
 };
-function makeImageRecord(id, name, x = 10, year = 2019) {
+function makeImageRecord(id, name, x = 10) {
     return {
         id,
         name,
         projection: EpsgCode.Google,
-        year,
         uri: 's3://bucket/path/' + name,
         bounds: GoogleTms.tileToSourceBounds({ x, y: 10, z: 5 }),
-        resolution: 750,
         files: [0, 1].map((i) => {
             const b = GoogleTms.tileToSourceBounds({ x, y: 10, z: 5 }).toJson();
             b.name = name + i;
@@ -343,18 +337,14 @@ o.spec('attribution', () => {
                         name: 'p1',
                     },
                 ],
-                summaries: {
-                    gsd: [0.75],
-                },
+                summaries: {},
             };
             mockFs.jsStore['s3://bucket/path/image2/collection.json'] = {
                 extent: {
                     spatial: { bbox: [5, 6, 7, 8] },
                     temporal: { interval: [['2016-02-03T01:02:03Z', '2018-09-13T11:32:43Z']] },
                 },
-                summaries: {
-                    gsd: [0.5],
-                },
+                summaries: {},
             };
             const request = mockRequest(`/v1/attribution/aerial/EPSG:3857/summary.json`);
             const res = await attribution(request);

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

@@ -1 +1 @@
-{"version":3,"file":"attribution.d.ts","sourceRoot":"","sources":["../../src/routes/attribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EACL,qBAAqB,EAOrB,cAAc,EACd,UAAU,EAEX,MAAM,eAAe,CAAC;AACvB,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAcnF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAsEtD,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,UAAU,GACjB,qBAAqB,CAsBvB;AAiFD;;GAEG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkCrF"}
+{"version":3,"file":"attribution.d.ts","sourceRoot":"","sources":["../../src/routes/attribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,cAAc,EAAe,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EACL,qBAAqB,EAOrB,cAAc,EACd,UAAU,EAEX,MAAM,eAAe,CAAC;AAYvB,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAInF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AA2DtD,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,UAAU,GACjB,qBAAqB,CAqBvB;AAiFD;;GAEG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkCrF"}

package/build/routes/attribution.js

@@ -1,10 +1,11 @@
+import { TileSetType } from '@basemaps/config';
 import { Bounds, GoogleTms, Stac, TileMatrixSet, } from '@basemaps/geo';
-import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import { CompositeError, Config, extractYearRangeFromName, fsa, Projection, setNameAndProjection, tileAttributionFromPath, titleizeImageryName, } from '@basemaps/shared';
 import { multiPolygonToWgs84, union, Wgs84 } from '@linzjs/geojson';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import { createHash } from 'crypto';
-import { TileSets } from '../tile.set.cache.js';
 import { Router } from '../router.js';
+import { TileSets } from '../tile.set.cache.js';
 /** Amount to pad imagery bounds to avoid fragmenting polygons  */
 const SmoothPadding = 1 + 1e-10; // about 1/100th of a millimeter at equator
 const NotFound = new LambdaHttpResponse(404, 'Not Found');
@@ -52,21 +53,8 @@ async function readStac(uri) {
         throw err;
     }
 }
-/** Attempt to find the GSD from a stack summary object */
-function getGsd(un) {
-    if (un == null)
-        return null;
-    const gsd = un['gsd'];
-    if (gsd == null)
-        return null;
-    if (!Array.isArray(gsd))
-        return null;
-    if (isNaN(gsd[0]))
-        return null;
-    return gsd[0];
-}
 export function createAttributionCollection(tileSet, stac, imagery, layer, host, extent) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const tileMatrix = tileSet.tileMatrix;
     return {
         stac_version: Stac.Version,
@@ -80,7 +68,6 @@ export function createAttributionCollection(tileSet, stac, imagery, layer, host,
         extent,
         links: [],
         summaries: {
-            gsd: [(_e = getGsd(stac === null || stac === void 0 ? void 0 : stac.summaries)) !== null && _e !== void 0 ? _e : imagery.resolution / 1000],
             'linz:zoom': {
                 min: TileMatrixSet.convertZoomLevel(layer.minZoom ? layer.minZoom : 0, GoogleTms, tileMatrix, true),
                 max: TileMatrixSet.convertZoomLevel(layer.maxZoom ? layer.maxZoom : 32, GoogleTms, tileMatrix, true),
@@ -102,7 +89,7 @@ async function tileSetAttribution(tileSet) {
     const items = [];
     // read all stac files in parallel
     for (const layer of tileSet.tileSet.layers) {
-        const imgId = Config.getImageId(layer, proj.epsg);
+        const imgId = layer[proj.epsg.code];
         if (imgId == null)
             continue;
         const im = tileSet.imagery.get(imgId);
@@ -116,7 +103,7 @@ async function tileSetAttribution(tileSet) {
     if (host == null)
         return null;
     for (const layer of tileSet.tileSet.layers) {
-        const imgId = Config.getImageId(layer, proj.epsg);
+        const imgId = layer[proj.epsg.code];
         if (imgId == null)
             continue;
         const im = tileSet.imagery.get(imgId);
@@ -177,7 +164,7 @@ export async function attribution(req) {
     req.timer.start('tileset:load');
     const tileSet = await TileSets.get(data.name, data.tileMatrix);
     req.timer.end('tileset:load');
-    if (tileSet == null || tileSet.isVector())
+    if (tileSet == null || tileSet.type === TileSetType.Vector)
         return NotFound;
     const cacheKey = createHash('sha256').update(JSON.stringify(tileSet.tileSet)).digest('base64');
     const ifNoneMatch = req.header(HttpHeader.IfNoneMatch);

package/build/routes/esri/rest.d.ts

@@ -0,0 +1,10 @@
+import { TileMatrixSet } from '@basemaps/geo';
+import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+export declare function vectorTileServer(req: LambdaHttpRequest, layerId: string, tms: TileMatrixSet): Promise<LambdaHttpResponse>;
+/**
+ * /v1/esri/services/:layerId/VectorTileServer
+ *
+ * @example http://localhost:5000/v1/esri/services/topographic/VectorTileServer
+ */
+export declare function Esri(req: LambdaHttpRequest): Promise<LambdaHttpResponse>;
+//# sourceMappingURL=rest.d.ts.map

package/build/routes/esri/rest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rest.d.ts","sourceRoot":"","sources":["../../../src/routes/esri/rest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,aAAa,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKvE,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,iBAAiB,EACtB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,kBAAkB,CAAC,CAiD7B;AAED;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsB9E"}

package/build/routes/esri/rest.js

@@ -0,0 +1,87 @@
+import { GoogleTms } from '@basemaps/geo';
+import { tileXyzFromPath } from '@basemaps/shared';
+import { LambdaHttpResponse } from '@linzjs/lambda';
+import { Router } from '../../router.js';
+import { TileSets } from '../../tile.set.cache.js';
+import { NotFound } from '../response.js';
+export async function vectorTileServer(req, layerId, tms) {
+    if (tms.identifier !== GoogleTms.identifier)
+        return NotFound;
+    const extent = {
+        xmin: tms.extent.x,
+        ymin: tms.extent.y,
+        xmax: tms.extent.right,
+        ymax: tms.extent.bottom,
+        // TODO where is wkid from
+        spatialReference: { wkid: 102100, latestWkid: tms.projection.code },
+    };
+    const res = new LambdaHttpResponse(200, 'ok');
+    res.json({
+        currentVersion: 10.4,
+        name: layerId,
+        capabilities: 'TilesOnly',
+        type: 'indexedVector',
+        tileMap: 'tilemap',
+        defaultStyles: 'resources/styles',
+        tiles: ['tiles/{z}/{x}/{y}.pbf'],
+        exportTilesAllowed: false,
+        maxExportTilesCount: 0,
+        initialExtent: extent,
+        fullExtent: extent,
+        minScale: tms.zooms[0].scaleDenominator,
+        maxScale: tms.zooms[tms.zooms.length - 1].scaleDenominator,
+        tileInfo: {
+            // TODO are all the pbf 256x256?
+            rows: 256,
+            cols: 256,
+            dpi: 96,
+            format: 'pbf',
+            origin: { x: tms.extent.x, y: tms.extent.bottom },
+            spatialReference: { wkid: 102100, latestWkid: tms.projection.code },
+            lods: tms.zooms.map((c, i) => {
+                return {
+                    level: i,
+                    scale: c.scaleDenominator,
+                    resolution: c.scaleDenominator * 0.28e-3,
+                };
+            }),
+        },
+        resourceInfo: {
+            styleVersion: 8,
+            tileCompression: 'gzip',
+            cacheInfo: { storageInfo: { packetSize: 128, storageFormat: 'compactV2' } },
+        },
+    });
+    return res;
+}
+/**
+ * /v1/esri/services/:layerId/VectorTileServer
+ *
+ * @example http://localhost:5000/v1/esri/services/topographic/VectorTileServer
+ */
+export async function Esri(req) {
+    const { rest } = Router.action(req);
+    if (rest[0] !== 'services')
+        return NotFound;
+    const layerId = rest[1];
+    if (layerId == null)
+        return NotFound;
+    const serviceId = rest[2];
+    if (serviceId !== 'VectorTileServer')
+        return NotFound;
+    if (rest.length === 3)
+        return vectorTileServer(req, layerId, GoogleTms);
+    if (rest[rest.length - 1].endsWith('.pbf')) {
+        const generatedPath = [layerId, GoogleTms.identifier, ...rest.slice(rest.length - 3)];
+        const xyz = tileXyzFromPath(generatedPath);
+        if (xyz == null)
+            return NotFound;
+        req.timer.start('tileset:load');
+        const tileSet = await TileSets.get(xyz.name, xyz.tileMatrix);
+        req.timer.end('tileset:load');
+        if (tileSet == null)
+            return NotFound;
+        return await tileSet.tile(req, xyz);
+    }
+    return new LambdaHttpResponse(200, 'ok');
+}

package/build/routes/imagery.d.ts

@@ -1,6 +1,8 @@
 import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 /**
  * Get metadata around the imagery such as the source bounding box or the bounding box of the COGS
+ *
+ * @example
  * - /v1/imagery/:imageryId/source.geojson
  * - /v1/imagery/:imageryId/covering.geojson
  */

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

@@ -1 +1 @@
-{"version":3,"file":"imagery.d.ts","sourceRoot":"","sources":["../../src/routes/imagery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAgBnF;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0BjF"}
+{"version":3,"file":"imagery.d.ts","sourceRoot":"","sources":["../../src/routes/imagery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAgBnF;;;;;;GAMG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0BjF"}

package/build/routes/imagery.js

@@ -5,8 +5,8 @@ import { createHash } from 'crypto';
 import { promisify } from 'util';
 import { gzip } from 'zlib';
 import { Router } from '../router.js';
+import { NotModified } from './response.js';
 import { TileEtag } from './tile.etag.js';
-import { NotModified } from './tile.js';
 const gzipP = promisify(gzip);
 function isAllowedFile(f) {
     if (f.endsWith('.geojson'))
@@ -17,6 +17,8 @@ function isAllowedFile(f) {
 }
 /**
  * Get metadata around the imagery such as the source bounding box or the bounding box of the COGS
+ *
+ * @example
  * - /v1/imagery/:imageryId/source.geojson
  * - /v1/imagery/:imageryId/covering.geojson
  */

package/build/routes/response.d.ts

@@ -0,0 +1,4 @@
+import { LambdaHttpResponse } from '@linzjs/lambda';
+export declare const NotFound: LambdaHttpResponse;
+export declare const NotModified: LambdaHttpResponse;
+//# sourceMappingURL=response.d.ts.map