@basemaps/lambda-tiler 6.34.0 → 6.36.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 +40 -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 +42 -9
- 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 +5 -11
- 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/fonts.js +1 -1
- package/build/routes/fonts.js.map +1 -1
- 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 +19 -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 +54 -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 +63 -63
- package/dist/node_modules/.package-lock.json +13 -10
- package/dist/node_modules/minimist/.eslintrc +54 -0
- package/dist/node_modules/minimist/.github/FUNDING.yml +12 -0
- package/dist/node_modules/minimist/.nycrc +14 -0
- package/dist/node_modules/minimist/CHANGELOG.md +212 -0
- package/dist/node_modules/minimist/{readme.markdown → README.md} +20 -1
- package/dist/node_modules/minimist/package.json +39 -9
- package/dist/node_modules/node-abi/abi_registry.json +8 -1
- package/dist/node_modules/node-abi/package.json +1 -1
- package/dist/node_modules/semver/classes/range.js +3 -0
- package/dist/node_modules/semver/index.js +81 -41
- package/dist/node_modules/semver/package.json +21 -10
- package/dist/package-lock.json +23 -20
- 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 +48 -11
- package/src/routes/__tests__/health.test.ts +4 -2
- package/src/routes/__tests__/sprites.test.ts +6 -11
- 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/fonts.ts +1 -1
- 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 +8 -12
- package/src/util/config.cache.ts +18 -18
- package/src/util/config.loader.ts +56 -0
- package/src/wmts.capability.ts +9 -15
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/node_modules/minimist/.travis.yml +0 -8
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,46 @@
|
|
|
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
|
+
# [6.36.0](https://github.com/linz/basemaps/compare/v6.35.0...v6.36.0) (2022-10-18)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* Remove AssetLocation and using cb_lastest to get default assets. BM-693 ([#2527](https://github.com/linz/basemaps/issues/2527)) ([fce8607](https://github.com/linz/basemaps/commit/fce860786fb838a6fcbe65f35ca9ec6f12eeaf97))
|
|
12
|
+
* **lambda-tiler:** Fix the font.json api which should get from assests/fonts/fonts.json ([#2526](https://github.com/linz/basemaps/issues/2526)) ([174d95f](https://github.com/linz/basemaps/commit/174d95fff3fb76d14f17c174bfbc52ee199ba7c3))
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
# [6.35.0](https://github.com/linz/basemaps/compare/v6.34.0...v6.35.0) (2022-09-14)
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
### Bug Fixes
|
|
22
|
+
|
|
23
|
+
* **infra:** give lambda-tiler access to config bucket ([#2457](https://github.com/linz/basemaps/issues/2457)) ([788c995](https://github.com/linz/basemaps/commit/788c995256642f89458e2b72c2bddec8ab8fb1b7))
|
|
24
|
+
* **lambda-tiler:** allow reading config from memory ([#2443](https://github.com/linz/basemaps/issues/2443)) ([9f98719](https://github.com/linz/basemaps/commit/9f987192f67c04a6bb1e97ab30680ef48a71db0e))
|
|
25
|
+
* **lambda-tiler:** assume current year when imagery has no date ([#2462](https://github.com/linz/basemaps/issues/2462)) ([289df66](https://github.com/linz/basemaps/commit/289df66ff78dc07361af56c1bafc663ea1beaf36))
|
|
26
|
+
* **lambda-tiler:** ensure wmts and style propagate config location ([#2445](https://github.com/linz/basemaps/issues/2445)) ([d93a34b](https://github.com/linz/basemaps/commit/d93a34b50bce9b49a30baa1fbfd7142332738d23))
|
|
27
|
+
* **lambda-tiler:** send 408 timeout response rather than timing out. ([#2460](https://github.com/linz/basemaps/issues/2460)) ([8d31469](https://github.com/linz/basemaps/commit/8d31469829a65739ccbe525031897259d9ae2ae4))
|
|
28
|
+
* **landing:** ensure tileMatrix is being passed correctly ([#2454](https://github.com/linz/basemaps/issues/2454)) ([3b66dee](https://github.com/linz/basemaps/commit/3b66dee9700074d578328d434cae9c6f6c20dfff))
|
|
29
|
+
* **landing:** force config to always be in base58 ([#2463](https://github.com/linz/basemaps/issues/2463)) ([a2447e9](https://github.com/linz/basemaps/commit/a2447e9228c1fdc2f28af70699261f200a201226))
|
|
30
|
+
* **shared:** ensure & is escaped in xml ([#2456](https://github.com/linz/basemaps/issues/2456)) ([665e433](https://github.com/linz/basemaps/commit/665e4335cbf52aeb2292295aba40fa40abf4c1b0))
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
### Features
|
|
34
|
+
|
|
35
|
+
* switch to aws role provider from chunkd ([#2473](https://github.com/linz/basemaps/issues/2473)) ([87be0e0](https://github.com/linz/basemaps/commit/87be0e08610f02003cb4ec3f6ced9b2051ee1617))
|
|
36
|
+
* **lambda-tiler:** Add tests for the config loader. ([#2446](https://github.com/linz/basemaps/issues/2446)) ([73c5a95](https://github.com/linz/basemaps/commit/73c5a9568b0fc9fc061c0752f9bb2474fb6ef347))
|
|
37
|
+
* **lambda-tiler:** Set Default asset location when config.asset is null ([#2450](https://github.com/linz/basemaps/issues/2450)) ([a244879](https://github.com/linz/basemaps/commit/a244879d7249da806bf35b4ad0f325066276e96c))
|
|
38
|
+
* **landing:** Load config into debug pages. ([#2486](https://github.com/linz/basemaps/issues/2486)) ([bf6b601](https://github.com/linz/basemaps/commit/bf6b601e46ee4693122dfa23ac18566ebc084aa4))
|
|
39
|
+
* allow loading config from ?config ([#2442](https://github.com/linz/basemaps/issues/2442)) ([8f946d8](https://github.com/linz/basemaps/commit/8f946d8ffb155304b80c26aca0faf4c64136390f))
|
|
40
|
+
* support styles from raster tile sets ([#2444](https://github.com/linz/basemaps/issues/2444)) ([bcd521f](https://github.com/linz/basemaps/commit/bcd521f3d240f07a41a4b09a2874d49283bcd3de))
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
|
|
6
46
|
# [6.34.0](https://github.com/linz/basemaps/compare/v6.33.0...v6.34.0) (2022-08-17)
|
|
7
47
|
|
|
8
48
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ConfigImagery, ConfigProvider, ConfigTileSetRaster, ConfigTileSetVector } from '@basemaps/config';
|
|
1
|
+
import { BaseConfig, ConfigImagery, ConfigProvider, ConfigTileSetRaster, ConfigTileSetVector } from '@basemaps/config';
|
|
2
2
|
export declare const TileSetAerial: ConfigTileSetRaster;
|
|
3
3
|
export declare const TileSetVector: ConfigTileSetVector;
|
|
4
4
|
export declare const Imagery2193: ConfigImagery;
|
|
@@ -7,5 +7,6 @@ export declare const Provider: ConfigProvider;
|
|
|
7
7
|
export declare class FakeData {
|
|
8
8
|
static tileSetRaster(name: string): ConfigTileSetRaster;
|
|
9
9
|
static tileSetVector(name: string): ConfigTileSetVector;
|
|
10
|
+
static bundle(configs: BaseConfig[]): string;
|
|
10
11
|
}
|
|
11
12
|
//# sourceMappingURL=config.data.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.data.d.ts","sourceRoot":"","sources":["../../src/__tests__/config.data.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"config.data.d.ts","sourceRoot":"","sources":["../../src/__tests__/config.data.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,aAAa,EACb,cAAc,EAEd,mBAAmB,EACnB,mBAAmB,EAEpB,MAAM,kBAAkB,CAAC;AAK1B,eAAO,MAAM,aAAa,EAAE,mBAiB3B,CAAC;AACF,eAAO,MAAM,aAAa,EAAE,mBAgB3B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,aAezB,CAAC;AACF,eAAO,MAAM,WAAW,EAAE,aAezB,CAAC;AAEF,eAAO,MAAM,QAAQ,EAAE,cA2BtB,CAAC;AAEF,qBAAa,QAAQ;IACnB,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB;IASvD,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB;IASvD,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,MAAM;CAY7C"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { TileSetType } from '@basemaps/config';
|
|
1
|
+
import { base58, ConfigProviderMemory, TileSetType, } from '@basemaps/config';
|
|
2
2
|
import { ImageFormat, VectorFormat } from '@basemaps/geo';
|
|
3
|
+
import { fsa } from '@basemaps/shared';
|
|
4
|
+
import { FsMemory } from '../routes/__tests__/memory.fs.js';
|
|
3
5
|
export const TileSetAerial = {
|
|
4
6
|
id: 'ts_aerial',
|
|
5
7
|
name: 'aerial',
|
|
@@ -108,5 +110,16 @@ export class FakeData {
|
|
|
108
110
|
tileSet.id = `ts_${name}`;
|
|
109
111
|
return tileSet;
|
|
110
112
|
}
|
|
113
|
+
static bundle(configs) {
|
|
114
|
+
const cfg = new ConfigProviderMemory();
|
|
115
|
+
for (const rec of configs)
|
|
116
|
+
cfg.put(rec);
|
|
117
|
+
const output = cfg.toJson();
|
|
118
|
+
const fsMemory = new FsMemory();
|
|
119
|
+
const configPath = `memory://linz-basemaps/${output.hash}.json`;
|
|
120
|
+
fsMemory.files.set(configPath, Buffer.from(JSON.stringify(output)));
|
|
121
|
+
fsa.register(configPath, fsMemory);
|
|
122
|
+
return base58.encode(Buffer.from(configPath));
|
|
123
|
+
}
|
|
111
124
|
}
|
|
112
125
|
//# sourceMappingURL=config.data.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.data.js","sourceRoot":"","sources":["../../src/__tests__/config.data.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"config.data.js","sourceRoot":"","sources":["../../src/__tests__/config.data.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,7 @@ o.spec('TileStyleJson', () => {
|
|
|
45
45
|
};
|
|
46
46
|
o('should not destroy the original configuration', () => {
|
|
47
47
|
const apiKey = 'abc123';
|
|
48
|
-
const converted = convertStyleJson(baseStyleJson, apiKey);
|
|
48
|
+
const converted = convertStyleJson(baseStyleJson, apiKey, null);
|
|
49
49
|
o(converted.sources.vector).deepEquals({
|
|
50
50
|
type: 'vector',
|
|
51
51
|
url: 'https://tiles.test/v1/tiles/topographic/EPSG:3857/tile.json?api=abc123',
|
|
@@ -55,7 +55,7 @@ o.spec('TileStyleJson', () => {
|
|
|
55
55
|
tiles: ['https://tiles.test/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.webp?api=abc123'],
|
|
56
56
|
});
|
|
57
57
|
o(JSON.stringify(baseStyleJson).includes(apiKey)).equals(false);
|
|
58
|
-
const convertedB = convertStyleJson(baseStyleJson, '0x1234');
|
|
58
|
+
const convertedB = convertStyleJson(baseStyleJson, '0x1234', null);
|
|
59
59
|
o(convertedB.sources.vector).deepEquals({
|
|
60
60
|
type: 'vector',
|
|
61
61
|
url: 'https://tiles.test/v1/tiles/topographic/EPSG:3857/tile.json?api=0x1234',
|
|
@@ -70,11 +70,25 @@ o.spec('TileStyleJson', () => {
|
|
|
70
70
|
});
|
|
71
71
|
o('should convert relative glyphs and sprites', () => {
|
|
72
72
|
const apiKey = '0x9f9f';
|
|
73
|
-
const converted = convertStyleJson(baseStyleJson, apiKey);
|
|
73
|
+
const converted = convertStyleJson(baseStyleJson, apiKey, null);
|
|
74
74
|
o(converted.sprite).equals('https://tiles.test/v1/sprites');
|
|
75
75
|
o(converted.glyphs).equals('https://tiles.test/v1/glyphs');
|
|
76
76
|
o(JSON.stringify(baseStyleJson).includes(apiKey)).equals(false);
|
|
77
77
|
o(JSON.stringify(baseStyleJson).includes('?api=')).equals(false);
|
|
78
78
|
});
|
|
79
|
+
o('should convert with config', () => {
|
|
80
|
+
const apiKey = '0x9f9f';
|
|
81
|
+
const converted = convertStyleJson(baseStyleJson, apiKey, 'config.json');
|
|
82
|
+
o(converted.sprite).equals('https://tiles.test/v1/sprites?config=config.json');
|
|
83
|
+
o(converted.glyphs).equals('https://tiles.test/v1/glyphs?config=config.json');
|
|
84
|
+
o(converted.sources.vector).deepEquals({
|
|
85
|
+
type: 'vector',
|
|
86
|
+
url: 'https://tiles.test/v1/tiles/topographic/EPSG:3857/tile.json?api=0x9f9f&config=config.json',
|
|
87
|
+
});
|
|
88
|
+
o(converted.sources.raster).deepEquals({
|
|
89
|
+
type: 'raster',
|
|
90
|
+
tiles: ['https://tiles.test/v1/tiles/aerial/EPSG:3857/{z}/{x}/{y}.webp?api=0x9f9f&config=config.json'],
|
|
91
|
+
});
|
|
92
|
+
});
|
|
79
93
|
});
|
|
80
94
|
//# sourceMappingURL=tile.style.json.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.style.json.test.js","sourceRoot":"","sources":["../../src/__tests__/tile.style.json.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEpF,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;IAC3B,MAAM,IAAI,GAAG,oBAAoB,CAAC;IAClC,IAAI,YAAgC,CAAC;IACrC,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE;QAChB,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,YAAY,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACtC,CAAC,CAAC,kBAAkB,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnC,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC1C,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAC/D,CAAC,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC1C,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,gCAAgC,CAAC,CAAC;QAC9E,CAAC,CAAC,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,qCAAqC,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAC/C,CAAC,CAAC,kBAAkB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,wCAAwC,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACrC,CAAC,CAAC,kBAAkB,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACpG,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAc;QAC/B,OAAO,EAAE,CAAC;QACV,EAAE,EAAE,UAAU;QACd,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE;YACP,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,2CAA2C,EAAE;YAC5E,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,6CAA6C,CAAC,EAAE;SACnF;QACD,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,YAAY;QACpB,MAAM,EAAE,aAAa;KACtB,CAAC;IAEF,CAAC,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACtD,MAAM,MAAM,GAAG,QAAQ,CAAC;QACxB,MAAM,SAAS,GAAG,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tile.style.json.test.js","sourceRoot":"","sources":["../../src/__tests__/tile.style.json.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,23 @@ o.spec('WmtsCapabilities', () => {
|
|
|
33
33
|
o(urls[0].attrs.format).equals('image/avif');
|
|
34
34
|
o(urls[0].attrs.template).equals('https://basemaps.test/v1/tiles/aerial/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.avif?api=secret1234');
|
|
35
35
|
});
|
|
36
|
+
o('should include config location', () => {
|
|
37
|
+
const wmts = new WmtsCapabilities({
|
|
38
|
+
httpBase: 'https://basemaps.test',
|
|
39
|
+
provider: Provider,
|
|
40
|
+
tileMatrix: [GoogleTms],
|
|
41
|
+
tileSet: TileSetAerial,
|
|
42
|
+
imagery: allImagery,
|
|
43
|
+
apiKey,
|
|
44
|
+
config: 's3://linz-basemaps/config.json',
|
|
45
|
+
formats: [ImageFormat.Avif],
|
|
46
|
+
isIndividualLayers: false,
|
|
47
|
+
}).toVNode();
|
|
48
|
+
const urls = tags(wmts, 'ResourceURL');
|
|
49
|
+
o(urls.length).equals(1);
|
|
50
|
+
o(urls[0].attrs.format).equals('image/avif');
|
|
51
|
+
o(urls[0].attrs.template).equals('https://basemaps.test/v1/tiles/aerial/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.avif?api=secret1234&config=s3%3A%2F%2Flinz-basemaps%2Fconfig.json');
|
|
52
|
+
});
|
|
36
53
|
o('should be seting encoding to utf-8', () => {
|
|
37
54
|
const xml = new WmtsCapabilities({
|
|
38
55
|
httpBase: 'https://basemaps.test',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wmts.capability.test.js","sourceRoot":"","sources":["../../src/__tests__/wmts.capability.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"wmts.capability.test.js","sourceRoot":"","sources":["../../src/__tests__/wmts.capability.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,33 @@
|
|
|
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 { ConfigLoader } from '../../util/config.loader.js';
|
|
6
7
|
import { FakeData } from '../../__tests__/config.data.js';
|
|
7
8
|
import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
|
|
8
|
-
o.spec('
|
|
9
|
+
o.spec('arcgis/stylejson', () => {
|
|
9
10
|
const host = 'https://tiles.test';
|
|
10
11
|
const sandbox = createSandbox();
|
|
12
|
+
const config = new ConfigProviderMemory();
|
|
11
13
|
o.before(() => {
|
|
12
14
|
process.env[Env.PublicUrlBase] = host;
|
|
13
15
|
});
|
|
14
|
-
o.
|
|
16
|
+
o.beforeEach(() => {
|
|
17
|
+
sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
|
|
18
|
+
config.objects.clear();
|
|
19
|
+
});
|
|
20
|
+
o.afterEach(() => {
|
|
21
|
+
sandbox.restore();
|
|
22
|
+
});
|
|
15
23
|
o('should not found tile set', async () => {
|
|
16
24
|
const request = mockRequest('/v1/arcgis/rest/services/topographic/VectorTileServer/root.json', 'get', Api.header);
|
|
17
|
-
sandbox.stub(Config.TileSet, 'get').resolves(null);
|
|
18
25
|
const res = await handler.router.handle(request);
|
|
19
26
|
o(res.status).equals(404);
|
|
20
27
|
});
|
|
21
28
|
o('should not found style', async () => {
|
|
22
29
|
const request = mockRequest('/v1/arcgis/rest/services/topographic/VectorTileServer/root.json', 'get', Api.header);
|
|
23
|
-
|
|
24
|
-
sandbox.stub(Config.Style, 'get').resolves(null);
|
|
30
|
+
config.put(FakeData.tileSetVector('topographic'));
|
|
25
31
|
const res = await handler.router.handle(request);
|
|
26
32
|
o(res.status).equals(404);
|
|
27
33
|
});
|
|
@@ -77,8 +83,8 @@ o.spec('v1/arcgis/rest/services/', () => {
|
|
|
77
83
|
o('should serve style json and remove the raster source and layers, then replace the vector url', async () => {
|
|
78
84
|
var _a;
|
|
79
85
|
const request = mockRequest('/v1/arcgis/rest/services/topographic/VectorTileServer/root.json', 'get', Api.header);
|
|
80
|
-
|
|
81
|
-
|
|
86
|
+
config.put(FakeData.tileSetVector('topographic'));
|
|
87
|
+
config.put(fakeRecord);
|
|
82
88
|
const res = await handler.router.handle(request);
|
|
83
89
|
o(res.status).equals(200);
|
|
84
90
|
o(res.header('content-type')).equals('application/json');
|
|
@@ -96,19 +102,16 @@ o.spec('v1/arcgis/rest/services/', () => {
|
|
|
96
102
|
});
|
|
97
103
|
o('should not found for raster tileset', async () => {
|
|
98
104
|
const request = mockRequest('/v1/arcgis/rest/services/raster/VectorTileServer/root.json', 'get', Api.header);
|
|
99
|
-
|
|
100
|
-
|
|
105
|
+
config.put(FakeData.tileSetRaster('raster'));
|
|
106
|
+
config.put(fakeRecord);
|
|
101
107
|
const res = await handler.router.handle(request);
|
|
102
108
|
o(res.status).equals(404);
|
|
103
109
|
});
|
|
104
110
|
o('should fine the new style with url query', async () => {
|
|
105
111
|
var _a;
|
|
106
112
|
const request = mockUrlRequest('/v1/arcgis/rest/services/topographic/VectorTileServer/root.json', 'style=topolite', Api.header);
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
.stub(Config.Style, 'get')
|
|
110
|
-
.withArgs('st_topolite')
|
|
111
|
-
.resolves(fakeRecord);
|
|
113
|
+
config.put({ id: 'st_topolite', name: 'topographic', style: fakeStyle });
|
|
114
|
+
config.put(FakeData.tileSetVector('topographic'));
|
|
112
115
|
const res = await handler.router.handle(request);
|
|
113
116
|
o(res.status).equals(200);
|
|
114
117
|
o(res.header('content-type')).equals('application/json');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arcgis.style.json.test.js","sourceRoot":"","sources":["../../../src/arcgis/__tests__/arcgis.style.json.test.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"arcgis.style.json.test.js","sourceRoot":"","sources":["../../../src/arcgis/__tests__/arcgis.style.json.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,34 @@
|
|
|
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 { ConfigLoader } from '../../util/config.loader.js';
|
|
6
7
|
import { FakeData } from '../../__tests__/config.data.js';
|
|
7
8
|
import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
|
|
8
|
-
o.spec('
|
|
9
|
+
o.spec('arcgis/VectorTileServer', () => {
|
|
9
10
|
const host = 'https://tiles.test';
|
|
10
11
|
const sandbox = createSandbox();
|
|
12
|
+
const config = new ConfigProviderMemory();
|
|
11
13
|
o.before(() => {
|
|
12
14
|
process.env[Env.PublicUrlBase] = host;
|
|
13
15
|
});
|
|
14
|
-
o.
|
|
16
|
+
o.beforeEach(() => {
|
|
17
|
+
sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
|
|
18
|
+
config.objects.clear();
|
|
19
|
+
});
|
|
20
|
+
o.afterEach(() => {
|
|
21
|
+
sandbox.restore();
|
|
22
|
+
});
|
|
15
23
|
o('should not found tile set', async () => {
|
|
16
24
|
const request = mockUrlRequest('/v1/arcgis/rest/services/topographic/VectorTileServer', 'f=json', Api.header);
|
|
17
|
-
sandbox.stub(Config.TileSet, 'get').resolves(null);
|
|
18
25
|
const res = await handler.router.handle(request);
|
|
19
26
|
o(res.status).equals(404);
|
|
20
27
|
});
|
|
21
28
|
o('should return the vector tile server', async () => {
|
|
22
29
|
var _a;
|
|
23
30
|
const request = mockUrlRequest('/v1/arcgis/rest/services/topographic/VectorTileServer', 'f=json', Api.header);
|
|
24
|
-
|
|
31
|
+
config.put(FakeData.tileSetVector('topographic'));
|
|
25
32
|
const res = await handler.router.handle(request);
|
|
26
33
|
o(res.status).equals(200);
|
|
27
34
|
o(res.header('content-type')).equals('application/json');
|
|
@@ -32,13 +39,13 @@ o.spec('v1/arcgis/rest/services/', () => {
|
|
|
32
39
|
});
|
|
33
40
|
o('should not return with no f=json query', async () => {
|
|
34
41
|
const request = mockRequest('/v1/arcgis/rest/services/topographic/VectorTileServer', 'get', Api.header);
|
|
35
|
-
|
|
42
|
+
config.put(FakeData.tileSetVector('topographic'));
|
|
36
43
|
const res = await handler.router.handle(request);
|
|
37
44
|
o(res.status).equals(404);
|
|
38
45
|
});
|
|
39
46
|
o('should return ok for post request', async () => {
|
|
40
47
|
const request = mockUrlRequest('/v1/arcgis/rest/services/topographic/VectorTileServer', 'f=json', Api.header, 'POST');
|
|
41
|
-
|
|
48
|
+
config.put(FakeData.tileSetVector('topographic'));
|
|
42
49
|
const res = await handler.router.handle(request);
|
|
43
50
|
o(res.status).equals(200);
|
|
44
51
|
o(res.body).deepEquals(`{"id":"${request.id}","correlationId":"${request.correlationId}","message":"ok"}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector.tiler.server.test.js","sourceRoot":"","sources":["../../../src/arcgis/__tests__/vector.tiler.server.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"vector.tiler.server.test.js","sourceRoot":"","sources":["../../../src/arcgis/__tests__/vector.tiler.server.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arcgis.style.json.d.ts","sourceRoot":"","sources":["../../src/arcgis/arcgis.style.json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"arcgis.style.json.d.ts","sourceRoot":"","sources":["../../src/arcgis/arcgis.style.json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAOnF,UAAU,QAAQ;IAChB,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AA0CD,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,iBAAiB,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BtG"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TileSetType } from '@basemaps/config';
|
|
2
2
|
import { Env, fsa } from '@basemaps/shared';
|
|
3
3
|
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
4
4
|
import { convertRelativeUrl } from '../routes/tile.style.json.js';
|
|
5
|
+
import { ConfigLoader } from '../util/config.loader.js';
|
|
5
6
|
import { Etag } from '../util/etag.js';
|
|
6
7
|
import { NotFound, NotModified } from '../util/response.js';
|
|
7
8
|
import { Validate } from '../util/validate.js';
|
|
@@ -47,14 +48,15 @@ function convertStyleJson(tileSet, style, apiKey) {
|
|
|
47
48
|
}
|
|
48
49
|
export async function arcgisStyleJsonGet(req) {
|
|
49
50
|
const apiKey = Validate.apiKey(req);
|
|
50
|
-
const
|
|
51
|
+
const config = await ConfigLoader.load(req);
|
|
52
|
+
const tileSet = await config.TileSet.get(config.TileSet.id(req.params.tileSet));
|
|
51
53
|
if ((tileSet === null || tileSet === void 0 ? void 0 : tileSet.type) !== TileSetType.Vector)
|
|
52
54
|
return NotFound();
|
|
53
55
|
const style = req.query.get('style');
|
|
54
56
|
const styleName = style ? style : 'topographic'; // Defalut to topographic style
|
|
55
57
|
// Get style Config from db
|
|
56
|
-
const dbId =
|
|
57
|
-
const styleConfig = await
|
|
58
|
+
const dbId = config.Style.id(styleName);
|
|
59
|
+
const styleConfig = await config.Style.get(dbId);
|
|
58
60
|
if (styleConfig == null)
|
|
59
61
|
return NotFound();
|
|
60
62
|
// Prepare sources and add linz source
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arcgis.style.json.js","sourceRoot":"","sources":["../../src/arcgis/arcgis.style.json.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"arcgis.style.json.js","sourceRoot":"","sources":["../../src/arcgis/arcgis.style.json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAQ/C,SAAS,aAAa,CAAC,OAAe,EAAE,MAAc;;IACpD,MAAM,IAAI,GAAG,MAAA,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,mCAAI,EAAE,CAAC;IAC9C,MAAM,GAAG,GAAG,4BAA4B,OAAO,mBAAmB,CAAC;IACnE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAe,EAAE,KAAgB,EAAE,MAAc;;IACzE,MAAM,OAAO,GAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,uDAAuD;IACvD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAClD,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC3B,KAAK,CAAC,GAAG,GAAG,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC3C,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACtB;aAAM;YACL,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;SACrB;KACF;IAED,oCAAoC;IACpC,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;QAChC,IAAI,KAAK,CAAC,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;YAAE,SAAS;QAC5E,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACpB;IAED,OAAO;QACL,OAAO,EAAE,CAAC;QACV,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,OAAO;QACP,MAAM;QACN,QAAQ,EAAE,MAAA,KAAK,CAAC,QAAQ,mCAAI,EAAE;QAC9B,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC;QACxC,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC;KAC5B,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,GAAgC;IACvE,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAChF,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAK,WAAW,CAAC,MAAM;QAAE,OAAO,QAAQ,EAAE,CAAC;IAE5D,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,+BAA+B;IAEhF,2BAA2B;IAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjD,IAAI,WAAW,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAE3C,sCAAsC;IACtC,MAAM,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5E,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;IAEpD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC;QAAE,OAAO,WAAW,EAAE,CAAC;IAE5D,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACnD,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3C,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IACrD,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAC1C,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAClC,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector.tile.server.d.ts","sourceRoot":"","sources":["../../src/arcgis/vector.tile.server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"vector.tile.server.d.ts","sourceRoot":"","sources":["../../src/arcgis/vector.tile.server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAUnF,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA8D/G"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TileSetType } from '@basemaps/config';
|
|
2
2
|
import { GoogleTms } from '@basemaps/geo';
|
|
3
3
|
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
4
4
|
import { convertRelativeUrl } from '../routes/tile.style.json.js';
|
|
5
|
+
import { ConfigLoader } from '../util/config.loader.js';
|
|
5
6
|
import { NotFound } from '../util/response.js';
|
|
6
7
|
import { Validate } from '../util/validate.js';
|
|
7
8
|
/** Zoom level for the tilematrix which will be slice by 1 during the covertion to arcgis tileserve lods */
|
|
8
9
|
const MaxTileMatrixZoom = 18;
|
|
9
10
|
const MinTileMatrixZoom = 1;
|
|
10
11
|
export async function arcgisTileServerGet(req) {
|
|
11
|
-
const
|
|
12
|
+
const config = await ConfigLoader.load(req);
|
|
13
|
+
const tileSet = await config.TileSet.get(config.TileSet.id(req.params.tileSet));
|
|
12
14
|
if ((tileSet === null || tileSet === void 0 ? void 0 : tileSet.type) !== TileSetType.Vector)
|
|
13
15
|
return NotFound();
|
|
14
16
|
const apiKey = Validate.apiKey(req);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vector.tile.server.js","sourceRoot":"","sources":["../../src/arcgis/vector.tile.server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"vector.tile.server.js","sourceRoot":"","sources":["../../src/arcgis/vector.tile.server.ts"],"names":[],"mappings":"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"}
|
package/build/index.d.ts
CHANGED
|
@@ -1,4 +1,2 @@
|
|
|
1
|
-
export declare const handler: import("@linzjs/lambda/build/src/function").
|
|
2
|
-
router: import("@linzjs/lambda/build/src/http/router").Router;
|
|
3
|
-
};
|
|
1
|
+
export declare const handler: import("@linzjs/lambda/build/src/function").LambdaHandlerAsync<import("@linzjs/lambda/build/src/http/request.http").HttpRequestEvent, import("@linzjs/lambda/build/src/http/request.http").HttpResponse> & import("@linzjs/lambda/build/src/function").HttpHandlerOptions;
|
|
4
2
|
//# sourceMappingURL=index.d.ts.map
|
package/build/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,OAAO
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,OAAO,2QAA2B,CAAC"}
|