@basemaps/lambda-tiler 7.0.0 → 7.1.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 +29 -0
- package/build/__tests__/config.data.d.ts +0 -1
- package/build/__tests__/config.data.js +2 -6
- package/build/__tests__/config.data.js.map +1 -1
- package/build/__tests__/index.test.d.ts +0 -1
- package/build/__tests__/index.test.js +28 -27
- package/build/__tests__/index.test.js.map +1 -1
- package/build/__tests__/tile.style.json.test.d.ts +0 -1
- package/build/__tests__/tile.style.json.test.js +38 -37
- package/build/__tests__/tile.style.json.test.js.map +1 -1
- package/build/__tests__/wmts.capability.test.d.ts +0 -1
- package/build/__tests__/wmts.capability.test.js +111 -122
- package/build/__tests__/wmts.capability.test.js.map +1 -1
- package/build/__tests__/xyz.util.d.ts +0 -1
- package/build/cli/render.preview.d.ts +0 -1
- package/build/cli/render.preview.js +13 -9
- package/build/cli/render.preview.js.map +1 -1
- package/build/cli/render.tile.d.ts +0 -1
- package/build/cli/render.tile.js +25 -17
- package/build/cli/render.tile.js.map +1 -1
- package/build/index.d.ts +0 -1
- package/build/index.js +24 -20
- package/build/index.js.map +1 -1
- package/build/routes/__tests__/attribution.test.d.ts +0 -1
- package/build/routes/__tests__/attribution.test.js +38 -37
- package/build/routes/__tests__/attribution.test.js.map +1 -1
- package/build/routes/__tests__/fonts.test.d.ts +0 -1
- package/build/routes/__tests__/fonts.test.js +61 -63
- package/build/routes/__tests__/fonts.test.js.map +1 -1
- package/build/routes/__tests__/health.test.d.ts +0 -1
- package/build/routes/__tests__/health.test.js +16 -16
- package/build/routes/__tests__/health.test.js.map +1 -1
- package/build/routes/__tests__/imagery.test.d.ts +0 -1
- package/build/routes/__tests__/imagery.test.js +10 -9
- package/build/routes/__tests__/imagery.test.js.map +1 -1
- package/build/routes/__tests__/memory.fs.d.ts +2 -3
- package/build/routes/__tests__/preview.index.test.d.ts +0 -1
- package/build/routes/__tests__/preview.index.test.js +88 -42
- package/build/routes/__tests__/preview.index.test.js.map +1 -1
- package/build/routes/__tests__/sprites.test.d.ts +0 -1
- package/build/routes/__tests__/sprites.test.js +34 -34
- package/build/routes/__tests__/sprites.test.js.map +1 -1
- package/build/routes/__tests__/tile.json.test.d.ts +0 -1
- package/build/routes/__tests__/tile.json.test.js +45 -51
- package/build/routes/__tests__/tile.json.test.js.map +1 -1
- package/build/routes/__tests__/tile.style.json.test.d.ts +0 -1
- package/build/routes/__tests__/tile.style.json.test.js +49 -50
- package/build/routes/__tests__/tile.style.json.test.js.map +1 -1
- package/build/routes/__tests__/wmts.test.d.ts +0 -1
- package/build/routes/__tests__/wmts.test.js +27 -20
- package/build/routes/__tests__/wmts.test.js.map +1 -1
- package/build/routes/__tests__/xyz.test.d.ts +0 -1
- package/build/routes/__tests__/xyz.test.js +97 -49
- package/build/routes/__tests__/xyz.test.js.map +1 -1
- package/build/routes/attribution.d.ts +1 -1
- package/build/routes/attribution.js +4 -5
- package/build/routes/attribution.js.map +1 -1
- package/build/routes/config.d.ts +0 -1
- package/build/routes/config.js +1 -2
- package/build/routes/config.js.map +1 -1
- package/build/routes/fonts.d.ts +0 -1
- package/build/routes/fonts.js +2 -3
- package/build/routes/fonts.js.map +1 -1
- package/build/routes/health.d.ts +1 -2
- package/build/routes/health.js +5 -15
- package/build/routes/health.js.map +1 -1
- package/build/routes/imagery.d.ts +0 -1
- package/build/routes/imagery.js +1 -1
- package/build/routes/imagery.js.map +1 -1
- package/build/routes/ping.d.ts +0 -1
- package/build/routes/ping.js +1 -1
- package/build/routes/ping.js.map +1 -1
- package/build/routes/preview.d.ts +6 -5
- package/build/routes/preview.index.d.ts +0 -1
- package/build/routes/preview.index.js +6 -5
- package/build/routes/preview.index.js.map +1 -1
- package/build/routes/preview.js +35 -10
- package/build/routes/preview.js.map +1 -1
- package/build/routes/sprites.d.ts +0 -1
- package/build/routes/sprites.js +2 -4
- package/build/routes/sprites.js.map +1 -1
- package/build/routes/tile.json.d.ts +0 -1
- package/build/routes/tile.json.js +10 -5
- package/build/routes/tile.json.js.map +1 -1
- package/build/routes/tile.style.json.d.ts +1 -1
- package/build/routes/tile.style.json.js +79 -16
- package/build/routes/tile.style.json.js.map +1 -1
- package/build/routes/tile.wmts.d.ts +0 -1
- package/build/routes/tile.wmts.js +8 -9
- package/build/routes/tile.wmts.js.map +1 -1
- package/build/routes/tile.xyz.d.ts +0 -1
- package/build/routes/tile.xyz.js.map +1 -1
- package/build/routes/tile.xyz.raster.d.ts +7 -8
- package/build/routes/tile.xyz.raster.js +17 -13
- package/build/routes/tile.xyz.raster.js.map +1 -1
- package/build/routes/tile.xyz.vector.d.ts +0 -1
- package/build/routes/tile.xyz.vector.js +4 -3
- package/build/routes/tile.xyz.vector.js.map +1 -1
- package/build/routes/version.d.ts +0 -1
- package/build/routes/version.js +3 -4
- package/build/routes/version.js.map +1 -1
- package/build/util/__test__/config.loader.test.d.ts +0 -1
- package/build/util/__test__/config.loader.test.js +35 -34
- package/build/util/__test__/config.loader.test.js.map +1 -1
- package/build/util/__test__/filter.test.d.ts +0 -1
- package/build/util/__test__/filter.test.js +17 -16
- package/build/util/__test__/filter.test.js.map +1 -1
- package/build/util/__test__/validate.test.d.ts +0 -1
- package/build/util/__test__/validate.test.js +26 -43
- package/build/util/__test__/validate.test.js.map +1 -1
- package/build/util/assets.provider.d.ts +5 -5
- package/build/util/assets.provider.js +8 -8
- package/build/util/assets.provider.js.map +1 -1
- package/build/util/config.cache.d.ts +2 -2
- package/build/util/config.cache.js +14 -3
- package/build/util/config.cache.js.map +1 -1
- package/build/util/config.loader.d.ts +0 -1
- package/build/util/config.loader.js +11 -12
- package/build/util/config.loader.js.map +1 -1
- package/build/util/cotar.serve.d.ts +3 -3
- package/build/util/cotar.serve.js +2 -2
- package/build/util/cotar.serve.js.map +1 -1
- package/build/util/etag.d.ts +0 -1
- package/build/util/etag.js.map +1 -1
- package/build/util/filter.d.ts +0 -1
- package/build/util/filter.js +4 -5
- package/build/util/filter.js.map +1 -1
- package/build/util/response.d.ts +0 -1
- package/build/util/source.cache.d.ts +8 -9
- package/build/util/source.cache.js +27 -24
- package/build/util/source.cache.js.map +1 -1
- package/build/util/swapping.lru.d.ts +0 -1
- package/build/util/swapping.lru.js +48 -7
- package/build/util/swapping.lru.js.map +1 -1
- package/build/util/validate.d.ts +17 -5
- package/build/util/validate.js +51 -15
- package/build/util/validate.js.map +1 -1
- package/build/wmts.capability.d.ts +1 -2
- package/build/wmts.capability.js +81 -12
- package/build/wmts.capability.js.map +1 -1
- package/bundle.sh +2 -2
- package/package.json +16 -18
- package/scripts/create.deployment.package.mjs +4 -11
- package/src/__tests__/config.data.ts +2 -6
- package/src/__tests__/index.test.ts +29 -27
- package/src/__tests__/tile.style.json.test.ts +40 -37
- package/src/__tests__/wmts.capability.test.ts +139 -120
- package/src/cli/render.preview.ts +14 -9
- package/src/cli/render.tile.ts +27 -18
- package/src/index.ts +28 -23
- package/src/routes/__tests__/attribution.test.ts +40 -37
- package/src/routes/__tests__/fonts.test.ts +68 -64
- package/src/routes/__tests__/health.test.ts +18 -17
- package/src/routes/__tests__/imagery.test.ts +11 -9
- package/src/routes/__tests__/preview.index.test.ts +114 -40
- package/src/routes/__tests__/sprites.test.ts +39 -34
- package/src/routes/__tests__/tile.json.test.ts +41 -39
- package/src/routes/__tests__/tile.style.json.test.ts +49 -46
- package/src/routes/__tests__/wmts.test.ts +28 -20
- package/src/routes/__tests__/xyz.test.ts +134 -55
- package/src/routes/attribution.ts +2 -2
- package/src/routes/config.ts +1 -0
- package/src/routes/fonts.ts +3 -3
- package/src/routes/health.ts +7 -13
- package/src/routes/imagery.ts +2 -1
- package/src/routes/ping.ts +1 -1
- package/src/routes/preview.index.ts +9 -5
- package/src/routes/preview.ts +44 -15
- package/src/routes/sprites.ts +4 -5
- package/src/routes/tile.json.ts +9 -2
- package/src/routes/tile.style.json.ts +89 -13
- package/src/routes/tile.wmts.ts +4 -3
- package/src/routes/tile.xyz.raster.ts +26 -22
- package/src/routes/tile.xyz.ts +1 -0
- package/src/routes/tile.xyz.vector.ts +5 -3
- package/src/routes/version.ts +3 -3
- package/src/util/__test__/config.loader.test.ts +38 -34
- package/src/util/__test__/filter.test.ts +19 -16
- package/src/util/__test__/validate.test.ts +28 -43
- package/src/util/assets.provider.ts +10 -9
- package/src/util/config.cache.ts +4 -3
- package/src/util/config.loader.ts +13 -13
- package/src/util/cotar.serve.ts +3 -2
- package/src/util/source.cache.ts +15 -26
- package/src/util/validate.ts +61 -14
- package/src/wmts.capability.ts +3 -3
- package/tsconfig.json +1 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/build/__tests__/config.data.d.ts.map +0 -1
- package/build/__tests__/index.test.d.ts.map +0 -1
- package/build/__tests__/tile.style.json.test.d.ts.map +0 -1
- package/build/__tests__/wmts.capability.test.d.ts.map +0 -1
- package/build/__tests__/xyz.util.d.ts.map +0 -1
- package/build/cli/render.preview.d.ts.map +0 -1
- package/build/cli/render.tile.d.ts.map +0 -1
- package/build/index.d.ts.map +0 -1
- package/build/routes/__tests__/attribution.test.d.ts.map +0 -1
- package/build/routes/__tests__/fonts.test.d.ts.map +0 -1
- package/build/routes/__tests__/health.test.d.ts.map +0 -1
- package/build/routes/__tests__/imagery.test.d.ts.map +0 -1
- package/build/routes/__tests__/memory.fs.d.ts.map +0 -1
- package/build/routes/__tests__/preview.index.test.d.ts.map +0 -1
- package/build/routes/__tests__/sprites.test.d.ts.map +0 -1
- package/build/routes/__tests__/tile.json.test.d.ts.map +0 -1
- package/build/routes/__tests__/tile.style.json.test.d.ts.map +0 -1
- package/build/routes/__tests__/wmts.test.d.ts.map +0 -1
- package/build/routes/__tests__/xyz.test.d.ts.map +0 -1
- package/build/routes/attribution.d.ts.map +0 -1
- package/build/routes/config.d.ts.map +0 -1
- package/build/routes/fonts.d.ts.map +0 -1
- package/build/routes/health.d.ts.map +0 -1
- package/build/routes/imagery.d.ts.map +0 -1
- package/build/routes/ping.d.ts.map +0 -1
- package/build/routes/preview.d.ts.map +0 -1
- package/build/routes/preview.index.d.ts.map +0 -1
- package/build/routes/sprites.d.ts.map +0 -1
- package/build/routes/tile.json.d.ts.map +0 -1
- package/build/routes/tile.style.json.d.ts.map +0 -1
- package/build/routes/tile.wmts.d.ts.map +0 -1
- package/build/routes/tile.xyz.d.ts.map +0 -1
- package/build/routes/tile.xyz.raster.d.ts.map +0 -1
- package/build/routes/tile.xyz.vector.d.ts.map +0 -1
- package/build/routes/version.d.ts.map +0 -1
- package/build/util/__test__/config.loader.test.d.ts.map +0 -1
- package/build/util/__test__/filter.test.d.ts.map +0 -1
- package/build/util/__test__/validate.test.d.ts.map +0 -1
- package/build/util/assets.provider.d.ts.map +0 -1
- package/build/util/config.cache.d.ts.map +0 -1
- package/build/util/config.loader.d.ts.map +0 -1
- package/build/util/cotar.serve.d.ts.map +0 -1
- package/build/util/etag.d.ts.map +0 -1
- package/build/util/filter.d.ts.map +0 -1
- package/build/util/response.d.ts.map +0 -1
- package/build/util/source.cache.d.ts.map +0 -1
- package/build/util/source.tracer.d.ts +0 -18
- package/build/util/source.tracer.d.ts.map +0 -1
- package/build/util/source.tracer.js +0 -26
- package/build/util/source.tracer.js.map +0 -1
- package/build/util/swapping.lru.d.ts.map +0 -1
- package/build/util/validate.d.ts.map +0 -1
- package/build/wmts.capability.d.ts.map +0 -1
- package/src/util/source.tracer.ts +0 -38
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,35 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [7.1.0](https://github.com/linz/basemaps/compare/v7.0.0...v7.1.0) (2024-03-25)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **cli:** Update the chunkd verison for the fix, and allow trailing slash uri ([#3140](https://github.com/linz/basemaps/issues/3140)) ([a0b3d9e](https://github.com/linz/basemaps/commit/a0b3d9e5cb464c4d2bfcada1d0a27c06c2809893))
|
|
12
|
+
* **lambda-tiler:** fixup up bundling of arm libvips ([#3043](https://github.com/linz/basemaps/issues/3043)) ([3214192](https://github.com/linz/basemaps/commit/3214192020a3a956468e51120721679ec2b313bc))
|
|
13
|
+
* **lambda-tiler:** lerc needs to be external to allow wasm import ([#3153](https://github.com/linz/basemaps/issues/3153)) ([d27b61d](https://github.com/linz/basemaps/commit/d27b61d9ec00636011f9a6ea73b424a397a315df))
|
|
14
|
+
* **lambda-tiler:** only use a compose pipeline if a pipeline is defined ([#3200](https://github.com/linz/basemaps/issues/3200)) ([dfd10d3](https://github.com/linz/basemaps/commit/dfd10d3a3c3ec008c2538794e45876116bd84359))
|
|
15
|
+
* some tests commented out ([#3066](https://github.com/linz/basemaps/issues/3066)) ([9896308](https://github.com/linz/basemaps/commit/98963088aff978639c7721e493c63b5582f3686e))
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Features
|
|
19
|
+
|
|
20
|
+
* allow configuration of output tile types base of tileset configuration BM-932 ([#3103](https://github.com/linz/basemaps/issues/3103)) ([808e554](https://github.com/linz/basemaps/commit/808e554a43c2a82ba6d5544a88fc6f84f3eac020))
|
|
21
|
+
* **config:** load DEMs and create default output piplines ([#3166](https://github.com/linz/basemaps/issues/3166)) ([fa08983](https://github.com/linz/basemaps/commit/fa08983049c999c7010313d6fb37f057025f31b8))
|
|
22
|
+
* **lambda-tiler:** randomly sample requests with trace logging ([#3170](https://github.com/linz/basemaps/issues/3170)) ([ced60bc](https://github.com/linz/basemaps/commit/ced60bc694d703da516e524c843b07b01922eb2b))
|
|
23
|
+
* **lambda-tiler:** show the first pipeline as the preview instead of a broken image ([#3187](https://github.com/linz/basemaps/issues/3187)) ([3101ace](https://github.com/linz/basemaps/commit/3101aceed618d2f7ef48f3dadd226a58bcadf9d5))
|
|
24
|
+
* **landing:** Add Config Debug for screenshot elevation data. ([#3174](https://github.com/linz/basemaps/issues/3174)) ([0ee360d](https://github.com/linz/basemaps/commit/0ee360de5181d60c9358e9a739f20503ed7c0ebd))
|
|
25
|
+
* **landing:** Enable elevation preview in the basemaps debug page ([#3161](https://github.com/linz/basemaps/issues/3161)) ([b902599](https://github.com/linz/basemaps/commit/b902599e0a574b71eb698287aeefc2cd5dd853d4))
|
|
26
|
+
* move to query parameters for pipeline selection ([#3136](https://github.com/linz/basemaps/issues/3136)) ([32c501c](https://github.com/linz/basemaps/commit/32c501c76301c69639eb412fac80f488f65ad3fb))
|
|
27
|
+
* **tiler-sharp:** allow outputs to customise how output is compressed ([#3126](https://github.com/linz/basemaps/issues/3126)) ([f13b8fb](https://github.com/linz/basemaps/commit/f13b8fb2aae7ad224c3fde6cfb4cd8f70d4f1f9e))
|
|
28
|
+
* **tiler-sharp:** directly resize/resample DEM inputs rather than RGBA outputs ([#3173](https://github.com/linz/basemaps/issues/3173)) ([b901f83](https://github.com/linz/basemaps/commit/b901f837757d59ddc8e1b8eb3beb87fa96dbc053))
|
|
29
|
+
* upgrade to typescript 5 ([#3019](https://github.com/linz/basemaps/issues/3019)) ([53aeebb](https://github.com/linz/basemaps/commit/53aeebbf07f173ac01aab0300d6e430159817c7e))
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
|
|
6
35
|
# [7.0.0](https://github.com/linz/basemaps/compare/v6.46.0...v7.0.0) (2023-11-27)
|
|
7
36
|
|
|
8
37
|
|
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
import { base58, ConfigProviderMemory, TileSetType, } from '@basemaps/config';
|
|
2
|
-
import {
|
|
3
|
-
import { fsa } from '@basemaps/shared';
|
|
4
|
-
import { FsMemory } from '@chunkd/source-memory';
|
|
2
|
+
import { fsa, FsMemory } from '@basemaps/shared';
|
|
5
3
|
export const TileSetAerial = {
|
|
6
4
|
id: 'ts_aerial',
|
|
7
5
|
name: 'aerial',
|
|
8
6
|
type: TileSetType.Raster,
|
|
9
|
-
format: ImageFormat.Webp,
|
|
10
7
|
description: 'aerial__description',
|
|
11
8
|
title: 'Aerial Imagery',
|
|
12
9
|
category: 'Basemap',
|
|
@@ -27,7 +24,6 @@ export const TileSetVector = {
|
|
|
27
24
|
description: 'topotgrpahic__description',
|
|
28
25
|
title: 'topotgrpahic Imagery',
|
|
29
26
|
category: 'Basemap',
|
|
30
|
-
format: VectorFormat.MapboxVectorTiles,
|
|
31
27
|
layers: [
|
|
32
28
|
{
|
|
33
29
|
3857: 's3://linz-basemaps/01G7WQMGHB7V946M0YWJJBZ6DW/topopgraphic.tar.co',
|
|
@@ -258,7 +254,7 @@ export class FakeData {
|
|
|
258
254
|
const output = cfg.toJson();
|
|
259
255
|
const fsMemory = new FsMemory();
|
|
260
256
|
const configPath = `memory://linz-basemaps/${output.hash}.json`;
|
|
261
|
-
fsMemory.files.set(configPath, Buffer.from(JSON.stringify(output)));
|
|
257
|
+
fsMemory.files.set(configPath, { buffer: Buffer.from(JSON.stringify(output)) });
|
|
262
258
|
fsa.register(configPath, fsMemory);
|
|
263
259
|
return base58.encode(Buffer.from(configPath));
|
|
264
260
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.data.js","sourceRoot":"","sources":["../../src/__tests__/config.data.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAIN,oBAAoB,EAGpB,WAAW,GACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"config.data.js","sourceRoot":"","sources":["../../src/__tests__/config.data.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,48 +1,49 @@
|
|
|
1
|
-
import
|
|
1
|
+
import assert from 'node:assert';
|
|
2
|
+
import { afterEach, describe, it } from 'node:test';
|
|
2
3
|
import { handler } from '../index.js';
|
|
3
4
|
import { mockRequest } from './xyz.util.js';
|
|
4
|
-
|
|
5
|
-
|
|
5
|
+
describe('LambdaXyz index', () => {
|
|
6
|
+
it('should export handler', async () => {
|
|
6
7
|
const foo = await import('../index.js');
|
|
7
|
-
|
|
8
|
+
assert.equal(typeof foo.handler, 'function');
|
|
8
9
|
});
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
delete process.env
|
|
12
|
-
delete process.env
|
|
13
|
-
delete process.env
|
|
10
|
+
describe('version', () => {
|
|
11
|
+
afterEach(() => {
|
|
12
|
+
delete process.env['GIT_VERSION'];
|
|
13
|
+
delete process.env['GIT_HASH'];
|
|
14
|
+
delete process.env['BUILD_ID'];
|
|
14
15
|
});
|
|
15
|
-
|
|
16
|
-
process.env
|
|
17
|
-
process.env
|
|
16
|
+
it('should return version', async () => {
|
|
17
|
+
process.env['GIT_VERSION'] = '1.2.3';
|
|
18
|
+
process.env['GIT_HASH'] = 'abc456';
|
|
18
19
|
const response = await handler.router.handle(mockRequest('/v1/version'));
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
assert.equal(response.status, 200);
|
|
21
|
+
assert.equal(response.statusDescription, 'ok');
|
|
22
|
+
assert.equal(response.header('cache-control'), 'no-store');
|
|
23
|
+
assert.deepEqual(JSON.parse(response.body), {
|
|
23
24
|
version: '1.2.3',
|
|
24
25
|
hash: 'abc456',
|
|
25
26
|
});
|
|
26
27
|
});
|
|
27
|
-
|
|
28
|
-
process.env
|
|
29
|
-
process.env
|
|
28
|
+
it('should include buildId if exists', async () => {
|
|
29
|
+
process.env['GIT_VERSION'] = '1.2.3';
|
|
30
|
+
process.env['BUILD_ID'] = '1658821493-3';
|
|
30
31
|
const response = await handler.router.handle(mockRequest('/v1/version'));
|
|
31
32
|
const body = JSON.parse(response.body);
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
assert.equal(response.status, 200);
|
|
34
|
+
assert.equal(response.statusDescription, 'ok');
|
|
35
|
+
assert.equal(response.header('cache-control'), 'no-store');
|
|
36
|
+
assert.deepEqual(body, {
|
|
36
37
|
version: '1.2.3',
|
|
37
38
|
buildId: '1658821493-3',
|
|
38
39
|
});
|
|
39
40
|
});
|
|
40
41
|
});
|
|
41
|
-
|
|
42
|
+
it('should respond to /ping', async () => {
|
|
42
43
|
const res = await handler.router.handle(mockRequest('/v1/ping'));
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
assert.equal(res.status, 200);
|
|
45
|
+
assert.equal(res.statusDescription, 'ok');
|
|
46
|
+
assert.equal(res.header('cache-control'), 'no-store');
|
|
46
47
|
});
|
|
47
48
|
});
|
|
48
49
|
//# sourceMappingURL=index.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/__tests__/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/__tests__/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,34 +1,35 @@
|
|
|
1
|
+
import assert from 'node:assert';
|
|
2
|
+
import { afterEach, beforeEach, describe, it } from 'node:test';
|
|
1
3
|
import { Env } from '@basemaps/shared';
|
|
2
|
-
import o from 'ospec';
|
|
3
4
|
import { convertRelativeUrl, convertStyleJson } from '../routes/tile.style.json.js';
|
|
4
|
-
|
|
5
|
+
describe('TileStyleJson', () => {
|
|
5
6
|
const host = 'https://tiles.test';
|
|
6
7
|
let originalHost;
|
|
7
|
-
|
|
8
|
+
beforeEach(() => {
|
|
8
9
|
originalHost = process.env[Env.PublicUrlBase];
|
|
9
10
|
process.env[Env.PublicUrlBase] = host;
|
|
10
11
|
});
|
|
11
|
-
|
|
12
|
+
afterEach(() => {
|
|
12
13
|
process.env[Env.PublicUrlBase] = originalHost;
|
|
13
14
|
});
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
it('should not convert empty urls', () => {
|
|
16
|
+
assert.equal(convertRelativeUrl(), '');
|
|
17
|
+
assert.equal(convertRelativeUrl(''), '');
|
|
18
|
+
assert.equal(convertRelativeUrl(undefined), '');
|
|
18
19
|
});
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
it('should only convert relative urls', () => {
|
|
21
|
+
assert.equal(convertRelativeUrl('/foo'), 'https://tiles.test/foo');
|
|
22
|
+
assert.equal(convertRelativeUrl('/bar/baz/'), 'https://tiles.test/bar/baz/');
|
|
22
23
|
});
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
it('should only convert with api keys', () => {
|
|
25
|
+
assert.equal(convertRelativeUrl('/foo', 'abc'), 'https://tiles.test/foo?api=abc');
|
|
26
|
+
assert.equal(convertRelativeUrl('/bar/baz/', 'abc'), 'https://tiles.test/bar/baz/?api=abc');
|
|
26
27
|
});
|
|
27
|
-
|
|
28
|
-
|
|
28
|
+
it('should convert with other query params', () => {
|
|
29
|
+
assert.equal(convertRelativeUrl('/foo?bar=baz', 'abc'), 'https://tiles.test/foo?bar=baz&api=abc');
|
|
29
30
|
});
|
|
30
|
-
|
|
31
|
-
|
|
31
|
+
it('should not convert full urls', () => {
|
|
32
|
+
assert.equal(convertRelativeUrl('https://foo.com/foo?bar=baz', 'abc'), 'https://foo.com/foo?bar=baz');
|
|
32
33
|
});
|
|
33
34
|
const baseStyleJson = {
|
|
34
35
|
version: 8,
|
|
@@ -43,49 +44,49 @@ o.spec('TileStyleJson', () => {
|
|
|
43
44
|
glyphs: '/v1/glyphs',
|
|
44
45
|
sprite: '/v1/sprites',
|
|
45
46
|
};
|
|
46
|
-
|
|
47
|
+
it('should not destroy the original configuration', () => {
|
|
47
48
|
const apiKey = 'abc123';
|
|
48
49
|
const converted = convertStyleJson(baseStyleJson, apiKey, null);
|
|
49
|
-
|
|
50
|
+
assert.deepEqual(converted.sources['vector'], {
|
|
50
51
|
type: 'vector',
|
|
51
52
|
url: 'https://tiles.test/v1/tiles/topographic/EPSG:3857/tile.json?api=abc123',
|
|
52
53
|
});
|
|
53
|
-
|
|
54
|
+
assert.deepEqual(converted.sources['raster'], {
|
|
54
55
|
type: 'raster',
|
|
55
56
|
tiles: ['https://tiles.test/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.webp?api=abc123'],
|
|
56
57
|
});
|
|
57
|
-
|
|
58
|
+
assert.equal(JSON.stringify(baseStyleJson).includes(apiKey), false);
|
|
58
59
|
const convertedB = convertStyleJson(baseStyleJson, '0x1234', null);
|
|
59
|
-
|
|
60
|
+
assert.deepEqual(convertedB.sources['vector'], {
|
|
60
61
|
type: 'vector',
|
|
61
62
|
url: 'https://tiles.test/v1/tiles/topographic/EPSG:3857/tile.json?api=0x1234',
|
|
62
63
|
});
|
|
63
|
-
|
|
64
|
+
assert.deepEqual(convertedB.sources['raster'], {
|
|
64
65
|
type: 'raster',
|
|
65
66
|
tiles: ['https://tiles.test/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.webp?api=0x1234'],
|
|
66
67
|
});
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
68
|
+
assert.equal(JSON.stringify(baseStyleJson).includes('0x1234'), false);
|
|
69
|
+
assert.equal(JSON.stringify(baseStyleJson).includes(apiKey), false);
|
|
70
|
+
assert.equal(JSON.stringify(baseStyleJson).includes('?api='), false);
|
|
70
71
|
});
|
|
71
|
-
|
|
72
|
+
it('should convert relative glyphs and sprites', () => {
|
|
72
73
|
const apiKey = '0x9f9f';
|
|
73
74
|
const converted = convertStyleJson(baseStyleJson, apiKey, null);
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
75
|
+
assert.equal(converted.sprite, 'https://tiles.test/v1/sprites');
|
|
76
|
+
assert.equal(converted.glyphs, 'https://tiles.test/v1/glyphs');
|
|
77
|
+
assert.equal(JSON.stringify(baseStyleJson).includes(apiKey), false);
|
|
78
|
+
assert.equal(JSON.stringify(baseStyleJson).includes('?api='), false);
|
|
78
79
|
});
|
|
79
|
-
|
|
80
|
+
it('should convert with config', () => {
|
|
80
81
|
const apiKey = '0x9f9f';
|
|
81
82
|
const converted = convertStyleJson(baseStyleJson, apiKey, 'config.json');
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
83
|
+
assert.equal(converted.sprite, 'https://tiles.test/v1/sprites?config=config.json');
|
|
84
|
+
assert.equal(converted.glyphs, 'https://tiles.test/v1/glyphs?config=config.json');
|
|
85
|
+
assert.deepEqual(converted.sources['vector'], {
|
|
85
86
|
type: 'vector',
|
|
86
87
|
url: 'https://tiles.test/v1/tiles/topographic/EPSG:3857/tile.json?api=0x9f9f&config=config.json',
|
|
87
88
|
});
|
|
88
|
-
|
|
89
|
+
assert.deepEqual(converted.sources['raster'], {
|
|
89
90
|
type: 'raster',
|
|
90
91
|
tiles: ['https://tiles.test/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.webp?api=0x9f9f&config=config.json'],
|
|
91
92
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.style.json.test.js","sourceRoot":"","sources":["../../src/__tests__/tile.style.json.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tile.style.json.test.js","sourceRoot":"","sources":["../../src/__tests__/tile.style.json.test.ts"],"names":[],"mappings":"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"}
|