@basemaps/lambda-tiler 6.34.0 → 6.35.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +28 -0
- package/build/__tests__/config.data.d.ts +2 -1
- package/build/__tests__/config.data.d.ts.map +1 -1
- package/build/__tests__/config.data.js +14 -1
- package/build/__tests__/config.data.js.map +1 -1
- package/build/__tests__/tile.style.json.test.js +17 -3
- package/build/__tests__/tile.style.json.test.js.map +1 -1
- package/build/__tests__/wmts.capability.test.js +17 -0
- package/build/__tests__/wmts.capability.test.js.map +1 -1
- package/build/arcgis/__tests__/arcgis.style.json.test.js +18 -15
- package/build/arcgis/__tests__/arcgis.style.json.test.js.map +1 -1
- package/build/arcgis/__tests__/vector.tiler.server.test.js +14 -7
- package/build/arcgis/__tests__/vector.tiler.server.test.js.map +1 -1
- package/build/arcgis/arcgis.style.json.d.ts.map +1 -1
- package/build/arcgis/arcgis.style.json.js +6 -4
- package/build/arcgis/arcgis.style.json.js.map +1 -1
- package/build/arcgis/vector.tile.server.d.ts.map +1 -1
- package/build/arcgis/vector.tile.server.js +4 -2
- package/build/arcgis/vector.tile.server.js.map +1 -1
- package/build/index.d.ts +1 -3
- package/build/index.d.ts.map +1 -1
- package/build/index.js +7 -8
- package/build/index.js.map +1 -1
- package/build/routes/__tests__/attribution.test.js +3 -2
- package/build/routes/__tests__/attribution.test.js.map +1 -1
- package/build/routes/__tests__/fonts.test.js +36 -7
- package/build/routes/__tests__/fonts.test.js.map +1 -1
- package/build/routes/__tests__/health.test.js +4 -2
- package/build/routes/__tests__/health.test.js.map +1 -1
- package/build/routes/__tests__/sprites.test.js +3 -4
- package/build/routes/__tests__/sprites.test.js.map +1 -1
- package/build/routes/__tests__/tile.json.test.js +24 -2
- package/build/routes/__tests__/tile.json.test.js.map +1 -1
- package/build/routes/__tests__/tile.style.json.test.js +58 -7
- package/build/routes/__tests__/tile.style.json.test.js.map +1 -1
- package/build/routes/__tests__/wmts.test.js +17 -14
- package/build/routes/__tests__/wmts.test.js.map +1 -1
- package/build/routes/__tests__/xyz.test.js +4 -2
- package/build/routes/__tests__/xyz.test.js.map +1 -1
- package/build/routes/attribution.d.ts.map +1 -1
- package/build/routes/attribution.js +20 -10
- package/build/routes/attribution.js.map +1 -1
- package/build/routes/config.d.ts +22 -0
- package/build/routes/config.d.ts.map +1 -0
- package/build/routes/config.js +63 -0
- package/build/routes/config.js.map +1 -0
- package/build/routes/health.d.ts.map +1 -1
- package/build/routes/health.js +3 -2
- package/build/routes/health.js.map +1 -1
- package/build/routes/imagery.d.ts.map +1 -1
- package/build/routes/imagery.js +3 -2
- package/build/routes/imagery.js.map +1 -1
- package/build/routes/tile.json.d.ts.map +1 -1
- package/build/routes/tile.json.js +7 -4
- package/build/routes/tile.json.js.map +1 -1
- package/build/routes/tile.style.json.d.ts +4 -3
- package/build/routes/tile.style.json.d.ts.map +1 -1
- package/build/routes/tile.style.json.js +53 -12
- package/build/routes/tile.style.json.js.map +1 -1
- package/build/routes/tile.wmts.d.ts.map +1 -1
- package/build/routes/tile.wmts.js +7 -4
- package/build/routes/tile.wmts.js.map +1 -1
- package/build/routes/tile.xyz.d.ts.map +1 -1
- package/build/routes/tile.xyz.js +4 -2
- package/build/routes/tile.xyz.js.map +1 -1
- package/build/routes/tile.xyz.raster.d.ts.map +1 -1
- package/build/routes/tile.xyz.raster.js +4 -2
- package/build/routes/tile.xyz.raster.js.map +1 -1
- package/build/util/__test__/config.loader.test.d.ts +2 -0
- package/build/util/__test__/config.loader.test.d.ts.map +1 -0
- package/build/util/__test__/config.loader.test.js +79 -0
- package/build/util/__test__/config.loader.test.js.map +1 -0
- package/build/util/assets.provider.d.ts +1 -4
- package/build/util/assets.provider.d.ts.map +1 -1
- package/build/util/assets.provider.js +23 -10
- package/build/util/assets.provider.js.map +1 -1
- package/build/util/config.cache.d.ts +3 -3
- package/build/util/config.cache.d.ts.map +1 -1
- package/build/util/config.cache.js +14 -15
- package/build/util/config.cache.js.map +1 -1
- package/build/util/config.loader.d.ts +10 -0
- package/build/util/config.loader.d.ts.map +1 -0
- package/build/util/config.loader.js +47 -0
- package/build/util/config.loader.js.map +1 -0
- package/build/wmts.capability.d.ts +3 -1
- package/build/wmts.capability.d.ts.map +1 -1
- package/build/wmts.capability.js +5 -15
- package/build/wmts.capability.js.map +1 -1
- package/dist/index.js +66 -66
- package/dist/node_modules/.package-lock.json +1 -1
- package/dist/package-lock.json +2 -2
- package/dist/package.json +1 -1
- package/package.json +8 -9
- package/src/__tests__/config.data.ts +25 -1
- package/src/__tests__/tile.style.json.test.ts +19 -3
- package/src/__tests__/wmts.capability.test.ts +21 -0
- package/src/arcgis/__tests__/arcgis.style.json.test.ts +21 -17
- package/src/arcgis/__tests__/vector.tiler.server.test.ts +17 -8
- package/src/arcgis/arcgis.style.json.ts +6 -4
- package/src/arcgis/vector.tile.server.ts +5 -2
- package/src/index.ts +9 -10
- package/src/routes/__tests__/attribution.test.ts +4 -2
- package/src/routes/__tests__/fonts.test.ts +44 -7
- package/src/routes/__tests__/health.test.ts +4 -2
- package/src/routes/__tests__/sprites.test.ts +3 -4
- package/src/routes/__tests__/tile.json.test.ts +30 -2
- package/src/routes/__tests__/tile.style.json.test.ts +68 -9
- package/src/routes/__tests__/wmts.test.ts +23 -17
- package/src/routes/__tests__/xyz.test.ts +4 -2
- package/src/routes/attribution.ts +23 -8
- package/src/routes/config.ts +83 -0
- package/src/routes/health.ts +4 -2
- package/src/routes/imagery.ts +3 -2
- package/src/routes/tile.json.ts +10 -4
- package/src/routes/tile.style.json.ts +58 -12
- package/src/routes/tile.wmts.ts +9 -4
- package/src/routes/tile.xyz.raster.ts +4 -2
- package/src/routes/tile.xyz.ts +5 -2
- package/src/util/__test__/config.loader.test.ts +116 -0
- package/src/util/assets.provider.ts +11 -12
- package/src/util/config.cache.ts +18 -18
- package/src/util/config.loader.ts +50 -0
- package/src/wmts.capability.ts +9 -15
- package/tsconfig.tsbuildinfo +1 -1
package/build/index.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { LogConfig } from '@basemaps/shared';
|
|
2
2
|
import { LambdaHttpResponse, lf } from '@linzjs/lambda';
|
|
3
3
|
import { arcgisInfoGet } from './arcgis/arcgis.info.js';
|
|
4
4
|
import { arcgisStyleJsonGet } from './arcgis/arcgis.style.json.js';
|
|
5
5
|
import { arcgisTileServerGet } from './arcgis/vector.tile.server.js';
|
|
6
6
|
import { tileAttributionGet } from './routes/attribution.js';
|
|
7
|
+
import { configImageryGet, configTileSetGet } from './routes/config.js';
|
|
7
8
|
import { fontGet, fontList } from './routes/fonts.js';
|
|
8
9
|
import { healthGet } from './routes/health.js';
|
|
9
10
|
import { imageryGet } from './routes/imagery.js';
|
|
@@ -14,23 +15,18 @@ import { styleJsonGet } from './routes/tile.style.json.js';
|
|
|
14
15
|
import { wmtsCapabilitiesGet } from './routes/tile.wmts.js';
|
|
15
16
|
import { tileXyzGet } from './routes/tile.xyz.js';
|
|
16
17
|
import { versionGet } from './routes/version.js';
|
|
17
|
-
import { assetProvider } from './util/assets.provider.js';
|
|
18
18
|
import { NotFound, OkResponse } from './util/response.js';
|
|
19
19
|
import { CoSources } from './util/source.cache.js';
|
|
20
20
|
import { St } from './util/source.tracer.js';
|
|
21
21
|
export const handler = lf.http(LogConfig.get());
|
|
22
|
+
/** If the request takes too long, respond with a 408 timeout when there is approx 1 second remaining */
|
|
23
|
+
handler.router.timeoutEarlyMs = 1000;
|
|
22
24
|
handler.router.hook('request', (req) => {
|
|
23
25
|
req.set('name', 'LambdaTiler');
|
|
24
|
-
// Set the asset location for asset provider
|
|
25
|
-
const assetLocation = Env.get(Env.AssetLocation);
|
|
26
|
-
assetProvider.set(assetLocation);
|
|
27
26
|
// Reset the request tracing before every request
|
|
28
27
|
St.reset();
|
|
29
28
|
});
|
|
30
|
-
let totalRequests = 0;
|
|
31
29
|
handler.router.hook('response', (req, res) => {
|
|
32
|
-
totalRequests++;
|
|
33
|
-
req.set('requestsTotal', totalRequests); // Number of requests served by this lambda
|
|
34
30
|
if (St.requests.length > 0) {
|
|
35
31
|
// TODO this could be relaxed to every say 5% of requests if logging gets too verbose.
|
|
36
32
|
req.set('requests', St.requests.slice(0, 100)); // limit to 100 requests (some tiles need 100s of requests)
|
|
@@ -65,6 +61,9 @@ handler.router.get('/v1/health', healthGet);
|
|
|
65
61
|
handler.router.get('/v1/version', versionGet);
|
|
66
62
|
// Image Metadata
|
|
67
63
|
handler.router.get('/v1/imagery/:imageryId/:fileName', imageryGet);
|
|
64
|
+
// Config
|
|
65
|
+
handler.router.get('/v1/config/:tileSet.json', configTileSetGet);
|
|
66
|
+
handler.router.get('/v1/config/:tileSet/:imageryId.json', configImageryGet);
|
|
68
67
|
// Sprites
|
|
69
68
|
handler.router.get('/v1/sprites/:spriteName', spriteGet);
|
|
70
69
|
// Fonts
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Attribution } from '@basemaps/attribution';
|
|
2
|
-
import {
|
|
2
|
+
import { ConfigProviderMemory } from '@basemaps/config';
|
|
3
3
|
import { Nztm2000QuadTms } from '@basemaps/geo';
|
|
4
4
|
import { LogConfig } from '@basemaps/shared';
|
|
5
5
|
import { HttpHeader } from '@linzjs/lambda';
|
|
6
6
|
import o from 'ospec';
|
|
7
7
|
import sinon from 'sinon';
|
|
8
8
|
import { handler } from '../../index.js';
|
|
9
|
+
import { ConfigLoader } from '../../util/config.loader.js';
|
|
9
10
|
import { FakeData, Imagery2193, Imagery3857, Provider, TileSetAerial } from '../../__tests__/config.data.js';
|
|
10
11
|
import { mockUrlRequest } from '../../__tests__/xyz.util.js';
|
|
11
12
|
// const ExpectedJson = {
|
|
@@ -281,7 +282,7 @@ o.spec('/v1/attribution', () => {
|
|
|
281
282
|
const sandbox = sinon.createSandbox();
|
|
282
283
|
o.beforeEach(() => {
|
|
283
284
|
LogConfig.get().level = 'silent';
|
|
284
|
-
|
|
285
|
+
sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
|
|
285
286
|
config.objects.clear();
|
|
286
287
|
config.put(TileSetAerial);
|
|
287
288
|
config.put(Imagery2193);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attribution.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/attribution.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"attribution.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/attribution.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { base58, ConfigProviderMemory } from '@basemaps/config';
|
|
2
|
+
import { Env, getDefaultConfig } from '@basemaps/shared';
|
|
2
3
|
import { fsa } from '@chunkd/fs';
|
|
3
4
|
import o from 'ospec';
|
|
4
5
|
import { handler } from '../../index.js';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
6
|
+
import { CachedConfig } from '../../util/config.cache.js';
|
|
7
|
+
import { CoSources } from '../../util/source.cache.js';
|
|
8
|
+
import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
|
|
7
9
|
import { fontList } from '../fonts.js';
|
|
8
10
|
import { FsMemory } from './memory.fs.js';
|
|
9
11
|
o.spec('/v1/fonts', () => {
|
|
@@ -13,11 +15,13 @@ o.spec('/v1/fonts', () => {
|
|
|
13
15
|
});
|
|
14
16
|
const assetLocation = process.env[Env.AssetLocation];
|
|
15
17
|
o.beforeEach(() => {
|
|
16
|
-
process.env[Env.AssetLocation] = 'memory://';
|
|
17
|
-
|
|
18
|
+
process.env[Env.AssetLocation] = 'memory://config';
|
|
19
|
+
getDefaultConfig().assets = 'memory://';
|
|
18
20
|
});
|
|
19
21
|
o.afterEach(() => {
|
|
20
|
-
|
|
22
|
+
getDefaultConfig().assets = assetLocation;
|
|
23
|
+
CachedConfig.cache.clear();
|
|
24
|
+
CoSources.cache.clear();
|
|
21
25
|
memory.files.clear();
|
|
22
26
|
});
|
|
23
27
|
o('should return 404 if no font found', async () => {
|
|
@@ -54,9 +58,34 @@ o.spec('/v1/fonts', () => {
|
|
|
54
58
|
o(res255.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
|
|
55
59
|
});
|
|
56
60
|
o('should return 404 if no asset location set', async () => {
|
|
57
|
-
|
|
61
|
+
getDefaultConfig().assets = undefined;
|
|
58
62
|
const res = await fontList(mockRequest('/v1/fonts.json'));
|
|
59
63
|
o(res.status).equals(404);
|
|
60
64
|
});
|
|
65
|
+
o('should get the correct utf8 font with default assets', async () => {
|
|
66
|
+
const cfgBundle = new ConfigProviderMemory();
|
|
67
|
+
await fsa.write('memory://linz-basemaps/bar.json', JSON.stringify(cfgBundle.toJson()));
|
|
68
|
+
await fsa.write('memory://config/fonts/🦄 🌈/0-255.pbf', Buffer.from(''));
|
|
69
|
+
const configLocation = base58.encode(Buffer.from('memory://linz-basemaps/bar.json'));
|
|
70
|
+
const res255 = await handler.router.handle(mockUrlRequest('/v1/fonts/🦄 🌈/0-255.pbf', `?config=${configLocation}`, Api.header));
|
|
71
|
+
o(res255.status).equals(200);
|
|
72
|
+
o(res255.header('content-type')).equals('application/x-protobuf');
|
|
73
|
+
o(res255.header('content-encoding')).equals(undefined);
|
|
74
|
+
o(res255.header('etag')).notEquals(undefined);
|
|
75
|
+
o(res255.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
|
|
76
|
+
});
|
|
77
|
+
o('should get the correct utf8 font with config assets', async () => {
|
|
78
|
+
const cfgBundle = new ConfigProviderMemory();
|
|
79
|
+
cfgBundle.assets = 'memory://config/assets';
|
|
80
|
+
await fsa.write('memory://linz-basemaps/bar.json', JSON.stringify(cfgBundle.toJson()));
|
|
81
|
+
await fsa.write('memory://config/assets/fonts/🦄 🌈/0-255.pbf', Buffer.from(''));
|
|
82
|
+
const configLocation = base58.encode(Buffer.from('memory://linz-basemaps/bar.json'));
|
|
83
|
+
const res255 = await handler.router.handle(mockUrlRequest('/v1/fonts/🦄 🌈/0-255.pbf', `?config=${configLocation}`, Api.header));
|
|
84
|
+
o(res255.status).equals(200);
|
|
85
|
+
o(res255.header('content-type')).equals('application/x-protobuf');
|
|
86
|
+
o(res255.header('content-encoding')).equals(undefined);
|
|
87
|
+
o(res255.header('etag')).notEquals(undefined);
|
|
88
|
+
o(res255.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
|
|
89
|
+
});
|
|
61
90
|
});
|
|
62
91
|
//# sourceMappingURL=fonts.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fonts.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/fonts.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"fonts.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/fonts.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ConfigProviderMemory } from '@basemaps/config';
|
|
2
2
|
import { LogConfig } from '@basemaps/shared';
|
|
3
3
|
import { LambdaAlbRequest, LambdaHttpResponse } from '@linzjs/lambda';
|
|
4
4
|
import o from 'ospec';
|
|
5
5
|
import sinon from 'sinon';
|
|
6
|
+
import { ConfigLoader } from '../../util/config.loader.js';
|
|
6
7
|
import { FakeData } from '../../__tests__/config.data.js';
|
|
7
8
|
import { getTestBuffer, healthGet, TestTiles } from '../health.js';
|
|
8
9
|
import { TileXyzRaster } from '../tile.xyz.raster.js';
|
|
@@ -20,10 +21,11 @@ o.spec('/v1/health', async () => {
|
|
|
20
21
|
const fakeTileSet = FakeData.tileSetRaster('health');
|
|
21
22
|
o.beforeEach(() => {
|
|
22
23
|
config.objects.clear();
|
|
23
|
-
|
|
24
|
+
sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
|
|
24
25
|
config.put(fakeTileSet);
|
|
25
26
|
});
|
|
26
27
|
o.afterEach(() => {
|
|
28
|
+
config.objects.clear();
|
|
27
29
|
sandbox.restore();
|
|
28
30
|
});
|
|
29
31
|
o('Should return bad response', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/health.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"health.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/health.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { Env } from '@basemaps/shared';
|
|
1
|
+
import { Env, getDefaultConfig } from '@basemaps/shared';
|
|
2
2
|
import { fsa } from '@chunkd/fs';
|
|
3
3
|
import o from 'ospec';
|
|
4
4
|
import { createSandbox } from 'sinon';
|
|
5
5
|
import { gunzipSync, gzipSync } from 'zlib';
|
|
6
6
|
import { handler } from '../../index.js';
|
|
7
|
-
import { assetProvider } from '../../util/assets.provider.js';
|
|
8
7
|
import { mockRequest } from '../../__tests__/xyz.util.js';
|
|
9
8
|
import { FsMemory } from './memory.fs.js';
|
|
10
9
|
o.spec('/v1/sprites', () => {
|
|
@@ -16,10 +15,10 @@ o.spec('/v1/sprites', () => {
|
|
|
16
15
|
const assetLocation = process.env[Env.AssetLocation];
|
|
17
16
|
o.beforeEach(() => {
|
|
18
17
|
process.env[Env.AssetLocation] = 'memory://';
|
|
19
|
-
|
|
18
|
+
getDefaultConfig().assets = 'memory://';
|
|
20
19
|
});
|
|
21
20
|
o.afterEach(() => {
|
|
22
|
-
|
|
21
|
+
getDefaultConfig().assets = assetLocation;
|
|
23
22
|
memory.files.clear();
|
|
24
23
|
sandbox.restore();
|
|
25
24
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sprites.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/sprites.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"sprites.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/sprites.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,28 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { base58, ConfigProviderMemory } from '@basemaps/config';
|
|
2
2
|
import { Env } from '@basemaps/shared';
|
|
3
|
+
import { fsa } from '@chunkd/fs';
|
|
3
4
|
import o from 'ospec';
|
|
5
|
+
import sinon from 'sinon';
|
|
4
6
|
import { handler } from '../../index.js';
|
|
7
|
+
import { ConfigLoader } from '../../util/config.loader.js';
|
|
5
8
|
import { CoSources } from '../../util/source.cache.js';
|
|
6
9
|
import { FakeData } from '../../__tests__/config.data.js';
|
|
7
10
|
import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
|
|
11
|
+
import { FsMemory } from './memory.fs.js';
|
|
8
12
|
o.spec('/v1/tiles/:tileSet/:tileMatrix/tile.json', () => {
|
|
9
13
|
const config = new ConfigProviderMemory();
|
|
14
|
+
const sandbox = sinon.createSandbox();
|
|
10
15
|
o.before(() => {
|
|
11
16
|
process.env[Env.PublicUrlBase] = 'https://tiles.test';
|
|
12
|
-
Config.setConfigProvider(config);
|
|
13
17
|
});
|
|
14
18
|
o.beforeEach(() => {
|
|
19
|
+
sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
|
|
15
20
|
config.objects.clear();
|
|
16
21
|
CoSources.cache.clear();
|
|
17
22
|
});
|
|
23
|
+
o.afterEach(() => {
|
|
24
|
+
sandbox.restore();
|
|
25
|
+
});
|
|
18
26
|
o('should 404 if invalid url is given', async () => {
|
|
19
27
|
const request = mockRequest('/v1/tiles/tile.json', 'get', Api.header);
|
|
20
28
|
const res = await handler.router.handle(request);
|
|
@@ -103,6 +111,20 @@ o.spec('/v1/tiles/:tileSet/:tileMatrix/tile.json', () => {
|
|
|
103
111
|
tilejson: '3.0.0',
|
|
104
112
|
});
|
|
105
113
|
});
|
|
114
|
+
o('should load from config bundle', async () => {
|
|
115
|
+
const memoryFs = new FsMemory();
|
|
116
|
+
fsa.register('memory://', memoryFs);
|
|
117
|
+
const fakeTileSet = FakeData.tileSetRaster('🦄 🌈');
|
|
118
|
+
const cfgBundle = new ConfigProviderMemory();
|
|
119
|
+
cfgBundle.put(fakeTileSet);
|
|
120
|
+
memoryFs.write('memory://linz-basemaps/bar.json', JSON.stringify(cfgBundle.toJson()));
|
|
121
|
+
const configLocation = base58.encode(Buffer.from('memory://linz-basemaps/bar.json'));
|
|
122
|
+
const request = mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=${configLocation}`, Api.header);
|
|
123
|
+
const res = await handler.router.handle(request);
|
|
124
|
+
o(res.status).equals(200);
|
|
125
|
+
const body = JSON.parse(Buffer.from(res.body, 'base64').toString());
|
|
126
|
+
o(body.tiles[0].includes(`config=${configLocation}`)).equals(true);
|
|
127
|
+
});
|
|
106
128
|
o('should serve convert zoom to tile matrix', async () => {
|
|
107
129
|
var _a;
|
|
108
130
|
const fakeTileSet = FakeData.tileSetVector('fake-vector');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.json.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/tile.json.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"tile.json.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/tile.json.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,27 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ConfigProviderMemory } from '@basemaps/config';
|
|
2
2
|
import { Env } from '@basemaps/shared';
|
|
3
3
|
import o from 'ospec';
|
|
4
4
|
import { createSandbox } from 'sinon';
|
|
5
5
|
import { handler } from '../../index.js';
|
|
6
|
-
import {
|
|
6
|
+
import { ConfigLoader } from '../../util/config.loader.js';
|
|
7
|
+
import { FakeData } from '../../__tests__/config.data.js';
|
|
8
|
+
import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
|
|
7
9
|
o.spec('/v1/styles', () => {
|
|
8
10
|
const host = 'https://tiles.test';
|
|
11
|
+
const config = new ConfigProviderMemory();
|
|
9
12
|
const sandbox = createSandbox();
|
|
10
13
|
o.before(() => {
|
|
11
14
|
process.env[Env.PublicUrlBase] = host;
|
|
12
15
|
});
|
|
13
|
-
|
|
14
|
-
|
|
16
|
+
o.beforeEach(() => {
|
|
17
|
+
sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
|
|
18
|
+
});
|
|
19
|
+
o.afterEach(() => {
|
|
20
|
+
sandbox.restore();
|
|
21
|
+
config.objects.clear();
|
|
22
|
+
});
|
|
15
23
|
o('should not found style json', async () => {
|
|
16
24
|
const request = mockRequest('/v1/tiles/topographic/Google/style/topographic.json', 'get', Api.header);
|
|
17
|
-
sandbox.stub(Config.Style, 'get').resolves(null);
|
|
18
25
|
const res = await handler.router.handle(request);
|
|
19
26
|
o(res.status).equals(404);
|
|
20
27
|
});
|
|
@@ -65,11 +72,11 @@ o.spec('/v1/styles', () => {
|
|
|
65
72
|
metadata: { id: 'test' },
|
|
66
73
|
};
|
|
67
74
|
const fakeRecord = {
|
|
68
|
-
id: '
|
|
75
|
+
id: 'st_topographic',
|
|
69
76
|
name: 'topographic',
|
|
70
77
|
style: fakeStyle,
|
|
71
78
|
};
|
|
72
|
-
|
|
79
|
+
config.put(fakeRecord);
|
|
73
80
|
const res = await handler.router.handle(request);
|
|
74
81
|
o(res.status).equals(200);
|
|
75
82
|
o(res.header('content-type')).equals('application/json');
|
|
@@ -91,5 +98,49 @@ o.spec('/v1/styles', () => {
|
|
|
91
98
|
fakeStyle.glyphs = `${host}/glyphs`;
|
|
92
99
|
o(JSON.parse(body)).deepEquals(fakeStyle);
|
|
93
100
|
});
|
|
101
|
+
o('should create raster styles', async () => {
|
|
102
|
+
const request = mockUrlRequest('/v1/styles/aerial.json', '', Api.header);
|
|
103
|
+
const tileSet = FakeData.tileSetRaster('aerial');
|
|
104
|
+
config.put(tileSet);
|
|
105
|
+
const res = await handler.router.handle(request);
|
|
106
|
+
o(res.status).equals(200);
|
|
107
|
+
const body = JSON.parse(Buffer.from(res.body, 'base64').toString());
|
|
108
|
+
o(body.version).equals(8);
|
|
109
|
+
o(body.sources['basemaps-aerial'].type).deepEquals('raster');
|
|
110
|
+
o(body.sources['basemaps-aerial'].tiles).deepEquals([
|
|
111
|
+
`https://tiles.test/v1/tiles/aerial/WebMercatorQuad/{z}/{x}/{y}.webp?api=${Api.key}`,
|
|
112
|
+
]);
|
|
113
|
+
o(body.sources['basemaps-aerial'].tileSize).deepEquals(256);
|
|
114
|
+
o(body.layers).deepEquals([{ id: 'basemaps-aerial', type: 'raster', source: 'basemaps-aerial' }]);
|
|
115
|
+
});
|
|
116
|
+
o('should support parameters', async () => {
|
|
117
|
+
const request = mockUrlRequest('/v1/styles/aerial.json', '?tileMatrix=NZTM2000Quad&format=jpg', Api.header);
|
|
118
|
+
const tileSet = FakeData.tileSetRaster('aerial');
|
|
119
|
+
config.put(tileSet);
|
|
120
|
+
const res = await handler.router.handle(request);
|
|
121
|
+
o(res.status).equals(200);
|
|
122
|
+
const body = JSON.parse(Buffer.from(res.body, 'base64').toString());
|
|
123
|
+
o(body.version).equals(8);
|
|
124
|
+
o(body.sources['basemaps-aerial'].type).deepEquals('raster');
|
|
125
|
+
o(body.sources['basemaps-aerial'].tiles).deepEquals([
|
|
126
|
+
`https://tiles.test/v1/tiles/aerial/NZTM2000Quad/{z}/{x}/{y}.jpeg?api=${Api.key}`,
|
|
127
|
+
]);
|
|
128
|
+
o(body.sources['basemaps-aerial'].tileSize).deepEquals(256);
|
|
129
|
+
o(body.layers).deepEquals([{ id: 'basemaps-aerial', type: 'raster', source: 'basemaps-aerial' }]);
|
|
130
|
+
});
|
|
131
|
+
o('should create raster styles from custom config', async () => {
|
|
132
|
+
const configId = FakeData.bundle([FakeData.tileSetRaster('aerial')]);
|
|
133
|
+
const request = mockUrlRequest('/v1/styles/aerial.json', `?config=${configId}`, Api.header);
|
|
134
|
+
const res = await handler.router.handle(request);
|
|
135
|
+
o(res.status).equals(200);
|
|
136
|
+
const body = JSON.parse(Buffer.from(res.body, 'base64').toString());
|
|
137
|
+
o(body.version).equals(8);
|
|
138
|
+
o(body.sources['basemaps-aerial'].type).deepEquals('raster');
|
|
139
|
+
o(body.sources['basemaps-aerial'].tiles).deepEquals([
|
|
140
|
+
`https://tiles.test/v1/tiles/aerial/WebMercatorQuad/{z}/{x}/{y}.webp?api=${Api.key}&config=${configId}`,
|
|
141
|
+
]);
|
|
142
|
+
o(body.sources['basemaps-aerial'].tileSize).deepEquals(256);
|
|
143
|
+
o(body.layers).deepEquals([{ id: 'basemaps-aerial', type: 'raster', source: 'basemaps-aerial' }]);
|
|
144
|
+
});
|
|
94
145
|
});
|
|
95
146
|
//# sourceMappingURL=tile.style.json.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.style.json.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/tile.style.json.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"tile.style.json.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/tile.style.json.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,32 +1,30 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ConfigProviderMemory } from '@basemaps/config';
|
|
2
2
|
import o from 'ospec';
|
|
3
3
|
import { createSandbox } from 'sinon';
|
|
4
4
|
import { handler } from '../../index.js';
|
|
5
|
+
import { ConfigLoader } from '../../util/config.loader.js';
|
|
5
6
|
import { Imagery2193, Imagery3857, Provider, TileSetAerial } from '../../__tests__/config.data.js';
|
|
6
7
|
import { Api, mockUrlRequest } from '../../__tests__/xyz.util.js';
|
|
7
8
|
o.spec('WMTSRouting', () => {
|
|
8
9
|
const sandbox = createSandbox();
|
|
10
|
+
const config = new ConfigProviderMemory();
|
|
11
|
+
o.before(() => {
|
|
12
|
+
sandbox.stub(ConfigLoader, 'load').resolves(config);
|
|
13
|
+
});
|
|
9
14
|
o.afterEach(() => {
|
|
15
|
+
config.objects.clear();
|
|
10
16
|
sandbox.restore();
|
|
11
17
|
});
|
|
12
18
|
o('should default to the aerial layer', async () => {
|
|
13
19
|
const imagery = new Map();
|
|
14
20
|
imagery.set(Imagery3857.id, Imagery3857);
|
|
15
21
|
imagery.set(Imagery2193.id, Imagery2193);
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
22
|
+
config.put(TileSetAerial);
|
|
23
|
+
config.put(Imagery2193);
|
|
24
|
+
config.put(Imagery3857);
|
|
25
|
+
config.put(Provider);
|
|
26
|
+
const req = mockUrlRequest('/v1/tiles/WMTSCapabilities.xml', `format=png&api=${Api.key}&config=s3://linz-basemaps/config.json`);
|
|
20
27
|
const res = await handler.router.handle(req);
|
|
21
|
-
o(tileSetStub.calledOnce).equals(true);
|
|
22
|
-
o(tileSetStub.args[0][0]).equals('ts_aerial');
|
|
23
|
-
o(providerStub.calledOnce).equals(true);
|
|
24
|
-
o(providerStub.args[0][0]).equals('pv_linz');
|
|
25
|
-
o(imageryStub.calledOnce).equals(true);
|
|
26
|
-
o([...imageryStub.args[0][0].values()]).deepEquals([
|
|
27
|
-
'im_01FYWKATAEK2ZTJQ2PX44Y0XNT',
|
|
28
|
-
'im_01FYWKAJ86W9P7RWM1VB62KD0H',
|
|
29
|
-
]);
|
|
30
28
|
o(res.status).equals(200);
|
|
31
29
|
const lines = Buffer.from(res.body, 'base64').toString().split('\n');
|
|
32
30
|
const titles = lines.filter((f) => f.startsWith(' <ows:Title>')).map((f) => f.trim());
|
|
@@ -36,6 +34,11 @@ o.spec('WMTSRouting', () => {
|
|
|
36
34
|
'<ows:Title>Google Maps Compatible for the World</ows:Title>',
|
|
37
35
|
'<ows:Title>LINZ NZTM2000 Map Tile Grid V2</ows:Title>',
|
|
38
36
|
]);
|
|
37
|
+
const resourceURLs = lines.filter((f) => f.includes('<ResourceURL')).map((f) => f.trim());
|
|
38
|
+
o(resourceURLs).deepEquals([
|
|
39
|
+
'<ResourceURL format="image/png" resourceType="tile" template="https://tiles.test/v1/tiles/aerial/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png?api=d01f7w7rnhdzg0p7fyrc9v9ard1&config=Q5pC4UjWdtFLU1CYtLcRSmB49RekgDgMa5EGJnB2M" />',
|
|
40
|
+
'<ResourceURL format="image/png" resourceType="tile" template="https://tiles.test/v1/tiles/ōtorohanga-urban-2021-0.1m/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png?api=d01f7w7rnhdzg0p7fyrc9v9ard1&config=Q5pC4UjWdtFLU1CYtLcRSmB49RekgDgMa5EGJnB2M" />',
|
|
41
|
+
]);
|
|
39
42
|
});
|
|
40
43
|
});
|
|
41
44
|
//# sourceMappingURL=wmts.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wmts.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/wmts.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"wmts.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/wmts.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACnG,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;IAE1C,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;QACZ,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;QACf,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACvB,OAAO,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QAEzC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACxB,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACxB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAErB,MAAM,GAAG,GAAG,cAAc,CACxB,gCAAgC,EAChC,kBAAkB,GAAG,CAAC,GAAG,wCAAwC,CAClE,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAE7C,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAErE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAE3F,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC;YACnB,uCAAuC;YACvC,mEAAmE;YACnE,6DAA6D;YAC7D,uDAAuD;SACxD,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1F,CAAC,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC;YACzB,gPAAgP;YAChP,oQAAoQ;SACrQ,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|