@vitessce/gl 3.3.2 → 3.3.3

package/dist/{index-0d084e33.js → index-901cd86d.js}

@@ -10767,8 +10767,8 @@ function acos$1(radians2, result) {
 function atan$1(radians2, result) {
   return map(radians2, (angle2) => Math.atan(angle2), result);
 }
-function clamp$1(value, min, max) {
-  return map(value, (value2) => Math.max(min, Math.min(max, value2)));
+function clamp$1(value, min, max2) {
+  return map(value, (value2) => Math.max(min, Math.min(max2, value2)));
 }
 function lerp$6(a2, b, t2) {
   if (isArray$3(a2)) {
@@ -11055,9 +11055,9 @@ class MathArray extends _extendableBuiltin(Array) {
   divideScalar(a2) {
     return this.multiplyByScalar(1 / a2);
   }
-  clampScalar(min, max) {
+  clampScalar(min, max2) {
     for (let i2 = 0; i2 < this.ELEMENTS; ++i2) {
-      this[i2] = Math.min(Math.max(this[i2], min), max);
+      this[i2] = Math.min(Math.max(this[i2], min), max2);
     }
     return this.check();
   }
@@ -17190,8 +17190,8 @@ function mod$1(value, divisor) {
 function lerp$1(start, end, step) {
   return step * end + (1 - step) * start;
 }
-function clamp(x2, min, max) {
-  return x2 < min ? min : x2 > max ? max : x2;
+function clamp(x2, min, max2) {
+  return x2 < min ? min : x2 > max2 ? max2 : x2;
 }
 function ieLog2(x2) {
   return Math.log(x2) * Math.LOG2E;
@@ -26945,17 +26945,17 @@ class DataColumn {
       const len2 = numInstances * size;
       if (value && len2 && value.length >= len2) {
         const min = new Array(size).fill(Infinity);
-        const max = new Array(size).fill(-Infinity);
+        const max2 = new Array(size).fill(-Infinity);
         for (let i2 = 0; i2 < len2; ) {
           for (let j = 0; j < size; j++) {
             const v = value[i2++];
             if (v < min[j])
               min[j] = v;
-            if (v > max[j])
-              max[j] = v;
+            if (v > max2[j])
+              max2[j] = v;
           }
         }
-        result = [min, max];
+        result = [min, max2];
       }
     }
     this.state.bounds = result;
@@ -53039,10 +53039,10 @@ class GroupNode extends ScenegraphNode {
       if (!bounds2) {
         return;
       }
-      const [min, max] = bounds2;
-      const center2 = new Vector3(min).add(max).divide([2, 2, 2]);
+      const [min, max2] = bounds2;
+      const center2 = new Vector3(min).add(max2).divide([2, 2, 2]);
       worldMatrix.transformAsPoint(center2, center2);
-      const halfSize = new Vector3(max).subtract(min).divide([2, 2, 2]);
+      const halfSize = new Vector3(max2).subtract(min).divide([2, 2, 2]);
       worldMatrix.transformAsVector(halfSize, halfSize);
       for (let v = 0; v < 8; v++) {
         const position = new Vector3(v & 1 ? -1 : 1, v & 2 ? -1 : 1, v & 4 ? -1 : 1).multiply(halfSize).add(center2);
@@ -61991,7 +61991,7 @@ class Tile {
     const { errors } = this;
     let numVertices = 0;
     let numTriangles = 0;
-    const max = size - 1;
+    const max2 = size - 1;
     indices.fill(0);
     function countElements(ax, ay, bx, by, cx, cy) {
       const mx = ax + bx >> 1;
@@ -62006,8 +62006,8 @@ class Tile {
         numTriangles++;
       }
     }
-    countElements(0, 0, max, max, max, 0);
-    countElements(max, max, 0, 0, 0, max);
+    countElements(0, 0, max2, max2, max2, 0);
+    countElements(max2, max2, 0, 0, 0, max2);
     const vertices = new Uint16Array(numVertices * 2);
     const triangles = new Uint32Array(numTriangles * 3);
     let triIndex = 0;
@@ -62032,8 +62032,8 @@ class Tile {
         triangles[triIndex++] = c;
       }
     }
-    processTriangle(0, 0, max, max, max, 0);
-    processTriangle(max, max, 0, 0, 0, max);
+    processTriangle(0, 0, max2, max2, max2, 0);
+    processTriangle(max2, max2, 0, 0, 0, max2);
     return { vertices, triangles };
   }
 }
@@ -103842,24 +103842,24 @@ const geoKeyNames = {
   4098: "VerticalDatumGeoKey",
   4099: "VerticalUnitsGeoKey"
 };
-function fromWhiteIsZero(raster, max) {
+function fromWhiteIsZero(raster, max2) {
   const { width, height } = raster;
   const rgbRaster = new Uint8Array(width * height * 3);
   let value;
   for (let i2 = 0, j = 0; i2 < raster.length; ++i2, j += 3) {
-    value = 256 - raster[i2] / max * 256;
+    value = 256 - raster[i2] / max2 * 256;
     rgbRaster[j] = value;
     rgbRaster[j + 1] = value;
     rgbRaster[j + 2] = value;
   }
   return rgbRaster;
 }
-function fromBlackIsZero(raster, max) {
+function fromBlackIsZero(raster, max2) {
   const { width, height } = raster;
   const rgbRaster = new Uint8Array(width * height * 3);
   let value;
   for (let i2 = 0, j = 0; i2 < raster.length; ++i2, j += 3) {
-    value = raster[i2] / max * 256;
+    value = raster[i2] / max2 * 256;
     rgbRaster[j] = value;
     rgbRaster[j + 1] = value;
     rgbRaster[j + 2] = value;
@@ -103952,16 +103952,16 @@ async function getDecoder(fileDirectory) {
   const Decoder = await importFn();
   return new Decoder(fileDirectory);
 }
-addDecoder([void 0, 1], () => import("./raw-c78b844f.js").then((m) => m.default));
-addDecoder(5, () => import("./lzw-04637fdd.js").then((m) => m.default));
+addDecoder([void 0, 1], () => import("./raw-93e6f264.js").then((m) => m.default));
+addDecoder(5, () => import("./lzw-d020357b.js").then((m) => m.default));
 addDecoder(6, () => {
   throw new Error("old style JPEG compression is not supported.");
 });
-addDecoder(7, () => import("./jpeg-201a0839.js").then((m) => m.default));
-addDecoder([8, 32946], () => import("./deflate-73d5335b.js").then((m) => m.default));
-addDecoder(32773, () => import("./packbits-c3fd53d2.js").then((m) => m.default));
-addDecoder(34887, () => import("./lerc-4c2149fc.js").then((m) => m.default));
-addDecoder(50001, () => import("./webimage-2dd56bbe.js").then((m) => m.default));
+addDecoder(7, () => import("./jpeg-2919bc92.js").then((m) => m.default));
+addDecoder([8, 32946], () => import("./deflate-8259e5d4.js").then((m) => m.default));
+addDecoder(32773, () => import("./packbits-2ad8f627.js").then((m) => m.default));
+addDecoder(34887, () => import("./lerc-95858d36.js").then((m) => m.default));
+addDecoder(50001, () => import("./webimage-33d58a8b.js").then((m) => m.default));
 function copyNewSize(array, width, height, samplesPerPixel = 1) {
   return new (Object.getPrototypeOf(array)).constructor(width * height * samplesPerPixel);
 }
@@ -104672,14 +104672,14 @@ class GeoTIFFImage {
     };
     const { fileDirectory } = this;
     const raster = await this.readRasters(subOptions);
-    const max = 2 ** this.fileDirectory.BitsPerSample[0];
+    const max2 = 2 ** this.fileDirectory.BitsPerSample[0];
     let data;
     switch (pi2) {
       case photometricInterpretations.WhiteIsZero:
-        data = fromWhiteIsZero(raster, max);
+        data = fromWhiteIsZero(raster, max2);
         break;
       case photometricInterpretations.BlackIsZero:
-        data = fromBlackIsZero(raster, max);
+        data = fromBlackIsZero(raster, max2);
         break;
       case photometricInterpretations.Palette:
         data = fromPalette(raster, fileDirectory.ColorMap);
@@ -110180,9 +110180,9 @@ const buf2binstring = (buf, len2) => {
   }
   return result;
 };
-var buf2string = (buf, max) => {
+var buf2string = (buf, max2) => {
   let i2, out;
-  const len2 = max || buf.length;
+  const len2 = max2 || buf.length;
   const utf16buf = new Array(len2 * 2);
   for (out = 0, i2 = 0; i2 < len2; ) {
     let c = buf[i2++];
@@ -110215,22 +110215,22 @@ var buf2string = (buf, max) => {
   }
   return buf2binstring(utf16buf, out);
 };
-var utf8border = (buf, max) => {
-  max = max || buf.length;
-  if (max > buf.length) {
-    max = buf.length;
+var utf8border = (buf, max2) => {
+  max2 = max2 || buf.length;
+  if (max2 > buf.length) {
+    max2 = buf.length;
   }
-  let pos = max - 1;
+  let pos = max2 - 1;
   while (pos >= 0 && (buf[pos] & 192) === 128) {
     pos--;
   }
   if (pos < 0) {
-    return max;
+    return max2;
   }
   if (pos === 0) {
-    return max;
+    return max2;
   }
-  return pos + _utf8len[buf[pos]] > max ? pos : max;
+  return pos + _utf8len[buf[pos]] > max2 ? pos : max2;
 };
 var strings = {
   string2buf,
@@ -110780,7 +110780,7 @@ const inflate_table = (type, lens2, lens_index, codes, table, table_index, work,
   const bits = opts2.bits;
   let len2 = 0;
   let sym = 0;
-  let min = 0, max = 0;
+  let min = 0, max2 = 0;
   let root2 = 0;
   let curr = 0;
   let drop = 0;
@@ -110807,21 +110807,21 @@ const inflate_table = (type, lens2, lens_index, codes, table, table_index, work,
     count2[lens2[lens_index + sym]]++;
   }
   root2 = bits;
-  for (max = MAXBITS; max >= 1; max--) {
-    if (count2[max] !== 0) {
+  for (max2 = MAXBITS; max2 >= 1; max2--) {
+    if (count2[max2] !== 0) {
       break;
     }
   }
-  if (root2 > max) {
-    root2 = max;
+  if (root2 > max2) {
+    root2 = max2;
   }
-  if (max === 0) {
+  if (max2 === 0) {
     table[table_index++] = 1 << 24 | 64 << 16 | 0;
     table[table_index++] = 1 << 24 | 64 << 16 | 0;
     opts2.bits = 1;
     return 0;
   }
-  for (min = 1; min < max; min++) {
+  for (min = 1; min < max2; min++) {
     if (count2[min] !== 0) {
       break;
     }
@@ -110837,7 +110837,7 @@ const inflate_table = (type, lens2, lens_index, codes, table, table_index, work,
       return -1;
     }
   }
-  if (left > 0 && (type === CODES || max !== 1)) {
+  if (left > 0 && (type === CODES || max2 !== 1)) {
     return -1;
   }
   offs[1] = 0;
@@ -110906,7 +110906,7 @@ const inflate_table = (type, lens2, lens_index, codes, table, table_index, work,
     }
     sym++;
     if (--count2[len2] === 0) {
-      if (len2 === max) {
+      if (len2 === max2) {
         break;
       }
       len2 = lens2[lens_index + work[sym]];
@@ -110918,7 +110918,7 @@ const inflate_table = (type, lens2, lens_index, codes, table, table_index, work,
       next3 += min;
       curr = len2 - drop;
       left = 1 << curr;
-      while (curr + drop < max) {
+      while (curr + drop < max2) {
         left -= count2[curr + drop];
         if (left <= 0) {
           break;
@@ -113452,14 +113452,14 @@ const DTYPE_LOOKUP$1 = {
 function getChannelStats(arr) {
   let len2 = arr.length;
   let min = Infinity;
-  let max = -Infinity;
+  let max2 = -Infinity;
   let total = 0;
   while (len2--) {
     if (arr[len2] < min) {
       min = arr[len2];
     }
-    if (arr[len2] > max) {
-      max = arr[len2];
+    if (arr[len2] > max2) {
+      max2 = arr[len2];
     }
     total += arr[len2];
   }
@@ -113497,7 +113497,7 @@ function getChannelStats(arr) {
     q1,
     q3,
     median,
-    domain: [min, max],
+    domain: [min, max2],
     contrastLimits
   };
 }
@@ -120966,14 +120966,14 @@ class ZodString extends ZodType {
     return min;
   }
   get maxLength() {
-    let max = null;
+    let max2 = null;
     for (const ch of this._def.checks) {
       if (ch.kind === "max") {
-        if (max === null || ch.value < max)
-          max = ch.value;
+        if (max2 === null || ch.value < max2)
+          max2 = ch.value;
       }
     }
-    return max;
+    return max2;
   }
 }
 ZodString.create = (params) => {
@@ -121188,20 +121188,20 @@ class ZodNumber extends ZodType {
     return min;
   }
   get maxValue() {
-    let max = null;
+    let max2 = null;
     for (const ch of this._def.checks) {
       if (ch.kind === "max") {
-        if (max === null || ch.value < max)
-          max = ch.value;
+        if (max2 === null || ch.value < max2)
+          max2 = ch.value;
       }
     }
-    return max;
+    return max2;
   }
   get isInt() {
     return !!this._def.checks.find((ch) => ch.kind === "int" || ch.kind === "multipleOf" && util.isInteger(ch.value));
   }
   get isFinite() {
-    let max = null, min = null;
+    let max2 = null, min = null;
     for (const ch of this._def.checks) {
       if (ch.kind === "finite" || ch.kind === "int" || ch.kind === "multipleOf") {
         return true;
@@ -121209,11 +121209,11 @@ class ZodNumber extends ZodType {
         if (min === null || ch.value > min)
           min = ch.value;
       } else if (ch.kind === "max") {
-        if (max === null || ch.value < max)
-          max = ch.value;
+        if (max2 === null || ch.value < max2)
+          max2 = ch.value;
       }
     }
-    return Number.isFinite(min) && Number.isFinite(max);
+    return Number.isFinite(min) && Number.isFinite(max2);
   }
 }
 ZodNumber.create = (params) => {
@@ -121371,14 +121371,14 @@ class ZodBigInt extends ZodType {
     return min;
   }
   get maxValue() {
-    let max = null;
+    let max2 = null;
     for (const ch of this._def.checks) {
       if (ch.kind === "max") {
-        if (max === null || ch.value < max)
-          max = ch.value;
+        if (max2 === null || ch.value < max2)
+          max2 = ch.value;
       }
     }
-    return max;
+    return max2;
   }
 }
 ZodBigInt.create = (params) => {
@@ -121506,14 +121506,14 @@ class ZodDate extends ZodType {
     return min != null ? new Date(min) : null;
   }
   get maxDate() {
-    let max = null;
+    let max2 = null;
     for (const ch of this._def.checks) {
       if (ch.kind === "max") {
-        if (max === null || ch.value < max)
-          max = ch.value;
+        if (max2 === null || ch.value < max2)
+          max2 = ch.value;
       }
     }
-    return max != null ? new Date(max) : null;
+    return max2 != null ? new Date(max2) : null;
   }
 }
 ZodDate.create = (params) => {
@@ -125872,7 +125872,7 @@ var toComparators_1 = toComparators$1;
 const SemVer$4 = semver;
 const Range$7 = requireRange();
 const maxSatisfying$1 = (versions, range2, options) => {
-  let max = null;
+  let max2 = null;
   let maxSV = null;
   let rangeObj = null;
   try {
@@ -125882,13 +125882,13 @@ const maxSatisfying$1 = (versions, range2, options) => {
   }
   versions.forEach((v) => {
     if (rangeObj.test(v)) {
-      if (!max || maxSV.compare(v) === -1) {
-        max = v;
-        maxSV = new SemVer$4(max, options);
+      if (!max2 || maxSV.compare(v) === -1) {
+        max2 = v;
+        maxSV = new SemVer$4(max2, options);
       }
     }
   });
-  return max;
+  return max2;
 };
 var maxSatisfying_1 = maxSatisfying$1;
 const SemVer$3 = semver;
@@ -126073,17 +126073,17 @@ var simplify = (versions, range2, options) => {
     set.push([first, null]);
   }
   const ranges2 = [];
-  for (const [min, max] of set) {
-    if (min === max) {
+  for (const [min, max2] of set) {
+    if (min === max2) {
       ranges2.push(min);
-    } else if (!max && min === v[0]) {
+    } else if (!max2 && min === v[0]) {
       ranges2.push("*");
-    } else if (!max) {
+    } else if (!max2) {
       ranges2.push(`>=${min}`);
     } else if (min === v[0]) {
-      ranges2.push(`<=${max}`);
+      ranges2.push(`<=${max2}`);
     } else {
-      ranges2.push(`${min} - ${max}`);
+      ranges2.push(`${min} - ${max2}`);
     }
   }
   const simplified = ranges2.join(" || ");
@@ -126377,7 +126377,9 @@ const FileType$1 = {
   OBS_SEGMENTATIONS_JSON: "obsSegmentations.json",
   OBS_SETS_CSV: "obsSets.csv",
   OBS_SETS_JSON: "obsSets.json",
+  // OME-Zarr
   IMAGE_OME_ZARR: "image.ome-zarr",
+  OBS_SEGMENTATIONS_OME_ZARR: "obsSegmentations.ome-zarr",
   // AnnData
   OBS_FEATURE_MATRIX_ANNDATA_ZARR: "obsFeatureMatrix.anndata.zarr",
   OBS_SETS_ANNDATA_ZARR: "obsSets.anndata.zarr",
@@ -126830,30 +126832,39 @@ const omeCoordinateTransformations = z.array(z.union([
     scale: z.array(z.number())
   })
 ]));
-z.object({
+const imageOmeTiffSchema = z.object({
   offsetsUrl: z.string().optional(),
   coordinateTransformations: omeCoordinateTransformations.optional()
 });
+imageOmeTiffSchema.extend({
+  obsTypesFromChannelNames: z.boolean().optional()
+});
 const imageOmeZarrSchema = z.object({
   coordinateTransformations: omeCoordinateTransformations.optional()
 });
 imageOmeZarrSchema.extend({
+  obsTypesFromChannelNames: z.boolean().optional()
+});
+const imageSpatialdataSchema = imageOmeZarrSchema.extend({
   path: z.string()
 });
-z.object({
+const obsSegmentationsSpatialdataSchema = z.object({
+  // TODO: should this also extend the imageOmeZarrSchema?
+  // TODO: should this be renamed labelsSpatialdataSchema?
+  // TODO: support obsTypesFromChannelNames?
   path: z.string()
 });
 z.object({
   path: z.string()
 });
-z.object({
+const obsSpotsSpatialdataSchema = 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({
+const obsFeatureMatrixSpatialdataSchema = 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({
+const obsSetsSpatialdataSchema = 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
@@ -126916,6 +126927,19 @@ z.object({
     z.array(annDataConvenienceObsEmbeddingItem)
   ])
 }).partial();
+z.object({
+  // TODO: should `image` be a special schema
+  // to allow specifying fileUid (like for embeddingType)?
+  image: imageSpatialdataSchema,
+  // TODO: should this be a special schema
+  // to allow specifying fileUid (like for embeddingType)?
+  labels: obsSegmentationsSpatialdataSchema,
+  obsFeatureMatrix: obsFeatureMatrixSpatialdataSchema,
+  obsSpots: obsSpotsSpatialdataSchema,
+  // TODO: obsPoints
+  // TODO: obsLocations
+  obsSets: obsSetsSpatialdataSchema
+}).partial();
 z.object({
   obsLabelsTypes: z.array(z.string()).optional(),
   embeddingTypes: z.array(z.string()).optional()
@@ -127284,14 +127308,14 @@ var tinycolor = { exports: {} };
       r2 = bound01(r2, 255);
       g2 = bound01(g2, 255);
       b = bound01(b, 255);
-      var max = mathMax(r2, g2, b), min = mathMin(r2, g2, b);
-      var h, s2, l2 = (max + min) / 2;
-      if (max == min) {
+      var max2 = mathMax(r2, g2, b), min = mathMin(r2, g2, b);
+      var h, s2, l2 = (max2 + min) / 2;
+      if (max2 == min) {
         h = s2 = 0;
       } else {
-        var d = max - min;
-        s2 = l2 > 0.5 ? d / (2 - max - min) : d / (max + min);
-        switch (max) {
+        var d = max2 - min;
+        s2 = l2 > 0.5 ? d / (2 - max2 - min) : d / (max2 + min);
+        switch (max2) {
           case r2:
             h = (g2 - b) / d + (g2 < b ? 6 : 0);
             break;
@@ -127339,14 +127363,14 @@ var tinycolor = { exports: {} };
       r2 = bound01(r2, 255);
       g2 = bound01(g2, 255);
       b = bound01(b, 255);
-      var max = mathMax(r2, g2, b), min = mathMin(r2, g2, b);
-      var h, s2, v = max;
-      var d = max - min;
-      s2 = max === 0 ? 0 : d / max;
-      if (max == min) {
+      var max2 = mathMax(r2, g2, b), min = mathMin(r2, g2, b);
+      var h, s2, v = max2;
+      var d = max2 - min;
+      s2 = max2 === 0 ? 0 : d / max2;
+      if (max2 == min) {
         h = 0;
       } else {
-        switch (max) {
+        switch (max2) {
           case r2:
             h = (g2 - b) / d + (g2 < b ? 6 : 0);
             break;
@@ -127743,19 +127767,19 @@ var tinycolor = { exports: {} };
       }
       return a2;
     }
-    function bound01(n2, max) {
+    function bound01(n2, max2) {
       if (isOnePointZero(n2)) {
         n2 = "100%";
       }
       var processPercent = isPercentage(n2);
-      n2 = mathMin(max, mathMax(0, parseFloat(n2)));
+      n2 = mathMin(max2, mathMax(0, parseFloat(n2)));
       if (processPercent) {
-        n2 = parseInt(n2 * max, 10) / 100;
+        n2 = parseInt(n2 * max2, 10) / 100;
       }
-      if (Math2.abs(n2 - max) < 1e-6) {
+      if (Math2.abs(n2 - max2) < 1e-6) {
         return 1;
       }
-      return n2 % max / parseFloat(max);
+      return n2 % max2 / parseFloat(max2);
     }
     function clamp01(val) {
       return mathMin(1, mathMax(0, val));
@@ -128814,10 +128838,10 @@ var json2csv_umd = { exports: {} };
     };
     Buffer3.prototype.inspect = function inspect2() {
       var str = "";
-      var max = INSPECT_MAX_BYTES;
+      var max2 = INSPECT_MAX_BYTES;
       if (this.length > 0) {
-        str = this.toString("hex", 0, max).match(/.{2}/g).join(" ");
-        if (this.length > max)
+        str = this.toString("hex", 0, max2).match(/.{2}/g).join(" ");
+        if (this.length > max2)
           str += " ... ";
       }
       return "<Buffer " + str + ">";
@@ -129383,10 +129407,10 @@ var json2csv_umd = { exports: {} };
         checkOffset(offset, 8, this.length);
       return read(this, offset, false, 52, 8);
     };
-    function checkInt(buf, value, offset, ext, max, min) {
+    function checkInt(buf, value, offset, ext, max2, min) {
       if (!internalIsBuffer(buf))
         throw new TypeError('"buffer" argument must be a Buffer instance');
-      if (value > max || value < min)
+      if (value > max2 || value < min)
         throw new RangeError('"value" argument is out of bounds');
       if (offset + ext > buf.length)
         throw new RangeError("Index out of range");
@@ -129611,7 +129635,7 @@ var json2csv_umd = { exports: {} };
       }
       return offset + 4;
     };
-    function checkIEEE754(buf, value, offset, ext, max, min) {
+    function checkIEEE754(buf, value, offset, ext, max2, min) {
       if (offset + ext > buf.length)
         throw new RangeError("Index out of range");
       if (offset < 0)
@@ -133668,18 +133692,18 @@ void main() {
 `;
 function extent(values2, valueof) {
   let min;
-  let max;
+  let max2;
   if (valueof === void 0) {
     for (const value of values2) {
       if (value != null) {
         if (min === void 0) {
           if (value >= value)
-            min = max = value;
+            min = max2 = value;
         } else {
           if (min > value)
             min = value;
-          if (max < value)
-            max = value;
+          if (max2 < value)
+            max2 = value;
         }
       }
     }
@@ -133689,36 +133713,54 @@ function extent(values2, valueof) {
       if ((value = valueof(value, ++index2, values2)) != null) {
         if (min === void 0) {
           if (value >= value)
-            min = max = value;
+            min = max2 = value;
         } else {
           if (min > value)
             min = value;
-          if (max < value)
-            max = value;
+          if (max2 < value)
+            max2 = value;
         }
       }
     }
   }
-  return [min, max];
+  return [min, max2];
+}
+function max(values2, valueof) {
+  let max2;
+  if (valueof === void 0) {
+    for (const value of values2) {
+      if (value != null && (max2 < value || max2 === void 0 && value >= value)) {
+        max2 = value;
+      }
+    }
+  } else {
+    let index2 = -1;
+    for (let value of values2) {
+      if ((value = valueof(value, ++index2, values2)) != null && (max2 < value || max2 === void 0 && value >= value)) {
+        max2 = value;
+      }
+    }
+  }
+  return max2;
 }
 function normalize(arr) {
-  const [min, max] = extent(arr);
-  const ratio = 255 / (max - min);
+  const [min, max2] = extent(arr);
+  const ratio = 255 / (max2 - min);
   const data = new Uint8Array(
     arr.map((i2) => Math.floor((i2 - min) * ratio))
   );
   return data;
 }
-function multiSetsToTextureData(multiFeatureValues, setColorValues, channelIsSetColorMode, texSize) {
+function multiSetsToTextureData(multiFeatureValues, multiMatrixObsIndex, setColorValues, channelIsSetColorMode, texSize) {
   let totalValuesLength = 0;
   let totalColorsLength = 0;
   channelIsSetColorMode.forEach((isSetColorMode, channelIndex) => {
-    var _a2, _b, _c, _d, _e;
+    var _a2, _b, _c, _d;
     if (isSetColorMode) {
-      totalValuesLength += ((_b = (_a2 = setColorValues[channelIndex]) == null ? void 0 : _a2.obsIndex) == null ? void 0 : _b.length) || 0;
-      totalColorsLength += (((_d = (_c = setColorValues[channelIndex]) == null ? void 0 : _c.setColors) == null ? void 0 : _d.length) || 0) * 3;
+      totalColorsLength += (((_b = (_a2 = setColorValues[channelIndex]) == null ? void 0 : _a2.setColors) == null ? void 0 : _b.length) || 0) * 3;
+      totalValuesLength += ((_c = setColorValues[channelIndex]) == null ? void 0 : _c.obsIndex) ? max(setColorValues[channelIndex].obsIndex.map((d) => parseInt(d))) : 0;
     } else {
-      totalValuesLength += ((_e = multiFeatureValues[channelIndex]) == null ? void 0 : _e.length) || 0;
+      totalValuesLength += multiMatrixObsIndex[channelIndex] ? max(multiMatrixObsIndex[channelIndex].map((d) => parseInt(d))) : ((_d = multiFeatureValues[channelIndex]) == null ? void 0 : _d.length) || 0;
     }
   });
   const valueTexHeight = Math.max(2, Math.ceil(totalValuesLength / texSize));
@@ -133736,12 +133778,20 @@ function multiSetsToTextureData(multiFeatureValues, setColorValues, channelIsSet
   let indexOffset = 0;
   let colorOffset = 0;
   channelIsSetColorMode.forEach((isSetColorMode, channelIndex) => {
+    const matrixObsIndex = multiMatrixObsIndex[channelIndex];
+    const bitmaskValueIsIndex = matrixObsIndex === null;
     if (isSetColorMode) {
       const { setColorIndices, setColors, obsIndex } = setColorValues[channelIndex] || {};
       if (setColorIndices && setColors && obsIndex) {
         for (let i2 = 0; i2 < obsIndex.length; i2++) {
-          const colorIndex = setColorIndices.get(String(i2 + 1));
-          totalData[indexOffset + i2] = colorIndex === void 0 ? 0 : colorIndex + 1;
+          let obsId = String(i2 + 1);
+          let obsI = i2;
+          if (!bitmaskValueIsIndex) {
+            obsId = obsIndex[i2];
+            obsI = parseInt(obsId) - 1;
+          }
+          const colorIndex = setColorIndices.get(obsId);
+          totalData[indexOffset + obsI] = colorIndex === void 0 ? 0 : colorIndex + 1;
         }
         for (let i2 = 0; i2 < setColors.length; i2++) {
           const { color: [r2, g2, b] } = setColors[i2];
@@ -133756,7 +133806,16 @@ function multiSetsToTextureData(multiFeatureValues, setColorValues, channelIsSet
       colorOffset += (setColors == null ? void 0 : setColors.length) || 0;
     } else {
       const featureArr = multiFeatureValues[channelIndex];
-      totalData.set(normalize(featureArr), indexOffset);
+      const normalizedFeatureArr = normalize(featureArr);
+      if (!bitmaskValueIsIndex && matrixObsIndex) {
+        for (let i2 = 0; i2 < matrixObsIndex.length; i2++) {
+          const obsId = matrixObsIndex[i2];
+          const obsI = parseInt(obsId) - 1;
+          totalData[indexOffset + obsI] = normalizedFeatureArr[i2];
+        }
+      } else {
+        totalData.set(normalizedFeatureArr, indexOffset);
+      }
       indicesOffsets.push(indexOffset);
       indexOffset += featureArr.length;
       colorsOffsets.push(colorOffset);
@@ -133783,6 +133842,17 @@ function padWithDefault(arr, defaultValue2, padWidth) {
 function getColor(arr) {
   return arr ? arr.map((v) => v / 255) : [0, 0, 0];
 }
+function isEqualShallow(prevArr, nextArr) {
+  if (prevArr === nextArr) {
+    return true;
+  }
+  if (Array.isArray(prevArr) && Array.isArray(nextArr)) {
+    if (prevArr.length === nextArr.length) {
+      return !prevArr.some((v, i2) => v !== nextArr[i2] && (!Array.isArray(v) && !Array.isArray(nextArr[i2]) || (v.length > 0 || nextArr[i2].length > 0)));
+    }
+  }
+  return prevArr === nextArr;
+}
 const defaultProps = {
   channelStrokeWidths: { type: "array", value: null, compare: true },
   channelsFilled: { type: "array", value: null, compare: true },
@@ -133792,6 +133862,7 @@ const defaultProps = {
   colormap: { type: "string", value: GLSL_COLORMAP_DEFAULT, compare: true },
   expressionData: { type: "object", value: null, compare: true },
   multiFeatureValues: { type: "array", value: null, compare: true },
+  multiMatrixObsIndex: { type: "array", value: null, compare: true },
   setColorValues: { type: "array", value: null, compare: true },
   channelFeatureValueColormaps: { type: "array", value: null, compare: true },
   channelFeatureValueColormapRanges: { type: "array", value: null, compare: true },
@@ -133842,8 +133913,13 @@ class BitmaskLayer2 extends XRLayer {
   }
   updateState({ props: props2, oldProps, changeFlags }) {
     super.updateState({ props: props2, oldProps, changeFlags });
-    if (props2.multiFeatureValues !== oldProps.multiFeatureValues || props2.setColorValues !== oldProps.setColorValues || props2.channelIsSetColorMode !== oldProps.channelIsSetColorMode) {
-      const { multiFeatureValues, setColorValues, channelIsSetColorMode } = this.props;
+    if (!isEqualShallow(props2.multiFeatureValues, oldProps.multiFeatureValues) || !isEqualShallow(props2.multiMatrixObsIndex, oldProps.multiMatrixObsIndex) || !isEqualShallow(props2.setColorValues, oldProps.setColorValues) || !isEqualShallow(props2.channelIsSetColorMode, oldProps.channelIsSetColorMode)) {
+      const {
+        multiFeatureValues,
+        multiMatrixObsIndex,
+        setColorValues,
+        channelIsSetColorMode
+      } = this.props;
       const [
         valueTex,
         colorTex,
@@ -133853,6 +133929,7 @@ class BitmaskLayer2 extends XRLayer {
         colorTexHeight
       ] = this.multiSetsToTexture(
         multiFeatureValues,
+        multiMatrixObsIndex,
         setColorValues,
         channelIsSetColorMode
       );
@@ -134017,7 +134094,7 @@ class BitmaskLayer2 extends XRLayer {
       type: GL$1.FLOAT
     });
   }
-  multiSetsToTexture(multiFeatureValues, setColorValues, channelIsSetColorMode) {
+  multiSetsToTexture(multiFeatureValues, multiMatrixObsIndex, setColorValues, channelIsSetColorMode) {
     const isWebGL2On = isWebGL2$1(this.context.gl);
     const [
       totalData,
@@ -134028,6 +134105,7 @@ class BitmaskLayer2 extends XRLayer {
       colorsOffsets
     ] = multiSetsToTextureData(
       multiFeatureValues,
+      multiMatrixObsIndex,
       setColorValues,
       channelIsSetColorMode,
       MULTI_FEATURE_TEX_SIZE