@basemaps/server 8.5.0 → 8.6.0

package/bin/basemaps-server.cjs

@@ -125111,9 +125111,9 @@ var ulid2 = __toESM(require_index_umd(), 1);
 var CliInfo = {
   // Detect unlinked packages looks for this string since its a package name, slightly work around it
   package: "@basemaps/cli",
-  version: "v8.4.0-5-g4f6f3929",
-  hash: "4f6f3929b9117c3e112f7d156ab185cb98821796",
-  buildId: "16305730095-1"
+  version: "v8.5.0-5-gbd34894f",
+  hash: "bd34894f26d1c7827503e0cb9d48d0773ecd6775",
+  buildId: "16790799626-1"
 };
 var CliDate = (/* @__PURE__ */ new Date()).toISOString();
 var CliId = ulid2.ulid();
@@ -129361,9 +129361,14 @@ var ConfigBase = z.object({
   /**
    * Was this configuration object generated from another object
    *
-   * @default undefined / false
+   * tileset-all: All tileset contains all raster layers
+   * tileset-alias: Alias that points to another tileset
+   * imagery-name: Tileset that is identified by its imagery name
+   * imagery-id: Tileset that is identified by its imagery id
+   *
+   * @default undefined
    */
-  virtual: z.boolean().optional()
+  virtual: z.enum(["tileset-all", "tileset-alias", "imagery-name", "imagery-id"]).optional()
 });
 
 // ../config/build/config/tile.set.js
@@ -129686,14 +129691,25 @@ var ConfigProviderMemory = class _ConfigProviderMemory extends BasemapsConfigPro
     return cfg;
   }
   /** Find all imagery inside this configuration and create a virtual tile set for it */
-  createVirtualTileSets() {
+  createVirtualTileSets(createById = true) {
     const allLayers = [];
     for (const obj of this.objects.values()) {
       if (isConfigImagery(obj)) {
-        this.put(_ConfigProviderMemory.imageryToTileSet(obj));
+        if (createById)
+          this.put(_ConfigProviderMemory.imageryToTileSet(obj));
         const tileSet = this.imageryToTileSetByName(obj);
         allLayers.push(tileSet.layers[0]);
       }
+      if (this.TileSet.is(obj)) {
+        if (obj.aliases) {
+          for (const alias of obj.aliases) {
+            const aliasTs = structuredClone(obj);
+            aliasTs.id = ConfigId.prefix(ConfigPrefix.TileSet, alias);
+            aliasTs.virtual = "tileset-alias";
+            this.put(aliasTs);
+          }
+        }
+      }
     }
     if (allLayers.length)
       this.createVirtualAllTileSet(allLayers);
@@ -129710,7 +129726,7 @@ var ConfigProviderMemory = class _ConfigProviderMemory extends BasemapsConfigPro
     }
     const allTileset = {
       type: TileSetType.Raster,
-      virtual: true,
+      virtual: "tileset-all",
       id: "ts_all",
       name: "all",
       title: "All Imagery",
@@ -129727,7 +129743,7 @@ var ConfigProviderMemory = class _ConfigProviderMemory extends BasemapsConfigPro
     if (existing == null) {
       existing = {
         type: TileSetType.Raster,
-        virtual: true,
+        virtual: "imagery-name",
         id: targetId,
         title: i.title,
         category: i.category,
@@ -129758,7 +129774,7 @@ var ConfigProviderMemory = class _ConfigProviderMemory extends BasemapsConfigPro
   static imageryToTileSet(i) {
     const ts = {
       type: TileSetType.Raster,
-      virtual: true,
+      virtual: "imagery-id",
       id: ConfigId.prefix(ConfigPrefix.TileSet, ConfigId.unprefix(ConfigPrefix.Imagery, i.id)),
       name: i.name,
       title: i.title,
@@ -136579,9 +136595,9 @@ var Router = class {
 };
 
 // ../../node_modules/@linzjs/lambda/build/src/function.js
-var version2 = "v8.4.0-5-g4f6f3929";
-var hash = "4f6f3929b9117c3e112f7d156ab185cb98821796";
-var buildId = "16305730095-1";
+var version2 = "v8.5.0-5-gbd34894f";
+var hash = "bd34894f26d1c7827503e0cb9d48d0773ecd6775";
+var buildId = "16790799626-1";
 var versionInfo = { version: version2, hash, buildId };
 async function runFunction(req, fn) {
   if (!req.timer.timers.has("lambda"))
@@ -141058,18 +141074,18 @@ async function versionGet(req) {
      * last git version tag
      * @example "v6.42.1"
      */
-    version: "v8.4.0-5-g4f6f3929",
+    version: "v8.5.0-5-gbd34894f",
     /**
      * Full git commit hash
      * @example "e4231b1ee62c276c8657c56677ced02681dfe5d6"
      */
-    hash: "4f6f3929b9117c3e112f7d156ab185cb98821796",
+    hash: "bd34894f26d1c7827503e0cb9d48d0773ecd6775",
     /**
      *
      * The exact build that this release was run from
      * @example "1658821493-3"
      */
-    buildId: "16305730095-1",
+    buildId: "16790799626-1",
     /**
      * Configuration id that was used to power this config
      * @example { "id": "cb_01JTQ7ZK49F8EY4N5DRJ3XFT73", hash: "HcByZ8WS2zpaTxFJp6wSKg2eUpwahLqAGEQdcDxKxqp6" }
@@ -141245,7 +141261,8 @@ var zTileSetConfig = z.object({
   minZoom: zZoom.optional(),
   maxZoom: zZoom.optional(),
   format: z.string().optional(),
-  outputs: z.array(ConfigTileSetOutputParser).optional()
+  outputs: z.array(ConfigTileSetOutputParser).optional(),
+  aliases: z.array(z.string()).optional()
 });
 
 // ../config-loader/build/json/tiff.config.js
@@ -141794,6 +141811,7 @@ var ConfigJson = class _ConfigJson {
     } else {
       tileSet.format = ts.type === TileSetType.Vector ? "pbf" : "webp";
     }
+    tileSet.aliases = ts.aliases;
     return tileSet;
   }
   loadImagery(url, name, title) {
@@ -141804,11 +141822,15 @@ var ConfigJson = class _ConfigJson {
     }
     return existing;
   }
+  /** Exposed for testing */
+  initImageryFromTiffUrl(url) {
+    return initImageryFromTiffUrl(url, this.Q, this.imageryConfigCache, this.logger);
+  }
   async _loadImagery(url, name, title) {
     const imageId = guessIdFromUri(url.href) ?? sha256base58(url.href);
     const id = ConfigId.prefix(ConfigPrefix.Imagery, imageId);
     this.logger.trace({ url: url.href, imageId: id }, "Imagery:Fetch");
-    const img = await initImageryFromTiffUrl(url, this.Q, this.imageryConfigCache, this.logger);
+    const img = await this.initImageryFromTiffUrl(url);
     img.id = id;
     img.name = name;
     img.title = title;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/server",
-  "version": "8.5.0",
+  "version": "8.6.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -52,17 +52,17 @@
     "sharp": "^0.33.0"
   },
   "devDependencies": {
-    "@basemaps/config": "^8.3.0",
-    "@basemaps/config-loader": "^8.5.0",
+    "@basemaps/config": "^8.6.0",
+    "@basemaps/config-loader": "^8.6.0",
     "@basemaps/geo": "^8.3.0",
-    "@basemaps/lambda-tiler": "^8.5.0",
+    "@basemaps/lambda-tiler": "^8.6.0",
     "@basemaps/landing": "^6.39.0",
-    "@basemaps/shared": "^8.5.0",
+    "@basemaps/shared": "^8.6.0",
     "@fastify/formbody": "^7.0.1",
     "@fastify/static": "^6.5.0",
     "cmd-ts": "^0.12.1",
     "fastify": "^4.9.2",
     "pretty-json-log": "^1.0.0"
   },
-  "gitHead": "4f6f3929b9117c3e112f7d156ab185cb98821796"
+  "gitHead": "bd34894f26d1c7827503e0cb9d48d0773ecd6775"
 }