@vitessce/gl 3.2.0 → 3.2.2

package/dist/{deflate-69c280fb.js → deflate-2292d6bb.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-68f84e2a.js";
-import { B as BaseDecoder } from "./index-2a7f1ae0.js";
+import { B as BaseDecoder } from "./index-7bac69ff.js";
 import "react";
 class DeflateDecoder extends BaseDecoder {
   decodeBlock(buffer) {

package/dist/{index-2a7f1ae0.js → index-7bac69ff.js}

@@ -103903,16 +103903,16 @@ async function getDecoder(fileDirectory) {
   const Decoder = await importFn();
   return new Decoder(fileDirectory);
 }
-addDecoder([void 0, 1], () => import("./raw-b0ec4406.js").then((m) => m.default));
-addDecoder(5, () => import("./lzw-8d3691e0.js").then((m) => m.default));
+addDecoder([void 0, 1], () => import("./raw-7701dc0d.js").then((m) => m.default));
+addDecoder(5, () => import("./lzw-e748554e.js").then((m) => m.default));
 addDecoder(6, () => {
   throw new Error("old style JPEG compression is not supported.");
 });
-addDecoder(7, () => import("./jpeg-95f78026.js").then((m) => m.default));
-addDecoder([8, 32946], () => import("./deflate-69c280fb.js").then((m) => m.default));
-addDecoder(32773, () => import("./packbits-2846ed6b.js").then((m) => m.default));
-addDecoder(34887, () => import("./lerc-5320d7fa.js").then((m) => m.default));
-addDecoder(50001, () => import("./webimage-a17e81f9.js").then((m) => m.default));
+addDecoder(7, () => import("./jpeg-d84c376b.js").then((m) => m.default));
+addDecoder([8, 32946], () => import("./deflate-2292d6bb.js").then((m) => m.default));
+addDecoder(32773, () => import("./packbits-17d3eaf3.js").then((m) => m.default));
+addDecoder(34887, () => import("./lerc-abfff89b.js").then((m) => m.default));
+addDecoder(50001, () => import("./webimage-6b6fefe4.js").then((m) => m.default));
 function copyNewSize(array2, width, height, samplesPerPixel = 1) {
   return new (Object.getPrototypeOf(array2)).constructor(width * height * samplesPerPixel);
 }
@@ -118398,6 +118398,67 @@ function makeBoundingBox(viewState) {
     viewport.unproject([0, viewport.height])
   ];
 }
+const TARGETS = [1, 2, 3, 4, 5, 10, 20, 25, 50, 100, 200, 250, 500, 1e3];
+const MIN_TARGET = TARGETS[0];
+const MAX_TARGET = TARGETS[TARGETS.length - 1];
+const SI_PREFIXES = [
+  { symbol: "Y", exponent: 24 },
+  { symbol: "Z", exponent: 21 },
+  { symbol: "E", exponent: 18 },
+  { symbol: "P", exponent: 15 },
+  { symbol: "T", exponent: 12 },
+  { symbol: "G", exponent: 9 },
+  { symbol: "M", exponent: 6 },
+  { symbol: "k", exponent: 3 },
+  { symbol: "h", exponent: 2 },
+  { symbol: "da", exponent: 1 },
+  { symbol: "", exponent: 0 },
+  { symbol: "d", exponent: -1 },
+  { symbol: "c", exponent: -2 },
+  { symbol: "m", exponent: -3 },
+  { symbol: "µ", exponent: -6 },
+  { symbol: "n", exponent: -9 },
+  { symbol: "p", exponent: -12 },
+  { symbol: "f", exponent: -15 },
+  { symbol: "a", exponent: -18 },
+  { symbol: "z", exponent: -21 },
+  { symbol: "y", exponent: -24 }
+];
+function sizeToMeters(size, unit) {
+  if (!unit || unit === "m") {
+    return size;
+  }
+  if (unit.length > 1) {
+    let unitPrefix = unit.substring(0, unit.length - 1);
+    if (unitPrefix === "u") {
+      unitPrefix = "µ";
+    }
+    const unitObj = SI_PREFIXES.find((p) => p.symbol === unitPrefix);
+    if (unitObj) {
+      return size * 10 ** unitObj.exponent;
+    }
+  }
+  throw new Error("Received unknown unit");
+}
+function snapValue(value) {
+  let magnitude = 0;
+  if (value < MIN_TARGET || value > MAX_TARGET) {
+    magnitude = Math.floor(Math.log10(value));
+  }
+  let snappedUnit = SI_PREFIXES.find(
+    (p) => p.exponent % 3 === 0 && p.exponent <= magnitude
+  );
+  let adjustedValue = value / 10 ** snappedUnit.exponent;
+  if (adjustedValue > 500 && adjustedValue <= 1e3) {
+    snappedUnit = SI_PREFIXES.find(
+      (p) => p.exponent % 3 === 0 && p.exponent <= magnitude + 3
+    );
+    adjustedValue = value / 10 ** snappedUnit.exponent;
+  }
+  const targetNewUnits = TARGETS.find((t2) => t2 > adjustedValue);
+  const targetOrigUnits = targetNewUnits * 10 ** snappedUnit.exponent;
+  return [targetOrigUnits, targetNewUnits, snappedUnit.symbol];
+}
 const fs$1$1 = `#define SHADER_NAME xr-layer-fragment-shader
 
 precision highp float;
@@ -119165,26 +119226,27 @@ const OverviewLayer = class extends CompositeLayer {
 OverviewLayer.layerName = "OverviewLayer";
 OverviewLayer.defaultProps = defaultProps$3;
 function getPosition(boundingBox, position, length2) {
-  const viewLength = boundingBox[2][0] - boundingBox[0][0];
+  const viewWidth = boundingBox[2][0] - boundingBox[0][0];
+  const viewHeight = boundingBox[2][1] - boundingBox[0][1];
   switch (position) {
     case "bottom-right": {
-      const yCoord = boundingBox[2][1] - (boundingBox[2][1] - boundingBox[0][1]) * length2;
-      const xLeftCoord = boundingBox[2][0] - viewLength * length2;
+      const yCoord = boundingBox[2][1] - viewHeight * length2;
+      const xLeftCoord = boundingBox[2][0] - viewWidth * length2;
       return [yCoord, xLeftCoord];
     }
     case "top-right": {
-      const yCoord = (boundingBox[2][1] - boundingBox[0][1]) * length2;
-      const xLeftCoord = boundingBox[2][0] - viewLength * length2;
+      const yCoord = boundingBox[0][1] + viewHeight * length2;
+      const xLeftCoord = boundingBox[2][0] - viewWidth * length2;
       return [yCoord, xLeftCoord];
     }
     case "top-left": {
-      const yCoord = (boundingBox[2][1] - boundingBox[0][1]) * length2;
-      const xLeftCoord = viewLength * length2;
+      const yCoord = boundingBox[0][1] + viewHeight * length2;
+      const xLeftCoord = boundingBox[0][0] + viewWidth * length2;
       return [yCoord, xLeftCoord];
     }
     case "bottom-left": {
-      const yCoord = boundingBox[2][1] - (boundingBox[2][1] - boundingBox[0][1]) * length2;
-      const xLeftCoord = viewLength * length2;
+      const yCoord = boundingBox[2][1] - viewHeight * length2;
+      const xLeftCoord = boundingBox[0][0] + viewWidth * length2;
       return [yCoord, xLeftCoord];
     }
     default: {
@@ -119202,11 +119264,12 @@ const defaultProps$2 = {
   unit: { type: "string", value: "", compare: true },
   size: { type: "number", value: 1, compare: true },
   position: { type: "string", value: "bottom-right", compare: true },
-  length: { type: "number", value: 0.085, compare: true }
+  length: { type: "number", value: 0.085, compare: true },
+  snap: { type: "boolean", value: false, compare: true }
 };
 const ScaleBarLayer = class extends CompositeLayer {
   renderLayers() {
-    const { id, unit, size, position, viewState, length: length2 } = this.props;
+    const { id, unit, size, position, viewState, length: length2, snap } = this.props;
     const boundingBox = makeBoundingBox(viewState);
     const { zoom } = viewState;
     const viewLength = boundingBox[2][0] - boundingBox[0][0];
@@ -119215,15 +119278,27 @@ const ScaleBarLayer = class extends CompositeLayer {
       2 ** (-zoom + 1.5),
       (boundingBox[2][1] - boundingBox[0][1]) * 7e-3
     );
-    const numUnits = barLength * size;
+    let adjustedBarLength = barLength;
+    let displayNumber = (barLength * size).toPrecision(5);
+    let displayUnit = unit;
+    if (snap) {
+      const meterSize = sizeToMeters(size, unit);
+      const numUnits = barLength * meterSize;
+      const [snappedOrigUnits, snappedNewUnits, snappedUnitPrefix] = snapValue(numUnits);
+      adjustedBarLength = snappedOrigUnits / meterSize;
+      displayNumber = snappedNewUnits;
+      displayUnit = `${snappedUnitPrefix}m`;
+    }
     const [yCoord, xLeftCoord] = getPosition(boundingBox, position, length2);
+    const xRightCoord = xLeftCoord + barLength;
+    const isLeft = position.endsWith("-left");
     const lengthBar = new LineLayer({
       id: `scale-bar-length-${id}`,
       coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
       data: [
         [
-          [xLeftCoord, yCoord],
-          [xLeftCoord + barLength, yCoord]
+          [isLeft ? xLeftCoord : xRightCoord - adjustedBarLength, yCoord],
+          [isLeft ? xLeftCoord + adjustedBarLength : xRightCoord, yCoord]
         ]
       ],
       getSourcePosition: (d) => d[0],
@@ -119236,8 +119311,14 @@ const ScaleBarLayer = class extends CompositeLayer {
       coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
       data: [
         [
-          [xLeftCoord, yCoord - barHeight],
-          [xLeftCoord, yCoord + barHeight]
+          [
+            isLeft ? xLeftCoord : xRightCoord - adjustedBarLength,
+            yCoord - barHeight
+          ],
+          [
+            isLeft ? xLeftCoord : xRightCoord - adjustedBarLength,
+            yCoord + barHeight
+          ]
         ]
       ],
       getSourcePosition: (d) => d[0],
@@ -119250,8 +119331,14 @@ const ScaleBarLayer = class extends CompositeLayer {
       coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
       data: [
         [
-          [xLeftCoord + barLength, yCoord - barHeight],
-          [xLeftCoord + barLength, yCoord + barHeight]
+          [
+            isLeft ? xLeftCoord + adjustedBarLength : xRightCoord,
+            yCoord - barHeight
+          ],
+          [
+            isLeft ? xLeftCoord + adjustedBarLength : xRightCoord,
+            yCoord + barHeight
+          ]
         ]
       ],
       getSourcePosition: (d) => d[0],
@@ -119264,8 +119351,11 @@ const ScaleBarLayer = class extends CompositeLayer {
       coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
       data: [
         {
-          text: numUnits.toPrecision(5) + unit,
-          position: [xLeftCoord + barLength * 0.5, yCoord + barHeight * 4]
+          text: `${displayNumber}${displayUnit}`,
+          position: [
+            isLeft ? xLeftCoord + barLength * 0.5 : xRightCoord - barLength * 0.5,
+            yCoord + barHeight * 4
+          ]
         }
       ],
       getColor: [220, 220, 220, 255],
@@ -119274,7 +119364,7 @@ const ScaleBarLayer = class extends CompositeLayer {
       sizeUnits: "meters",
       sizeScale: 2 ** -zoom,
       characterSet: [
-        ...unit.split(""),
+        ...displayUnit.split(""),
         ...range$3(10).map((i2) => String(i2)),
         ".",
         "e",

package/dist/index.js

@@ -1,5 +1,5 @@
-import { f as distEs6 } from "./index-2a7f1ae0.js";
-import { o, n, A, r, q, p, i, j, C, l, D, G, e, H, c, M, k, m, d, P, S, h, T, t, b, s, v } from "./index-2a7f1ae0.js";
+import { f as distEs6 } from "./index-7bac69ff.js";
+import { o, n, A, r, q, p, i, j, C, l, D, G, e, H, c, M, k, m, d, P, S, h, T, t, b, s, v } from "./index-7bac69ff.js";
 import "react";
 const SELECTION_TYPE = distEs6.SELECTION_TYPE;
 export {

package/dist/{jpeg-95f78026.js → jpeg-d84c376b.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-2a7f1ae0.js";
+import { B as BaseDecoder } from "./index-7bac69ff.js";
 import "react";
 const dctZigZag = new Int32Array([
   0,

package/dist/{lerc-5320d7fa.js → lerc-abfff89b.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-68f84e2a.js";
-import { g as getDefaultExportFromCjs, B as BaseDecoder, L as LercParameters, a as LercAddCompression } from "./index-2a7f1ae0.js";
+import { g as getDefaultExportFromCjs, B as BaseDecoder, L as LercParameters, a as LercAddCompression } from "./index-7bac69ff.js";
 import "react";
 var LercDecode = { exports: {} };
 (function(module) {

package/dist/{lzw-8d3691e0.js → lzw-e748554e.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-2a7f1ae0.js";
+import { B as BaseDecoder } from "./index-7bac69ff.js";
 import "react";
 const MIN_BITS = 9;
 const CLEAR_CODE = 256;

package/dist/{packbits-2846ed6b.js → packbits-17d3eaf3.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-2a7f1ae0.js";
+import { B as BaseDecoder } from "./index-7bac69ff.js";
 import "react";
 class PackbitsDecoder extends BaseDecoder {
   decodeBlock(buffer) {

package/dist/{raw-b0ec4406.js → raw-7701dc0d.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-2a7f1ae0.js";
+import { B as BaseDecoder } from "./index-7bac69ff.js";
 import "react";
 class RawDecoder extends BaseDecoder {
   decodeBlock(buffer) {

package/dist/{webimage-a17e81f9.js → webimage-6b6fefe4.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-2a7f1ae0.js";
+import { B as BaseDecoder } from "./index-7bac69ff.js";
 import "react";
 class WebImageDecoder extends BaseDecoder {
   constructor() {

package/dist-tsc/BitmaskLayer.d.ts

@@ -1,4 +1,4 @@
-declare const BitmaskLayer_base: new (...props: import(".pnpm/@vivjs+types@0.13.7/node_modules/@vivjs/types").Viv<{
+declare const BitmaskLayer_base: new (...props: import(".pnpm/@vivjs+types@0.13.8/node_modules/@vivjs/types").Viv<{
     contrastLimits: number[][];
     channelsVisible: boolean[];
     dtype: string;

package/dist-tsc/BitmaskLayerBeta.d.ts

@@ -1,4 +1,4 @@
-declare const BitmaskLayer_base: new (...props: import(".pnpm/@vivjs+types@0.13.7/node_modules/@vivjs/types").Viv<{
+declare const BitmaskLayer_base: new (...props: import(".pnpm/@vivjs+types@0.13.8/node_modules/@vivjs/types").Viv<{
     contrastLimits: number[][];
     channelsVisible: boolean[];
     dtype: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/gl",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "author": "Gehlenborg Lab",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -23,7 +23,7 @@
     "@deck.gl/layers": "~8.8.6",
     "@deck.gl/mesh-layers": "~8.8.6",
     "@deck.gl/react": "~8.8.6",
-    "@hms-dbmi/viv": "~0.13.7",
+    "@hms-dbmi/viv": "~0.13.8",
     "@loaders.gl/3d-tiles": "^3.0.0",
     "@loaders.gl/core": "^3.0.0",
     "@loaders.gl/images": "^3.0.0",
@@ -52,7 +52,7 @@
     "mathjs": "^9.2.0",
     "nebula.gl": "0.23.8",
     "d3-array": "^2.4.0",
-    "@vitessce/utils": "3.2.0"
+    "@vitessce/utils": "3.2.2"
   },
   "devDependencies": {
     "glsl-colormap": "^1.0.1"