@vitessce/scatterplot-embedding 3.2.1 → 3.3.0

package/dist/{deflate-2d5bfeab.js → deflate-bd431815.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-68f84e2a.js";
-import { B as BaseDecoder } from "./index-64ed3bae.js";
+import { B as BaseDecoder } from "./index-87e09f29.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{index-64ed3bae.js → index-87e09f29.js}

@@ -4462,9 +4462,9 @@ const schemePlasma = [[13, 8, 135], [16, 7, 136], [19, 7, 137], [22, 7, 138], [2
 function rgbSpline(spline) {
   return (colors) => {
     const n2 = colors.length;
-    let r2 = new Array(n2);
-    let g2 = new Array(n2);
-    let b = new Array(n2);
+    const r2 = new Array(n2);
+    const g2 = new Array(n2);
+    const b = new Array(n2);
     let i2;
     let color2;
     for (i2 = 0; i2 < n2; ++i2) {
@@ -4473,10 +4473,10 @@ function rgbSpline(spline) {
       g2[i2] = color2[1] || 0;
       b[i2] = color2[2] || 0;
     }
-    r2 = spline(r2);
-    g2 = spline(g2);
-    b = spline(b);
-    return (t2) => [r2(t2), g2(t2), b(t2)];
+    const rFunc = spline(r2);
+    const gFunc = spline(g2);
+    const bFunc = spline(b);
+    return (t2) => [rFunc(t2), gFunc(t2), bFunc(t2)];
   };
 }
 function basis(values2) {
@@ -11068,6 +11068,7 @@ const DataType$2 = {
 const FileType$1 = {
   // Joint file types
   ANNDATA_ZARR: "anndata.zarr",
+  SPATIALDATA_ZARR: "spatialdata.zarr",
   // Atomic file types
   OBS_EMBEDDING_CSV: "obsEmbedding.csv",
   OBS_SPOTS_CSV: "obsSpots.csv",
@@ -11090,6 +11091,16 @@ const FileType$1 = {
   OBS_SEGMENTATIONS_ANNDATA_ZARR: "obsSegmentations.anndata.zarr",
   OBS_LABELS_ANNDATA_ZARR: "obsLabels.anndata.zarr",
   FEATURE_LABELS_ANNDATA_ZARR: "featureLabels.anndata.zarr",
+  // SpatialData
+  IMAGE_SPATIALDATA_ZARR: "image.spatialdata.zarr",
+  LABELS_SPATIALDATA_ZARR: "labels.spatialdata.zarr",
+  SHAPES_SPATIALDATA_ZARR: "shapes.spatialdata.zarr",
+  OBS_FEATURE_MATRIX_SPATIALDATA_ZARR: "obsFeatureMatrix.spatialdata.zarr",
+  OBS_SETS_SPATIALDATA_ZARR: "obsSets.spatialdata.zarr",
+  OBS_SPOTS_SPATIALDATA_ZARR: "obsSpots.spatialdata.zarr",
+  // TODO:
+  // OBS_POINTS_SPATIALDATA_ZARR: 'obsPoints.spatialdata.zarr',
+  // OBS_LOCATIONS_SPATIALDATA_ZARR: 'obsLocations.spatialdata.zarr',
   // MuData
   OBS_FEATURE_MATRIX_MUDATA_ZARR: "obsFeatureMatrix.mudata.zarr",
   OBS_SETS_MUDATA_ZARR: "obsSets.mudata.zarr",
@@ -11891,9 +11902,30 @@ z.object({
   offsetsUrl: z.string().optional(),
   coordinateTransformations: omeCoordinateTransformations.optional()
 });
-z.object({
+const imageOmeZarrSchema = z.object({
   coordinateTransformations: omeCoordinateTransformations.optional()
 });
+imageOmeZarrSchema.extend({
+  path: z.string()
+});
+z.object({
+  path: z.string()
+});
+z.object({
+  path: z.string()
+});
+z.object({
+  path: z.string(),
+  tablePath: z.string().optional().describe("The path to a table which annotates the spots. If available but not specified, the spot identifiers may not be aligned with associated tabular data as expected.")
+});
+annDataObsFeatureMatrix.extend({
+  region: z.string().describe("The name of a region to use to filter instances (i.e., rows) in the table").optional()
+});
+z.object({
+  region: z.string().describe("The name of a region to use to filter instances (i.e., rows) in the table").optional(),
+  tablePath: z.string().optional().describe("The path to a table which contains the index for the set values."),
+  obsSets: annDataObsSets
+});
 z.object({
   obsIndex: z.string(),
   obsEmbedding: z.array(z.string()).length(2)
@@ -121180,16 +121212,16 @@ function addDecoder(cases, importFn) {
   }
   cases.forEach((c2) => registry$1.set(c2, importFn));
 }
-addDecoder([void 0, 1], () => import("./raw-4ea71ae5.js").then((m2) => m2.default));
-addDecoder(5, () => import("./lzw-194af29e.js").then((m2) => m2.default));
+addDecoder([void 0, 1], () => import("./raw-12234337.js").then((m2) => m2.default));
+addDecoder(5, () => import("./lzw-9f579219.js").then((m2) => m2.default));
 addDecoder(6, () => {
   throw new Error("old style JPEG compression is not supported.");
 });
-addDecoder(7, () => import("./jpeg-26d14b38.js").then((m2) => m2.default));
-addDecoder([8, 32946], () => import("./deflate-2d5bfeab.js").then((m2) => m2.default));
-addDecoder(32773, () => import("./packbits-40fe7e7e.js").then((m2) => m2.default));
-addDecoder(34887, () => import("./lerc-925e402e.js").then((m2) => m2.default));
-addDecoder(50001, () => import("./webimage-cd737900.js").then((m2) => m2.default));
+addDecoder(7, () => import("./jpeg-418390c5.js").then((m2) => m2.default));
+addDecoder([8, 32946], () => import("./deflate-bd431815.js").then((m2) => m2.default));
+addDecoder(32773, () => import("./packbits-81f5fada.js").then((m2) => m2.default));
+addDecoder(34887, () => import("./lerc-f1c20446.js").then((m2) => m2.default));
+addDecoder(50001, () => import("./webimage-6ef04827.js").then((m2) => m2.default));
 function decodeRowAcc(row, stride) {
   let length2 = row.length - stride;
   let offset5 = 0;
@@ -130089,6 +130121,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, unit2) {
+  if (!unit2 || unit2 === "m") {
+    return size;
+  }
+  if (unit2.length > 1) {
+    let unitPrefix = unit2.substring(0, unit2.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;
@@ -130856,26 +130949,27 @@ const OverviewLayer = class extends CompositeLayer {
 OverviewLayer.layerName = "OverviewLayer";
 OverviewLayer.defaultProps = defaultProps$3;
 function getPosition$1(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: {
@@ -130893,11 +130987,12 @@ const defaultProps$2$1 = {
   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: unit2, size, position, viewState, length: length2 } = this.props;
+    const { id, unit: unit2, size, position, viewState, length: length2, snap } = this.props;
     const boundingBox = makeBoundingBox(viewState);
     const { zoom } = viewState;
     const viewLength = boundingBox[2][0] - boundingBox[0][0];
@@ -130906,15 +131001,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 = unit2;
+    if (snap) {
+      const meterSize = sizeToMeters(size, unit2);
+      const numUnits = barLength * meterSize;
+      const [snappedOrigUnits, snappedNewUnits, snappedUnitPrefix] = snapValue(numUnits);
+      adjustedBarLength = snappedOrigUnits / meterSize;
+      displayNumber = snappedNewUnits;
+      displayUnit = `${snappedUnitPrefix}m`;
+    }
     const [yCoord, xLeftCoord] = getPosition$1(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],
@@ -130927,8 +131034,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],
@@ -130941,8 +131054,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],
@@ -130955,8 +131074,11 @@ const ScaleBarLayer = class extends CompositeLayer {
       coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
       data: [
         {
-          text: numUnits.toPrecision(5) + unit2,
-          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],
@@ -130965,7 +131087,7 @@ const ScaleBarLayer = class extends CompositeLayer {
       sizeUnits: "meters",
       sizeScale: 2 ** -zoom,
       characterSet: [
-        ...unit2.split(""),
+        ...displayUnit.split(""),
         ...range(10).map((i2) => String(i2)),
         ".",
         "e",
@@ -145440,9 +145562,9 @@ function Legend(props2) {
     const hasSubLabel = subLabel !== null;
     if (!isSetColor) {
       g2.append("text").attr("text-anchor", hasSubLabel ? "start" : "end").attr("dominant-baseline", "hanging").attr("x", hasSubLabel ? 0 : width).attr("y", 0).text(mainLabel).style("font-size", "10px").style("fill", foregroundColor);
-    }
-    if (hasSubLabel) {
-      g2.append("text").attr("text-anchor", "end").attr("dominant-baseline", "hanging").attr("x", width).attr("y", titleHeight).text(subLabel).style("font-size", "9px").style("fill", foregroundColor);
+      if (hasSubLabel) {
+        g2.append("text").attr("text-anchor", "end").attr("dominant-baseline", "hanging").attr("x", width).attr("y", titleHeight).text(subLabel).style("font-size", "9px").style("fill", foregroundColor);
+      }
     }
   }, [
     width,

package/dist/index.js

@@ -1,4 +1,4 @@
-import { E } from "./index-64ed3bae.js";
+import { E } from "./index-87e09f29.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{jpeg-26d14b38.js → jpeg-418390c5.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-64ed3bae.js";
+import { B as BaseDecoder } from "./index-87e09f29.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{lerc-925e402e.js → lerc-f1c20446.js}

@@ -1,5 +1,5 @@
 import { i as inflate_1 } from "./pako.esm-68f84e2a.js";
-import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-64ed3bae.js";
+import { g as getDefaultExportFromCjs, B as BaseDecoder } from "./index-87e09f29.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{lzw-194af29e.js → lzw-9f579219.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-64ed3bae.js";
+import { B as BaseDecoder } from "./index-87e09f29.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{packbits-40fe7e7e.js → packbits-81f5fada.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-64ed3bae.js";
+import { B as BaseDecoder } from "./index-87e09f29.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{raw-4ea71ae5.js → raw-12234337.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-64ed3bae.js";
+import { B as BaseDecoder } from "./index-87e09f29.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/dist/{webimage-cd737900.js → webimage-6ef04827.js}

@@ -1,4 +1,4 @@
-import { B as BaseDecoder } from "./index-64ed3bae.js";
+import { B as BaseDecoder } from "./index-87e09f29.js";
 import "react";
 import "@vitessce/vit-s";
 import "react-dom";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitessce/scatterplot-embedding",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "author": "Gehlenborg Lab",
   "homepage": "http://vitessce.io",
   "repository": {
@@ -20,12 +20,12 @@
     "d3-array": "^2.4.0",
     "lodash-es": "^4.17.21",
     "react-aria": "^3.28.0",
-    "@vitessce/constants-internal": "3.2.1",
-    "@vitessce/legend": "3.2.1",
-    "@vitessce/scatterplot": "3.2.1",
-    "@vitessce/sets-utils": "3.2.1",
-    "@vitessce/utils": "3.2.1",
-    "@vitessce/vit-s": "3.2.1"
+    "@vitessce/constants-internal": "3.3.0",
+    "@vitessce/legend": "3.3.0",
+    "@vitessce/scatterplot": "3.3.0",
+    "@vitessce/sets-utils": "3.3.0",
+    "@vitessce/utils": "3.3.0",
+    "@vitessce/vit-s": "3.3.0"
   },
   "devDependencies": {
     "react": "^18.0.0",