@basemaps/server 7.13.0 → 7.14.0

package/bin/basemaps-server.cjs

@@ -274,6 +274,7 @@ __export(tslib_es6_exports, {
   __propKey: () => __propKey,
   __read: () => __read,
   __rest: () => __rest,
+  __rewriteRelativeImportExtension: () => __rewriteRelativeImportExtension,
   __runInitializers: () => __runInitializers,
   __setFunctionName: () => __setFunctionName,
   __spread: () => __spread,
@@ -413,8 +414,8 @@ function __generator(thisArg, body) {
     if (t[0] & 1)
       throw t[1];
     return t[1];
-  }, trys: [], ops: [] }, f, y, t, g;
-  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+  }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+  return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
     return this;
   }), g;
   function verb(n) {
@@ -555,16 +556,24 @@ function __asyncGenerator(thisArg, _arguments, generator) {
   if (!Symbol.asyncIterator)
     throw new TypeError("Symbol.asyncIterator is not defined.");
   var g = generator.apply(thisArg, _arguments || []), i, q = [];
-  return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function() {
+  return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function() {
     return this;
   }, i;
-  function verb(n) {
-    if (g[n])
+  function awaitReturn(f) {
+    return function(v) {
+      return Promise.resolve(v).then(f, reject);
+    };
+  }
+  function verb(n, f) {
+    if (g[n]) {
       i[n] = function(v) {
         return new Promise(function(a, b) {
           q.push([n, v, a, b]) > 1 || resume(n, v);
         });
       };
+      if (f)
+        i[n] = f(i[n]);
+    }
   }
   function resume(n, v) {
     try {
@@ -633,9 +642,9 @@ function __importStar(mod) {
     return mod;
   var result = {};
   if (mod != null) {
-    for (var k in mod)
-      if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
-        __createBinding(result, mod, k);
+    for (var k = ownKeys(mod), i = 0; i < k.length; i++)
+      if (k[i] !== "default")
+        __createBinding(result, mod, k[i]);
   }
   __setModuleDefault(result, mod);
   return result;
@@ -668,7 +677,7 @@ function __addDisposableResource(env, value, async) {
   if (value !== null && value !== void 0) {
     if (typeof value !== "object" && typeof value !== "function")
       throw new TypeError("Object expected.");
-    var dispose;
+    var dispose, inner;
     if (async) {
       if (!Symbol.asyncDispose)
         throw new TypeError("Symbol.asyncDispose is not defined.");
@@ -678,9 +687,19 @@ function __addDisposableResource(env, value, async) {
       if (!Symbol.dispose)
         throw new TypeError("Symbol.dispose is not defined.");
       dispose = value[Symbol.dispose];
+      if (async)
+        inner = dispose;
     }
     if (typeof dispose !== "function")
       throw new TypeError("Object not disposable.");
+    if (inner)
+      dispose = function() {
+        try {
+          inner.call(this);
+        } catch (e) {
+          return Promise.reject(e);
+        }
+      };
     env.stack.push({ value, dispose, async });
   } else if (async) {
     env.stack.push({ async: true });
@@ -692,26 +711,41 @@ function __disposeResources(env) {
     env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
     env.hasError = true;
   }
+  var r, s = 0;
   function next() {
-    while (env.stack.length) {
-      var rec = env.stack.pop();
+    while (r = env.stack.pop()) {
       try {
-        var result = rec.dispose && rec.dispose.call(rec.value);
-        if (rec.async)
-          return Promise.resolve(result).then(next, function(e) {
-            fail(e);
-            return next();
-          });
+        if (!r.async && s === 1)
+          return s = 0, env.stack.push(r), Promise.resolve().then(next);
+        if (r.dispose) {
+          var result = r.dispose.call(r.value);
+          if (r.async)
+            return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+        } else
+          s |= 1;
       } catch (e) {
         fail(e);
       }
     }
+    if (s === 1)
+      return env.hasError ? Promise.reject(env.error) : Promise.resolve();
     if (env.hasError)
       throw env.error;
   }
   return next();
 }
-var extendStatics, __assign, __createBinding, __setModuleDefault, _SuppressedError, tslib_es6_default;
+function __rewriteRelativeImportExtension(path3, preserveJsx) {
+  if (typeof path3 === "string" && /^\.\.?\//.test(path3)) {
+    return path3.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m, tsx, d, ext, cm) {
+      return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : d + ext + "." + cm.toLowerCase() + "js";
+    });
+  }
+  return path3;
+}
+var extendStatics, __assign, __createBinding, __setModuleDefault, ownKeys, _SuppressedError, tslib_es6_default;
 var init_tslib_es6 = __esm({
   "../../node_modules/tslib/tslib.es6.mjs"() {
     extendStatics = function(d, b) {
@@ -756,6 +790,16 @@ var init_tslib_es6 = __esm({
     } : function(o, v) {
       o["default"] = v;
     };
+    ownKeys = function(o) {
+      ownKeys = Object.getOwnPropertyNames || function(o2) {
+        var ar = [];
+        for (var k in o2)
+          if (Object.prototype.hasOwnProperty.call(o2, k))
+            ar[ar.length] = k;
+        return ar;
+      };
+      return ownKeys(o);
+    };
     _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
       var e = new Error(message);
       return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
@@ -766,6 +810,10 @@ var init_tslib_es6 = __esm({
       __rest,
       __decorate,
       __param,
+      __esDecorate,
+      __runInitializers,
+      __propKey,
+      __setFunctionName,
       __metadata,
       __awaiter,
       __generator,
@@ -787,7 +835,8 @@ var init_tslib_es6 = __esm({
       __classPrivateFieldSet,
       __classPrivateFieldIn,
       __addDisposableResource,
-      __disposeResources
+      __disposeResources,
+      __rewriteRelativeImportExtension
     };
   }
 });
@@ -1859,7 +1908,7 @@ var require_Endpoint = __commonJS({
 // ../../node_modules/obliterator/iterator.js
 var require_iterator = __commonJS({
   "../../node_modules/obliterator/iterator.js"(exports, module2) {
-    function Iterator(next) {
+    function Iterator2(next) {
       Object.defineProperty(this, "_next", {
         writable: false,
         enumerable: false,
@@ -1867,7 +1916,7 @@ var require_iterator = __commonJS({
       });
       this.done = false;
     }
-    Iterator.prototype.next = function() {
+    Iterator2.prototype.next = function() {
       if (this.done)
         return { done: true };
       var step = this._next();
@@ -1876,28 +1925,28 @@ var require_iterator = __commonJS({
       return step;
     };
     if (typeof Symbol !== "undefined")
-      Iterator.prototype[Symbol.iterator] = function() {
+      Iterator2.prototype[Symbol.iterator] = function() {
         return this;
       };
-    Iterator.of = function() {
+    Iterator2.of = function() {
       var args = arguments, l = args.length, i = 0;
-      return new Iterator(function() {
+      return new Iterator2(function() {
         if (i >= l)
           return { done: true };
         return { done: false, value: args[i++] };
       });
     };
-    Iterator.empty = function() {
-      var iterator = new Iterator(null);
+    Iterator2.empty = function() {
+      var iterator = new Iterator2(null);
       iterator.done = true;
       return iterator;
     };
-    Iterator.is = function(value) {
-      if (value instanceof Iterator)
+    Iterator2.is = function(value) {
+      if (value instanceof Iterator2)
         return true;
       return typeof value === "object" && value !== null && typeof value.next === "function";
     };
-    module2.exports = Iterator;
+    module2.exports = Iterator2;
   }
 });
 
@@ -2124,7 +2173,7 @@ var require_iterables = __commonJS({
 // ../../node_modules/mnemonist/lru-cache.js
 var require_lru_cache = __commonJS({
   "../../node_modules/mnemonist/lru-cache.js"(exports, module2) {
-    var Iterator = require_iterator();
+    var Iterator2 = require_iterator();
     var forEach = require_foreach();
     var typed = require_typed_arrays();
     var iterables = require_iterables();
@@ -2250,7 +2299,7 @@ var require_lru_cache = __commonJS({
     LRUCache.prototype.keys = function() {
       var i = 0, l = this.size;
       var pointer = this.head, keys = this.K, forward = this.forward;
-      return new Iterator(function() {
+      return new Iterator2(function() {
         if (i >= l)
           return { done: true };
         var key = keys[pointer];
@@ -2266,7 +2315,7 @@ var require_lru_cache = __commonJS({
     LRUCache.prototype.values = function() {
       var i = 0, l = this.size;
       var pointer = this.head, values = this.V, forward = this.forward;
-      return new Iterator(function() {
+      return new Iterator2(function() {
         if (i >= l)
           return { done: true };
         var value = values[pointer];
@@ -2282,7 +2331,7 @@ var require_lru_cache = __commonJS({
     LRUCache.prototype.entries = function() {
       var i = 0, l = this.size;
       var pointer = this.head, keys = this.K, values = this.V, forward = this.forward;
-      return new Iterator(function() {
+      return new Iterator2(function() {
         if (i >= l)
           return { done: true };
         var key = keys[pointer], value = values[pointer];
@@ -124629,7 +124678,16 @@ var Env = {
   Analytics: {
     CloudFrontId: "ANALYTICS_CLOUD_FRONT_ID",
     CloudFrontSourceBucket: "ANALYTICS_CLOUD_FRONT_SOURCE_BUCKET",
-    CacheBucket: "ANALYTICS_CACHE_BUCKET"
+    /** Where to store the analytic cache data */
+    CacheBucket: "ANALYTICS_CACHE_BUCKET",
+    /** Max number of records to process in the analytics process */
+    MaxRecords: "ANALYTICS_MAX_RECORDS",
+    /** Elastic server Id */
+    ElasticId: "ELASTIC_ID",
+    /** ElasticSearch's API key */
+    ElasticApiKey: "ELASTIC_API_KEY",
+    /** Index to use for storing analytic data */
+    ElasticIndexName: "ELASTIC_INDEX_NAME"
   },
   /** Load a environment var defaulting to defaultOutput if it does not exist  */
   get(envName) {
@@ -135043,9 +135101,9 @@ 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.12.0-12-g9c1d78fe",
-  hash: "9c1d78fe9e4cccb6309b761f17dc249681ce1769",
-  buildId: "12624609360-1"
+  version: "v7.13.0-9-g72f2a811",
+  hash: "72f2a811d4851c6f50758617c9e65179d2b27bc8",
+  buildId: "12978670711-1"
 };
 var CliId = ulid3.ulid();
 
@@ -135753,9 +135811,9 @@ var Router = class {
 };
 
 // ../../node_modules/@linzjs/lambda/build/src/function.js
-var version2 = "v7.12.0-12-g9c1d78fe";
-var hash = "9c1d78fe9e4cccb6309b761f17dc249681ce1769";
-var buildId = "12624609360-1";
+var version2 = "v7.13.0-9-g72f2a811";
+var hash = "72f2a811d4851c6f50758617c9e65179d2b27bc8";
+var buildId = "12978670711-1";
 var versionInfo = { version: version2, hash, buildId };
 async function runFunction(req, fn) {
   if (!req.timer.timers.has("lambda"))
@@ -138117,22 +138175,39 @@ var LercDecompressor = {
   async bytes(source, tile) {
     await import_lerc.default.load();
     const bytes = import_lerc.default.decode(tile);
-    if (bytes.pixelType !== "F32") {
-      throw new Error(`Lerc: Invalid output pixelType:${bytes.pixelType} from:${source.source.url.href}`);
-    }
     if (bytes.depthCount !== 1) {
       throw new Error(`Lerc: Invalid output depthCount:${bytes.depthCount} from:${source.source.url.href}`);
     }
     if (bytes.pixels.length !== 1) {
       throw new Error(`Lerc: Invalid output bandCount:${bytes.pixels.length} from:${source.source.url.href}`);
     }
-    return {
-      pixels: bytes.pixels[0],
-      width: bytes.width,
-      height: bytes.height,
-      channels: 1,
-      depth: "float32"
-    };
+    switch (bytes.pixelType) {
+      case "F32":
+        return {
+          pixels: bytes.pixels[0],
+          width: bytes.width,
+          height: bytes.height,
+          channels: 1,
+          depth: "float32"
+        };
+      case "U32":
+        return {
+          pixels: bytes.pixels[0],
+          width: bytes.width,
+          height: bytes.height,
+          channels: 1,
+          depth: "uint32"
+        };
+      case "U8":
+        return {
+          pixels: bytes.pixels[0],
+          width: bytes.width,
+          height: bytes.height,
+          channels: 1,
+          depth: "uint8"
+        };
+    }
+    throw new Error(`Lerc: Invalid output pixelType:${bytes.pixelType} from:${source.source.url.href}`);
   }
 };
 var Decompressors = {
@@ -138150,8 +138225,6 @@ function cropResize(tiff, data, comp, mode) {
   }
   if (data.channels !== 1)
     throw new Error("Unable to crop-resize more than one channel got:" + data.channels);
-  if (data.depth !== "float32")
-    throw new Error("Unable to crop-resize other than float32 got:" + data.depth);
   const source = { x: 0, y: 0, width: data.width, height: data.height };
   const target = { width: 0, height: 0, scale: 1 };
   if (comp.extract) {
@@ -138197,7 +138270,8 @@ function resizeNearest(data, comp, source, target) {
   const maxWidth = Math.min(comp.source.width, data.width) - 1;
   const maxHeight = Math.min(comp.source.height, data.height) - 1;
   const invScale = 1 / target.scale;
-  const outputBuffer = new Float32Array(target.width * target.height);
+  const ret = getOutputBuffer(data, target);
+  const outputBuffer = ret.pixels;
   for (let y = 0; y < target.height; y++) {
     let sourceY = Math.round((y + 0.5) * invScale + source.y);
     if (sourceY > maxHeight)
@@ -138209,13 +138283,43 @@ function resizeNearest(data, comp, source, target) {
       outputBuffer[y * target.width + x] = data.pixels[sourceY * data.width + sourceX];
     }
   }
-  return { pixels: outputBuffer, width: target.width, height: target.height, depth: "float32", channels: 1 };
+  return ret;
+}
+function getOutputBuffer(source, target) {
+  switch (source.depth) {
+    case "uint8":
+      return {
+        pixels: new Uint8Array(target.width * target.height),
+        width: target.width,
+        height: target.height,
+        depth: source.depth,
+        channels: 1
+      };
+    case "float32":
+      return {
+        pixels: new Float32Array(target.width * target.height),
+        width: target.width,
+        height: target.height,
+        depth: source.depth,
+        channels: 1
+      };
+    case "uint32":
+      return {
+        pixels: new Uint32Array(target.width * target.height),
+        width: target.width,
+        height: target.height,
+        depth: source.depth,
+        channels: 1
+      };
+  }
 }
 function resizeBilinear(data, comp, source, target, noData) {
   const invScale = 1 / target.scale;
   const maxWidth = Math.min(comp.source.width, data.width) - 2;
   const maxHeight = Math.min(comp.source.height, data.height) - 2;
-  const outputBuffer = new Float32Array(target.width * target.height);
+  const ret = getOutputBuffer(data, target);
+  const outputBuffer = ret.pixels;
+  const needsRounding = !data.depth.startsWith("float");
   for (let y = 0; y < target.height; y++) {
     const sourceY = Math.min((y + 0.5) * invScale + source.y, maxHeight);
     const minY = Math.floor(sourceY);
@@ -138252,24 +138356,24 @@ function resizeBilinear(data, comp, source, target, noData) {
       const weightC = (1 - xDiff) * yDiff;
       const weightD = xDiff * yDiff;
       const pixel = minXMinY * weightA + maxXMinY * weightB + minXMaxY * weightC + maxXMaxY * weightD;
-      outputBuffer[outPx] = pixel;
+      outputBuffer[outPx] = needsRounding ? Math.round(pixel) : pixel;
     }
   }
-  return { pixels: outputBuffer, width: target.width, height: target.height, depth: "float32", channels: 1 };
+  return ret;
 }
 
 // ../tiler-sharp/build/pipeline/pipeline.color.ramp.js
 var ColorRamp = class {
-  constructor(ramp2) {
+  constructor(ramp) {
     Object.defineProperty(this, "ramps", {
       enumerable: true,
       configurable: true,
       writable: true,
       value: []
     });
-    const ramps = ramp2.trim().split("\n");
-    for (const ramp3 of ramps) {
-      const parts = ramp3.trim().split(" ");
+    const ramps = ramp.trim().split("\n");
+    for (const ramp2 of ramps) {
+      const parts = ramp2.trim().split(" ");
       const numbers = parts.map(Number);
       this.ramps.push({ v: numbers[0], color: numbers.slice(1) });
     }
@@ -138279,27 +138383,33 @@ var ColorRamp = class {
     if (num <= first.v)
       return first.color;
     for (let i = 0; i < this.ramps.length - 1; i++) {
-      const ramp2 = this.ramps[i];
-      if (num < ramp2.v)
+      const ramp = this.ramps[i];
+      if (num < ramp.v)
         continue;
-      if (ramp2.v === num)
-        return ramp2.color;
+      if (ramp.v === num)
+        return ramp.color;
       const rampNext = this.ramps[i + 1];
       if (num >= rampNext.v)
         continue;
-      const range = rampNext.v - ramp2.v;
-      const offset = num - ramp2.v;
+      const range = rampNext.v - ramp.v;
+      const offset = num - ramp.v;
       const scale = offset / range;
-      const r = Math.round((rampNext.color[0] - ramp2.color[0]) * scale + ramp2.color[0]);
-      const g = Math.round((rampNext.color[1] - ramp2.color[1]) * scale + ramp2.color[1]);
-      const b = Math.round((rampNext.color[2] - ramp2.color[2]) * scale + ramp2.color[2]);
-      const a = Math.round((rampNext.color[3] - ramp2.color[3]) * scale + ramp2.color[3]);
+      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];
     }
     return this.ramps[this.ramps.length - 1].color;
   }
 };
-var ramp = new ColorRamp(DefaultColorRamp);
+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`)
+};
 var PipelineColorRamp = {
   type: "color-ramp",
   process(comp, data) {
@@ -138311,6 +138421,7 @@ var PipelineColorRamp = {
       width: data.width,
       height: data.height
     };
+    const ramp = Ramps[data.depth];
     const size = data.width * data.height;
     const noData = comp.asset.images[0].noData;
     for (let i = 0; i < size; i++) {
@@ -140046,17 +140157,17 @@ function versionGet() {
      * last git version tag
      * @example "v6.42.1"
      */
-    version: "v7.12.0-12-g9c1d78fe",
+    version: "v7.13.0-9-g72f2a811",
     /**
      * Full git commit hash
      * @example "e4231b1ee62c276c8657c56677ced02681dfe5d6"
      */
-    hash: "9c1d78fe9e4cccb6309b761f17dc249681ce1769",
+    hash: "72f2a811d4851c6f50758617c9e65179d2b27bc8",
     /**
      * The exact build that this release was run from
      * @example "1658821493-3"
      */
-    buildId: "12624609360-1"
+    buildId: "12978670711-1"
   });
   return Promise.resolve(response);
 }

package/package.json

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