wip

linz · Jul 8, 2022 · bd2bd50 · bd2bd50
1 parent 700c729
commit bd2bd50
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 19 deletions.
diff --git a/packages/config/src/config/tile.set.ts b/packages/config/src/config/tile.set.ts
@@ -22,6 +22,7 @@ export type TileResizeKernel = 'nearest' | 'lanczos3' | 'lanczos2';
 export interface ConfigTileSetBase extends BaseConfig {
   title?: string;
   description?: string;
+  category?: string;
 
   /**
    * The rendering layer for imagery in this tileset

diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts
@@ -25,3 +25,4 @@ export { ConfigProviderMemory, ConfigBundled } from './memory/memory.config.js';
 export { TileSetNameComponents, TileSetNameParser } from './tile.set.name.js';
 export { parseHex, parseRgba } from './color.js';
 export { ConfigJson } from './json/json.config.js';
+export { standardizeLayerName } from './json/name.convertor.js';
diff --git a/packages/config/src/memory/memory.config.ts b/packages/config/src/memory/memory.config.ts
@@ -99,6 +99,8 @@ export class ConfigProviderMemory extends BasemapsConfigProvider {
       existing = {
         type: TileSetType.Raster,
         id: targetId,
+        title: i.title,
+        category: i.category,
         name: targetName,
         format: ImageFormat.Webp,
         layers: [{ name: targetName, minZoom: 0, maxZoom: 32 }],

diff --git a/packages/lambda-tiler/src/tile.set.cache.ts b/packages/lambda-tiler/src/tile.set.cache.ts
@@ -1,4 +1,5 @@
 import { TileSetNameParser, TileSetType } from '@basemaps/config';
+import { standardizeLayerName } from '@basemaps/config';
 import { GoogleTms, Nztm2000QuadTms, TileMatrixSet } from '@basemaps/geo';
 import { Config } from '@basemaps/shared';
 import { TileSet } from './tile.set.js';
@@ -81,30 +82,37 @@ export class TileSetCache {
   }
 
   async getAll(name: string, tileMatrix?: TileMatrixSet | null): Promise<TileSet[]> {
-    const nameComp = TileSetNameParser.parse(name);
     const tileMatrices = tileMatrix == null ? [GoogleTms, Nztm2000QuadTms] : [tileMatrix];
 
     const promises: Promise<TileSet | null>[] = [];
     for (const tileMatrix of tileMatrices) promises.push(this.get(name, tileMatrix));
     const tileMatrixSets = await Promise.all(promises);
 
-    const tileSets: TileSetRaster[] = [];
+    const tileSets: Promise<TileSet | null>[] = [];
     for (const parent of tileMatrixSets) {
       if (parent == null) continue;
       if (parent.type === TileSetType.Vector) continue;
 
-      tileSets.push(parent);
-      if (nameComp.layer != null) {
-        parent.components.name = nameComp.name;
-      } else if (parent.imagery != null && parent.imagery.size > 1) {
-        for (const imageId of parent.imagery.keys()) {
-          const childImg = parent.child(imageId);
-          if (childImg == null) continue;
-          tileSets.push(childImg);
-        }
+      for (const layer of parent.imagery.values()) {
+        if (layer.projection !== parent.tileMatrix.projection.code) continue;
+        const tileSetId = standardizeLayerName(layer.name);
+        // FIXME needs a getAll or this will request one by one
+        tileSets.push(this.get(tileSetId, parent.tileMatrix));
       }
+      // tileSets.push(parent);
+      // if (nameComp.layer != null) {
+      //   parent.components.name = nameComp.name;
+      // } else if (parent.imagery != null && parent.imagery.size > 1) {
+      //   for (const imageId of parent.imagery.keys()) {
+      //     const childImg = parent.child(imageId);
+      //     if (childImg == null) continue;
+      //     tileSets.push(childImg);
+      //   }
+      // }
     }
-    return tileSets.sort((a, b) => a.title.localeCompare(b.title));
+    const allTileSets = await Promise.all(tileSets);
+    const onlyRasters = allTileSets.filter((f) => f != null && f.type === 'raster') as TileSetRaster[];
+    return onlyRasters.sort((a: TileSetRaster, b: TileSetRaster) => a.title.localeCompare(b.title));
   }
 }
 

diff --git a/packages/lambda-tiler/src/tile.set.raster.ts b/packages/lambda-tiler/src/tile.set.raster.ts
@@ -51,8 +51,6 @@ export class TileSetRaster {
   components: TileSetNameComponents;
   tileSet: ConfigTileSetRaster;
 
-  keywords: string[] = [];
-
   constructor(name: string, tileMatrix: TileMatrixSet) {
     this.components = TileSetNameParser.parse(name);
     this.tileMatrix = tileMatrix;
@@ -218,7 +216,7 @@ export class TileSetRaster {
     child.tileSet.title = image.title ?? `${title} ${titleizeImageryName(image.name)}`;
     child.extentOverride = Bounds.fromJson(image.bounds);
 
-    if (image.category) child.keywords.push(image.category);
+    if (image.category) child.tileSet.category = image.category;
 
     const layer: ConfigLayer = { name: image.name, minZoom: 0, maxZoom: 100 };
     layer[this.tileMatrix.projection.code] = image.id;

diff --git a/packages/lambda-tiler/src/wmts.capability.ts b/packages/lambda-tiler/src/wmts.capability.ts
@@ -161,10 +161,8 @@ export class WmtsCapabilities {
   }
 
   buildKeywords(layer: TileSetRaster): VNodeElement {
-    return V(
-      'ows:Keywords',
-      layer.keywords.map((keyword) => V('ows:Keyword', keyword)),
-    );
+    if (layer.tileSet.category == null) return V('ows:Keywords');
+    return V('ows:Keywords', V('ows:Keyword', layer.tileSet.category));
   }
 
   buildStyle(): VNodeElement {

diff --git a/packages/server/src/server.ts b/packages/server/src/server.ts
@@ -52,6 +52,7 @@ export async function createServer(opts: ServerOptions, logger: LogType): Promis
     logger.info({ path: opts.config, mode: 'config:bundle' }, 'Starting Server');
     const configJson = await fsa.read(opts.config);
     const mem = ConfigProviderMemory.fromJson(JSON.parse(configJson.toString()));
+    mem.createVirtualTileSets();
     Config.setConfigProvider(mem);
   } else {
     const mem = await ConfigJson.fromPath(opts.config, logger);