@basemaps/lambda-tiler 6.39.0 → 6.40.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 +24 -0
- package/build/__tests__/config.data.d.ts.map +1 -1
- package/build/__tests__/config.data.js +142 -1
- package/build/__tests__/config.data.js.map +1 -1
- package/build/__tests__/wmts.capability.test.js +9 -16
- package/build/__tests__/wmts.capability.test.js.map +1 -1
- package/build/__tests__/xyz.util.d.ts.map +1 -1
- package/build/__tests__/xyz.util.js +6 -2
- package/build/__tests__/xyz.util.js.map +1 -1
- package/build/cli/render.tile.d.ts +2 -0
- package/build/cli/render.tile.d.ts.map +1 -0
- package/build/cli/render.tile.js +33 -0
- package/build/cli/render.tile.js.map +1 -0
- package/build/routes/__tests__/attribution.test.js +63 -3
- package/build/routes/__tests__/attribution.test.js.map +1 -1
- package/build/routes/__tests__/wmts.test.js +50 -8
- package/build/routes/__tests__/wmts.test.js.map +1 -1
- package/build/routes/attribution.d.ts +12 -0
- package/build/routes/attribution.d.ts.map +1 -1
- package/build/routes/attribution.js +29 -27
- package/build/routes/attribution.js.map +1 -1
- package/build/routes/tile.json.d.ts.map +1 -1
- package/build/routes/tile.json.js +2 -1
- package/build/routes/tile.json.js.map +1 -1
- package/build/routes/tile.style.json.d.ts.map +1 -1
- package/build/routes/tile.style.json.js +2 -1
- 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 +3 -1
- package/build/routes/tile.wmts.js.map +1 -1
- package/build/routes/tile.xyz.raster.d.ts.map +1 -1
- package/build/routes/tile.xyz.raster.js +5 -1
- package/build/routes/tile.xyz.raster.js.map +1 -1
- package/build/util/__test__/filter.test.d.ts +2 -0
- package/build/util/__test__/filter.test.d.ts.map +1 -0
- package/build/util/__test__/filter.test.js +64 -0
- package/build/util/__test__/filter.test.js.map +1 -0
- package/build/util/config.loader.d.ts.map +1 -1
- package/build/util/config.loader.js +2 -3
- package/build/util/config.loader.js.map +1 -1
- package/build/util/filter.d.ts +15 -0
- package/build/util/filter.d.ts.map +1 -0
- package/build/util/filter.js +59 -0
- package/build/util/filter.js.map +1 -0
- package/build/wmts.capability.d.ts +8 -5
- package/build/wmts.capability.d.ts.map +1 -1
- package/build/wmts.capability.js +17 -15
- package/build/wmts.capability.js.map +1 -1
- package/dist/index.js +58 -58
- package/dist/node_modules/.package-lock.json +11 -11
- package/dist/node_modules/minimist/.eslintrc +25 -50
- package/dist/node_modules/minimist/CHANGELOG.md +87 -1
- package/dist/node_modules/minimist/README.md +14 -10
- package/dist/node_modules/minimist/example/parse.js +2 -0
- package/dist/node_modules/minimist/index.js +256 -242
- package/dist/node_modules/minimist/package.json +73 -73
- package/dist/node_modules/minimist/test/all_bool.js +26 -24
- package/dist/node_modules/minimist/test/bool.js +146 -147
- package/dist/node_modules/minimist/test/dash.js +33 -21
- package/dist/node_modules/minimist/test/default_bool.js +26 -24
- package/dist/node_modules/minimist/test/dotted.js +13 -11
- package/dist/node_modules/minimist/test/kv_short.js +26 -10
- package/dist/node_modules/minimist/test/long.js +28 -26
- package/dist/node_modules/minimist/test/num.js +30 -28
- package/dist/node_modules/minimist/test/parse.js +169 -157
- package/dist/node_modules/minimist/test/parse_modified.js +7 -5
- package/dist/node_modules/minimist/test/proto.js +41 -37
- package/dist/node_modules/minimist/test/short.js +57 -55
- package/dist/node_modules/minimist/test/stop_early.js +10 -8
- package/dist/node_modules/minimist/test/unknown.js +83 -81
- package/dist/node_modules/minimist/test/whitespace.js +6 -4
- package/dist/node_modules/node-abi/.circleci/config.yml +2 -2
- package/dist/node_modules/node-abi/.github/CODEOWNERS +1 -0
- package/dist/node_modules/node-abi/.github/workflows/update-abi.yml +5 -4
- package/dist/node_modules/node-abi/README.md +5 -3
- package/dist/node_modules/node-abi/abi_registry.json +8 -1
- package/dist/node_modules/node-abi/package.json +4 -4
- package/dist/node_modules/readable-stream/README.md +1 -1
- package/dist/node_modules/readable-stream/lib/_stream_duplex.js +12 -25
- package/dist/node_modules/readable-stream/lib/_stream_passthrough.js +2 -4
- package/dist/node_modules/readable-stream/lib/_stream_readable.js +176 -273
- package/dist/node_modules/readable-stream/lib/_stream_transform.js +26 -37
- package/dist/node_modules/readable-stream/lib/_stream_writable.js +118 -174
- package/dist/node_modules/readable-stream/lib/internal/streams/async_iterator.js +10 -37
- package/dist/node_modules/readable-stream/lib/internal/streams/buffer_list.js +20 -47
- package/dist/node_modules/readable-stream/lib/internal/streams/destroy.js +8 -17
- package/dist/node_modules/readable-stream/lib/internal/streams/end-of-stream.js +1 -19
- package/dist/node_modules/readable-stream/lib/internal/streams/from.js +12 -24
- package/dist/node_modules/readable-stream/lib/internal/streams/pipeline.js +5 -16
- package/dist/node_modules/readable-stream/lib/internal/streams/state.js +2 -7
- package/dist/node_modules/readable-stream/package.json +1 -1
- package/dist/package-lock.json +12 -343
- package/dist/package.json +1 -1
- package/package.json +8 -8
- package/src/__tests__/config.data.ts +142 -1
- package/src/__tests__/wmts.capability.test.ts +9 -16
- package/src/__tests__/xyz.util.ts +6 -2
- package/src/cli/render.tile.ts +38 -0
- package/src/routes/__tests__/attribution.test.ts +65 -3
- package/src/routes/__tests__/wmts.test.ts +70 -9
- package/src/routes/attribution.ts +24 -28
- package/src/routes/tile.json.ts +2 -1
- package/src/routes/tile.style.json.ts +2 -1
- package/src/routes/tile.wmts.ts +3 -1
- package/src/routes/tile.xyz.raster.ts +4 -1
- package/src/util/__test__/filter.test.ts +80 -0
- package/src/util/config.loader.ts +1 -2
- package/src/util/filter.ts +60 -0
- package/src/wmts.capability.ts +19 -14
- package/tsconfig.tsbuildinfo +1 -1
- package/test-dump.js +0 -6
- package/test-imagery.js +0 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attribution.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/attribution.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"attribution.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/attribution.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,21 +8,21 @@ import { Api, mockUrlRequest } from '../../__tests__/xyz.util.js';
|
|
|
8
8
|
o.spec('WMTSRouting', () => {
|
|
9
9
|
const sandbox = createSandbox();
|
|
10
10
|
const config = new ConfigProviderMemory();
|
|
11
|
-
|
|
11
|
+
const imagery = new Map();
|
|
12
|
+
o.beforeEach(() => {
|
|
12
13
|
sandbox.stub(ConfigLoader, 'load').resolves(config);
|
|
13
|
-
});
|
|
14
|
-
o.afterEach(() => {
|
|
15
|
-
config.objects.clear();
|
|
16
|
-
sandbox.restore();
|
|
17
|
-
});
|
|
18
|
-
o('should default to the aerial layer', async () => {
|
|
19
|
-
const imagery = new Map();
|
|
20
14
|
imagery.set(Imagery3857.id, Imagery3857);
|
|
21
15
|
imagery.set(Imagery2193.id, Imagery2193);
|
|
22
16
|
config.put(TileSetAerial);
|
|
23
17
|
config.put(Imagery2193);
|
|
24
18
|
config.put(Imagery3857);
|
|
25
19
|
config.put(Provider);
|
|
20
|
+
});
|
|
21
|
+
o.afterEach(() => {
|
|
22
|
+
config.objects.clear();
|
|
23
|
+
sandbox.restore();
|
|
24
|
+
});
|
|
25
|
+
o('should default to the aerial layer', async () => {
|
|
26
26
|
const req = mockUrlRequest('/v1/tiles/WMTSCapabilities.xml', `format=png&api=${Api.key}&config=s3://linz-basemaps/config.json`);
|
|
27
27
|
const res = await handler.router.handle(req);
|
|
28
28
|
o(res.status).equals(200);
|
|
@@ -40,5 +40,47 @@ o.spec('WMTSRouting', () => {
|
|
|
40
40
|
'<ResourceURL format="image/png" resourceType="tile" template="https://tiles.test/v1/tiles/ōtorohanga-urban-2021-0.1m/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png?api=d01f7w7rnhdzg0p7fyrc9v9ard1&config=Q5pC4UjWdtFLU1CYtLcRSmB49RekgDgMa5EGJnB2M" />',
|
|
41
41
|
]);
|
|
42
42
|
});
|
|
43
|
+
o('should filter out date[after] by year', async () => {
|
|
44
|
+
const req = mockUrlRequest('/v1/tiles/WMTSCapabilities.xml', `format=png&api=${Api.key}&config=s3://linz-basemaps/config.json&date[after]=2022`);
|
|
45
|
+
const res = await handler.router.handle(req);
|
|
46
|
+
o(res.status).equals(200);
|
|
47
|
+
const lines = Buffer.from(res.body, 'base64').toString().split('\n');
|
|
48
|
+
const titles = lines.filter((f) => f.startsWith(' <ows:Title>')).map((f) => f.trim());
|
|
49
|
+
o(titles).deepEquals([
|
|
50
|
+
'<ows:Title>Aerial Imagery</ows:Title>',
|
|
51
|
+
'<ows:Title>Google Maps Compatible for the World</ows:Title>',
|
|
52
|
+
'<ows:Title>LINZ NZTM2000 Map Tile Grid V2</ows:Title>',
|
|
53
|
+
]);
|
|
54
|
+
});
|
|
55
|
+
o('should filter out date[before] by year', async () => {
|
|
56
|
+
const req = mockUrlRequest('/v1/tiles/WMTSCapabilities.xml', `format=png&api=${Api.key}&config=s3://linz-basemaps/config.json&date[before]=2020`);
|
|
57
|
+
const res = await handler.router.handle(req);
|
|
58
|
+
o(res.status).equals(200);
|
|
59
|
+
const lines = Buffer.from(res.body, 'base64').toString().split('\n');
|
|
60
|
+
const titles = lines.filter((f) => f.startsWith(' <ows:Title>')).map((f) => f.trim());
|
|
61
|
+
o(titles).deepEquals([
|
|
62
|
+
'<ows:Title>Aerial Imagery</ows:Title>',
|
|
63
|
+
'<ows:Title>Google Maps Compatible for the World</ows:Title>',
|
|
64
|
+
'<ows:Title>LINZ NZTM2000 Map Tile Grid V2</ows:Title>',
|
|
65
|
+
]);
|
|
66
|
+
});
|
|
67
|
+
o('should filter inclusive date[before] by year', async () => {
|
|
68
|
+
const req = mockUrlRequest('/v1/tiles/WMTSCapabilities.xml', `format=png&api=${Api.key}&config=s3://linz-basemaps/config.json&date[before]=2021`);
|
|
69
|
+
const res = await handler.router.handle(req);
|
|
70
|
+
o(res.status).equals(200);
|
|
71
|
+
const lines = Buffer.from(res.body, 'base64').toString().split('\n');
|
|
72
|
+
const titles = lines.filter((f) => f.startsWith(' <ows:Title>')).map((f) => f.trim());
|
|
73
|
+
o(titles).deepEquals([
|
|
74
|
+
'<ows:Title>Aerial Imagery</ows:Title>',
|
|
75
|
+
'<ows:Title>Ōtorohanga 0.1m Urban Aerial Photos (2021)</ows:Title>',
|
|
76
|
+
'<ows:Title>Google Maps Compatible for the World</ows:Title>',
|
|
77
|
+
'<ows:Title>LINZ NZTM2000 Map Tile Grid V2</ows:Title>',
|
|
78
|
+
]);
|
|
79
|
+
const resourceURLs = lines.filter((f) => f.includes('<ResourceURL')).map((f) => f.trim());
|
|
80
|
+
o(resourceURLs).deepEquals([
|
|
81
|
+
'<ResourceURL format="image/png" resourceType="tile" template="https://tiles.test/v1/tiles/aerial/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png?api=d01f7w7rnhdzg0p7fyrc9v9ard1&config=Q5pC4UjWdtFLU1CYtLcRSmB49RekgDgMa5EGJnB2M&date%5Bbefore%5D=2021" />',
|
|
82
|
+
'<ResourceURL format="image/png" resourceType="tile" template="https://tiles.test/v1/tiles/ōtorohanga-urban-2021-0.1m/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.png?api=d01f7w7rnhdzg0p7fyrc9v9ard1&config=Q5pC4UjWdtFLU1CYtLcRSmB49RekgDgMa5EGJnB2M" />',
|
|
83
|
+
]);
|
|
84
|
+
});
|
|
43
85
|
});
|
|
44
86
|
//# sourceMappingURL=wmts.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wmts.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/wmts.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACnG,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"wmts.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/wmts.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,16 @@
|
|
|
1
|
+
import { NamedBounds } from '@basemaps/geo';
|
|
2
|
+
import { Projection } from '@basemaps/shared';
|
|
3
|
+
import { BBox, MultiPolygon } from '@linzjs/geojson';
|
|
1
4
|
import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
|
|
5
|
+
/**
|
|
6
|
+
* Convert a list of COG file bounds into a MultiPolygon. If the bounds spans more than half the
|
|
7
|
+
* globe then return a simple MultiPolygon for the bounding box.
|
|
8
|
+
|
|
9
|
+
* @param bbox in WGS84
|
|
10
|
+
* @param files in target projection
|
|
11
|
+
* @return MultiPolygon in WGS84
|
|
12
|
+
*/
|
|
13
|
+
export declare function createCoordinates(bbox: BBox, files: NamedBounds[], proj: Projection): MultiPolygon;
|
|
2
14
|
export interface TileAttributionGet {
|
|
3
15
|
Params: {
|
|
4
16
|
tileSet: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attribution.d.ts","sourceRoot":"","sources":["../../src/routes/attribution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"attribution.d.ts","sourceRoot":"","sources":["../../src/routes/attribution.ts"],"names":[],"mappings":"AACA,OAAO,EAML,WAAW,EAKZ,MAAM,eAAe,CAAC;AACvB,OAAO,EAAuD,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,IAAI,EAAE,YAAY,EAA2C,MAAM,iBAAiB,CAAC;AAC9F,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAwBnF;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,UAAU,GAAG,YAAY,CAclG;AA+FD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BhH"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { getAllImagery, TileSetType } from '@basemaps/config';
|
|
2
2
|
import { Bounds, GoogleTms, Stac, TileMatrixSet, } from '@basemaps/geo';
|
|
3
|
-
import { extractYearRangeFromName,
|
|
3
|
+
import { extractYearRangeFromName, extractYearRangeFromTitle, Projection } from '@basemaps/shared';
|
|
4
4
|
import { multiPolygonToWgs84, union, Wgs84 } from '@linzjs/geojson';
|
|
5
5
|
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
6
6
|
import { ConfigLoader } from '../util/config.loader.js';
|
|
7
7
|
import { Etag } from '../util/etag.js';
|
|
8
|
+
import { filterLayers, yearRangeToInterval } from '../util/filter.js';
|
|
8
9
|
import { NotFound, NotModified } from '../util/response.js';
|
|
9
10
|
import { Validate } from '../util/validate.js';
|
|
10
11
|
/** Amount to pad imagery bounds to avoid fragmenting polygons */
|
|
@@ -27,18 +28,17 @@ function roundPair(p) {
|
|
|
27
28
|
* @param files in target projection
|
|
28
29
|
* @return MultiPolygon in WGS84
|
|
29
30
|
*/
|
|
30
|
-
function createCoordinates(bbox, files, proj) {
|
|
31
|
+
export function createCoordinates(bbox, files, proj) {
|
|
31
32
|
if (Wgs84.delta(bbox[0], bbox[2]) <= 0) {
|
|
32
33
|
// This bounds spans more than half the globe which multiPolygonToWgs84 can't handle; just
|
|
33
34
|
// return bbox as polygon
|
|
34
35
|
return Wgs84.bboxToMultiPolygon(bbox);
|
|
35
36
|
}
|
|
36
|
-
|
|
37
|
+
const polygons = [];
|
|
37
38
|
// merge imagery bounds
|
|
38
|
-
for (const image of files)
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
39
|
+
for (const image of files)
|
|
40
|
+
polygons.push(Bounds.fromJson(image).pad(SmoothPadding).toPolygon());
|
|
41
|
+
const coordinates = union(polygons);
|
|
42
42
|
const roundToWgs84 = (p) => roundPair(proj.toWgs84(p));
|
|
43
43
|
return multiPolygonToWgs84(coordinates, roundToWgs84);
|
|
44
44
|
}
|
|
@@ -54,31 +54,27 @@ function getHost(host) {
|
|
|
54
54
|
* links and assets for a more comprehensive STAC file.
|
|
55
55
|
*/
|
|
56
56
|
async function tileSetAttribution(req, tileSet, tileMatrix) {
|
|
57
|
-
var _a, _b, _c
|
|
57
|
+
var _a, _b, _c;
|
|
58
58
|
const proj = Projection.get(tileMatrix);
|
|
59
59
|
const cols = [];
|
|
60
60
|
const items = [];
|
|
61
61
|
const config = await ConfigLoader.load(req);
|
|
62
62
|
const imagery = await getAllImagery(config, tileSet.layers, [tileMatrix.projection]);
|
|
63
|
+
const filteredLayers = filterLayers(req, tileSet.layers);
|
|
63
64
|
const host = await config.Provider.get(config.Provider.id('linz'));
|
|
64
|
-
for (const layer of
|
|
65
|
+
for (const layer of filteredLayers) {
|
|
66
|
+
if (layer.disabled)
|
|
67
|
+
continue;
|
|
65
68
|
const imgId = layer[proj.epsg.code];
|
|
66
69
|
if (imgId == null)
|
|
67
70
|
continue;
|
|
68
71
|
const im = imagery.get(imgId);
|
|
69
72
|
if (im == null)
|
|
70
73
|
continue;
|
|
74
|
+
const title = im.title;
|
|
71
75
|
const bbox = proj.boundsToWgs84BoundingBox(im.bounds).map(roundNumber);
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
req.log.debug({ imagery: im.name }, 'Attribution:DefaultYear');
|
|
75
|
-
// Put it in the future so people know its a "fake" date
|
|
76
|
-
years[0] = new Date().getUTCFullYear() + 1;
|
|
77
|
-
years[1] = years[0] + 1;
|
|
78
|
-
}
|
|
79
|
-
const interval = [years.map((y) => `${y}-01-01T00:00:00Z`)];
|
|
80
|
-
const extent = { spatial: { bbox: [bbox] }, temporal: { interval } };
|
|
81
|
-
items.push({
|
|
76
|
+
const extent = { spatial: { bbox: [bbox] } };
|
|
77
|
+
const item = {
|
|
82
78
|
type: 'Feature',
|
|
83
79
|
stac_version: Stac.Version,
|
|
84
80
|
id: imgId + '_item',
|
|
@@ -88,13 +84,19 @@ async function tileSetAttribution(req, tileSet, tileMatrix) {
|
|
|
88
84
|
bbox,
|
|
89
85
|
geometry: { type: 'MultiPolygon', coordinates: createCoordinates(bbox, im.files, proj) },
|
|
90
86
|
properties: {
|
|
91
|
-
title
|
|
87
|
+
title,
|
|
92
88
|
category: im.category,
|
|
93
|
-
datetime: null,
|
|
94
|
-
start_datetime: interval[0][0],
|
|
95
|
-
end_datetime: interval[0][1],
|
|
96
89
|
},
|
|
97
|
-
}
|
|
90
|
+
};
|
|
91
|
+
const years = (_a = extractYearRangeFromTitle(im.title)) !== null && _a !== void 0 ? _a : extractYearRangeFromName(im.name);
|
|
92
|
+
if (years) {
|
|
93
|
+
const interval = yearRangeToInterval(years);
|
|
94
|
+
extent.temporal = { interval: [[interval[0].toISOString(), interval[1].toISOString()]] };
|
|
95
|
+
item.properties.datetime = null;
|
|
96
|
+
item.properties.start_datetime = interval[0].toISOString();
|
|
97
|
+
item.properties.end_datetime = interval[1].toISOString();
|
|
98
|
+
}
|
|
99
|
+
items.push(item);
|
|
98
100
|
const zoomMin = TileMatrixSet.convertZoomLevel(layer.minZoom ? layer.minZoom : 0, GoogleTms, tileMatrix, true);
|
|
99
101
|
const zoomMax = TileMatrixSet.convertZoomLevel(layer.maxZoom ? layer.maxZoom : 32, GoogleTms, tileMatrix, true);
|
|
100
102
|
cols.push({
|
|
@@ -102,7 +104,7 @@ async function tileSetAttribution(req, tileSet, tileMatrix) {
|
|
|
102
104
|
license: Stac.License,
|
|
103
105
|
id: im.id,
|
|
104
106
|
providers: getHost(host),
|
|
105
|
-
title
|
|
107
|
+
title,
|
|
106
108
|
description: 'No description',
|
|
107
109
|
extent,
|
|
108
110
|
links: [],
|
|
@@ -118,8 +120,8 @@ async function tileSetAttribution(req, tileSet, tileMatrix) {
|
|
|
118
120
|
type: 'FeatureCollection',
|
|
119
121
|
stac_version: Stac.Version,
|
|
120
122
|
stac_extensions: ['single-file-stac'],
|
|
121
|
-
title: (
|
|
122
|
-
description: (
|
|
123
|
+
title: (_b = tileSet.title) !== null && _b !== void 0 ? _b : 'No title',
|
|
124
|
+
description: (_c = tileSet.description) !== null && _c !== void 0 ? _c : 'No Description',
|
|
123
125
|
features: items,
|
|
124
126
|
collections: cols,
|
|
125
127
|
links: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attribution.js","sourceRoot":"","sources":["../../src/routes/attribution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7F,OAAO,EAIL,MAAM,EACN,SAAS,EAET,IAAI,EAGJ,aAAa,GACd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,wBAAwB,EAAE,
|
|
1
|
+
{"version":3,"file":"attribution.js","sourceRoot":"","sources":["../../src/routes/attribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.json.d.ts","sourceRoot":"","sources":["../../src/routes/tile.json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"tile.json.d.ts","sourceRoot":"","sources":["../../src/routes/tile.json.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAMnF,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,iBAAiB,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAuClG"}
|
|
@@ -2,6 +2,7 @@ import { GoogleTms, TileMatrixSet } from '@basemaps/geo';
|
|
|
2
2
|
import { Env, toQueryString } from '@basemaps/shared';
|
|
3
3
|
import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
4
4
|
import { ConfigLoader } from '../util/config.loader.js';
|
|
5
|
+
import { getFilters } from '../util/filter.js';
|
|
5
6
|
import { NotFound } from '../util/response.js';
|
|
6
7
|
import { Validate } from '../util/validate.js';
|
|
7
8
|
export async function tileJsonGet(req) {
|
|
@@ -19,7 +20,7 @@ export async function tileJsonGet(req) {
|
|
|
19
20
|
const format = (_a = Validate.getRequestedFormats(req)) !== null && _a !== void 0 ? _a : [tileSet.format];
|
|
20
21
|
const host = (_b = Env.get(Env.PublicUrlBase)) !== null && _b !== void 0 ? _b : '';
|
|
21
22
|
const configLocation = ConfigLoader.extract(req);
|
|
22
|
-
const query = toQueryString({ api: apiKey, config: configLocation });
|
|
23
|
+
const query = toQueryString({ api: apiKey, config: configLocation, ...getFilters(req) });
|
|
23
24
|
const tileUrl = [host, 'v1', 'tiles', tileSet.name, tileMatrix.identifier, '{z}', '{x}', '{y}'].join('/') + `.${format[0]}${query}`;
|
|
24
25
|
const tileJson = { tiles: [tileUrl], tilejson: '3.0.0' };
|
|
25
26
|
const maxZoom = TileMatrixSet.convertZoomLevel((_c = tileSet.maxZoom) !== null && _c !== void 0 ? _c : 30, GoogleTms, tileMatrix, true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.json.js","sourceRoot":"","sources":["../../src/routes/tile.json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,aAAa,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAS/C,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAmC;;IACnE,MAAM,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACpE,IAAI,UAAU,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAE1C,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAEpC,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE5C,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAChC,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,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC9B,IAAI,OAAO,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAA,QAAQ,CAAC,mBAAmB,CAAC,GAAG,CAAC,mCAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAErE,MAAM,IAAI,GAAG,MAAA,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,mCAAI,EAAE,CAAC;IAE9C,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAEjD,MAAM,KAAK,GAAG,aAAa,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tile.json.js","sourceRoot":"","sources":["../../src/routes/tile.json.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.style.json.d.ts","sourceRoot":"","sources":["../../src/routes/tile.style.json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAW,SAAS,EAAe,MAAM,kBAAkB,CAAC;AAG/F,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"tile.style.json.d.ts","sourceRoot":"","sources":["../../src/routes/tile.style.json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAW,SAAS,EAAe,MAAM,kBAAkB,CAAC;AAG/F,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AASnF;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAQhG;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,GAAG,SAAS,CAuBrH;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,wBAAsB,cAAc,CAClC,GAAG,EAAE,iBAAiB,CAAC,QAAQ,CAAC,EAChC,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,CAAC,CA8B7B;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,iBAAiB,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAoChG"}
|
|
@@ -8,6 +8,7 @@ import { Validate } from '../util/validate.js';
|
|
|
8
8
|
import { Etag } from '../util/etag.js';
|
|
9
9
|
import { ConfigLoader } from '../util/config.loader.js';
|
|
10
10
|
import { GoogleTms, ImageFormat, TileMatrixSets } from '@basemaps/geo';
|
|
11
|
+
import { getFilters } from '../util/filter.js';
|
|
11
12
|
/**
|
|
12
13
|
* Convert relative URLS into a full hostname url
|
|
13
14
|
* @param url possible url to update
|
|
@@ -68,7 +69,7 @@ export async function tileSetToStyle(req, tileSet, apiKey) {
|
|
|
68
69
|
if (tileFormat == null)
|
|
69
70
|
return new LambdaHttpResponse(400, 'Invalid image format');
|
|
70
71
|
const configLocation = ConfigLoader.extract(req);
|
|
71
|
-
const query = toQueryString({ config: configLocation, api: apiKey });
|
|
72
|
+
const query = toQueryString({ config: configLocation, api: apiKey, ...getFilters(req) });
|
|
72
73
|
const tileUrl = fsa.join((_c = Env.get(Env.PublicUrlBase)) !== null && _c !== void 0 ? _c : '', `/v1/tiles/${tileSet.name}/${tileMatrix.identifier}/{z}/{x}/{y}.${tileFormat}${query}`);
|
|
73
74
|
const styleId = `basemaps-${tileSet.name}`;
|
|
74
75
|
const style = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.style.json.js","sourceRoot":"","sources":["../../src/routes/tile.style.json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkD,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/F,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,UAAU,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"tile.style.json.js","sourceRoot":"","sources":["../../src/routes/tile.style.json.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.wmts.d.ts","sourceRoot":"","sources":["../../src/routes/tile.wmts.ts"],"names":[],"mappings":"AACA,OAAO,EAA8B,aAAa,EAAE,MAAM,eAAe,CAAC;AAE1E,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"tile.wmts.d.ts","sourceRoot":"","sources":["../../src/routes/tile.wmts.ts"],"names":[],"mappings":"AACA,OAAO,EAA8B,aAAa,EAAE,MAAM,eAAe,CAAC;AAE1E,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AASnF,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE;QACN,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,wBAAgB,iBAAiB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,aAAa,EAAE,GAAG,IAAI,CAKlF;AACD;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,iBAAiB,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAmDlH"}
|
|
@@ -8,6 +8,7 @@ import { Validate } from '../util/validate.js';
|
|
|
8
8
|
import { WmtsCapabilities } from '../wmts.capability.js';
|
|
9
9
|
import { Etag } from '../util/etag.js';
|
|
10
10
|
import { ConfigLoader } from '../util/config.loader.js';
|
|
11
|
+
import { filterLayers, getFilters } from '../util/filter.js';
|
|
11
12
|
export function getWmtsTileMatrix(tileMatrixParam) {
|
|
12
13
|
if (tileMatrixParam == null)
|
|
13
14
|
return [GoogleTms, Nztm2000QuadTms];
|
|
@@ -45,11 +46,12 @@ export async function wmtsCapabilitiesGet(req) {
|
|
|
45
46
|
provider: provider !== null && provider !== void 0 ? provider : undefined,
|
|
46
47
|
tileSet,
|
|
47
48
|
tileMatrix,
|
|
48
|
-
isIndividualLayers: req.params.tileMatrix == null,
|
|
49
49
|
imagery,
|
|
50
50
|
apiKey,
|
|
51
51
|
config: ConfigLoader.extract(req),
|
|
52
52
|
formats: Validate.getRequestedFormats(req),
|
|
53
|
+
layers: req.params.tileMatrix == null ? filterLayers(req, tileSet.layers) : null,
|
|
54
|
+
filters: getFilters(req),
|
|
53
55
|
}).toXml();
|
|
54
56
|
if (xml == null)
|
|
55
57
|
return NotFound();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.wmts.js","sourceRoot":"","sources":["../../src/routes/tile.wmts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,eAAe,EAAiB,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"tile.wmts.js","sourceRoot":"","sources":["../../src/routes/tile.wmts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.xyz.raster.d.ts","sourceRoot":"","sources":["../../src/routes/tile.xyz.raster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAItE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"tile.xyz.raster.d.ts","sourceRoot":"","sources":["../../src/routes/tile.xyz.raster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAItE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAOnF,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,KAAK,CAAC;AAE3C,eAAO,MAAM,YAAY,gBAA0B,CAAC;AAKpD,eAAO,MAAM,aAAa;0BACI,iBAAiB,WAAW,mBAAmB,OAAO,OAAO,GAAG,QAAQ,MAAM,EAAE,CAAC;cA8C7F,iBAAiB,WAAW,mBAAmB,OAAO,OAAO,GAAG,QAAQ,kBAAkB,CAAC;CA+C5G,CAAC"}
|
|
@@ -7,6 +7,7 @@ import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
|
|
|
7
7
|
import pLimit from 'p-limit';
|
|
8
8
|
import { ConfigLoader } from '../util/config.loader.js';
|
|
9
9
|
import { Etag } from '../util/etag.js';
|
|
10
|
+
import { filterLayers } from '../util/filter.js';
|
|
10
11
|
import { NotFound, NotModified } from '../util/response.js';
|
|
11
12
|
import { CoSources } from '../util/source.cache.js';
|
|
12
13
|
const LoadingQueue = pLimit(Env.getNumber(Env.TiffConcurrency, 25));
|
|
@@ -23,11 +24,14 @@ export const TileXyzRaster = {
|
|
|
23
24
|
async getAssetsForTile(req, tileSet, xyz) {
|
|
24
25
|
const config = await ConfigLoader.load(req);
|
|
25
26
|
const imagery = await getAllImagery(config, tileSet.layers, [xyz.tileMatrix.projection]);
|
|
27
|
+
const filteredLayers = filterLayers(req, tileSet.layers);
|
|
26
28
|
const output = [];
|
|
27
29
|
const tileBounds = xyz.tileMatrix.tileToSourceBounds(xyz.tile);
|
|
28
30
|
// All zoom level config is stored as Google zoom levels
|
|
29
31
|
const filterZoom = TileMatrixSet.convertZoomLevel(xyz.tile.z, xyz.tileMatrix, TileMatrixSets.get(Epsg.Google));
|
|
30
|
-
for (const layer of
|
|
32
|
+
for (const layer of filteredLayers) {
|
|
33
|
+
if (layer.disabled)
|
|
34
|
+
continue;
|
|
31
35
|
if (layer.maxZoom != null && filterZoom > layer.maxZoom)
|
|
32
36
|
continue;
|
|
33
37
|
if (layer.minZoom != null && filterZoom < layer.minZoom)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tile.xyz.raster.js","sourceRoot":"","sources":["../../src/routes/tile.xyz.raster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAuB,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC1F,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAAE,UAAU,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,MAAM,MAAM,SAAS,CAAC;AAC7B,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,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;AAEpE,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACrC,IAAI,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3E,OAAO,GAAG,IAAI,OAAO,CAAC;AACxB,CAAC;AAID,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC;AAEpD,MAAM,mBAAmB,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAW,CAAC;AACzE,MAAM,iBAAiB,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;AAEzD,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,KAAK,CAAC,gBAAgB,CAAC,GAAsB,EAAE,OAA4B,EAAE,GAAY;QACvF,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;
|
|
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 @@
|
|
|
1
|
+
{"version":3,"file":"filter.test.d.ts","sourceRoot":"","sources":["../../../src/util/__test__/filter.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import o from 'ospec';
|
|
2
|
+
import { mockUrlRequest } from '../../__tests__/xyz.util.js';
|
|
3
|
+
import { filterLayers } from '../filter.js';
|
|
4
|
+
o.spec('filterLayers', () => {
|
|
5
|
+
const sourceLayers = [
|
|
6
|
+
{
|
|
7
|
+
name: 'waikato-0_625m-snc12836-2004',
|
|
8
|
+
title: 'Waikato 0.625m SNC12836 (2004-2008)',
|
|
9
|
+
},
|
|
10
|
+
{
|
|
11
|
+
name: 'hawkes-bay--manawat-whanganui-0_75m-snc30001-2002',
|
|
12
|
+
title: 'Hawkes Bay / Manawatū-Whanganui 0.75m SNC30001 (2002)',
|
|
13
|
+
},
|
|
14
|
+
{
|
|
15
|
+
name: 'canterbury-0_75m-snc25054-2000-2001',
|
|
16
|
+
title: 'Canterbury 0.75m SNC25054 (2000-2001)',
|
|
17
|
+
},
|
|
18
|
+
{
|
|
19
|
+
name: 'otago-0_375m-sn3806-1975',
|
|
20
|
+
title: 'Otago 0.375m SN3806 (1975)',
|
|
21
|
+
},
|
|
22
|
+
];
|
|
23
|
+
o('should not filter with empty parameters', () => {
|
|
24
|
+
const layers = filterLayers(mockUrlRequest('/foo/bar,js'), sourceLayers);
|
|
25
|
+
o(layers).deepEquals(sourceLayers);
|
|
26
|
+
});
|
|
27
|
+
o('should filter date[after]', () => {
|
|
28
|
+
const dateAfter = '2003-12-31T23:59:59.999';
|
|
29
|
+
const layers = filterLayers(mockUrlRequest('/foo/bar,js', `?date[after]=${dateAfter}`), sourceLayers);
|
|
30
|
+
o(layers).deepEquals([sourceLayers[0]]);
|
|
31
|
+
});
|
|
32
|
+
o('should filter date[before]', () => {
|
|
33
|
+
const dateBefore = '2003-01-01T00:00:00.000Z';
|
|
34
|
+
const layers = filterLayers(mockUrlRequest('/foo/bar,js', `?date[before]=${dateBefore}`), sourceLayers);
|
|
35
|
+
o(layers).deepEquals(sourceLayers.slice(1));
|
|
36
|
+
});
|
|
37
|
+
o('should filter date[before] in between years', () => {
|
|
38
|
+
const dateBefore = '2026-01-01T00:00:00.000Z';
|
|
39
|
+
const layer = [{ name: '', title: 'Waikato 0.625m SNC12836 (2020-2028)' }];
|
|
40
|
+
const layers = filterLayers(mockUrlRequest('/foo/bar,js', `?date[before]=${dateBefore}`), layer);
|
|
41
|
+
o(layers).deepEquals(layer);
|
|
42
|
+
});
|
|
43
|
+
o('should filter date[after] in between years', () => {
|
|
44
|
+
const dateAfter = '2026-12-31T23:59:59.999Z';
|
|
45
|
+
const layer = [{ name: '', title: 'Waikato 0.625m SNC12836 (2020-2028)' }];
|
|
46
|
+
const layers = filterLayers(mockUrlRequest('/foo/bar,js', `?date[after]=${dateAfter}`), layer);
|
|
47
|
+
o(layers).deepEquals(layer);
|
|
48
|
+
});
|
|
49
|
+
o('should filter date[after] and date[before] in between years', () => {
|
|
50
|
+
const dateAfter = '2026-12-31T23:59:59.999Z';
|
|
51
|
+
const dateBefore = '2028-01-01T00:00:00.000Z';
|
|
52
|
+
const layer = [{ name: '', title: 'Waikato 0.625m SNC12836 (2020-2028)' }];
|
|
53
|
+
const layers = filterLayers(mockUrlRequest('/foo/bar,js', `?date[after]=${dateAfter}&date[before]=${dateBefore}`), layer);
|
|
54
|
+
o(layers).deepEquals(layer);
|
|
55
|
+
});
|
|
56
|
+
o('should filter date[after] and date[before] in between years with single year', () => {
|
|
57
|
+
const dateAfter = '2026-12-31T23:59:59.999Z';
|
|
58
|
+
const dateBefore = '2028-01-01T00:00:00.000Z';
|
|
59
|
+
const layer = [{ name: '', title: 'Waikato 0.625m SNC12836 (2028)' }];
|
|
60
|
+
const layers = filterLayers(mockUrlRequest('/foo/bar,js', `?date[after]=${dateAfter}&date[before]=${dateBefore}`), layer);
|
|
61
|
+
o(layers).deepEquals(layer);
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
//# sourceMappingURL=filter.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"filter.test.js","sourceRoot":"","sources":["../../../src/util/__test__/filter.test.ts"],"names":[],"mappings":"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"}
|