@basemaps/server 7.14.0 → 7.16.0

package/bin/basemaps-server.cjs

@@ -130900,9 +130900,16 @@ credentials.onFileSystemFound = (acc, fs4, path3) => {
   applyS3MiddleWare(fs4);
   fsa.register(acc.prefix, fs4);
 };
+function splitConfig(x) {
+  if (x.startsWith("["))
+    return JSON.parse(x);
+  return x.split(",");
+}
 var credentialPath = Env.get(Env.AwsRoleConfigPath);
-if (credentialPath)
-  credentials.registerConfig(fsa.toUrl(credentialPath), s3Fs);
+if (credentialPath) {
+  for (const loc of splitConfig(credentialPath))
+    credentials.registerConfig(fsa.toUrl(loc), s3Fs);
+}
 s3Fs.credentials = credentials;
 fsa.register("https://", new FsHttp());
 fsa.register("s3://", s3Fs);
@@ -131940,16 +131947,11 @@ var CHAR_2 = "2".charCodeAt(0);
 var CHAR_3 = "3".charCodeAt(0);
 
 // ../geo/build/xy.order.js
-var XyOrder;
-(function(XyOrder2) {
-  XyOrder2[XyOrder2["Xy"] = 0] = "Xy";
-  XyOrder2[XyOrder2["Yx"] = 1] = "Yx";
-})(XyOrder || (XyOrder = {}));
 function getXyOrder(epsg) {
-  if (epsg === Epsg.Nztm2000) {
-    return XyOrder.Yx;
-  }
-  return XyOrder.Xy;
+  const code = typeof epsg === "number" ? epsg : epsg.code;
+  if (code === EpsgCode.Nztm2000 || code === EpsgCode.Citm2000)
+    return "yx";
+  return "xy";
 }
 
 // ../geo/build/tile.matrix.set.js
@@ -132029,7 +132031,7 @@ var TileMatrixSet = class {
     if (projection == null)
       throw new Error(`Unable to find supported projection ${def.supportedCRS}`);
     this.projection = projection;
-    if (getXyOrder(this.projection) === XyOrder.Yx) {
+    if (getXyOrder(this.projection) === "yx") {
       this.indexX = 1;
       this.indexY = 0;
     }
@@ -132229,6 +132231,204 @@ var TileMatrixSet = class {
   }
 };
 
+// ../geo/build/tms/citm2000.js
+var Citm2000Tmst = {
+  type: "TileMatrixSetType",
+  title: "Debug tile matrix for EPSG:3793",
+  abstract: "",
+  identifier: "CITM2000Quad",
+  supportedCRS: "https://www.opengis.net/def/crs/EPSG/0/3793",
+  boundingBox: {
+    type: "BoundingBoxType",
+    crs: "https://www.opengis.net/def/crs/EPSG/0/3793",
+    lowerCorner: [5051234111622438e-9, 3.4301543757978342e6],
+    upperCorner: [5207777145550478e-9, 3.5866974097258747e6]
+  },
+  tileMatrix: [
+    {
+      type: "TileMatrixType",
+      identifier: "0",
+      scaleDenominator: 218391509386217e-8,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 1,
+      matrixHeight: 1
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "1",
+      scaleDenominator: 109195754693108e-8,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 2,
+      matrixHeight: 2
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "2",
+      scaleDenominator: 545978.773465544,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 4,
+      matrixHeight: 4
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "3",
+      scaleDenominator: 272989.386732772,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 8,
+      matrixHeight: 8
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "4",
+      scaleDenominator: 136494.693366386,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 16,
+      matrixHeight: 16
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "5",
+      scaleDenominator: 68247.346683193,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 32,
+      matrixHeight: 32
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "6",
+      scaleDenominator: 34123.6733415964,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 64,
+      matrixHeight: 64
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "7",
+      scaleDenominator: 17061.8366707982,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 128,
+      matrixHeight: 128
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "8",
+      scaleDenominator: 8530.91833539913,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 256,
+      matrixHeight: 256
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "9",
+      scaleDenominator: 4265.45916769956,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 512,
+      matrixHeight: 512
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "10",
+      scaleDenominator: 2132.72958384978,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 1024,
+      matrixHeight: 1024
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "11",
+      scaleDenominator: 1066.36479192489,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 2048,
+      matrixHeight: 2048
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "12",
+      scaleDenominator: 533.182395962445,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 4096,
+      matrixHeight: 4096
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "13",
+      scaleDenominator: 266.591197981222,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 8192,
+      matrixHeight: 8192
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "14",
+      scaleDenominator: 133.295598990611,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 16384,
+      matrixHeight: 16384
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "15",
+      scaleDenominator: 66.6477994953056,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 32768,
+      matrixHeight: 32768
+    },
+    {
+      type: "TileMatrixType",
+      identifier: "16",
+      scaleDenominator: 33.3238997476528,
+      topLeftCorner: [5207777145550478e-9, 3.4301543757978342e6],
+      tileWidth: 256,
+      tileHeight: 256,
+      matrixWidth: 65536,
+      matrixHeight: 65536
+    }
+  ],
+  $generated: {
+    package: "@basemaps/cli",
+    version: "v7.14.0-4-g2766010d",
+    hash: "2766010d8d2bb8b673f6bcbef2fe2636f2e0f4ea",
+    createdAt: "2025-02-10T20:34:46.643Z"
+  },
+  $options: {
+    sourceTileMatrix: "WebMercatorQuad",
+    zoomOffset: 8
+  }
+};
+var Citm2000Tms = new TileMatrixSet(Citm2000Tmst);
+
 // ../geo/build/tms/google.js
 var GoogleTmst = {
   type: "TileMatrixSetType",
@@ -132505,11 +132705,12 @@ var Nztm2000QuadTms = new TileMatrixSet(Nztm20002.Nztm2000Quad);
 // ../geo/build/tms/index.js
 var TileMatrixSets = {
   /** All TileMatrixSets that are currently supported */
-  All: [GoogleTms, Nztm2000Tms, Nztm2000QuadTms],
+  All: [GoogleTms, Nztm2000Tms, Nztm2000QuadTms, Citm2000Tms],
   /** Default mapping of EPSG code to Tile matrix set */
   Defaults: /* @__PURE__ */ new Map([
     [Epsg.Google.code, GoogleTms],
-    [Epsg.Nztm2000.code, Nztm2000Tms]
+    [Epsg.Nztm2000.code, Nztm2000Tms],
+    [Epsg.Citm2000.code, Citm2000Tms]
   ]),
   /**
    * Get a tile matrix set by EPSG Code
@@ -135101,10 +135302,11 @@ var ulid3 = __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: "v7.13.0-9-g72f2a811",
-  hash: "72f2a811d4851c6f50758617c9e65179d2b27bc8",
-  buildId: "12978670711-1"
+  version: "v7.15.1-10-g25fa7659",
+  hash: "25fa7659b84a40205ceacda8b2ca5f48e1dc6f7b",
+  buildId: "14319632927-1"
 };
+var CliDate = (/* @__PURE__ */ new Date()).toISOString();
 var CliId = ulid3.ulid();
 
 // src/cli.ts
@@ -135811,9 +136013,9 @@ var Router = class {
 };
 
 // ../../node_modules/@linzjs/lambda/build/src/function.js
-var version2 = "v7.13.0-9-g72f2a811";
-var hash = "72f2a811d4851c6f50758617c9e65179d2b27bc8";
-var buildId = "12978670711-1";
+var version2 = "v7.15.1-10-g25fa7659";
+var hash = "25fa7659b84a40205ceacda8b2ca5f48e1dc6f7b";
+var buildId = "14319632927-1";
 var versionInfo = { version: version2, hash, buildId };
 async function runFunction(req, fn) {
   if (!req.timer.timers.has("lambda"))
@@ -136148,14 +136350,20 @@ var SafeBuckets = /* @__PURE__ */ new Set([
 var SafeProtocols = /* @__PURE__ */ new Set([new URL("s3://foo").protocol, new URL("memory://foo.json").protocol]);
 var ConfigLoader = class {
   /** Exposed for testing */
-  static async getDefaultConfig() {
+  static async getDefaultConfig(req) {
     const config = getDefaultConfig();
-    if (config.assets == null) {
-      const cb = await config.ConfigBundle.get(config.ConfigBundle.id("latest"));
-      if (cb)
-        config.assets = cb.assets;
-    }
-    return config;
+    const cb = await config.ConfigBundle.get("cb_latest");
+    if (cb == null)
+      return config;
+    req?.timer.start("config:load");
+    return CachedConfig.get(Fsa.toUrl(cb.path)).then((cfg) => {
+      req?.timer.end("config:load");
+      if (cfg == null)
+        throw new LambdaHttpResponse(500, "Unable to find latest configuration");
+      if (cfg.assets == null)
+        cfg.assets = cb.assets;
+      return cfg;
+    });
   }
   /** Lookup the config path from a request and return a standardized location */
   static extract(req) {
@@ -136470,6 +136678,8 @@ var Validate = {
    * Defaults to standard image format output if no outputs are defined on the tileset
    */
   pipeline(tileSet, tileType, pipeline2) {
+    if (tileSet.outputs?.length === 1 && pipeline2 == null)
+      pipeline2 = tileSet.outputs[0].name;
     if (pipeline2 != null && pipeline2 !== "rgba") {
       if (tileSet.outputs == null)
         throw new LambdaHttpResponse(404, "TileSet has no pipelines");
@@ -138221,7 +138431,7 @@ function cropResize(tiff, data, comp, mode) {
     const cropVal = comp.crop;
     if (cropVal == null)
       return data;
-    return applyCrop(tiff, data, cropVal);
+    return applyCrop(data, cropVal);
   }
   if (data.channels !== 1)
     throw new Error("Unable to crop-resize more than one channel got:" + data.channels);
@@ -138257,14 +138467,14 @@ function cropResize(tiff, data, comp, mode) {
       throw new Error("Unable to use resize kernel: " + mode);
   }
 }
-function applyCrop(_tiff, data, crop) {
-  const output = new Float32Array(crop.width * crop.height * data.channels);
+function applyCrop(data, crop) {
+  const output = getOutputBuffer(data, { width: crop.width, height: crop.height });
   for (let y = 0; y < crop.height; y++) {
     const source = ((y + crop.y) * data.width + crop.x) * data.channels;
     const length = crop.width * data.channels;
-    output.set(data.pixels.subarray(source, source + length), y * crop.width);
+    output.pixels.set(data.pixels.subarray(source, source + length), y * crop.width);
   }
-  return { pixels: output, width: crop.width, height: crop.height, channels: data.channels, depth: "float32" };
+  return output;
 }
 function resizeNearest(data, comp, source, target) {
   const maxWidth = Math.min(comp.source.width, data.width) - 1;
@@ -138362,9 +138572,21 @@ function resizeBilinear(data, comp, source, target, noData) {
   return ret;
 }
 
-// ../tiler-sharp/build/pipeline/pipeline.color.ramp.js
+// ../tiler-sharp/build/pipeline/colorize/color.ramp.js
 var ColorRamp = class {
   constructor(ramp) {
+    Object.defineProperty(this, "min", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, "max", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
     Object.defineProperty(this, "ramps", {
       enumerable: true,
       configurable: true,
@@ -138377,38 +138599,89 @@ var ColorRamp = class {
       const numbers = parts.map(Number);
       this.ramps.push({ v: numbers[0], color: numbers.slice(1) });
     }
+    this.min = this.ramps[0].v;
+    this.max = this.ramps[this.ramps.length - 1].v;
   }
-  get(num) {
-    const first = this.ramps[0];
-    if (num <= first.v)
-      return first.color;
+  set(val2, data, targetOffset) {
+    if (val2 <= this.min) {
+      const color = this.ramps[0].color;
+      data[targetOffset] = color[0];
+      data[targetOffset + 1] = color[1];
+      data[targetOffset + 2] = color[2];
+      data[targetOffset + 3] = color[3];
+      return;
+    } else if (val2 >= this.max) {
+      const color = this.ramps[this.ramps.length - 1].color;
+      data[targetOffset] = color[0];
+      data[targetOffset + 1] = color[1];
+      data[targetOffset + 2] = color[2];
+      data[targetOffset + 3] = color[3];
+      return;
+    }
     for (let i = 0; i < this.ramps.length - 1; i++) {
       const ramp = this.ramps[i];
-      if (num < ramp.v)
+      if (val2 < ramp.v)
         continue;
-      if (ramp.v === num)
-        return ramp.color;
+      if (ramp.v === val2) {
+        const color = ramp.color;
+        data[targetOffset] = color[0];
+        data[targetOffset + 1] = color[1];
+        data[targetOffset + 2] = color[2];
+        data[targetOffset + 3] = color[3];
+        return;
+      }
       const rampNext = this.ramps[i + 1];
-      if (num >= rampNext.v)
+      if (val2 >= rampNext.v)
         continue;
       const range = rampNext.v - ramp.v;
-      const offset = num - ramp.v;
+      const offset = val2 - ramp.v;
       const scale = offset / range;
       const r = Math.round((rampNext.color[0] - ramp.color[0]) * scale + ramp.color[0]);
       const g = Math.round((rampNext.color[1] - ramp.color[1]) * scale + ramp.color[1]);
       const b = Math.round((rampNext.color[2] - ramp.color[2]) * scale + ramp.color[2]);
       const a = Math.round((rampNext.color[3] - ramp.color[3]) * scale + ramp.color[3]);
-      return [r, g, b, a];
+      data[targetOffset] = r;
+      data[targetOffset + 1] = g;
+      data[targetOffset + 2] = b;
+      data[targetOffset + 3] = a;
+      return;
     }
-    return this.ramps[this.ramps.length - 1].color;
+    throw new Error("Ramp value assertion failure");
   }
 };
+
+// ../tiler-sharp/build/pipeline/colorize/grey.scale.js
+var GreyScale = class {
+  constructor(minVal, maxVal) {
+    Object.defineProperty(this, "min", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, "max", {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: void 0
+    });
+    this.min = minVal;
+    this.max = maxVal;
+  }
+  set(val2, data, targetOffset) {
+    const scaledValue = (val2 - this.min) * 255 / (this.max - this.min);
+    data[targetOffset] = scaledValue;
+    data[targetOffset + 1] = scaledValue;
+    data[targetOffset + 2] = scaledValue;
+    data[targetOffset + 3] = 255;
+  }
+};
+
+// ../tiler-sharp/build/pipeline/pipeline.color.ramp.js
 var Ramps = {
   float32: new ColorRamp(DefaultColorRamp),
-  uint8: new ColorRamp(`0 0 0 0 255
-255 255 255 255 255`),
-  uint32: new ColorRamp(`0 0 0 0 255
-${2 ** 32 - 1} 255 255 255 255`)
+  uint8: new GreyScale(0, 255),
+  uint32: new GreyScale(0, 2 ** 32 - 1)
 };
 var PipelineColorRamp = {
   type: "color-ramp",
@@ -138430,11 +138703,7 @@ var PipelineColorRamp = {
       if (noData != null && px === noData)
         continue;
       const target = i * 4;
-      const color = ramp.get(px);
-      raw[target + 0] = color[0];
-      raw[target + 1] = color[1];
-      raw[target + 2] = color[2];
-      raw[target + 3] = color[3];
+      ramp.set(px, raw, target);
     }
     return output;
   }
@@ -140157,17 +140426,17 @@ function versionGet() {
      * last git version tag
      * @example "v6.42.1"
      */
-    version: "v7.13.0-9-g72f2a811",
+    version: "v7.15.1-10-g25fa7659",
     /**
      * Full git commit hash
      * @example "e4231b1ee62c276c8657c56677ced02681dfe5d6"
      */
-    hash: "72f2a811d4851c6f50758617c9e65179d2b27bc8",
+    hash: "25fa7659b84a40205ceacda8b2ca5f48e1dc6f7b",
     /**
      * The exact build that this release was run from
      * @example "1658821493-3"
      */
-    buildId: "12978670711-1"
+    buildId: "14319632927-1"
   });
   return Promise.resolve(response);
 }
@@ -140538,7 +140807,8 @@ var IgnoredTitles = /* @__PURE__ */ new Set([
   "flat",
   // Projections
   "2193",
-  "3857"
+  "3857",
+  "3793"
 ]);
 function getImageryName(target) {
   const parts = target.pathname.split("/");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basemaps/server",
-  "version": "7.14.0",
+  "version": "7.16.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/linz/basemaps.git",
@@ -52,17 +52,17 @@
     "sharp": "^0.33.0"
   },
   "devDependencies": {
-    "@basemaps/config": "^7.14.0",
-    "@basemaps/config-loader": "^7.14.0",
-    "@basemaps/geo": "^7.12.0",
-    "@basemaps/lambda-tiler": "^7.14.0",
+    "@basemaps/config": "^7.16.0",
+    "@basemaps/config-loader": "^7.16.0",
+    "@basemaps/geo": "^7.16.0",
+    "@basemaps/lambda-tiler": "^7.16.0",
     "@basemaps/landing": "^6.39.0",
-    "@basemaps/shared": "^7.14.0",
+    "@basemaps/shared": "^7.16.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": "72f2a811d4851c6f50758617c9e65179d2b27bc8"
+  "gitHead": "25fa7659b84a40205ceacda8b2ca5f48e1dc6f7b"
 }