@basemaps/lambda-tiler 6.31.0 → 6.32.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 +21 -0
- package/build/__tests__/config.data.d.ts +6 -1
- package/build/__tests__/config.data.d.ts.map +1 -1
- package/build/__tests__/config.data.js +33 -2
- package/build/__tests__/config.data.js.map +1 -1
- package/build/__tests__/index.test.js +3 -13
- package/build/__tests__/index.test.js.map +1 -1
- package/build/__tests__/xyz.util.d.ts +7 -9
- package/build/__tests__/xyz.util.d.ts.map +1 -1
- package/build/__tests__/xyz.util.js +14 -20
- package/build/__tests__/xyz.util.js.map +1 -1
- package/build/index.d.ts +0 -2
- package/build/index.d.ts.map +1 -1
- package/build/index.js +57 -26
- package/build/index.js.map +1 -1
- package/build/routes/__tests__/attribution.test.js +350 -400
- package/build/routes/__tests__/attribution.test.js.map +1 -1
- package/build/routes/__tests__/fonts.test.js +11 -5
- package/build/routes/__tests__/fonts.test.js.map +1 -1
- package/build/routes/__tests__/health.test.js +16 -13
- package/build/routes/__tests__/health.test.js.map +1 -1
- package/build/routes/__tests__/sprites.test.js +6 -0
- package/build/routes/__tests__/sprites.test.js.map +1 -1
- package/build/routes/__tests__/tile.json.test.d.ts +2 -0
- package/build/routes/__tests__/tile.json.test.d.ts.map +1 -0
- package/build/routes/__tests__/tile.json.test.js +124 -0
- package/build/routes/__tests__/tile.json.test.js.map +1 -0
- package/build/routes/__tests__/tile.style.json.test.d.ts +2 -0
- package/build/routes/__tests__/tile.style.json.test.d.ts.map +1 -0
- package/build/routes/__tests__/tile.style.json.test.js +95 -0
- package/build/routes/__tests__/tile.style.json.test.js.map +1 -0
- package/build/routes/__tests__/wmts.test.js +5 -44
- package/build/routes/__tests__/wmts.test.js.map +1 -1
- package/build/{__tests__ → routes/__tests__}/xyz.test.d.ts +0 -0
- package/build/routes/__tests__/xyz.test.d.ts.map +1 -0
- package/build/routes/__tests__/xyz.test.js +99 -0
- package/build/routes/__tests__/xyz.test.js.map +1 -0
- package/build/routes/attribution.d.ts +7 -5
- package/build/routes/attribution.d.ts.map +1 -1
- package/build/routes/attribution.js +43 -81
- package/build/routes/attribution.js.map +1 -1
- package/build/routes/fonts.d.ts +1 -1
- package/build/routes/fonts.d.ts.map +1 -1
- package/build/routes/fonts.js +30 -15
- package/build/routes/fonts.js.map +1 -1
- package/build/routes/health.d.ts +3 -3
- package/build/routes/health.d.ts.map +1 -1
- package/build/routes/health.js +15 -13
- package/build/routes/health.js.map +1 -1
- package/build/routes/imagery.d.ts.map +1 -1
- package/build/routes/imagery.js +11 -10
- package/build/routes/imagery.js.map +1 -1
- package/build/routes/ping.d.ts +3 -0
- package/build/routes/ping.d.ts.map +1 -0
- package/build/routes/ping.js +7 -0
- package/build/routes/ping.js.map +1 -0
- package/build/routes/sprites.d.ts.map +1 -1
- package/build/routes/sprites.js +16 -10
- package/build/routes/sprites.js.map +1 -1
- package/build/routes/tile.json.d.ts +7 -1
- package/build/routes/tile.json.d.ts.map +1 -1
- package/build/routes/tile.json.js +18 -21
- package/build/routes/tile.json.js.map +1 -1
- package/build/routes/tile.style.json.d.ts +6 -1
- package/build/routes/tile.style.json.d.ts.map +1 -1
- package/build/routes/tile.style.json.js +10 -13
- package/build/routes/tile.style.json.js.map +1 -1
- package/build/routes/tile.wmts.d.ts +9 -3
- package/build/routes/tile.wmts.d.ts.map +1 -1
- package/build/routes/tile.wmts.js +26 -35
- package/build/routes/tile.wmts.js.map +1 -1
- package/build/routes/tile.xyz.d.ts +14 -4
- package/build/routes/tile.xyz.d.ts.map +1 -1
- package/build/routes/tile.xyz.js +21 -17
- package/build/routes/tile.xyz.js.map +1 -1
- package/build/routes/tile.xyz.raster.d.ts +11 -0
- package/build/routes/tile.xyz.raster.d.ts.map +1 -0
- package/build/routes/tile.xyz.raster.js +90 -0
- package/build/routes/tile.xyz.raster.js.map +1 -0
- package/build/routes/tile.xyz.vector.d.ts +8 -0
- package/build/routes/tile.xyz.vector.d.ts.map +1 -0
- package/build/routes/tile.xyz.vector.js +46 -0
- package/build/routes/tile.xyz.vector.js.map +1 -0
- package/build/routes/version.d.ts +3 -0
- package/build/routes/version.d.ts.map +1 -0
- package/build/routes/version.js +9 -0
- package/build/routes/version.js.map +1 -0
- package/build/util/__test__/validate.test.d.ts +2 -0
- package/build/util/__test__/validate.test.d.ts.map +1 -0
- package/build/util/__test__/validate.test.js +66 -0
- package/build/util/__test__/validate.test.js.map +1 -0
- package/build/{cotar.cache.d.ts → util/cotar.serve.d.ts} +3 -8
- package/build/util/cotar.serve.d.ts.map +1 -0
- package/build/util/cotar.serve.js +41 -0
- package/build/util/cotar.serve.js.map +1 -0
- package/build/util/etag.d.ts +6 -0
- package/build/util/etag.d.ts.map +1 -0
- package/build/util/etag.js +20 -0
- package/build/util/etag.js.map +1 -0
- package/build/util/response.d.ts +4 -0
- package/build/util/response.d.ts.map +1 -0
- package/build/util/response.js +4 -0
- package/build/util/response.js.map +1 -0
- package/build/util/source.cache.d.ts +28 -0
- package/build/util/source.cache.d.ts.map +1 -0
- package/build/util/source.cache.js +53 -0
- package/build/util/source.cache.js.map +1 -0
- package/build/{source.tracer.d.ts → util/source.tracer.d.ts} +1 -0
- package/build/util/source.tracer.d.ts.map +1 -0
- package/build/{source.tracer.js → util/source.tracer.js} +3 -0
- package/build/util/source.tracer.js.map +1 -0
- package/build/util/swapping.lru.d.ts +21 -0
- package/build/util/swapping.lru.d.ts.map +1 -0
- package/build/util/swapping.lru.js +56 -0
- package/build/util/swapping.lru.js.map +1 -0
- package/build/util/validate.d.ts +46 -0
- package/build/util/validate.d.ts.map +1 -0
- package/build/util/validate.js +107 -0
- package/build/util/validate.js.map +1 -0
- package/build/wmts.capability.d.ts +1 -1
- package/build/wmts.capability.d.ts.map +1 -1
- package/dist/index.js +62 -60
- package/dist/node_modules/.package-lock.json +1 -1
- package/dist/package-lock.json +2 -2
- package/dist/package.json +1 -1
- package/package.json +6 -6
- package/src/__tests__/config.data.ts +41 -3
- package/src/__tests__/index.test.ts +3 -19
- package/src/__tests__/xyz.util.ts +18 -21
- package/src/index.ts +66 -29
- package/src/routes/__tests__/attribution.test.ts +356 -403
- package/src/routes/__tests__/fonts.test.ts +11 -5
- package/src/routes/__tests__/health.test.ts +17 -13
- package/src/routes/__tests__/sprites.test.ts +6 -1
- package/src/routes/__tests__/tile.json.test.ts +145 -0
- package/src/routes/__tests__/tile.style.json.test.ts +105 -0
- package/src/routes/__tests__/wmts.test.ts +5 -55
- package/src/routes/__tests__/xyz.test.ts +119 -0
- package/src/routes/attribution.ts +53 -99
- package/src/routes/fonts.ts +29 -15
- package/src/routes/health.ts +17 -16
- package/src/routes/imagery.ts +10 -9
- package/src/routes/ping.ts +8 -0
- package/src/routes/sprites.ts +16 -10
- package/src/routes/tile.json.ts +24 -18
- package/src/routes/tile.style.json.ts +15 -12
- package/src/routes/tile.wmts.ts +30 -31
- package/src/routes/tile.xyz.raster.ts +106 -0
- package/src/routes/tile.xyz.ts +31 -16
- package/src/routes/tile.xyz.vector.ts +47 -0
- package/src/routes/version.ts +8 -0
- package/src/util/__test__/validate.test.ts +74 -0
- package/src/util/cotar.serve.ts +46 -0
- package/src/util/etag.ts +20 -0
- package/src/util/response.ts +4 -0
- package/src/util/source.cache.ts +71 -0
- package/src/{source.tracer.ts → util/source.tracer.ts} +4 -0
- package/src/util/swapping.lru.ts +63 -0
- package/src/util/validate.ts +126 -0
- package/src/wmts.capability.ts +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/build/__tests__/route.test.d.ts +0 -2
- package/build/__tests__/route.test.d.ts.map +0 -1
- package/build/__tests__/route.test.js +0 -21
- package/build/__tests__/route.test.js.map +0 -1
- package/build/__tests__/tiff.cache.test.d.ts +0 -2
- package/build/__tests__/tiff.cache.test.d.ts.map +0 -1
- package/build/__tests__/tiff.cache.test.js +0 -59
- package/build/__tests__/tiff.cache.test.js.map +0 -1
- package/build/__tests__/tile.cache.key.test.d.ts +0 -2
- package/build/__tests__/tile.cache.key.test.d.ts.map +0 -1
- package/build/__tests__/tile.cache.key.test.js +0 -49
- package/build/__tests__/tile.cache.key.test.js.map +0 -1
- package/build/__tests__/tile.set.cache.test.d.ts +0 -2
- package/build/__tests__/tile.set.cache.test.d.ts.map +0 -1
- package/build/__tests__/tile.set.cache.test.js +0 -72
- package/build/__tests__/tile.set.cache.test.js.map +0 -1
- package/build/__tests__/tile.set.test.d.ts +0 -2
- package/build/__tests__/tile.set.test.d.ts.map +0 -1
- package/build/__tests__/tile.set.test.js +0 -12
- package/build/__tests__/tile.set.test.js.map +0 -1
- package/build/__tests__/xyz.test.d.ts.map +0 -1
- package/build/__tests__/xyz.test.js +0 -275
- package/build/__tests__/xyz.test.js.map +0 -1
- package/build/api.key.d.ts +0 -2
- package/build/api.key.d.ts.map +0 -1
- package/build/api.key.js +0 -24
- package/build/api.key.js.map +0 -1
- package/build/cli/dump.d.ts +0 -2
- package/build/cli/dump.d.ts.map +0 -1
- package/build/cli/dump.js +0 -48
- package/build/cli/dump.js.map +0 -1
- package/build/cli/tile.set.local.d.ts +0 -12
- package/build/cli/tile.set.local.d.ts.map +0 -1
- package/build/cli/tile.set.local.js +0 -40
- package/build/cli/tile.set.local.js.map +0 -1
- package/build/cotar.cache.d.ts.map +0 -1
- package/build/cotar.cache.js +0 -50
- package/build/cotar.cache.js.map +0 -1
- package/build/router.d.ts +0 -15
- package/build/router.d.ts.map +0 -1
- package/build/router.js +0 -50
- package/build/router.js.map +0 -1
- package/build/routes/api.d.ts +0 -4
- package/build/routes/api.d.ts.map +0 -1
- package/build/routes/api.js +0 -14
- package/build/routes/api.js.map +0 -1
- package/build/routes/esri/rest.d.ts +0 -10
- package/build/routes/esri/rest.d.ts.map +0 -1
- package/build/routes/esri/rest.js +0 -88
- package/build/routes/esri/rest.js.map +0 -1
- package/build/routes/response.d.ts +0 -4
- package/build/routes/response.d.ts.map +0 -1
- package/build/routes/response.js +0 -4
- package/build/routes/response.js.map +0 -1
- package/build/routes/tile.d.ts +0 -3
- package/build/routes/tile.d.ts.map +0 -1
- package/build/routes/tile.etag.d.ts +0 -11
- package/build/routes/tile.etag.d.ts.map +0 -1
- package/build/routes/tile.etag.js +0 -30
- package/build/routes/tile.etag.js.map +0 -1
- package/build/routes/tile.js +0 -28
- package/build/routes/tile.js.map +0 -1
- package/build/source.tracer.d.ts.map +0 -1
- package/build/source.tracer.js.map +0 -1
- package/build/tiff.cache.d.ts +0 -17
- package/build/tiff.cache.d.ts.map +0 -1
- package/build/tiff.cache.js +0 -46
- package/build/tiff.cache.js.map +0 -1
- package/build/tile.set.cache.d.ts +0 -20
- package/build/tile.set.cache.d.ts.map +0 -1
- package/build/tile.set.cache.js +0 -72
- package/build/tile.set.cache.js.map +0 -1
- package/build/tile.set.d.ts +0 -4
- package/build/tile.set.d.ts.map +0 -1
- package/build/tile.set.js +0 -2
- package/build/tile.set.js.map +0 -1
- package/build/tile.set.raster.d.ts +0 -49
- package/build/tile.set.raster.d.ts.map +0 -1
- package/build/tile.set.raster.js +0 -189
- package/build/tile.set.raster.js.map +0 -1
- package/build/tile.set.vector.d.ts +0 -18
- package/build/tile.set.vector.d.ts.map +0 -1
- package/build/tile.set.vector.js +0 -54
- package/build/tile.set.vector.js.map +0 -1
- package/build/validate.d.ts +0 -16
- package/build/validate.d.ts.map +0 -1
- package/build/validate.js +0 -32
- package/build/validate.js.map +0 -1
- package/src/__tests__/route.test.ts +0 -24
- package/src/__tests__/tiff.cache.test.ts +0 -73
- package/src/__tests__/tile.cache.key.test.ts +0 -56
- package/src/__tests__/tile.set.cache.test.ts +0 -80
- package/src/__tests__/tile.set.test.ts +0 -12
- package/src/__tests__/xyz.test.ts +0 -318
- package/src/api.key.ts +0 -23
- package/src/cli/dump.ts +0 -61
- package/src/cli/tile.set.local.ts +0 -51
- package/src/cotar.cache.ts +0 -54
- package/src/router.ts +0 -58
- package/src/routes/api.ts +0 -15
- package/src/routes/esri/rest.ts +0 -90
- package/src/routes/response.ts +0 -4
- package/src/routes/tile.etag.ts +0 -36
- package/src/routes/tile.ts +0 -23
- package/src/tiff.cache.ts +0 -51
- package/src/tile.set.cache.ts +0 -84
- package/src/tile.set.raster.ts +0 -230
- package/src/tile.set.ts +0 -4
- package/src/tile.set.vector.ts +0 -61
- package/src/validate.ts +0 -32
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { Config } from '@basemaps/config';
|
|
2
|
+
import { Bounds, Epsg, TileMatrixSet, TileMatrixSets, VectorFormat } from '@basemaps/geo';
|
|
3
|
+
import { Env, fsa } from '@basemaps/shared';
|
|
4
|
+
import { Tiler } from '@basemaps/tiler';
|
|
5
|
+
import { TileMakerSharp } from '@basemaps/tiler-sharp';
|
|
6
|
+
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
7
|
+
import pLimit from 'p-limit';
|
|
8
|
+
import { Etag } from '../util/etag.js';
|
|
9
|
+
import { NotFound, NotModified } from '../util/response.js';
|
|
10
|
+
import { CoSources } from '../util/source.cache.js';
|
|
11
|
+
const LoadingQueue = pLimit(Env.getNumber(Env.TiffConcurrency, 25));
|
|
12
|
+
export function getTiffName(name) {
|
|
13
|
+
const lowerName = name.toLowerCase();
|
|
14
|
+
if (lowerName.endsWith('.tif') || lowerName.endsWith('.tiff'))
|
|
15
|
+
return name;
|
|
16
|
+
return `${name}.tiff`;
|
|
17
|
+
}
|
|
18
|
+
export const TileComposer = new TileMakerSharp(256);
|
|
19
|
+
const DefaultResizeKernel = { in: 'lanczos3', out: 'lanczos3' };
|
|
20
|
+
const DefaultBackground = { r: 0, g: 0, b: 0, alpha: 0 };
|
|
21
|
+
export const TileXyzRaster = {
|
|
22
|
+
async getTiffsForTile(req, tileSet, xyz) {
|
|
23
|
+
const imagery = await Config.getAllImagery(tileSet.layers, [xyz.tileMatrix.projection]);
|
|
24
|
+
const output = [];
|
|
25
|
+
const tileBounds = xyz.tileMatrix.tileToSourceBounds(xyz.tile);
|
|
26
|
+
// All zoom level config is stored as Google zoom levels
|
|
27
|
+
const filterZoom = TileMatrixSet.convertZoomLevel(xyz.tile.z, xyz.tileMatrix, TileMatrixSets.get(Epsg.Google));
|
|
28
|
+
for (const layer of tileSet.layers) {
|
|
29
|
+
if (layer.maxZoom != null && filterZoom > layer.maxZoom)
|
|
30
|
+
continue;
|
|
31
|
+
if (layer.minZoom != null && filterZoom < layer.minZoom)
|
|
32
|
+
continue;
|
|
33
|
+
const imgId = layer[xyz.tileMatrix.projection.code];
|
|
34
|
+
if (imgId == null) {
|
|
35
|
+
req.log.warn({ layer: layer.name, projection: xyz.tileMatrix.projection.code }, 'Failed to lookup imagery');
|
|
36
|
+
continue;
|
|
37
|
+
}
|
|
38
|
+
const img = imagery.get(imgId);
|
|
39
|
+
if (img == null) {
|
|
40
|
+
req.log.warn({ layer: layer.name, projection: xyz.tileMatrix.projection.code, imgId }, 'Failed to lookup imagery');
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
43
|
+
if (!tileBounds.intersects(Bounds.fromJson(img.bounds)))
|
|
44
|
+
continue;
|
|
45
|
+
for (const c of img.files) {
|
|
46
|
+
if (!tileBounds.intersects(Bounds.fromJson(c)))
|
|
47
|
+
continue;
|
|
48
|
+
const tiffPath = fsa.join(img.uri, getTiffName(c.name));
|
|
49
|
+
output.push(tiffPath);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return output;
|
|
53
|
+
},
|
|
54
|
+
async tile(req, tileSet, xyz) {
|
|
55
|
+
var _a, _b;
|
|
56
|
+
if (xyz.tileType === VectorFormat.MapboxVectorTiles)
|
|
57
|
+
return NotFound();
|
|
58
|
+
const tiffPaths = await this.getTiffsForTile(req, tileSet, xyz);
|
|
59
|
+
const cacheKey = Etag.key(tiffPaths);
|
|
60
|
+
if (Etag.isNotModified(req, cacheKey))
|
|
61
|
+
return NotModified();
|
|
62
|
+
const toLoad = [];
|
|
63
|
+
for (const tiffPath of tiffPaths) {
|
|
64
|
+
toLoad.push(LoadingQueue(() => {
|
|
65
|
+
return CoSources.getCog(tiffPath).catch((error) => {
|
|
66
|
+
req.log.warn({ error, tiff: tiffPath }, 'TiffLoadFailed');
|
|
67
|
+
return null;
|
|
68
|
+
});
|
|
69
|
+
}));
|
|
70
|
+
}
|
|
71
|
+
const tiffs = (await Promise.all(toLoad)).filter((f) => f != null);
|
|
72
|
+
const tiler = new Tiler(xyz.tileMatrix);
|
|
73
|
+
const layers = await tiler.tile(tiffs, xyz.tile.x, xyz.tile.y, xyz.tile.z);
|
|
74
|
+
const res = await TileComposer.compose({
|
|
75
|
+
layers,
|
|
76
|
+
format: xyz.tileType,
|
|
77
|
+
background: (_a = tileSet.background) !== null && _a !== void 0 ? _a : DefaultBackground,
|
|
78
|
+
resizeKernel: (_b = tileSet.resizeKernel) !== null && _b !== void 0 ? _b : DefaultResizeKernel,
|
|
79
|
+
metrics: req.timer,
|
|
80
|
+
});
|
|
81
|
+
req.set('layersUsed', res.layers);
|
|
82
|
+
req.set('bytes', res.buffer.byteLength);
|
|
83
|
+
const response = new LambdaHttpResponse(200, 'ok');
|
|
84
|
+
response.header(HttpHeader.ETag, cacheKey);
|
|
85
|
+
response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
|
|
86
|
+
response.buffer(res.buffer, 'image/' + xyz.tileType);
|
|
87
|
+
return response;
|
|
88
|
+
},
|
|
89
|
+
};
|
|
90
|
+
//# sourceMappingURL=tile.xyz.raster.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tile.xyz.raster.js","sourceRoot":"","sources":["../../src/routes/tile.xyz.raster.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { ConfigTileSetVector } from '@basemaps/config';
|
|
2
|
+
import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
|
|
3
|
+
import { TileXyz } from '../util/validate.js';
|
|
4
|
+
export declare const tileXyzVector: {
|
|
5
|
+
/** Serve a MVT vector tile */
|
|
6
|
+
tile(req: LambdaHttpRequest, tileSet: ConfigTileSetVector, xyz: TileXyz): Promise<LambdaHttpResponse>;
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=tile.xyz.vector.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tile.xyz.vector.d.ts","sourceRoot":"","sources":["../../src/routes/tile.xyz.vector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKnF,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,eAAO,MAAM,aAAa;IACxB,8BAA8B;cACd,iBAAiB,WAAW,mBAAmB,OAAO,OAAO,GAAG,QAAQ,kBAAkB,CAAC;CAmC5G,CAAC"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { GoogleTms, VectorFormat } from '@basemaps/geo';
|
|
2
|
+
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
3
|
+
import { isGzip } from '../util/cotar.serve.js';
|
|
4
|
+
import { Etag } from '../util/etag.js';
|
|
5
|
+
import { NotFound, NotModified } from '../util/response.js';
|
|
6
|
+
import { CoSources } from '../util/source.cache.js';
|
|
7
|
+
export const tileXyzVector = {
|
|
8
|
+
/** Serve a MVT vector tile */
|
|
9
|
+
async tile(req, tileSet, xyz) {
|
|
10
|
+
if (xyz.tileType !== VectorFormat.MapboxVectorTiles)
|
|
11
|
+
return NotFound();
|
|
12
|
+
if (xyz.tileMatrix.identifier !== GoogleTms.identifier)
|
|
13
|
+
return NotFound();
|
|
14
|
+
if (tileSet.layers.length > 1)
|
|
15
|
+
return new LambdaHttpResponse(500, 'Too many layers in tileset');
|
|
16
|
+
const [layer] = tileSet.layers;
|
|
17
|
+
const layerId = layer[3857];
|
|
18
|
+
if (layerId == null)
|
|
19
|
+
return new LambdaHttpResponse(500, 'Layer url not found from tileset Config');
|
|
20
|
+
// Flip Y coordinate because MBTiles files are TMS.
|
|
21
|
+
const y = (1 << xyz.tile.z) - 1 - xyz.tile.y;
|
|
22
|
+
const tilePath = `tiles/${xyz.tile.z}/${xyz.tile.x}/${y}.pbf.gz`;
|
|
23
|
+
const tileId = `${layerId}#${tilePath}`;
|
|
24
|
+
const cacheKey = Etag.key(tileId);
|
|
25
|
+
if (Etag.isNotModified(req, cacheKey))
|
|
26
|
+
return NotModified();
|
|
27
|
+
req.timer.start('cotar:load');
|
|
28
|
+
const cotar = await CoSources.getCotar(layerId);
|
|
29
|
+
if (cotar == null)
|
|
30
|
+
return new LambdaHttpResponse(500, 'Failed to load VectorTiles');
|
|
31
|
+
req.timer.end('cotar:load');
|
|
32
|
+
req.timer.start('cotar:tile');
|
|
33
|
+
const tile = await cotar.get(tilePath);
|
|
34
|
+
if (tile == null)
|
|
35
|
+
return NotFound();
|
|
36
|
+
req.timer.end('cotar:tile');
|
|
37
|
+
const tileBuffer = Buffer.from(tile);
|
|
38
|
+
const response = LambdaHttpResponse.ok().buffer(tileBuffer, 'application/x-protobuf');
|
|
39
|
+
response.header(HttpHeader.ETag, cacheKey);
|
|
40
|
+
response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
|
|
41
|
+
if (isGzip(tileBuffer))
|
|
42
|
+
response.header(HttpHeader.ContentEncoding, 'gzip');
|
|
43
|
+
return response;
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
//# sourceMappingURL=tile.xyz.vector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tile.xyz.vector.js","sourceRoot":"","sources":["../../src/routes/tile.xyz.vector.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/routes/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,wBAAsB,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC,CAK9D"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
2
|
+
export async function versionGet() {
|
|
3
|
+
var _a;
|
|
4
|
+
const response = new LambdaHttpResponse(200, 'ok');
|
|
5
|
+
response.header(HttpHeader.CacheControl, 'no-store');
|
|
6
|
+
response.json({ version: (_a = process.env.GIT_VERSION) !== null && _a !== void 0 ? _a : 'dev', hash: process.env.GIT_HASH });
|
|
7
|
+
return response;
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=version.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/routes/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEhE,MAAM,CAAC,KAAK,UAAU,UAAU;;IAC9B,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACnD,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IACrD,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,WAAW,mCAAI,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzF,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.test.d.ts","sourceRoot":"","sources":["../../../src/util/__test__/validate.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { GoogleTms, ImageFormat, Nztm2000QuadTms, Nztm2000Tms, VectorFormat } from '@basemaps/geo';
|
|
2
|
+
import o from 'ospec';
|
|
3
|
+
import { mockUrlRequest } from '../../__tests__/xyz.util.js';
|
|
4
|
+
import { Validate } from '../validate.js';
|
|
5
|
+
o.spec('GetImageFormats', () => {
|
|
6
|
+
o('should parse all formats', () => {
|
|
7
|
+
const req = mockUrlRequest('/v1/blank', 'format=png&format=jpeg');
|
|
8
|
+
const formats = Validate.getRequestedFormats(req);
|
|
9
|
+
o(formats).deepEquals([ImageFormat.Png, ImageFormat.Jpeg]);
|
|
10
|
+
});
|
|
11
|
+
o('should ignore bad formats', () => {
|
|
12
|
+
const req = mockUrlRequest('/v1/blank', 'format=fake&format=mvt');
|
|
13
|
+
const formats = Validate.getRequestedFormats(req);
|
|
14
|
+
o(formats).equals(null);
|
|
15
|
+
});
|
|
16
|
+
o('should de-dupe formats', () => {
|
|
17
|
+
const req = mockUrlRequest('/v1/blank', 'format=png&format=jpeg&format=png&format=jpeg&format=png&format=jpeg');
|
|
18
|
+
const formats = Validate.getRequestedFormats(req);
|
|
19
|
+
o(formats).deepEquals([ImageFormat.Png, ImageFormat.Jpeg]);
|
|
20
|
+
});
|
|
21
|
+
o('should support "tileFormat" Alias all formats', () => {
|
|
22
|
+
const req = mockUrlRequest('/v1/blank', 'tileFormat=png&format=jpeg');
|
|
23
|
+
const formats = Validate.getRequestedFormats(req);
|
|
24
|
+
o(formats).deepEquals([ImageFormat.Jpeg, ImageFormat.Png]);
|
|
25
|
+
});
|
|
26
|
+
o('should not duplicate "tileFormat" alias all formats', () => {
|
|
27
|
+
const req = mockUrlRequest('/v1/blank', 'tileFormat=jpeg&format=jpeg');
|
|
28
|
+
const formats = Validate.getRequestedFormats(req);
|
|
29
|
+
o(formats).deepEquals([ImageFormat.Jpeg]);
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
o.spec('getTileMatrixSet', () => {
|
|
33
|
+
o('should lookup epsg codes', () => {
|
|
34
|
+
var _a, _b, _c, _d;
|
|
35
|
+
o((_a = Validate.getTileMatrixSet('EPSG:3857')) === null || _a === void 0 ? void 0 : _a.identifier).equals(GoogleTms.identifier);
|
|
36
|
+
o((_b = Validate.getTileMatrixSet('EPSG:2193')) === null || _b === void 0 ? void 0 : _b.identifier).equals(Nztm2000Tms.identifier);
|
|
37
|
+
o((_c = Validate.getTileMatrixSet('3857')) === null || _c === void 0 ? void 0 : _c.identifier).equals(GoogleTms.identifier);
|
|
38
|
+
o((_d = Validate.getTileMatrixSet('2193')) === null || _d === void 0 ? void 0 : _d.identifier).equals(Nztm2000Tms.identifier);
|
|
39
|
+
});
|
|
40
|
+
o('should lookup by identifier', () => {
|
|
41
|
+
var _a, _b, _c;
|
|
42
|
+
o((_a = Validate.getTileMatrixSet('WebMercatorQuad')) === null || _a === void 0 ? void 0 : _a.identifier).equals(GoogleTms.identifier);
|
|
43
|
+
o((_b = Validate.getTileMatrixSet('NZTM2000Quad')) === null || _b === void 0 ? void 0 : _b.identifier).equals(Nztm2000QuadTms.identifier);
|
|
44
|
+
o((_c = Validate.getTileMatrixSet('Nztm2000')) === null || _c === void 0 ? void 0 : _c.identifier).equals(Nztm2000Tms.identifier);
|
|
45
|
+
});
|
|
46
|
+
o('should be case sensitive', () => {
|
|
47
|
+
var _a;
|
|
48
|
+
o((_a = Validate.getTileMatrixSet('Nztm2000Quad')) === null || _a === void 0 ? void 0 : _a.identifier).equals(undefined);
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
o.spec('getTileFormat', () => {
|
|
52
|
+
for (const ext of Object.values(ImageFormat)) {
|
|
53
|
+
o('should support image format:' + ext, () => {
|
|
54
|
+
o(Validate.getTileFormat(ext)).equals(ext);
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
o('should support vector format: mvt', () => {
|
|
58
|
+
o(Validate.getTileFormat('pbf')).equals(VectorFormat.MapboxVectorTiles);
|
|
59
|
+
});
|
|
60
|
+
for (const fmt of ['FAKE', /* 'JPEG' // TODO should this be case sensitive ,*/ 'mvt', 'json']) {
|
|
61
|
+
o('should not support format:' + fmt, () => {
|
|
62
|
+
o(Validate.getTileFormat(fmt)).equals(null);
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
//# sourceMappingURL=validate.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate.test.js","sourceRoot":"","sources":["../../../src/util/__test__/validate.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import {
|
|
3
|
-
import { LambdaHttpResponse } from '@linzjs/lambda';
|
|
4
|
-
export declare class CotarCache {
|
|
5
|
-
static cache: Map<string, Promise<Cotar | null>>;
|
|
6
|
-
static get(uri: string): Promise<Cotar | null>;
|
|
7
|
-
}
|
|
2
|
+
import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
|
|
8
3
|
/**
|
|
9
4
|
* Load a cotar and look for a file inside the cotar returning the file back as a LambdaResponse
|
|
10
5
|
*
|
|
@@ -12,7 +7,7 @@ export declare class CotarCache {
|
|
|
12
7
|
* - Content-Encoding if the file starts with gzip magic
|
|
13
8
|
* - Content-Type from the parameter contentType
|
|
14
9
|
*/
|
|
15
|
-
export declare function serveFromCotar(cotarPath: string, assetPath: string, contentType: string): Promise<LambdaHttpResponse>;
|
|
10
|
+
export declare function serveFromCotar(req: LambdaHttpRequest, cotarPath: string, assetPath: string, contentType: string): Promise<LambdaHttpResponse>;
|
|
16
11
|
/**
|
|
17
12
|
* Does a buffer look like a gzipped document instead of raw json
|
|
18
13
|
*
|
|
@@ -22,4 +17,4 @@ export declare function serveFromCotar(cotarPath: string, assetPath: string, con
|
|
|
22
17
|
*
|
|
23
18
|
*/
|
|
24
19
|
export declare function isGzip(b: Buffer): boolean;
|
|
25
|
-
//# sourceMappingURL=cotar.
|
|
20
|
+
//# sourceMappingURL=cotar.serve.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cotar.serve.d.ts","sourceRoot":"","sources":["../../src/util/cotar.serve.ts"],"names":[],"mappings":";AAAA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKnF;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,iBAAiB,EACtB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAgB7B;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAEzC"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
2
|
+
import { Etag } from './etag.js';
|
|
3
|
+
import { NotFound, NotModified } from './response.js';
|
|
4
|
+
import { CoSources } from './source.cache.js';
|
|
5
|
+
/**
|
|
6
|
+
* Load a cotar and look for a file inside the cotar returning the file back as a LambdaResponse
|
|
7
|
+
*
|
|
8
|
+
* This will also set two headers
|
|
9
|
+
* - Content-Encoding if the file starts with gzip magic
|
|
10
|
+
* - Content-Type from the parameter contentType
|
|
11
|
+
*/
|
|
12
|
+
export async function serveFromCotar(req, cotarPath, assetPath, contentType) {
|
|
13
|
+
const cotar = await CoSources.getCotar(cotarPath);
|
|
14
|
+
if (cotar == null)
|
|
15
|
+
return NotFound();
|
|
16
|
+
const fileData = await cotar.get(assetPath);
|
|
17
|
+
if (fileData == null)
|
|
18
|
+
return NotFound();
|
|
19
|
+
const buf = Buffer.from(fileData);
|
|
20
|
+
const cacheKey = Etag.key(buf);
|
|
21
|
+
if (Etag.isNotModified(req, cacheKey))
|
|
22
|
+
return NotModified();
|
|
23
|
+
const response = LambdaHttpResponse.ok().buffer(buf, contentType);
|
|
24
|
+
response.header(HttpHeader.ETag, cacheKey);
|
|
25
|
+
response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
|
|
26
|
+
if (isGzip(buf))
|
|
27
|
+
response.header(HttpHeader.ContentEncoding, 'gzip');
|
|
28
|
+
return response;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Does a buffer look like a gzipped document instead of raw json
|
|
32
|
+
*
|
|
33
|
+
* Determined by checking the first two bytes are the gzip magic bytes `0x1f 0x8b`
|
|
34
|
+
*
|
|
35
|
+
* @see https://en.wikipedia.org/wiki/Gzip
|
|
36
|
+
*
|
|
37
|
+
*/
|
|
38
|
+
export function isGzip(b) {
|
|
39
|
+
return b[0] === 0x1f && b[1] === 0x8b;
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=cotar.serve.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cotar.serve.js","sourceRoot":"","sources":["../../src/util/cotar.serve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAsB,EACtB,SAAiB,EACjB,SAAiB,EACjB,WAAmB;IAEnB,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAClD,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IACrC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC5C,IAAI,QAAQ,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAExC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAElC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC;QAAE,OAAO,WAAW,EAAE,CAAC;IAE5D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAClE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3C,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,sDAAsD,CAAC,CAAC;IACjG,IAAI,MAAM,CAAC,GAAG,CAAC;QAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IACrE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,MAAM,CAAC,CAAS;IAC9B,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;AACxC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"etag.d.ts","sourceRoot":"","sources":["../../src/util/etag.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAE/D,eAAO,MAAM,IAAI;aACN,OAAO,GAAG,MAAM;uBAKN,iBAAiB,YAAY,MAAM,GAAG,OAAO;CAUjE,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { sha256base58 } from '@basemaps/config';
|
|
2
|
+
import { HttpHeader } from '@linzjs/lambda';
|
|
3
|
+
export const Etag = {
|
|
4
|
+
key(obj) {
|
|
5
|
+
if (Buffer.isBuffer(obj) || typeof obj === 'string')
|
|
6
|
+
return sha256base58(obj);
|
|
7
|
+
return sha256base58(JSON.stringify(obj));
|
|
8
|
+
},
|
|
9
|
+
isNotModified(req, cacheKey) {
|
|
10
|
+
// If the user has supplied a IfNoneMatch Header and it contains the full sha256 sum for our
|
|
11
|
+
// etag this tile has not been modified.
|
|
12
|
+
const ifNoneMatch = req.header(HttpHeader.IfNoneMatch);
|
|
13
|
+
if (ifNoneMatch != null && ifNoneMatch.indexOf(cacheKey) > -1) {
|
|
14
|
+
req.set('cache', { hit: true, match: ifNoneMatch });
|
|
15
|
+
return true;
|
|
16
|
+
}
|
|
17
|
+
return false;
|
|
18
|
+
},
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=etag.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"etag.js","sourceRoot":"","sources":["../../src/util/etag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAqB,MAAM,gBAAgB,CAAC;AAE/D,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,GAAG,CAAC,GAAY;QACd,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;QAC9E,OAAO,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,aAAa,CAAC,GAAsB,EAAE,QAAgB;QACpD,4FAA4F;QAC5F,wCAAwC;QACxC,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACvD,IAAI,WAAW,IAAI,IAAI,IAAI,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE;YAC7D,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../src/util/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,eAAO,MAAM,QAAQ,QAAO,kBAA8D,CAAC;AAC3F,eAAO,MAAM,WAAW,QAAO,kBAAiE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../src/util/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAuB,EAAE,CAAC,IAAI,kBAAkB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;AAC3F,MAAM,CAAC,MAAM,WAAW,GAAG,GAAuB,EAAE,CAAC,IAAI,kBAAkB,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { CogTiff } from '@cogeotiff/core';
|
|
2
|
+
import { Cotar } from '@cotar/core';
|
|
3
|
+
import { SwappingLru } from './swapping.lru.js';
|
|
4
|
+
export declare type LruStrut = LruStrutCotar | LruStrutCog;
|
|
5
|
+
export interface LruStrutCotar {
|
|
6
|
+
type: 'cotar';
|
|
7
|
+
value: Promise<Cotar>;
|
|
8
|
+
_value?: Cotar;
|
|
9
|
+
}
|
|
10
|
+
export interface LruStrutCog {
|
|
11
|
+
type: 'cog';
|
|
12
|
+
value: Promise<CogTiff>;
|
|
13
|
+
_value?: CogTiff;
|
|
14
|
+
}
|
|
15
|
+
declare class LruStrutObj<T extends LruStrut> {
|
|
16
|
+
ob: T;
|
|
17
|
+
constructor(ob: T);
|
|
18
|
+
get size(): number;
|
|
19
|
+
}
|
|
20
|
+
export declare class SourceCache {
|
|
21
|
+
cache: SwappingLru<LruStrutObj<LruStrutCotar | LruStrutCog>>;
|
|
22
|
+
constructor(maxSize: number);
|
|
23
|
+
getCog(location: string): Promise<CogTiff>;
|
|
24
|
+
getCotar(location: string): Promise<Cotar>;
|
|
25
|
+
}
|
|
26
|
+
export declare const CoSources: SourceCache;
|
|
27
|
+
export {};
|
|
28
|
+
//# sourceMappingURL=source.cache.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source.cache.d.ts","sourceRoot":"","sources":["../../src/util/source.cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,oBAAY,QAAQ,GAAG,aAAa,GAAG,WAAW,CAAC;AAEnD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACtB,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,KAAK,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,cAAM,WAAW,CAAC,CAAC,SAAS,QAAQ;IAClC,EAAE,EAAE,CAAC,CAAC;gBACM,EAAE,EAAE,CAAC;IAKjB,IAAI,IAAI,IAAI,MAAM,CAIjB;CACF;AAED,qBAAa,WAAW;IACtB,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC;gBACjD,OAAO,EAAE,MAAM;IAI3B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAc1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;CAa3C;AAED,eAAO,MAAM,SAAS,aAAqC,CAAC"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { fsa } from '@basemaps/shared';
|
|
2
|
+
import { CogTiff } from '@cogeotiff/core';
|
|
3
|
+
import { Cotar } from '@cotar/core';
|
|
4
|
+
import { St } from './source.tracer.js';
|
|
5
|
+
import { SwappingLru } from './swapping.lru.js';
|
|
6
|
+
class LruStrutObj {
|
|
7
|
+
constructor(ob) {
|
|
8
|
+
this.ob = ob;
|
|
9
|
+
if (this.ob._value == null)
|
|
10
|
+
this.ob.value.then((c) => (this.ob._value = c));
|
|
11
|
+
}
|
|
12
|
+
get size() {
|
|
13
|
+
const val = this.ob._value;
|
|
14
|
+
if (val == null)
|
|
15
|
+
return 0;
|
|
16
|
+
return val.source.chunkSize * val.source.chunks.size;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
export class SourceCache {
|
|
20
|
+
constructor(maxSize) {
|
|
21
|
+
this.cache = new SwappingLru(maxSize);
|
|
22
|
+
}
|
|
23
|
+
getCog(location) {
|
|
24
|
+
var _a;
|
|
25
|
+
const existing = (_a = this.cache.get(location)) === null || _a === void 0 ? void 0 : _a.ob;
|
|
26
|
+
if (existing != null) {
|
|
27
|
+
if (existing.type === 'cog')
|
|
28
|
+
return existing.value;
|
|
29
|
+
throw new Error(`Existing object of type: ${existing.type} made for location: ${location}`);
|
|
30
|
+
}
|
|
31
|
+
const source = fsa.source(location);
|
|
32
|
+
St.trace(source);
|
|
33
|
+
const value = CogTiff.create(source);
|
|
34
|
+
this.cache.set(location, new LruStrutObj({ type: 'cog', value }));
|
|
35
|
+
return value;
|
|
36
|
+
}
|
|
37
|
+
getCotar(location) {
|
|
38
|
+
var _a;
|
|
39
|
+
const existing = (_a = this.cache.get(location)) === null || _a === void 0 ? void 0 : _a.ob;
|
|
40
|
+
if (existing != null) {
|
|
41
|
+
if (existing.type === 'cotar')
|
|
42
|
+
return existing.value;
|
|
43
|
+
throw new Error(`Existing object of type: ${existing.type} made for location: ${location}`);
|
|
44
|
+
}
|
|
45
|
+
const source = fsa.source(location);
|
|
46
|
+
St.trace(source);
|
|
47
|
+
const value = Cotar.fromTar(source);
|
|
48
|
+
this.cache.set(location, new LruStrutObj({ type: 'cotar', value }));
|
|
49
|
+
return value;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
export const CoSources = new SourceCache(256 * 1024 * 1024);
|
|
53
|
+
//# sourceMappingURL=source.cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source.cache.js","sourceRoot":"","sources":["../../src/util/source.cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source.tracer.d.ts","sourceRoot":"","sources":["../../src/util/source.tracer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,UAAU,aAAa;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,YAAY;IACvB,QAAQ,EAAE,aAAa,EAAE,CAAM;IAE/B,+BAA+B;IAC/B,KAAK,IAAI,IAAI;IAIb,6EAA6E;IAC7E,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;CAejC;AAED,eAAO,MAAM,EAAE,cAAqB,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { sha256base58 } from '@basemaps/config';
|
|
1
2
|
export class SourceTracer {
|
|
2
3
|
constructor() {
|
|
3
4
|
this.requests = [];
|
|
@@ -11,6 +12,8 @@ export class SourceTracer {
|
|
|
11
12
|
const originFetch = source.fetchBytes;
|
|
12
13
|
source.fetchBytes = async (offset, length) => {
|
|
13
14
|
const request = { source: source.uri, offset, length };
|
|
15
|
+
const traceId = sha256base58(`${request.source}:${request.offset}:${request.length}`);
|
|
16
|
+
request.id = traceId;
|
|
14
17
|
this.requests.push(request);
|
|
15
18
|
const startTime = Date.now();
|
|
16
19
|
const ret = await originFetch.apply(source, [offset, length]);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source.tracer.js","sourceRoot":"","sources":["../../src/util/source.tracer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAWhD,MAAM,OAAO,YAAY;IAAzB;QACE,aAAQ,GAAoB,EAAE,CAAC;IAuBjC,CAAC;IArBC,+BAA+B;IAC/B,KAAK;QACH,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACrB,CAAC;IAED,6EAA6E;IAC7E,KAAK,CAAC,MAAmB;QACvB,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC;QACtC,MAAM,CAAC,UAAU,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAwB,EAAE;YAClF,MAAM,OAAO,GAAkB,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YACtE,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACtF,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC;YACrB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE7B,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;YAE9D,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;YAC1C,OAAO,GAAG,CAAC;QACb,CAAC,CAAC;IACJ,CAAC;CACF;AAED,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,YAAY,EAAE,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export declare class SwappingLru<T extends {
|
|
2
|
+
size: number;
|
|
3
|
+
}> {
|
|
4
|
+
cacheA: Map<string, T>;
|
|
5
|
+
cacheB: Map<string, T>;
|
|
6
|
+
maxSize: number;
|
|
7
|
+
hits: number;
|
|
8
|
+
misses: number;
|
|
9
|
+
resets: number;
|
|
10
|
+
_lastCheckedAt: number;
|
|
11
|
+
constructor(maxSize: number);
|
|
12
|
+
get(id: string): T | null;
|
|
13
|
+
/** Reset the cache */
|
|
14
|
+
clear(): void;
|
|
15
|
+
set(id: string, tiff: T): void;
|
|
16
|
+
/** Validate the size of the cache has not exploded */
|
|
17
|
+
check(): void;
|
|
18
|
+
/** Calculate the total number of bytes used by this cache */
|
|
19
|
+
get currentSize(): number;
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=swapping.lru.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"swapping.lru.d.ts","sourceRoot":"","sources":["../../src/util/swapping.lru.ts"],"names":[],"mappings":"AAAA,qBAAa,WAAW,CAAC,CAAC,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE;IACjD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAa;IACnC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAa;IACnC,OAAO,EAAE,MAAM,CAAC;IAEhB,IAAI,SAAK;IACT,MAAM,SAAK;IACX,MAAM,SAAK;IAEX,cAAc,SAAM;gBAER,OAAO,EAAE,MAAM;IAI3B,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI;IAoBzB,sBAAsB;IACtB,KAAK,IAAI,IAAI;IAKb,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI;IAK9B,sDAAsD;IACtD,KAAK,IAAI,IAAI;IASb,6DAA6D;IAC7D,IAAI,WAAW,IAAI,MAAM,CAIxB;CACF"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
export class SwappingLru {
|
|
2
|
+
constructor(maxSize) {
|
|
3
|
+
this.cacheA = new Map();
|
|
4
|
+
this.cacheB = new Map();
|
|
5
|
+
this.hits = 0;
|
|
6
|
+
this.misses = 0;
|
|
7
|
+
this.resets = 0;
|
|
8
|
+
this._lastCheckedAt = -1;
|
|
9
|
+
this.maxSize = maxSize;
|
|
10
|
+
}
|
|
11
|
+
get(id) {
|
|
12
|
+
const cacheA = this.cacheA.get(id);
|
|
13
|
+
if (cacheA) {
|
|
14
|
+
this.hits++;
|
|
15
|
+
return cacheA;
|
|
16
|
+
}
|
|
17
|
+
const cacheB = this.cacheB.get(id);
|
|
18
|
+
if (cacheB == null) {
|
|
19
|
+
this.misses++;
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
this.hits++;
|
|
23
|
+
// If a object is still useful move it into the main cache
|
|
24
|
+
this.cacheA.set(id, cacheB);
|
|
25
|
+
this.cacheB.delete(id);
|
|
26
|
+
return cacheB;
|
|
27
|
+
}
|
|
28
|
+
/** Reset the cache */
|
|
29
|
+
clear() {
|
|
30
|
+
this.cacheA.clear();
|
|
31
|
+
this.cacheB.clear();
|
|
32
|
+
}
|
|
33
|
+
set(id, tiff) {
|
|
34
|
+
this.cacheA.set(id, tiff);
|
|
35
|
+
this.check();
|
|
36
|
+
}
|
|
37
|
+
/** Validate the size of the cache has not exploded */
|
|
38
|
+
check() {
|
|
39
|
+
this._lastCheckedAt = Date.now();
|
|
40
|
+
if (this.maxSize <= 0)
|
|
41
|
+
return;
|
|
42
|
+
if (this.currentSize <= this.maxSize)
|
|
43
|
+
return;
|
|
44
|
+
this.resets++;
|
|
45
|
+
this.cacheB = this.cacheA;
|
|
46
|
+
this.cacheA = new Map();
|
|
47
|
+
}
|
|
48
|
+
/** Calculate the total number of bytes used by this cache */
|
|
49
|
+
get currentSize() {
|
|
50
|
+
let size = 0;
|
|
51
|
+
for (const value of this.cacheA.values())
|
|
52
|
+
size += value.size;
|
|
53
|
+
return size;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=swapping.lru.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"swapping.lru.js","sourceRoot":"","sources":["../../src/util/swapping.lru.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,WAAW;IAWtB,YAAY,OAAe;QAV3B,WAAM,GAAmB,IAAI,GAAG,EAAE,CAAC;QACnC,WAAM,GAAmB,IAAI,GAAG,EAAE,CAAC;QAGnC,SAAI,GAAG,CAAC,CAAC;QACT,WAAM,GAAG,CAAC,CAAC;QACX,WAAM,GAAG,CAAC,CAAC;QAEX,mBAAc,GAAG,CAAC,CAAC,CAAC;QAGlB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,GAAG,CAAC,EAAU;QACZ,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC;SACf;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,MAAM,IAAI,IAAI,EAAE;YAClB,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,OAAO,IAAI,CAAC;SACb;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,0DAA0D;QAC1D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACvB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,sBAAsB;IACtB,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,GAAG,CAAC,EAAU,EAAE,IAAO;QACrB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,EAAE,CAAC;IACf,CAAC;IAED,sDAAsD;IACtD,KAAK;QACH,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC;YAAE,OAAO;QAC9B,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;IAC1B,CAAC;IAED,6DAA6D;IAC7D,IAAI,WAAW;QACb,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|