@basemaps/lambda-tiler 6.34.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.
Files changed (124) hide show
  1. package/CHANGELOG.md +28 -0
  2. package/build/__tests__/config.data.d.ts +2 -1
  3. package/build/__tests__/config.data.d.ts.map +1 -1
  4. package/build/__tests__/config.data.js +14 -1
  5. package/build/__tests__/config.data.js.map +1 -1
  6. package/build/__tests__/tile.style.json.test.js +17 -3
  7. package/build/__tests__/tile.style.json.test.js.map +1 -1
  8. package/build/__tests__/wmts.capability.test.js +17 -0
  9. package/build/__tests__/wmts.capability.test.js.map +1 -1
  10. package/build/arcgis/__tests__/arcgis.style.json.test.js +18 -15
  11. package/build/arcgis/__tests__/arcgis.style.json.test.js.map +1 -1
  12. package/build/arcgis/__tests__/vector.tiler.server.test.js +14 -7
  13. package/build/arcgis/__tests__/vector.tiler.server.test.js.map +1 -1
  14. package/build/arcgis/arcgis.style.json.d.ts.map +1 -1
  15. package/build/arcgis/arcgis.style.json.js +6 -4
  16. package/build/arcgis/arcgis.style.json.js.map +1 -1
  17. package/build/arcgis/vector.tile.server.d.ts.map +1 -1
  18. package/build/arcgis/vector.tile.server.js +4 -2
  19. package/build/arcgis/vector.tile.server.js.map +1 -1
  20. package/build/index.d.ts +1 -3
  21. package/build/index.d.ts.map +1 -1
  22. package/build/index.js +7 -8
  23. package/build/index.js.map +1 -1
  24. package/build/routes/__tests__/attribution.test.js +3 -2
  25. package/build/routes/__tests__/attribution.test.js.map +1 -1
  26. package/build/routes/__tests__/fonts.test.js +36 -7
  27. package/build/routes/__tests__/fonts.test.js.map +1 -1
  28. package/build/routes/__tests__/health.test.js +4 -2
  29. package/build/routes/__tests__/health.test.js.map +1 -1
  30. package/build/routes/__tests__/sprites.test.js +3 -4
  31. package/build/routes/__tests__/sprites.test.js.map +1 -1
  32. package/build/routes/__tests__/tile.json.test.js +24 -2
  33. package/build/routes/__tests__/tile.json.test.js.map +1 -1
  34. package/build/routes/__tests__/tile.style.json.test.js +58 -7
  35. package/build/routes/__tests__/tile.style.json.test.js.map +1 -1
  36. package/build/routes/__tests__/wmts.test.js +17 -14
  37. package/build/routes/__tests__/wmts.test.js.map +1 -1
  38. package/build/routes/__tests__/xyz.test.js +4 -2
  39. package/build/routes/__tests__/xyz.test.js.map +1 -1
  40. package/build/routes/attribution.d.ts.map +1 -1
  41. package/build/routes/attribution.js +20 -10
  42. package/build/routes/attribution.js.map +1 -1
  43. package/build/routes/config.d.ts +22 -0
  44. package/build/routes/config.d.ts.map +1 -0
  45. package/build/routes/config.js +63 -0
  46. package/build/routes/config.js.map +1 -0
  47. package/build/routes/health.d.ts.map +1 -1
  48. package/build/routes/health.js +3 -2
  49. package/build/routes/health.js.map +1 -1
  50. package/build/routes/imagery.d.ts.map +1 -1
  51. package/build/routes/imagery.js +3 -2
  52. package/build/routes/imagery.js.map +1 -1
  53. package/build/routes/tile.json.d.ts.map +1 -1
  54. package/build/routes/tile.json.js +7 -4
  55. package/build/routes/tile.json.js.map +1 -1
  56. package/build/routes/tile.style.json.d.ts +4 -3
  57. package/build/routes/tile.style.json.d.ts.map +1 -1
  58. package/build/routes/tile.style.json.js +53 -12
  59. package/build/routes/tile.style.json.js.map +1 -1
  60. package/build/routes/tile.wmts.d.ts.map +1 -1
  61. package/build/routes/tile.wmts.js +7 -4
  62. package/build/routes/tile.wmts.js.map +1 -1
  63. package/build/routes/tile.xyz.d.ts.map +1 -1
  64. package/build/routes/tile.xyz.js +4 -2
  65. package/build/routes/tile.xyz.js.map +1 -1
  66. package/build/routes/tile.xyz.raster.d.ts.map +1 -1
  67. package/build/routes/tile.xyz.raster.js +4 -2
  68. package/build/routes/tile.xyz.raster.js.map +1 -1
  69. package/build/util/__test__/config.loader.test.d.ts +2 -0
  70. package/build/util/__test__/config.loader.test.d.ts.map +1 -0
  71. package/build/util/__test__/config.loader.test.js +79 -0
  72. package/build/util/__test__/config.loader.test.js.map +1 -0
  73. package/build/util/assets.provider.d.ts +1 -4
  74. package/build/util/assets.provider.d.ts.map +1 -1
  75. package/build/util/assets.provider.js +23 -10
  76. package/build/util/assets.provider.js.map +1 -1
  77. package/build/util/config.cache.d.ts +3 -3
  78. package/build/util/config.cache.d.ts.map +1 -1
  79. package/build/util/config.cache.js +14 -15
  80. package/build/util/config.cache.js.map +1 -1
  81. package/build/util/config.loader.d.ts +10 -0
  82. package/build/util/config.loader.d.ts.map +1 -0
  83. package/build/util/config.loader.js +47 -0
  84. package/build/util/config.loader.js.map +1 -0
  85. package/build/wmts.capability.d.ts +3 -1
  86. package/build/wmts.capability.d.ts.map +1 -1
  87. package/build/wmts.capability.js +5 -15
  88. package/build/wmts.capability.js.map +1 -1
  89. package/dist/index.js +66 -66
  90. package/dist/node_modules/.package-lock.json +1 -1
  91. package/dist/package-lock.json +2 -2
  92. package/dist/package.json +1 -1
  93. package/package.json +8 -9
  94. package/src/__tests__/config.data.ts +25 -1
  95. package/src/__tests__/tile.style.json.test.ts +19 -3
  96. package/src/__tests__/wmts.capability.test.ts +21 -0
  97. package/src/arcgis/__tests__/arcgis.style.json.test.ts +21 -17
  98. package/src/arcgis/__tests__/vector.tiler.server.test.ts +17 -8
  99. package/src/arcgis/arcgis.style.json.ts +6 -4
  100. package/src/arcgis/vector.tile.server.ts +5 -2
  101. package/src/index.ts +9 -10
  102. package/src/routes/__tests__/attribution.test.ts +4 -2
  103. package/src/routes/__tests__/fonts.test.ts +44 -7
  104. package/src/routes/__tests__/health.test.ts +4 -2
  105. package/src/routes/__tests__/sprites.test.ts +3 -4
  106. package/src/routes/__tests__/tile.json.test.ts +30 -2
  107. package/src/routes/__tests__/tile.style.json.test.ts +68 -9
  108. package/src/routes/__tests__/wmts.test.ts +23 -17
  109. package/src/routes/__tests__/xyz.test.ts +4 -2
  110. package/src/routes/attribution.ts +23 -8
  111. package/src/routes/config.ts +83 -0
  112. package/src/routes/health.ts +4 -2
  113. package/src/routes/imagery.ts +3 -2
  114. package/src/routes/tile.json.ts +10 -4
  115. package/src/routes/tile.style.json.ts +58 -12
  116. package/src/routes/tile.wmts.ts +9 -4
  117. package/src/routes/tile.xyz.raster.ts +4 -2
  118. package/src/routes/tile.xyz.ts +5 -2
  119. package/src/util/__test__/config.loader.test.ts +116 -0
  120. package/src/util/assets.provider.ts +11 -12
  121. package/src/util/config.cache.ts +18 -18
  122. package/src/util/config.loader.ts +50 -0
  123. package/src/wmts.capability.ts +9 -15
  124. package/tsconfig.tsbuildinfo +1 -1
@@ -1,4 +1,4 @@
1
- import { Config, TileSetType } from '@basemaps/config';
1
+ import { getAllImagery, TileSetType } from '@basemaps/config';
2
2
  import { GoogleTms, Nztm2000QuadTms } from '@basemaps/geo';
3
3
  import { Env } from '@basemaps/shared';
4
4
  import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
@@ -7,6 +7,7 @@ import { NotFound, NotModified } from '../util/response.js';
7
7
  import { Validate } from '../util/validate.js';
8
8
  import { WmtsCapabilities } from '../wmts.capability.js';
9
9
  import { Etag } from '../util/etag.js';
10
+ import { ConfigLoader } from '../util/config.loader.js';
10
11
  export function getWmtsTileMatrix(tileMatrixParam) {
11
12
  if (tileMatrixParam == null)
12
13
  return [GoogleTms, Nztm2000QuadTms];
@@ -29,14 +30,15 @@ export async function wmtsCapabilitiesGet(req) {
29
30
  if (tileMatrix == null)
30
31
  return NotFound();
31
32
  const host = (_b = Env.get(Env.PublicUrlBase)) !== null && _b !== void 0 ? _b : '';
33
+ const config = await ConfigLoader.load(req);
32
34
  req.timer.start('tileset:load');
33
- const tileSet = await Config.TileSet.get(Config.TileSet.id(tileSetName !== null && tileSetName !== void 0 ? tileSetName : 'aerial'));
35
+ const tileSet = await config.TileSet.get(config.TileSet.id(tileSetName !== null && tileSetName !== void 0 ? tileSetName : 'aerial'));
34
36
  req.timer.end('tileset:load');
35
37
  if (tileSet == null || tileSet.type !== TileSetType.Raster)
36
38
  return NotFound();
37
- const provider = await Config.Provider.get(Config.Provider.id('linz'));
39
+ const provider = await config.Provider.get(config.Provider.id('linz'));
38
40
  req.timer.start('imagery:load');
39
- const imagery = await Config.getAllImagery(tileSet.layers, tileMatrix.map((tms) => tms.projection));
41
+ const imagery = await getAllImagery(config, tileSet.layers, tileMatrix.map((tms) => tms.projection));
40
42
  req.timer.end('imagery:load');
41
43
  const xml = new WmtsCapabilities({
42
44
  httpBase: host,
@@ -46,6 +48,7 @@ export async function wmtsCapabilitiesGet(req) {
46
48
  isIndividualLayers: req.params.tileMatrix == null,
47
49
  imagery,
48
50
  apiKey,
51
+ config: ConfigLoader.extract(req),
49
52
  formats: Validate.getRequestedFormats(req),
50
53
  }).toXml();
51
54
  if (xml == null)
@@ -1 +1 @@
1
- {"version":3,"file":"tile.wmts.js","sourceRoot":"","sources":["../../src/routes/tile.wmts.ts"],"names":[],"mappings":"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"}
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.d.ts","sourceRoot":"","sources":["../../src/routes/tile.xyz.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAMvE,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,iBAAiB,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAgBhG"}
1
+ {"version":3,"file":"tile.xyz.d.ts","sourceRoot":"","sources":["../../src/routes/tile.xyz.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAOvE,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;QACV,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,iBAAiB,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkBhG"}
@@ -1,5 +1,6 @@
1
- import { Config, TileSetType } from '@basemaps/config';
1
+ import { TileSetType } from '@basemaps/config';
2
2
  import { LambdaHttpResponse } from '@linzjs/lambda';
3
+ import { ConfigLoader } from '../util/config.loader.js';
3
4
  import { NotFound } from '../util/response.js';
4
5
  import { Validate } from '../util/validate.js';
5
6
  import { TileXyzRaster } from './tile.xyz.raster.js';
@@ -16,8 +17,9 @@ import { tileXyzVector } from './tile.xyz.vector.js';
16
17
  */
17
18
  export async function tileXyzGet(req) {
18
19
  const xyzData = Validate.xyz(req);
20
+ const config = await ConfigLoader.load(req);
19
21
  req.timer.start('tileset:load');
20
- const tileSet = await Config.TileSet.get(Config.TileSet.id(xyzData.tileSet));
22
+ const tileSet = await config.TileSet.get(config.TileSet.id(xyzData.tileSet));
21
23
  req.timer.end('tileset:load');
22
24
  if (tileSet == null)
23
25
  return NotFound();
@@ -1 +1 @@
1
- {"version":3,"file":"tile.xyz.js","sourceRoot":"","sources":["../../src/routes/tile.xyz.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAarD;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAkC;IACjE,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAElC,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,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7E,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC9B,IAAI,OAAO,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAEvC,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,WAAW,CAAC,MAAM;YACrB,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACnD,KAAK,WAAW,CAAC,MAAM;YACrB,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACnD;YACE,OAAO,IAAI,kBAAkB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;KACzD;AACH,CAAC"}
1
+ {"version":3,"file":"tile.xyz.js","sourceRoot":"","sources":["../../src/routes/tile.xyz.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAarD;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAkC;IACjE,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAElC,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,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7E,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC9B,IAAI,OAAO,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAEvC,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,WAAW,CAAC,MAAM;YACrB,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACnD,KAAK,WAAW,CAAC,MAAM;YACrB,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACnD;YACE,OAAO,IAAI,kBAAkB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;KACzD;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"tile.xyz.raster.d.ts","sourceRoot":"","sources":["../../src/routes/tile.xyz.raster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAI/D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKnF,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,eAAO,MAAM,YAAY,gBAA0B,CAAC;AAKpD,eAAO,MAAM,aAAa;yBACG,iBAAiB,WAAW,mBAAmB,OAAO,OAAO,GAAG,QAAQ,MAAM,EAAE,CAAC;cAqC5F,iBAAiB,WAAW,mBAAmB,OAAO,OAAO,GAAG,QAAQ,kBAAkB,CAAC;CAyC5G,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;AAEvD,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAMnF,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,eAAO,MAAM,YAAY,gBAA0B,CAAC;AAKpD,eAAO,MAAM,aAAa;yBACG,iBAAiB,WAAW,mBAAmB,OAAO,OAAO,GAAG,QAAQ,MAAM,EAAE,CAAC;cAsC5F,iBAAiB,WAAW,mBAAmB,OAAO,OAAO,GAAG,QAAQ,kBAAkB,CAAC;CAyC5G,CAAC"}
@@ -1,10 +1,11 @@
1
- import { Config } from '@basemaps/config';
1
+ import { getAllImagery } from '@basemaps/config';
2
2
  import { Bounds, Epsg, TileMatrixSet, TileMatrixSets, VectorFormat } from '@basemaps/geo';
3
3
  import { Env, fsa } from '@basemaps/shared';
4
4
  import { Tiler } from '@basemaps/tiler';
5
5
  import { TileMakerSharp } from '@basemaps/tiler-sharp';
6
6
  import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
7
7
  import pLimit from 'p-limit';
8
+ import { ConfigLoader } from '../util/config.loader.js';
8
9
  import { Etag } from '../util/etag.js';
9
10
  import { NotFound, NotModified } from '../util/response.js';
10
11
  import { CoSources } from '../util/source.cache.js';
@@ -20,7 +21,8 @@ const DefaultResizeKernel = { in: 'lanczos3', out: 'lanczos3' };
20
21
  const DefaultBackground = { r: 0, g: 0, b: 0, alpha: 0 };
21
22
  export const TileXyzRaster = {
22
23
  async getTiffsForTile(req, tileSet, xyz) {
23
- const imagery = await Config.getAllImagery(tileSet.layers, [xyz.tileMatrix.projection]);
24
+ const config = await ConfigLoader.load(req);
25
+ const imagery = await getAllImagery(config, tileSet.layers, [xyz.tileMatrix.projection]);
24
26
  const output = [];
25
27
  const tileBounds = xyz.tileMatrix.tileToSourceBounds(xyz.tile);
26
28
  // All zoom level config is stored as Google zoom levels
@@ -1 +1 @@
1
- {"version":3,"file":"tile.xyz.raster.js","sourceRoot":"","sources":["../../src/routes/tile.xyz.raster.ts"],"names":[],"mappings":"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"}
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,2 @@
1
+ export {};
2
+ //# sourceMappingURL=config.loader.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.loader.test.d.ts","sourceRoot":"","sources":["../../../src/util/__test__/config.loader.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,79 @@
1
+ import { base58, ConfigProviderMemory } from '@basemaps/config';
2
+ import { fsa } from '@basemaps/shared';
3
+ import { LambdaHttpResponse } from '@linzjs/lambda';
4
+ import o from 'ospec';
5
+ import { createSandbox } from 'sinon';
6
+ import { FsMemory } from '../../routes/__tests__/memory.fs.js';
7
+ import { FakeData } from '../../__tests__/config.data.js';
8
+ import { Api, mockRequest, mockUrlRequest } from '../../__tests__/xyz.util.js';
9
+ import { CachedConfig } from '../config.cache.js';
10
+ import { ConfigLoader } from '../config.loader.js';
11
+ o.spec('ConfigLoader', () => {
12
+ const memory = new FsMemory();
13
+ const config = new ConfigProviderMemory();
14
+ const sandbox = createSandbox();
15
+ o.before(() => {
16
+ fsa.register('memory://', memory);
17
+ });
18
+ o.beforeEach(() => {
19
+ sandbox.stub(ConfigLoader, 'getDefaultConfig').resolves(config);
20
+ });
21
+ o.afterEach(() => {
22
+ sandbox.restore();
23
+ config.objects.clear();
24
+ memory.files.clear();
25
+ CachedConfig.cache.clear();
26
+ });
27
+ o('should return default config', async () => {
28
+ const provider = await ConfigLoader.load(mockRequest('/v1/fonts.json'));
29
+ o(provider).deepEquals(config);
30
+ });
31
+ o('should Not working with wrong config url', async () => {
32
+ const error = await ConfigLoader.load(mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=notapath`, Api.header))
33
+ .then(() => null)
34
+ .catch((e) => e);
35
+ o(error instanceof LambdaHttpResponse).equals(true);
36
+ o(error.status).equals(400);
37
+ o(error.statusDescription).equals('Invalid config location');
38
+ });
39
+ o('should Not working with wrong protocol', async () => {
40
+ const error = await ConfigLoader.load(mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=memory1://linz-basemaps/config`, Api.header))
41
+ .then(() => null)
42
+ .catch((e) => e);
43
+ o(error instanceof LambdaHttpResponse).equals(true);
44
+ o(error.status).equals(400);
45
+ o(error.statusDescription).equals('Invalid configuration location protocol:memory1');
46
+ });
47
+ o('should Not working with wrong s3 bucket', async () => {
48
+ const error = await ConfigLoader.load(mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=s3://wrong-bucket/config`, Api.header))
49
+ .then(() => null)
50
+ .catch((e) => e);
51
+ o(error instanceof LambdaHttpResponse).equals(true);
52
+ o(error.status).equals(400);
53
+ o(error.statusDescription).equals('Bucket: "wrong-bucket" is not a allowed bucket location');
54
+ });
55
+ const location = 'memory://linz-basemaps/config.json';
56
+ o('should Not working with no file in the path', async () => {
57
+ const error = await ConfigLoader.load(mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=${location}`, Api.header))
58
+ .then(() => null)
59
+ .catch((e) => e);
60
+ o(error instanceof LambdaHttpResponse).equals(true);
61
+ o(error.status).equals(404);
62
+ o(error.statusDescription).equals(`Config not found at ${location}`);
63
+ });
64
+ o('should get expected config file', async () => {
65
+ const expectedConfig = new ConfigProviderMemory();
66
+ expectedConfig.put(FakeData.tileSetRaster('aerial'));
67
+ await fsa.write(location, Buffer.from(JSON.stringify(expectedConfig.toJson())));
68
+ const provider = await ConfigLoader.load(mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=${location}`, Api.header));
69
+ o(await provider.Imagery.get('aerial')).deepEquals(await expectedConfig.Imagery.get('aerial'));
70
+ });
71
+ o('should get expected config file with base58 location', async () => {
72
+ const expectedConfig = new ConfigProviderMemory();
73
+ expectedConfig.put(FakeData.tileSetVector('topographic'));
74
+ await fsa.write(location, Buffer.from(JSON.stringify(expectedConfig.toJson())));
75
+ const provider = await ConfigLoader.load(mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=${base58.encode(Buffer.from(location))}`, Api.header));
76
+ o(await provider.Imagery.get('topographic')).deepEquals(await expectedConfig.Imagery.get('topographic'));
77
+ });
78
+ });
79
+ //# sourceMappingURL=config.loader.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.loader.test.js","sourceRoot":"","sources":["../../../src/util/__test__/config.loader.test.ts"],"names":[],"mappings":"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"}
@@ -9,10 +9,7 @@ export declare class AssetProvider {
9
9
  * s3://linz-baesmaps/assets/ # Remote location
10
10
  * s3://linz-basemaps/assets/assets-b4ff211a.tar.co # Remote Cotar
11
11
  */
12
- /** Path of the assets location */
13
- path: string | undefined;
14
- set(path?: string): void;
15
- get(fileName: string): Promise<Buffer | null>;
12
+ get(path: string, fileName: string): Promise<Buffer | null>;
16
13
  getFromCotar(path: string, fileName: string): Promise<Buffer | null>;
17
14
  /**
18
15
  * Load a assets from local path or cotar returning the file back as a LambdaResponse
@@ -1 +1 @@
1
- {"version":3,"file":"assets.provider.d.ts","sourceRoot":"","sources":["../../src/util/assets.provider.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAc,MAAM,gBAAgB,CAAC;AAMnF,qBAAa,aAAa;IACxB;;;;;;;OAOG;IAEH,kCAAkC;IAClC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAEzB,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAIlB,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAe7C,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAM1E;;;;;;OAMG;IACG,KAAK,CAAC,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAYpG;AAED,eAAO,MAAM,aAAa,eAAsB,CAAC"}
1
+ {"version":3,"file":"assets.provider.d.ts","sourceRoot":"","sources":["../../src/util/assets.provider.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAc,MAAM,gBAAgB,CAAC;AAOnF,qBAAa,aAAa;IACxB;;;;;;;OAOG;IAEG,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAc3D,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAM1E;;;;;;OAMG;IACG,KAAK,CAAC,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAiBpG;AAED,eAAO,MAAM,aAAa,eAAsB,CAAC"}
@@ -1,22 +1,27 @@
1
+ import { Env } from '@basemaps/shared';
1
2
  import { fsa } from '@chunkd/fs';
2
3
  import { LambdaHttpResponse, HttpHeader } from '@linzjs/lambda';
4
+ import { ConfigLoader } from './config.loader.js';
3
5
  import { isGzip } from './cotar.serve.js';
4
6
  import { Etag } from './etag.js';
5
7
  import { NotFound, NotModified } from './response.js';
6
8
  import { CoSources } from './source.cache.js';
7
9
  export class AssetProvider {
8
- set(path) {
9
- this.path = path;
10
- }
11
- async get(fileName) {
12
- if (this.path == null)
13
- return null;
10
+ /**
11
+ * Assets can be ready from the following locations.
12
+ *
13
+ * /home/blacha/config/build/assets # Local File
14
+ * /home/blacha/config/build/assets.tar.co # Local Cotar
15
+ * s3://linz-baesmaps/assets/ # Remote location
16
+ * s3://linz-basemaps/assets/assets-b4ff211a.tar.co # Remote Cotar
17
+ */
18
+ async get(path, fileName) {
14
19
  // get assets file from cotar
15
- if (this.path.endsWith('.tar.co'))
16
- return await this.getFromCotar(this.path, fileName);
20
+ if (path.endsWith('.tar.co'))
21
+ return await this.getFromCotar(path, fileName);
17
22
  // get assets file for directory
18
23
  try {
19
- const filePath = fsa.join(this.path, fileName);
24
+ const filePath = fsa.join(path, fileName);
20
25
  return await fsa.read(filePath);
21
26
  }
22
27
  catch (e) {
@@ -38,7 +43,15 @@ export class AssetProvider {
38
43
  * - Content-Type from the parameter contentType
39
44
  */
40
45
  async serve(req, file, contentType) {
41
- const buf = await assetProvider.get(file);
46
+ const config = await ConfigLoader.load(req);
47
+ let assetLocation = Env.get(Env.AssetLocation);
48
+ if (config == null)
49
+ return NotFound();
50
+ if (config.assets != null)
51
+ assetLocation = config.assets;
52
+ if (assetLocation == null)
53
+ return NotFound();
54
+ const buf = await assetProvider.get(assetLocation, file);
42
55
  if (buf == null)
43
56
  return NotFound();
44
57
  const cacheKey = Etag.key(buf);
@@ -1 +1 @@
1
- {"version":3,"file":"assets.provider.js","sourceRoot":"","sources":["../../src/util/assets.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAqB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,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,MAAM,OAAO,aAAa;IAaxB,GAAG,CAAC,IAAa;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,QAAgB;QACxB,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QACnC,6BAA6B;QAC7B,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAEvF,gCAAgC;QAChC,IAAI;YACF,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC/C,OAAO,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACjC;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,CAAC,IAAI,KAAK,GAAG;gBAAE,OAAO,IAAI,CAAC;YAChC,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAY,EAAE,QAAgB;QAC/C,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzC,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,KAAK,CAAC,GAAsB,EAAE,IAAY,EAAE,WAAmB;QACnE,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,GAAG,IAAI,IAAI;YAAE,OAAO,QAAQ,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC;YAAE,OAAO,WAAW,EAAE,CAAC;QAE5D,MAAM,QAAQ,GAAG,kBAAkB,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAClE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC3C,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,sDAAsD,CAAC,CAAC;QACjG,IAAI,MAAM,CAAC,GAAG,CAAC;YAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACrE,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC"}
1
+ {"version":3,"file":"assets.provider.js","sourceRoot":"","sources":["../../src/util/assets.provider.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,16 @@
1
1
  import { ConfigBundled, ConfigProviderMemory } from '@basemaps/config';
2
2
  import { SwappingLru } from './swapping.lru.js';
3
3
  declare class LruConfig {
4
- configProvider: Promise<ConfigProviderMemory>;
4
+ configProvider: Promise<ConfigProviderMemory | null>;
5
5
  constructor(config: Promise<ConfigBundled>);
6
6
  get size(): number;
7
7
  }
8
8
  export declare class ConfigCache {
9
9
  cache: SwappingLru<LruConfig>;
10
10
  constructor(maxSize: number);
11
- getConfig(location: string): Promise<ConfigProviderMemory | null>;
11
+ get(location: string): Promise<ConfigProviderMemory | null>;
12
12
  }
13
- /** Cache 20 configs(Around 500KB each)*/
13
+ /** Cache 20 configs (Around <30KB -> 5MB each)*/
14
14
  export declare const CachedConfig: ConfigCache;
15
15
  export {};
16
16
  //# sourceMappingURL=config.cache.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.cache.d.ts","sourceRoot":"","sources":["../../src/util/config.cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,cAAM,SAAS;IACb,cAAc,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;gBAElC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC;IAQ1C,IAAI,IAAI,IAAI,MAAM,CAGjB;CACF;AAED,qBAAa,WAAW;IACtB,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;gBAClB,OAAO,EAAE,MAAM;IAI3B,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;CAalE;AAED,yCAAyC;AACzC,eAAO,MAAM,YAAY,aAAsB,CAAC"}
1
+ {"version":3,"file":"config.cache.d.ts","sourceRoot":"","sources":["../../src/util/config.cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEvE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,cAAM,SAAS;IACb,cAAc,EAAE,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;gBAEzC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC;IAa1C,IAAI,IAAI,IAAI,MAAM,CAGjB;CACF;AAED,qBAAa,WAAW;IACtB,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;gBAClB,OAAO,EAAE,MAAM;IAI3B,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;CAQ5D;AAED,iDAAiD;AACjD,eAAO,MAAM,YAAY,aAAsB,CAAC"}
@@ -1,12 +1,18 @@
1
1
  import { ConfigProviderMemory } from '@basemaps/config';
2
- import { fsa } from '@chunkd/fs';
2
+ import { fsa } from '@basemaps/shared';
3
3
  import { SwappingLru } from './swapping.lru.js';
4
4
  class LruConfig {
5
5
  constructor(config) {
6
- this.configProvider = config.then((c) => {
6
+ this.configProvider = config
7
+ .then((c) => {
7
8
  const configProvider = ConfigProviderMemory.fromJson(c);
8
9
  configProvider.createVirtualTileSets();
9
10
  return configProvider;
11
+ })
12
+ .catch((e) => {
13
+ if (e.code === 404)
14
+ return null;
15
+ throw e;
10
16
  });
11
17
  }
12
18
  get size() {
@@ -18,24 +24,17 @@ export class ConfigCache {
18
24
  constructor(maxSize) {
19
25
  this.cache = new SwappingLru(maxSize);
20
26
  }
21
- getConfig(location) {
27
+ get(location) {
22
28
  var _a;
23
29
  const existing = (_a = this.cache.get(location)) === null || _a === void 0 ? void 0 : _a.configProvider;
24
30
  if (existing != null)
25
31
  return existing;
26
- try {
27
- const configJson = fsa.readJson(location);
28
- const config = new LruConfig(configJson);
29
- this.cache.set(location, config);
30
- return config.configProvider;
31
- }
32
- catch (e) {
33
- if (e.code === 404)
34
- return Promise.resolve(null);
35
- throw e;
36
- }
32
+ const configJson = fsa.readJson(location);
33
+ const config = new LruConfig(configJson);
34
+ this.cache.set(location, config);
35
+ return config.configProvider;
37
36
  }
38
37
  }
39
- /** Cache 20 configs(Around 500KB each)*/
38
+ /** Cache 20 configs (Around <30KB -> 5MB each)*/
40
39
  export const CachedConfig = new ConfigCache(20);
41
40
  //# sourceMappingURL=config.cache.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.cache.js","sourceRoot":"","sources":["../../src/util/config.cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,SAAS;IAGb,YAAY,MAA8B;QACxC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACtC,MAAM,cAAc,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACxD,cAAc,CAAC,qBAAqB,EAAE,CAAC;YACvC,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,IAAI;QACN,qFAAqF;QACrF,OAAO,CAAC,CAAC;IACX,CAAC;CACF;AAED,MAAM,OAAO,WAAW;IAEtB,YAAY,OAAe;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,WAAW,CAAY,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,SAAS,CAAC,QAAgB;;QACxB,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,0CAAE,cAAc,CAAC;QAC1D,IAAI,QAAQ,IAAI,IAAI;YAAE,OAAO,QAAQ,CAAC;QACtC,IAAI;YACF,MAAM,UAAU,GAAG,GAAG,CAAC,QAAQ,CAAgB,QAAQ,CAAC,CAAC;YACzD,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC;YACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACjC,OAAO,MAAM,CAAC,cAAc,CAAC;SAC9B;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,CAAC,IAAI,KAAK,GAAG;gBAAE,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjD,MAAM,CAAC,CAAC;SACT;IACH,CAAC;CACF;AAED,yCAAyC;AACzC,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC"}
1
+ {"version":3,"file":"config.cache.js","sourceRoot":"","sources":["../../src/util/config.cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,SAAS;IAGb,YAAY,MAA8B;QACxC,IAAI,CAAC,cAAc,GAAG,MAAM;aACzB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACV,MAAM,cAAc,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACxD,cAAc,CAAC,qBAAqB,EAAE,CAAC;YACvC,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,IAAI,CAAC,CAAC,IAAI,KAAK,GAAG;gBAAE,OAAO,IAAI,CAAC;YAChC,MAAM,CAAC,CAAC;QACV,CAAC,CAAC,CAAC;IACP,CAAC;IAED,IAAI,IAAI;QACN,qFAAqF;QACrF,OAAO,CAAC,CAAC;IACX,CAAC;CACF;AAED,MAAM,OAAO,WAAW;IAEtB,YAAY,OAAe;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,WAAW,CAAY,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,GAAG,CAAC,QAAgB;;QAClB,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,0CAAE,cAAc,CAAC;QAC1D,IAAI,QAAQ,IAAI,IAAI;YAAE,OAAO,QAAQ,CAAC;QACtC,MAAM,UAAU,GAAG,GAAG,CAAC,QAAQ,CAAgB,QAAQ,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACjC,OAAO,MAAM,CAAC,cAAc,CAAC;IAC/B,CAAC;CACF;AAED,iDAAiD;AACjD,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC"}
@@ -0,0 +1,10 @@
1
+ import { BasemapsConfigProvider } from '@basemaps/config';
2
+ import { LambdaHttpRequest } from '@linzjs/lambda';
3
+ export declare class ConfigLoader {
4
+ /** Exposed for testing */
5
+ static getDefaultConfig(): Promise<BasemapsConfigProvider>;
6
+ /** Lookup the config path from a request and return a standardized location */
7
+ static extract(req: LambdaHttpRequest): string | null;
8
+ static load(req: LambdaHttpRequest): Promise<BasemapsConfigProvider>;
9
+ }
10
+ //# sourceMappingURL=config.loader.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.loader.d.ts","sourceRoot":"","sources":["../../src/util/config.loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,sBAAsB,EAAY,MAAM,kBAAkB,CAAC;AAG5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAQnD,qBAAa,YAAY;IACvB,0BAA0B;WACb,gBAAgB,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAIhE,+EAA+E;IAC/E,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI;WAOxC,IAAI,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,sBAAsB,CAAC;CAwB3E"}
@@ -0,0 +1,47 @@
1
+ import { base58, isBase58 } from '@basemaps/config';
2
+ import { LambdaHttpResponse } from '@linzjs/lambda';
3
+ import { parseUri } from '@chunkd/core';
4
+ import { CachedConfig } from './config.cache.js';
5
+ import { getDefaultConfig } from '@basemaps/shared';
6
+ // FIXME load this from process.env COG BUCKETS?
7
+ const SafeBuckets = new Set(['linz-workflow-artifacts', 'linz-basemaps']);
8
+ const SafeProtocols = new Set(['s3', 'memory']);
9
+ export class ConfigLoader {
10
+ /** Exposed for testing */
11
+ static async getDefaultConfig() {
12
+ return getDefaultConfig();
13
+ }
14
+ /** Lookup the config path from a request and return a standardized location */
15
+ static extract(req) {
16
+ const rawLocation = req.query.get('config');
17
+ if (rawLocation == null)
18
+ return null;
19
+ if (rawLocation.includes('/'))
20
+ return base58.encode(Buffer.from(rawLocation));
21
+ return rawLocation;
22
+ }
23
+ static async load(req) {
24
+ const rawLocation = req.query.get('config');
25
+ if (rawLocation == null)
26
+ return this.getDefaultConfig();
27
+ const configLocation = isBase58(rawLocation) ? Buffer.from(base58.decode(rawLocation)).toString() : rawLocation;
28
+ const r = parseUri(configLocation);
29
+ if (r == null)
30
+ throw new LambdaHttpResponse(400, 'Invalid config location');
31
+ if (!SafeProtocols.has(r.protocol)) {
32
+ throw new LambdaHttpResponse(400, `Invalid configuration location protocol:${r.protocol}`);
33
+ }
34
+ if (!SafeBuckets.has(r.bucket)) {
35
+ throw new LambdaHttpResponse(400, `Bucket: "${r.bucket}" is not a allowed bucket location`);
36
+ }
37
+ req.set('config', configLocation);
38
+ req.timer.start('config:load');
39
+ return CachedConfig.get(configLocation).then((f) => {
40
+ req.timer.end('config:load');
41
+ if (f == null)
42
+ throw new LambdaHttpResponse(404, `Config not found at ${configLocation}`);
43
+ return f;
44
+ });
45
+ }
46
+ }
47
+ //# sourceMappingURL=config.loader.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.loader.js","sourceRoot":"","sources":["../../src/util/config.loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA0B,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,gDAAgD;AAChD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC,CAAC;AAC1E,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AAEhD,MAAM,OAAO,YAAY;IACvB,0BAA0B;IAC1B,MAAM,CAAC,KAAK,CAAC,gBAAgB;QAC3B,OAAO,gBAAgB,EAAE,CAAC;IAC5B,CAAC;IAED,+EAA+E;IAC/E,MAAM,CAAC,OAAO,CAAC,GAAsB;QACnC,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,WAAW,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QACrC,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QAC9E,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAsB;QACtC,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,WAAW,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAExD,MAAM,cAAc,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;QAEhH,MAAM,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;QAEnC,IAAI,CAAC,IAAI,IAAI;YAAE,MAAM,IAAI,kBAAkB,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAC;QAC5E,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE;YAClC,MAAM,IAAI,kBAAkB,CAAC,GAAG,EAAE,2CAA2C,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC5F;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;YAC9B,MAAM,IAAI,kBAAkB,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,MAAM,oCAAoC,CAAC,CAAC;SAC7F;QAED,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAClC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC/B,OAAO,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACjD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC7B,IAAI,CAAC,IAAI,IAAI;gBAAE,MAAM,IAAI,kBAAkB,CAAC,GAAG,EAAE,uBAAuB,cAAc,EAAE,CAAC,CAAC;YAC1F,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
@@ -17,18 +17,20 @@ export interface WmtsCapabilitiesParams {
17
17
  apiKey?: string;
18
18
  /** Limit the output to the following image formats other wise @see ImageFormatOrder */
19
19
  formats?: ImageFormat[] | null;
20
+ /** Config location */
21
+ config?: string | null;
20
22
  }
21
23
  export declare class WmtsCapabilities {
22
24
  httpBase: string;
23
25
  provider?: WmtsProvider;
24
26
  tileSet: ConfigTileSet;
25
27
  apiKey?: string;
28
+ config?: string | null;
26
29
  tileMatrixSets: Map<string, TileMatrixSet>;
27
30
  imagery: Map<string, ConfigImagery>;
28
31
  formats: ImageFormat[];
29
32
  isIndividualLayers: boolean;
30
33
  constructor(params: WmtsCapabilitiesParams);
31
- loadImagery(): Promise<void>;
32
34
  buildWgs84BoundingBox(tms: TileMatrixSet, layers: Bounds[]): VNodeElement;
33
35
  /** Combine all the bounds of the imagery inside the layers into a extent for the imagery set */
34
36
  buildBoundingBoxFromImagery(tms: TileMatrixSet, layers: ConfigLayer[]): VNodeElement | null;
@@ -1 +1 @@
1
- {"version":3,"file":"wmts.capability.d.ts","sourceRoot":"","sources":["../src/wmts.capability.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAE,WAAW,EAAE,aAAa,EAAwB,MAAM,kBAAkB,CAAC;AAC3G,OAAO,EAAE,MAAM,EAAa,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAiB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAoB/D,MAAM,WAAW,sBAAsB;IACrC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,kCAAkC;IAClC,OAAO,EAAE,aAAa,CAAC;IACvB,sCAAsC;IACtC,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,6EAA6E;IAC7E,kBAAkB,EAAE,OAAO,CAAC;IAC5B,2DAA2D;IAC3D,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpC,6CAA6C;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uFAAuF;IACvF,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;CAChC;AAeD,qBAAa,gBAAgB;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,6BAAoC;IAClD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpC,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,kBAAkB,UAAS;gBAEf,MAAM,EAAE,sBAAsB;IAWpC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAWlC,qBAAqB,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,YAAY;IAyBzE,gGAAgG;IAChG,2BAA2B,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,YAAY,GAAG,IAAI;IAmB3F,aAAa,IAAI,YAAY,EAAE;IAmC/B,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAcvD,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAQjE,qBAAqB,CAAC,KAAK,EAAE,WAAW,GAAG,YAAY,GAAG,IAAI;IAmC9D,UAAU,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY;IAqC9C,aAAa,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY;IAK3D,UAAU,IAAI,YAAY;IAI1B,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,YAAY;IAoBpD,OAAO,IAAI,YAAY;IAmBvB,KAAK,IAAI,MAAM;CAGhB"}
1
+ {"version":3,"file":"wmts.capability.d.ts","sourceRoot":"","sources":["../src/wmts.capability.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAwB,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,MAAM,EAAa,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAgC,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAoB9E,MAAM,WAAW,sBAAsB;IACrC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,kCAAkC;IAClC,OAAO,EAAE,aAAa,CAAC;IACvB,sCAAsC;IACtC,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,6EAA6E;IAC7E,kBAAkB,EAAE,OAAO,CAAC;IAC5B,2DAA2D;IAC3D,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpC,6CAA6C;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uFAAuF;IACvF,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAC/B,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAeD,qBAAa,gBAAgB;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,cAAc,6BAAoC;IAClD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACpC,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,kBAAkB,UAAS;gBAEf,MAAM,EAAE,sBAAsB;IAY1C,qBAAqB,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,YAAY;IAyBzE,gGAAgG;IAChG,2BAA2B,CAAC,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,YAAY,GAAG,IAAI;IAmB3F,aAAa,IAAI,YAAY,EAAE;IAmC/B,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAevD,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY;IAQjE,qBAAqB,CAAC,KAAK,EAAE,WAAW,GAAG,YAAY,GAAG,IAAI;IAmC9D,UAAU,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY;IAqC9C,aAAa,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY;IAK3D,UAAU,IAAI,YAAY;IAI1B,kBAAkB,CAAC,GAAG,EAAE,aAAa,GAAG,YAAY;IAoBpD,OAAO,IAAI,YAAY;IAmBvB,KAAK,IAAI,MAAM;CAGhB"}
@@ -1,6 +1,6 @@
1
- import { Config, standardizeLayerName } from '@basemaps/config';
1
+ import { standardizeLayerName } from '@basemaps/config';
2
2
  import { Bounds, GoogleTms } from '@basemaps/geo';
3
- import { Projection, V } from '@basemaps/shared';
3
+ import { Projection, toQueryString, V } from '@basemaps/shared';
4
4
  import { ImageFormatOrder } from '@basemaps/tiler';
5
5
  const CapabilitiesAttrs = {
6
6
  xmlns: 'http://www.opengis.net/wmts/1.0',
@@ -32,6 +32,7 @@ export class WmtsCapabilities {
32
32
  this.httpBase = params.httpBase;
33
33
  this.provider = params.provider;
34
34
  this.tileSet = params.tileSet;
35
+ this.config = params.config;
35
36
  this.isIndividualLayers = params.isIndividualLayers;
36
37
  for (const tms of params.tileMatrix)
37
38
  this.tileMatrixSets.set(tms.identifier, tms);
@@ -39,17 +40,6 @@ export class WmtsCapabilities {
39
40
  this.formats = (_a = params.formats) !== null && _a !== void 0 ? _a : ImageFormatOrder;
40
41
  this.imagery = params.imagery;
41
42
  }
42
- async loadImagery() {
43
- const ids = new Set();
44
- for (const tms of this.tileMatrixSets.values()) {
45
- for (const layer of this.tileSet.layers) {
46
- const layerId = layer[tms.projection.code];
47
- if (layerId != null)
48
- ids.add(layerId);
49
- }
50
- }
51
- this.imagery = await Config.Imagery.getAll(ids);
52
- }
53
43
  buildWgs84BoundingBox(tms, layers) {
54
44
  let bbox;
55
45
  if (layers.length > 0) {
@@ -131,7 +121,7 @@ export class WmtsCapabilities {
131
121
  ];
132
122
  }
133
123
  buildTileUrl(tileSetId, suffix) {
134
- const apiSuffix = this.apiKey ? `?api=${this.apiKey}` : '';
124
+ const query = toQueryString({ api: this.apiKey, config: this.config });
135
125
  return [
136
126
  this.httpBase,
137
127
  'v1',
@@ -140,7 +130,7 @@ export class WmtsCapabilities {
140
130
  '{TileMatrixSet}',
141
131
  '{TileMatrix}',
142
132
  '{TileCol}',
143
- `{TileRow}.${suffix}${apiSuffix}`,
133
+ `{TileRow}.${suffix}${query}`,
144
134
  ].join('/');
145
135
  }
146
136
  buildResourceUrl(tileSetId, suffix) {