@basemaps/lambda-tiler 6.33.0 → 6.35.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (156) hide show
  1. package/CHANGELOG.md +47 -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/__tests__/xyz.util.d.ts +1 -1
  11. package/build/__tests__/xyz.util.d.ts.map +1 -1
  12. package/build/__tests__/xyz.util.js +2 -2
  13. package/build/__tests__/xyz.util.js.map +1 -1
  14. package/build/arcgis/__tests__/arcgis.style.json.test.d.ts +2 -0
  15. package/build/arcgis/__tests__/arcgis.style.json.test.d.ts.map +1 -0
  16. package/build/arcgis/__tests__/arcgis.style.json.test.js +131 -0
  17. package/build/arcgis/__tests__/arcgis.style.json.test.js.map +1 -0
  18. package/build/arcgis/__tests__/vector.tiler.server.test.d.ts +2 -0
  19. package/build/arcgis/__tests__/vector.tiler.server.test.d.ts.map +1 -0
  20. package/build/arcgis/__tests__/vector.tiler.server.test.js +54 -0
  21. package/build/arcgis/__tests__/vector.tiler.server.test.js.map +1 -0
  22. package/build/arcgis/arcgis.info.d.ts +3 -0
  23. package/build/arcgis/arcgis.info.d.ts.map +1 -0
  24. package/build/arcgis/arcgis.info.js +25 -0
  25. package/build/arcgis/arcgis.info.js.map +1 -0
  26. package/build/arcgis/arcgis.style.json.d.ts +9 -0
  27. package/build/arcgis/arcgis.style.json.d.ts.map +1 -0
  28. package/build/arcgis/arcgis.style.json.js +75 -0
  29. package/build/arcgis/arcgis.style.json.js.map +1 -0
  30. package/build/arcgis/vector.tile.server.d.ts +8 -0
  31. package/build/arcgis/vector.tile.server.d.ts.map +1 -0
  32. package/build/arcgis/vector.tile.server.js +73 -0
  33. package/build/arcgis/vector.tile.server.js.map +1 -0
  34. package/build/index.d.ts +1 -3
  35. package/build/index.d.ts.map +1 -1
  36. package/build/index.js +15 -4
  37. package/build/index.js.map +1 -1
  38. package/build/routes/__tests__/attribution.test.js +3 -2
  39. package/build/routes/__tests__/attribution.test.js.map +1 -1
  40. package/build/routes/__tests__/fonts.test.js +46 -29
  41. package/build/routes/__tests__/fonts.test.js.map +1 -1
  42. package/build/routes/__tests__/health.test.js +4 -2
  43. package/build/routes/__tests__/health.test.js.map +1 -1
  44. package/build/routes/__tests__/sprites.test.js +7 -2
  45. package/build/routes/__tests__/sprites.test.js.map +1 -1
  46. package/build/routes/__tests__/tile.json.test.js +24 -2
  47. package/build/routes/__tests__/tile.json.test.js.map +1 -1
  48. package/build/routes/__tests__/tile.style.json.test.js +58 -7
  49. package/build/routes/__tests__/tile.style.json.test.js.map +1 -1
  50. package/build/routes/__tests__/wmts.test.js +17 -14
  51. package/build/routes/__tests__/wmts.test.js.map +1 -1
  52. package/build/routes/__tests__/xyz.test.js +4 -2
  53. package/build/routes/__tests__/xyz.test.js.map +1 -1
  54. package/build/routes/attribution.d.ts.map +1 -1
  55. package/build/routes/attribution.js +20 -10
  56. package/build/routes/attribution.js.map +1 -1
  57. package/build/routes/config.d.ts +22 -0
  58. package/build/routes/config.d.ts.map +1 -0
  59. package/build/routes/config.js +63 -0
  60. package/build/routes/config.js.map +1 -0
  61. package/build/routes/fonts.d.ts +0 -2
  62. package/build/routes/fonts.d.ts.map +1 -1
  63. package/build/routes/fonts.js +3 -66
  64. package/build/routes/fonts.js.map +1 -1
  65. package/build/routes/health.d.ts.map +1 -1
  66. package/build/routes/health.js +3 -2
  67. package/build/routes/health.js.map +1 -1
  68. package/build/routes/imagery.d.ts.map +1 -1
  69. package/build/routes/imagery.js +3 -2
  70. package/build/routes/imagery.js.map +1 -1
  71. package/build/routes/sprites.d.ts.map +1 -1
  72. package/build/routes/sprites.js +3 -29
  73. package/build/routes/sprites.js.map +1 -1
  74. package/build/routes/tile.json.d.ts.map +1 -1
  75. package/build/routes/tile.json.js +7 -4
  76. package/build/routes/tile.json.js.map +1 -1
  77. package/build/routes/tile.style.json.d.ts +4 -3
  78. package/build/routes/tile.style.json.d.ts.map +1 -1
  79. package/build/routes/tile.style.json.js +53 -12
  80. package/build/routes/tile.style.json.js.map +1 -1
  81. package/build/routes/tile.wmts.d.ts.map +1 -1
  82. package/build/routes/tile.wmts.js +7 -4
  83. package/build/routes/tile.wmts.js.map +1 -1
  84. package/build/routes/tile.xyz.d.ts.map +1 -1
  85. package/build/routes/tile.xyz.js +4 -2
  86. package/build/routes/tile.xyz.js.map +1 -1
  87. package/build/routes/tile.xyz.raster.d.ts.map +1 -1
  88. package/build/routes/tile.xyz.raster.js +4 -2
  89. package/build/routes/tile.xyz.raster.js.map +1 -1
  90. package/build/util/__test__/config.loader.test.d.ts +2 -0
  91. package/build/util/__test__/config.loader.test.d.ts.map +1 -0
  92. package/build/util/__test__/config.loader.test.js +79 -0
  93. package/build/util/__test__/config.loader.test.js.map +1 -0
  94. package/build/util/assets.provider.d.ts +24 -0
  95. package/build/util/assets.provider.d.ts.map +1 -0
  96. package/build/util/assets.provider.js +69 -0
  97. package/build/util/assets.provider.js.map +1 -0
  98. package/build/util/config.cache.d.ts +16 -0
  99. package/build/util/config.cache.d.ts.map +1 -0
  100. package/build/util/config.cache.js +40 -0
  101. package/build/util/config.cache.js.map +1 -0
  102. package/build/util/config.loader.d.ts +10 -0
  103. package/build/util/config.loader.d.ts.map +1 -0
  104. package/build/util/config.loader.js +47 -0
  105. package/build/util/config.loader.js.map +1 -0
  106. package/build/util/response.d.ts +2 -1
  107. package/build/util/response.d.ts.map +1 -1
  108. package/build/util/response.js +1 -0
  109. package/build/util/response.js.map +1 -1
  110. package/build/wmts.capability.d.ts +3 -1
  111. package/build/wmts.capability.d.ts.map +1 -1
  112. package/build/wmts.capability.js +5 -15
  113. package/build/wmts.capability.js.map +1 -1
  114. package/dist/index.js +68 -68
  115. package/dist/node_modules/.package-lock.json +4 -4
  116. package/dist/node_modules/node-abi/abi_registry.json +8 -1
  117. package/dist/node_modules/node-abi/package.json +1 -1
  118. package/dist/package-lock.json +8 -8
  119. package/dist/package.json +1 -1
  120. package/package.json +8 -9
  121. package/src/__tests__/config.data.ts +25 -1
  122. package/src/__tests__/tile.style.json.test.ts +19 -3
  123. package/src/__tests__/wmts.capability.test.ts +21 -0
  124. package/src/__tests__/xyz.util.ts +7 -2
  125. package/src/arcgis/__tests__/arcgis.style.json.test.ts +157 -0
  126. package/src/arcgis/__tests__/vector.tiler.server.test.ts +70 -0
  127. package/src/arcgis/arcgis.info.ts +26 -0
  128. package/src/arcgis/arcgis.style.json.ts +83 -0
  129. package/src/arcgis/vector.tile.server.ts +81 -0
  130. package/src/index.ts +18 -5
  131. package/src/routes/__tests__/attribution.test.ts +4 -2
  132. package/src/routes/__tests__/fonts.test.ts +54 -32
  133. package/src/routes/__tests__/health.test.ts +4 -2
  134. package/src/routes/__tests__/sprites.test.ts +7 -3
  135. package/src/routes/__tests__/tile.json.test.ts +30 -2
  136. package/src/routes/__tests__/tile.style.json.test.ts +68 -9
  137. package/src/routes/__tests__/wmts.test.ts +23 -17
  138. package/src/routes/__tests__/xyz.test.ts +4 -2
  139. package/src/routes/attribution.ts +23 -8
  140. package/src/routes/config.ts +83 -0
  141. package/src/routes/fonts.ts +4 -64
  142. package/src/routes/health.ts +4 -2
  143. package/src/routes/imagery.ts +3 -2
  144. package/src/routes/sprites.ts +4 -27
  145. package/src/routes/tile.json.ts +10 -4
  146. package/src/routes/tile.style.json.ts +58 -12
  147. package/src/routes/tile.wmts.ts +9 -4
  148. package/src/routes/tile.xyz.raster.ts +4 -2
  149. package/src/routes/tile.xyz.ts +5 -2
  150. package/src/util/__test__/config.loader.test.ts +116 -0
  151. package/src/util/assets.provider.ts +66 -0
  152. package/src/util/config.cache.ts +44 -0
  153. package/src/util/config.loader.ts +50 -0
  154. package/src/util/response.ts +3 -1
  155. package/src/wmts.capability.ts +9 -15
  156. package/tsconfig.tsbuildinfo +1 -1
@@ -1,73 +1,10 @@
1
- import { Env } from '@basemaps/shared';
2
- import { fsa } from '@chunkd/fs';
3
- import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
4
1
  import path from 'path';
5
- import { isGzip, serveFromCotar } from '../util/cotar.serve.js';
6
- import { Etag } from '../util/etag.js';
7
- import { NotFound, NotModified } from '../util/response.js';
2
+ import { assetProvider } from '../util/assets.provider.js';
8
3
  export async function fontGet(req) {
9
- const assetLocation = Env.get(Env.AssetLocation);
10
- if (assetLocation == null)
11
- return NotFound();
12
4
  const targetFile = path.join('fonts', req.params.fontStack, req.params.range) + '.pbf';
13
- if (assetLocation.endsWith('.tar.co')) {
14
- return serveFromCotar(req, assetLocation, targetFile, 'application/x-protobuf');
15
- }
16
- try {
17
- const filePath = fsa.join(assetLocation, targetFile);
18
- const buf = await fsa.read(filePath);
19
- const cacheKey = Etag.key(buf);
20
- if (Etag.isNotModified(req, cacheKey))
21
- return NotModified();
22
- const response = LambdaHttpResponse.ok().buffer(buf, 'application/x-protobuf');
23
- response.header(HttpHeader.ETag, cacheKey);
24
- response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
25
- if (isGzip(buf))
26
- response.header(HttpHeader.ContentEncoding, 'gzip');
27
- return response;
28
- }
29
- catch (e) {
30
- if (e.code === 404)
31
- return NotFound();
32
- throw e;
33
- }
34
- }
35
- /** Get the unique name of folders is a path that contain .pbf files */
36
- export async function getFonts(fontPath) {
37
- const fonts = new Set();
38
- // TODO use {recursive: false}
39
- for await (const font of fsa.list(fontPath)) {
40
- if (!font.endsWith('.pbf'))
41
- continue;
42
- const dirName = path.basename(path.dirname(font)); // TODO this only works for /a/b.pbf and not /a/b/c.pbf
43
- if (dirName.includes('/'))
44
- continue;
45
- fonts.add(dirName);
46
- }
47
- // Ensure the fonts are alphabetical
48
- return [...fonts].sort();
5
+ return assetProvider.serve(req, targetFile, 'application/x-protobuf');
49
6
  }
50
7
  export async function fontList(req) {
51
- const assetLocation = Env.get(Env.AssetLocation);
52
- if (assetLocation == null)
53
- return NotFound();
54
- if (assetLocation.endsWith('.tar.co'))
55
- return serveFromCotar(req, assetLocation, 'fonts.json', 'application/json');
56
- try {
57
- const filePath = fsa.join(assetLocation, '/fonts');
58
- const fonts = await getFonts(filePath);
59
- const cacheKey = Etag.key(fonts);
60
- if (Etag.isNotModified(req, cacheKey))
61
- return NotModified();
62
- const response = LambdaHttpResponse.ok().buffer(JSON.stringify(fonts), 'application/json');
63
- response.header(HttpHeader.ETag, cacheKey);
64
- response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
65
- return response;
66
- }
67
- catch (e) {
68
- if (e.code === 404)
69
- return NotFound();
70
- throw e;
71
- }
8
+ return assetProvider.serve(req, 'fonts.json', 'application/json');
72
9
  }
73
10
  //# sourceMappingURL=fonts.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"fonts.js","sourceRoot":"","sources":["../../src/routes/fonts.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fonts.js","sourceRoot":"","sources":["../../src/routes/fonts.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAM3D,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,GAA+B;IAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;IACvF,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,wBAAwB,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,GAAsB;IACnD,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC;AACpE,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":";AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAMnF,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,UAAU,QAAS,SAAQ,OAAO;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,SAAS,EAAE,QAAQ,EAG/B,CAAC;AAGF,wBAAsB,aAAa,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAanE;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAS/G;AAED;;;;;;GAMG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA6BnF"}
1
+ {"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":";AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAOnF,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,UAAU,QAAS,SAAQ,OAAO;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,SAAS,EAAE,QAAQ,EAG/B,CAAC;AAGF,wBAAsB,aAAa,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAanE;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAS/G;AAED;;;;;;GAMG;AACH,wBAAsB,SAAS,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA8BnF"}
@@ -1,4 +1,3 @@
1
- import { Config } from '@basemaps/config';
2
1
  import { GoogleTms, ImageFormat, Nztm2000QuadTms } from '@basemaps/geo';
3
2
  import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
4
3
  import * as fs from 'fs';
@@ -6,6 +5,7 @@ import * as path from 'path';
6
5
  import PixelMatch from 'pixelmatch';
7
6
  import Sharp from 'sharp';
8
7
  import url from 'url';
8
+ import { ConfigLoader } from '../util/config.loader.js';
9
9
  import { TileXyzRaster } from './tile.xyz.raster.js';
10
10
  export const TestTiles = [
11
11
  { tileSet: 'health', tileMatrix: GoogleTms, tileType: ImageFormat.Png, tile: { x: 252, y: 156, z: 8 } },
@@ -45,7 +45,8 @@ export async function updateExpectedTile(test, newTileData, difference) {
45
45
  * @throws LambdaHttpResponse for failure health test
46
46
  */
47
47
  export async function healthGet(req) {
48
- const tileSet = await Config.TileSet.get(Config.TileSet.id('health'));
48
+ const config = await ConfigLoader.load(req);
49
+ const tileSet = await config.TileSet.get(config.TileSet.id('health'));
49
50
  if (tileSet == null)
50
51
  throw new LambdaHttpResponse(500, 'TileSet: "health" not found');
51
52
  for (const test of TestTiles) {
@@ -1 +1 @@
1
- {"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"imagery.d.ts","sourceRoot":"","sources":["../../src/routes/imagery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AASnF,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAKhD;AAED,UAAU,UAAU;IAClB,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CACjD;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,iBAAiB,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0BhG"}
1
+ {"version":3,"file":"imagery.d.ts","sourceRoot":"","sources":["../../src/routes/imagery.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAUnF,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAKhD;AAED,UAAU,UAAU;IAClB,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CACjD;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAAC,GAAG,EAAE,iBAAiB,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BhG"}
@@ -1,8 +1,8 @@
1
- import { Config } from '@basemaps/config';
2
1
  import { fsa } from '@basemaps/shared';
3
2
  import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
4
3
  import { promisify } from 'util';
5
4
  import { gzip } from 'zlib';
5
+ import { ConfigLoader } from '../util/config.loader.js';
6
6
  import { isGzip } from '../util/cotar.serve.js';
7
7
  import { Etag } from '../util/etag.js';
8
8
  import { NotFound, NotModified } from '../util/response.js';
@@ -30,7 +30,8 @@ export async function imageryGet(req) {
30
30
  const requestedFile = req.params.fileName;
31
31
  if (!isAllowedFile(requestedFile))
32
32
  return NotFound();
33
- const imagery = await Config.Imagery.get(Config.Imagery.id(req.params.imageryId));
33
+ const config = await ConfigLoader.load(req);
34
+ const imagery = await config.Imagery.get(config.Imagery.id(req.params.imageryId));
34
35
  if (imagery == null)
35
36
  return NotFound();
36
37
  const targetPath = fsa.join(imagery.uri, requestedFile);
@@ -1 +1 @@
1
- {"version":3,"file":"imagery.js","sourceRoot":"","sources":["../../src/routes/imagery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAE9B,MAAM,UAAU,aAAa,CAAC,CAAS;IACrC,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC;IAC5B,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IACrC,OAAO,KAAK,CAAC;AACf,CAAC;AAMD;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAkC;IACjE,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC1C,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAAE,OAAO,QAAQ,EAAE,CAAC;IAErD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAClF,IAAI,OAAO,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAEvC,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAExD,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvC,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,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACnD,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC3C,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACpD,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,sDAAsD,CAAC,CAAC;QACjG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAC1E,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;QACjC,OAAO,QAAQ,CAAC;KACjB;IAAC,OAAO,CAAC,EAAE;QACV,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,EAAE,wBAAwB,CAAC,CAAC;QACvD,OAAO,QAAQ,EAAE,CAAC;KACnB;AACH,CAAC"}
1
+ {"version":3,"file":"imagery.js","sourceRoot":"","sources":["../../src/routes/imagery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAE9B,MAAM,UAAU,aAAa,CAAC,CAAS;IACrC,IAAI,CAAC,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC;IAC5B,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IACrC,OAAO,KAAK,CAAC;AACf,CAAC;AAMD;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,GAAkC;IACjE,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC1C,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;QAAE,OAAO,QAAQ,EAAE,CAAC;IAErD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAClF,IAAI,OAAO,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAEvC,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAExD,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvC,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,IAAI,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACnD,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC3C,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACpD,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,EAAE,sDAAsD,CAAC,CAAC;QACjG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,GAAG,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAC1E,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;QACjC,OAAO,QAAQ,CAAC;KACjB;IAAC,OAAO,CAAC,EAAE;QACV,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,EAAE,wBAAwB,CAAC,CAAC;QACvD,OAAO,QAAQ,EAAE,CAAC;KACnB;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"sprites.d.ts","sourceRoot":"","sources":["../../src/routes/sprites.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKnF,UAAU,SAAS;IACjB,MAAM,EAAE;QACN,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAMD,wBAAsB,SAAS,CAAC,GAAG,EAAE,iBAAiB,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA4B9F"}
1
+ {"version":3,"file":"sprites.d.ts","sourceRoot":"","sources":["../../src/routes/sprites.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAIvE,UAAU,SAAS;IACjB,MAAM,EAAE;QACN,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAMD,wBAAsB,SAAS,CAAC,GAAG,EAAE,iBAAiB,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAO9F"}
@@ -1,42 +1,16 @@
1
- import { Env } from '@basemaps/shared';
2
1
  import { fsa } from '@chunkd/fs';
3
2
  import path from 'path';
4
- import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
5
- import { NotFound, NotModified } from '../util/response.js';
6
- import { isGzip, serveFromCotar } from '../util/cotar.serve.js';
7
- import { Etag } from '../util/etag.js';
3
+ import { NotFound } from '../util/response.js';
4
+ import { assetProvider } from '../util/assets.provider.js';
8
5
  const Extensions = new Map();
9
6
  Extensions.set('.png', 'image/png');
10
7
  Extensions.set('.json', 'application/json');
11
8
  export async function spriteGet(req) {
12
- const assetLocation = Env.get(Env.AssetLocation);
13
- if (assetLocation == null)
14
- return NotFound();
15
9
  const extension = path.extname(req.params.spriteName);
16
10
  const mimeType = Extensions.get(extension);
17
11
  if (mimeType == null)
18
12
  return NotFound();
19
13
  const targetFile = fsa.join('sprites', req.params.spriteName);
20
- if (assetLocation.endsWith('.tar.co'))
21
- return serveFromCotar(req, assetLocation, targetFile, mimeType);
22
- try {
23
- const filePath = fsa.join(assetLocation, targetFile);
24
- req.set('target', filePath);
25
- const buf = await fsa.read(filePath);
26
- const cacheKey = Etag.key(buf);
27
- if (Etag.isNotModified(req, cacheKey))
28
- return NotModified();
29
- const response = LambdaHttpResponse.ok().buffer(buf, mimeType);
30
- response.header(HttpHeader.ETag, cacheKey);
31
- response.header(HttpHeader.CacheControl, 'public, max-age=604800, stale-while-revalidate=86400');
32
- if (isGzip(buf))
33
- response.header(HttpHeader.ContentEncoding, 'gzip');
34
- return response;
35
- }
36
- catch (e) {
37
- if (e.code === 404)
38
- return NotFound();
39
- throw e;
40
- }
14
+ return assetProvider.serve(req, targetFile, mimeType);
41
15
  }
42
16
  //# sourceMappingURL=sprites.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"sprites.js","sourceRoot":"","sources":["../../src/routes/sprites.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,UAAU,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAQvC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;AAC7B,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AACpC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAiC;IAC/D,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACjD,IAAI,aAAa,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAE7C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3C,IAAI,QAAQ,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAExC,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9D,IAAI,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,cAAc,CAAC,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAEvG,IAAI;QACF,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QACrD,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAE5B,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrC,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,QAAQ,CAAC,CAAC;QAC/D,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;KACjB;IAAC,OAAO,CAAM,EAAE;QACf,IAAI,CAAC,CAAC,IAAI,KAAK,GAAG;YAAE,OAAO,QAAQ,EAAE,CAAC;QACtC,MAAM,CAAC,CAAC;KACT;AACH,CAAC"}
1
+ {"version":3,"file":"sprites.js","sourceRoot":"","sources":["../../src/routes/sprites.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAQ3D,MAAM,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;AAC7B,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AACpC,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;AAE5C,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAiC;IAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3C,IAAI,QAAQ,IAAI,IAAI;QAAE,OAAO,QAAQ,EAAE,CAAC;IAExC,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9D,OAAO,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC"}
@@ -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;AAInF,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,CAkClG"}
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;AAKnF,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"}
@@ -1,6 +1,7 @@
1
1
  import { GoogleTms, TileMatrixSet } from '@basemaps/geo';
2
- import { Config, Env } from '@basemaps/shared';
2
+ import { Env, toQueryString } from '@basemaps/shared';
3
3
  import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
4
+ import { ConfigLoader } from '../util/config.loader.js';
4
5
  import { NotFound } from '../util/response.js';
5
6
  import { Validate } from '../util/validate.js';
6
7
  export async function tileJsonGet(req) {
@@ -9,15 +10,17 @@ export async function tileJsonGet(req) {
9
10
  if (tileMatrix == null)
10
11
  return NotFound();
11
12
  const apiKey = Validate.apiKey(req);
13
+ const config = await ConfigLoader.load(req);
12
14
  req.timer.start('tileset:load');
13
- const tileSet = await Config.TileSet.get(Config.TileSet.id(req.params.tileSet));
15
+ const tileSet = await config.TileSet.get(config.TileSet.id(req.params.tileSet));
14
16
  req.timer.end('tileset:load');
15
17
  if (tileSet == null)
16
18
  return NotFound();
17
19
  const format = (_a = Validate.getRequestedFormats(req)) !== null && _a !== void 0 ? _a : [tileSet.format];
18
20
  const host = (_b = Env.get(Env.PublicUrlBase)) !== null && _b !== void 0 ? _b : '';
19
- const tileUrl = [host, 'v1', 'tiles', tileSet.name, tileMatrix.identifier, '{z}', '{x}', '{y}'].join('/') +
20
- `.${format[0]}?api=${apiKey}`;
21
+ const configLocation = ConfigLoader.extract(req);
22
+ const query = toQueryString({ api: apiKey, config: configLocation });
23
+ const tileUrl = [host, 'v1', 'tiles', tileSet.name, tileMatrix.identifier, '{z}', '{x}', '{y}'].join('/') + `.${format[0]}${query}`;
21
24
  const tileJson = { tiles: [tileUrl], tilejson: '3.0.0' };
22
25
  const maxZoom = TileMatrixSet.convertZoomLevel((_c = tileSet.maxZoom) !== null && _c !== void 0 ? _c : 30, GoogleTms, tileMatrix, true);
23
26
  const minZoom = TileMatrixSet.convertZoomLevel((_d = tileSet.minZoom) !== null && _d !== void 0 ? _d : 0, 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,MAAM,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAqB,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnF,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,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,OAAO,GACX,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QACzF,IAAI,MAAM,CAAC,CAAC,CAAC,QAAQ,MAAM,EAAE,CAAC;IAEhC,MAAM,QAAQ,GAAa,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IACnE,MAAM,OAAO,GAAG,aAAa,CAAC,gBAAgB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACnG,MAAM,OAAO,GAAG,aAAa,CAAC,gBAAgB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAElG,IAAI,OAAO,CAAC,OAAO;QAAE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;IAChD,IAAI,OAAO,CAAC,OAAO;QAAE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;IAEhD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE/B,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,MAAM,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAC1C,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAClC,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1
+ {"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;IAErE,MAAM,OAAO,GACX,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC;IAEtH,MAAM,QAAQ,GAAa,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IACnE,MAAM,OAAO,GAAG,aAAa,CAAC,gBAAgB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACnG,MAAM,OAAO,GAAG,aAAa,CAAC,gBAAgB,CAAC,MAAA,OAAO,CAAC,OAAO,mCAAI,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IAElG,IAAI,OAAO,CAAC,OAAO;QAAE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;IAChD,IAAI,OAAO,CAAC,OAAO;QAAE,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;IAEhD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE/B,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,MAAM,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAC1C,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAClC,OAAO,QAAQ,CAAC;AAClB,CAAC"}
@@ -1,4 +1,4 @@
1
- import { StyleJson } from '@basemaps/config';
1
+ import { ConfigTileSetRaster, StyleJson } from '@basemaps/config';
2
2
  import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
3
3
  /**
4
4
  * Convert relative URLS into a full hostname url
@@ -6,18 +6,19 @@ import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
6
6
  * @param apiKey ApiKey to append with ?api= if required
7
7
  * @returns Updated Url or empty string if url is empty
8
8
  */
9
- export declare function convertRelativeUrl(url?: string, apiKey?: string): string;
9
+ export declare function convertRelativeUrl(url?: string, apiKey?: string, config?: string | null): string;
10
10
  /**
11
11
  * Create a new style json that has absolute urls to the current host and API Keys where required
12
12
  * @param style style to update
13
13
  * @param apiKey api key to inject
14
14
  * @returns new stylejson
15
15
  */
16
- export declare function convertStyleJson(style: StyleJson, apiKey: string): StyleJson;
16
+ export declare function convertStyleJson(style: StyleJson, apiKey: string, config: string | null): StyleJson;
17
17
  export interface StyleGet {
18
18
  Params: {
19
19
  styleName: string;
20
20
  };
21
21
  }
22
+ export declare function tileSetToStyle(req: LambdaHttpRequest<StyleGet>, tileSet: ConfigTileSetRaster, apiKey: string): Promise<LambdaHttpResponse>;
22
23
  export declare function styleJsonGet(req: LambdaHttpRequest<StyleGet>): Promise<LambdaHttpResponse>;
23
24
  //# sourceMappingURL=tile.style.json.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"tile.style.json.d.ts","sourceRoot":"","sources":["../../src/routes/tile.style.json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGtD,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAMnF;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAOxE;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,CAuB5E;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE;QACN,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,iBAAiB,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsBhG"}
1
+ {"version":3,"file":"tile.style.json.d.ts","sourceRoot":"","sources":["../../src/routes/tile.style.json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAW,SAAS,EAAe,MAAM,kBAAkB,CAAC;AAGxF,OAAO,EAAc,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAQnF;;;;;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,GAAG,SAAS,CAuBnG;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,CA6BhG"}
@@ -1,17 +1,20 @@
1
- import { Config, Env } from '@basemaps/shared';
1
+ import { TileSetType } from '@basemaps/config';
2
+ import { Env, toQueryString } from '@basemaps/shared';
2
3
  import { fsa } from '@chunkd/fs';
3
4
  import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
4
5
  import { URL } from 'url';
5
6
  import { NotFound, NotModified } from '../util/response.js';
6
7
  import { Validate } from '../util/validate.js';
7
8
  import { Etag } from '../util/etag.js';
9
+ import { ConfigLoader } from '../util/config.loader.js';
10
+ import { GoogleTms, ImageFormat, TileMatrixSets } from '@basemaps/geo';
8
11
  /**
9
12
  * Convert relative URLS into a full hostname url
10
13
  * @param url possible url to update
11
14
  * @param apiKey ApiKey to append with ?api= if required
12
15
  * @returns Updated Url or empty string if url is empty
13
16
  */
14
- export function convertRelativeUrl(url, apiKey) {
17
+ export function convertRelativeUrl(url, apiKey, config) {
15
18
  var _a;
16
19
  if (url == null)
17
20
  return '';
@@ -21,6 +24,8 @@ export function convertRelativeUrl(url, apiKey) {
21
24
  const fullUrl = new URL(fsa.join(host, url));
22
25
  if (apiKey)
23
26
  fullUrl.searchParams.set('api', apiKey);
27
+ if (config)
28
+ fullUrl.searchParams.set('config', config);
24
29
  return fullUrl.toString().replace(/%7B/g, '{').replace(/%7D/g, '}');
25
30
  }
26
31
  /**
@@ -29,16 +34,16 @@ export function convertRelativeUrl(url, apiKey) {
29
34
  * @param apiKey api key to inject
30
35
  * @returns new stylejson
31
36
  */
32
- export function convertStyleJson(style, apiKey) {
37
+ export function convertStyleJson(style, apiKey, config) {
33
38
  var _a;
34
39
  const sources = JSON.parse(JSON.stringify(style.sources));
35
40
  for (const [key, value] of Object.entries(sources)) {
36
41
  if (value.type === 'vector') {
37
- value.url = convertRelativeUrl(value.url, apiKey);
42
+ value.url = convertRelativeUrl(value.url, apiKey, config);
38
43
  }
39
44
  else if (value.type === 'raster' && Array.isArray(value.tiles)) {
40
45
  for (let i = 0; i < value.tiles.length; i++) {
41
- value.tiles[i] = convertRelativeUrl(value.tiles[i], apiKey);
46
+ value.tiles[i] = convertRelativeUrl(value.tiles[i], apiKey, config);
42
47
  }
43
48
  }
44
49
  sources[key] = value;
@@ -50,20 +55,56 @@ export function convertStyleJson(style, apiKey) {
50
55
  sources,
51
56
  layers: style.layers,
52
57
  metadata: (_a = style.metadata) !== null && _a !== void 0 ? _a : {},
53
- glyphs: convertRelativeUrl(style.glyphs),
54
- sprite: convertRelativeUrl(style.sprite),
58
+ glyphs: convertRelativeUrl(style.glyphs, undefined, config),
59
+ sprite: convertRelativeUrl(style.sprite, undefined, config),
55
60
  };
56
61
  }
62
+ export async function tileSetToStyle(req, tileSet, apiKey) {
63
+ var _a, _b, _c;
64
+ const tileMatrix = TileMatrixSets.find((_a = req.query.get('tileMatrix')) !== null && _a !== void 0 ? _a : GoogleTms.identifier);
65
+ if (tileMatrix == null)
66
+ return new LambdaHttpResponse(400, 'Invalid tile matrix');
67
+ const [tileFormat] = (_b = Validate.getRequestedFormats(req)) !== null && _b !== void 0 ? _b : [ImageFormat.Webp];
68
+ if (tileFormat == null)
69
+ return new LambdaHttpResponse(400, 'Invalid image format');
70
+ const configLocation = ConfigLoader.extract(req);
71
+ const query = toQueryString({ config: configLocation, api: apiKey });
72
+ 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
+ const styleId = `basemaps-${tileSet.name}`;
74
+ const style = {
75
+ version: 8,
76
+ sources: { [styleId]: { type: 'raster', tiles: [tileUrl], tileSize: 256 } },
77
+ layers: [{ id: styleId, type: 'raster', source: styleId }],
78
+ };
79
+ const data = Buffer.from(JSON.stringify(style));
80
+ const cacheKey = Etag.key(data);
81
+ if (Etag.isNotModified(req, cacheKey))
82
+ return NotModified();
83
+ const response = new LambdaHttpResponse(200, 'ok');
84
+ response.header(HttpHeader.ETag, cacheKey);
85
+ response.header(HttpHeader.CacheControl, 'no-store');
86
+ response.buffer(data, 'application/json');
87
+ req.set('bytes', data.byteLength);
88
+ return response;
89
+ }
57
90
  export async function styleJsonGet(req) {
58
91
  const apiKey = Validate.apiKey(req);
59
92
  const styleName = req.params.styleName;
60
93
  // Get style Config from db
61
- const dbId = Config.Style.id(styleName);
62
- const styleConfig = await Config.Style.get(dbId);
63
- if (styleConfig == null)
64
- return NotFound();
94
+ const config = await ConfigLoader.load(req);
95
+ const dbId = config.Style.id(styleName);
96
+ const styleConfig = await config.Style.get(dbId);
97
+ if (styleConfig == null) {
98
+ // Were we given a tileset name instead, generated
99
+ const tileSet = await config.TileSet.get(config.TileSet.id(styleName));
100
+ if (tileSet == null)
101
+ return NotFound();
102
+ if (tileSet.type !== TileSetType.Raster)
103
+ return NotFound();
104
+ return tileSetToStyle(req, tileSet, apiKey);
105
+ }
65
106
  // Prepare sources and add linz source
66
- const style = convertStyleJson(styleConfig.style, apiKey);
107
+ const style = convertStyleJson(styleConfig.style, apiKey, ConfigLoader.extract(req));
67
108
  const data = Buffer.from(JSON.stringify(style));
68
109
  const cacheKey = Etag.key(data);
69
110
  if (Etag.isNotModified(req, cacheKey))
@@ -1 +1 @@
1
- {"version":3,"file":"tile.style.json.js","sourceRoot":"","sources":["../../src/routes/tile.style.json.ts"],"names":[],"mappings":"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"}
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;AAOnF,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,CA8ClH"}
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;AAQnF,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,CAkDlH"}
@@ -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