@basemaps/lambda-tiler 6.33.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 +47 -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/__tests__/xyz.util.d.ts +1 -1
- package/build/__tests__/xyz.util.d.ts.map +1 -1
- package/build/__tests__/xyz.util.js +2 -2
- package/build/__tests__/xyz.util.js.map +1 -1
- package/build/arcgis/__tests__/arcgis.style.json.test.d.ts +2 -0
- package/build/arcgis/__tests__/arcgis.style.json.test.d.ts.map +1 -0
- package/build/arcgis/__tests__/arcgis.style.json.test.js +131 -0
- package/build/arcgis/__tests__/arcgis.style.json.test.js.map +1 -0
- package/build/arcgis/__tests__/vector.tiler.server.test.d.ts +2 -0
- package/build/arcgis/__tests__/vector.tiler.server.test.d.ts.map +1 -0
- package/build/arcgis/__tests__/vector.tiler.server.test.js +54 -0
- package/build/arcgis/__tests__/vector.tiler.server.test.js.map +1 -0
- package/build/arcgis/arcgis.info.d.ts +3 -0
- package/build/arcgis/arcgis.info.d.ts.map +1 -0
- package/build/arcgis/arcgis.info.js +25 -0
- package/build/arcgis/arcgis.info.js.map +1 -0
- package/build/arcgis/arcgis.style.json.d.ts +9 -0
- package/build/arcgis/arcgis.style.json.d.ts.map +1 -0
- package/build/arcgis/arcgis.style.json.js +75 -0
- package/build/arcgis/arcgis.style.json.js.map +1 -0
- package/build/arcgis/vector.tile.server.d.ts +8 -0
- package/build/arcgis/vector.tile.server.d.ts.map +1 -0
- package/build/arcgis/vector.tile.server.js +73 -0
- package/build/arcgis/vector.tile.server.js.map +1 -0
- package/build/index.d.ts +1 -3
- package/build/index.d.ts.map +1 -1
- package/build/index.js +15 -4
- 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 +46 -29
- 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 +7 -2
- 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.d.ts +0 -2
- package/build/routes/fonts.d.ts.map +1 -1
- package/build/routes/fonts.js +3 -66
- 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/sprites.d.ts.map +1 -1
- package/build/routes/sprites.js +3 -29
- package/build/routes/sprites.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 +24 -0
- package/build/util/assets.provider.d.ts.map +1 -0
- package/build/util/assets.provider.js +69 -0
- package/build/util/assets.provider.js.map +1 -0
- package/build/util/config.cache.d.ts +16 -0
- package/build/util/config.cache.d.ts.map +1 -0
- package/build/util/config.cache.js +40 -0
- package/build/util/config.cache.js.map +1 -0
- 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/util/response.d.ts +2 -1
- package/build/util/response.d.ts.map +1 -1
- package/build/util/response.js +1 -0
- package/build/util/response.js.map +1 -1
- 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 +68 -68
- package/dist/node_modules/.package-lock.json +4 -4
- package/dist/node_modules/node-abi/abi_registry.json +8 -1
- package/dist/node_modules/node-abi/package.json +1 -1
- package/dist/package-lock.json +8 -8
- 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/__tests__/xyz.util.ts +7 -2
- package/src/arcgis/__tests__/arcgis.style.json.test.ts +157 -0
- package/src/arcgis/__tests__/vector.tiler.server.test.ts +70 -0
- package/src/arcgis/arcgis.info.ts +26 -0
- package/src/arcgis/arcgis.style.json.ts +83 -0
- package/src/arcgis/vector.tile.server.ts +81 -0
- package/src/index.ts +18 -5
- package/src/routes/__tests__/attribution.test.ts +4 -2
- package/src/routes/__tests__/fonts.test.ts +54 -32
- package/src/routes/__tests__/health.test.ts +4 -2
- package/src/routes/__tests__/sprites.test.ts +7 -3
- 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 +4 -64
- package/src/routes/health.ts +4 -2
- package/src/routes/imagery.ts +3 -2
- package/src/routes/sprites.ts +4 -27
- 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 +66 -0
- package/src/util/config.cache.ts +44 -0
- package/src/util/config.loader.ts +50 -0
- package/src/util/response.ts +3 -1
- package/src/wmts.capability.ts +9 -15
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -0,0 +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;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"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { TileSetType } from '@basemaps/config';
|
|
2
|
+
import { Env, fsa } from '@basemaps/shared';
|
|
3
|
+
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
4
|
+
import { convertRelativeUrl } from '../routes/tile.style.json.js';
|
|
5
|
+
import { ConfigLoader } from '../util/config.loader.js';
|
|
6
|
+
import { Etag } from '../util/etag.js';
|
|
7
|
+
import { NotFound, NotModified } from '../util/response.js';
|
|
8
|
+
import { Validate } from '../util/validate.js';
|
|
9
|
+
function tileserverUrl(tileSet, apiKey) {
|
|
10
|
+
var _a;
|
|
11
|
+
const host = (_a = Env.get(Env.PublicUrlBase)) !== null && _a !== void 0 ? _a : '';
|
|
12
|
+
const url = `/v1/arcgis/rest/services/${tileSet}/VectorTileServer`;
|
|
13
|
+
const fullUrl = new URL(fsa.join(host, url));
|
|
14
|
+
fullUrl.searchParams.set('api', apiKey);
|
|
15
|
+
fullUrl.searchParams.set('f', 'json');
|
|
16
|
+
return fullUrl.toString().replace(/%7B/g, '{').replace(/%7D/g, '}');
|
|
17
|
+
}
|
|
18
|
+
function convertStyleJson(tileSet, style, apiKey) {
|
|
19
|
+
var _a;
|
|
20
|
+
const sources = JSON.parse(JSON.stringify(style.sources));
|
|
21
|
+
// Only keep the vector layer and update the source url
|
|
22
|
+
for (const [key, value] of Object.entries(sources)) {
|
|
23
|
+
if (value.type === 'vector') {
|
|
24
|
+
value.url = tileserverUrl(tileSet, apiKey);
|
|
25
|
+
sources[key] = value;
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
delete sources[key];
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
// Remove all the not vector layers.
|
|
32
|
+
const layers = [];
|
|
33
|
+
for (const layer of style.layers) {
|
|
34
|
+
if (layer.source != null && !sources.hasOwnProperty(layer.source))
|
|
35
|
+
continue;
|
|
36
|
+
layers.push(layer);
|
|
37
|
+
}
|
|
38
|
+
return {
|
|
39
|
+
version: 8,
|
|
40
|
+
id: style.id,
|
|
41
|
+
name: style.name,
|
|
42
|
+
sources,
|
|
43
|
+
layers,
|
|
44
|
+
metadata: (_a = style.metadata) !== null && _a !== void 0 ? _a : {},
|
|
45
|
+
glyphs: convertRelativeUrl(style.glyphs),
|
|
46
|
+
sprite: convertRelativeUrl(style.sprite),
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
export async function arcgisStyleJsonGet(req) {
|
|
50
|
+
const apiKey = Validate.apiKey(req);
|
|
51
|
+
const config = await ConfigLoader.load(req);
|
|
52
|
+
const tileSet = await config.TileSet.get(config.TileSet.id(req.params.tileSet));
|
|
53
|
+
if ((tileSet === null || tileSet === void 0 ? void 0 : tileSet.type) !== TileSetType.Vector)
|
|
54
|
+
return NotFound();
|
|
55
|
+
const style = req.query.get('style');
|
|
56
|
+
const styleName = style ? style : 'topographic'; // Defalut to topographic style
|
|
57
|
+
// Get style Config from db
|
|
58
|
+
const dbId = config.Style.id(styleName);
|
|
59
|
+
const styleConfig = await config.Style.get(dbId);
|
|
60
|
+
if (styleConfig == null)
|
|
61
|
+
return NotFound();
|
|
62
|
+
// Prepare sources and add linz source
|
|
63
|
+
const styleJson = convertStyleJson(tileSet.name, styleConfig.style, apiKey);
|
|
64
|
+
const data = Buffer.from(JSON.stringify(styleJson));
|
|
65
|
+
const cacheKey = Etag.key(data);
|
|
66
|
+
if (Etag.isNotModified(req, cacheKey))
|
|
67
|
+
return NotModified();
|
|
68
|
+
const response = new LambdaHttpResponse(200, 'ok');
|
|
69
|
+
response.header(HttpHeader.ETag, cacheKey);
|
|
70
|
+
response.header(HttpHeader.CacheControl, 'no-store');
|
|
71
|
+
response.buffer(data, 'application/json');
|
|
72
|
+
req.set('bytes', data.byteLength);
|
|
73
|
+
return response;
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=arcgis.style.json.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"arcgis.style.json.js","sourceRoot":"","sources":["../../src/arcgis/arcgis.style.json.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
|
|
2
|
+
export interface VectorTileServer {
|
|
3
|
+
Params: {
|
|
4
|
+
tileSet: string;
|
|
5
|
+
};
|
|
6
|
+
}
|
|
7
|
+
export declare function arcgisTileServerGet(req: LambdaHttpRequest<VectorTileServer>): Promise<LambdaHttpResponse>;
|
|
8
|
+
//# sourceMappingURL=vector.tile.server.d.ts.map
|
|
@@ -0,0 +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;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"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import { TileSetType } from '@basemaps/config';
|
|
2
|
+
import { GoogleTms } from '@basemaps/geo';
|
|
3
|
+
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
4
|
+
import { convertRelativeUrl } from '../routes/tile.style.json.js';
|
|
5
|
+
import { ConfigLoader } from '../util/config.loader.js';
|
|
6
|
+
import { NotFound } from '../util/response.js';
|
|
7
|
+
import { Validate } from '../util/validate.js';
|
|
8
|
+
/** Zoom level for the tilematrix which will be slice by 1 during the covertion to arcgis tileserve lods */
|
|
9
|
+
const MaxTileMatrixZoom = 18;
|
|
10
|
+
const MinTileMatrixZoom = 1;
|
|
11
|
+
export async function arcgisTileServerGet(req) {
|
|
12
|
+
const config = await ConfigLoader.load(req);
|
|
13
|
+
const tileSet = await config.TileSet.get(config.TileSet.id(req.params.tileSet));
|
|
14
|
+
if ((tileSet === null || tileSet === void 0 ? void 0 : tileSet.type) !== TileSetType.Vector)
|
|
15
|
+
return NotFound();
|
|
16
|
+
const apiKey = Validate.apiKey(req);
|
|
17
|
+
const f = req.query.get('f');
|
|
18
|
+
if (f !== 'json')
|
|
19
|
+
return NotFound();
|
|
20
|
+
const extent = {
|
|
21
|
+
xmin: GoogleTms.extent.x,
|
|
22
|
+
ymin: GoogleTms.extent.y,
|
|
23
|
+
xmax: GoogleTms.extent.right,
|
|
24
|
+
ymax: GoogleTms.extent.bottom,
|
|
25
|
+
// TODO where is wkid from
|
|
26
|
+
spatialReference: { wkid: 102100, latestWkid: GoogleTms.projection.code },
|
|
27
|
+
};
|
|
28
|
+
const vectorTileServer = {
|
|
29
|
+
currentVersion: 10.81,
|
|
30
|
+
name: tileSet.name,
|
|
31
|
+
capabilities: 'TilesOnly',
|
|
32
|
+
type: 'indexedVector',
|
|
33
|
+
defaultStyles: '',
|
|
34
|
+
tiles: [convertRelativeUrl(`/v1/tiles/${tileSet.name}/WebMercatorQuad/{z}/{x}/{y}.pbf`, apiKey)],
|
|
35
|
+
exportTilesAllowed: false,
|
|
36
|
+
maxExportTilesCount: 0,
|
|
37
|
+
initialExtent: extent,
|
|
38
|
+
fullExtent: extent,
|
|
39
|
+
minScale: 0.0,
|
|
40
|
+
maxScale: 0.0,
|
|
41
|
+
tileInfo: {
|
|
42
|
+
rows: 512,
|
|
43
|
+
cols: 512,
|
|
44
|
+
dpi: 96,
|
|
45
|
+
format: 'pbf',
|
|
46
|
+
origin: { x: GoogleTms.extent.x, y: GoogleTms.extent.bottom },
|
|
47
|
+
spatialReference: { wkid: 102100, latestWkid: GoogleTms.projection.code },
|
|
48
|
+
lods: GoogleTms.zooms.slice(MinTileMatrixZoom, MaxTileMatrixZoom).map((c, i) => {
|
|
49
|
+
return {
|
|
50
|
+
level: i,
|
|
51
|
+
resolution: c.scaleDenominator * 0.28e-3,
|
|
52
|
+
scale: c.scaleDenominator,
|
|
53
|
+
};
|
|
54
|
+
}),
|
|
55
|
+
},
|
|
56
|
+
maxzoom: 22,
|
|
57
|
+
minLOD: 0,
|
|
58
|
+
maxLOD: 15,
|
|
59
|
+
resourceInfo: {
|
|
60
|
+
styleVersion: 8,
|
|
61
|
+
tileCompression: 'gzip',
|
|
62
|
+
cacheInfo: { storageInfo: { packetSize: 128, storageFormat: 'compactV2' } },
|
|
63
|
+
},
|
|
64
|
+
};
|
|
65
|
+
const json = JSON.stringify(vectorTileServer, null, 2);
|
|
66
|
+
const data = Buffer.from(json);
|
|
67
|
+
const response = new LambdaHttpResponse(200, 'ok');
|
|
68
|
+
response.header(HttpHeader.CacheControl, 'no-store');
|
|
69
|
+
response.buffer(data, 'application/json');
|
|
70
|
+
req.set('bytes', data.byteLength);
|
|
71
|
+
return response;
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=vector.tile.server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,OAAO,2QAA2B,CAAC"}
|
package/build/index.js
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { LogConfig } from '@basemaps/shared';
|
|
2
2
|
import { LambdaHttpResponse, lf } from '@linzjs/lambda';
|
|
3
|
+
import { arcgisInfoGet } from './arcgis/arcgis.info.js';
|
|
4
|
+
import { arcgisStyleJsonGet } from './arcgis/arcgis.style.json.js';
|
|
5
|
+
import { arcgisTileServerGet } from './arcgis/vector.tile.server.js';
|
|
3
6
|
import { tileAttributionGet } from './routes/attribution.js';
|
|
7
|
+
import { configImageryGet, configTileSetGet } from './routes/config.js';
|
|
4
8
|
import { fontGet, fontList } from './routes/fonts.js';
|
|
5
9
|
import { healthGet } from './routes/health.js';
|
|
6
10
|
import { imageryGet } from './routes/imagery.js';
|
|
@@ -11,19 +15,18 @@ import { styleJsonGet } from './routes/tile.style.json.js';
|
|
|
11
15
|
import { wmtsCapabilitiesGet } from './routes/tile.wmts.js';
|
|
12
16
|
import { tileXyzGet } from './routes/tile.xyz.js';
|
|
13
17
|
import { versionGet } from './routes/version.js';
|
|
14
|
-
import { NotFound } from './util/response.js';
|
|
18
|
+
import { NotFound, OkResponse } from './util/response.js';
|
|
15
19
|
import { CoSources } from './util/source.cache.js';
|
|
16
20
|
import { St } from './util/source.tracer.js';
|
|
17
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;
|
|
18
24
|
handler.router.hook('request', (req) => {
|
|
19
25
|
req.set('name', 'LambdaTiler');
|
|
20
26
|
// Reset the request tracing before every request
|
|
21
27
|
St.reset();
|
|
22
28
|
});
|
|
23
|
-
let totalRequests = 0;
|
|
24
29
|
handler.router.hook('response', (req, res) => {
|
|
25
|
-
totalRequests++;
|
|
26
|
-
req.set('requestsTotal', totalRequests); // Number of requests served by this lambda
|
|
27
30
|
if (St.requests.length > 0) {
|
|
28
31
|
// TODO this could be relaxed to every say 5% of requests if logging gets too verbose.
|
|
29
32
|
req.set('requests', St.requests.slice(0, 100)); // limit to 100 requests (some tiles need 100s of requests)
|
|
@@ -58,6 +61,9 @@ handler.router.get('/v1/health', healthGet);
|
|
|
58
61
|
handler.router.get('/v1/version', versionGet);
|
|
59
62
|
// Image Metadata
|
|
60
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);
|
|
61
67
|
// Sprites
|
|
62
68
|
handler.router.get('/v1/sprites/:spriteName', spriteGet);
|
|
63
69
|
// Fonts
|
|
@@ -78,4 +84,9 @@ handler.router.get('/v1/attribution/:tileSet/:tileMatrix/summary.json', tileAttr
|
|
|
78
84
|
handler.router.get('/v1/tiles/:tileSet/:tileMatrix/WMTSCapabilities.xml', wmtsCapabilitiesGet);
|
|
79
85
|
handler.router.get('/v1/tiles/:tileSet/WMTSCapabilities.xml', wmtsCapabilitiesGet);
|
|
80
86
|
handler.router.get('/v1/tiles/WMTSCapabilities.xml', wmtsCapabilitiesGet);
|
|
87
|
+
// Arcgis Vector
|
|
88
|
+
handler.router.get('/v1/arcgis/rest/services/:tileSet/VectorTileServer', arcgisTileServerGet);
|
|
89
|
+
handler.router.post('/v1/arcgis/rest/services/:tileSet/VectorTileServer', OkResponse);
|
|
90
|
+
handler.router.get('/v1/arcgis/rest/services/:tileSet/VectorTileServer/root.json', arcgisStyleJsonGet);
|
|
91
|
+
handler.router.get('/v1/arcgis/rest/info', arcgisInfoGet);
|
|
81
92
|
//# sourceMappingURL=index.js.map
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;
|
|
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,54 +1,41 @@
|
|
|
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';
|
|
9
|
+
import { fontList } from '../fonts.js';
|
|
7
10
|
import { FsMemory } from './memory.fs.js';
|
|
8
11
|
o.spec('/v1/fonts', () => {
|
|
9
12
|
const memory = new FsMemory();
|
|
10
13
|
o.before(() => {
|
|
11
14
|
fsa.register('memory://', memory);
|
|
12
15
|
});
|
|
16
|
+
const assetLocation = process.env[Env.AssetLocation];
|
|
13
17
|
o.beforeEach(() => {
|
|
14
|
-
process.env[Env.AssetLocation] = 'memory://';
|
|
18
|
+
process.env[Env.AssetLocation] = 'memory://config';
|
|
19
|
+
getDefaultConfig().assets = 'memory://';
|
|
15
20
|
});
|
|
16
21
|
o.afterEach(() => {
|
|
17
|
-
|
|
22
|
+
getDefaultConfig().assets = assetLocation;
|
|
23
|
+
CachedConfig.cache.clear();
|
|
24
|
+
CoSources.cache.clear();
|
|
18
25
|
memory.files.clear();
|
|
19
26
|
});
|
|
20
|
-
o('should
|
|
21
|
-
await Promise.all([
|
|
22
|
-
fsa.write('memory://fonts/Roboto Thin/0-255.pbf', Buffer.from('')),
|
|
23
|
-
fsa.write('memory://fonts/Roboto Thin/256-512.pbf', Buffer.from('')),
|
|
24
|
-
fsa.write('memory://fonts/Roboto Black/0-255.pbf', Buffer.from('')),
|
|
25
|
-
]);
|
|
26
|
-
const fonts = await getFonts('memory://fonts/');
|
|
27
|
-
o(fonts).deepEquals(['Roboto Black', 'Roboto Thin']);
|
|
28
|
-
});
|
|
29
|
-
o('should return empty list if no fonts found', async () => {
|
|
30
|
-
const res = await fontList(mockRequest('/v1/fonts.json'));
|
|
31
|
-
o(res.status).equals(200);
|
|
32
|
-
o(res.body).equals('[]');
|
|
33
|
-
o(res.header('etag')).notEquals(undefined);
|
|
34
|
-
o(res.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
|
|
35
|
-
});
|
|
36
|
-
o('should return 404 if no assets defined', async () => {
|
|
37
|
-
delete process.env[Env.AssetLocation];
|
|
27
|
+
o('should return 404 if no font found', async () => {
|
|
38
28
|
const res = await fontList(mockRequest('/v1/fonts.json'));
|
|
39
29
|
o(res.status).equals(404);
|
|
40
30
|
});
|
|
41
31
|
o('should return a list of fonts found', async () => {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
fsa.write('memory://fonts/Roboto Thin/256-512.pbf', Buffer.from('')),
|
|
45
|
-
fsa.write('memory://fonts/Roboto Black/0-255.pbf', Buffer.from('')),
|
|
46
|
-
]);
|
|
32
|
+
var _a;
|
|
33
|
+
await fsa.write('memory://fonts.json', Buffer.from(JSON.stringify(['Roboto Black', 'Roboto Thin'])));
|
|
47
34
|
const res = await fontList(mockRequest('/v1/fonts.json'));
|
|
48
35
|
o(res.status).equals(200);
|
|
49
36
|
o(res.header('content-type')).equals('application/json');
|
|
50
37
|
o(res.header('content-encoding')).equals(undefined);
|
|
51
|
-
o(res.
|
|
38
|
+
o((_a = res._body) === null || _a === void 0 ? void 0 : _a.toString()).equals(JSON.stringify(['Roboto Black', 'Roboto Thin']));
|
|
52
39
|
});
|
|
53
40
|
o('should get the correct font', async () => {
|
|
54
41
|
await fsa.write('memory://fonts/Roboto Thin/0-255.pbf', Buffer.from(''));
|
|
@@ -70,5 +57,35 @@ o.spec('/v1/fonts', () => {
|
|
|
70
57
|
o(res255.header('etag')).notEquals(undefined);
|
|
71
58
|
o(res255.header('cache-control')).equals('public, max-age=604800, stale-while-revalidate=86400');
|
|
72
59
|
});
|
|
60
|
+
o('should return 404 if no asset location set', async () => {
|
|
61
|
+
getDefaultConfig().assets = undefined;
|
|
62
|
+
const res = await fontList(mockRequest('/v1/fonts.json'));
|
|
63
|
+
o(res.status).equals(404);
|
|
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
|
+
});
|
|
73
90
|
});
|
|
74
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,21 +1,26 @@
|
|
|
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
|
+
import { createSandbox } from 'sinon';
|
|
4
5
|
import { gunzipSync, gzipSync } from 'zlib';
|
|
5
6
|
import { handler } from '../../index.js';
|
|
6
7
|
import { mockRequest } from '../../__tests__/xyz.util.js';
|
|
7
8
|
import { FsMemory } from './memory.fs.js';
|
|
8
9
|
o.spec('/v1/sprites', () => {
|
|
9
10
|
const memory = new FsMemory();
|
|
11
|
+
const sandbox = createSandbox();
|
|
10
12
|
o.before(() => {
|
|
11
13
|
fsa.register('memory://', memory);
|
|
12
14
|
});
|
|
15
|
+
const assetLocation = process.env[Env.AssetLocation];
|
|
13
16
|
o.beforeEach(() => {
|
|
14
17
|
process.env[Env.AssetLocation] = 'memory://';
|
|
18
|
+
getDefaultConfig().assets = 'memory://';
|
|
15
19
|
});
|
|
16
20
|
o.afterEach(() => {
|
|
17
|
-
|
|
21
|
+
getDefaultConfig().assets = assetLocation;
|
|
18
22
|
memory.files.clear();
|
|
23
|
+
sandbox.restore();
|
|
19
24
|
});
|
|
20
25
|
o('should return 404 if no assets defined', async () => {
|
|
21
26
|
delete process.env[Env.AssetLocation];
|
|
@@ -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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"}
|